From e34122965e9e2bc2e2c9538f294c361c48ee541e Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Thu, 3 Sep 2026 23:59:18 +0200
Subject: [PATCH 01/11] feat(dashboard): add link routing

---
 apps/backend/src/jobs/shortcuts-indexer.ts    |  4 +-
 apps/backend/src/lib/data/links.ts            | 29 +++++++
 .../components/settings/LinkDetailsForm.tsx   | 81 ++++++++++++++++++-
 .../web/src/components/widgets/CommandBar.tsx | 20 ++++-
 apps/web/src/components/widgets/LinkView.tsx  | 35 +++++++-
 .../components/widgets/ShortcutsWidget.tsx    | 16 ++--
 packages/types/package.json                   |  4 +
 packages/types/sdk-types.ts                   |  7 ++
 8 files changed, 183 insertions(+), 13 deletions(-)

diff --git a/apps/backend/src/jobs/shortcuts-indexer.ts b/apps/backend/src/jobs/shortcuts-indexer.ts
index 8132041d..b28af1fe 100644
--- a/apps/backend/src/jobs/shortcuts-indexer.ts
+++ b/apps/backend/src/jobs/shortcuts-indexer.ts
@@ -55,7 +55,7 @@ export async function runShortcutsIndexing() {
         name,
         icon: String(link?.iconUrl || link?.folderIcon || "/icons/faGlobe.svg"),
         secondary: String(link?.collection || link?.folder || "Link"),
-        action: url.startsWith("url:") ? url : `url:${url}`,
+        action: "link",
         app: "",
         tags: [
           name,
@@ -381,7 +381,7 @@ async function rebuildUserShortcuts(pb: any, userId: string, rows: ShortcutRow[]
     const existingRecords = existingBySource.get(sid) || [];
 
     // Determine if it's a link or integration
-    const isLink = newRows.length === 1 && newRows[0].app === "" && newRows[0].action.startsWith("url:");
+    const isLink = newRows.length === 1 && newRows[0].app === "" && (newRows[0].action === "link" || newRows[0].action.startsWith("url:"));
     
     if (isLink) {
       const newRow = newRows[0];
diff --git a/apps/backend/src/lib/data/links.ts b/apps/backend/src/lib/data/links.ts
index e9502fe8..0eebc05b 100644
--- a/apps/backend/src/lib/data/links.ts
+++ b/apps/backend/src/lib/data/links.ts
@@ -45,11 +45,18 @@ export interface HomeLinkFolderPathItem {
     parentFolder?: string;
 }
 
+export interface SecondaryUrl {
+    name: string;
+    url: string;
+    routingRule: string;
+}
+
 export interface LinkItem {
     collectionId: string;
     collectionName: "linkItems";
     id: string;
     url: string;
+    secondaryUrls?: SecondaryUrl[];
     title: string;
     iconUrl: string;
     description: string;
@@ -185,6 +192,7 @@ export async function getLinksItems(userId: string, listId: string, folderId?: s
     return records.map((r) => ({
         id: r.id,
         url: r.url,
+        secondaryUrls: normalizeSecondaryUrls((r as any).secondaryUrls),
         title: r.title,
         iconUrl: r.iconUrl,
         description: r.description,
@@ -298,6 +306,15 @@ function buildFolderPathResolver(
     };
 }
 
+function normalizeSecondaryUrls(raw: unknown): SecondaryUrl[] {
+    if (!Array.isArray(raw)) return [];
+    return raw.map((entry: any) => ({
+        name: String(entry?.name ?? "").trim(),
+        url: String(entry?.url ?? "").trim(),
+        routingRule: String(entry?.routingRule ?? "").trim(),
+    })).filter((entry) => entry.url && entry.routingRule);
+}
+
 function getMonitorLinkId(monitor: { sourcelinkId?: string; linkId?: string }) {
     return String(monitor.sourcelinkId || monitor.linkId || "").trim();
 }
@@ -454,6 +471,7 @@ export async function getHomeLinks(userId: string) {
         return {
             id: r.id as string,
             url: r.url as string,
+            secondaryUrls: normalizeSecondaryUrls((r as any).secondaryUrls),
             title: r.title as string,
             iconUrl: r.iconUrl as string,
             description: r.description as string,
@@ -608,11 +626,13 @@ export async function createHomeLinkItem(
         linkGroup?: string;
         folder?: string;
         statusCheck?: boolean;
+        secondaryUrls?: SecondaryUrl[];
     },
 ): Promise<
     {
         id: string;
         url: string;
+        secondaryUrls?: SecondaryUrl[];
         title: string;
         iconUrl: string;
         description: string;
@@ -663,6 +683,7 @@ export async function createHomeLinkItem(
         collection: homeCollection.id,
         folder: folderId ?? "",
         position: nextPosition,
+        secondaryUrls: normalizeSecondaryUrls(data.secondaryUrls),
     });
 
     await syncHomeLinkMonitor(userId, record.id, record.url, data.statusCheck);
@@ -670,6 +691,7 @@ export async function createHomeLinkItem(
     return {
         id: record.id,
         url: record.url,
+        secondaryUrls: normalizeSecondaryUrls((record as any).secondaryUrls),
         title: record.title,
         iconUrl: record.iconUrl,
         description: record.description,
@@ -766,6 +788,7 @@ export async function updateHomeLinkItem(
         linkGroup?: string;
         folder?: string;
         statusCheck?: boolean;
+        secondaryUrls?: SecondaryUrl[];
     },
 ): Promise<void> {
     const pb = getServerPB();
@@ -781,6 +804,7 @@ export async function updateHomeLinkItem(
     if (data.title !== undefined) updateData.title = data.title;
     if (data.iconUrl !== undefined) updateData.iconUrl = data.iconUrl;
     if (data.description !== undefined) updateData.description = data.description;
+    if (data.secondaryUrls !== undefined) updateData.secondaryUrls = normalizeSecondaryUrls(data.secondaryUrls);
 
     if (data.linkGroup !== undefined || data.folder !== undefined) {
         const homeListId = await getHomeListId(userId);
@@ -954,9 +978,11 @@ export async function createLinkItem(data: {
     collection: string;
     folder?: string;
     tags?: string[];
+    secondaryUrls?: SecondaryUrl[];
 }): Promise<{
     id: string;
     url: string;
+    secondaryUrls?: SecondaryUrl[];
     title: string;
     iconUrl: string;
     description: string;
@@ -975,11 +1001,13 @@ export async function createLinkItem(data: {
         collection: data.collection,
         folder: data.folder ?? "",
         tags: Array.isArray(data.tags) ? data.tags : [],
+        secondaryUrls: normalizeSecondaryUrls(data.secondaryUrls),
     });
 
     return {
         id: record.id,
         url: record.url,
+        secondaryUrls: normalizeSecondaryUrls((record as any).secondaryUrls),
         title: record.title,
         iconUrl: record.iconUrl,
         description: record.description,
@@ -1000,6 +1028,7 @@ export async function createCollectionLinkItem(
         collection: string;
         folder?: string;
         tags?: string[];
+        secondaryUrls?: SecondaryUrl[];
     },
 ): Promise<{
     id: string;
diff --git a/apps/web/src/components/settings/LinkDetailsForm.tsx b/apps/web/src/components/settings/LinkDetailsForm.tsx
index 63bbc550..d5524a9b 100644
--- a/apps/web/src/components/settings/LinkDetailsForm.tsx
+++ b/apps/web/src/components/settings/LinkDetailsForm.tsx
@@ -46,9 +46,16 @@ import { RadioGroup, RadioGroupItem } from "../ui/radio-group";
 import { Switch } from "@/components/ui/switch";
 import { faEllipsisV, faPaperclip } from "@fortawesome/free-solid-svg-icons";
 import { Icon as Iconify } from "@iconify-icon/react";
-import { Check, ChevronsUpDown } from "lucide-react";
+import { Check, ChevronsUpDown, CircleHelp, Plus, Trash2 } from "lucide-react";
 import { cn } from "@/lib/utils";
-import type { LinkType, StatusCheckAuth, StatusCheckMethod } from "@dashwise/types/sdk";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import type { LinkType, StatusCheckAuth, StatusCheckMethod } from "@dashwise/types/links";
+
+interface SecondaryUrl {
+  name: string;
+  url: string;
+  routingRule: string;
+}
 
 interface Icon {
   Name: string;
@@ -94,6 +101,8 @@ export default function LinkDetailsForm({
   const [name, setName] = useState("");
   const [linkId, setLinkId] = useState(() => link?.id || generateRandomId());
   const [url, setUrl] = useState("");
+  const [secondaryUrls, setSecondaryUrls] = useState<SecondaryUrl[]>([]);
+  const [secondaryUrlsExpanded, setSecondaryUrlsExpanded] = useState(false);
   const [icon, setIcon] = useState<IconResult | null>(null);
   const [linkGroup, setLinkGroup] = useState(() => preselectOpenedGroup || link?.linkGroup || link?.collection || "");
   const [folder, setFolder] = useState(() => link?.folder || "");
@@ -137,6 +146,13 @@ export default function LinkDetailsForm({
     if (link?.linkGroup) {
       setLinkGroup(link.linkGroup);
     }
+    if (Array.isArray((link as any)?.secondaryUrls)) {
+      setSecondaryUrls((link as any).secondaryUrls);
+      setSecondaryUrlsExpanded((link as any).secondaryUrls.length > 0);
+    } else {
+      setSecondaryUrls([]);
+      setSecondaryUrlsExpanded(false);
+    }
     if ((link as any)?.folder) {
       setFolder((link as any).folder);
     }
@@ -252,6 +268,7 @@ export default function LinkDetailsForm({
       linkGroup,
       folder,
       statusCheck,
+      secondaryUrls: secondaryUrls.filter((entry) => entry.url.trim() && entry.routingRule.trim()),
     };
 
     if (isEditing && link?.id) {
@@ -299,6 +316,8 @@ export default function LinkDetailsForm({
   const resetForm = () => {
     setName("");
     setUrl("");
+    setSecondaryUrls([]);
+    setSecondaryUrlsExpanded(false);
     setIcon(null);
     setIconEdited(false);
     setFolder("");
@@ -422,6 +441,64 @@ export default function LinkDetailsForm({
           onBlur={handleUrlBlur}
         />
 
+        <div className="mt-3">
+          {!secondaryUrlsExpanded ? (
+            <button
+              type="button"
+              className="text-sm text-primary underline-offset-4 hover:underline"
+              onClick={() => setSecondaryUrlsExpanded(true)}
+            >
+              Add more URLs
+            </button>
+          ) : (
+            <>
+              <Separator className="my-3" />
+              <section>
+                <div className="flex items-center justify-between">
+                <div className="flex items-center gap-1.5">
+                  <Label className="font-medium">Secondary urls</Label>
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <button type="button" aria-label="About secondary URL routing" className="text-muted-foreground hover:text-foreground">
+                        <CircleHelp className="h-3.5 w-3.5" />
+                      </button>
+                    </TooltipTrigger>
+                    <TooltipContent>Route this link to another URL when opened from a matching origin or hostname.</TooltipContent>
+                  </Tooltip>
+                </div>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon"
+                  className="h-7 w-7 rounded-full"
+                  aria-label="Add secondary URL"
+                  title="Add secondary URL"
+                  onClick={() => setSecondaryUrls((current) => [...current, { name: "", url: "", routingRule: "" }])}
+                >
+                  <Plus className="h-4 w-4" />
+                </Button>
+                </div>
+
+                <div className="mt-2 flex flex-col gap-3">
+                  {secondaryUrls.map((entry, index) => (
+                    <div key={index} className="grid gap-2 rounded-md border border-white/10 p-2">
+                    <div className="flex items-center gap-2">
+                      <Input placeholder="Name" aria-label="Secondary URL name" value={entry.name} onChange={(e) => setSecondaryUrls((current) => current.map((item, itemIndex) => itemIndex === index ? { ...item, name: e.target.value } : item))} className="frosted" />
+                      <Button type="button" variant="ghost" size="icon" className="h-8 w-8 shrink-0" aria-label={`Remove secondary URL ${index + 1}`} onClick={() => setSecondaryUrls((current) => current.filter((_, itemIndex) => itemIndex !== index))}>
+                        <Trash2 className="h-3.5 w-3.5" />
+                      </Button>
+                    </div>
+                    <Input placeholder="URL" aria-label="Secondary URL" value={entry.url} onChange={(e) => setSecondaryUrls((current) => current.map((item, itemIndex) => itemIndex === index ? { ...item, url: e.target.value } : item))} className="frosted" />
+                    <Input placeholder="Routing rule (e.g. localhost, 192.168.1.10, example.com)" aria-label="Secondary URL routing rule" value={entry.routingRule} onChange={(e) => setSecondaryUrls((current) => current.map((item, itemIndex) => itemIndex === index ? { ...item, routingRule: e.target.value } : item))} className="frosted" />
+                    </div>
+                  ))}
+                </div>
+              </section>
+              <Separator className="my-3" />
+            </>
+          )}
+        </div>
+
         <Label htmlFor="link-image">Icon</Label>
         <RadioGroup className="flex flex-wrap items-center gap-2" defaultValue="current">
           <Label
diff --git a/apps/web/src/components/widgets/CommandBar.tsx b/apps/web/src/components/widgets/CommandBar.tsx
index 3d6f6ac4..0e4eb249 100644
--- a/apps/web/src/components/widgets/CommandBar.tsx
+++ b/apps/web/src/components/widgets/CommandBar.tsx
@@ -10,13 +10,15 @@ import { DialogTitle } from "@radix-ui/react-dialog";
 import { Icon as IconifyIcon } from "@iconify-icon/react";
 import AppIcon from "@dashwise/app-icon";
 import QRCode from "qrcode";
-import { getFrequentlyUsedShortcutsAction, logShortcutUsageAction } from '@/lib/apiClient';
+import { getFrequentlyUsedShortcutsAction, getHomeLinksAction, logShortcutUsageAction } from '@/lib/apiClient';
+import { getRoutedLinkUrl } from "@/lib/linkRouting";
 import { proxyIntegrationAction } from '@/lib/apiClient';
 
 // --- Types ---
 
 type LinkItem = {
   id?: string;
+  sourceId?: string;
   parentId?: string;
   icon?: string;
   linkGroup?: string;
@@ -47,6 +49,7 @@ type SearchEngine = {
 
 type IncomingShortcut = {
   id?: string;
+  sourceId?: string;
   parentId?: string;
   name?: string;
   icon?: string;
@@ -106,6 +109,8 @@ function normalizeConfigLinks(input: IncomingShortcut[] = []): LinkItem[] {
           url = "__toggle_theme__";
         } else if (action.toLowerCase().startsWith("link-tile-layout:")) {
           url = "__toggle_link_tile_layout__";
+        } else if (action.toLowerCase() === "link") {
+          url = "__source_link__";
         } else if (action.startsWith("url:")) {
           url = action.slice(4);
         } else if (action.startsWith("command:")) {
@@ -133,6 +138,7 @@ function normalizeConfigLinks(input: IncomingShortcut[] = []): LinkItem[] {
 
       return {
         id: it.id,
+        sourceId: it.sourceId,
         parentId: (it as any).parentId,
         name: it.name || "",
         icon: it.icon || undefined,
@@ -166,6 +172,13 @@ export default function CommandBar(
     [shortcuts],
   );
 
+  React.useEffect(() => {
+    if (!open) return;
+    void getHomeLinksAction({ token: token ?? "" }).then((links) => {
+      if (Array.isArray(links)) setHomeLinks(links as typeof homeLinks);
+    }).catch(() => {});
+  }, [open, token]);
+
   const defaultEngine = searchEngines.find((se) => se.status === "default") ||
     searchEngines.find((se) => se.status !== "disabled") ||
     searchEngines[0];
@@ -178,6 +191,7 @@ export default function CommandBar(
   const [qrCodeDataUrl, setQrCodeDataUrl] = React.useState("");
   const [qrCodeLoading, setQrCodeLoading] = React.useState(false);
   const [qrCodeError, setQrCodeError] = React.useState<string | null>(null);
+  const [homeLinks, setHomeLinks] = React.useState<Array<{ id: string; url: string; secondaryUrls?: Array<{ url: string; routingRule: string }> }>>([]);
   const [frequentlyUsedIds, setFrequentlyUsedIds] = React.useState<string[]>([]);
   const inputRef = React.useRef<HTMLInputElement | null>(null);
 
@@ -551,6 +565,10 @@ export default function CommandBar(
       openSearch(query);
     } else if (a.url === "__qr_action__") {
       return;
+    } else if (a.url === "__source_link__") {
+      const sourceLink = a.sourceId && homeLinks.find((link) => link.id === a.sourceId);
+      if (sourceLink) openUrl(getRoutedLinkUrl(sourceLink), config?.global?.linkOpenBehaviour);
+      else setOpen(false);
     } else if (a.url === "__proxy_action__") {
       logShortcutUsage(a);
       void triggerProxyAction(a);
diff --git a/apps/web/src/components/widgets/LinkView.tsx b/apps/web/src/components/widgets/LinkView.tsx
index a42b2ed7..14ad1096 100644
--- a/apps/web/src/components/widgets/LinkView.tsx
+++ b/apps/web/src/components/widgets/LinkView.tsx
@@ -9,7 +9,7 @@ import {
   updateHomeLinkFolderIconAction,
 } from '@/lib/apiClient';
 import { PaginatedCarouselViewComponent } from "./PaginatedCarouselView";
-import type { LinkType } from "@dashwise/types/sdk";
+import type { LinkType } from "@dashwise/types/links";
 import {
   Popover,
   PopoverContent,
@@ -802,6 +802,33 @@ export default function LinkView({ links = [] }: { links?: LinkType[] }) {
   );
 }
 
+function getRoutedLinkUrl(link: LinkType): string {
+  const primaryUrl = String(link.url ?? "").trim();
+  if (typeof window === "undefined" || !Array.isArray(link.secondaryUrls)) return primaryUrl;
+
+  const origin = window.location.origin.toLowerCase();
+  const hostname = window.location.hostname.toLowerCase();
+  const host = window.location.host.toLowerCase();
+
+  for (const secondary of link.secondaryUrls) {
+    const rule = String(secondary.routingRule ?? "").trim().toLowerCase().replace(/\/$/, "");
+    if (!rule) continue;
+    let matches = [origin, hostname, host].includes(rule);
+    if (!matches && rule.startsWith("*.")) matches = hostname.endsWith(rule.slice(1));
+    if (!matches) {
+      try {
+        const ruleUrl = new URL(rule.includes("://") ? rule : `https://${rule}`);
+        matches = [ruleUrl.origin.toLowerCase(), ruleUrl.hostname.toLowerCase(), ruleUrl.host.toLowerCase()].some((value) => [origin, hostname, host].includes(value));
+      } catch {
+        // Treat malformed routing rules as non-matches.
+      }
+    }
+    if (matches && String(secondary.url ?? "").trim()) return String(secondary.url).trim();
+  }
+
+  return primaryUrl;
+}
+
 function previewFirstFolderIcons(folderId: string): boolean {
   if (!folderId) return false;
   try {
@@ -853,11 +880,12 @@ function LinkTile({
   const isHealthy = serverStatus === "healthy";
   const isDisabled = serverStatus === "disabled";
   const showDot = Boolean(link.statusCheck);
+  const routedUrl = getRoutedLinkUrl(link);
 
   return (
     <a
       key={link.id || link.url || itemIdx}
-      href={link.url}
+      href={routedUrl}
       target={user?.global?.linkOpenBehaviour === "newtab" ? "_blank" : "_self"}
       rel={user?.global?.linkOpenBehaviour === "newtab"
         ? "noopener noreferrer"
@@ -949,11 +977,12 @@ function CompactLinkTile({
   const isHealthy = serverStatus === "healthy";
   const isDisabled = serverStatus === "disabled";
   const showDot = Boolean(link.statusCheck);
+  const routedUrl = getRoutedLinkUrl(link);
 
   return (
     <a
       key={link.id || link.url || itemIdx}
-      href={link.url}
+      href={routedUrl}
       target={user?.global?.linkOpenBehaviour === "newtab" ? "_blank" : "_self"}
       rel={user?.global?.linkOpenBehaviour === "newtab"
         ? "noopener noreferrer"
diff --git a/apps/web/src/components/widgets/ShortcutsWidget.tsx b/apps/web/src/components/widgets/ShortcutsWidget.tsx
index 0f5217ad..4dbbdf83 100644
--- a/apps/web/src/components/widgets/ShortcutsWidget.tsx
+++ b/apps/web/src/components/widgets/ShortcutsWidget.tsx
@@ -4,21 +4,24 @@ import { useEffect, useState } from "react";
 import AppIcon from "@dashwise/app-icon";
 import WidgetColumnTemplate from "@dashwise/integrationskit/templates/WidgetColumn";
 import useAuth from "@/context/useAuth";
-import { getShortcutsAction, logShortcutUsageAction, proxyIntegrationAction } from "@/lib/apiClient";
+import { getHomeLinksAction, getShortcutsAction, logShortcutUsageAction, proxyIntegrationAction } from "@/lib/apiClient";
+import { getRoutedLinkUrl } from "@/lib/linkRouting";
 
-type Shortcut = { id: string; name: string; icon?: string; action: string | { type: string; url?: string } };
+type Shortcut = { id: string; name: string; icon?: string; sourceId?: string; action: string | { type: string; url?: string } };
 
 export default function ShortcutsWidget({ shortcutIds = [], className = "" }: { shortcutIds?: string[]; className?: string }) {
   const { withAuth, toggleTheme, toggleLinkTileLayout } = useAuth();
   const [shortcuts, setShortcuts] = useState<Shortcut[]>([]);
+  const [homeLinks, setHomeLinks] = useState<Array<{ id: string; url: string; secondaryUrls?: Array<{ url: string; routingRule: string }> }>>([]);
 
   useEffect(() => {
     let cancelled = false;
-    void withAuth((auth) => getShortcutsAction(auth)).then((items) => {
+    void Promise.all([withAuth((auth) => getShortcutsAction(auth)), withAuth((auth) => getHomeLinksAction(auth))]).then(([items, links]) => {
       if (cancelled || !Array.isArray(items)) return;
       const selected = new Map((items as Shortcut[]).map((item) => [item.id, item]));
       setShortcuts(shortcutIds.map((id) => selected.get(id)).filter((item): item is Shortcut => Boolean(item)));
-    }).catch(() => { if (!cancelled) setShortcuts([]); });
+      setHomeLinks(Array.isArray(links) ? links as typeof homeLinks : []);
+    }).catch(() => { if (!cancelled) { setShortcuts([]); setHomeLinks([]); } });
     return () => { cancelled = true; };
   }, [shortcutIds, withAuth]);
 
@@ -28,7 +31,10 @@ export default function ShortcutsWidget({ shortcutIds = [], className = "" }: {
       await withAuth((auth) => proxyIntegrationAction(auth, shortcut.id));
       return;
     }
-    const value = typeof action === "string" ? action.trim() : String(action.url ?? "").trim();
+    const sourceLink = shortcut.sourceId && homeLinks.find((link) => link.id === shortcut.sourceId);
+    const value = action === "link" && sourceLink
+      ? getRoutedLinkUrl(sourceLink)
+      : typeof action === "string" ? action.trim() : String(action.url ?? "").trim();
     if (!value) return;
     if (value.toLowerCase().startsWith("theme:")) {
       await toggleTheme();
diff --git a/packages/types/package.json b/packages/types/package.json
index a8cceb84..2ef54f47 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -11,6 +11,10 @@
     "./sdk": {
       "types": "./sdk-types.ts",
       "default": "./sdk-types.ts"
+    },
+    "./links": {
+      "types": "./links.ts",
+      "default": "./links.ts"
     }
   },
   "types": "index.ts",
diff --git a/packages/types/sdk-types.ts b/packages/types/sdk-types.ts
index 0d994db5..73fea8db 100644
--- a/packages/types/sdk-types.ts
+++ b/packages/types/sdk-types.ts
@@ -216,9 +216,16 @@ export type NewsUpdateInput = {
   enableTopicGrouping?: boolean;
 };
 
+export type SecondaryUrl = {
+  name: string;
+  url: string;
+  routingRule: string;
+};
+
 export type HomeLink = {
   id: string;
   url: string;
+  secondaryUrls?: SecondaryUrl[];
   title: string;
   iconUrl: string;
   description: string;

From d7f4d3f6e4e8f4edfc401fce792cf0bc78f9561d Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Fri, 4 Sep 2026 00:00:44 +0200
Subject: [PATCH 02/11] dev: add config option to disable feed indexing

---
 apps/backend/src/jobs/index.ts             | 10 ++++++----
 apps/backend/src/jobs/news/feed-builder.ts |  4 ++++
 apps/backend/src/lib/config.ts             | 10 ++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/backend/src/jobs/index.ts b/apps/backend/src/jobs/index.ts
index 6b10d758..1bb8c1a1 100644
--- a/apps/backend/src/jobs/index.ts
+++ b/apps/backend/src/jobs/index.ts
@@ -188,10 +188,12 @@ export function registerJobsCron() {
     await runDefaultIntegrationsJob("scheduled run");
   });
 
-  void runNewsFeedBuilderJob("initial run");
-  Bun.cron(config.FEED_BUILDING_SCHEDULE, async () => {
-    await runNewsFeedBuilderJob("scheduled run");
-  });
+  if (!config.DEV_DISABLE_NEWS_INDEXING) {
+    void runNewsFeedBuilderJob("initial run");
+    Bun.cron(config.FEED_BUILDING_SCHEDULE, async () => {
+      await runNewsFeedBuilderJob("scheduled run");
+    });
+  }
 
   Bun.cron(config.NOTIFICATION_FORWARDER_SCHEDULE, async () => {
     await runNotificationForwarderJob("cron schedule");
diff --git a/apps/backend/src/jobs/news/feed-builder.ts b/apps/backend/src/jobs/news/feed-builder.ts
index c17995d8..90d2ad3a 100644
--- a/apps/backend/src/jobs/news/feed-builder.ts
+++ b/apps/backend/src/jobs/news/feed-builder.ts
@@ -270,6 +270,10 @@ export async function newsFeedBuilder(feedId?: string, options: BuilderOptions =
   details: Array<any>;
 }> {
   const result = { processed: 0, skipped: 0, updated: 0, errors: 0, details: [] as any[] };
+  if (config.DEV_DISABLE_NEWS_INDEXING) {
+    return result;
+  }
+
   const sourceRevision = `${Date.now()}`;
   logger.info("Running news feed builder");
 
diff --git a/apps/backend/src/lib/config.ts b/apps/backend/src/lib/config.ts
index 10dbb914..8a799513 100644
--- a/apps/backend/src/lib/config.ts
+++ b/apps/backend/src/lib/config.ts
@@ -20,6 +20,12 @@ const normalizedNewsSubscriptionRetention = Number(env.NEWS_SUBSCRIPTION_RETENTI
 const resolvedNewsSubscriptionRetention = Number.isInteger(normalizedNewsSubscriptionRetention) && normalizedNewsSubscriptionRetention > 0
   ? normalizedNewsSubscriptionRetention
   : 50;
+const resolvedDeviceCodePending = Number.isInteger(Number(env.AUTH_DEVICE_CODE_MAX_PENDING)) && Number(env.AUTH_DEVICE_CODE_MAX_PENDING) > 0
+  ? Number(env.AUTH_DEVICE_CODE_MAX_PENDING) : 100;
+const resolvedDeviceCodeSockets = Number.isInteger(Number(env.AUTH_DEVICE_CODE_MAX_SOCKETS)) && Number(env.AUTH_DEVICE_CODE_MAX_SOCKETS) > 0
+  ? Number(env.AUTH_DEVICE_CODE_MAX_SOCKETS) : 100;
+const resolvedDeviceCodeTtl = Number.isInteger(Number(env.AUTH_DEVICE_CODE_TTL_MS)) && Number(env.AUTH_DEVICE_CODE_TTL_MS) >= 300_000
+  ? Number(env.AUTH_DEVICE_CODE_TTL_MS) : 10 * 60 * 1000;
 
 const truthyEnv = (value?: string | null): boolean => {
   if (!value) return false;
@@ -49,6 +55,7 @@ const getLogLevel = (): string | undefined => {
 export const config = {
   ENVIRONMENT: processEnvironment === "dev" ? "dev" : "production",
   USE_LOCAL_FEED_CACHE: useLocalFeedCache,
+  DEV_DISABLE_NEWS_INDEXING: processEnvironment === "dev" && truthyEnv(env.DEV_DISABLE_NEWS_INDEXING),
   PORT: Number(env.PORT) || 3000,
   PB_URL: getEnv("PB_URL", "NEXT_PUBLIC_PB_URL") || "http://127.0.0.1:8090",
   PB_BINARY_PATH: env.PB_BINARY_PATH,
@@ -66,6 +73,9 @@ export const config = {
   UPDATE_CHECK_SCHEDULE: env.UPDATE_CHECK_SCHEDULE || "0 2 * * *",
   FEED_BUILDING_SCHEDULE: env.FEED_BUILDING_SCHEDULE || "*/30 * * * *",
   NEWS_SUBSCRIPTION_RETENTION: resolvedNewsSubscriptionRetention,
+  AUTH_DEVICE_CODE_MAX_PENDING: resolvedDeviceCodePending,
+  AUTH_DEVICE_CODE_MAX_SOCKETS: resolvedDeviceCodeSockets,
+  AUTH_DEVICE_CODE_TTL_MS: resolvedDeviceCodeTtl,
   NOTIFICATION_FORWARDER_SCHEDULE: env.NOTIFICATION_FORWARDER_SCHEDULE || "* * * * *",
   DEFAULT_INTEGRATIONS_SCHEDULE: env.DEFAULT_INTEGRATIONS_SCHEDULE || "0 4 * * *",
   PAGECONFIG_CLEANUP_SCHEDULE: env.PAGECONFIG_CLEANUP_SCHEDULE || "0 5 * * *",

From 0787bf69840549e505effdce61eb6f42801ee52d Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Fri, 4 Sep 2026 00:01:08 +0200
Subject: [PATCH 03/11] feat(lin routing): add pocketbase migration

---
 apps/web/src/lib/linkRouting.ts               | 37 +++++++++++++++++++
 ...3000000_add_secondary_urls_to_linkItems.js | 21 +++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 apps/web/src/lib/linkRouting.ts
 create mode 100644 pocketbase/migrations/1783000000_add_secondary_urls_to_linkItems.js

diff --git a/apps/web/src/lib/linkRouting.ts b/apps/web/src/lib/linkRouting.ts
new file mode 100644
index 00000000..3887523d
--- /dev/null
+++ b/apps/web/src/lib/linkRouting.ts
@@ -0,0 +1,37 @@
+export type RoutedLink = {
+  url?: string;
+  secondaryUrls?: Array<{ url?: string; routingRule?: string }>;
+};
+
+export function getRoutedLinkUrl(link: RoutedLink): string {
+  const primaryUrl = String(link.url ?? "").trim();
+  if (typeof window === "undefined" || !Array.isArray(link.secondaryUrls)) return primaryUrl;
+
+  const origin = window.location.origin.toLowerCase();
+  const hostname = window.location.hostname.toLowerCase();
+  const host = window.location.host.toLowerCase();
+  const currentValues = [origin, hostname, host];
+
+  for (const secondary of link.secondaryUrls) {
+    const rule = String(secondary.routingRule ?? "").trim().toLowerCase().replace(/\/$/, "");
+    if (!rule) continue;
+
+    let matches = currentValues.includes(rule);
+    if (!matches && rule.startsWith("*.")) matches = hostname.endsWith(rule.slice(1));
+    if (!matches) {
+      try {
+        const ruleUrl = new URL(rule.includes("://") ? rule : `https://${rule}`);
+        matches = [ruleUrl.origin, ruleUrl.hostname, ruleUrl.host]
+          .map((value) => value.toLowerCase())
+          .some((value) => currentValues.includes(value));
+      } catch {
+        // Ignore malformed rules.
+      }
+    }
+
+    const secondaryUrl = String(secondary.url ?? "").trim();
+    if (matches && secondaryUrl) return secondaryUrl;
+  }
+
+  return primaryUrl;
+}
diff --git a/pocketbase/migrations/1783000000_add_secondary_urls_to_linkItems.js b/pocketbase/migrations/1783000000_add_secondary_urls_to_linkItems.js
new file mode 100644
index 00000000..ed77b56f
--- /dev/null
+++ b/pocketbase/migrations/1783000000_add_secondary_urls_to_linkItems.js
@@ -0,0 +1,21 @@
+/// <reference path="../pb_data/types.d.ts" />
+migrate((app) => {
+  const linkItems = app.findCollectionByNameOrId("pbc_2828452451");
+
+  linkItems.fields.addAt(5, new Field({
+    "hidden": false,
+    "id": "json_secondary_urls",
+    "maxSize": 0,
+    "name": "secondaryUrls",
+    "presentable": false,
+    "required": false,
+    "system": false,
+    "type": "json"
+  }));
+
+  return app.save(linkItems);
+}, (app) => {
+  const linkItems = app.findCollectionByNameOrId("pbc_2828452451");
+  linkItems.fields.removeById("json_secondary_urls");
+  return app.save(linkItems);
+});

From 40fbdf9457960563459d6580131f0f111245248f Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Fri, 4 Sep 2026 17:53:26 +0200
Subject: [PATCH 04/11] feat(widgets): add contdown widget

---
 .../settings/SmartFramesManager.tsx           |  7 ++-
 .../settings/pages/DashboardWidgetPreview.tsx | 22 ++++++++
 .../settings/pages/EditGlanceablesView.tsx    | 55 ++++++++++++++++++-
 .../widgets/dashboard/GlanceableClock.tsx     |  1 +
 packages/assets/integrations/default.yaml     | 21 ++++++-
 packages/integrationskit/Glanceable.tsx       | 34 ++++++++++++
 .../forms/WidgetPropertiesForm.tsx            | 48 +++++++++++++++-
 .../static-widgets/CountdownWidget.tsx        | 20 +++++--
 8 files changed, 195 insertions(+), 13 deletions(-)

diff --git a/apps/web/src/components/settings/SmartFramesManager.tsx b/apps/web/src/components/settings/SmartFramesManager.tsx
index fb09b198..61e84df8 100644
--- a/apps/web/src/components/settings/SmartFramesManager.tsx
+++ b/apps/web/src/components/settings/SmartFramesManager.tsx
@@ -71,7 +71,12 @@ const LOCAL_WIDGET_SCHEMAS: Record<string, Record<string, any>> = {
   "calendar-today": { startMonday: true },
   "calendar-week": { startMonday: true },
   "calendar-upcoming": { maxEvents: 5 },
-  countdown: { date: "", date_format: "yyyy-MM-dd", label: "Countdown" },
+  countdown: {
+    date: { type: "date", default: "" },
+    display_name: "",
+    date_format: "yyyy-MM-dd",
+    label: "Countdown",
+  },
   "rss-feed": { feedId: "all", maxItems: 8, title: "Latest Articles" },
   "latest-links": { listId: "", maxItems: 8, title: "Latest Links" },
   progress: {
diff --git a/apps/web/src/components/settings/pages/DashboardWidgetPreview.tsx b/apps/web/src/components/settings/pages/DashboardWidgetPreview.tsx
index 7fc15546..0ec107e9 100644
--- a/apps/web/src/components/settings/pages/DashboardWidgetPreview.tsx
+++ b/apps/web/src/components/settings/pages/DashboardWidgetPreview.tsx
@@ -39,6 +39,7 @@ import {
 } from "@/components/ui/dialog";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { renderWidget } from "@/components/widgets/Widget";
+import { useActivity } from "@/context/ActivityContext";
 import ShortcutsPicker from "@/components/widgets/ShortcutsPicker";
 import { EditGlanceablesView } from "@/components/settings/pages/EditGlanceablesView";
 import {
@@ -678,6 +679,16 @@ function WidgetInputEditor({
   dataError: string | null;
   setDataError: (value: string | null) => void;
 }) {
+  const { calendarEvents } = useActivity();
+  const dateSuggestions = widgetType === "countdown"
+    ? calendarEvents.map((event) => ({
+        value: event.id,
+        label: `${event.title} — ${formatCalendarEventDate(event.start)}`,
+        date: event.start.slice(0, 10),
+        displayName: event.title,
+      }))
+    : [];
+
   if (widgetType === "rss-feed" || widgetType === "latest-rss-feed") {
     return (
       <NewsFeedWidgetInputEditor
@@ -719,10 +730,21 @@ function WidgetInputEditor({
       onError={setDataError}
       error={dataError}
       emptyMessage="No input properties for this widget."
+      dateSuggestions={dateSuggestions}
+      onDateSuggestionSelect={(key, suggestion) => onChange({
+        ...inputDraft,
+        [key]: suggestion.date,
+        ...(key === "date" && suggestion.displayName ? { display_name: suggestion.displayName } : {}),
+      })}
     />
   );
 }
 
+function formatCalendarEventDate(value: string) {
+  const date = new Date(value);
+  return Number.isNaN(date.getTime()) ? value : date.toLocaleDateString([], { month: "short", day: "numeric" });
+}
+
 function NewsFeedWidgetInputEditor({
   schema,
   inputDraft,
diff --git a/apps/web/src/components/settings/pages/EditGlanceablesView.tsx b/apps/web/src/components/settings/pages/EditGlanceablesView.tsx
index a88a960a..b6e5a0a1 100644
--- a/apps/web/src/components/settings/pages/EditGlanceablesView.tsx
+++ b/apps/web/src/components/settings/pages/EditGlanceablesView.tsx
@@ -16,6 +16,7 @@ import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { ClockGlanceableIntervals, ClockGlanceableSelection, DEFAULT_GLANCEABLE_CAROUSEL_INTERVAL, GlanceableSide } from "./utils";
 import { useLocalization } from "@/context/LocalizationContext";
+import { useActivity } from "@/context/ActivityContext";
 import useAuth from "@/context/useAuth";
 import { getIntegrationWithGlanceableAction } from '@/lib/apiClient';
 
@@ -36,6 +37,11 @@ type GlanceableCatalogItem = {
   properties?: Record<string, any>;
 };
 
+function formatCalendarEventDate(value: string) {
+  const date = new Date(value);
+  return Number.isNaN(date.getTime()) ? value : date.toLocaleDateString([], { month: "short", day: "numeric" });
+}
+
 function getGlanceableGroupName(entry?: Partial<GlanceableCatalogItem> & Record<string, any>) {
   const rawLabel = entry?.integrationDisplayName ?? entry?.integrationName ?? entry?.appName ?? entry?.app;
   if (typeof rawLabel === "string" && rawLabel.trim()) {
@@ -79,6 +85,7 @@ export function EditGlanceablesView({
   hideAddGlanceable = false,
 }: EditGlanceablesViewProps) {
   const localization = useLocalization();
+  const { calendarEvents } = useActivity();
   const { withAuth, user } = useAuth();
   const editorTitle = titleOverride ?? (
     selectedClockPart === "clock"
@@ -109,7 +116,7 @@ export function EditGlanceablesView({
   );
 
   useEffect(() => {
-    if (!selectedClockType || ["date", "greeting", "local-timezone", "world-clock", "progress"].includes(selectedClockType)) {
+    if (!selectedClockType || ["date", "countdown", "greeting", "local-timezone", "world-clock", "progress"].includes(selectedClockType)) {
       setIntegrationInfo(null);
       return;
     }
@@ -319,6 +326,50 @@ export function EditGlanceablesView({
                 </div>
               )}
 
+              {selectedClockType === "countdown" && (
+                <div className="space-y-3">
+                  <div className="space-y-2">
+                    <p className="text-xs text-white/70">Calendar event</p>
+                    {calendarEvents.length > 0 && (
+                      <select
+                        aria-label="Select calendar event for countdown"
+                        value=""
+                        onChange={(event) => {
+                          const selected = calendarEvents.find((item) => item.id === event.target.value);
+                          if (selected) updateSelectedParams({
+                            date: selected.start.slice(0, 10),
+                            display_name: selected.title,
+                          });
+                        }}
+                        className="w-full rounded-md border border-white/15 bg-black/20 px-3 py-2 text-sm outline-none"
+                      >
+                        <option value="">Select an event from your calendars...</option>
+                        {calendarEvents.map((event) => (
+                          <option key={event.id} value={event.id}>
+                            {event.title} — {formatCalendarEventDate(event.start)}
+                          </option>
+                        ))}
+                      </select>
+                    )}
+                    <Input
+                      type="date"
+                      value={String(selectedParams.date ?? selectedProperties.date?.default ?? "").slice(0, 10)}
+                      onChange={(event) => updateSelectedParams({ date: event.target.value })}
+                      className="h-9 rounded-full border-white/20 bg-transparent px-3 text-sm"
+                    />
+                  </div>
+                  <div className="space-y-2">
+                    <p className="text-xs text-white/70">Event name</p>
+                    <Input
+                      value={String(selectedParams.display_name ?? selectedParams.displayName ?? "")}
+                      onChange={(event) => updateSelectedParams({ display_name: event.target.value })}
+                      placeholder="Event"
+                      className="h-9 rounded-full border-white/20 bg-transparent px-3 text-sm"
+                    />
+                  </div>
+                </div>
+              )}
+
               {selectedClockType === "progress" && (
                 <div className="space-y-2">
                   <p className="text-xs text-white/70">Period</p>
@@ -388,7 +439,7 @@ export function EditGlanceablesView({
                   </div>
                 ))}
 
-              {!["date", "weather"].includes(selectedClockType) && !integrationInfo?.environmentDefinitions && (
+              {!['date', 'countdown', 'weather'].includes(selectedClockType) && !integrationInfo?.environmentDefinitions && (
                 <p className="text-xs italic text-white/50">
                   No configurable properties for this glanceable.
                 </p>
diff --git a/apps/web/src/components/widgets/dashboard/GlanceableClock.tsx b/apps/web/src/components/widgets/dashboard/GlanceableClock.tsx
index 5e42d377..05787c68 100644
--- a/apps/web/src/components/widgets/dashboard/GlanceableClock.tsx
+++ b/apps/web/src/components/widgets/dashboard/GlanceableClock.tsx
@@ -31,6 +31,7 @@ const CAROUSEL_FADE_DURATION_MS = 250;
 type LocalizationFormatters = Pick<ReturnType<typeof useLocalization>, "formatTemperature" | "formatTime" | "formatDate">;
 const LOCAL_ONLY_GLANCEABLES = new Set([
   "date",
+  "countdown",
   "greeting",
   "local-timezone",
   "world-clock",
diff --git a/packages/assets/integrations/default.yaml b/packages/assets/integrations/default.yaml
index 5770f597..f2343f9b 100644
--- a/packages/assets/integrations/default.yaml
+++ b/packages/assets/integrations/default.yaml
@@ -60,11 +60,13 @@ configuration:
     - name: "Countdown"
       key: "countdown"
       template: "countdown"
-      category: "Clock"
+      category: "Calendar"
       data:
         input:
-          date: "2026-12-31"
-          display_name: "New Year"
+          date:
+            type: "date"
+            default: "2026-12-31"
+          display_name: ""
           date_format: "yyyy-MM-dd"
     - name: "Iframe"
       key: "iframe"
@@ -109,6 +111,19 @@ configuration:
               - value: "week"
                 label: "Week"
   glanceables:
+    - name: "Countdown"
+      key: "countdown"
+      icon: "solar:calendar-bold"
+      exampleProps:
+        date: ""
+        display_name: ""
+        date_format: "yyyy-MM-dd"
+      properties:
+        date:
+          type: "date"
+          default: ""
+        display_name: ""
+        date_format: "yyyy-MM-dd"
     - name: "Date"
       icon: none
       text: "${date.now}" 
diff --git a/packages/integrationskit/Glanceable.tsx b/packages/integrationskit/Glanceable.tsx
index 97aa6942..844442b7 100644
--- a/packages/integrationskit/Glanceable.tsx
+++ b/packages/integrationskit/Glanceable.tsx
@@ -238,6 +238,9 @@ function LegacyGlanceable({
     case "date":
       return <span className={`inline-flex items-center text-center ${className ?? ""}`}>{formatDate(new Date(), params?.format, formatters)}</span>;
 
+    case "countdown":
+      return <CountdownGlanceable params={params} className={className} />;
+
     case "greeting":
       return <GreetingGlanceable params={params} className={className} />;
 
@@ -259,6 +262,37 @@ function LegacyGlanceable({
   }
 }
 
+function CountdownGlanceable({
+  params,
+  className,
+}: {
+  params?: Record<string, any>;
+  className?: string;
+}) {
+  const target = typeof params?.date === "string" ? new Date(params.date) : null;
+  const [today, setToday] = useState(() => new Date());
+
+  useEffect(() => {
+    const interval = window.setInterval(() => setToday(new Date()), 60_000);
+    return () => window.clearInterval(interval);
+  }, []);
+
+  if (!target || Number.isNaN(target.getTime())) {
+    return <span className={className}>Select a date</span>;
+  }
+
+  const days = Math.round((new Date(target.getFullYear(), target.getMonth(), target.getDate()).getTime() -
+    new Date(today.getFullYear(), today.getMonth(), today.getDate()).getTime()) / 86_400_000);
+  const text = days === 0
+    ? "today"
+    : days > 0
+      ? `in ${days} day${days === 1 ? "" : "s"}`
+      : `${Math.abs(days)} day${days === -1 ? "" : "s"} since`;
+  const name = String(params?.display_name ?? params?.displayName ?? params?.label ?? "Event").trim() || "Event";
+
+  return <span className={`inline-flex items-center gap-1 text-center ${className ?? ""}`}><span>{name}</span><span className="opacity-75">{text}</span></span>;
+}
+
 function LegacyWorldClock({
   params,
   className,
diff --git a/packages/integrationskit/forms/WidgetPropertiesForm.tsx b/packages/integrationskit/forms/WidgetPropertiesForm.tsx
index 2e757763..1b64cba4 100644
--- a/packages/integrationskit/forms/WidgetPropertiesForm.tsx
+++ b/packages/integrationskit/forms/WidgetPropertiesForm.tsx
@@ -10,6 +10,13 @@ export type GlanceableOption = {
   properties?: Record<string, any>;
 };
 
+export type DateSuggestion = {
+  value: string;
+  label: string;
+  date: string;
+  displayName?: string;
+};
+
 export type WidgetPropertiesFormProps = {
   idPrefix?: string;
   schema?: Record<string, any>;
@@ -21,6 +28,8 @@ export type WidgetPropertiesFormProps = {
   glanceableOptions?: GlanceableOption[];
   glanceableSlotPositions?: readonly GlanceableSlotPosition[];
   onEditGlanceable?: (index: number) => void;
+  dateSuggestions?: DateSuggestion[];
+  onDateSuggestionSelect?: (key: string, suggestion: DateSuggestion) => void;
 };
 
 type SelectSchema = {
@@ -355,6 +364,8 @@ export default function WidgetPropertiesForm({
   glanceableOptions = [],
   glanceableSlotPositions = ["left", "right"],
   onEditGlanceable,
+  dateSuggestions = [],
+  onDateSuggestionSelect,
 }: WidgetPropertiesFormProps) {
   const keys = Array.from(new Set([...Object.keys(schema), ...Object.keys(value)]));
 
@@ -372,12 +383,19 @@ export default function WidgetPropertiesForm({
       {keys.map((key) => {
         const schemaValue = schema[key];
         const hasStoredValue = key in value;
-        const currentValue = hasStoredValue ? value[key] : schemaValue;
+        const currentValue = isRecord(schemaValue) && schemaValue.type === "date" && isRecord(value[key])
+          ? value[key].default ?? ""
+          : hasStoredValue
+            ? value[key]
+            : isRecord(schemaValue) && schemaValue.type === "date"
+              ? schemaValue.default ?? ""
+              : schemaValue;
         const selectSchema = isSelectSchema(schemaValue) ? schemaValue : null;
+        const isDateSchema = isRecord(schemaValue) && schemaValue.type === "date";
         const inputId = `${idPrefix}-${key}`;
         const selectOptions = selectSchema ? getSelectOptions(selectSchema) : [];
         const isGlanceablesField = key === "glanceables";
-        const type = isGlanceablesField ? "glanceables" : selectSchema ? "select" : getValueType(schemaValue ?? currentValue);
+        const type = isGlanceablesField ? "glanceables" : selectSchema ? "select" : isDateSchema ? "date" : getValueType(schemaValue ?? currentValue);
         const selectValue = hasStoredValue && value[key] != null && value[key] !== ""
           ? String(value[key])
           : ""
@@ -431,6 +449,32 @@ export default function WidgetPropertiesForm({
                 onChange={(event: ChangeEvent<HTMLInputElement>) => updateValue(key, event.target.value === "" ? null : Number(event.target.value))}
                 className="w-full rounded-md border border-white/15 bg-black/20 px-3 py-2 text-sm outline-none"
               />
+            ) : type === "date" ? (
+              <div className="space-y-2">
+                {dateSuggestions.length > 0 && (
+                  <select
+                    aria-label={`Select calendar event for ${key}`}
+                    value=""
+                    onChange={(event) => {
+                      const suggestion = dateSuggestions.find((item) => item.value === event.target.value);
+                      if (suggestion) onDateSuggestionSelect?.(key, suggestion);
+                    }}
+                    className="w-full rounded-md border border-white/15 bg-black/20 px-3 py-2 text-sm outline-none"
+                  >
+                    <option value="">Select an event from your calendars...</option>
+                    {dateSuggestions.map((suggestion) => (
+                      <option key={suggestion.value} value={suggestion.value}>{suggestion.label}</option>
+                    ))}
+                  </select>
+                )}
+                <input
+                  id={inputId}
+                  type="date"
+                  value={currentValue == null ? "" : String(currentValue).slice(0, 10)}
+                  onChange={(event: ChangeEvent<HTMLInputElement>) => updateValue(key, event.target.value)}
+                  className="w-full rounded-md border border-white/15 bg-black/20 px-3 py-2 text-sm outline-none"
+                />
+              </div>
             ) : type === "string" ? (
               <input
                 id={inputId}
diff --git a/packages/integrationskit/static-widgets/CountdownWidget.tsx b/packages/integrationskit/static-widgets/CountdownWidget.tsx
index 9718cd38..f31db124 100644
--- a/packages/integrationskit/static-widgets/CountdownWidget.tsx
+++ b/packages/integrationskit/static-widgets/CountdownWidget.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import React from "react";
+import React, { useEffect, useState } from "react";
 import {
   differenceInCalendarDays,
   format,
@@ -14,7 +14,7 @@ import type { ResolvedWidget } from "../types";
 
 interface CountdownWidgetProps {
   className?: string;
-  date?: string;
+  date?: string | { default?: string };
   display_name?: string;
   displayName?: string;
   date_format?: string;
@@ -33,11 +33,21 @@ export default function CountdownWidget({
   icon,
   title,
 }: CountdownWidgetProps) {
-  const inputDate = typeof date === "string" ? date.trim() : "";
+  const inputDate = typeof date === "string"
+    ? date.trim()
+    : date && typeof date === "object" && typeof date.default === "string"
+      ? date.default.trim()
+      : "";
   const parsedTargetDate = parseCountdownDate(inputDate, date_format ?? dateFormat);
+  const [today, setToday] = useState(() => new Date());
+
+  useEffect(() => {
+    const interval = window.setInterval(() => setToday(new Date()), 60_000);
+    return () => window.clearInterval(interval);
+  }, []);
 
   const daysLeft = parsedTargetDate
-    ? differenceInCalendarDays(startOfDay(parsedTargetDate), startOfDay(new Date()))
+    ? differenceInCalendarDays(startOfDay(parsedTargetDate), startOfDay(today))
     : null;
 
   const eventName = (display_name ?? displayName ?? title ?? "Event").trim() || "Event";
@@ -53,7 +63,7 @@ export default function CountdownWidget({
           ? "1 day left"
           : daysLeft > 1
             ? `${daysLeft} days left`
-            : `${Math.abs(daysLeft)} days overdue`;
+            : `${Math.abs(daysLeft)} days since`;
 
   const resolved: ResolvedWidget = {
     header: {

From 76f93d4a7bf774f28306f5c5383c8fdb895f0fc9 Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Fri, 4 Sep 2026 18:04:30 +0200
Subject: [PATCH 05/11] dev: add config flag to disable news indexing

---
 docs/Configuration.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/Configuration.md b/docs/Configuration.md
index 4e8731a5..b65ce4a4 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -13,11 +13,12 @@ You can use the following environment variables for the all-in-one container; th
 | PORT | No | `3000` | HTTP port for the backend server |
 | ENVIRONMENT | No | `production` | Set to `dev` for development-only behavior |
 
-### Development-only Cache
+### Development-only Settings
 
 | Name | Required | Default Value | Description |
 | --- | --- | --- | --- |
 | USE_LOCAL_FEED_CACHE | No | `false` | Use process-local feed variables instead of Redis. Only honored when `ENVIRONMENT=dev`; not recommended for production because cache is lost on restart and is not shared between processes. |
+| DEV_DISABLE_NEWS_INDEXING | No | `false` | Disable news feed indexing during development. Only honored when `ENVIRONMENT=dev`; this skips startup and scheduled indexing as well as any on-demand rebuilds. |
 
 ### Authentication
 

From 965ef3567fada099c10fda3d5c229a3a8dfbc643 Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Mon, 7 Sep 2026 13:57:52 +0200
Subject: [PATCH 06/11] feat(links): display 'add link to folder' icon button,
 feat(links): edit links, feat(links): add tags from add links modal

---
 apps/backend/src/lib/data/links.ts            |  18 ++-
 .../apps/links/lists/[listId]/page.tsx        |  53 ++++++++-
 .../links/CreateLinksItemDialog.tsx           | 112 +++++++++++++-----
 .../src/components/links/LinksDetailView.tsx  |  85 +++++++------
 apps/web/src/lib/apiClient.ts                 |   4 +-
 5 files changed, 197 insertions(+), 75 deletions(-)

diff --git a/apps/backend/src/lib/data/links.ts b/apps/backend/src/lib/data/links.ts
index 0eebc05b..9a6ccf33 100644
--- a/apps/backend/src/lib/data/links.ts
+++ b/apps/backend/src/lib/data/links.ts
@@ -786,7 +786,9 @@ export async function updateHomeLinkItem(
         iconUrl?: string;
         description?: string;
         linkGroup?: string;
+        collection?: string;
         folder?: string;
+        tags?: string[];
         statusCheck?: boolean;
         secondaryUrls?: SecondaryUrl[];
     },
@@ -795,7 +797,7 @@ export async function updateHomeLinkItem(
 
     const item = await pb.collection("linkItems").getOne(linkId);
     const list = await pb.collection("linksLists").getOne(item.collection);
-    if (list.user !== userId || list.type !== "home") {
+    if (list.user !== userId) {
         throw new ApiActionError("Unauthorized", 401, { error: "Unauthorized" });
     }
 
@@ -804,9 +806,15 @@ export async function updateHomeLinkItem(
     if (data.title !== undefined) updateData.title = data.title;
     if (data.iconUrl !== undefined) updateData.iconUrl = data.iconUrl;
     if (data.description !== undefined) updateData.description = data.description;
+    if (data.tags !== undefined) updateData.tags = data.tags;
+    if (list.type !== "home" && data.collection !== undefined && data.collection !== item.collection) {
+        const targetList = await pb.collection("linksLists").getOne(data.collection);
+        if (targetList.user !== userId) throw new ApiActionError("Unauthorized", 401, { error: "Unauthorized" });
+        updateData.collection = data.collection;
+    }
     if (data.secondaryUrls !== undefined) updateData.secondaryUrls = normalizeSecondaryUrls(data.secondaryUrls);
 
-    if (data.linkGroup !== undefined || data.folder !== undefined) {
+    if (list.type === "home" && (data.linkGroup !== undefined || data.folder !== undefined)) {
         const homeListId = await getHomeListId(userId);
         let folderId: string | undefined;
         const groupName = String(data.linkGroup || "").trim();
@@ -832,8 +840,12 @@ export async function updateHomeLinkItem(
         updateData.folder = folderId ?? "";
     }
 
+    if (list.type !== "home" && data.folder !== undefined) updateData.folder = data.folder ?? "";
+
     await pb.collection("linkItems").update(linkId, updateData);
-    await syncHomeLinkMonitor(userId, linkId, String(updateData.url ?? item.url ?? ""), data.statusCheck);
+    if (list.type === "home") {
+        await syncHomeLinkMonitor(userId, linkId, String(updateData.url ?? item.url ?? ""), data.statusCheck);
+    }
 }
 
 export async function reorderLinks(
diff --git a/apps/web/src/app/(authenticated)/apps/links/lists/[listId]/page.tsx b/apps/web/src/app/(authenticated)/apps/links/lists/[listId]/page.tsx
index af43d523..b3648b67 100644
--- a/apps/web/src/app/(authenticated)/apps/links/lists/[listId]/page.tsx
+++ b/apps/web/src/app/(authenticated)/apps/links/lists/[listId]/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { useParams } from "react-router-dom";
-import { useMemo, useState } from "react";
+import { useParams, useSearchParams } from "react-router-dom";
+import { useEffect, useMemo, useState } from "react";
 import useAuth from "@/context/useAuth";
 import { getLinksCollectionsAction, getLinksFoldersAction, getLinksItemsAction, getLinksTagsAction } from '@/lib/apiClient';
 import LinksDetailView, { type LinkFolderRecord, type LinkItemRecord, type LinkTagRecord } from "@/components/links/LinksDetailView";
@@ -20,6 +20,7 @@ type LinkCollection = {
 
 export default function LinksListDetailPage() {
     const { listId = "" } = useParams();
+    const [searchParams, setSearchParams] = useSearchParams();
     const { token } = useAuth();
     const queryClient = useQueryClient();
     const collectionsQuery = useApiQuery(queryKeys.links.collections, getLinksCollectionsAction);
@@ -31,6 +32,23 @@ export default function LinksListDetailPage() {
     const items = (itemsQuery.data ?? []) as LinkItemRecord[];
     const tags = (tagsQuery.data ?? []) as LinkTagRecord[];
     const [createLinkOpen, setCreateLinkOpen] = useState(false);
+    const [linkToEdit, setLinkToEdit] = useState<LinkItemRecord | null>(null);
+    const [defaultFolderId, setDefaultFolderId] = useState<string | undefined>();
+    const [focusTags, setFocusTags] = useState(false);
+
+    useEffect(() => {
+        if (searchParams.get("add") !== "1") return;
+
+        setLinkToEdit(null);
+        setDefaultFolderId(undefined);
+        setFocusTags(false);
+        setCreateLinkOpen(true);
+        setSearchParams((current) => {
+            const next = new URLSearchParams(current);
+            next.delete("add");
+            return next;
+        }, { replace: true });
+    }, [searchParams, setSearchParams]);
 
     const list = useMemo(
         () => collections.find((collection) => collection.id === listId) ?? null,
@@ -65,7 +83,24 @@ export default function LinksListDetailPage() {
                 folders={folders}
                 items={items}
                 tags={tags}
-                onAddLink={() => setCreateLinkOpen(true)}
+                onAddLink={(folderId) => {
+                    setLinkToEdit(null);
+                    setDefaultFolderId(folderId);
+                    setFocusTags(false);
+                    setCreateLinkOpen(true);
+                }}
+                onEditLink={(item) => {
+                    setDefaultFolderId(undefined);
+                    setLinkToEdit(item);
+                    setFocusTags(false);
+                    setCreateLinkOpen(true);
+                }}
+                onEditLinkTags={(item) => {
+                    setDefaultFolderId(undefined);
+                    setLinkToEdit(item);
+                    setFocusTags(true);
+                    setCreateLinkOpen(true);
+                }}
                 onFolderCreated={(folder) => {
                     queryClient.setQueryData<LinkFolderRecord[]>(["api", token, ...queryKeys.links.folders(listId)], (current = []) => [folder, ...current.filter((existing) => existing.id !== folder.id)]);
                 }}
@@ -73,8 +108,18 @@ export default function LinksListDetailPage() {
 
             <CreateLinksItemDialog
                 open={createLinkOpen}
-                onOpenChange={setCreateLinkOpen}
+                onOpenChange={(open) => {
+                    setCreateLinkOpen(open);
+                    if (!open) {
+                        setLinkToEdit(null);
+                        setDefaultFolderId(undefined);
+                        setFocusTags(false);
+                    }
+                }}
                 defaultCollectionId={listId}
+                defaultFolderId={defaultFolderId}
+                editItem={linkToEdit}
+                focusTags={focusTags}
                 onCreated={(link) => {
                     if (link.collection !== listId) return;
 
diff --git a/apps/web/src/components/links/CreateLinksItemDialog.tsx b/apps/web/src/components/links/CreateLinksItemDialog.tsx
index 37226917..d25bdb9a 100644
--- a/apps/web/src/components/links/CreateLinksItemDialog.tsx
+++ b/apps/web/src/components/links/CreateLinksItemDialog.tsx
@@ -4,7 +4,9 @@ import { useEffect, useMemo, useRef, useState } from "react";
 import AppIcon from "@dashwise/app-icon";
 import {
   createLinkItemAction,
+  createLinksTagAction,
   createLinksFolderAction,
+  updateHomeLinkItemAction,
   getLinksCollectionsAction,
   getLinksFoldersAction,
   getLinksMetadataAction,
@@ -71,6 +73,8 @@ type CreatedLinkItem = {
   id: string;
   title: string;
   url: string;
+  iconUrl?: string;
+  description?: string;
   collection: string;
   folder?: string;
   created: string;
@@ -82,9 +86,12 @@ type Props = {
   open: boolean;
   onOpenChange: (open: boolean) => void;
   defaultCollectionId?: string;
+  defaultFolderId?: string;
   defaultTagIds?: string[];
+  editItem?: Partial<CreatedLinkItem> & { id: string } | null;
   onCreated?: (item: CreatedLinkItem) => void;
   onFolderCreated?: (folder: FolderRecord) => void;
+  focusTags?: boolean;
 };
 
 function IconPickerButton({
@@ -275,18 +282,31 @@ function TagMultiSelect({
   selectedTagIds,
   onChange,
   disabled,
+  onCreateTag,
+  autoFocus,
 }: {
   tags: TagRecord[];
   selectedTagIds: string[];
   onChange: (ids: string[]) => void;
+  onCreateTag: (name: string) => void;
   disabled?: boolean;
+  autoFocus?: boolean;
 }) {
   const [open, setOpen] = useState(false);
+  const triggerRef = useRef<HTMLButtonElement>(null);
+  const [search, setSearch] = useState("");
   const selectedTags = useMemo(
     () => selectedTagIds.map((id) => tags.find((tag) => tag.id === id)).filter((tag): tag is TagRecord => Boolean(tag)),
     [selectedTagIds, tags],
   );
 
+  useEffect(() => {
+    if (!autoFocus) return;
+
+    const frame = requestAnimationFrame(() => triggerRef.current?.focus());
+    return () => cancelAnimationFrame(frame);
+  }, [autoFocus]);
+
   const toggleTag = (tagId: string) => {
     onChange(
       selectedTagIds.includes(tagId)
@@ -300,6 +320,7 @@ function TagMultiSelect({
       <PopoverTrigger asChild>
         <Button
           type="button"
+          ref={triggerRef}
           variant="outline"
           role="combobox"
           aria-expanded={open}
@@ -327,9 +348,23 @@ function TagMultiSelect({
       </PopoverTrigger>
       <PopoverContent className="frosted text-foreground w-[min(32rem,calc(100vw-2rem))] p-0">
         <Command className="text-foreground">
-          <CommandInput placeholder="Search tags..." className="h-9" />
+          <CommandInput placeholder="Search tags..." className="h-9" value={search} onValueChange={setSearch} />
           <CommandList>
-            <CommandEmpty>No tags found.</CommandEmpty>
+            <CommandEmpty>
+              <button
+                type="button"
+                className="flex w-full items-center gap-2 px-2 py-2 text-left text-sm text-white/75 hover:bg-white/10 hover:text-white"
+                onClick={() => {
+                  const name = search.trim();
+                  if (!name) return;
+                  onCreateTag(name);
+                  setSearch("");
+                  setOpen(false);
+                }}
+              >
+                <span className="text-base">+</span> Add tag
+              </button>
+            </CommandEmpty>
             <CommandGroup className="text-foreground">
               {tags.map((tag) => (
                 <CommandItem key={tag.id} value={tag.name} onSelect={() => toggleTag(tag.id)}>
@@ -352,9 +387,12 @@ export default function CreateLinksItemDialog({
   open,
   onOpenChange,
   defaultCollectionId,
+defaultFolderId,
   defaultTagIds = [],
+  editItem,
   onCreated,
   onFolderCreated,
+  focusTags = false,
 }: Props) {
   const { withAuth } = useAuth();
   const [title, setTitle] = useState("");
@@ -380,6 +418,10 @@ export default function CreateLinksItemDialog({
   const autoMetadataRef = useRef({ title: "", iconUrl: "", description: "" });
 
   const defaultTagKey = defaultTagIds.join("|");
+  const defaultTagIdsForEffect = useMemo(
+    () => defaultTagKey ? defaultTagKey.split("|") : [],
+    [defaultTagKey],
+  );
 
   useEffect(() => {
     if (!open) {
@@ -410,15 +452,20 @@ export default function CreateLinksItemDialog({
     initializedTargetRef.current = false;
     metadataRequestRef.current += 1;
     autoMetadataRef.current = { title: "", iconUrl: "", description: "" };
-    setTitle("");
-    setUrl("");
-    setIconUrl("");
-    setDescription("");
+    setTitle(editItem?.title ?? "");
+    setUrl(editItem?.url ?? "");
+    setIconUrl(editItem?.iconUrl ?? "");
+    setDescription(editItem?.description ?? "");
+    autoMetadataRef.current = editItem ? {
+      title: editItem.title ?? "",
+      iconUrl: editItem.iconUrl ?? "",
+      description: editItem.description ?? "",
+    } : { title: "", iconUrl: "", description: "" };
     setCollections([]);
     setFolders([]);
     setTags([]);
     setSelectedTargetKey("");
-    setSelectedTagIds(defaultTagIds);
+    setSelectedTagIds(editItem?.tags ?? defaultTagIdsForEffect);
     setActiveTab("link");
     setFolderName("");
     setFolderIconUrl("");
@@ -481,7 +528,7 @@ export default function CreateLinksItemDialog({
     return () => {
       mounted = false;
     };
-  }, [defaultTagKey, open, withAuth]);
+  }, [defaultTagIdsForEffect, defaultTagKey, editItem, open, withAuth]);
 
   useEffect(() => {
     if (!open) return;
@@ -528,7 +575,6 @@ export default function CreateLinksItemDialog({
 
   const targetGroups = useMemo(() => buildTargetGroups(collections, folders), [collections, folders]);
   const allTargetOptions = useMemo(() => targetGroups.flatMap((group) => group.options), [targetGroups]);
-  const tagsById = useMemo(() => new Map(tags.map((tag) => [tag.id, tag])), [tags]);
   const selectedTarget = useMemo(
     () => allTargetOptions.find((option) => option.key === selectedTargetKey) ?? null,
     [allTargetOptions, selectedTargetKey],
@@ -537,39 +583,43 @@ export default function CreateLinksItemDialog({
   useEffect(() => {
     if (!open || initializedTargetRef.current || allTargetOptions.length === 0) return;
 
-    const preferredTarget = defaultCollectionId
-      ? allTargetOptions.find((option) => option.collectionId === defaultCollectionId && !option.folderId)
-        ?? allTargetOptions.find((option) => option.collectionId === defaultCollectionId)
-      : allTargetOptions[0];
+    const preferredTarget = editItem?.folder
+      ? allTargetOptions.find((option) => option.key === `folder:${editItem.folder}`)
+      : defaultFolderId
+        ? allTargetOptions.find((option) => option.key === `folder:${defaultFolderId}`)
+        : defaultCollectionId
+          ? allTargetOptions.find((option) => option.collectionId === defaultCollectionId && !option.folderId)
+            ?? allTargetOptions.find((option) => option.collectionId === defaultCollectionId)
+          : allTargetOptions[0];
 
     if (preferredTarget) {
       setSelectedTargetKey(preferredTarget.key);
       initializedTargetRef.current = true;
     }
-  }, [allTargetOptions, defaultCollectionId, open]);
+  }, [allTargetOptions, defaultCollectionId, defaultFolderId, editItem, open]);
 
   const handleSave = async () => {
     if (!title.trim() || !url.trim() || !selectedTarget) return;
 
-    const saved = await withAuth((auth) => createLinkItemAction(auth, {
+    const payload = {
       title: title.trim(),
       url: url.trim(),
       iconUrl: iconUrl.trim() || undefined,
       description: description.trim() || undefined,
       collection: selectedTarget.collectionId,
-      folder: selectedTarget.folderId,
+      folder: selectedTarget.folderId ?? "",
       tags: selectedTagIds.length > 0 ? selectedTagIds : undefined,
-    }));
-
-    const createdItem = {
-      ...(saved as CreatedLinkItem),
-      tags: selectedTagIds,
     };
+    const saved = editItem?.id
+      ? await withAuth((auth) => updateHomeLinkItemAction(auth, editItem.id, payload))
+      : await withAuth((auth) => createLinkItemAction(auth, payload));
+
+    const createdItem = { ...(editItem ?? {}), ...(saved as CreatedLinkItem), ...payload, tags: selectedTagIds } as CreatedLinkItem;
 
     setAlert({
       open: true,
-      title: "Link created",
-      description: `Created link "${title.trim()}".`,
+      title: editItem ? "Link updated" : "Link created",
+      description: `${editItem ? "Updated" : "Created"} link "${title.trim()}"`,
       variant: "success",
     });
 
@@ -600,7 +650,7 @@ export default function CreateLinksItemDialog({
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent className="frosted text-foreground max-w-3xl">
         <DialogHeader>
-          <DialogTitle>Add to list</DialogTitle>
+          <DialogTitle>{editItem ? "Edit link" : "Add to list"}</DialogTitle>
         </DialogHeader>
 
         {alert.open && (
@@ -623,7 +673,7 @@ export default function CreateLinksItemDialog({
         )}
 
         <Tabs value={activeTab} onValueChange={(value) => setActiveTab(value as "link" | "folder")} className="space-y-5">
-          <TabsList className="grid w-full grid-cols-2">
+          {!editItem ? <TabsList className="grid w-full grid-cols-2">
             <TabsTrigger value="link" className="gap-2">
               <Link2 />
               Add link
@@ -632,7 +682,7 @@ export default function CreateLinksItemDialog({
               <FolderPlus />
               Add folder
             </TabsTrigger>
-          </TabsList>
+          </TabsList> : null}
 
           <form
             className="space-y-5"
@@ -722,7 +772,15 @@ export default function CreateLinksItemDialog({
                 tags={tags}
                 selectedTagIds={selectedTagIds}
                 onChange={setSelectedTagIds}
-                disabled={loadingData || tags.length === 0}
+                autoFocus={focusTags}
+                onCreateTag={(name) => {
+                  void withAuth((auth) => createLinksTagAction(auth, { name })).then((created) => {
+                    const tag = created as TagRecord;
+                    setTags((current) => [...current.filter((entry) => entry.id !== tag.id), tag]);
+                    setSelectedTagIds((current) => [...current, tag.id]);
+                  });
+                }}
+                disabled={loadingData}
               />
             </div>
 
diff --git a/apps/web/src/components/links/LinksDetailView.tsx b/apps/web/src/components/links/LinksDetailView.tsx
index d11af2ac..135fd9d2 100644
--- a/apps/web/src/components/links/LinksDetailView.tsx
+++ b/apps/web/src/components/links/LinksDetailView.tsx
@@ -60,7 +60,9 @@ export interface LinksDetailViewProps {
     folders: LinkFolderRecord[];
     items: LinkItemRecord[];
     tags: LinkTagRecord[];
-    onAddLink?: () => void;
+    onAddLink?: (folderId?: string) => void;
+    onEditLink?: (item: LinkItemRecord) => void;
+    onEditLinkTags?: (item: LinkItemRecord) => void;
     onFolderCreated?: (folder: LinkFolderRecord) => void;
 }
 
@@ -79,9 +81,6 @@ function normalizeTagIds(value: unknown): string[] {
         .filter(Boolean);
 }
 
-function hasAnyTag(value: unknown, tagId: string) {
-    return normalizeTagIds(value).includes(tagId);
-}
 
 function formatClock(date: Date) {
     return date
@@ -193,7 +192,7 @@ function TagBadges({
     );
 }
 
-function LinkActions({ item, onShare }: { item: LinkItemRecord; onShare: () => void }) {
+function LinkActions({ item, onShare, onEdit, onEditTags }: { item: LinkItemRecord; onShare: () => void; onEdit?: (item: LinkItemRecord) => void; onEditTags?: (item: LinkItemRecord) => void }) {
     const linkUrl = String(item.url ?? "").trim();
 
     return (
@@ -225,6 +224,7 @@ function LinkActions({ item, onShare }: { item: LinkItemRecord; onShare: () => v
                 className="inline-flex h-8 w-8 items-center justify-center rounded-full border border-white/10 bg-black/15 text-white/65 transition-colors hover:bg-white/10 hover:text-white"
                 aria-label={`Edit tags for ${item.title}`}
                 title="Tag"
+                onClick={() => onEditTags?.(item)}
             >
                 <Icon icon="fa6-solid:tag" className="text-[11px]" />
             </button>
@@ -234,6 +234,7 @@ function LinkActions({ item, onShare }: { item: LinkItemRecord; onShare: () => v
                 className="inline-flex h-8 w-8 items-center justify-center rounded-full border border-white/10 bg-black/15 text-white/65 transition-colors hover:bg-white/10 hover:text-white"
                 aria-label={`Edit ${item.title}`}
                 title="Edit"
+                onClick={() => onEdit?.(item)}
             >
                 <Icon icon="fa6-solid:pen" className="text-[11px]" />
             </button>
@@ -275,11 +276,15 @@ function LinkRow({
     tagsById,
     compact = false,
     onShare,
+    onEdit,
+    onEditTags,
 }: {
     item: LinkItemRecord;
     tagsById: Map<string, LinkTagRecord>;
     compact?: boolean;
     onShare: (item: LinkItemRecord) => void;
+    onEdit?: (item: LinkItemRecord) => void;
+    onEditTags?: (item: LinkItemRecord) => void;
 }) {
     const linkUrl = String(item.url ?? "").trim();
     const titleElement = linkUrl ? (
@@ -331,7 +336,7 @@ function LinkRow({
                         ) : null}
                     </div>
 
-                    <LinkActions item={item} onShare={() => onShare(item)} />
+                    <LinkActions item={item} onShare={() => onShare(item)} onEdit={onEdit} onEditTags={onEditTags} />
                 </div>
             </div>
         </div>
@@ -391,6 +396,8 @@ function FolderTreeNode({
     collapsedFolders,
     setCollapsedFolders,
     onShare,
+    onEdit,
+    onEditTags,
     onCreateFolder,
 }: {
     node: FolderNode;
@@ -398,6 +405,8 @@ function FolderTreeNode({
     collapsedFolders: Record<string, boolean>;
     setCollapsedFolders: Dispatch<SetStateAction<Record<string, boolean>>>;
     onShare: (item: LinkItemRecord) => void;
+    onEdit?: (item: LinkItemRecord) => void;
+    onEditTags?: (item: LinkItemRecord) => void;
     onCreateFolder?: (parentFolderId: string) => void;
 }) {
     const isCollapsed = collapsedFolders[node.folder.id] ?? false;
@@ -448,9 +457,9 @@ function FolderTreeNode({
                     <button
                         type="button"
                         onClick={() => onCreateFolder(node.folder.id)}
-                        className="ml-auto opacity-0 transition-opacity hover:opacity-100 focus:opacity-100 rounded-full border border-white/10 bg-white/5 p-2 text-white/70 hover:bg-white/10"
-                        aria-label={`Create folder under ${node.folder.name}`}
-                        title="Create subfolder"
+                        className="ml-auto inline-flex h-7 w-7 items-center justify-center rounded-full border border-white/10 bg-transparent p-0 text-white/70 opacity-0 transition-opacity hover:bg-white/10 focus:opacity-100 group-hover:opacity-100"
+                        aria-label={`Add link to ${node.folder.name}`}
+                        title="Add link to folder"
                     >
                         <Icon icon="fa6-solid:plus" className="text-[11px]" />
                     </button>
@@ -467,6 +476,8 @@ function FolderTreeNode({
                             collapsedFolders={collapsedFolders}
                             setCollapsedFolders={setCollapsedFolders}
                             onShare={onShare}
+                            onEdit={onEdit}
+                            onEditTags={onEditTags}
                             onCreateFolder={onCreateFolder}
                         />
                     ))}
@@ -478,6 +489,8 @@ function FolderTreeNode({
                             tagsById={tagsById}
                             compact
                             onShare={onShare}
+                            onEdit={onEdit}
+                            onEditTags={onEditTags}
                         />
                     ))}
                 </div>
@@ -494,6 +507,8 @@ export default function LinksDetailView({
     items,
     tags,
     onAddLink,
+    onEditLink,
+    onEditLinkTags,
     onFolderCreated,
 }: LinksDetailViewProps) {
     const [sortField, setSortField] = useState<LinkSortField>("created");
@@ -610,28 +625,12 @@ export default function LinksDetailView({
                 </div>
             </header>
 
-            <section className="space-y-1 pt-3">
-                <div className="flex items-center justify-between">
-                    <h2 className="text-lg font-medium text-white/90">Folders</h2>
-                    <button
-                        type="button"
-                        onClick={() => {
-                            setCreateFolderParentId(null);
-                            setCreateFolderOpen(true);
-                        }}
-                        className="inline-flex h-10 w-10 items-center justify-center rounded-full border border-white/10 bg-white/5 text-white transition-colors hover:bg-white/10"
-                        aria-label="Create folder"
-                        title="Create folder"
-                    >
-                        <Icon icon="fa6-solid:plus" className="text-sm" />
-                    </button>
-                </div>
-
-                {roots.length === 0 && rootItems.length === 0 ? (
-                    <div className="frosted rounded-2xl border border-white/10 p-5 text-sm text-white/55">
-                        No folders found.
+            {roots.length > 0 ? (
+                <section className="space-y-1 pt-3">
+                    <div className="flex items-center justify-between">
+                        <h2 className="text-lg font-medium text-white/90">Folders</h2>
                     </div>
-                ) : (
+
                     <div className="space-y-1">
                         {roots.map((node) => (
                             <FolderTreeNode
@@ -641,15 +640,14 @@ export default function LinksDetailView({
                                 collapsedFolders={collapsedFolders}
                                 setCollapsedFolders={setCollapsedFolders}
                                 onShare={(item) => setShareItem(item)}
-                                onCreateFolder={(parentFolderId) => {
-                                    setCreateFolderParentId(parentFolderId);
-                                    setCreateFolderOpen(true);
-                                }}
+                                onEdit={onEditLink}
+                                onEditTags={onEditLinkTags}
+                                onCreateFolder={(parentFolderId) => onAddLink?.(parentFolderId)}
                             />
                         ))}
                     </div>
-                )}
-            </section>
+                </section>
+            ) : null}
 
             <section className="space-y-1">
                 <div className="flex flex-wrap items-center justify-between">
@@ -684,8 +682,15 @@ export default function LinksDetailView({
                 </div>
 
                 {sortedLinks.length === 0 ? (
-                    <div className="frosted rounded-2xl border border-white/10 p-5 text-sm text-white/55">
-                        No links found.
+                    <div className="flex justify-center py-16 text-sm text-white/55">
+                        <span>
+                            <a
+                                href={`/apps/links/lists/${listId}?add=1`}
+                                className="text-white/65 underline decoration-white/25 underline-offset-4 transition-colors hover:text-white hover:decoration-white/60"
+                            >
+                                Add a link
+                            </a>{" "}to get started
+                        </span>
                     </div>
                 ) : (
                     <div className="space-y-3">
@@ -695,6 +700,8 @@ export default function LinksDetailView({
                                 item={item}
                                 tagsById={tagsById}
                                 onShare={(nextItem) => setShareItem(nextItem)}
+                                onEdit={onEditLink}
+                                onEditTags={onEditLinkTags}
                             />
                         ))}
                     </div>
@@ -704,7 +711,7 @@ export default function LinksDetailView({
             {onAddLink ? (
                 <button
                     type="button"
-                    onClick={onAddLink}
+                    onClick={() => onAddLink()}
                     className="fixed bottom-6 right-6 z-30 inline-flex h-14 w-14 items-center justify-center rounded-full border border-white/15 bg-white/10 text-white shadow-2xl backdrop-blur-md transition-transform duration-150 hover:scale-105 hover:bg-white/15 hover:text-primary"
                     aria-label="Add link"
                     title="Add link"
diff --git a/apps/web/src/lib/apiClient.ts b/apps/web/src/lib/apiClient.ts
index 27598ae5..fb8d74a2 100644
--- a/apps/web/src/lib/apiClient.ts
+++ b/apps/web/src/lib/apiClient.ts
@@ -336,11 +336,11 @@ export async function getLinksTagsAction(auth: ActionAuth) {
   return extractData(await getLinksTags({ headers: authHeaders(auth) }));
 }
 
-export async function createLinkItemAction(auth: ActionAuth, data: { url: string; title: string; iconUrl?: string; description?: string; linkGroup?: string; folder?: string; collection?: string; tags?: string[] }) {
+export async function createLinkItemAction(auth: ActionAuth, data: { url: string; title: string; iconUrl?: string; description?: string; linkGroup?: string; folder?: string; collection?: string; tags?: string[]; secondaryUrls?: { name: string; url: string; routingRule: string }[] }) {
   return extractData(await postLinksItems({ body: data, headers: authHeaders(auth) }));
 }
 
-export async function updateHomeLinkItemAction(auth: ActionAuth, linkId: string, data: { url?: string; title?: string; iconUrl?: string; description?: string; linkGroup?: string; folder?: string }) {
+export async function updateHomeLinkItemAction(auth: ActionAuth, linkId: string, data: { url?: string; title?: string; iconUrl?: string; description?: string; linkGroup?: string; collection?: string; folder?: string; tags?: string[]; secondaryUrls?: { name: string; url: string; routingRule: string }[] }) {
   return extractData(await putLinksItemsByLinkId({ path: { linkId }, body: data, headers: authHeaders(auth) }));
 }
 

From c7adcd1d31939da2f4232384078715797f49019f Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Mon, 7 Sep 2026 21:08:45 +0200
Subject: [PATCH 07/11] feat(shortcuts): render secondary actions

---
 apps/backend/src/jobs/shortcuts-indexer.ts    |  85 ++++++++--
 apps/backend/src/lib/data/shortcuts.ts        |  15 ++
 apps/backend/src/routes/shortcuts.route.ts    |  18 ++
 .../web/src/components/widgets/CommandBar.tsx | 158 +++++++++++++++++-
 apps/web/src/components/widgets/SearchBar.tsx |   3 +
 apps/web/src/lib/apiClient.ts                 |  14 ++
 packages/assets/defaults/shortcuts.json       |   3 +
 packages/integrationskit/Shortcuts.tsx        |  12 ++
 .../1785000005_shortcut_secondary_actions.js  |  31 ++++
 9 files changed, 316 insertions(+), 23 deletions(-)
 create mode 100644 pocketbase/migrations/1785000005_shortcut_secondary_actions.js

diff --git a/apps/backend/src/jobs/shortcuts-indexer.ts b/apps/backend/src/jobs/shortcuts-indexer.ts
index b28af1fe..458b03ff 100644
--- a/apps/backend/src/jobs/shortcuts-indexer.ts
+++ b/apps/backend/src/jobs/shortcuts-indexer.ts
@@ -9,8 +9,9 @@ type ShortcutRow = {
   name: string;
   icon: string;
   secondary: string;
-  action: string;
-  app: string;
+  	action: string;
+  	actions?: Record<string, string>;
+  	app: string;
   tags: string[];
   sourceId?: string;
   sourceUpdated?: string;
@@ -29,8 +30,10 @@ type ShortcutDefaultsRow = {
   icon?: unknown;
   secondary?: unknown;
   secondaryInfo?: unknown;
-  action?: unknown;
-  tags?: unknown;
+  	action?: unknown;
+  	actions?: unknown;
+  	secondaryActions?: unknown;
+  	tags?: unknown;
 };
 
 export async function runShortcutsIndexing() {
@@ -153,8 +156,9 @@ function buildDefaultShortcutRows(): ShortcutRow[] {
       name,
       icon: String(shortcut?.icon ?? "/icons/faGlobe.svg"),
       secondary: String(shortcut?.secondaryInfo ?? shortcut?.secondary ?? "Dashwise"),
-      action,
-      app: "",
+      		action,
+      		actions: normalizeActions(shortcut.actions ?? shortcut.secondaryActions),
+      		app: "",
       tags: [
         name,
         ...(Array.isArray(shortcut?.tags) ? shortcut.tags.map((tag: unknown) => String(tag)) : []),
@@ -194,6 +198,22 @@ function normalizeObject(raw: unknown): Record<string, any> {
   return {};
 }
 
+function normalizeActions(raw: unknown): Record<string, string> {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
+  return Object.fromEntries(
+    Object.entries(raw as Record<string, unknown>)
+      .filter(([label, value]) => label.trim() && typeof value === "string" && value.trim())
+      .map(([label, value]) => [label.trim(), String(value).trim()]),
+  );
+}
+
+function parseActions(raw: unknown): Record<string, string> {
+  if (typeof raw === "string") {
+    try { return normalizeActions(JSON.parse(raw)); } catch { return {}; }
+  }
+  return normalizeActions(raw);
+}
+
 function normalizeKey(value: string) {
   return String(value || "")
     .trim()
@@ -312,8 +332,9 @@ async function buildIntegrationShortcutRows(
     name: item.name,
     icon: item.icon || integrationIcon,
     secondary: item.secondaryInfo || integrationName,
-    action: serializeShortcutAction(item.action),
-    app: shortcutApp.id,
+    		action: serializeShortcutAction(item.action),
+    		actions: item.actions,
+    		app: shortcutApp.id,
     tags: item.tags,
     sourceId: integration.id,
     sourceUpdated: (integration as any).updated as string,
@@ -386,6 +407,7 @@ async function rebuildUserShortcuts(pb: any, userId: string, rows: ShortcutRow[]
     if (isLink) {
       const newRow = newRows[0];
       const existingRecord = existingRecords[0];
+      let preservedState: Record<string, unknown> = {};
 
       if (existingRecord) {
         // Keep the existing shortcut when its source has not changed.
@@ -393,11 +415,15 @@ async function rebuildUserShortcuts(pb: any, userId: string, rows: ShortcutRow[]
         const itemUpdated = new Date(existingRecord.updated).getTime();
 
         if (sourceUpdated <= itemUpdated) {
+          if (JSON.stringify(parseActions(existingRecord.secondaryActions)) !== JSON.stringify(newRow.actions ?? {})) {
+            await pb.collection("shortcuts").update(existingRecord.id, { secondaryActions: newRow.actions ?? {} });
+          }
           // Discard (keep existing)
           continue;
         }
         
-        // Replace
+        // Replace while preserving user-owned state.
+        preservedState = preserveShortcutState(existingRecord, newRow.app);
         await pb.collection("shortcuts").delete(existingRecord.id).catch(() => {});
       }
 
@@ -406,11 +432,13 @@ async function rebuildUserShortcuts(pb: any, userId: string, rows: ShortcutRow[]
         name: newRow.name,
         icon: newRow.icon,
         secondary: newRow.secondary,
-        action: newRow.action,
-        app: newRow.app || null,
+        			action: newRow.action,
+        			secondaryActions: newRow.actions ?? {},
+        			app: newRow.app || null,
         tags: JSON.stringify(newRow.tags ?? []),
         sourceId: sid,
         sourceUpdated: newRow.sourceUpdated,
+        ...preservedState,
       });
     } else {
       // Integration logic: "regenerate every time and check whether the output differs"
@@ -428,8 +456,9 @@ async function rebuildUserShortcuts(pb: any, userId: string, rows: ShortcutRow[]
           name: r.name,
           icon: r.icon,
           secondary: r.secondary,
-          action,
-          app: r.app,
+          			action,
+          			actions: parseActions(r.secondaryActions),
+          			app: r.app,
           tags: parseTags(r.tags),
         };
       }).sort((a, b) => a.action.localeCompare(b.action));
@@ -438,8 +467,9 @@ async function rebuildUserShortcuts(pb: any, userId: string, rows: ShortcutRow[]
         name: r.name,
         icon: r.icon,
         secondary: r.secondary,
-        action: r.action,
-        app: r.app,
+        			action: r.action,
+        			actions: r.actions,
+        			app: r.app,
         tags: r.tags,
       })).sort((a, b) => a.action.localeCompare(b.action));
 
@@ -450,25 +480,44 @@ async function rebuildUserShortcuts(pb: any, userId: string, rows: ShortcutRow[]
         continue;
       }
 
-      // Replace all for this source
+      // Replace all for this source, retaining user-owned state for matching rows.
+      const remainingRecords = [...existingRecords];
       for (const r of existingRecords) await pb.collection("shortcuts").delete(r.id).catch(() => {});
       for (const row of newRows) {
+        const matchingRecordIndex = remainingRecords.findIndex((record) =>
+          String(record.name ?? "") === row.name || String(record.action ?? "") === row.action,
+        );
+        const matchingRecord = matchingRecordIndex >= 0 ? remainingRecords.splice(matchingRecordIndex, 1)[0] : null;
+        const preservedState = matchingRecord
+          ? preserveShortcutState(matchingRecord, row.app)
+          : {};
         await pb.collection("shortcuts").create({
           user: userId,
           name: row.name,
           icon: row.icon,
           secondary: row.secondary,
-          action: row.action,
-          app: row.app || null,
+          			action: row.action,
+          			secondaryActions: row.actions ?? {},
+          			app: row.app || null,
           tags: JSON.stringify(row.tags ?? []),
           sourceId: sid,
           sourceUpdated: row.sourceUpdated,
+          ...preservedState,
         });
       }
     }
   }
 }
 
+function preserveShortcutState(record: Record<string, any>, generatedApp: string) {
+  const hasRootOverride = Boolean(generatedApp) && !record.app;
+  return {
+    isPinned: Boolean(record.isPinned),
+    isDisabled: Boolean(record.isDisabled),
+    ...(hasRootOverride ? { app: null } : {}),
+  };
+}
+
 function serializeShortcutAction(action: unknown): string {
   if (typeof action === "string") {
     return action.trim();
diff --git a/apps/backend/src/lib/data/shortcuts.ts b/apps/backend/src/lib/data/shortcuts.ts
index fcf67616..9d461ee7 100644
--- a/apps/backend/src/lib/data/shortcuts.ts
+++ b/apps/backend/src/lib/data/shortcuts.ts
@@ -35,6 +35,18 @@ export function escapeFilter(value: string) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
 
+export function parseActions(value: unknown): Record<string, string> {
+  if (typeof value === "string") {
+    try { value = JSON.parse(value); } catch { return {}; }
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  return Object.fromEntries(
+    Object.entries(value as Record<string, unknown>)
+      .filter(([label, action]) => label.trim() && typeof action === "string" && action.trim())
+      .map(([label, action]) => [label.trim(), String(action).trim()]),
+  );
+}
+
 export function parseTags(value: unknown): string[] {
   if (Array.isArray(value)) {
     return value
@@ -127,6 +139,7 @@ export async function getShortcuts(userId: string) {
     const actionString = typeof action === "string" ? action : "";
     return {
       id: record.id,
+      sourceId: String((record as any).sourceId ?? ""),
       parentId:
         typeof record.app === "string" && record.app.trim().length > 0
           ? record.app.trim()
@@ -136,8 +149,10 @@ export async function getShortcuts(userId: string) {
       secondaryInfo: String(record.secondary ?? ""),
       type: actionString.startsWith("app:") ? "app" : "link",
       action,
+      actions: parseActions((record as any).secondaryActions),
       tags: parseTags(record.tags),
       isPinned: Boolean(record.isPinned),
+      isDisabled: Boolean((record as any).isDisabled),
       usageStats: record.usageStats,
     };
   });
diff --git a/apps/backend/src/routes/shortcuts.route.ts b/apps/backend/src/routes/shortcuts.route.ts
index dbc511b9..512db166 100644
--- a/apps/backend/src/routes/shortcuts.route.ts
+++ b/apps/backend/src/routes/shortcuts.route.ts
@@ -35,6 +35,24 @@ shortcutsRoute
       return syncOnDemandShortcuts(userId, String(c.req.param("appId") ?? ""), body?.shortcuts);
     }),
   )
+  .patch(
+    "/api/v1/shortcuts/:id",
+    withJson(async (c) => {
+      const body = await readJsonBody<{ isPinned?: unknown; isDisabled?: unknown; app?: unknown }>(c);
+      const { userId } = await requireAuth({ token: readAuthToken(c) });
+      const pb = await getSuperuserPB();
+      const record = await pb.collection("shortcuts").getOne(String(c.req.param("id") ?? ""));
+      if (String(record.user ?? "") !== userId) {
+        throw new ApiActionError("Unauthorized", 403, { error: "Unauthorized" });
+      }
+      const updates: Record<string, unknown> = {};
+      if (typeof body?.isPinned === "boolean") updates.isPinned = body.isPinned;
+      if (typeof body?.isDisabled === "boolean") updates.isDisabled = body.isDisabled;
+      if (body?.app === null || typeof body?.app === "string") updates.app = body.app || null;
+      if (Object.keys(updates).length > 0) await pb.collection("shortcuts").update(record.id, updates);
+      return { success: true };
+    }),
+  )
   .post(
     "/api/v1/shortcuts/usageStats",
     withJson(async (c) => {
diff --git a/apps/web/src/components/widgets/CommandBar.tsx b/apps/web/src/components/widgets/CommandBar.tsx
index 0e4eb249..13172874 100644
--- a/apps/web/src/components/widgets/CommandBar.tsx
+++ b/apps/web/src/components/widgets/CommandBar.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import type { SyntheticEvent } from "react";
 
 import { Dialog, DialogClose, DialogContent } from "../ui/dialog";
+import { useQueryClient } from "@tanstack/react-query";
 import { usePageConfig } from "@/hooks/usePageConfig";
 import useAuth from "@/context/useAuth";
 import { Separator } from "../ui/separator";
@@ -12,7 +13,16 @@ import AppIcon from "@dashwise/app-icon";
 import QRCode from "qrcode";
 import { getFrequentlyUsedShortcutsAction, getHomeLinksAction, logShortcutUsageAction } from '@/lib/apiClient';
 import { getRoutedLinkUrl } from "@/lib/linkRouting";
-import { proxyIntegrationAction } from '@/lib/apiClient';
+import { proxyIntegrationAction, updateShortcutAction } from '@/lib/apiClient';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuTrigger,
+} from "../ui/dropdown-menu";
 
 // --- Types ---
 
@@ -33,6 +43,8 @@ type LinkItem = {
   engineSlug?: string;
   isQrAction?: boolean;
   isPinned?: boolean;
+  isDisabled?: boolean;
+  actions?: Record<string, string>;
   proxyAction?: boolean;
   _section?: string;
 };
@@ -60,6 +72,8 @@ type IncomingShortcut = {
   linkGroup?: string;
   tags?: string[];
   isPinned?: boolean;
+  isDisabled?: boolean;
+  actions?: Record<string, string>;
 };
 
 type ProxyAction = {
@@ -78,9 +92,9 @@ type CommandBarProps = {
 function normalizeConfigLinks(input: IncomingShortcut[] = []): LinkItem[] {
   return input
     .filter((it) =>
-      !it.type || it.type === "link" || it.type === "app" ||
+      !it.isDisabled && (!it.type || it.type === "link" || it.type === "app" ||
       it.type === "karakeepBookmark" || it.type === "jellyfinItem" ||
-      it.type === "beszelItem" || it.type === "dashdotItem"
+      it.type === "beszelItem" || it.type === "dashdotItem")
     )
     .map((it) => {
       const actionValue = it.action;
@@ -148,6 +162,8 @@ function normalizeConfigLinks(input: IncomingShortcut[] = []): LinkItem[] {
         url,
         proxyAction,
         isPinned: it.isPinned,
+        isDisabled: it.isDisabled,
+        actions: it.actions ?? (it as any).secondaryActions,
       } as LinkItem;
     });
 }
@@ -163,6 +179,7 @@ export default function CommandBar(
     toggleTheme,
     toggleLinkTileLayout,
   } = useAuth();
+  const queryClient = useQueryClient();
   const searchPreferences = user?.searchPreferences ?? {};
   const searchEngines: SearchEngine[] =
     (searchPreferences.searchEngines || []) as SearchEngine[];
@@ -193,6 +210,7 @@ export default function CommandBar(
   const [qrCodeError, setQrCodeError] = React.useState<string | null>(null);
   const [homeLinks, setHomeLinks] = React.useState<Array<{ id: string; url: string; secondaryUrls?: Array<{ url: string; routingRule: string }> }>>([]);
   const [frequentlyUsedIds, setFrequentlyUsedIds] = React.useState<string[]>([]);
+  const [actionsMenuOpen, setActionsMenuOpen] = React.useState(false);
   const inputRef = React.useRef<HTMLInputElement | null>(null);
 
   // Fetch frequently used items
@@ -525,6 +543,17 @@ export default function CommandBar(
 
   const handleKeyDown = (e: React.KeyboardEvent) => {
     const actionsCount = actions.length;
+    if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "k" && selectedAction?.id) {
+      e.preventDefault();
+      e.stopPropagation();
+      setActionsMenuOpen(true);
+      return;
+    }
+    if (e.key === "*" && selectedAction?.id) {
+      e.preventDefault();
+      setActionsMenuOpen(true);
+      return;
+    }
     if (e.key === "Tab" && !query && clipboardText) {
       e.preventDefault();
       setQuery(clipboardText);
@@ -721,6 +750,88 @@ export default function CommandBar(
     }
   }
 
+  const selectedShortcut = selectedAction?.id && !selectedAction.id.startsWith("__")
+    ? selectedAction
+    : null;
+
+  function secondaryLink(value: string) {
+    const trimmed = value.trim();
+    if (trimmed.toLowerCase().startsWith("link:")) return trimmed.slice(5).trim();
+    if (trimmed.toLowerCase().startsWith("url:")) return trimmed.slice(4).trim();
+    return "";
+  }
+
+  async function refreshShortcutCache() {
+    await queryClient.invalidateQueries({ queryKey: ["api", token, "links", "search"] });
+  }
+
+  async function runSecondaryAction(value: string, label: string) {
+    if (!selectedShortcut) return;
+    const normalizedLabel = label.toLowerCase();
+    if (normalizedLabel.includes("favorite") || normalizedLabel.includes("favourite")) {
+      if (!token || !selectedShortcut.id) return;
+      const shortcutId = selectedShortcut.id;
+      const previousPinned = Boolean(selectedShortcut.isPinned);
+      const nextPinned = !previousPinned;
+      const updateVisibleShortcut = (isPinned: boolean) => {
+        setFiltered((items) => items.map((item) => item.id === shortcutId ? { ...item, isPinned } : item));
+      };
+      const updateCachedShortcut = (isPinned: boolean) => {
+        queryClient.setQueryData<IncomingShortcut[]>(["api", token, "links", "search"], (items) =>
+          Array.isArray(items)
+            ? items.map((item) => item.id === shortcutId ? { ...item, isPinned } : item)
+            : items,
+        );
+      };
+
+      // Optimistically update the UI and cached shortcut before persisting.
+      updateVisibleShortcut(nextPinned);
+      updateCachedShortcut(nextPinned);
+      setActionsMenuOpen(false);
+
+      try {
+        await updateShortcutAction({ token }, shortcutId, { isPinned: nextPinned });
+        await refreshShortcutCache();
+      } catch (error) {
+        updateVisibleShortcut(previousPinned);
+        updateCachedShortcut(previousPinned);
+        console.error("Failed to update shortcut favourite", error);
+      }
+      return;
+    }
+    if (normalizedLabel.includes("root") || normalizedLabel.includes("app")) {
+      if (!token || !selectedShortcut.id || !currentAppId) return;
+      await updateShortcutAction({ token }, selectedShortcut.id, { app: null });
+      await refreshShortcutCache();
+      setActionsMenuOpen(false);
+      setCurrentAppId(null);
+      return;
+    }
+    if (normalizedLabel.includes("copy")) {
+      const sourceLink = selectedShortcut.sourceId && homeLinks.find((link) => link.id === selectedShortcut.sourceId);
+      const link = selectedShortcut.url === "__source_link__" && sourceLink
+        ? getRoutedLinkUrl(sourceLink)
+        : selectedShortcut.url;
+      if (link && !link.startsWith("__")) await navigator.clipboard?.writeText(link);
+      setActionsMenuOpen(false);
+      return;
+    }
+    if (normalizedLabel.includes("hide") || normalizedLabel.includes("disable")) {
+      if (!token || !selectedShortcut.id) return;
+      await updateShortcutAction({ token }, selectedShortcut.id, { isDisabled: true });
+      await refreshShortcutCache();
+      setActionsMenuOpen(false);
+      setFiltered((items) => items.filter((item) => item.id !== selectedShortcut.id));
+      return;
+    }
+    const link = secondaryLink(value);
+    if (link) {
+      openUrl(link, config?.global?.linkOpenBehaviour);
+      return;
+    }
+    if (value.trim().startsWith("command:")) openCommandClient(value.trim());
+  }
+
   function onClickLink(e: SyntheticEvent, a: LinkItem) {
     e.preventDefault();
     const idx = actions.indexOf(a);
@@ -934,8 +1045,45 @@ export default function CommandBar(
         <section>
           <Separator className="bg-(--text-primary)/20 my-2" />
 
-          <div className="text-xs text-gray-400  mx-3 mb-3">
-            <code>esc</code> Close searchbar · <code>Enter</code> Open shortcut
+          <div className="mx-3 mb-3 flex items-center justify-between gap-3 text-xs text-gray-400">
+            <span><code>esc</code> Close searchbar · <code>Enter</code> Open shortcut</span>
+            {selectedShortcut && (
+              <DropdownMenu open={actionsMenuOpen} onOpenChange={setActionsMenuOpen}>
+                <DropdownMenuTrigger asChild>
+                  <button type="button" className="rounded px-2 py-1 text-foreground/80 hover:bg-white/10">
+                    <IconifyIcon icon="glyphs:arrow-external-bold" className="mr-1 align-[-0.1em]" />
+                    More Actions <kbd className="ml-1">(*)</kbd>
+                  </button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end" className="frosted min-w-56 text-foreground">
+                  <DropdownMenuLabel>{selectedShortcut.name}</DropdownMenuLabel>
+                  <DropdownMenuSeparator className="bg-white/15" />
+                  <DropdownMenuItem onSelect={() => void runSecondaryAction("", selectedShortcut.isPinned ? "Remove favourite" : "Add shortcut as favourite")}>
+                    <IconifyIcon icon={selectedShortcut.isPinned ? "fa6-solid:star" : "fa6-regular:star"} />
+                    {selectedShortcut.isPinned ? "Remove favourite" : "Add shortcut as favourite"}
+                    <DropdownMenuShortcut>F</DropdownMenuShortcut>
+                  </DropdownMenuItem>
+                  {currentAppId && <DropdownMenuItem onSelect={() => void runSecondaryAction("", "Add shortcut to root shortcuts")}>
+                    <IconifyIcon icon="fa6-solid:house" />
+                    Add shortcut to root shortcuts
+                  </DropdownMenuItem>}
+                  <DropdownMenuItem onSelect={() => void runSecondaryAction("", "Copy link")}>
+                    <IconifyIcon icon="fa6-solid:copy" />
+                    Copy link
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onSelect={() => void runSecondaryAction("", "Hide/disable shortcut")}>
+                    <IconifyIcon icon="fa6-solid:eye-slash" />
+                    Hide/disable shortcut
+                  </DropdownMenuItem>
+                  {Object.entries(selectedShortcut.actions ?? {}).map(([label, value]) => (
+                    <DropdownMenuItem key={label} onSelect={() => void runSecondaryAction(value, label)}>
+                      <IconifyIcon icon="fa6-solid:bolt" />
+                      {label}
+                    </DropdownMenuItem>
+                  ))}
+                </DropdownMenuContent>
+              </DropdownMenu>
+            )}
           </div>
         </section>
       </DialogContent>
diff --git a/apps/web/src/components/widgets/SearchBar.tsx b/apps/web/src/components/widgets/SearchBar.tsx
index 67ddc567..d2087d88 100644
--- a/apps/web/src/components/widgets/SearchBar.tsx
+++ b/apps/web/src/components/widgets/SearchBar.tsx
@@ -27,6 +27,9 @@ type Shortcut = {
   secondaryInfo: string;
   type: 'link' | 'app' | 'karakeepBookmark' | 'jellyfinItem' | 'beszelItem' | 'dashdotItem';
   action: string | ProxyAction;
+  actions?: Record<string, string>;
+  secondaryActions?: Record<string, string>;
+  isDisabled?: boolean;
   tags?: string[];
 };
 
diff --git a/apps/web/src/lib/apiClient.ts b/apps/web/src/lib/apiClient.ts
index fb8d74a2..95e2d3bf 100644
--- a/apps/web/src/lib/apiClient.ts
+++ b/apps/web/src/lib/apiClient.ts
@@ -673,6 +673,20 @@ export async function getShortcutsAction(auth: ActionAuth) {
   return extractData(await getShortcuts({ headers: authHeaders(auth) }));
 }
 
+export async function updateShortcutAction(
+  auth: ActionAuth,
+  id: string,
+  patch: { isPinned?: boolean; isDisabled?: boolean; app?: string | null },
+) {
+  const response = await fetch(backendUrl(`/api/v1/shortcuts/${encodeURIComponent(id)}`), {
+    method: "PATCH",
+    headers: { "Content-Type": "application/json", ...authHeaders(auth) },
+    body: JSON.stringify(patch),
+  });
+  if (!response.ok) throw new Error(`Failed to update shortcut (${response.status})`);
+  return response.json();
+}
+
 export async function getFrequentlyUsedShortcutsAction(auth: ActionAuth) {
   return extractData(await getShortcutsFrequentlyUsed({ headers: authHeaders(auth) }));
 }
diff --git a/packages/assets/defaults/shortcuts.json b/packages/assets/defaults/shortcuts.json
index 306584a4..a62d3332 100644
--- a/packages/assets/defaults/shortcuts.json
+++ b/packages/assets/defaults/shortcuts.json
@@ -4,6 +4,9 @@
         "icon": "fa6-solid:gear",
         "secondary": "Dashwise",
         "action": "url:/settings/appearance",
+        "actions": {
+            "Go to URL": "link:/settings/appearance"
+        },
         "tags": ["Settings", "Preferences"]
     },
     {
diff --git a/packages/integrationskit/Shortcuts.tsx b/packages/integrationskit/Shortcuts.tsx
index 4717107f..6993eac7 100644
--- a/packages/integrationskit/Shortcuts.tsx
+++ b/packages/integrationskit/Shortcuts.tsx
@@ -16,6 +16,7 @@ export type ShortcutItem = {
 	secondaryInfo: string;
 	type: string;
 	action: string | ShortcutActionObject;
+	actions?: Record<string, string>;
 	tags: string[];
 };
 
@@ -217,6 +218,7 @@ export default async function Shortcuts({
 					secondaryInfo: String(item.secondaryInfo ?? item.secondary ?? ""),
 					type: String(item.type ?? "shortcut"),
 					action,
+					actions: normalizeShortcutActions(item.actions ?? item.secondaryActions),
 					tags: toTagList(item.tags),
 				});
 			}
@@ -226,6 +228,16 @@ export default async function Shortcuts({
 	return rows;
 }
 
+function normalizeShortcutActions(raw: unknown): Record<string, string> | undefined {
+	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return undefined;
+	const actions = Object.fromEntries(
+		Object.entries(raw as Record<string, unknown>)
+			.filter(([label, value]) => label.trim() && typeof value === "string" && value.trim())
+			.map(([label, value]) => [label.trim(), String(value).trim()]),
+	);
+	return Object.keys(actions).length > 0 ? actions : undefined;
+}
+
 function isValidShortcutAction(action: unknown): action is string | ShortcutActionObject {
 	if (typeof action === "string") {
 		return action.trim().length > 0;
diff --git a/pocketbase/migrations/1785000005_shortcut_secondary_actions.js b/pocketbase/migrations/1785000005_shortcut_secondary_actions.js
new file mode 100644
index 00000000..b757f828
--- /dev/null
+++ b/pocketbase/migrations/1785000005_shortcut_secondary_actions.js
@@ -0,0 +1,31 @@
+/// <reference path="../pb_data/types.d.ts" />
+
+migrate((app) => {
+  const shortcuts = app.findCollectionByNameOrId("pbc_3591471183");
+  shortcuts.fields.addAt(shortcuts.fields.length, new Field({
+    "hidden": false,
+    "id": "bool_isDisabled",
+    "name": "isDisabled",
+    "presentable": false,
+    "required": false,
+    "system": false,
+    "type": "bool"
+  }));
+  shortcuts.fields.addAt(shortcuts.fields.length, new Field({
+    "help": "JSON map of secondary action labels to action values",
+    "hidden": false,
+    "id": "json_secondaryActions",
+    "maxSize": 0,
+    "name": "secondaryActions",
+    "presentable": false,
+    "required": false,
+    "system": false,
+    "type": "json"
+  }));
+  return app.save(shortcuts);
+}, (app) => {
+  const shortcuts = app.findCollectionByNameOrId("pbc_3591471183");
+  shortcuts.fields.removeById("json_secondaryActions");
+  shortcuts.fields.removeById("bool_isDisabled");
+  return app.save(shortcuts);
+});

From db50af814797a35473551835d51491006e6de683 Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Tue, 8 Sep 2026 23:02:24 +0200
Subject: [PATCH 08/11] fix(frame): border on frames

---
 apps/web/src/components/dashboard/Screensaver.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/dashboard/Screensaver.tsx b/apps/web/src/components/dashboard/Screensaver.tsx
index 90bf7bb5..73e5bbf2 100644
--- a/apps/web/src/components/dashboard/Screensaver.tsx
+++ b/apps/web/src/components/dashboard/Screensaver.tsx
@@ -284,7 +284,7 @@ export default function Screensaver(
           return (
             <div
               key={frame.id}
-              className={`min-w-full h-full flex items-center justify-center snap-center relative overflow-hidden border border-white/10 transition-transform duration-200 ease-out ${
+              className={`min-w-full h-full flex items-center justify-center snap-center relative overflow-hidden transition-transform duration-200 ease-out ${
                 showRadius ? "rounded-3xl" : "rounded-none"
               }`}
               style={{ transform: `scale(${scale})` }}

From 87e0b8ce1b362c20e2d09178749bfdb54fd98f17 Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Tue, 8 Sep 2026 23:20:41 +0200
Subject: [PATCH 09/11] feat(news): overhaul news overview carousel

---
 apps/web/src/components/news/NewsOverview.tsx | 73 +++++++++++++------
 1 file changed, 51 insertions(+), 22 deletions(-)

diff --git a/apps/web/src/components/news/NewsOverview.tsx b/apps/web/src/components/news/NewsOverview.tsx
index 625b10ff..82cfa3c1 100644
--- a/apps/web/src/components/news/NewsOverview.tsx
+++ b/apps/web/src/components/news/NewsOverview.tsx
@@ -60,6 +60,26 @@ function NewsFeedCarousel({
         { staleTime: 60_000 },
     );
     const items = feedQuery.data?.items ?? [];
+    const hasSimilarArticles = items.some(
+        (item) => Array.isArray(item.relatedArticles) && item.relatedArticles.length > 0,
+    );
+    const carouselGroups = hasSimilarArticles
+        ? items.reduce<NewsFeedItem[][]>((groups, item) => {
+            const hasRelatedArticles = Array.isArray(item.relatedArticles) && item.relatedArticles.length > 0;
+            const lastGroup = groups[groups.length - 1];
+            const lastArticle = lastGroup?.[0];
+            const lastArticleHasRelatedArticles = Array.isArray(lastArticle?.relatedArticles) &&
+                lastArticle.relatedArticles.length > 0;
+
+            if (!hasRelatedArticles && !lastArticleHasRelatedArticles && lastGroup?.length === 1) {
+                lastGroup.push(item);
+            } else {
+                groups.push([item]);
+            }
+
+            return groups;
+        }, [])
+        : items.map((item) => [item]);
     const getIconUrl = (item: NewsFeedItem) => {
         const subscription = subscriptions.find((entry) =>
             String(entry.id || "") === String(item.subscription_id || "") ||
@@ -93,15 +113,20 @@ function NewsFeedCarousel({
             )}
 
             {items.length > 0 && (
-                <div
-                    className="flex snap-x gap-2.5 overflow-x-auto overscroll-x-contain pb-2"
-                >
-                    {items.map((item, index) => (
-                        <OverviewTopicCard
-                            key={`${item.link}-${index}`}
-                            item={item}
-                            iconUrl={getIconUrl(item)}
-                        />
+                <div className="flex snap-x gap-2.5 overflow-x-auto overscroll-x-contain pb-2">
+                    {carouselGroups.map((group, groupIndex) => (
+                        <div
+                            key={`${group[0].link}-${groupIndex}`}
+                            className={group.length > 1 ? "flex w-[min(84vw,20rem)] shrink-0 flex-col gap-2" : "contents"}
+                        >
+                            {group.map((item, itemIndex) => (
+                                <OverviewTopicCard
+                                    key={`${item.link}-${itemIndex}`}
+                                    item={item}
+                                    iconUrl={getIconUrl(item)}
+                                />
+                            ))}
+                        </div>
                     ))}
                 </div>
             )}
@@ -126,11 +151,6 @@ function OverviewTopicCard({ item, iconUrl }: { item: NewsFeedItem; iconUrl?: st
                     ) : (
                         <div className="h-full w-full frosted" />
                     )}
-                    {item.topicTitle && (
-                        <span className="absolute bottom-2 left-3 max-w-[calc(100%-1.5rem)] truncate text-[10px] font-medium uppercase tracking-[0.14em] text-white/70">
-                            {item.topicTitle}
-                        </span>
-                    )}
                 </div>
                 <div className="space-y-1.5">
                     <h3 className="line-clamp-2 text-base font-semibold leading-snug group-hover:text-primary">
@@ -146,21 +166,30 @@ function OverviewTopicCard({ item, iconUrl }: { item: NewsFeedItem; iconUrl?: st
             </a>
 
             {relatedArticles.length > 0 && (
-                <div className="mt-auto border-t border-white/10 p-2.5">
-                    <p className="mb-2 px-0.5 text-[10px] font-semibold uppercase tracking-[0.16em] text-white/45">
-                        Similar articles
-                    </p>
-                    <div className="flex gap-2 overflow-x-auto pb-1 scrollbar-hide">
+                <div className="mt-3">
+                    <p className="mb-1 text-[10px] font-semibold uppercase tracking-[0.16em] text-white/45">SIMILAR</p>
+                    <div className="divide-y divide-white/10">
                         {relatedArticles.map((article, index) => (
                             <a
                                 key={`${article.link}-${index}`}
                                 href={article.link}
                                 target="_blank"
                                 rel="noreferrer"
-                                className="w-44 shrink-0 rounded-lg frosted p-2 transition hover:bg-white/10"
+                                className="flex items-center gap-2 py-2 transition hover:text-primary"
                             >
-                                <p className="line-clamp-3 text-xs font-medium leading-snug">{article.title}</p>
-                                <p className="mt-1 truncate text-[10px] text-white/45">{article.subscription_name}</p>
+                                {article.thumbnailUrl ? (
+                                    <img
+                                        src={String(article.thumbnailUrl)}
+                                        alt=""
+                                        className="h-8 w-8 shrink-0 aspect-square rounded object-cover"
+                                    />
+                                ) : (
+                                    <div className="h-8 w-8 shrink-0 aspect-square rounded bg-white/5" />
+                                )}
+                                <div className="min-w-0">
+                                    <p className="line-clamp-2 text-xs font-medium leading-snug">{article.title}</p>
+                                    <p className="mt-0.5 truncate text-[10px] text-white/45">{article.subscription_name}</p>
+                                </div>
                             </a>
                         ))}
                     </div>

From f0ab02ae6b75857c85a217a3b64f92e642aa1656 Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Tue, 8 Sep 2026 23:20:47 +0200
Subject: [PATCH 10/11] dev(news): add local SQLite cache

---
 .gitignore                                   |   3 +
 apps/backend/src/jobs/news/feed-builder.ts   |  11 +-
 apps/backend/src/lib/cache/feed-items-dev.ts | 259 +++++++++++++++++++
 apps/backend/src/lib/cache/feed-items.ts     |  92 ++-----
 apps/backend/src/lib/config.ts               |   5 +-
 apps/backend/src/routes/news.route.ts        |   8 +
 6 files changed, 295 insertions(+), 83 deletions(-)
 create mode 100644 apps/backend/src/lib/cache/feed-items-dev.ts

diff --git a/.gitignore b/.gitignore
index 54e12c40..5362fb92 100755
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,9 @@ dashwise-sdk/node_modules
 .DS_Store
 *.pem
 
+# local development data
+**/.data/
+
 # debug
 npm-debug.log*
 yarn-debug.log*
diff --git a/apps/backend/src/jobs/news/feed-builder.ts b/apps/backend/src/jobs/news/feed-builder.ts
index 90d2ad3a..205cffe5 100644
--- a/apps/backend/src/jobs/news/feed-builder.ts
+++ b/apps/backend/src/jobs/news/feed-builder.ts
@@ -15,6 +15,7 @@ import {
   updateNewsSubscription,
 } from "../../lib/data/superuser";
 import {
+  hasSubscriptionArticles,
   readSubscriptionArticles,
   type CachedArticle,
   writeMaterializedFeed,
@@ -270,10 +271,6 @@ export async function newsFeedBuilder(feedId?: string, options: BuilderOptions =
   details: Array<any>;
 }> {
   const result = { processed: 0, skipped: 0, updated: 0, errors: 0, details: [] as any[] };
-  if (config.DEV_DISABLE_NEWS_INDEXING) {
-    return result;
-  }
-
   const sourceRevision = `${Date.now()}`;
   logger.info("Running news feed builder");
 
@@ -337,7 +334,11 @@ export async function newsFeedBuilder(feedId?: string, options: BuilderOptions =
 
   const fetchResults = await Promise.all(allSubscriptions
     .filter((subscription) => targetSubscriptionIds.has(String(subscription.id)))
-    .map((subscription) => fetchAndCacheSubscription(subscription, result)));
+    .map((subscription) => {
+      const subscriptionId = String(subscription.id || "");
+      if (config.DEV_DISABLE_NEWS_INDEXING && hasSubscriptionArticles(subscriptionId)) return Promise.resolve(false);
+      return fetchAndCacheSubscription(subscription, result);
+    }));
   result.processed = fetchResults.length;
 
   const affectedUsers = new Set<string>(targetUserIds);
diff --git a/apps/backend/src/lib/cache/feed-items-dev.ts b/apps/backend/src/lib/cache/feed-items-dev.ts
new file mode 100644
index 00000000..d5cdd7c1
--- /dev/null
+++ b/apps/backend/src/lib/cache/feed-items-dev.ts
@@ -0,0 +1,259 @@
+import { Database } from "bun:sqlite";
+import { mkdirSync } from "node:fs";
+import { dirname } from "node:path";
+
+export type CachedArticle = {
+  dedupeKey: string;
+  canonicalUrl?: string;
+  guid?: string;
+  title: string;
+  publishedAt: number;
+  json: Record<string, unknown>;
+  sourceIds?: string[];
+};
+
+export type MaterializedFeedItem = {
+  id: string;
+  score: number;
+  json: Record<string, unknown>;
+};
+
+export type FeedCacheMetadata = {
+  builtAt: string;
+  revision: string;
+  itemCount: number;
+  sourceRevision: string;
+};
+
+type Row = Record<string, unknown>;
+
+const database = (Bun.env.ENVIRONMENT === "dev"
+  ? (() => {
+      const databasePath = Bun.env.DASHWISE_DEV_NEWS_DB_PATH || ".data/news-dev.sqlite";
+      mkdirSync(dirname(databasePath), { recursive: true });
+      return new Database(databasePath);
+    })()
+  : null) as Database;
+
+if (database) database.exec(`
+  CREATE TABLE IF NOT EXISTS articles (
+    dedupe_key TEXT PRIMARY KEY,
+    canonical_url TEXT,
+    guid TEXT,
+    title TEXT NOT NULL,
+    published_at INTEGER NOT NULL,
+    json TEXT NOT NULL
+  );
+  CREATE TABLE IF NOT EXISTS article_sources (
+    dedupe_key TEXT NOT NULL,
+    subscription_id TEXT NOT NULL,
+    PRIMARY KEY (dedupe_key, subscription_id)
+  );
+  CREATE TABLE IF NOT EXISTS subscription_articles (
+    subscription_id TEXT NOT NULL,
+    dedupe_key TEXT NOT NULL,
+    published_at INTEGER NOT NULL,
+    PRIMARY KEY (subscription_id, dedupe_key)
+  );
+  CREATE TABLE IF NOT EXISTS subscription_fetches (
+    subscription_id TEXT PRIMARY KEY,
+    fetched_at TEXT NOT NULL
+  );
+  CREATE TABLE IF NOT EXISTS materialized_items (
+    user_id TEXT NOT NULL,
+    feed_id TEXT NOT NULL,
+    item_id TEXT NOT NULL,
+    score REAL NOT NULL,
+    json TEXT NOT NULL,
+    PRIMARY KEY (user_id, feed_id, item_id)
+  );
+  CREATE TABLE IF NOT EXISTS materialized_metadata (
+    user_id TEXT NOT NULL,
+    feed_id TEXT NOT NULL,
+    built_at TEXT NOT NULL,
+    revision TEXT NOT NULL,
+    item_count INTEGER NOT NULL,
+    source_revision TEXT NOT NULL,
+    PRIMARY KEY (user_id, feed_id)
+  );
+`);
+
+const parseJson = <T>(value: unknown, fallback: T): T => {
+  try {
+    return JSON.parse(String(value)) as T;
+  } catch {
+    return fallback;
+  }
+};
+
+
+
+export function hasSubscriptionArticles(subscriptionId: string) {
+  return Boolean(database.query("SELECT 1 FROM subscription_fetches WHERE subscription_id = ? LIMIT 1").get(subscriptionId));
+}
+
+export function readArticle(dedupeKey: string): CachedArticle | null {
+  const row = database.query("SELECT dedupe_key, canonical_url, guid, title, published_at, json FROM articles WHERE dedupe_key = ?").get(dedupeKey) as Row | null;
+  if (!row) return null;
+  return {
+    dedupeKey: String(row.dedupe_key),
+    canonicalUrl: row.canonical_url ? String(row.canonical_url) : undefined,
+    guid: row.guid ? String(row.guid) : undefined,
+    title: String(row.title || ""),
+    publishedAt: Number(row.published_at) || 0,
+    json: parseJson<Record<string, unknown>>(row.json, {}),
+  };
+}
+
+export function readArticleSources(dedupeKey: string) {
+  return (database.query("SELECT subscription_id FROM article_sources WHERE dedupe_key = ?").all(dedupeKey) as Row[])
+    .map((row) => String(row.subscription_id));
+}
+
+export function readSubscriptionArticles(subscriptionId: string): CachedArticle[] {
+  const rows = database.query(`
+    SELECT a.dedupe_key, a.canonical_url, a.guid, a.title, a.published_at, a.json
+    FROM subscription_articles sa
+    JOIN articles a ON a.dedupe_key = sa.dedupe_key
+    WHERE sa.subscription_id = ?
+    ORDER BY sa.published_at DESC
+  `).all(subscriptionId) as Row[];
+
+  return rows.map((row) => ({
+    dedupeKey: String(row.dedupe_key),
+    canonicalUrl: row.canonical_url ? String(row.canonical_url) : undefined,
+    guid: row.guid ? String(row.guid) : undefined,
+    title: String(row.title || ""),
+    publishedAt: Number(row.published_at) || 0,
+    json: { ...parseJson<Record<string, unknown>>(row.json, {}), subscription_id: subscriptionId },
+    sourceIds: readArticleSources(String(row.dedupe_key)),
+  }));
+}
+
+export function writeSubscriptionArticles(subscriptionId: string, articles: CachedArticle[]) {
+  const transaction = database.transaction(() => {
+    const current = (database.query("SELECT dedupe_key FROM subscription_articles WHERE subscription_id = ?").all(subscriptionId) as Row[])
+      .map((row) => String(row.dedupe_key));
+    const next = new Map(articles.filter((article) => article.dedupeKey).map((article) => [article.dedupeKey, article]));
+
+    for (const dedupeKey of current) {
+      if (next.has(dedupeKey)) continue;
+      database.query("DELETE FROM subscription_articles WHERE subscription_id = ? AND dedupe_key = ?").run(subscriptionId, dedupeKey);
+      database.query("DELETE FROM article_sources WHERE subscription_id = ? AND dedupe_key = ?").run(subscriptionId, dedupeKey);
+      database.query("DELETE FROM articles WHERE dedupe_key = ? AND NOT EXISTS (SELECT 1 FROM article_sources WHERE dedupe_key = ?)").run(dedupeKey, dedupeKey);
+    }
+
+    for (const article of next.values()) {
+      const existing = readArticle(article.dedupeKey);
+      const selected = existing && JSON.stringify(existing.json).length > JSON.stringify(article.json).length ? existing : article;
+      database.query(`
+        INSERT INTO articles (dedupe_key, canonical_url, guid, title, published_at, json)
+        VALUES (?, ?, ?, ?, ?, ?)
+        ON CONFLICT(dedupe_key) DO UPDATE SET
+          canonical_url = excluded.canonical_url,
+          guid = excluded.guid,
+          title = excluded.title,
+          published_at = excluded.published_at,
+          json = excluded.json
+      `).run(
+        article.dedupeKey,
+        selected.canonicalUrl || "",
+        selected.guid || "",
+        selected.title || "",
+        selected.publishedAt || 0,
+        JSON.stringify(selected.json),
+      );
+      database.query("INSERT OR REPLACE INTO subscription_articles (subscription_id, dedupe_key, published_at) VALUES (?, ?, ?)")
+        .run(subscriptionId, article.dedupeKey, article.publishedAt || 0);
+      database.query("INSERT OR IGNORE INTO article_sources (dedupe_key, subscription_id) VALUES (?, ?)")
+        .run(article.dedupeKey, subscriptionId);
+    }
+    database.query("INSERT OR REPLACE INTO subscription_fetches (subscription_id, fetched_at) VALUES (?, ?)")
+      .run(subscriptionId, new Date().toISOString());
+  });
+  transaction();
+}
+
+export function deleteSubscriptionArticleIndex(subscriptionId: string) {
+  const transaction = database.transaction(() => {
+    const rows = database.query("SELECT dedupe_key FROM subscription_articles WHERE subscription_id = ?").all(subscriptionId) as Row[];
+    database.query("DELETE FROM subscription_articles WHERE subscription_id = ?").run(subscriptionId);
+    database.query("DELETE FROM article_sources WHERE subscription_id = ?").run(subscriptionId);
+    for (const row of rows) {
+      database.query("DELETE FROM articles WHERE dedupe_key = ? AND NOT EXISTS (SELECT 1 FROM article_sources WHERE dedupe_key = ?)")
+        .run(String(row.dedupe_key), String(row.dedupe_key));
+    }
+    database.query("DELETE FROM subscription_fetches WHERE subscription_id = ?").run(subscriptionId);
+  });
+  transaction();
+}
+
+export function readMaterializedFeedPage(userId: string, feedId: string, offset: number, limit: number) {
+  const rows = database.query(`
+    SELECT item_id, score, json FROM materialized_items
+    WHERE user_id = ? AND feed_id = ?
+    ORDER BY score DESC
+    LIMIT ? OFFSET ?
+  `).all(userId, feedId, limit, offset) as Row[];
+  const countRow = database.query("SELECT COUNT(*) AS count FROM materialized_items WHERE user_id = ? AND feed_id = ?").get(userId, feedId) as Row | null;
+  const total = Number(countRow?.count || 0);
+  const exists = Boolean(database.query("SELECT 1 FROM materialized_metadata WHERE user_id = ? AND feed_id = ? LIMIT 1").get(userId, feedId)) || total > 0;
+  return {
+    items: rows.map((row) => parseJson<Record<string, unknown>>(row.json, {})),
+    total,
+    exists,
+  };
+}
+
+export function readFeedCacheMetadata(userId: string, feedId: string): FeedCacheMetadata | null {
+  const row = database.query("SELECT built_at, revision, item_count, source_revision FROM materialized_metadata WHERE user_id = ? AND feed_id = ?")
+    .get(userId, feedId) as Row | null;
+  return row ? {
+    builtAt: String(row.built_at || ""),
+    revision: String(row.revision || ""),
+    itemCount: Number(row.item_count) || 0,
+    sourceRevision: String(row.source_revision || ""),
+  } : null;
+}
+
+export function writeMaterializedFeed(userId: string, feedId: string, items: MaterializedFeedItem[], sourceRevision = "") {
+  const revision = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+  const transaction = database.transaction(() => {
+    database.query("DELETE FROM materialized_items WHERE user_id = ? AND feed_id = ?").run(userId, feedId);
+    for (const item of items) {
+      database.query("INSERT INTO materialized_items (user_id, feed_id, item_id, score, json) VALUES (?, ?, ?, ?, ?)")
+        .run(userId, feedId, item.id, item.score || 0, JSON.stringify(item.json));
+    }
+    database.query(`
+      INSERT INTO materialized_metadata (user_id, feed_id, built_at, revision, item_count, source_revision)
+      VALUES (?, ?, ?, ?, ?, ?)
+      ON CONFLICT(user_id, feed_id) DO UPDATE SET
+        built_at = excluded.built_at,
+        revision = excluded.revision,
+        item_count = excluded.item_count,
+        source_revision = excluded.source_revision
+    `).run(userId, feedId, new Date().toISOString(), revision, items.length, sourceRevision);
+  });
+  transaction();
+}
+
+export function deleteMaterializedFeed(userId: string, feedId: string) {
+  database.query("DELETE FROM materialized_items WHERE user_id = ? AND feed_id = ?").run(userId, feedId);
+  database.query("DELETE FROM materialized_metadata WHERE user_id = ? AND feed_id = ?").run(userId, feedId);
+}
+
+export function readFeedItemsCache(feedId: string): unknown[] | null {
+  const articles = readSubscriptionArticles(feedId);
+  return articles.length ? articles.map((article) => article.json) : null;
+}
+
+export function clearLocalFeedCache() {
+  database.exec(`
+    DELETE FROM articles;
+    DELETE FROM article_sources;
+    DELETE FROM subscription_articles;
+    DELETE FROM subscription_fetches;
+    DELETE FROM materialized_items;
+    DELETE FROM materialized_metadata;
+  `);
+}
diff --git a/apps/backend/src/lib/cache/feed-items.ts b/apps/backend/src/lib/cache/feed-items.ts
index dee6be0d..b543b2b7 100644
--- a/apps/backend/src/lib/cache/feed-items.ts
+++ b/apps/backend/src/lib/cache/feed-items.ts
@@ -1,5 +1,6 @@
 import { RedisClient } from "bun";
 import { config } from "../config";
+import * as devCache from "./feed-items-dev";
 
 export type CachedArticle = {
   dedupeKey: string;
@@ -27,11 +28,6 @@ export type FeedCacheMetadata = {
 const redisUrl = Bun.env.REDIS_URL || Bun.env.VALKEY_URL || "redis://127.0.0.1:6379";
 const client = config.USE_LOCAL_FEED_CACHE ? null : new RedisClient(redisUrl);
 
-const localArticles = new Map<string, CachedArticle>();
-const localArticleSources = new Map<string, Set<string>>();
-const localSubscriptionIndexes = new Map<string, Map<string, number>>();
-const localViews = new Map<string, { order: Map<string, number>; items: Map<string, string> }>();
-const localMetadata = new Map<string, FeedCacheMetadata>();
 
 const toStringValue = (value: unknown) => value == null ? "" : String(value);
 
@@ -90,7 +86,7 @@ function subscriptionIndexEntries(value: unknown): string[] {
 }
 
 async function readArticle(dedupeKey: string): Promise<CachedArticle | null> {
-  if (config.USE_LOCAL_FEED_CACHE) return localArticles.get(dedupeKey) ?? null;
+  if (config.USE_LOCAL_FEED_CACHE) return devCache.readArticle(dedupeKey);
 
   const hash = parseRedisHash(await command("HGETALL", [articleDocumentKey(dedupeKey)]));
   if (!hash?.json) return null;
@@ -105,27 +101,19 @@ async function readArticle(dedupeKey: string): Promise<CachedArticle | null> {
 }
 
 async function readArticleSources(dedupeKey: string): Promise<string[]> {
-  if (config.USE_LOCAL_FEED_CACHE) return Array.from(localArticleSources.get(dedupeKey) ?? []);
+  if (config.USE_LOCAL_FEED_CACHE) return devCache.readArticleSources(dedupeKey);
   return subscriptionIndexEntries(await command("SMEMBERS", [articleSourcesKey(dedupeKey)]));
 }
 
+export function hasSubscriptionArticles(subscriptionId: string) {
+  return config.USE_LOCAL_FEED_CACHE ? devCache.hasSubscriptionArticles(String(subscriptionId || "").trim()) : false;
+}
+
 export async function readSubscriptionArticles(subscriptionId: string): Promise<CachedArticle[]> {
   const id = String(subscriptionId || "").trim();
   if (!id) return [];
 
-  if (config.USE_LOCAL_FEED_CACHE) {
-    const entries = Array.from(localSubscriptionIndexes.get(id)?.entries() ?? [])
-      .sort((left, right) => right[1] - left[1]);
-    const articles: CachedArticle[] = [];
-    for (const [dedupeKey] of entries) {
-      const article = localArticles.get(dedupeKey);
-      if (article) articles.push({ ...article, sourceIds: Array.from(localArticleSources.get(dedupeKey) ?? []) });
-    }
-    return articles.map((article) => ({
-      ...article,
-      json: { ...article.json, subscription_id: id },
-    }));
-  }
+  if (config.USE_LOCAL_FEED_CACHE) return devCache.readSubscriptionArticles(id);
 
   const members = subscriptionIndexEntries(await command("ZREVRANGE", [subscriptionArticlesKey(id), "0", "-1"]));
   const loaded = await Promise.all(members.map(async (dedupeKey) => {
@@ -147,26 +135,7 @@ export async function writeSubscriptionArticles(subscriptionId: string, articles
   const next = new Map(articles.filter((article) => article.dedupeKey).map((article) => [article.dedupeKey, article]));
 
   if (config.USE_LOCAL_FEED_CACHE) {
-    const current = localSubscriptionIndexes.get(id) ?? new Map<string, number>();
-    for (const dedupeKey of current.keys()) {
-      if (next.has(dedupeKey)) continue;
-      current.delete(dedupeKey);
-      const sources = localArticleSources.get(dedupeKey);
-      sources?.delete(id);
-      if (!sources?.size) {
-        localArticleSources.delete(dedupeKey);
-        localArticles.delete(dedupeKey);
-      }
-    }
-    for (const article of next.values()) {
-      const existing = localArticles.get(article.dedupeKey);
-      localArticles.set(article.dedupeKey, existing && JSON.stringify(existing.json).length > JSON.stringify(article.json).length ? existing : article);
-      current.set(article.dedupeKey, article.publishedAt);
-      const sources = localArticleSources.get(article.dedupeKey) ?? new Set<string>();
-      sources.add(id);
-      localArticleSources.set(article.dedupeKey, sources);
-    }
-    localSubscriptionIndexes.set(id, current);
+    devCache.writeSubscriptionArticles(id, articles);
     return;
   }
 
@@ -200,16 +169,7 @@ export async function deleteSubscriptionArticleIndex(subscriptionId: string) {
   const id = String(subscriptionId || "").trim();
   if (!id) return;
   if (config.USE_LOCAL_FEED_CACHE) {
-    const current = localSubscriptionIndexes.get(id) ?? new Map<string, number>();
-    for (const dedupeKey of current.keys()) {
-      const sources = localArticleSources.get(dedupeKey);
-      sources?.delete(id);
-      if (!sources?.size) {
-        localArticleSources.delete(dedupeKey);
-        localArticles.delete(dedupeKey);
-      }
-    }
-    localSubscriptionIndexes.delete(id);
+    devCache.deleteSubscriptionArticleIndex(id);
     return;
   }
 
@@ -236,13 +196,7 @@ export async function readMaterializedFeedPage(
   const orderKey = materializedFeedOrderKey(userId, feedId);
   const itemsKey = materializedFeedItemsKey(userId, feedId);
 
-  if (config.USE_LOCAL_FEED_CACHE) {
-    const view = localViews.get(orderKey);
-    if (!view) return { items: [], total: 0, exists: false };
-    const ids = Array.from(view.order.entries()).sort((left, right) => right[1] - left[1]).map(([id]) => id);
-    const page = ids.slice(offset, offset + limit).map((id) => parseJson<Record<string, unknown>>(view.items.get(id), {}));
-    return { items: page, total: ids.length, exists: true };
-  }
+  if (config.USE_LOCAL_FEED_CACHE) return devCache.readMaterializedFeedPage(userId, feedId, offset, limit);
 
   const revisionBefore = toStringValue(await command("HGET", [materializedFeedMetaKey(userId, feedId), "revision"]));
   const total = Number(await command("ZCARD", [orderKey])) || 0;
@@ -270,7 +224,7 @@ export async function readMaterializedFeedItems(userId: string, feedId: string)
 
 export async function readFeedCacheMetadata(userId: string, feedId: string): Promise<FeedCacheMetadata | null> {
   const key = materializedFeedMetaKey(userId, feedId);
-  if (config.USE_LOCAL_FEED_CACHE) return localMetadata.get(key) ?? null;
+  if (config.USE_LOCAL_FEED_CACHE) return devCache.readFeedCacheMetadata(userId, feedId);
   const hash = parseRedisHash(await command("HGETALL", [key]));
   if (!hash) return null;
   return {
@@ -292,16 +246,7 @@ export async function writeMaterializedFeed(
   const revision = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
 
   if (config.USE_LOCAL_FEED_CACHE) {
-    const order = new Map<string, number>();
-    const itemMap = new Map<string, string>();
-    for (const item of items) {
-      order.set(item.id, item.score);
-      itemMap.set(item.id, JSON.stringify(item.json));
-    }
-    localViews.set(orderKey, { order, items: itemMap });
-    localMetadata.set(materializedFeedMetaKey(userId, feedId), {
-      builtAt: new Date().toISOString(), revision, itemCount: items.length, sourceRevision,
-    });
+    devCache.writeMaterializedFeed(userId, feedId, items, sourceRevision);
     return;
   }
 
@@ -338,8 +283,7 @@ export async function deleteMaterializedFeed(userId: string, feedId: string) {
   const metaKey = materializedFeedMetaKey(userId, feedId);
 
   if (config.USE_LOCAL_FEED_CACHE) {
-    localViews.delete(orderKey);
-    localMetadata.delete(metaKey);
+    devCache.deleteMaterializedFeed(userId, feedId);
     return;
   }
 
@@ -352,7 +296,7 @@ export async function readFeedItemsCache(feedId: string): Promise<unknown[] | nu
   const articles = await readSubscriptionArticles(feedId);
   if (articles.length) return articles.map((article) => article.json);
 
-  if (config.USE_LOCAL_FEED_CACHE) return null;
+  if (config.USE_LOCAL_FEED_CACHE) return devCache.readFeedItemsCache(feedId);
   const raw = await command("HGET", [`feedItems:${feedId}`, "json"]);
   const parsed = parseJson<unknown>(toStringValue(raw), null);
   return Array.isArray(parsed) ? parsed : null;
@@ -364,9 +308,5 @@ export async function writeFeedItemsCache(feedId: string, items: unknown[], feed
 }
 
 export function clearLocalFeedCache() {
-  localArticles.clear();
-  localArticleSources.clear();
-  localSubscriptionIndexes.clear();
-  localViews.clear();
-  localMetadata.clear();
+  if (config.USE_LOCAL_FEED_CACHE) devCache.clearLocalFeedCache();
 }
diff --git a/apps/backend/src/lib/config.ts b/apps/backend/src/lib/config.ts
index 8a799513..06e91fb1 100644
--- a/apps/backend/src/lib/config.ts
+++ b/apps/backend/src/lib/config.ts
@@ -33,7 +33,8 @@ const truthyEnv = (value?: string | null): boolean => {
 };
 
 const requestedLocalFeedCache = truthyEnv(env.USE_LOCAL_FEED_CACHE);
-const useLocalFeedCache = requestedLocalFeedCache && processEnvironment === "dev";
+const devDisableNewsIndexing = processEnvironment === "dev" && truthyEnv(env.DEV_DISABLE_NEWS_INDEXING);
+const useLocalFeedCache = (requestedLocalFeedCache || devDisableNewsIndexing) && processEnvironment === "dev";
 
 if (requestedLocalFeedCache && !useLocalFeedCache) {
   console.warn("USE_LOCAL_FEED_CACHE is only supported in development and will be ignored");
@@ -55,7 +56,7 @@ const getLogLevel = (): string | undefined => {
 export const config = {
   ENVIRONMENT: processEnvironment === "dev" ? "dev" : "production",
   USE_LOCAL_FEED_CACHE: useLocalFeedCache,
-  DEV_DISABLE_NEWS_INDEXING: processEnvironment === "dev" && truthyEnv(env.DEV_DISABLE_NEWS_INDEXING),
+  DEV_DISABLE_NEWS_INDEXING: devDisableNewsIndexing,
   PORT: Number(env.PORT) || 3000,
   PB_URL: getEnv("PB_URL", "NEXT_PUBLIC_PB_URL") || "http://127.0.0.1:8090",
   PB_BINARY_PATH: env.PB_BINARY_PATH,
diff --git a/apps/backend/src/routes/news.route.ts b/apps/backend/src/routes/news.route.ts
index 36705e57..94679a2b 100644
--- a/apps/backend/src/routes/news.route.ts
+++ b/apps/backend/src/routes/news.route.ts
@@ -9,6 +9,7 @@ import { readAuthToken, readJsonBody, requireAuth, withJson } from "./shared";
 import { createLogger } from "../lib/logger";
 import { jobsApi } from "../jobs/index";
 import { suggestCommonBlacklistWords } from "../lib/news/topic-suggestions";
+import { config } from "../lib/config";
 
 const logger = createLogger("API");
 
@@ -17,6 +18,11 @@ const FEED_REQUEST_HEADERS = {
   "Accept": "application/rss+xml, application/atom+xml, application/xml, text/xml;q=0.9, */*;q=0.8",
 };
 
+async function ensureDevNewsFeed(userId: string, feedId: string) {
+  if (!config.DEV_DISABLE_NEWS_INDEXING) return;
+  await jobsApi.runNewsFeedBuilderJob("dev local cache", feedId, userId);
+}
+
 async function refreshNewsFeed(userId: string, options: { feedIds: string[] }) {
   const { feedIds } = options;
   if (!feedIds.length) {
@@ -220,6 +226,7 @@ newsRoute
   }))
   .get("/api/v1/news/feeds/:id", withJson(async (c) => {
     const { userId } = await requireAuth({ token: readAuthToken(c) });
+    await ensureDevNewsFeed(userId, String(c.req.param("id") ?? ""));
     const limit = Number(c.req.query("limit") ?? "");
     const offset = Number(c.req.query("offset") ?? "");
     return getNewsFeed(userId, c.req.param("id"), {
@@ -229,6 +236,7 @@ newsRoute
   }))
   .get("/api/v1/news/feed", withJson(async (c) => {
     const { userId } = await requireAuth({ token: readAuthToken(c) });
+    await ensureDevNewsFeed(userId, c.req.query("feedId") ?? "all");
     const limit = Number(c.req.query("limit") ?? "");
     const offset = Number(c.req.query("offset") ?? "");
     return getNewsFeed(userId, c.req.query("feedId") ?? "all", {

From 8f21a33455bb0fea07fe8ae5c8f085c6663b092b Mon Sep 17 00:00:00 2001
From: Andreas Molnar <andreas24juni@gmail.com>
Date: Tue, 8 Sep 2026 23:22:12 +0200
Subject: [PATCH 11/11] fix(integrations): use redis cache

---
 apps/backend/src/routes/integrations.route.ts | 101 +++++++++++++++---
 1 file changed, 86 insertions(+), 15 deletions(-)

diff --git a/apps/backend/src/routes/integrations.route.ts b/apps/backend/src/routes/integrations.route.ts
index 31b036d4..f95278c8 100644
--- a/apps/backend/src/routes/integrations.route.ts
+++ b/apps/backend/src/routes/integrations.route.ts
@@ -13,6 +13,7 @@ import {
   listIntegrations,
   testIntegrationEndpoint,
   updateIntegration,
+  buildResolvedEndpoints,
 } from "../lib/data/integrations";
 import { ApiActionError } from "../lib/data/auth";
 import { executeRoutedShortcut } from "../lib/data/shortcuts";
@@ -61,6 +62,9 @@ const previewJsonCache = new Map<string, { body: unknown; expiresAt: number }>()
 const previewRedis = new RedisClient(
   Bun.env.REDIS_URL || Bun.env.VALKEY_URL || "redis://127.0.0.1:6379",
 );
+const integrationCacheRedis = new RedisClient(
+  Bun.env.REDIS_URL || Bun.env.VALKEY_URL || "redis://127.0.0.1:6379",
+);
 const previewJsonMaxBytes = 1_048_576;
 const previewJsonTimeoutMs = 10_000;
 let previewRedisUnavailable = false;
@@ -544,7 +548,8 @@ async function resolveWidgetConsumer(
   const mergedInput = mergeWidgetInput(resolvedEnv, opts.properties);
   const widgetJSON = applyWidgetInput(payload.widgetJSON, mergedInput ?? {});
 
-  const cacheContext = createIntegrationCacheContext({
+  const cacheContext = await createIntegrationCacheContext({
+    integrationId: payload.integrationId,
     localData: envWithStatefulHiddenVars.localData,
     type: "widget",
     key: opts.key,
@@ -639,7 +644,8 @@ async function resolveGlanceableConsumer(
     opts.properties,
   );
 
-  const cacheContext = createIntegrationCacheContext({
+  const cacheContext = await createIntegrationCacheContext({
+    integrationId: payload.integrationId,
     localData: envWithStatefulHiddenVars.localData,
     type: "glanceable",
     key: opts.key,
@@ -703,7 +709,7 @@ async function resolveFreshRuntime(
     { data: Record<string, any> | null; env: Record<string, string> }
   >,
   ctx: {
-    cacheContext: ReturnType<typeof createIntegrationCacheContext>;
+    cacheContext: Awaited<ReturnType<typeof createIntegrationCacheContext>>;
     isPreview: boolean;
     cacheConfig: IntegrationCacheConfig;
   },
@@ -742,7 +748,7 @@ async function resolveFreshRuntime(
 
 function buildCacheMeta(
   cacheConfig: IntegrationCacheConfig,
-  cacheContext: ReturnType<typeof createIntegrationCacheContext>,
+  cacheContext: Awaited<ReturnType<typeof createIntegrationCacheContext>>,
   fromCache = false,
   staleReturned = false,
 ) {
@@ -1088,7 +1094,66 @@ function buildConsumerStateVars(
   return merged;
 }
 
-function createIntegrationCacheContext(opts: {
+function integrationCacheRedisKey(integrationId: string, namespace: string, recordKey: string) {
+  const encoded = Buffer.from(recordKey, "utf8").toString("base64url");
+  return `integrations:cache:${integrationId}:${namespace}:${encoded}`;
+}
+
+async function readIntegrationCacheRecords(
+  integrationId: string,
+  namespace: string,
+  recordKeys: string[],
+): Promise<Record<string, CacheRecord>> {
+  const entries = await Promise.all(recordKeys.map(async (recordKey) => {
+    try {
+      const raw = await integrationCacheRedis.send("GET", [
+        integrationCacheRedisKey(integrationId, namespace, recordKey),
+      ]);
+      if (typeof raw !== "string") return null;
+      const parsed = JSON.parse(raw);
+      return isPlainObject(parsed) ? [recordKey, parsed as CacheRecord] as const : null;
+    } catch {
+      return null;
+    }
+  }));
+  return Object.fromEntries(entries.filter((entry): entry is readonly [string, CacheRecord] => entry !== null));
+}
+
+async function writeIntegrationCacheRecord(
+  integrationId: string,
+  namespace: string,
+  recordKey: string,
+  record: CacheRecord,
+  retentionSeconds: number | null,
+) {
+  const invalidatesAt = Number(record.invalidatesAt);
+  const ttl = Number.isFinite(invalidatesAt)
+    ? Math.max(1, Math.ceil((invalidatesAt - Date.now()) / 1000))
+    : Math.max(1, Number(retentionSeconds) || 1);
+  try {
+    await integrationCacheRedis.send("SET", [
+      integrationCacheRedisKey(integrationId, namespace, recordKey),
+      JSON.stringify(record),
+      "EX",
+      String(ttl),
+    ]);
+  } catch {
+    // Redis is an optional cache; a failed write must not break integrations.
+  }
+}
+
+async function deleteIntegrationCacheRecord(integrationId: string, namespace: string, recordKey: string) {
+  try {
+    await integrationCacheRedis.send("DEL", [
+      integrationCacheRedisKey(integrationId, namespace, recordKey),
+    ]);
+  } catch {
+    // Redis is an optional cache.
+  }
+}
+
+async function createIntegrationCacheContext(opts: {
+  integrationId: string;
   localData: unknown;
   type: ConsumerType;
   key: string;
@@ -1098,12 +1163,13 @@ function createIntegrationCacheContext(opts: {
   initialChanged?: boolean;
   sharedEndpointCache?: Map<string, ResolvedEndpointData>;
 }) {
-  const root: Record<string, any> = isPlainObject(opts.localData)
-    ? JSON.parse(JSON.stringify(opts.localData))
-    : {};
-  const cacheKV: Record<string, any> = isPlainObject(root.cacheKV)
-    ? root.cacheKV
-    : (root.cacheKV = {});
+  const sourceLocalData = isPlainObject(opts.localData) ? opts.localData : {};
+  const hadPersistedCache = Object.prototype.hasOwnProperty.call(sourceLocalData, "cacheKV");
+  const root: Record<string, any> = JSON.parse(JSON.stringify(sourceLocalData));
+  // cacheKV used to live in PocketBase localData. Keep it request-local and
+  // hydrate it from Redis so transient endpoint data is not persisted.
+  const cacheKV: Record<string, any> = {};
+  delete root.cacheKV;
 
   const statefulVars = buildConsumerStateVars(opts.integrationJSON, opts.input);
   const stateKey = Buffer.from(
@@ -1121,7 +1187,11 @@ function createIntegrationCacheContext(opts: {
 
   const cacheNamespace = `${opts.type}:${opts.key}:${stateKey}`;
   const runtimeSnapshotKey = `${cacheNamespace}:runtime`;
-  let changed = Boolean(opts.initialChanged);
+  const endpointIds = buildResolvedEndpoints(opts.integrationJSON, {}).map((ep) => ep.id ?? ep.name ?? "").filter(Boolean);
+  const redisCacheKeys = [runtimeSnapshotKey, ...endpointIds.map((id) => `${cacheNamespace}:endpoint:${id}`)];
+  const hydratedCache = await readIntegrationCacheRecords(opts.integrationId, cacheNamespace, redisCacheKeys);
+  Object.assign(cacheKV, hydratedCache);
+  const changed = Boolean(opts.initialChanged) || hadPersistedCache;
 
   const readRecord = (key: string): CacheRecord | null => {
     const record = cacheKV[key];
@@ -1129,7 +1199,7 @@ function createIntegrationCacheContext(opts: {
     const invalidatesAt = Number((record as CacheRecord).invalidatesAt);
     if (Number.isFinite(invalidatesAt) && invalidatesAt <= Date.now()) {
       delete cacheKV[key];
-      changed = true;
+      void deleteIntegrationCacheRecord(opts.integrationId, cacheNamespace, key);
       return null;
     }
     return record as CacheRecord;
@@ -1141,13 +1211,14 @@ function createIntegrationCacheContext(opts: {
     invalidatesAt: number | null,
     retentionSeconds: number | null,
   ) => {
-    cacheKV[key] = {
+    const record = {
       value,
       retentionSeconds,
       invalidatesAt,
       createdAt: Date.now(),
     } satisfies CacheRecord;
-    changed = true;
+    cacheKV[key] = record;
+    void writeIntegrationCacheRecord(opts.integrationId, cacheNamespace, key, record, retentionSeconds);
   };
 
   const endpointKey = (id: string) => `${cacheNamespace}:endpoint:${id}`;