From 947f875aa8b72f179b61a4917b0459cc101a6c8f Mon Sep 17 00:00:00 2001
From: felix bear <cocojojo5213@gmail.com>
Date: Tue, 9 Jun 2026 21:53:50 +0900
Subject: [PATCH 01/11] fix(jira): paginate auto-import search (#8161)

* fix(jira): paginate auto-import search #5578

* fix(jira): cap auto-import pagination

---------

Co-authored-by: cocojojo5213 <cocojojo5213@users.noreply.github.com>
---
 .../providers/jira/jira-api.service.spec.ts   | 213 +++++++++++++++++-
 .../issue/providers/jira/jira-api.service.ts  | 196 ++++++++++++++--
 .../issue/providers/jira/jira.const.ts        |   1 +
 3 files changed, 391 insertions(+), 19 deletions(-)

diff --git a/src/app/features/issue/providers/jira/jira-api.service.spec.ts b/src/app/features/issue/providers/jira/jira-api.service.spec.ts
index 39e91e8410..478673b5d6 100644
--- a/src/app/features/issue/providers/jira/jira-api.service.spec.ts
+++ b/src/app/features/issue/providers/jira/jira-api.service.spec.ts
@@ -7,9 +7,10 @@ import { SnackService } from '../../../../core/snack/snack.service';
 import { GlobalProgressBarService } from '../../../../core-ui/global-progress-bar/global-progress-bar.service';
 import { BannerService } from '../../../../core/banner/banner.service';
 import { MatDialog } from '@angular/material/dialog';
-import { DEFAULT_JIRA_CFG } from './jira.const';
+import { DEFAULT_JIRA_CFG, JIRA_MAX_AUTO_IMPORT_PAGES } from './jira.const';
 import { JiraCfg } from './jira.model';
 import { formatJiraDate } from '../../../../util/format-jira-date';
+import { JiraIssueOriginal } from './jira-api-responses';
 
 const makeMockExtensionService = (
   onReady$: Subject<boolean> | ReplaySubject<boolean>,
@@ -57,6 +58,44 @@ const baseCfg: JiraCfg = {
   password: 'pass',
 };
 
+const makeJiraIssue = (key: string): JiraIssueOriginal => ({
+  key,
+  id: key.replace(/\D/g, '') || key,
+  expand: '',
+  self: `https://jira.example.com/rest/api/latest/issue/${key}`,
+  fields: {
+    summary: `Summary ${key}`,
+    components: [],
+    attachment: [],
+    timeestimate: 0,
+    timespent: 0,
+    description: null,
+    assignee: null as any,
+    updated: '2026-06-08T00:00:00.000+0000',
+    status: {
+      self: '',
+      id: '1',
+      description: '',
+      iconUrl: '',
+      name: 'Open',
+      statusCategory: {
+        self: '',
+        id: '1',
+        key: 'new',
+        colorName: 'blue-gray',
+        name: 'To Do',
+      },
+    },
+    issuelinks: [],
+  },
+});
+
+const jsonResponse = (body: unknown, status = 200): Promise<Response> =>
+  Promise.resolve(new Response(JSON.stringify(body), { status }));
+
+const requestBodyAt = (fetchSpy: jasmine.Spy, index: number): Record<string, unknown> =>
+  JSON.parse((fetchSpy.calls.argsFor(index)[1] as RequestInit).body as string);
+
 describe('JiraApiService', () => {
   describe('addWorklog$ date formatting', () => {
     it('should format date correctly using formatJiraDate', () => {
@@ -290,4 +329,176 @@ describe('JiraApiService', () => {
       expect(fetchSpy).not.toHaveBeenCalled();
     });
   });
+
+  describe('findAutoImportIssues$ pagination', () => {
+    let service: JiraApiService;
+    let fetchSpy: jasmine.Spy;
+    const cfg = {
+      ...baseCfg,
+      allowFetchFallback: true,
+      autoAddBacklogJqlQuery: 'project = TEST ORDER BY updated DESC',
+    };
+
+    beforeEach(() => {
+      service = setupService(new Subject<boolean>());
+      fetchSpy = spyOn(window, 'fetch');
+    });
+
+    it('fetches all Jira Cloud search/jql pages via nextPageToken', (done) => {
+      fetchSpy.and.returnValues(
+        jsonResponse({
+          issues: [makeJiraIssue('TEST-1')],
+          maxResults: 100,
+          nextPageToken: 'token-2',
+        }),
+        jsonResponse({
+          issues: [makeJiraIssue('TEST-2')],
+          maxResults: 100,
+          nextPageToken: 'token-3',
+        }),
+        jsonResponse({
+          issues: [makeJiraIssue('TEST-3')],
+          maxResults: 100,
+        }),
+      );
+
+      service.findAutoImportIssues$(cfg).subscribe({
+        next: (issues) => {
+          expect(issues.map((issue) => issue.key)).toEqual([
+            'TEST-1',
+            'TEST-2',
+            'TEST-3',
+          ]);
+          expect(fetchSpy).toHaveBeenCalledTimes(3);
+          expect(String(fetchSpy.calls.argsFor(0)[0])).toContain('/search/jql');
+          expect(requestBodyAt(fetchSpy, 0)).toEqual(
+            jasmine.objectContaining({
+              jql: cfg.autoAddBacklogJqlQuery,
+              maxResults: 100,
+            }),
+          );
+          expect(requestBodyAt(fetchSpy, 1)).toEqual(
+            jasmine.objectContaining({ nextPageToken: 'token-2' }),
+          );
+          expect(requestBodyAt(fetchSpy, 2)).toEqual(
+            jasmine.objectContaining({ nextPageToken: 'token-3' }),
+          );
+          done();
+        },
+        error: done.fail,
+      });
+    });
+
+    it('caps Jira Cloud auto-import pagination', (done) => {
+      fetchSpy.and.returnValues(
+        ...Array.from({ length: JIRA_MAX_AUTO_IMPORT_PAGES + 1 }, (_, index) =>
+          jsonResponse({
+            issues: [makeJiraIssue(`TEST-${index + 1}`)],
+            maxResults: 100,
+            nextPageToken: `token-${index + 2}`,
+          }),
+        ),
+      );
+
+      service.findAutoImportIssues$(cfg).subscribe({
+        next: (issues) => {
+          expect(issues.map((issue) => issue.key)).toEqual([
+            'TEST-1',
+            'TEST-2',
+            'TEST-3',
+            'TEST-4',
+            'TEST-5',
+          ]);
+          expect(fetchSpy).toHaveBeenCalledTimes(JIRA_MAX_AUTO_IMPORT_PAGES);
+          expect(requestBodyAt(fetchSpy, JIRA_MAX_AUTO_IMPORT_PAGES - 1)).toEqual(
+            jasmine.objectContaining({ nextPageToken: 'token-5' }),
+          );
+          done();
+        },
+        error: done.fail,
+      });
+    });
+
+    it('falls back to Jira Server/DC search pages via startAt', (done) => {
+      fetchSpy.and.returnValues(
+        jsonResponse({ errorMessages: ['not found'] }, 404),
+        jsonResponse({
+          issues: [makeJiraIssue('TEST-1')],
+          maxResults: 100,
+          startAt: 0,
+          total: 250,
+        }),
+        jsonResponse({
+          issues: [makeJiraIssue('TEST-101')],
+          maxResults: 100,
+          startAt: 100,
+          total: 250,
+        }),
+        jsonResponse({
+          issues: [makeJiraIssue('TEST-201')],
+          maxResults: 100,
+          startAt: 200,
+          total: 250,
+        }),
+      );
+
+      service.findAutoImportIssues$(cfg).subscribe({
+        next: (issues) => {
+          expect(issues.map((issue) => issue.key)).toEqual([
+            'TEST-1',
+            'TEST-101',
+            'TEST-201',
+          ]);
+          expect(fetchSpy).toHaveBeenCalledTimes(4);
+          expect(String(fetchSpy.calls.argsFor(0)[0])).toContain('/search/jql');
+          expect(String(fetchSpy.calls.argsFor(1)[0])).toContain('/search');
+          expect(requestBodyAt(fetchSpy, 1)).not.toEqual(
+            jasmine.objectContaining({ startAt: jasmine.any(Number) }),
+          );
+          expect(requestBodyAt(fetchSpy, 2)).toEqual(
+            jasmine.objectContaining({ startAt: 100 }),
+          );
+          expect(requestBodyAt(fetchSpy, 3)).toEqual(
+            jasmine.objectContaining({ startAt: 200 }),
+          );
+          done();
+        },
+        error: done.fail,
+      });
+    });
+
+    it('caps Jira Server/DC auto-import pagination', (done) => {
+      fetchSpy.and.returnValues(
+        jsonResponse({ errorMessages: ['not found'] }, 404),
+        ...Array.from({ length: JIRA_MAX_AUTO_IMPORT_PAGES + 1 }, (_, index) => {
+          const startAt = index * 100;
+          const issueNumber = startAt + 1;
+          return jsonResponse({
+            issues: [makeJiraIssue(`TEST-${issueNumber}`)],
+            maxResults: 100,
+            startAt,
+            total: 1000,
+          });
+        }),
+      );
+
+      service.findAutoImportIssues$(cfg).subscribe({
+        next: (issues) => {
+          expect(issues.map((issue) => issue.key)).toEqual([
+            'TEST-1',
+            'TEST-101',
+            'TEST-201',
+            'TEST-301',
+            'TEST-401',
+          ]);
+          expect(fetchSpy).toHaveBeenCalledTimes(JIRA_MAX_AUTO_IMPORT_PAGES + 1);
+          expect(requestBodyAt(fetchSpy, JIRA_MAX_AUTO_IMPORT_PAGES)).toEqual(
+            jasmine.objectContaining({ startAt: 400 }),
+          );
+          done();
+        },
+        error: done.fail,
+      });
+    });
+  });
 });
diff --git a/src/app/features/issue/providers/jira/jira-api.service.ts b/src/app/features/issue/providers/jira/jira-api.service.ts
index af45e58a21..9950716571 100644
--- a/src/app/features/issue/providers/jira/jira-api.service.ts
+++ b/src/app/features/issue/providers/jira/jira-api.service.ts
@@ -3,18 +3,20 @@ import { nanoid } from 'nanoid';
 import { ChromeExtensionInterfaceService } from '../../../../core/chrome-extension-interface/chrome-extension-interface.service';
 import {
   JIRA_ADDITIONAL_ISSUE_FIELDS,
+  JIRA_MAX_AUTO_IMPORT_PAGES,
   JIRA_MAX_RESULTS,
   JIRA_REQUEST_TIMEOUT_DURATION,
 } from './jira.const';
 import {
   mapIssueResponse,
-  mapIssuesResponse,
   mapResponse,
   mapToSearchResults,
   mapToSearchResultsForJQL,
   mapTransitionResponse,
 } from './jira-issue-map.util';
 import {
+  JiraApiEnvelope,
+  JiraIssueOriginal,
   JiraOriginalStatus,
   JiraOriginalTransition,
   JiraOriginalUser,
@@ -30,6 +32,7 @@ import {
   concatMap,
   finalize,
   first,
+  map,
   mapTo,
   shareReplay,
   take,
@@ -85,6 +88,15 @@ interface JiraRequestCfg {
   body?: Record<string, unknown>;
 }
 
+type JiraIssueSearchResponse = {
+  issues: JiraIssueOriginal[];
+  maxResults?: number;
+  startAt?: number;
+  total?: number;
+  isLast?: boolean;
+  nextPageToken?: string;
+};
+
 @Injectable({
   providedIn: 'root',
 })
@@ -232,33 +244,27 @@ export class JiraApiService {
       });
     }
 
-    return this._sendRequest$({
-      jiraReqCfg: {
-        transform: mapIssuesResponse,
-        pathname: 'search/jql',
-        method: 'POST',
-        body: {
-          ...options,
-          jql: searchQuery,
-        },
-      },
+    return this._fetchAllJiraSearchPages$({
       cfg,
+      pathname: 'search/jql',
+      body: {
+        ...options,
+        jql: searchQuery,
+      },
+      isCloudJqlSearch: true,
       suppressErrorSnack: true,
     }).pipe(
       catchError((err) => {
         const code = extractHttpStatus(err);
         if (code === 401 || code === 403) return throwError(() => err);
         // Fallback for Server/DC: POST /search with jql in body
-        return this._sendRequest$({
-          jiraReqCfg: {
-            transform: mapIssuesResponse,
-            pathname: 'search',
-            method: 'POST',
-            body: { ...options, jql: searchQuery },
-          },
+        return this._fetchAllJiraSearchPages$({
           cfg,
+          pathname: 'search',
+          body: { ...options, jql: searchQuery },
         });
       }),
+      map((issues) => issues.map((issue) => mapIssueResponse({ response: issue }, cfg))),
     ) as Observable<JiraIssueReduced[]>;
   }
 
@@ -390,6 +396,160 @@ export class JiraApiService {
   // Complex Functions
 
   // --------
+  private _fetchAllJiraSearchPages$({
+    cfg,
+    pathname,
+    body,
+    isCloudJqlSearch = false,
+    suppressErrorSnack = false,
+  }: {
+    cfg: JiraCfg;
+    pathname: string;
+    body: Record<string, unknown>;
+    isCloudJqlSearch?: boolean;
+    suppressErrorSnack?: boolean;
+  }): Observable<JiraIssueOriginal[]> {
+    return this._fetchJiraSearchPage$({
+      cfg,
+      pathname,
+      body,
+      suppressErrorSnack,
+    }).pipe(
+      concatMap((firstPage) => {
+        return this._fetchRemainingJiraSearchPages$({
+          cfg,
+          pathname,
+          baseBody: body,
+          previousPage: firstPage,
+          isCloudJqlSearch,
+          suppressErrorSnack,
+          fetchedPages: 1,
+        }).pipe(map((issues) => [...(firstPage.issues || []), ...issues]));
+      }),
+    );
+  }
+
+  private _fetchRemainingJiraSearchPages$({
+    cfg,
+    pathname,
+    baseBody,
+    previousPage,
+    isCloudJqlSearch,
+    suppressErrorSnack,
+    fetchedPages,
+  }: {
+    cfg: JiraCfg;
+    pathname: string;
+    baseBody: Record<string, unknown>;
+    previousPage: JiraIssueSearchResponse;
+    isCloudJqlSearch: boolean;
+    suppressErrorSnack: boolean;
+    fetchedPages: number;
+  }): Observable<JiraIssueOriginal[]> {
+    if (fetchedPages >= JIRA_MAX_AUTO_IMPORT_PAGES) {
+      return of([]);
+    }
+
+    const nextPageBody = this._getNextJiraSearchPageBody({
+      previousPage,
+      baseBody,
+      isCloudJqlSearch,
+    });
+
+    if (!nextPageBody) {
+      return of([]);
+    }
+
+    return this._fetchJiraSearchPage$({
+      cfg,
+      pathname,
+      body: nextPageBody,
+      suppressErrorSnack,
+    }).pipe(
+      concatMap((page) =>
+        this._fetchRemainingJiraSearchPages$({
+          cfg,
+          pathname,
+          baseBody,
+          previousPage: page,
+          isCloudJqlSearch,
+          suppressErrorSnack,
+          fetchedPages: fetchedPages + 1,
+        }).pipe(map((issues) => [...(page.issues || []), ...issues])),
+      ),
+    );
+  }
+
+  private _fetchJiraSearchPage$({
+    cfg,
+    pathname,
+    body,
+    suppressErrorSnack,
+  }: {
+    cfg: JiraCfg;
+    pathname: string;
+    body: Record<string, unknown>;
+    suppressErrorSnack: boolean;
+  }): Observable<JiraIssueSearchResponse> {
+    return this._sendRequest$({
+      jiraReqCfg: {
+        pathname,
+        method: 'POST',
+        body,
+      },
+      cfg,
+      suppressErrorSnack,
+    }).pipe(
+      map(
+        (res) =>
+          ((res as JiraApiEnvelope<JiraIssueSearchResponse>).response ||
+            {}) as JiraIssueSearchResponse,
+      ),
+    );
+  }
+
+  private _getNextJiraSearchPageBody({
+    previousPage,
+    baseBody,
+    isCloudJqlSearch,
+  }: {
+    previousPage: JiraIssueSearchResponse;
+    baseBody: Record<string, unknown>;
+    isCloudJqlSearch: boolean;
+  }): Record<string, unknown> | null {
+    const maxResults =
+      typeof previousPage.maxResults === 'number'
+        ? previousPage.maxResults
+        : (baseBody.maxResults as number | undefined);
+    const issueCount = previousPage.issues?.length || 0;
+    const pageSize = Math.max(maxResults || issueCount || JIRA_MAX_RESULTS, 1);
+
+    if (isCloudJqlSearch) {
+      return previousPage.nextPageToken
+        ? {
+            ...baseBody,
+            nextPageToken: previousPage.nextPageToken,
+          }
+        : null;
+    }
+
+    if (
+      previousPage.total === undefined ||
+      previousPage.startAt === undefined ||
+      issueCount === 0
+    ) {
+      return null;
+    }
+
+    const startAt = previousPage.startAt + pageSize;
+    return startAt < previousPage.total
+      ? {
+          ...baseBody,
+          startAt,
+        }
+      : null;
+  }
+
   private _isInterfacesReadyIfNeeded$(cfg: JiraCfg): Observable<boolean> {
     if (IS_ELECTRON || IS_ANDROID_WEB_VIEW || cfg.allowFetchFallback) {
       return of(true);
diff --git a/src/app/features/issue/providers/jira/jira.const.ts b/src/app/features/issue/providers/jira/jira.const.ts
index e719b2f03c..4ae90d777f 100644
--- a/src/app/features/issue/providers/jira/jira.const.ts
+++ b/src/app/features/issue/providers/jira/jira.const.ts
@@ -58,6 +58,7 @@ export const JIRA_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ss.SSZZ';
 export const JIRA_ISSUE_TYPE = 'JIRA';
 export const JIRA_REQUEST_TIMEOUT_DURATION = 20000;
 export const JIRA_MAX_RESULTS = 100;
+export const JIRA_MAX_AUTO_IMPORT_PAGES = 5;
 export const JIRA_ADDITIONAL_ISSUE_FIELDS = [
   'assignee',
   'summary',

From d844559c6f39909878960beaeed1e82f3ae9b6d4 Mon Sep 17 00:00:00 2001
From: felix bear <cocojojo5213@gmail.com>
Date: Tue, 9 Jun 2026 21:55:05 +0900
Subject: [PATCH 02/11] fix(plugins): translate yesterday tasks plugin #5103
 (#8146)

Co-authored-by: cocojojo5213 <cocojojo5213@users.noreply.github.com>
---
 packages/plugin-dev/scripts/build-all.js      |   4 +
 .../yesterday-tasks-plugin/i18n/de.json       |  19 +++
 .../yesterday-tasks-plugin/i18n/en.json       |  19 +++
 .../yesterday-tasks-plugin/index.html         | 117 +++++++++++-------
 .../yesterday-tasks-plugin/manifest.json      |   3 +
 .../yesterday-tasks-plugin/plugin.js          |   2 +-
 src/app/plugins/plugin-bridge.service.ts      |  19 +++
 src/app/plugins/plugin-runner.spec.ts         |  43 ++++++-
 src/app/plugins/plugin-runner.ts              |  21 +++-
 .../plugins/util/plugin-iframe.util.spec.ts   |  48 ++++++-
 src/app/plugins/util/plugin-iframe.util.ts    |   5 +
 11 files changed, 244 insertions(+), 56 deletions(-)
 create mode 100644 packages/plugin-dev/yesterday-tasks-plugin/i18n/de.json
 create mode 100644 packages/plugin-dev/yesterday-tasks-plugin/i18n/en.json

diff --git a/packages/plugin-dev/scripts/build-all.js b/packages/plugin-dev/scripts/build-all.js
index 4f1e5a41b0..0e09f46071 100755
--- a/packages/plugin-dev/scripts/build-all.js
+++ b/packages/plugin-dev/scripts/build-all.js
@@ -175,6 +175,10 @@ const plugins = [
           fs.copyFileSync(src, dest);
         }
       }
+      const i18nSrc = path.join(pluginPath, 'i18n');
+      if (fs.existsSync(i18nSrc)) {
+        copyRecursive(i18nSrc, path.join(targetDir, 'i18n'));
+      }
       return 'Copied to assets';
     },
   },
diff --git a/packages/plugin-dev/yesterday-tasks-plugin/i18n/de.json b/packages/plugin-dev/yesterday-tasks-plugin/i18n/de.json
new file mode 100644
index 0000000000..8f1ee6363c
--- /dev/null
+++ b/packages/plugin-dev/yesterday-tasks-plugin/i18n/de.json
@@ -0,0 +1,19 @@
+{
+  "PLUGIN": {
+    "NAME": "Aufgaben von gestern",
+    "DESCRIPTION": "Zeigt alle Aufgaben an, an denen du gestern gearbeitet hast, inklusive der jeweils erfassten Zeit."
+  },
+  "SHORTCUT": {
+    "SHOW_YESTERDAY_TASKS": "Aufgaben von gestern anzeigen"
+  },
+  "DATE": {
+    "YESTERDAY": "Gestern",
+    "DAYS_AGO": "vor {{count}} Tagen"
+  },
+  "MESSAGES": {
+    "LOADING_TASKS": "Aufgaben werden geladen...",
+    "NO_RECENT_TASKS_FOUND": "Keine aktuellen Aufgaben gefunden",
+    "NO_TASKS_LAST_30_DAYS": "In den letzten 30 Tagen wurden keine Aufgaben erfasst.",
+    "ERROR_LOADING_TASKS": "Fehler beim Laden der Aufgaben. Bitte versuche es erneut."
+  }
+}
diff --git a/packages/plugin-dev/yesterday-tasks-plugin/i18n/en.json b/packages/plugin-dev/yesterday-tasks-plugin/i18n/en.json
new file mode 100644
index 0000000000..dfe11def0e
--- /dev/null
+++ b/packages/plugin-dev/yesterday-tasks-plugin/i18n/en.json
@@ -0,0 +1,19 @@
+{
+  "PLUGIN": {
+    "NAME": "Yesterday's Tasks",
+    "DESCRIPTION": "Shows all tasks you worked on yesterday with time spent on each."
+  },
+  "SHORTCUT": {
+    "SHOW_YESTERDAY_TASKS": "Show Yesterday's Tasks"
+  },
+  "DATE": {
+    "YESTERDAY": "Yesterday",
+    "DAYS_AGO": "{{count}} days ago"
+  },
+  "MESSAGES": {
+    "LOADING_TASKS": "Loading tasks...",
+    "NO_RECENT_TASKS_FOUND": "No recent tasks found",
+    "NO_TASKS_LAST_30_DAYS": "No tasks tracked in the last 30 days.",
+    "ERROR_LOADING_TASKS": "Error loading tasks. Please try again."
+  }
+}
diff --git a/packages/plugin-dev/yesterday-tasks-plugin/index.html b/packages/plugin-dev/yesterday-tasks-plugin/index.html
index df2e30b144..a5a528e3d3 100644
--- a/packages/plugin-dev/yesterday-tasks-plugin/index.html
+++ b/packages/plugin-dev/yesterday-tasks-plugin/index.html
@@ -73,7 +73,12 @@
       ></div>
 
       <div id="content">
-        <div class="loading">Loading tasks...</div>
+        <div
+          class="loading"
+          data-i18n="MESSAGES.LOADING_TASKS"
+        >
+          Loading tasks...
+        </div>
       </div>
     </div>
 
@@ -128,12 +133,56 @@
         return minutes + 'm';
       }
 
-      // Wait for plugin API to be available
-      function waitForPlugin() {
-        if (typeof PluginAPI !== 'undefined') {
-          init();
+      async function translate(key, params) {
+        if (
+          typeof PluginAPI !== 'undefined' &&
+          typeof PluginAPI.translate === 'function'
+        ) {
+          return await PluginAPI.translate(key, params);
+        }
+        return key;
+      }
+
+      async function formatPluginDate(date, format) {
+        if (
+          typeof PluginAPI !== 'undefined' &&
+          typeof PluginAPI.formatDate === 'function'
+        ) {
+          return await PluginAPI.formatDate(date, format);
+        }
+        return date.toLocaleDateString('en-US', {
+          weekday: 'long',
+          year: 'numeric',
+          month: 'long',
+          day: 'numeric',
+        });
+      }
+
+      async function applyStaticTranslations() {
+        await Promise.all(
+          Array.from(document.querySelectorAll('[data-i18n]')).map(async (el) => {
+            el.textContent = await translate(el.dataset.i18n);
+          }),
+        );
+      }
+
+      async function updateDateDisplay(result) {
+        const dateEl = document.getElementById('yesterday-date');
+        if (result.tasks.length > 0) {
+          const dateText = await formatPluginDate(result.date, 'long');
+
+          if (result.daysBack === 1) {
+            dateEl.textContent =
+              dateText + ' (' + (await translate('DATE.YESTERDAY')) + ')';
+          } else {
+            dateEl.textContent =
+              dateText +
+              ' (' +
+              (await translate('DATE.DAYS_AGO', { count: result.daysBack })) +
+              ')';
+          }
         } else {
-          setTimeout(waitForPlugin, 100);
+          dateEl.textContent = await translate('MESSAGES.NO_RECENT_TASKS_FOUND');
         }
       }
 
@@ -257,42 +306,27 @@
 
       async function init() {
         try {
+          await applyStaticTranslations();
           const result = await getLastAvailableTasks();
           const projects = await PluginAPI.getAllProjects();
 
-          // Update the date display based on what was found
-          const dateEl = document.getElementById('yesterday-date');
-          if (result.tasks.length > 0) {
-            const dateText = result.date.toLocaleDateString('en-US', {
-              weekday: 'long',
-              year: 'numeric',
-              month: 'long',
-              day: 'numeric',
-            });
+          await updateDateDisplay(result);
 
-            if (result.daysBack === 1) {
-              dateEl.textContent = dateText + ' (Yesterday)';
-            } else {
-              dateEl.textContent = dateText + ` (${result.daysBack} days ago)`;
-            }
-          } else {
-            dateEl.textContent = 'No recent tasks found';
-          }
-
-          displayTasks(result.tasks, projects);
+          await displayTasks(result.tasks, projects);
         } catch (error) {
           console.error('Error loading tasks:', error);
+          const errorMsg = await translate('MESSAGES.ERROR_LOADING_TASKS');
           document.getElementById('content').innerHTML =
-            '<div class="no-tasks">Error loading tasks. Please try again.</div>';
+            `<div class="no-tasks">${escapeHtml(errorMsg)}</div>`;
         }
       }
 
-      function displayTasks(tasks, projects = []) {
+      async function displayTasks(tasks, projects = []) {
         const contentEl = document.getElementById('content');
 
         if (tasks.length === 0) {
-          contentEl.innerHTML =
-            '<div class="no-tasks">No tasks tracked in the last 30 days.</div>';
+          const noTasksMsg = await translate('MESSAGES.NO_TASKS_LAST_30_DAYS');
+          contentEl.innerHTML = `<div class="no-tasks">${escapeHtml(noTasksMsg)}</div>`;
           return;
         }
 
@@ -339,26 +373,9 @@
         const result = await getLastAvailableTasks();
         const projects = await PluginAPI.getAllProjects();
 
-        // Update the date display
-        const dateEl = document.getElementById('yesterday-date');
-        if (result.tasks.length > 0) {
-          const dateText = result.date.toLocaleDateString('en-US', {
-            weekday: 'long',
-            year: 'numeric',
-            month: 'long',
-            day: 'numeric',
-          });
+        await updateDateDisplay(result);
 
-          if (result.daysBack === 1) {
-            dateEl.textContent = dateText + ' (Yesterday)';
-          } else {
-            dateEl.textContent = dateText + ` (${result.daysBack} days ago)`;
-          }
-        } else {
-          dateEl.textContent = 'No recent tasks found';
-        }
-
-        displayTasks(result.tasks, projects);
+        await displayTasks(result.tasks, projects);
       }
 
       // Register hooks to refresh on task changes
@@ -372,6 +389,10 @@
         PluginAPI.registerHook(PluginAPI.Hooks.TASK_DELETE, (taskData) => {
           refreshTasks();
         });
+        PluginAPI.registerHook(PluginAPI.Hooks.LANGUAGE_CHANGE, async () => {
+          await applyStaticTranslations();
+          await refreshTasks();
+        });
       }
 
       // Start
diff --git a/packages/plugin-dev/yesterday-tasks-plugin/manifest.json b/packages/plugin-dev/yesterday-tasks-plugin/manifest.json
index 3bf589d259..81a4268869 100644
--- a/packages/plugin-dev/yesterday-tasks-plugin/manifest.json
+++ b/packages/plugin-dev/yesterday-tasks-plugin/manifest.json
@@ -7,6 +7,9 @@
   "description": "Shows all tasks you worked on yesterday with time spent on each.",
   "hooks": [],
   "permissions": ["getTasks", "getArchivedTasks", "showIndexHtmlAsView", "openDialog"],
+  "i18n": {
+    "languages": ["en", "de"]
+  },
   "iFrame": true,
   "sidePanel": true,
   "type": "standard",
diff --git a/packages/plugin-dev/yesterday-tasks-plugin/plugin.js b/packages/plugin-dev/yesterday-tasks-plugin/plugin.js
index b17c0cf9a1..5d64f0d3b8 100644
--- a/packages/plugin-dev/yesterday-tasks-plugin/plugin.js
+++ b/packages/plugin-dev/yesterday-tasks-plugin/plugin.js
@@ -3,7 +3,7 @@ console.log("Yesterday's Tasks Plugin loaded");
 // Register a keyboard shortcut
 PluginAPI.registerShortcut({
   id: 'show_yesterday',
-  label: "Show Yesterday's Tasks",
+  label: PluginAPI.translate('SHORTCUT.SHOW_YESTERDAY_TASKS'),
   onExec: function () {
     PluginAPI.showIndexHtmlAsView();
   },
diff --git a/src/app/plugins/plugin-bridge.service.ts b/src/app/plugins/plugin-bridge.service.ts
index d291aae84a..4f9f5a0ac5 100644
--- a/src/app/plugins/plugin-bridge.service.ts
+++ b/src/app/plugins/plugin-bridge.service.ts
@@ -85,6 +85,8 @@ import { createPluginSyncAdapter } from './issue-provider/plugin-sync-adapter.se
 import { PluginOAuthBridgeService } from './oauth/plugin-oauth-bridge.service';
 import { ISSUE_PROVIDER_TYPES } from '../features/issue/issue.const';
 import { PluginService } from './plugin.service';
+import { PluginI18nService } from './plugin-i18n.service';
+import { formatDateForPlugin } from './plugin-i18n-date.util';
 
 // New imports for simple counters
 import { selectAllSimpleCounters } from '../features/simple-counter/store/simple-counter.reducer';
@@ -103,6 +105,8 @@ import {
 import { getDbDateStr } from '../util/get-db-date-str';
 import { DataInitService } from '../core/data-init/data-init.service';
 
+type PluginDateFormat = 'short' | 'medium' | 'long' | 'time' | 'datetime';
+
 /**
  * PluginBridge acts as an intermediary layer between plugins and the main application services.
  * This provides:
@@ -247,6 +251,9 @@ export class PluginBridgeService implements OnDestroy {
     startOAuthFlow: (config: OAuthFlowConfig) => Promise<OAuthTokenResult>;
     getOAuthToken: () => Promise<string | null>;
     clearOAuthToken: () => Promise<void>;
+    translate: (key: string, params?: Record<string, string | number>) => string;
+    formatDate: (date: Date | string | number, format: PluginDateFormat) => string;
+    getCurrentLanguage: () => string;
     log: ReturnType<typeof Log.withContext>;
   } {
     return {
@@ -336,6 +343,18 @@ export class PluginBridgeService implements OnDestroy {
       clearOAuthToken: (): Promise<void> =>
         this._pluginOAuthBridge.clearOAuthTokens(pluginId),
 
+      // i18n
+      translate: (key: string, params?: Record<string, string | number>): string =>
+        this._injector.get(PluginI18nService).translate(pluginId, key, params),
+      formatDate: (date: Date | string | number, format: PluginDateFormat): string =>
+        formatDateForPlugin(
+          date,
+          format,
+          this._injector.get(PluginI18nService).getCurrentLanguage(),
+        ),
+      getCurrentLanguage: (): string =>
+        this._injector.get(PluginI18nService).getCurrentLanguage(),
+
       // Logging
       log: Log.withContext(`${pluginId}`),
     };
diff --git a/src/app/plugins/plugin-runner.spec.ts b/src/app/plugins/plugin-runner.spec.ts
index bf5b38ec26..f8af9e2025 100644
--- a/src/app/plugins/plugin-runner.spec.ts
+++ b/src/app/plugins/plugin-runner.spec.ts
@@ -14,6 +14,7 @@ describe('PluginRunner', () => {
   let mockSnackService: jasmine.SpyObj<SnackService>;
   let mockCleanupService: jasmine.SpyObj<PluginCleanupService>;
   let mockI18nService: jasmine.SpyObj<PluginI18nService>;
+  let registerSidePanelButtonSpy: jasmine.Spy;
 
   const mockManifest: PluginManifest = {
     id: 'test-plugin',
@@ -39,7 +40,10 @@ describe('PluginRunner', () => {
       'pingNodeBridge',
     ]);
     // createBoundMethods should return an empty object (no additional bound methods)
-    mockPluginBridge.createBoundMethods.and.returnValue({} as any);
+    registerSidePanelButtonSpy = jasmine.createSpy('registerSidePanelButton');
+    mockPluginBridge.createBoundMethods.and.returnValue({
+      registerSidePanelButton: registerSidePanelButtonSpy,
+    } as any);
     mockPluginBridge.pingNodeBridge.and.resolveTo(false);
 
     mockSecurityService = jasmine.createSpyObj('PluginSecurityService', [
@@ -57,6 +61,7 @@ describe('PluginRunner', () => {
       'unloadPluginTranslations',
     ]);
     mockI18nService.getCurrentLanguage.and.returnValue('en');
+    mockI18nService.translate.and.callFake((_pluginId, key) => key);
 
     TestBed.configureTestingModule({
       providers: [
@@ -155,6 +160,42 @@ describe('PluginRunner', () => {
         mockManifest,
       );
     });
+
+    it('uses plugin i18n for auto-registered side panel labels', async () => {
+      mockI18nService.translate
+        .withArgs('test-plugin', 'PLUGIN.NAME')
+        .and.returnValue('Aufgaben von gestern');
+
+      await service.loadPlugin(
+        {
+          ...mockManifest,
+          sidePanel: true,
+          i18n: { languages: ['en', 'de'] },
+        },
+        `/* no-op */`,
+        mockBaseCfg,
+      );
+
+      expect(registerSidePanelButtonSpy).toHaveBeenCalledOnceWith(
+        jasmine.objectContaining({ label: 'Aufgaben von gestern' }),
+      );
+    });
+
+    it('falls back to manifest name when plugin name i18n is missing', async () => {
+      await service.loadPlugin(
+        {
+          ...mockManifest,
+          sidePanel: true,
+          i18n: { languages: ['en', 'de'] },
+        },
+        `/* no-op */`,
+        mockBaseCfg,
+      );
+
+      expect(registerSidePanelButtonSpy).toHaveBeenCalledOnceWith(
+        jasmine.objectContaining({ label: 'Test Plugin' }),
+      );
+    });
   });
 
   describe('unloadPlugin', () => {
diff --git a/src/app/plugins/plugin-runner.ts b/src/app/plugins/plugin-runner.ts
index a75cd53556..18a9fc4307 100644
--- a/src/app/plugins/plugin-runner.ts
+++ b/src/app/plugins/plugin-runner.ts
@@ -84,9 +84,14 @@ export class PluginRunner {
 
         // Register UI components for iframe plugins
         // Skip menu entry if this is a side panel plugin
+        const pluginDisplayName = this._translatePluginText(
+          manifest,
+          'PLUGIN.NAME',
+          manifest.name,
+        );
         if (manifest.iFrame && !manifest.isSkipMenuEntry && !manifest.sidePanel) {
           pluginAPI.registerMenuEntry({
-            label: manifest.name,
+            label: pluginDisplayName,
             icon: manifest.icon || 'extension',
             onClick: () => pluginAPI.showIndexHtmlAsView(),
           });
@@ -95,7 +100,7 @@ export class PluginRunner {
         // Auto-register side panel if configured
         if (manifest.sidePanel) {
           pluginAPI.registerSidePanelButton({
-            label: manifest.name,
+            label: pluginDisplayName,
             icon: manifest.icon || 'extension',
             onClick: () => {
               // No-op: the side panel toggle is handled by PluginSidePanelBtnsComponent
@@ -117,6 +122,18 @@ export class PluginRunner {
     }
   }
 
+  private _translatePluginText(
+    manifest: PluginManifest,
+    key: string,
+    fallback: string,
+  ): string {
+    if (!manifest.i18n?.languages?.length) {
+      return fallback;
+    }
+    const translated = this._pluginI18nService.translate(manifest.id, key);
+    return translated === key ? fallback : translated;
+  }
+
   /**
    * Execute plugin code - KISS approach
    */
diff --git a/src/app/plugins/util/plugin-iframe.util.spec.ts b/src/app/plugins/util/plugin-iframe.util.spec.ts
index 26058866d8..467126a53c 100644
--- a/src/app/plugins/util/plugin-iframe.util.spec.ts
+++ b/src/app/plugins/util/plugin-iframe.util.spec.ts
@@ -11,7 +11,10 @@ import {
 } from './plugin-iframe.util';
 
 describe('handlePluginMessage()', () => {
-  const createConfig = (pluginBridge: PluginBridgeService): PluginIframeConfig => ({
+  const createConfig = (
+    pluginBridge: PluginBridgeService,
+    boundMethods?: PluginIframeConfig['boundMethods'],
+  ): PluginIframeConfig => ({
     pluginId: 'test-plugin',
     manifest: {
       id: 'test-plugin',
@@ -30,9 +33,7 @@ describe('handlePluginMessage()', () => {
       isDev: false,
     } as PluginBaseCfg,
     pluginBridge,
-    boundMethods: {} as ReturnType<
-      typeof PluginBridgeService.prototype.createBoundMethods
-    >,
+    boundMethods,
   });
 
   it('rebuilds iframe dialog button handlers and returns the selected result', async () => {
@@ -169,6 +170,45 @@ describe('handlePluginMessage()', () => {
     );
   });
 
+  it('routes iframe i18n API calls through plugin-bound methods', async () => {
+    const sourceWindow = jasmine.createSpyObj<{ postMessage: jasmine.Spy }>(
+      'sourceWindow',
+      ['postMessage'],
+    );
+    const translate = jasmine
+      .createSpy('translate')
+      .withArgs('DATE.YESTERDAY', { days: 1 })
+      .and.returnValue('Gestern');
+    const pluginBridge = {
+      createBoundMethods: () => ({
+        translate,
+      }),
+    } as unknown as PluginBridgeService;
+
+    await handlePluginMessage(
+      {
+        data: {
+          type: PluginIframeMessageType.API_CALL,
+          method: 'translate',
+          callId: 11,
+          args: ['DATE.YESTERDAY', { days: 1 }],
+        },
+        source: sourceWindow,
+      } as unknown as MessageEvent,
+      createConfig(pluginBridge),
+    );
+
+    expect(translate).toHaveBeenCalledOnceWith('DATE.YESTERDAY', { days: 1 });
+    expect(sourceWindow.postMessage).toHaveBeenCalledWith(
+      {
+        type: PluginIframeMessageType.API_RESPONSE,
+        callId: 11,
+        result: 'Gestern',
+      },
+      '*',
+    );
+  });
+
   it('generates iframe code that waits for async dialog button handlers', () => {
     const script = createPluginApiScript(
       createConfig({ createBoundMethods: () => ({}) } as unknown as PluginBridgeService),
diff --git a/src/app/plugins/util/plugin-iframe.util.ts b/src/app/plugins/util/plugin-iframe.util.ts
index c2580770ee..cfebf4d217 100644
--- a/src/app/plugins/util/plugin-iframe.util.ts
+++ b/src/app/plugins/util/plugin-iframe.util.ts
@@ -404,6 +404,11 @@ export const createPluginApiScript = (config: PluginIframeConfig): string => {
           deleteCounter: (id) => callApi('deleteCounter', [id]),
           getAllCounters: () => callApi('getAllCounters'),
 
+          // i18n
+          translate: (key, params) => callApi('translate', [key, params]),
+          formatDate: (date, format) => callApi('formatDate', [date, format]),
+          getCurrentLanguage: () => callApi('getCurrentLanguage'),
+
           // Readiness signal for iframe plugins.
           //
           // NOTE — semantic difference from host-side onReady:

From 1c536568890daf4224685a715ab74377db3f8183 Mon Sep 17 00:00:00 2001
From: felix bear <cocojojo5213@gmail.com>
Date: Tue, 9 Jun 2026 22:00:43 +0900
Subject: [PATCH 03/11] fix(jira): honor no_proxy for electron requests #6324
 (#8177)

Co-authored-by: cocojojo5213 <cocojojo5213@users.noreply.github.com>
---
 electron/jira.ts              |   2 +-
 electron/proxy-agent.test.cjs | 168 ++++++++++++++++++++++++++++++++++
 electron/proxy-agent.ts       |  74 ++++++++++++++-
 3 files changed, 241 insertions(+), 3 deletions(-)
 create mode 100644 electron/proxy-agent.test.cjs

diff --git a/electron/jira.ts b/electron/jira.ts
index aad2b4ff5e..421e447173 100644
--- a/electron/jira.ts
+++ b/electron/jira.ts
@@ -18,7 +18,7 @@ export const sendJiraRequest = ({
   jiraCfg: JiraCfg;
 }): void => {
   const mainWin = getWin();
-  const agent = createProxyAwareAgent(jiraCfg?.isAllowSelfSignedCertificate);
+  const agent = createProxyAwareAgent(url, jiraCfg?.isAllowSelfSignedCertificate);
 
   fetch(url, {
     ...requestInit,
diff --git a/electron/proxy-agent.test.cjs b/electron/proxy-agent.test.cjs
new file mode 100644
index 0000000000..c6b242b549
--- /dev/null
+++ b/electron/proxy-agent.test.cjs
@@ -0,0 +1,168 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const path = require('node:path');
+const Module = require('node:module');
+const { Agent: HttpsAgent } = require('node:https');
+const { HttpsProxyAgent } = require('https-proxy-agent');
+
+require('ts-node/register/transpile-only');
+
+const originalModuleLoad = Module._load;
+const originalEnv = { ...process.env };
+const proxyAgentModulePath = path.resolve(__dirname, 'proxy-agent.ts');
+
+const resetModule = () => {
+  delete require.cache[proxyAgentModulePath];
+};
+
+const clearProxyEnv = () => {
+  delete process.env.HTTPS_PROXY;
+  delete process.env.https_proxy;
+  delete process.env.HTTP_PROXY;
+  delete process.env.http_proxy;
+  delete process.env.NO_PROXY;
+  delete process.env.no_proxy;
+};
+
+const installMocks = () => {
+  Module._load = function patchedLoad(request, parent, isMain) {
+    if (request === 'electron-log/main') {
+      return {
+        log: () => {},
+      };
+    }
+
+    return originalModuleLoad.call(this, request, parent, isMain);
+  };
+};
+
+const loadProxyAgentModule = () => {
+  resetModule();
+  return require(proxyAgentModulePath);
+};
+
+test.beforeEach(() => {
+  clearProxyEnv();
+  installMocks();
+  resetModule();
+});
+
+test.afterEach(() => {
+  Module._load = originalModuleLoad;
+  process.env = { ...originalEnv };
+  resetModule();
+});
+
+test('returns undefined when no proxy or self-signed handling is configured', () => {
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  assert.equal(
+    createProxyAwareAgent('https://jira.internal.example/rest/api'),
+    undefined,
+  );
+});
+
+test('creates a proxy agent from HTTPS_PROXY', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  const agent = createProxyAwareAgent('https://jira.external.example/rest/api');
+
+  assert.ok(agent instanceof HttpsProxyAgent);
+  assert.equal(agent.proxy.href, 'http://proxy.example:8080/');
+});
+
+test('bypasses proxy for an exact NO_PROXY host match', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.NO_PROXY = 'jira.internal.example';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  assert.equal(
+    createProxyAwareAgent('https://jira.internal.example/rest/api'),
+    undefined,
+  );
+});
+
+test('bypasses proxy for subdomains of a bare NO_PROXY domain', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.NO_PROXY = 'internal.example';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  assert.equal(
+    createProxyAwareAgent('https://jira.internal.example/rest/api'),
+    undefined,
+  );
+  assert.ok(
+    createProxyAwareAgent('https://notinternal.example/rest/api') instanceof
+      HttpsProxyAgent,
+  );
+});
+
+test('honors lowercase no_proxy and leading-dot suffix matches', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.no_proxy = '.internal.example';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  assert.equal(
+    createProxyAwareAgent('https://jira.internal.example/rest/api'),
+    undefined,
+  );
+  assert.equal(createProxyAwareAgent('https://internal.example/rest/api'), undefined);
+});
+
+test('honors wildcard NO_PROXY entries', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.NO_PROXY = '*';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  assert.equal(
+    createProxyAwareAgent('https://jira.external.example/rest/api'),
+    undefined,
+  );
+});
+
+test('honors wildcard suffix NO_PROXY entries', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.NO_PROXY = '*.corp.example';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  assert.equal(createProxyAwareAgent('https://jira.corp.example/rest/api'), undefined);
+});
+
+test('requires NO_PROXY port entries to match the request port', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.NO_PROXY = 'jira.internal.example:8443';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  assert.equal(
+    createProxyAwareAgent('https://jira.internal.example:8443/rest/api'),
+    undefined,
+  );
+  assert.ok(
+    createProxyAwareAgent('https://jira.internal.example:443/rest/api') instanceof
+      HttpsProxyAgent,
+  );
+});
+
+test('keeps self-signed handling when NO_PROXY bypasses the proxy', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.NO_PROXY = 'jira.internal.example';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  const agent = createProxyAwareAgent('https://jira.internal.example/rest/api', true);
+
+  assert.ok(agent instanceof HttpsAgent);
+  assert.equal(agent.options.rejectUnauthorized, false);
+});
+
+test('keeps proxy handling for non-matching NO_PROXY entries', () => {
+  process.env.HTTPS_PROXY = 'http://proxy.example:8080';
+  process.env.NO_PROXY = 'other.internal.example,.corp.example';
+  const { createProxyAwareAgent } = loadProxyAgentModule();
+
+  const agent = createProxyAwareAgent('https://jira.internal.example/rest/api', true);
+
+  assert.ok(agent instanceof HttpsProxyAgent);
+  assert.equal(agent.proxy.href, 'http://proxy.example:8080/');
+  assert.equal(agent.options.rejectUnauthorized, false);
+});
diff --git a/electron/proxy-agent.ts b/electron/proxy-agent.ts
index dc991a309c..c069a633be 100644
--- a/electron/proxy-agent.ts
+++ b/electron/proxy-agent.ts
@@ -13,11 +13,80 @@ export const getProxyUrl = (): string | undefined =>
   process.env.http_proxy ||
   undefined;
 
+const getNoProxy = (): string | undefined =>
+  process.env.NO_PROXY || process.env.no_proxy || undefined;
+
+const getUrlPort = (url: URL): string =>
+  url.port || (url.protocol === 'http:' ? '80' : url.protocol === 'https:' ? '443' : '');
+
+const parseNoProxyEntry = (
+  rawEntry: string,
+): { host: string; port?: string } | undefined => {
+  const entry = rawEntry.trim().toLowerCase();
+  if (!entry) {
+    return undefined;
+  }
+
+  const withoutProtocol = entry.replace(/^[a-z][a-z\d+.-]*:\/\//, '');
+  const withoutPath = withoutProtocol.split('/')[0];
+  const portMatch = withoutPath.match(/:(\d+)$/);
+  const port = portMatch?.[1];
+  const host = (port ? withoutPath.slice(0, -port.length - 1) : withoutPath).replace(
+    /^\[(.*)]$/,
+    '$1',
+  );
+
+  return host ? { host, port } : undefined;
+};
+
+export const isNoProxyMatch = (requestUrl: string, noProxy = getNoProxy()): boolean => {
+  if (!noProxy) {
+    return false;
+  }
+
+  let url: URL;
+  try {
+    url = new URL(requestUrl);
+  } catch {
+    return false;
+  }
+
+  const targetHost = url.hostname.toLowerCase();
+  const targetPort = getUrlPort(url);
+
+  return noProxy
+    .split(/[,\s]+/)
+    .map(parseNoProxyEntry)
+    .filter((entry): entry is { host: string; port?: string } => !!entry)
+    .some(({ host, port }) => {
+      if (host === '*') {
+        return true;
+      }
+
+      if (port && port !== targetPort) {
+        return false;
+      }
+
+      if (host.startsWith('*.')) {
+        const suffix = host.slice(1);
+        return targetHost.endsWith(suffix);
+      }
+
+      if (host.startsWith('.')) {
+        return targetHost === host.slice(1) || targetHost.endsWith(host);
+      }
+
+      return targetHost === host || targetHost.endsWith(`.${host}`);
+    });
+};
+
 /**
  * Builds a node-fetch–compatible HTTPS agent that respects:
  *  1. Proxy environment variables (HTTPS_PROXY / HTTP_PROXY)
- *  2. An opt-in flag to accept self-signed certificates on the **target** server
+ *  2. NO_PROXY / no_proxy bypasses for the current request URL
+ *  3. An opt-in flag to accept self-signed certificates on the **target** server
  *
+ * @param requestUrl       The URL about to be requested.
  * @param allowSelfSigned  When `true`, TLS certificate errors on both the
  *                         proxy **and** the target connection are ignored.
  *                         This is intentional – the user opted in via the
@@ -26,11 +95,12 @@ export const getProxyUrl = (): string | undefined =>
  *          a proxy nor self-signed handling is needed.
  */
 export const createProxyAwareAgent = (
+  requestUrl: string,
   allowSelfSigned = false,
 ): HttpsProxyAgent<string> | HttpsAgent | undefined => {
   const proxyUrl = getProxyUrl();
 
-  if (proxyUrl) {
+  if (proxyUrl && !isNoProxyMatch(requestUrl)) {
     log(`Using proxy.${allowSelfSigned ? ' (self-signed certs allowed)' : ''}`);
 
     const agent = new HttpsProxyAgent(proxyUrl, {

From 4c869c2e15e1030095564f6b5a2eb2e05ee2396f Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannesjo@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:03:20 +0200
Subject: [PATCH 04/11] feat(plugins): migrate Gitea and Linear issue providers
 to plugins (#8204)

* feat(plugins): migrate Gitea and Linear issue providers to plugins

* feat(plugins): localize Gitea issue provider config form

Port the existing Gitea translations (F.GITEA.* + shared issue-content keys)
into the plugin's own i18n so non-English users keep localized config labels
after the plugin migration. Generated for all 28 app locales.

* docs(plugins): note Linear teamId/projectId filter is now active

The built-in Linear provider defined teamId/projectId config fields but never
passed them to the search, so they were inert. The plugin honors them as the
field labels promise; document this as a deliberate behavior change.

* test(issue): fix unknown casts in issue-provider migration spec

The spec compiled clean under the app tsconfig (which excludes *.spec.ts)
but failed CI's tsconfig.spec.json build: casting state.entities[id]
(IssueProvider | undefined) straight to Record<string, unknown> is a
TS2352 non-overlap error, and .toBe(already) on a bare literal is a
TS2345. Add the intermediate 'as unknown' so the spec type-checks.

* ci(lighthouse): raise total resource-count budget to 260

Migrating the Gitea and Linear issue providers to bundled plugins adds
two more entries to BUNDLED_PLUGIN_PATHS. Each bundled plugin is
discovered at startup, fetching its manifest.json plus icon.svg, which
pushed the Lighthouse total request count to 251, one over the previous
250 budget. The increase is an inherent, accepted consequence of the
built-in -> bundled-plugin migration (same as github/clickup); bump the
budget to 260 to reflect the new baseline with modest headroom.
---
 .../gitea-issue-provider/i18n/ar.json         |  22 +
 .../gitea-issue-provider/i18n/cs.json         |  22 +
 .../gitea-issue-provider/i18n/de.json         |  22 +
 .../gitea-issue-provider/i18n/en.json         |  22 +
 .../gitea-issue-provider/i18n/es.json         |  22 +
 .../gitea-issue-provider/i18n/fa.json         |  22 +
 .../gitea-issue-provider/i18n/fi.json         |  22 +
 .../gitea-issue-provider/i18n/fr.json         |  22 +
 .../gitea-issue-provider/i18n/hr.json         |  22 +
 .../gitea-issue-provider/i18n/id.json         |  22 +
 .../gitea-issue-provider/i18n/it.json         |  22 +
 .../gitea-issue-provider/i18n/ja.json         |  22 +
 .../gitea-issue-provider/i18n/ko.json         |  22 +
 .../gitea-issue-provider/i18n/nb.json         |  22 +
 .../gitea-issue-provider/i18n/nl.json         |  22 +
 .../gitea-issue-provider/i18n/pl.json         |  22 +
 .../gitea-issue-provider/i18n/pt-br.json      |  22 +
 .../gitea-issue-provider/i18n/pt.json         |  22 +
 .../gitea-issue-provider/i18n/ro-md.json      |  22 +
 .../gitea-issue-provider/i18n/ro.json         |  22 +
 .../gitea-issue-provider/i18n/ru.json         |  22 +
 .../gitea-issue-provider/i18n/sk.json         |  22 +
 .../gitea-issue-provider/i18n/sv.json         |  22 +
 .../gitea-issue-provider/i18n/tr.json         |  22 +
 .../gitea-issue-provider/i18n/uk.json         |  22 +
 .../gitea-issue-provider/i18n/vi.json         |  22 +
 .../gitea-issue-provider/i18n/zh-tw.json      |  22 +
 .../gitea-issue-provider/i18n/zh.json         |  22 +
 .../plugin-dev/gitea-issue-provider/icon.svg  |   1 +
 .../gitea-issue-provider/package-lock.json    | 532 ++++++++++++++++++
 .../gitea-issue-provider/package.json         |  17 +
 .../gitea-issue-provider/scripts/build.js     |  67 +++
 .../gitea-issue-provider/src/manifest.json    |  57 ++
 .../gitea-issue-provider/src/plugin.ts        | 371 ++++++++++++
 .../gitea-issue-provider/tsconfig.json        |  16 +
 .../linear-issue-provider/i18n/en.json        |  17 +
 .../plugin-dev/linear-issue-provider/icon.svg |   1 +
 .../linear-issue-provider/package-lock.json   | 532 ++++++++++++++++++
 .../linear-issue-provider/package.json        |  17 +
 .../linear-issue-provider/scripts/build.js    |  67 +++
 .../linear-issue-provider/src/manifest.json   |  27 +
 .../linear-issue-provider/src/plugin.ts       | 319 +++++++++++
 .../linear-issue-provider/tsconfig.json       |  16 +
 ...sue-provider-setup-overview.component.html |  18 +-
 .../issue-content-configs.const.ts            |   6 +-
 src/app/features/issue/issue.const.ts         |  26 +-
 src/app/features/issue/issue.model.ts         |  58 +-
 src/app/features/issue/issue.service.spec.ts  |   4 -
 src/app/features/issue/issue.service.ts       |  10 +-
 .../get-issue-provider-tooltip.ts             |   5 -
 .../issue/mapping-helper/is-issue-done.ts     |  11 -
 .../gitea/format-gitea-issue-title.util.ts    |  10 -
 .../providers/gitea/gitea-api-responses.d.ts  |  14 -
 .../providers/gitea/gitea-api.service.ts      | 296 ----------
 .../providers/gitea/gitea-cfg-form.const.ts   | 108 ----
 .../gitea-common-interfaces.service.spec.ts   |  40 --
 .../gitea/gitea-common-interfaces.service.ts  |  84 ---
 .../gitea/gitea-issue-content.const.ts        |  51 --
 .../gitea/gitea-issue-map.util.spec.ts        | 105 ----
 .../providers/gitea/gitea-issue-map.util.ts   |  59 --
 .../providers/gitea/gitea-issue.model.ts      |  47 --
 .../issue/providers/gitea/gitea.const.ts      |  15 -
 .../issue/providers/gitea/gitea.model.ts      |  10 -
 .../linear/linear-api.service.spec.ts         | 264 ---------
 .../providers/linear/linear-api.service.ts    | 370 ------------
 .../providers/linear/linear-cfg-form.const.ts |  64 ---
 .../linear-common-interfaces.service.ts       | 112 ----
 .../linear/linear-issue-content.const.ts      |  59 --
 .../providers/linear/linear-issue-map.util.ts |  24 -
 .../providers/linear/linear-issue.model.ts    |  62 --
 .../issue/providers/linear/linear.const.ts    |  13 -
 .../issue/providers/linear/linear.model.ts    |   7 -
 .../store/issue-provider.reducer.spec.ts      | 136 +++++
 .../issue/store/issue-provider.reducer.ts     |  45 ++
 .../dialog-create-project.component.ts        |   2 -
 .../plugin-issue-provider-adapter.service.ts  |  17 +-
 src/app/plugins/plugin.service.ts             |   2 +
 tools/lighthouse/budget.json                  |   2 +-
 78 files changed, 2905 insertions(+), 1924 deletions(-)
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/ar.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/cs.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/de.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/en.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/es.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/fa.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/fi.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/fr.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/hr.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/id.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/it.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/ja.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/ko.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/nb.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/nl.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/pl.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/pt-br.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/pt.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/ro-md.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/ro.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/ru.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/sk.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/sv.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/tr.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/uk.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/vi.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/zh-tw.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/i18n/zh.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/icon.svg
 create mode 100644 packages/plugin-dev/gitea-issue-provider/package-lock.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/package.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/scripts/build.js
 create mode 100644 packages/plugin-dev/gitea-issue-provider/src/manifest.json
 create mode 100644 packages/plugin-dev/gitea-issue-provider/src/plugin.ts
 create mode 100644 packages/plugin-dev/gitea-issue-provider/tsconfig.json
 create mode 100644 packages/plugin-dev/linear-issue-provider/i18n/en.json
 create mode 100644 packages/plugin-dev/linear-issue-provider/icon.svg
 create mode 100644 packages/plugin-dev/linear-issue-provider/package-lock.json
 create mode 100644 packages/plugin-dev/linear-issue-provider/package.json
 create mode 100644 packages/plugin-dev/linear-issue-provider/scripts/build.js
 create mode 100644 packages/plugin-dev/linear-issue-provider/src/manifest.json
 create mode 100644 packages/plugin-dev/linear-issue-provider/src/plugin.ts
 create mode 100644 packages/plugin-dev/linear-issue-provider/tsconfig.json
 delete mode 100644 src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-api-responses.d.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-api.service.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-cfg-form.const.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-common-interfaces.service.spec.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-issue-content.const.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-issue-map.util.spec.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-issue-map.util.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea-issue.model.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea.const.ts
 delete mode 100644 src/app/features/issue/providers/gitea/gitea.model.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear-api.service.spec.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear-api.service.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear-cfg-form.const.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear-common-interfaces.service.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear-issue-content.const.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear-issue-map.util.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear-issue.model.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear.const.ts
 delete mode 100644 src/app/features/issue/providers/linear/linear.model.ts
 create mode 100644 src/app/features/issue/store/issue-provider.reducer.spec.ts

diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/ar.json b/packages/plugin-dev/gitea-issue-provider/i18n/ar.json
new file mode 100644
index 0000000000..5c8d992a94
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/ar.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "المضيف (على سبيل المثال: \nhttps://try.gitea.io)",
+    "TOKEN": "رمز الوصول",
+    "REPO_FULL_NAME": "اسم المستخدم أو اسم المؤسسة/المشروع",
+    "SCOPE": "النطاق",
+    "SCOPE_ALL": "الكل",
+    "SCOPE_CREATED": "تم إنشاؤه بواسطتي",
+    "SCOPE_ASSIGNED": "تم تعيينه لي",
+    "FILTER_LABELS": "التصفية حسب التسميات (اختياري)",
+    "EXCLUDE_LABELS": "استبعاد التسميات (اختياري)",
+    "HOW_TO_GET_TOKEN": "كيف تحصل على الرمز المميز؟"
+  },
+  "DISPLAY": {
+    "SUMMARY": "ملخص",
+    "STATE": "حالة",
+    "ASSIGNEE": "المحال",
+    "LABELS": "تسميات",
+    "DESCRIPTION": "وصف"
+  },
+  "FORM_HELP": "<p>هنا يمكنك تهيئة 'سوبر برودكتيفيتي' لإدراج مشكلات ’جيتيا’ المفتوحة لمستودع معين في لوحة إنشاء المهام في عرض التخطيط اليومي. سيتم سردها كاقتراحات وستوفر رابطًا للمشكلة بالإضافة إلى مزيد من المعلومات عنها.</p> <p>بالإضافة إلى ذلك يمكنك إضافة واستيراد جميع المشكلات المفتوحة تلقائيًا.</p><p>للحصول على حدود الاستخدام والوصول يمكنك توفير رمز وصول مميز."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/cs.json b/packages/plugin-dev/gitea-issue-provider/i18n/cs.json
new file mode 100644
index 0000000000..30ca0392f4
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/cs.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Hostitel (např.: https://try.gitea.io)",
+    "TOKEN": "Přístupový token",
+    "REPO_FULL_NAME": "Uživatelské jméno nebo název organizace/projektu",
+    "SCOPE": "Rozsah",
+    "SCOPE_ALL": "Všechny",
+    "SCOPE_CREATED": "Vytvořeno mnou",
+    "SCOPE_ASSIGNED": "Přiřazeno mně",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "Jak získat token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Shrnutí",
+    "STATE": "Stav",
+    "ASSIGNEE": "Přiřazený",
+    "LABELS": "Štítky",
+    "DESCRIPTION": "Popis"
+  },
+  "FORM_HELP": "<p>Zde můžete nakonfigurovat SuperProductivity tak, aby zobrazoval otevřené problémy Gitea pro konkrétní repozitář v panelu vytváření úkolů v denním plánovacím zobrazení. Budou uvedeny jako návrhy a poskytnou odkaz na problém a další informace o něm.</p> <p>Kromě toho můžete automaticky přidat a importovat všechny otevřené problémy.</p><p>Pro překročení omezení a přístup můžete poskytnout přístupový token."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/de.json b/packages/plugin-dev/gitea-issue-provider/i18n/de.json
new file mode 100644
index 0000000000..feab9e16cf
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/de.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (z. B. : https://try.gitea.io)",
+    "TOKEN": "Zugangstoken",
+    "REPO_FULL_NAME": "Benutzername oder Organisationsname/Projekt",
+    "SCOPE": "Umfang",
+    "SCOPE_ALL": "Alle",
+    "SCOPE_CREATED": "Von mir erstellt",
+    "SCOPE_ASSIGNED": "Mir zugewiesen",
+    "FILTER_LABELS": "Nach Labels filtern (optional)",
+    "EXCLUDE_LABELS": "Labels ausschließen (optional)",
+    "HOW_TO_GET_TOKEN": "Wie bekomme ich einen Token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Zusammenfassung",
+    "STATE": "Status",
+    "ASSIGNEE": "Zuständiger",
+    "LABELS": "Beschriftungen",
+    "DESCRIPTION": "Beschreibung"
+  },
+  "FORM_HELP": "<p>Hier kannst du SuperProductivity so konfigurieren, dass offene Gitea-Issues für ein bestimmtes Repository im Aufgabenerstellungsfenster in der Tagesplanungsansicht aufgelistet werden. Sie werden als Vorschläge angezeigt und enthalten einen Link zum Issue sowie weitere Informationen dazu.</p><p> Darüber hinaus kannst du alle offenen Issues automatisch hinzufügen und importieren.</p><p> Um Nutzungsbeschränkungen zu umgehen und Zugriff zu erhalten, kannst du ein Zugriffstoken bereitstellen."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/en.json b/packages/plugin-dev/gitea-issue-provider/i18n/en.json
new file mode 100644
index 0000000000..3f44bcbe86
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/en.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (e.g. https://try.gitea.io)",
+    "TOKEN": "Access Token",
+    "REPO_FULL_NAME": "Username or Organization name/repository",
+    "SCOPE": "Scope",
+    "SCOPE_ALL": "All",
+    "SCOPE_CREATED": "Created by me",
+    "SCOPE_ASSIGNED": "Assigned to me",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "How to get a token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Summary",
+    "STATE": "Status",
+    "ASSIGNEE": "Assignee",
+    "LABELS": "Labels",
+    "DESCRIPTION": "Description"
+  },
+  "FORM_HELP": "<p>Here you can configure Super Productivity to list open Gitea issues for a specific repository in the task creation panel in the daily planning view. They will be listed as suggestions and will provide a link to the issue as well as more information about it.</p><p>In addition, you can automatically add and import all open issues.</p><p>To get by usage limits and gain access, you can provide an access token."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/es.json b/packages/plugin-dev/gitea-issue-provider/i18n/es.json
new file mode 100644
index 0000000000..16bb5232d7
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/es.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (p. ej.: https://try.gitea.io)",
+    "TOKEN": "Token de acceso",
+    "REPO_FULL_NAME": "Nombre de usuario o nombre de la organización/proyecto",
+    "SCOPE": "Alcance",
+    "SCOPE_ALL": "Todos",
+    "SCOPE_CREATED": "Creado por mí",
+    "SCOPE_ASSIGNED": "Asignado a mí",
+    "FILTER_LABELS": "Filtrar por etiquetas (opcional)",
+    "EXCLUDE_LABELS": "Excluir etiquetas (opcional)",
+    "HOW_TO_GET_TOKEN": "¿Cómo obtener un token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Resumen",
+    "STATE": "Estado",
+    "ASSIGNEE": "Asignado",
+    "LABELS": "Etiquetas",
+    "DESCRIPTION": "Descripción"
+  },
+  "FORM_HELP": "<p>Aquí puedes configurar SuperProductivity para listar las incidencias de Gitea abiertas para un repositorio específico en el panel de creación de tareas en la vista de planificación diaria. Se listarán como sugerencias y proporcionarán un enlace a la incidencia así como más información sobre ella.</p> <p>Además, puedes añadir e importar automáticamente todas las incidencias abiertas.</p><p>Para superar los límites de uso y acceder puedes proporcionar un token de acceso."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/fa.json b/packages/plugin-dev/gitea-issue-provider/i18n/fa.json
new file mode 100644
index 0000000000..4510c19ac0
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/fa.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "میزبان (به عنوان مثال: https://try.gitea.io)",
+    "TOKEN": "توکن دسترسی",
+    "REPO_FULL_NAME": "نام کاربری یا نام سازمان/پروژه",
+    "SCOPE": "دامنه",
+    "SCOPE_ALL": "همه",
+    "SCOPE_CREATED": "ایجاد شده توسط من",
+    "SCOPE_ASSIGNED": "به من اختصاص داده است",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "چگونه یک توکن دریافت کنیم؟"
+  },
+  "DISPLAY": {
+    "SUMMARY": "خلاصه",
+    "STATE": "وضعیت",
+    "ASSIGNEE": "وکیل",
+    "LABELS": "برچسب",
+    "DESCRIPTION": "توضیحات"
+  },
+  "FORM_HELP": "<p>در اینجا می‌توانید SuperProductivity را پیکربندی کنید تا مشکلات باز Gitea را برای یک مخزن خاص در پانل ایجاد کار در نمای برنامه‌ریزی روزانه فهرست کند. آنها به عنوان پیشنهاد فهرست می شوند و پیوندی به موضوع و همچنین اطلاعات بیشتری در مورد آن ارائه می دهند.</p> <p>علاوه بر این، می‌توانید به‌طور خودکار همه مسائل باز را اضافه و وارد کنید.</p><p>برای دریافت محدودیت‌های استفاده و دسترسی، می‌توانید یک نشانه دسترسی ارائه کنید."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/fi.json b/packages/plugin-dev/gitea-issue-provider/i18n/fi.json
new file mode 100644
index 0000000000..b953ee99c6
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/fi.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Isäntä (esim.: https://try.gitea.io)",
+    "TOKEN": "Käyttöoikeustunnus",
+    "REPO_FULL_NAME": "Käyttäjänimi tai organisaation nimi/projekti",
+    "SCOPE": "Laajuus",
+    "SCOPE_ALL": "Kaikki",
+    "SCOPE_CREATED": "Minun luomat",
+    "SCOPE_ASSIGNED": "Minulle osoitetut",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "Miten saan tunnuksen?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Yhteenveto",
+    "STATE": "Tila",
+    "ASSIGNEE": "Vastuuhenkilö",
+    "LABELS": "Tunnisteet",
+    "DESCRIPTION": "Kuvaus"
+  },
+  "FORM_HELP": "<p>Tässä voit määrittää SuperProductivityn listamaan avoimet Gitea-ongelmat tietystä arkistosta tehtävänluontipaneelissa päivittäisessä suunnittelinäkymässä. Ne listataan ehdotuksina ja tarjoavat linkin ongelmaan sekä lisätietoja siitä.</p> <p>Lisäksi voit automaattisesti lisätä ja tuoda kaikki avoimet ongelmat.</p><p>Käyttörajoitusten ja pääsyn saamiseksi voit antaa käyttöoikeustunnuksen."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/fr.json b/packages/plugin-dev/gitea-issue-provider/i18n/fr.json
new file mode 100644
index 0000000000..958b36c827
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/fr.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Hôte (e.g.: https://try.gitea.io)",
+    "TOKEN": "Jeton d'accès",
+    "REPO_FULL_NAME": "Nom d'utilisateur ou nom de l'organisation/projet",
+    "SCOPE": "Portée",
+    "SCOPE_ALL": "Tout",
+    "SCOPE_CREATED": "Créé par moi",
+    "SCOPE_ASSIGNED": "Attribués à moi",
+    "FILTER_LABELS": "Filtrer par étiquettes (facultatif)",
+    "EXCLUDE_LABELS": "Exclure des étiquettes (facultatif)",
+    "HOW_TO_GET_TOKEN": "Comment obtenir un jeton ?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Résumé",
+    "STATE": "Statut",
+    "ASSIGNEE": "Bénéficiaire",
+    "LABELS": "Étiquettes",
+    "DESCRIPTION": "Description"
+  },
+  "FORM_HELP": "<p>Ici, vous pouvez configurer SuperProductivity pour lister les problèmes ouverts de Gitea pour un dépôt spécifique dans le panneau de création de tâches dans la vue de planification quotidienne. Ils seront listés comme suggestions et fourniront un lien vers le problème ainsi que plus d'informations à son sujet.</p> <p>En plus, vous pouvez automatiquement ajouter et importer tous les problèmes ouverts.</p><p>Pour contourner les limites d'utilisation et pour accéder, vous pouvez fournir un jeton d'accès.</p>"
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/hr.json b/packages/plugin-dev/gitea-issue-provider/i18n/hr.json
new file mode 100644
index 0000000000..803e9bfba2
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/hr.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (npr. https://try.gitea.io)",
+    "TOKEN": "Token za pristup",
+    "REPO_FULL_NAME": "Korisničko ime ili ime organizacije/repozitorija",
+    "SCOPE": "Opseg",
+    "SCOPE_ALL": "Sve",
+    "SCOPE_CREATED": "Stvoreno od mene",
+    "SCOPE_ASSIGNED": "Dodijeljeno meni",
+    "FILTER_LABELS": "Filtriraj prema oznakama (opcionalno)",
+    "EXCLUDE_LABELS": "Isključi oznake (opcionalno)",
+    "HOW_TO_GET_TOKEN": "Kako dobiti token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Sažetak",
+    "STATE": "Status",
+    "ASSIGNEE": "Dodijeljeno",
+    "LABELS": "Oznake",
+    "DESCRIPTION": "Opis"
+  },
+  "FORM_HELP": "<p>Ovdje možeš podesiti Super Productivity da prikazuje otvorene Gitea probleme za određeni repozitorij u ploči za stvaranje zadataka u dnevnom planiranju. Prikazat će se kao prijedlozi i imat će poveznicu na problem kao i dodatne informacije.</p> <p>Također možeš automatski dodati i uvesti sve otvorene probleme.</p><p>Za izbjegavanja ograničenja i dobivanja pristupa, unesi token za pristup.</p>"
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/id.json b/packages/plugin-dev/gitea-issue-provider/i18n/id.json
new file mode 100644
index 0000000000..33b6da61ca
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/id.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (contoh: https://try.gitea.io)",
+    "TOKEN": "Akses Token",
+    "REPO_FULL_NAME": "Nama pengguna atau nama/proyek Organisasi",
+    "SCOPE": "Cakupan",
+    "SCOPE_ALL": "Semua",
+    "SCOPE_CREATED": "Dibuat oleh saya",
+    "SCOPE_ASSIGNED": "Ditugaskan kepada saya",
+    "FILTER_LABELS": "Filter berdasarkan label (opsional)",
+    "EXCLUDE_LABELS": "Kecualikan label (opsional)",
+    "HOW_TO_GET_TOKEN": "Bagaimana cara mendapatkan token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Ringkasan",
+    "STATE": "Status",
+    "ASSIGNEE": "Penanggung jawab",
+    "LABELS": "Label",
+    "DESCRIPTION": "Deskripsi"
+  },
+  "FORM_HELP": "<p>Di sini Anda dapat mengonfigurasi SuperProductivity untuk membuat daftar open Gitea issues untuk repositori tertentu di panel pembuatan tugas dalam tampilan perencanaan harian. Mereka akan dicantumkan sebagai saran dan akan memberikan tautan ke masalah tersebut serta informasi lebih lanjut tentangnya.</p> <p>Selain itu, Anda dapat secara otomatis menambahkan dan menyinkronkan semua open issues ke backlog tugas Anda.</p><p>Untuk mencapai batas penggunaan dan untuk mengakses, Anda dapat memberikan token akses.</p>"
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/it.json b/packages/plugin-dev/gitea-issue-provider/i18n/it.json
new file mode 100644
index 0000000000..58e49f6bd1
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/it.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (es.: https://try.gitea.io)",
+    "TOKEN": "Token di accesso",
+    "REPO_FULL_NAME": "Username o nome Organizzazione/Progetto",
+    "SCOPE": "Scopo",
+    "SCOPE_ALL": "Tutti",
+    "SCOPE_CREATED": "Create da me",
+    "SCOPE_ASSIGNED": "Assegnate a me",
+    "FILTER_LABELS": "Filtra per etichette (facoltativo)",
+    "EXCLUDE_LABELS": "Escludi etichette (facoltativo)",
+    "HOW_TO_GET_TOKEN": "Come ottenere un token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Riepilogo",
+    "STATE": "Stato",
+    "ASSIGNEE": "Assegnatario",
+    "LABELS": "Etichette",
+    "DESCRIPTION": "Descrizione"
+  },
+  "FORM_HELP": "<p>Qui è possibile configurare SuperProductivity in modo che elenchi le issue aperte di Gitea per uno specifico repository nel pannello di creazione delle attività nella vista di pianificazione giornaliera. Saranno elencati come suggerimenti e forniranno un link all'issue e ulteriori informazioni su di esso.</p> <p>Inoltre è possibile aggiungere e importare automaticamente tutte le issue aperte.</p><p>Per superare i limiti di utilizzo e accedere è possibile fornire un token di accesso."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/ja.json b/packages/plugin-dev/gitea-issue-provider/i18n/ja.json
new file mode 100644
index 0000000000..e796cf6075
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/ja.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "ホスト (例:https://try.gitea.io)",
+    "TOKEN": "アクセストークン",
+    "REPO_FULL_NAME": "ユーザー名または組織名/プロジェクト名",
+    "SCOPE": "範囲",
+    "SCOPE_ALL": "全て",
+    "SCOPE_CREATED": "私が作った",
+    "SCOPE_ASSIGNED": "私に割り当てられた",
+    "FILTER_LABELS": "ラベルで絞り込み（任意）",
+    "EXCLUDE_LABELS": "ラベルを除外（任意）",
+    "HOW_TO_GET_TOKEN": "トークンの入手方法は？"
+  },
+  "DISPLAY": {
+    "SUMMARY": "概要",
+    "STATE": "地位",
+    "ASSIGNEE": "担当者",
+    "LABELS": "ラベル",
+    "DESCRIPTION": "形容"
+  },
+  "FORM_HELP": "<p>ここで SuperProductivity を設定し、日次計画ビューのタスク作成パネルで特定のリポジトリに対して未解決の Gitea 課題を一覧表示させることができます。それらは提案としてリストされ、課題へのリンクとそれに関する詳細情報が提供されます。</p> <p>さらに、すべてのオープン課題を自動的に追加してインポートすることもできます。</p><p>利用制限を通過してアクセスするには、アクセストークンを提供することができます。"
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/ko.json b/packages/plugin-dev/gitea-issue-provider/i18n/ko.json
new file mode 100644
index 0000000000..ce371721ec
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/ko.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "호스트(예: https://try.gitea.io)",
+    "TOKEN": "액세스 토큰",
+    "REPO_FULL_NAME": "사용자 이름 또는 조직 이름/프로젝트",
+    "SCOPE": "범위",
+    "SCOPE_ALL": "모두",
+    "SCOPE_CREATED": "작성자: 나",
+    "SCOPE_ASSIGNED": "나에게 할당됨",
+    "FILTER_LABELS": "라벨로 필터링(선택 사항)",
+    "EXCLUDE_LABELS": "라벨 제외(선택 사항)",
+    "HOW_TO_GET_TOKEN": "토큰은 어떻게 받나요?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "요약",
+    "STATE": "상태",
+    "ASSIGNEE": "담당자",
+    "LABELS": "레이블",
+    "DESCRIPTION": "묘사"
+  },
+  "FORM_HELP": "<p>여기에서 일일 계획 보기의 작업 만들기 패널에서 특정 리포지토리에 대해 열려 있는 Gitea 이슈를 나열하도록 SuperProductivity를 구성할 수 있습니다. 이슈는 제안 사항으로 나열되며 이슈에 대한 링크와 자세한 정보를 제공합니다.</p> <p>또한 열려 있는 모든 이슈를 자동으로 추가하고 가져올 수 있습니다.</p><p>사용량 제한을 통과하고 액세스하려면 액세스 토큰을 제공할 수 있습니다."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/nb.json b/packages/plugin-dev/gitea-issue-provider/i18n/nb.json
new file mode 100644
index 0000000000..b00ff99267
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/nb.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Vert (f.eks.: https://try.gitea.io)",
+    "TOKEN": "Access Token",
+    "REPO_FULL_NAME": "Brukernavn eller organisasjonsnavn/prosjekt",
+    "SCOPE": "Omfang",
+    "SCOPE_ALL": "Alle",
+    "SCOPE_CREATED": "Laget av meg",
+    "SCOPE_ASSIGNED": "Tildelt til meg",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "Hvordan får man et token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Sammendrag",
+    "STATE": "Status",
+    "ASSIGNEE": "Tildelt",
+    "LABELS": "Etiketter",
+    "DESCRIPTION": "Beskrivelse"
+  },
+  "FORM_HELP": "<p>Her kan du konfigurere SuperProductivity til å liste åpne Gitea-problemer for et spesifikt repository i opprettingspanelet for oppgaver i den daglige planleggingsvisningen. De vil bli listet som forslag og vil gi en lenke til problemet samt mer informasjon om det.<\\/p> <p>I tillegg kan du automatisk legge til og importere alle åpne problemer.<\\/p><p>For å komme forbi bruksgrensene og få tilgang kan du gi et tilgangstoken."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/nl.json b/packages/plugin-dev/gitea-issue-provider/i18n/nl.json
new file mode 100644
index 0000000000..64be91178b
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/nl.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (bijv. https://try.gitea.io)",
+    "TOKEN": "Access Token",
+    "REPO_FULL_NAME": "Gebruikersnaam of Organisatie naam/project",
+    "SCOPE": "Toepassingsgebied",
+    "SCOPE_ALL": "Alle",
+    "SCOPE_CREATED": "Aangemaakt door mij",
+    "SCOPE_ASSIGNED": "Aan mij toegewezen",
+    "FILTER_LABELS": "Filteren op labels (optioneel)",
+    "EXCLUDE_LABELS": "Labels uitsluiten (optioneel)",
+    "HOW_TO_GET_TOKEN": "Hoe krijg ik een token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Samenvatting",
+    "STATE": "Status",
+    "ASSIGNEE": "Toegewezen persoon",
+    "LABELS": "Labels",
+    "DESCRIPTION": "Beschrijving"
+  },
+  "FORM_HELP": "<p>Hier kun je SuperProductivity configureren om open Gitea kwesties voor een specifieke repository te tonen in het paneel voor het aanmaken van taken in de dagelijkse planningsweergave. Ze worden weergegeven als suggesties en geven een link naar het issue en meer informatie over het issue.</p> <p>Daarnaast kun je automatisch alle openstaande issues toevoegen en importeren.</p><p>Om de gebruikslimieten te omzeilen en toegang te krijgen kun je een toegangstoken geven."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/pl.json b/packages/plugin-dev/gitea-issue-provider/i18n/pl.json
new file mode 100644
index 0000000000..7698afb87a
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/pl.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Host (np. https://try.gitea.io)",
+    "TOKEN": "Token dostępu",
+    "REPO_FULL_NAME": "Nazwa użytkownika lub nazwa organizacji/projektu",
+    "SCOPE": "Zakres",
+    "SCOPE_ALL": "Wszystkie",
+    "SCOPE_CREATED": "Stworzony przeze mnie",
+    "SCOPE_ASSIGNED": "Przydzielony do mnie",
+    "FILTER_LABELS": "Filtruj według etykiet (opcjonalnie)",
+    "EXCLUDE_LABELS": "Wyklucz etykiety (opcjonalnie)",
+    "HOW_TO_GET_TOKEN": "Jak zdobyć token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Podsumowanie",
+    "STATE": "Status",
+    "ASSIGNEE": "Osoba przypisana",
+    "LABELS": "Etykiety",
+    "DESCRIPTION": "Opis"
+  },
+  "FORM_HELP": "<p>Tutaj można skonfigurować SuperProductivity tak, aby wyświetlał listę otwartych zgłoszeń Gitea dla określonego repozytorium w panelu tworzenia zadań w widoku planowania dziennego. Będą one wyświetlane jako sugestie i będą zawierać link do zgłoszenia oraz więcej informacji na jego temat.</p> <p>Ponadto możesz automatycznie dodawać i importować wszystkie otwarte zgłoszenia.</p><p>Aby ominąć limity użytkowania i uzyskać dostęp, możesz podać token dostępu."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/pt-br.json b/packages/plugin-dev/gitea-issue-provider/i18n/pt-br.json
new file mode 100644
index 0000000000..c7ebb1c4ff
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/pt-br.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Servidor (ex: https://try.gitea.io)",
+    "TOKEN": "Token de Acesso",
+    "REPO_FULL_NAME": "Nome do Usuário ou Organização/repositório",
+    "SCOPE": "Escopo",
+    "SCOPE_ALL": "Todos",
+    "SCOPE_CREATED": "Criado por mim",
+    "SCOPE_ASSIGNED": "Atribuído a mim",
+    "FILTER_LABELS": "Filtrar por rótulos (opcional)",
+    "EXCLUDE_LABELS": "Excluir rótulos (opcional)",
+    "HOW_TO_GET_TOKEN": "Como obter um token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Resumo",
+    "STATE": "Status",
+    "ASSIGNEE": "Responsável",
+    "LABELS": "Etiquetas",
+    "DESCRIPTION": "Descrição"
+  },
+  "FORM_HELP": "<p>Aqui você pode configurar o Super Productivity para listar issues abertas do Gitea de um repositório específico no painel de criação de tarefas na visualização de planejador. Elas serão listadas como sugestões e fornecerão um link para a issue, bem como mais informações sobre ela.</p><p>Além disso, você pode adicionar e importar automaticamente todas as issues abertas.</p><p>Para contornar limites de uso e para ter acesso, você pode fornecer um token de acesso."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/pt.json b/packages/plugin-dev/gitea-issue-provider/i18n/pt.json
new file mode 100644
index 0000000000..7d35f33d26
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/pt.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Endereço do servidor (ex: https://try.gitea.io)",
+    "TOKEN": "Token de acesso",
+    "REPO_FULL_NAME": "Nome do usuário ou organização/projeto",
+    "SCOPE": "Escopo",
+    "SCOPE_ALL": "Todos",
+    "SCOPE_CREATED": "Criados por mim",
+    "SCOPE_ASSIGNED": "Atribuídos a mim",
+    "FILTER_LABELS": "Filtrar por etiquetas (opcional)",
+    "EXCLUDE_LABELS": "Excluir etiquetas (opcional)",
+    "HOW_TO_GET_TOKEN": "Como obter um token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Resumo",
+    "STATE": "Estado",
+    "ASSIGNEE": "Atribuído",
+    "LABELS": "Etiquetas",
+    "DESCRIPTION": "Descrição"
+  },
+  "FORM_HELP": "<p>Aqui você pode configurar o SuperProductivity para listar tarefas do Gitea de um repositório específico no painel de tarefas na tela de planejamento diário. Elas também serão listadas como sugestões e será disponibilizado um link para a tarefa bem como mais informações sobre a mesma.</p> <p>Além disso você pode adicionar e sincronizar todas as tarefas abertas para o seu backlog.</p><p>"
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/ro-md.json b/packages/plugin-dev/gitea-issue-provider/i18n/ro-md.json
new file mode 100644
index 0000000000..728874fd21
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/ro-md.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Gazdă (d.e. https://try.gitea.io)",
+    "TOKEN": "Jeton de acces",
+    "REPO_FULL_NAME": "Nume utilizator sau nume organizație/proiect",
+    "SCOPE": "Domeniu de aplicare",
+    "SCOPE_ALL": "Toate",
+    "SCOPE_CREATED": "Create de mine",
+    "SCOPE_ASSIGNED": "Atribuite mie",
+    "FILTER_LABELS": "Filtrează după etichete (opțional)",
+    "EXCLUDE_LABELS": "Exclude etichetele (opțional)",
+    "HOW_TO_GET_TOKEN": "Cum se obține un jeton?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Sumar",
+    "STATE": "Stare",
+    "ASSIGNEE": "Asignat lui",
+    "LABELS": "Etichete",
+    "DESCRIPTION": "Descriere"
+  },
+  "FORM_HELP": "<p>Aici poți configura Super Productivity pentru a lista problemele deschise pe Gitea pentru un repository specific în panoul de creare a sarcinilor în modul de planificare zilnic. Acestea vor fi listate ca sugestii și vor conține o legătură către problemă și mai multe informații despre acesta.</p> <p>În plus, poți adăuga și importa automat toate problemele deschise.</p><p>Pentru a fenta limitele de utilizare și acces, poți folosi un jeton de acces."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/ro.json b/packages/plugin-dev/gitea-issue-provider/i18n/ro.json
new file mode 100644
index 0000000000..728874fd21
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/ro.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Gazdă (d.e. https://try.gitea.io)",
+    "TOKEN": "Jeton de acces",
+    "REPO_FULL_NAME": "Nume utilizator sau nume organizație/proiect",
+    "SCOPE": "Domeniu de aplicare",
+    "SCOPE_ALL": "Toate",
+    "SCOPE_CREATED": "Create de mine",
+    "SCOPE_ASSIGNED": "Atribuite mie",
+    "FILTER_LABELS": "Filtrează după etichete (opțional)",
+    "EXCLUDE_LABELS": "Exclude etichetele (opțional)",
+    "HOW_TO_GET_TOKEN": "Cum se obține un jeton?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Sumar",
+    "STATE": "Stare",
+    "ASSIGNEE": "Asignat lui",
+    "LABELS": "Etichete",
+    "DESCRIPTION": "Descriere"
+  },
+  "FORM_HELP": "<p>Aici poți configura Super Productivity pentru a lista problemele deschise pe Gitea pentru un repository specific în panoul de creare a sarcinilor în modul de planificare zilnic. Acestea vor fi listate ca sugestii și vor conține o legătură către problemă și mai multe informații despre acesta.</p> <p>În plus, poți adăuga și importa automat toate problemele deschise.</p><p>Pentru a fenta limitele de utilizare și acces, poți folosi un jeton de acces."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/ru.json b/packages/plugin-dev/gitea-issue-provider/i18n/ru.json
new file mode 100644
index 0000000000..f2c59e6ef2
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/ru.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Хост (н-р: https://try.gitea.io)",
+    "TOKEN": "Токен доступа",
+    "REPO_FULL_NAME": "Имя пользователя или название организации/проекта",
+    "SCOPE": "Скоуп",
+    "SCOPE_ALL": "Все",
+    "SCOPE_CREATED": "Создано мной",
+    "SCOPE_ASSIGNED": "Назначено мне",
+    "FILTER_LABELS": "Фильтровать по меткам (необязательно)",
+    "EXCLUDE_LABELS": "Исключить метки (необязательно)",
+    "HOW_TO_GET_TOKEN": "Как получить токен?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Резюме",
+    "STATE": "Статус",
+    "ASSIGNEE": "Исполнитель",
+    "LABELS": "Метки",
+    "DESCRIPTION": "Описание"
+  },
+  "FORM_HELP": "<p>Здесь вы можете настроить SuperProductivity чтобы отображать проблемы Gitea для конкретного репозитория на панели создания задач в представлении ежедневного планирования. Они будут перечислены в качестве предложений и предоставят ссылку на проблему, а также дополнительную информацию о ней.</p> <p>Кроме того, вы можете автоматически добавлять и синхронизировать все открытые проблемы.</p></p>Чтобы получить доступ к закрытым репозиториям, вы можете предоставить токен доступа."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/sk.json b/packages/plugin-dev/gitea-issue-provider/i18n/sk.json
new file mode 100644
index 0000000000..84f52e06b6
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/sk.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Hostiteľ (napr.: https://try.gitea.io)",
+    "TOKEN": "Prístupový token",
+    "REPO_FULL_NAME": "Používateľské meno alebo názov organizácie/projektu",
+    "SCOPE": "Rozsah pôsobnosti",
+    "SCOPE_ALL": "Všetky",
+    "SCOPE_CREATED": "Vytvorené mnou",
+    "SCOPE_ASSIGNED": "Pridelené mne",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "Ako získať token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Zhrnutie",
+    "STATE": "Stav",
+    "ASSIGNEE": "Priradený",
+    "LABELS": "Štítky",
+    "DESCRIPTION": "Popis"
+  },
+  "FORM_HELP": "<p>Tu môžete nakonfigurovať program SuperProductivity tak, aby na paneli vytvárania úloh v zobrazení denného plánovania zobrazoval zoznam otvorených problémov Gitea pre konkrétny repozitár. Budú uvedené ako návrhy a budú obsahovať odkaz na problém, ako aj ďalšie informácie o ňom.</p> <p>Okrem toho môžete automaticky pridať a importovať všetky otvorené problémy.</p><p>Ak chcete obísť obmedzenia používania a získať prístup, môžete zadať prístupový token."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/sv.json b/packages/plugin-dev/gitea-issue-provider/i18n/sv.json
new file mode 100644
index 0000000000..407d60df59
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/sv.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Värd (t.ex. https://try.gitea.io)",
+    "TOKEN": "Åtkomsttoken",
+    "REPO_FULL_NAME": "Användarnamn eller organisationsnamn/projekt",
+    "SCOPE": "Omfattning",
+    "SCOPE_ALL": "Alla",
+    "SCOPE_CREATED": "Skapade av mig",
+    "SCOPE_ASSIGNED": "Ålagda mig",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "Hur får man en token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Sammanfattning",
+    "STATE": "Status",
+    "ASSIGNEE": "Mottagare",
+    "LABELS": "Etiketter",
+    "DESCRIPTION": "Beskrivning"
+  },
+  "FORM_HELP": "<p>Här kan du konfigurera SuperProductivity så att öppna Gitea-ärenden för ett specifikt arkiv listas i panelen för uppgiftskapande i den dagliga planeringsvyn. De listas som förslag och innehåller en länk till ärendet samt mer information om det. </p> <p>Dessutom kan du automatiskt lägga till och importera alla öppna ärenden. </p><p>För att komma förbi användningsbegränsningar och få åtkomst kan du ange en åtkomsttoken."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/tr.json b/packages/plugin-dev/gitea-issue-provider/i18n/tr.json
new file mode 100644
index 0000000000..859e90c087
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/tr.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Sağlayıcı (örneğin: https://try.gitea.io)",
+    "TOKEN": "Erişim Jetonu",
+    "REPO_FULL_NAME": "Kullanıcı adı veya Organizasyon adı/projesi",
+    "SCOPE": "Kapsam",
+    "SCOPE_ALL": "Hepsi",
+    "SCOPE_CREATED": "Benim tarafımdan oluşturuldu",
+    "SCOPE_ASSIGNED": "Bana atanan",
+    "FILTER_LABELS": "Etiketlere göre filtrele (isteğe bağlı)",
+    "EXCLUDE_LABELS": "Etiketleri hariç tut (isteğe bağlı)",
+    "HOW_TO_GET_TOKEN": "Bir token nasıl alınır?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Özet",
+    "STATE": "Durum",
+    "ASSIGNEE": "Atanan",
+    "LABELS": "Etiketler",
+    "DESCRIPTION": "Açıklama"
+  },
+  "FORM_HELP": "<p>Burada SuperProductivity'yi, günlük planlama görünümündeki görev oluşturma panelinde belirli bir depo için açık Gitea sorunlarını listeleyecek şekilde yapılandırabilirsiniz. Öneriler olarak listelenecekler ve konuyla ilgili bir bağlantının yanı sıra konuyla ilgili daha fazla bilgi sağlayacaklar.</p> <p>Ek olarak, tüm açık sorunları otomatik olarak görev biriktirme listenize ekleyebilir ve senkronize edebilirsiniz.</p><p>Kullanım sınırlarını aşmak ve erişim sağlamak için bir erişim jetonu sağlayabilirsiniz."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/uk.json b/packages/plugin-dev/gitea-issue-provider/i18n/uk.json
new file mode 100644
index 0000000000..d8c3509e1f
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/uk.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Хост (наприклад: https://try.gitea.io)",
+    "TOKEN": "Токен доступу",
+    "REPO_FULL_NAME": "Ім'я користувача або назва організації/проекту",
+    "SCOPE": "Область пошуку (Scope)",
+    "SCOPE_ALL": "Усі",
+    "SCOPE_CREATED": "Створені мною",
+    "SCOPE_ASSIGNED": "Призначені мені",
+    "FILTER_LABELS": "Filter by labels (optional)",
+    "EXCLUDE_LABELS": "Exclude labels (optional)",
+    "HOW_TO_GET_TOKEN": "Як отримати токен?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Підсумок",
+    "STATE": "Статус",
+    "ASSIGNEE": "Виконавець",
+    "LABELS": "Мітки",
+    "DESCRIPTION": "Опис"
+  },
+  "FORM_HELP": "<p>Тут ви можете налаштувати SuperProductivity для відображення відкритих завдань Gitea для конкретного репозиторію в панелі створення завдань у вікні щоденного планування. Вони будуть показані як пропозиції та надаватимуть посилання на завдання, а також додаткову інформацію про нього.</p> <p>Крім того, ви можете автоматично додавати та імпортувати всі відкриті завдання.</p><p>Щоб обійти обмеження використання та отримати доступ, ви можете надати токен доступу."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/vi.json b/packages/plugin-dev/gitea-issue-provider/i18n/vi.json
new file mode 100644
index 0000000000..153157f0b3
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/vi.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "Máy chủ (ví dụ: https://try.gitea.io)",
+    "TOKEN": "Token truy cập",
+    "REPO_FULL_NAME": "Tên người dùng hoặc Tổ chức/kho lưu trữ",
+    "SCOPE": "Phạm vi",
+    "SCOPE_ALL": "Tất cả",
+    "SCOPE_CREATED": "Do tôi tạo",
+    "SCOPE_ASSIGNED": "Được giao cho tôi",
+    "FILTER_LABELS": "Lọc theo nhãn (tùy chọn)",
+    "EXCLUDE_LABELS": "Loại trừ nhãn (tùy chọn)",
+    "HOW_TO_GET_TOKEN": "Cách lấy token?"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Tóm tắt",
+    "STATE": "Trạng thái",
+    "ASSIGNEE": "Người được giao",
+    "LABELS": "Nhãn",
+    "DESCRIPTION": "Mô tả"
+  },
+  "FORM_HELP": "<p>Tại đây bạn có thể cấu hình Super Productivity để liệt kê các sự cố Gitea mở cho một kho lưu trữ cụ thể trong bảng tạo công việc ở chế độ xem lên kế hoạch hàng ngày. Chúng sẽ được liệt kê làm gợi ý và cung cấp liên kết đến sự cố cũng như thêm thông tin về nó.</p><p>Ngoài ra, bạn có thể tự động thêm và nhập tất cả sự cố mở.</p><p>Để vượt qua giới hạn sử dụng và truy cập, bạn có thể cung cấp token truy cập."
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/zh-tw.json b/packages/plugin-dev/gitea-issue-provider/i18n/zh-tw.json
new file mode 100644
index 0000000000..420be47d4a
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/zh-tw.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "主機（例如：https://try.gitea.io）",
+    "TOKEN": "存取權杖",
+    "REPO_FULL_NAME": "使用者名稱或組織名稱/專案",
+    "SCOPE": "範圍",
+    "SCOPE_ALL": "全部",
+    "SCOPE_CREATED": "由我建立",
+    "SCOPE_ASSIGNED": "指派給我",
+    "FILTER_LABELS": "依標籤篩選（選填）",
+    "EXCLUDE_LABELS": "排除標籤（選填）",
+    "HOW_TO_GET_TOKEN": "如何取得權杖？"
+  },
+  "DISPLAY": {
+    "SUMMARY": "摘要",
+    "STATE": "狀態",
+    "ASSIGNEE": "指派人",
+    "LABELS": "標籤",
+    "DESCRIPTION": "描述"
+  },
+  "FORM_HELP": "<p>在此您可以設定 Super Productivity 在每日規劃檢視的工作建立面板中列出特定程式碼庫的開放 Gitea 議題。它們將作為建議列出，並提供議題的連結以及更多相關資訊。</p> <p>此外，您可以自動新增和匯入所有開放議題。</p><p>為了繞過使用限制並存取，您可以提供存取權杖。"
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/i18n/zh.json b/packages/plugin-dev/gitea-issue-provider/i18n/zh.json
new file mode 100644
index 0000000000..9739ae2f55
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/i18n/zh.json
@@ -0,0 +1,22 @@
+{
+  "CFG": {
+    "HOST": "主机（例如：https://try.gitea.io）",
+    "TOKEN": "访问令牌",
+    "REPO_FULL_NAME": "用户名或组织名称/项目",
+    "SCOPE": "范围",
+    "SCOPE_ALL": "全部",
+    "SCOPE_CREATED": "由我创建",
+    "SCOPE_ASSIGNED": "分配给我",
+    "FILTER_LABELS": "按标签筛选（可选）",
+    "EXCLUDE_LABELS": "排除标签（可选）",
+    "HOW_TO_GET_TOKEN": "如何获取令牌？"
+  },
+  "DISPLAY": {
+    "SUMMARY": "摘要",
+    "STATE": "状态",
+    "ASSIGNEE": "负责人",
+    "LABELS": "标签",
+    "DESCRIPTION": "描述"
+  },
+  "FORM_HELP": "<p>在这里，您可以将 SuperProductivity 配置为在每日规划视图的任务创建看板中列出特定存储库的未结 Gitea 问题。它们将列为建议，并提供指向问题的链接以及有关它的更多信息。</p> <p>此外，您还可以自动添加和导入所有未结问题。</p><p>为了通过使用限制并访问，您可以提供一个访问令牌。"
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/icon.svg b/packages/plugin-dev/gitea-issue-provider/icon.svg
new file mode 100644
index 0000000000..bae7e5aa72
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/icon.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m4.186 5.421c-1.845-.004-4.316 1.169-4.18 4.11.213 4.594 4.92 5.02 6.801 5.057.206.862 2.42 3.834 4.059 3.99h7.18c4.306-.286 7.53-13.022 5.14-13.07-3.953.186-6.296.28-8.305.296v3.975l-.626-.277-.004-3.696c-2.306-.001-4.336-.108-8.189-.298-.482-.003-1.154-.085-1.876-.087zm.261 1.625h.22c.262 2.355.688 3.732 1.55 5.836-2.2-.26-4.072-.899-4.416-3.285-.178-1.235.422-2.524 2.646-2.552zm8.557 2.315c.15.002.303.03.447.096l.749.323-.537.979a.672.597 0 0 0 -.241.038.672.597 0 0 0 -.405.764.672.597 0 0 0 .112.174l-.926 1.686a.672.597 0 0 0 -.222.038.672.597 0 0 0 -.405.764.672.597 0 0 0 .86.36.672.597 0 0 0 .404-.765.672.597 0 0 0 -.158-.22l.902-1.642a.672.597 0 0 0 .293-.03.672.597 0 0 0 .213-.112c.348.146.633.265.838.366.308.152.417.253.45.365.033.11-.003.322-.177.694-.13.277-.345.67-.599 1.133a.672.597 0 0 0 -.251.038.672.597 0 0 0 -.405.764.672.597 0 0 0 .86.36.672.597 0 0 0 .404-.764.672.597 0 0 0 -.137-.202c.251-.458.467-.852.606-1.148.188-.402.286-.701.2-.99s-.35-.477-.7-.65c-.23-.113-.517-.233-.86-.377a.672.597 0 0 0 -.038-.239.672.597 0 0 0 -.145-.209l.528-.963 2.924 1.263c.528.229.746.79.49 1.26l-2.01 3.68c-.257.469-.888.663-1.416.435l-4.137-1.788c-.528-.228-.747-.79-.49-1.26l2.01-3.679c.176-.323.53-.515.905-.53h.064z"/></svg>
\ No newline at end of file
diff --git a/packages/plugin-dev/gitea-issue-provider/package-lock.json b/packages/plugin-dev/gitea-issue-provider/package-lock.json
new file mode 100644
index 0000000000..ca96ea3c47
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/package-lock.json
@@ -0,0 +1,532 @@
+{
+  "name": "gitea-issue-provider",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "gitea-issue-provider",
+      "version": "1.0.0",
+      "dependencies": {
+        "@super-productivity/plugin-api": "file:../../plugin-api"
+      },
+      "devDependencies": {
+        "esbuild": "^0.25.11",
+        "typescript": "^5.8.3"
+      }
+    },
+    "../../plugin-api": {
+      "name": "@super-productivity/plugin-api",
+      "version": "1.0.1",
+      "license": "MIT",
+      "devDependencies": {
+        "typescript": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
+      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@super-productivity/plugin-api": {
+      "resolved": "../../plugin-api",
+      "link": true
+    },
+    "node_modules/esbuild": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
+      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.12",
+        "@esbuild/android-arm": "0.25.12",
+        "@esbuild/android-arm64": "0.25.12",
+        "@esbuild/android-x64": "0.25.12",
+        "@esbuild/darwin-arm64": "0.25.12",
+        "@esbuild/darwin-x64": "0.25.12",
+        "@esbuild/freebsd-arm64": "0.25.12",
+        "@esbuild/freebsd-x64": "0.25.12",
+        "@esbuild/linux-arm": "0.25.12",
+        "@esbuild/linux-arm64": "0.25.12",
+        "@esbuild/linux-ia32": "0.25.12",
+        "@esbuild/linux-loong64": "0.25.12",
+        "@esbuild/linux-mips64el": "0.25.12",
+        "@esbuild/linux-ppc64": "0.25.12",
+        "@esbuild/linux-riscv64": "0.25.12",
+        "@esbuild/linux-s390x": "0.25.12",
+        "@esbuild/linux-x64": "0.25.12",
+        "@esbuild/netbsd-arm64": "0.25.12",
+        "@esbuild/netbsd-x64": "0.25.12",
+        "@esbuild/openbsd-arm64": "0.25.12",
+        "@esbuild/openbsd-x64": "0.25.12",
+        "@esbuild/openharmony-arm64": "0.25.12",
+        "@esbuild/sunos-x64": "0.25.12",
+        "@esbuild/win32-arm64": "0.25.12",
+        "@esbuild/win32-ia32": "0.25.12",
+        "@esbuild/win32-x64": "0.25.12"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    }
+  }
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/package.json b/packages/plugin-dev/gitea-issue-provider/package.json
new file mode 100644
index 0000000000..5c94ce6564
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "gitea-issue-provider",
+  "version": "1.0.0",
+  "description": "Gitea issue provider plugin",
+  "scripts": {
+    "build": "node scripts/build.js",
+    "typecheck": "tsc --noEmit",
+    "lint": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.11",
+    "typescript": "^5.8.3"
+  },
+  "dependencies": {
+    "@super-productivity/plugin-api": "file:../../plugin-api"
+  }
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/scripts/build.js b/packages/plugin-dev/gitea-issue-provider/scripts/build.js
new file mode 100644
index 0000000000..90ae76df05
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/scripts/build.js
@@ -0,0 +1,67 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const { build } = require('esbuild');
+
+const ROOT_DIR = path.join(__dirname, '..');
+const SRC_DIR = path.join(ROOT_DIR, 'src');
+const DIST_DIR = path.join(ROOT_DIR, 'dist');
+const I18N_SRC = path.join(ROOT_DIR, 'i18n');
+const I18N_DIST = path.join(DIST_DIR, 'i18n');
+
+async function buildPlugin() {
+  console.log('Building gitea-issue-provider...');
+
+  if (fs.existsSync(DIST_DIR)) {
+    fs.rmSync(DIST_DIR, { recursive: true });
+  }
+  fs.mkdirSync(DIST_DIR);
+
+  // Build TypeScript to IIFE bundle
+  await build({
+    entryPoints: [path.join(SRC_DIR, 'plugin.ts')],
+    bundle: true,
+    outfile: path.join(DIST_DIR, 'plugin.js'),
+    platform: 'browser',
+    target: 'es2020',
+    format: 'iife',
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
+    logLevel: 'info',
+    minify: true,
+    sourcemap: false,
+  });
+
+  // Copy manifest.json
+  fs.copyFileSync(
+    path.join(SRC_DIR, 'manifest.json'),
+    path.join(DIST_DIR, 'manifest.json'),
+  );
+
+  // Copy icon.svg if present
+  const iconSrc = path.join(ROOT_DIR, 'icon.svg');
+  if (fs.existsSync(iconSrc)) {
+    fs.copyFileSync(iconSrc, path.join(DIST_DIR, 'icon.svg'));
+    console.log('Copied icon.svg');
+  }
+
+  // Copy i18n files
+  if (fs.existsSync(I18N_SRC)) {
+    fs.mkdirSync(I18N_DIST, { recursive: true });
+    for (const file of fs.readdirSync(I18N_SRC)) {
+      if (file.endsWith('.json')) {
+        fs.copyFileSync(path.join(I18N_SRC, file), path.join(I18N_DIST, file));
+      }
+    }
+    console.log('Copied i18n files');
+  }
+
+  console.log('Build complete!');
+}
+
+buildPlugin().catch((err) => {
+  console.error('Build failed:', err);
+  process.exit(1);
+});
diff --git a/packages/plugin-dev/gitea-issue-provider/src/manifest.json b/packages/plugin-dev/gitea-issue-provider/src/manifest.json
new file mode 100644
index 0000000000..4e1466a7d7
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/src/manifest.json
@@ -0,0 +1,57 @@
+{
+  "id": "gitea-issue-provider",
+  "name": "Gitea Issues",
+  "version": "1.0.0",
+  "manifestVersion": 1,
+  "minSupVersion": "13.0.0",
+  "description": "Gitea issue provider plugin",
+  "author": "Super Productivity",
+  "type": "issueProvider",
+  "icon": "icon.svg",
+  "iFrame": false,
+  "permissions": [],
+  "hooks": [],
+  "i18n": {
+    "languages": [
+      "ar",
+      "cs",
+      "de",
+      "en",
+      "es",
+      "fa",
+      "fi",
+      "fr",
+      "hr",
+      "id",
+      "it",
+      "ja",
+      "ko",
+      "nb",
+      "nl",
+      "pl",
+      "pt",
+      "pt-br",
+      "ro",
+      "ro-md",
+      "ru",
+      "sk",
+      "sv",
+      "tr",
+      "uk",
+      "vi",
+      "zh",
+      "zh-tw"
+    ]
+  },
+  "issueProvider": {
+    "pollIntervalMs": 300000,
+    "icon": "gitea",
+    "humanReadableName": "Gitea",
+    "issueProviderKey": "GITEA",
+    "allowPrivateNetwork": true,
+    "issueStrings": {
+      "singular": "Issue",
+      "plural": "Issues"
+    }
+  }
+}
diff --git a/packages/plugin-dev/gitea-issue-provider/src/plugin.ts b/packages/plugin-dev/gitea-issue-provider/src/plugin.ts
new file mode 100644
index 0000000000..1dfc8c06e8
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/src/plugin.ts
@@ -0,0 +1,371 @@
+import type {
+  IssueProviderPluginDefinition,
+  PluginFieldMapping,
+  PluginHttp,
+  PluginHttpOptions,
+  PluginIssue,
+  PluginSearchResult,
+} from '@super-productivity/plugin-api';
+
+declare const PluginAPI: {
+  registerIssueProvider(definition: IssueProviderPluginDefinition): void;
+  translate(key: string, params?: Record<string, string | number>): string;
+};
+
+const API_SUFFIX = 'api';
+const API_VERSION = 'v1';
+
+// Scope option values — must stay identical to the built-in provider's stored
+// config so existing (migrated) providers keep working.
+const SCOPE_CREATED_BY_ME = 'created-by-me';
+const SCOPE_ASSIGNED_TO_ME = 'assigned-to-me';
+
+interface GiteaConfig {
+  host?: string;
+  token?: string;
+  repoFullname?: string;
+  scope?: string;
+  filterLabels?: string;
+  excludeLabels?: string;
+}
+
+interface GiteaUser {
+  avatar_url: string;
+  id: number;
+  username: string;
+  login: string;
+  full_name: string;
+}
+
+interface GiteaLabel {
+  id: number;
+  name: string;
+  color: string;
+}
+
+interface GiteaRepositoryReduced {
+  id: number;
+  full_name: string;
+}
+
+interface GiteaIssue {
+  id: number;
+  number: number;
+  url: string;
+  html_url: string;
+  title: string;
+  body: string;
+  state: string;
+  labels: GiteaLabel[];
+  user: GiteaUser | null;
+  assignee: GiteaUser | null;
+  assignees: GiteaUser[] | null;
+  comments: number;
+  created_at: string;
+  updated_at: string;
+  closed_at: string | null;
+  repository: GiteaRepositoryReduced | null;
+}
+
+interface GiteaComment {
+  id: number;
+  body: string;
+  created_at: string;
+  user: GiteaUser | null;
+}
+
+const t = (key: string): string => {
+  try {
+    return PluginAPI.translate(key);
+  } catch {
+    return key;
+  }
+};
+
+const baseUrl = (cfg: GiteaConfig): string => {
+  const host = (cfg.host || '').replace(/\/+$/, '');
+  if (!host) {
+    throw new Error('Gitea host is not configured.');
+  }
+  return `${host}/${API_SUFFIX}/${API_VERSION}`;
+};
+
+// Auth is sent as `Authorization: token <token>` (a Gitea-supported scheme),
+// which keeps the token out of request URLs / logs.
+const giteaHeaders = (cfg: GiteaConfig): Record<string, string> => {
+  const headers: Record<string, string> = { accept: 'application/json' };
+  if (cfg.token) {
+    headers['Authorization'] = `token ${cfg.token}`;
+  }
+  return headers;
+};
+
+const parseLabelList = (raw: string | undefined): string[] =>
+  (raw ?? '')
+    .split(',')
+    .map((l) => l.trim())
+    .filter((l) => l.length > 0);
+
+// Gitea/Forgejo's two issue endpoints historically disagree on whether a
+// `labels=a,b` query means AND or OR (see go-gitea/gitea#33509). We always
+// filter labels client-side so behavior is consistent regardless of server.
+const hasAllLabels = (issue: GiteaIssue, required: readonly string[]): boolean => {
+  if (required.length === 0) {
+    return true;
+  }
+  const names = new Set((issue.labels ?? []).map((l) => l.name));
+  return required.every((name) => names.has(name));
+};
+
+const isIssueIncludedByLabels = (
+  issue: GiteaIssue,
+  excluded: readonly string[],
+): boolean => {
+  if (excluded.length === 0) {
+    return true;
+  }
+  const names = new Set((issue.labels ?? []).map((l) => l.name));
+  return !excluded.some((name) => names.has(name));
+};
+
+const issueAssignees = (issue: GiteaIssue): string[] =>
+  (issue.assignees ?? [])
+    .map((a) => a.login || a.username)
+    .filter((name): name is string => !!name);
+
+const mapSearchResult = (issue: GiteaIssue): PluginSearchResult => ({
+  // Gitea tracks issues by their per-repo `number`, not the global `id`.
+  id: String(issue.number),
+  title: `#${issue.number} ${issue.title}`,
+  url: issue.html_url,
+  status: issue.state,
+  assignee: issue.assignee?.login || issue.assignee?.username,
+  labels: (issue.labels ?? []).map((l) => l.name),
+});
+
+PluginAPI.registerIssueProvider({
+  configFields: [
+    {
+      key: 'host',
+      type: 'input',
+      label: t('CFG.HOST'),
+      required: true,
+    },
+    {
+      key: 'token',
+      type: 'password',
+      label: t('CFG.TOKEN'),
+      required: true,
+    },
+    {
+      key: 'tokenHelp',
+      type: 'link',
+      label: t('CFG.HOW_TO_GET_TOKEN'),
+      url: 'https://docs.gitea.com/development/api-usage#generating-and-listing-api-tokens',
+    },
+    {
+      key: 'repoFullname',
+      type: 'input',
+      label: t('CFG.REPO_FULL_NAME'),
+      required: true,
+    },
+    {
+      key: 'scope',
+      type: 'select',
+      label: t('CFG.SCOPE'),
+      required: true,
+      options: [
+        { value: 'all', label: t('CFG.SCOPE_ALL') },
+        { value: SCOPE_CREATED_BY_ME, label: t('CFG.SCOPE_CREATED') },
+        { value: SCOPE_ASSIGNED_TO_ME, label: t('CFG.SCOPE_ASSIGNED') },
+      ],
+    },
+    {
+      key: 'filterLabels',
+      type: 'input',
+      label: t('CFG.FILTER_LABELS'),
+      advanced: true,
+    },
+    {
+      key: 'excludeLabels',
+      type: 'input',
+      label: t('CFG.EXCLUDE_LABELS'),
+      advanced: true,
+    },
+  ],
+
+  getHeaders(config: Record<string, unknown>): Record<string, string> {
+    return giteaHeaders(config as unknown as GiteaConfig);
+  },
+
+  async searchIssues(
+    searchTerm: string,
+    config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<PluginSearchResult[]> {
+    const cfg = config as unknown as GiteaConfig;
+    const base = baseUrl(cfg);
+    const includedLabels = parseLabelList(cfg.filterLabels);
+    const excludedLabels = parseLabelList(cfg.excludeLabels);
+
+    // `priority_repo_id` is the only reliable way to scope the global issue
+    // search to the configured repository, so look it up first.
+    const repo = await http.get<GiteaRepositoryReduced>(
+      `${base}/repos/${cfg.repoFullname}`,
+    );
+
+    const params: Record<string, string> = {
+      limit: '100',
+      state: 'open',
+      q: searchTerm,
+    };
+    if (repo?.id) {
+      params['priority_repo_id'] = String(repo.id);
+    }
+    if (cfg.scope === SCOPE_CREATED_BY_ME) {
+      params['created'] = 'true';
+    } else if (cfg.scope === SCOPE_ASSIGNED_TO_ME) {
+      params['assigned'] = 'true';
+    }
+    if (includedLabels.length > 0) {
+      params['labels'] = includedLabels.join(',');
+    }
+
+    const issues =
+      (await http.get<GiteaIssue[]>(`${base}/repos/issues/search`, { params })) || [];
+    return issues
+      .filter((issue) => issue.repository?.full_name === cfg.repoFullname)
+      .filter((issue) => hasAllLabels(issue, includedLabels))
+      .filter((issue) => isIssueIncludedByLabels(issue, excludedLabels))
+      .map(mapSearchResult);
+  },
+
+  async getById(
+    issueId: string,
+    config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<PluginIssue> {
+    const cfg = config as unknown as GiteaConfig;
+    const base = baseUrl(cfg);
+    const issueUrl = `${base}/repos/${cfg.repoFullname}/issues/${issueId}`;
+    const issue = await http.get<GiteaIssue>(issueUrl);
+
+    const result: PluginIssue = {
+      id: String(issue.number),
+      title: issue.title,
+      body: issue.body || '',
+      url: issue.html_url,
+      state: issue.state,
+      lastUpdated: new Date(issue.updated_at).getTime(),
+      assignee: issue.assignee?.login || issue.assignee?.username,
+      labels: (issue.labels ?? []).map((l) => l.name),
+      comments: [],
+
+      // Extended fields for richer display
+      number: issue.number,
+      summary: `#${issue.number} ${issue.title}`,
+      assignees: issueAssignees(issue),
+      creator: issue.user?.login || issue.user?.username,
+      creatorAvatarUrl: issue.user?.avatar_url,
+      createdAt: new Date(issue.created_at).getTime(),
+      closedAt: issue.closed_at ? new Date(issue.closed_at).getTime() : undefined,
+    };
+
+    if (issue.comments > 0) {
+      const commentsData = await http.get<GiteaComment[]>(`${issueUrl}/comments`);
+      result.comments = (commentsData || []).map((c) => ({
+        author: c.user?.login || c.user?.username || 'unknown',
+        body: c.body || '',
+        created: new Date(c.created_at).getTime(),
+        avatarUrl: c.user?.avatar_url,
+      }));
+    }
+
+    return result;
+  },
+
+  getIssueLink(issueId: string, config: Record<string, unknown>): string {
+    const cfg = config as unknown as GiteaConfig;
+    const host = (cfg.host || '').replace(/\/+$/, '');
+    return `${host}/${cfg.repoFullname}/issues/${issueId}`;
+  },
+
+  async testConnection(
+    config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<boolean> {
+    const cfg = config as unknown as GiteaConfig;
+    try {
+      await http.get(`${baseUrl(cfg)}/repos/${cfg.repoFullname}`);
+      return true;
+    } catch {
+      return false;
+    }
+  },
+
+  async getNewIssuesForBacklog(
+    config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<PluginSearchResult[]> {
+    const cfg = config as unknown as GiteaConfig;
+    const base = baseUrl(cfg);
+    const includedLabels = parseLabelList(cfg.filterLabels);
+    const excludedLabels = parseLabelList(cfg.excludeLabels);
+
+    const params: Record<string, string> = { limit: '100', state: 'open' };
+    if (cfg.scope === SCOPE_CREATED_BY_ME || cfg.scope === SCOPE_ASSIGNED_TO_ME) {
+      const user = await http.get<GiteaUser>(`${base}/user`);
+      if (cfg.scope === SCOPE_CREATED_BY_ME) {
+        params['created_by'] = user.username;
+      } else {
+        params['assigned_by'] = user.username;
+      }
+    }
+    if (includedLabels.length > 0) {
+      params['labels'] = includedLabels.join(',');
+    }
+
+    const opts: PluginHttpOptions = { params };
+    const issues =
+      (await http.get<GiteaIssue[]>(`${base}/repos/${cfg.repoFullname}/issues`, opts)) ||
+      [];
+    return issues
+      .filter((issue) => hasAllLabels(issue, includedLabels))
+      .filter((issue) => isIssueIncludedByLabels(issue, excludedLabels))
+      .map(mapSearchResult);
+  },
+
+  issueDisplay: [
+    { field: 'summary', label: t('DISPLAY.SUMMARY'), type: 'link', linkField: 'url' },
+    { field: 'state', label: t('DISPLAY.STATE'), type: 'text' },
+    { field: 'assignees', label: t('DISPLAY.ASSIGNEE'), type: 'list', hideEmpty: true },
+    { field: 'labels', label: t('DISPLAY.LABELS'), type: 'list', hideEmpty: true },
+    { field: 'body', label: t('DISPLAY.DESCRIPTION'), type: 'markdown' },
+  ],
+
+  commentsConfig: {
+    authorField: 'author',
+    bodyField: 'body',
+    createdField: 'created',
+    avatarField: 'avatarUrl',
+  },
+
+  // Read-only provider: pull-only mappings drive remote-update detection only.
+  fieldMappings: [
+    {
+      taskField: 'isDone',
+      issueField: 'state',
+      defaultDirection: 'pullOnly',
+      toIssueValue: (taskValue: unknown): string => (taskValue ? 'closed' : 'open'),
+      toTaskValue: (issueValue: unknown): boolean => issueValue === 'closed',
+    },
+  ] satisfies PluginFieldMapping[],
+
+  extractSyncValues(issue: PluginIssue): Record<string, unknown> {
+    return {
+      state: issue.state,
+      title: issue.title,
+      body: issue.body,
+    };
+  },
+});
diff --git a/packages/plugin-dev/gitea-issue-provider/tsconfig.json b/packages/plugin-dev/gitea-issue-provider/tsconfig.json
new file mode 100644
index 0000000000..3c59f94bab
--- /dev/null
+++ b/packages/plugin-dev/gitea-issue-provider/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/packages/plugin-dev/linear-issue-provider/i18n/en.json b/packages/plugin-dev/linear-issue-provider/i18n/en.json
new file mode 100644
index 0000000000..793a06ac66
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/i18n/en.json
@@ -0,0 +1,17 @@
+{
+  "CFG": {
+    "API_KEY": "API Key",
+    "TEAM_ID": "Team ID (optional, filter to a specific team)",
+    "PROJECT_ID": "Project ID (optional, filter to a specific project)",
+    "HOW_TO_GET_TOKEN": "Get your API key"
+  },
+  "DISPLAY": {
+    "SUMMARY": "Summary",
+    "STATE": "Status",
+    "PRIORITY": "Priority",
+    "ASSIGNEE": "Assignee",
+    "LABELS": "Labels",
+    "DESCRIPTION": "Description"
+  },
+  "FORM_HELP": "<p>Configure Super Productivity to list and import your assigned Linear issues in the task creation panel. They will be listed as suggestions with a link to the issue and more information about it.</p>"
+}
diff --git a/packages/plugin-dev/linear-issue-provider/icon.svg b/packages/plugin-dev/linear-issue-provider/icon.svg
new file mode 100644
index 0000000000..613820a135
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M1.22541 61.5228c-.2225-.9485.90748-1.5459 1.59638-.857L39.3342 97.1782c.6889.6889.0915 1.8189-.857 1.5964C20.0515 94.4522 5.54779 79.9485 1.22541 61.5228ZM.00189135 46.8891c-.01764375.2833.08887215.5599.28957165.7606L52.3503 99.7085c.2007.2007.4773.3075.7606.2896 2.3692-.1476 4.6938-.46 6.9624-.9259.7645-.157 1.0301-1.0963.4782-1.6481L2.57595 39.4485c-.55186-.5519-1.49117-.2863-1.648174.4782-.465915 2.2686-.77832 4.5932-.92588465 6.9624ZM4.21093 29.7054c-.16649.3738-.08169.8106.20765 1.1l64.77602 64.776c.2894.2894.7262.3742 1.1.2077 1.7861-.7956 3.5171-1.6927 5.1855-2.684.5521-.328.6373-1.0867.1832-1.5407L8.43566 24.3367c-.45409-.4541-1.21271-.3689-1.54074.1832-.99132 1.6684-1.88843 3.3994-2.68399 5.1855ZM12.6587 18.074c-.3701-.3701-.393-.9637-.0443-1.3541C21.7795 6.45931 35.1114 0 49.9519 0 77.5927 0 100 22.4073 100 50.0481c0 14.8405-6.4593 28.1724-16.7199 37.3375-.3903.3487-.984.3258-1.3542-.0443L12.6587 18.074Z"/></svg>
diff --git a/packages/plugin-dev/linear-issue-provider/package-lock.json b/packages/plugin-dev/linear-issue-provider/package-lock.json
new file mode 100644
index 0000000000..c6fbc2f8a8
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/package-lock.json
@@ -0,0 +1,532 @@
+{
+  "name": "linear-issue-provider",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "linear-issue-provider",
+      "version": "1.0.0",
+      "dependencies": {
+        "@super-productivity/plugin-api": "file:../../plugin-api"
+      },
+      "devDependencies": {
+        "esbuild": "^0.25.11",
+        "typescript": "^5.8.3"
+      }
+    },
+    "../../plugin-api": {
+      "name": "@super-productivity/plugin-api",
+      "version": "1.0.1",
+      "license": "MIT",
+      "devDependencies": {
+        "typescript": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
+      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@super-productivity/plugin-api": {
+      "resolved": "../../plugin-api",
+      "link": true
+    },
+    "node_modules/esbuild": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
+      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.12",
+        "@esbuild/android-arm": "0.25.12",
+        "@esbuild/android-arm64": "0.25.12",
+        "@esbuild/android-x64": "0.25.12",
+        "@esbuild/darwin-arm64": "0.25.12",
+        "@esbuild/darwin-x64": "0.25.12",
+        "@esbuild/freebsd-arm64": "0.25.12",
+        "@esbuild/freebsd-x64": "0.25.12",
+        "@esbuild/linux-arm": "0.25.12",
+        "@esbuild/linux-arm64": "0.25.12",
+        "@esbuild/linux-ia32": "0.25.12",
+        "@esbuild/linux-loong64": "0.25.12",
+        "@esbuild/linux-mips64el": "0.25.12",
+        "@esbuild/linux-ppc64": "0.25.12",
+        "@esbuild/linux-riscv64": "0.25.12",
+        "@esbuild/linux-s390x": "0.25.12",
+        "@esbuild/linux-x64": "0.25.12",
+        "@esbuild/netbsd-arm64": "0.25.12",
+        "@esbuild/netbsd-x64": "0.25.12",
+        "@esbuild/openbsd-arm64": "0.25.12",
+        "@esbuild/openbsd-x64": "0.25.12",
+        "@esbuild/openharmony-arm64": "0.25.12",
+        "@esbuild/sunos-x64": "0.25.12",
+        "@esbuild/win32-arm64": "0.25.12",
+        "@esbuild/win32-ia32": "0.25.12",
+        "@esbuild/win32-x64": "0.25.12"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    }
+  }
+}
diff --git a/packages/plugin-dev/linear-issue-provider/package.json b/packages/plugin-dev/linear-issue-provider/package.json
new file mode 100644
index 0000000000..1cd493b42e
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "linear-issue-provider",
+  "version": "1.0.0",
+  "description": "Linear issue provider plugin",
+  "scripts": {
+    "build": "node scripts/build.js",
+    "typecheck": "tsc --noEmit",
+    "lint": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.11",
+    "typescript": "^5.8.3"
+  },
+  "dependencies": {
+    "@super-productivity/plugin-api": "file:../../plugin-api"
+  }
+}
diff --git a/packages/plugin-dev/linear-issue-provider/scripts/build.js b/packages/plugin-dev/linear-issue-provider/scripts/build.js
new file mode 100644
index 0000000000..a841a2754c
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/scripts/build.js
@@ -0,0 +1,67 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const { build } = require('esbuild');
+
+const ROOT_DIR = path.join(__dirname, '..');
+const SRC_DIR = path.join(ROOT_DIR, 'src');
+const DIST_DIR = path.join(ROOT_DIR, 'dist');
+const I18N_SRC = path.join(ROOT_DIR, 'i18n');
+const I18N_DIST = path.join(DIST_DIR, 'i18n');
+
+async function buildPlugin() {
+  console.log('Building linear-issue-provider...');
+
+  if (fs.existsSync(DIST_DIR)) {
+    fs.rmSync(DIST_DIR, { recursive: true });
+  }
+  fs.mkdirSync(DIST_DIR);
+
+  // Build TypeScript to IIFE bundle
+  await build({
+    entryPoints: [path.join(SRC_DIR, 'plugin.ts')],
+    bundle: true,
+    outfile: path.join(DIST_DIR, 'plugin.js'),
+    platform: 'browser',
+    target: 'es2020',
+    format: 'iife',
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
+    logLevel: 'info',
+    minify: true,
+    sourcemap: false,
+  });
+
+  // Copy manifest.json
+  fs.copyFileSync(
+    path.join(SRC_DIR, 'manifest.json'),
+    path.join(DIST_DIR, 'manifest.json'),
+  );
+
+  // Copy icon.svg if present
+  const iconSrc = path.join(ROOT_DIR, 'icon.svg');
+  if (fs.existsSync(iconSrc)) {
+    fs.copyFileSync(iconSrc, path.join(DIST_DIR, 'icon.svg'));
+    console.log('Copied icon.svg');
+  }
+
+  // Copy i18n files
+  if (fs.existsSync(I18N_SRC)) {
+    fs.mkdirSync(I18N_DIST, { recursive: true });
+    for (const file of fs.readdirSync(I18N_SRC)) {
+      if (file.endsWith('.json')) {
+        fs.copyFileSync(path.join(I18N_SRC, file), path.join(I18N_DIST, file));
+      }
+    }
+    console.log('Copied i18n files');
+  }
+
+  console.log('Build complete!');
+}
+
+buildPlugin().catch((err) => {
+  console.error('Build failed:', err);
+  process.exit(1);
+});
diff --git a/packages/plugin-dev/linear-issue-provider/src/manifest.json b/packages/plugin-dev/linear-issue-provider/src/manifest.json
new file mode 100644
index 0000000000..39f53b3c58
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/src/manifest.json
@@ -0,0 +1,27 @@
+{
+  "id": "linear-issue-provider",
+  "name": "Linear Issues",
+  "version": "1.0.0",
+  "manifestVersion": 1,
+  "minSupVersion": "13.0.0",
+  "description": "Linear issue provider plugin",
+  "author": "Super Productivity",
+  "type": "issueProvider",
+  "icon": "icon.svg",
+  "iFrame": false,
+  "permissions": [],
+  "hooks": [],
+  "i18n": {
+    "languages": ["en"]
+  },
+  "issueProvider": {
+    "pollIntervalMs": 300000,
+    "icon": "linear",
+    "humanReadableName": "Linear",
+    "issueProviderKey": "LINEAR",
+    "issueStrings": {
+      "singular": "Issue",
+      "plural": "Issues"
+    }
+  }
+}
diff --git a/packages/plugin-dev/linear-issue-provider/src/plugin.ts b/packages/plugin-dev/linear-issue-provider/src/plugin.ts
new file mode 100644
index 0000000000..02fb85d5cf
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/src/plugin.ts
@@ -0,0 +1,319 @@
+import type {
+  IssueProviderPluginDefinition,
+  PluginFieldMapping,
+  PluginHttp,
+  PluginIssue,
+  PluginSearchResult,
+} from '@super-productivity/plugin-api';
+
+declare const PluginAPI: {
+  registerIssueProvider(definition: IssueProviderPluginDefinition): void;
+  translate(key: string, params?: Record<string, string | number>): string;
+};
+
+const LINEAR_API_URL = 'https://api.linear.app/graphql';
+
+// Linear workflow state types that mean "done" (matches the built-in provider).
+const DONE_STATE_TYPES = ['completed', 'canceled'];
+
+interface LinearConfig {
+  apiKey?: string;
+  teamId?: string;
+  projectId?: string;
+}
+
+interface LinearGraphQLResponse<T = unknown> {
+  data?: T;
+  errors?: Array<{ message: string }>;
+}
+
+interface LinearRawIssueReduced {
+  id: string;
+  identifier: string;
+  number: number;
+  title: string;
+  updatedAt: string;
+  url: string;
+  state: { name: string; type: string };
+}
+
+interface LinearRawIssue extends LinearRawIssueReduced {
+  description?: string;
+  priority: number;
+  createdAt: string;
+  completedAt?: string;
+  canceledAt?: string;
+  dueDate?: string;
+  assignee?: { id: string; name: string; avatarUrl?: string };
+  creator?: { id: string; name: string };
+  labels?: { nodes: Array<{ id: string; name: string; color: string }> };
+  comments?: {
+    nodes: Array<{
+      id: string;
+      body: string;
+      createdAt: string;
+      user?: { id: string; name: string; avatarUrl?: string };
+    }>;
+  };
+}
+
+const t = (key: string): string => {
+  try {
+    return PluginAPI.translate(key);
+  } catch {
+    return key;
+  }
+};
+
+const SEARCH_ISSUES_QUERY = `
+  query SearchIssues($first: Int!, $team: TeamFilter, $project: NullableProjectFilter) {
+    viewer {
+      assignedIssues(
+        first: $first,
+        filter: {
+          state: { type: { in: ["backlog", "unstarted", "started"] } },
+          team: $team,
+          project: $project
+        }
+      ) {
+        nodes {
+          id identifier number title updatedAt url
+          state { id name type }
+        }
+      }
+    }
+  }
+`;
+
+const GET_ISSUE_QUERY = `
+  query GetIssue($id: String!) {
+    issue(id: $id) {
+      id identifier number title description priority
+      createdAt updatedAt completedAt canceledAt dueDate url
+      state { id name type }
+      team { id name key }
+      assignee { id name avatarUrl }
+      creator { id name }
+      labels(first: 50) { nodes { id name color } }
+      comments(first: 50) {
+        nodes { id body createdAt user { id name avatarUrl } }
+      }
+    }
+  }
+`;
+
+const GET_VIEWER_QUERY = `query GetViewer { viewer { id name } }`;
+
+const graphql = async <T>(
+  http: PluginHttp,
+  query: string,
+  variables: Record<string, unknown>,
+): Promise<T> => {
+  const res = await http.post<LinearGraphQLResponse<T>>(LINEAR_API_URL, {
+    query,
+    variables,
+  });
+  if (res?.errors?.length) {
+    throw new Error(res.errors[0].message || 'Linear GraphQL error');
+  }
+  if (!res?.data) {
+    throw new Error('No data returned from Linear');
+  }
+  return res.data;
+};
+
+const mapReduced = (issue: LinearRawIssueReduced): PluginSearchResult => ({
+  id: issue.id,
+  title: `${issue.identifier} ${issue.title}`,
+  url: issue.url,
+  status: issue.state?.name,
+  // Provider-specific fields used for display + isDone mapping.
+  identifier: issue.identifier,
+  stateType: issue.state?.type,
+});
+
+const searchAssignedIssues = async (
+  searchTerm: string,
+  cfg: LinearConfig,
+  http: PluginHttp,
+): Promise<PluginSearchResult[]> => {
+  const variables: Record<string, unknown> = { first: 50 };
+  // Deliberate behavior change from the built-in provider: the old
+  // LinearApiService accepted teamId/projectId but its callers never passed
+  // them, so the "filter to specific team/project" config fields were inert.
+  // Here we honor them as the labels promise. Empty fields = no filter (the
+  // common case), so this only narrows results for users who set a value.
+  if (cfg.teamId) {
+    variables.team = { id: { eq: cfg.teamId } };
+  }
+  if (cfg.projectId) {
+    variables.project = { id: { eq: cfg.projectId } };
+  }
+
+  const data = await graphql<{
+    viewer: { assignedIssues: { nodes: LinearRawIssueReduced[] } };
+  }>(http, SEARCH_ISSUES_QUERY, variables);
+
+  let issues = data.viewer?.assignedIssues?.nodes || [];
+  const term = searchTerm.trim().toLowerCase();
+  if (term) {
+    issues = issues.filter(
+      (issue) =>
+        issue.title.toLowerCase().includes(term) ||
+        issue.identifier.toLowerCase().includes(term),
+    );
+  }
+  return issues.map(mapReduced);
+};
+
+PluginAPI.registerIssueProvider({
+  configFields: [
+    {
+      key: 'apiKey',
+      type: 'password',
+      label: t('CFG.API_KEY'),
+      required: true,
+    },
+    {
+      key: 'apiKeyHelp',
+      type: 'link',
+      label: t('CFG.HOW_TO_GET_TOKEN'),
+      url: 'https://linear.app/settings/account/security',
+    },
+    {
+      key: 'teamId',
+      type: 'input',
+      label: t('CFG.TEAM_ID'),
+      advanced: true,
+    },
+    {
+      key: 'projectId',
+      type: 'input',
+      label: t('CFG.PROJECT_ID'),
+      advanced: true,
+    },
+  ],
+
+  getHeaders(config: Record<string, unknown>): Record<string, string> {
+    const cfg = config as unknown as LinearConfig;
+    return {
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      'Content-Type': 'application/json',
+      Authorization: cfg.apiKey || '',
+    };
+  },
+
+  searchIssues(
+    searchTerm: string,
+    config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<PluginSearchResult[]> {
+    return searchAssignedIssues(searchTerm, config as unknown as LinearConfig, http);
+  },
+
+  async getById(
+    issueId: string,
+    _config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<PluginIssue> {
+    const data = await graphql<{ issue: LinearRawIssue | null }>(http, GET_ISSUE_QUERY, {
+      id: issueId,
+    });
+    const issue = data.issue;
+    if (!issue) {
+      throw new Error('No issue data returned from Linear');
+    }
+
+    return {
+      id: issue.id,
+      title: issue.title,
+      body: issue.description || '',
+      url: issue.url,
+      state: issue.state?.name,
+      lastUpdated: new Date(issue.updatedAt).getTime(),
+      assignee: issue.assignee?.name,
+      labels: (issue.labels?.nodes || []).map((l) => l.name),
+      comments: (issue.comments?.nodes || [])
+        .filter((c) => !!c.user)
+        .map((c) => ({
+          author: c.user!.name,
+          body: c.body || '',
+          created: new Date(c.createdAt).getTime(),
+          avatarUrl: c.user!.avatarUrl,
+        })),
+
+      // Extended fields for display + isDone mapping.
+      identifier: issue.identifier,
+      number: issue.number,
+      summary: `${issue.identifier} ${issue.title}`,
+      stateType: issue.state?.type,
+      priority: issue.priority,
+      creator: issue.creator?.name,
+      createdAt: new Date(issue.createdAt).getTime(),
+      completedAt: issue.completedAt ? new Date(issue.completedAt).getTime() : undefined,
+    };
+  },
+
+  // Linear issue URLs require the workspace slug, which can't be derived from the
+  // id + config alone. Returning '' makes the adapter fall back to getById().url,
+  // matching the built-in provider's behavior.
+  getIssueLink(): string {
+    return '';
+  },
+
+  async testConnection(
+    _config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<boolean> {
+    try {
+      await graphql(http, GET_VIEWER_QUERY, {});
+      return true;
+    } catch {
+      return false;
+    }
+  },
+
+  getNewIssuesForBacklog(
+    config: Record<string, unknown>,
+    http: PluginHttp,
+  ): Promise<PluginSearchResult[]> {
+    return searchAssignedIssues('', config as unknown as LinearConfig, http);
+  },
+
+  issueDisplay: [
+    { field: 'summary', label: t('DISPLAY.SUMMARY'), type: 'link', linkField: 'url' },
+    { field: 'state', label: t('DISPLAY.STATE'), type: 'text', hideEmpty: true },
+    { field: 'priority', label: t('DISPLAY.PRIORITY'), type: 'text', hideEmpty: true },
+    { field: 'assignee', label: t('DISPLAY.ASSIGNEE'), type: 'text', hideEmpty: true },
+    { field: 'labels', label: t('DISPLAY.LABELS'), type: 'list', hideEmpty: true },
+    { field: 'body', label: t('DISPLAY.DESCRIPTION'), type: 'markdown' },
+  ],
+
+  commentsConfig: {
+    authorField: 'author',
+    bodyField: 'body',
+    createdField: 'created',
+    avatarField: 'avatarUrl',
+  },
+
+  // Read-only provider: pull-only mapping drives remote-update detection only.
+  fieldMappings: [
+    {
+      taskField: 'isDone',
+      issueField: 'stateType',
+      defaultDirection: 'pullOnly',
+      toIssueValue: (taskValue: unknown): string =>
+        taskValue ? 'completed' : 'unstarted',
+      toTaskValue: (issueValue: unknown): boolean =>
+        DONE_STATE_TYPES.includes(issueValue as string),
+    },
+  ] satisfies PluginFieldMapping[],
+
+  extractSyncValues(issue: PluginIssue): Record<string, unknown> {
+    return {
+      stateType: issue.stateType,
+      title: issue.title,
+      body: issue.body,
+    };
+  },
+});
diff --git a/packages/plugin-dev/linear-issue-provider/tsconfig.json b/packages/plugin-dev/linear-issue-provider/tsconfig.json
new file mode 100644
index 0000000000..3c59f94bab
--- /dev/null
+++ b/packages/plugin-dev/linear-issue-provider/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/src/app/features/issue-panel/issue-provider-setup-overview/issue-provider-setup-overview.component.html b/src/app/features/issue-panel/issue-provider-setup-overview/issue-provider-setup-overview.component.html
index ce395605a1..baef3ddce2 100644
--- a/src/app/features/issue-panel/issue-provider-setup-overview/issue-provider-setup-overview.component.html
+++ b/src/app/features/issue-panel/issue-provider-setup-overview/issue-provider-setup-overview.component.html
@@ -105,22 +105,8 @@
     <mat-icon svgIcon="open_project"></mat-icon>
     <span>Open Project</span>
   </button>
-  <button
-    class="provider-tile focus-ring"
-    type="button"
-    (click)="openSetupDialog('GITEA')"
-  >
-    <mat-icon svgIcon="gitea"></mat-icon>
-    <span>Gitea</span>
-  </button>
-  <button
-    class="provider-tile focus-ring"
-    type="button"
-    (click)="openSetupDialog('LINEAR')"
-  >
-    <mat-icon svgIcon="linear"></mat-icon>
-    <span>Linear</span>
-  </button>
+  <!-- Gitea and Linear are bundled plugins now — rendered via the
+       pluginProviders / disabledPluginProviders loops below (like GitHub). -->
   <button
     class="provider-tile focus-ring"
     type="button"
diff --git a/src/app/features/issue/issue-content/issue-content-configs.const.ts b/src/app/features/issue/issue-content/issue-content-configs.const.ts
index 6b20507798..15efa156f0 100644
--- a/src/app/features/issue/issue-content/issue-content-configs.const.ts
+++ b/src/app/features/issue/issue-content/issue-content-configs.const.ts
@@ -8,11 +8,11 @@ import {
 import { JIRA_ISSUE_CONTENT_CONFIG } from '../providers/jira/jira-issue-content.const';
 import { GITLAB_ISSUE_CONTENT_CONFIG } from '../providers/gitlab/gitlab-issue-content.const';
 import { CALDAV_ISSUE_CONTENT_CONFIG } from '../providers/caldav/caldav-issue-content.const';
-import { GITEA_ISSUE_CONTENT_CONFIG } from '../providers/gitea/gitea-issue-content.const';
+// Gitea is now a plugin — content config lives in the plugin's issueDisplay
 import { REDMINE_ISSUE_CONTENT_CONFIG } from '../providers/redmine/redmine-issue-content.const';
 import { OPEN_PROJECT_ISSUE_CONTENT_CONFIG } from '../providers/open-project/open-project-issue-content.const';
 import { TRELLO_ISSUE_CONTENT_CONFIG } from '../providers/trello/trello-issue-content.const';
-import { LINEAR_ISSUE_CONTENT_CONFIG } from '../providers/linear/linear-issue-content.const';
+// Linear is now a plugin — content config lives in the plugin's issueDisplay
 import { AZURE_DEVOPS_ISSUE_CONTENT_CONFIG } from '../providers/azure-devops/azure-devops-issue/azure-devops-issue-content.const';
 import { NEXTCLOUD_DECK_ISSUE_CONTENT_CONFIG } from '../providers/nextcloud-deck/nextcloud-deck-issue-content.const';
 
@@ -26,11 +26,9 @@ export const ISSUE_CONTENT_CONFIGS: Record<
   GITLAB: GITLAB_ISSUE_CONTENT_CONFIG,
   JIRA: JIRA_ISSUE_CONTENT_CONFIG,
   CALDAV: CALDAV_ISSUE_CONTENT_CONFIG,
-  GITEA: GITEA_ISSUE_CONTENT_CONFIG,
   REDMINE: REDMINE_ISSUE_CONTENT_CONFIG,
   OPEN_PROJECT: OPEN_PROJECT_ISSUE_CONTENT_CONFIG,
   TRELLO: TRELLO_ISSUE_CONTENT_CONFIG,
-  LINEAR: LINEAR_ISSUE_CONTENT_CONFIG,
   AZURE_DEVOPS: AZURE_DEVOPS_ISSUE_CONTENT_CONFIG,
   NEXTCLOUD_DECK: NEXTCLOUD_DECK_ISSUE_CONTENT_CONFIG,
   ICAL: {
diff --git a/src/app/features/issue/issue.const.ts b/src/app/features/issue/issue.const.ts
index 006da511f8..9177769134 100644
--- a/src/app/features/issue/issue.const.ts
+++ b/src/app/features/issue/issue.const.ts
@@ -18,10 +18,7 @@ import {
   OPEN_PROJECT_CONFIG_FORM_SECTION,
 } from './providers/open-project/open-project.const';
 import { T } from '../../t.const';
-import {
-  DEFAULT_GITEA_CFG,
-  GITEA_CONFIG_FORM_SECTION,
-} from './providers/gitea/gitea.const';
+// Gitea is now a plugin — no built-in config needed
 import {
   DEFAULT_REDMINE_CFG,
   REDMINE_CONFIG_FORM_SECTION,
@@ -34,10 +31,7 @@ import {
   DEFAULT_TRELLO_CFG,
   TRELLO_CONFIG_FORM_SECTION,
 } from './providers/trello/trello.const';
-import {
-  DEFAULT_LINEAR_CFG,
-  LINEAR_CONFIG_FORM_SECTION,
-} from './providers/linear/linear.const';
+// Linear is now a plugin — no built-in config needed
 // ClickUp is now a plugin — no built-in config needed
 import { AZURE_DEVOPS_INITIAL_CFG } from './providers/azure-devops/azure-devops.const';
 import { DEFAULT_NEXTCLOUD_DECK_CFG } from './providers/nextcloud-deck/nextcloud-deck.const';
@@ -51,11 +45,11 @@ export const GITHUB_TYPE: MigratedIssueProviderKey = 'GITHUB';
 export const JIRA_TYPE: BuiltInIssueProviderKey = 'JIRA';
 export const CALDAV_TYPE: BuiltInIssueProviderKey = 'CALDAV';
 export const OPEN_PROJECT_TYPE: BuiltInIssueProviderKey = 'OPEN_PROJECT';
-export const GITEA_TYPE: BuiltInIssueProviderKey = 'GITEA';
+export const GITEA_TYPE: MigratedIssueProviderKey = 'GITEA';
 export const REDMINE_TYPE: BuiltInIssueProviderKey = 'REDMINE';
 export const ICAL_TYPE: BuiltInIssueProviderKey = 'ICAL';
 export const TRELLO_TYPE: BuiltInIssueProviderKey = 'TRELLO';
-export const LINEAR_TYPE: BuiltInIssueProviderKey = 'LINEAR';
+export const LINEAR_TYPE: MigratedIssueProviderKey = 'LINEAR';
 export const CLICKUP_TYPE: MigratedIssueProviderKey = 'CLICKUP';
 export const AZURE_DEVOPS_TYPE: BuiltInIssueProviderKey = 'AZURE_DEVOPS';
 export const NEXTCLOUD_DECK_TYPE: BuiltInIssueProviderKey = 'NEXTCLOUD_DECK';
@@ -66,10 +60,8 @@ export const ISSUE_PROVIDER_TYPES: BuiltInIssueProviderKey[] = [
   CALDAV_TYPE,
   ICAL_TYPE,
   OPEN_PROJECT_TYPE,
-  GITEA_TYPE,
   TRELLO_TYPE,
   REDMINE_TYPE,
-  LINEAR_TYPE,
   AZURE_DEVOPS_TYPE,
   NEXTCLOUD_DECK_TYPE,
 ] as const;
@@ -80,10 +72,8 @@ export const ISSUE_PROVIDER_ICON_MAP = {
   [CALDAV_TYPE]: 'caldav',
   [ICAL_TYPE]: 'calendar',
   [OPEN_PROJECT_TYPE]: 'open_project',
-  [GITEA_TYPE]: 'gitea',
   [TRELLO_TYPE]: 'trello',
   [REDMINE_TYPE]: 'redmine',
-  [LINEAR_TYPE]: 'linear',
   [AZURE_DEVOPS_TYPE]: 'azure_devops',
   [NEXTCLOUD_DECK_TYPE]: 'nextcloud_deck',
 } as const;
@@ -94,10 +84,8 @@ export const ISSUE_PROVIDER_HUMANIZED = {
   [CALDAV_TYPE]: 'CalDAV',
   [ICAL_TYPE]: 'Calendar',
   [OPEN_PROJECT_TYPE]: 'OpenProject',
-  [GITEA_TYPE]: 'Gitea',
   [TRELLO_TYPE]: 'Trello',
   [REDMINE_TYPE]: 'Redmine',
-  [LINEAR_TYPE]: 'Linear',
   [AZURE_DEVOPS_TYPE]: 'Azure DevOps',
   [NEXTCLOUD_DECK_TYPE]: 'Nextcloud Deck',
 } as const;
@@ -108,10 +96,8 @@ export const DEFAULT_ISSUE_PROVIDER_CFGS = {
   [CALDAV_TYPE]: DEFAULT_CALDAV_CFG,
   [ICAL_TYPE]: DEFAULT_CALENDAR_CFG,
   [OPEN_PROJECT_TYPE]: DEFAULT_OPEN_PROJECT_CFG,
-  [GITEA_TYPE]: DEFAULT_GITEA_CFG,
   [TRELLO_TYPE]: DEFAULT_TRELLO_CFG,
   [REDMINE_TYPE]: DEFAULT_REDMINE_CFG,
-  [LINEAR_TYPE]: DEFAULT_LINEAR_CFG,
   [AZURE_DEVOPS_TYPE]: AZURE_DEVOPS_INITIAL_CFG,
   [NEXTCLOUD_DECK_TYPE]: DEFAULT_NEXTCLOUD_DECK_CFG,
 } as const;
@@ -122,10 +108,8 @@ export const ISSUE_PROVIDER_FORM_CFGS_MAP = {
   [CALDAV_TYPE]: CALDAV_CONFIG_FORM_SECTION,
   [ICAL_TYPE]: CALENDAR_FORM_CFG_NEW as any,
   [OPEN_PROJECT_TYPE]: OPEN_PROJECT_CONFIG_FORM_SECTION,
-  [GITEA_TYPE]: GITEA_CONFIG_FORM_SECTION,
   [TRELLO_TYPE]: TRELLO_CONFIG_FORM_SECTION,
   [REDMINE_TYPE]: REDMINE_CONFIG_FORM_SECTION,
-  [LINEAR_TYPE]: LINEAR_CONFIG_FORM_SECTION,
   [AZURE_DEVOPS_TYPE]: AZURE_DEVOPS_CONFIG_FORM_SECTION,
   [NEXTCLOUD_DECK_TYPE]: NEXTCLOUD_DECK_CONFIG_FORM_SECTION,
 } as const;
@@ -150,10 +134,8 @@ export const ISSUE_STR_MAP: Record<
     ISSUE_STR: T.F.OPEN_PROJECT.ISSUE_STRINGS.ISSUE_STR,
     ISSUES_STR: T.F.OPEN_PROJECT.ISSUE_STRINGS.ISSUES_STR,
   },
-  [GITEA_TYPE]: DEFAULT_ISSUE_STRS,
   [TRELLO_TYPE]: DEFAULT_ISSUE_STRS,
   [REDMINE_TYPE]: DEFAULT_ISSUE_STRS,
-  [LINEAR_TYPE]: DEFAULT_ISSUE_STRS,
   [AZURE_DEVOPS_TYPE]: DEFAULT_ISSUE_STRS,
   [NEXTCLOUD_DECK_TYPE]: DEFAULT_ISSUE_STRS,
 } as const;
diff --git a/src/app/features/issue/issue.model.ts b/src/app/features/issue/issue.model.ts
index 38357b311a..027e9075eb 100644
--- a/src/app/features/issue/issue.model.ts
+++ b/src/app/features/issue/issue.model.ts
@@ -9,14 +9,10 @@ import {
   OpenProjectWorkPackage,
   OpenProjectWorkPackageReduced,
 } from './providers/open-project/open-project-issue.model';
-import { GiteaCfg } from './providers/gitea/gitea.model';
-import { GiteaIssue } from './providers/gitea/gitea-issue.model';
 import { RedmineCfg } from './providers/redmine/redmine.model';
 import { RedmineIssue } from './providers/redmine/redmine-issue.model';
 import { TrelloCfg } from './providers/trello/trello.model';
 import { TrelloIssue, TrelloIssueReduced } from './providers/trello/trello-issue.model';
-import { LinearCfg } from './providers/linear/linear.model';
-import { LinearIssue, LinearIssueReduced } from './providers/linear/linear-issue.model';
 import { EntityState } from '@ngrx/entity';
 import {
   CalendarProviderCfg,
@@ -49,15 +45,13 @@ export type BuiltInIssueProviderKey =
   | 'CALDAV'
   | 'ICAL'
   | 'OPEN_PROJECT'
-  | 'GITEA'
   | 'TRELLO'
   | 'REDMINE'
-  | 'LINEAR'
   | 'AZURE_DEVOPS'
   | 'NEXTCLOUD_DECK';
 
 // Keys migrated from built-in to plugin — still valid as IssueProviderKey
-export type MigratedIssueProviderKey = 'GITHUB' | 'CLICKUP';
+export type MigratedIssueProviderKey = 'GITHUB' | 'CLICKUP' | 'GITEA' | 'LINEAR';
 
 // Plugin issue provider keys use a 'plugin:' prefix to avoid collision
 export type PluginIssueProviderKey = `plugin:${string}`;
@@ -80,10 +74,8 @@ const BUILT_IN_KEYS: ReadonlySet<string> = new Set<BuiltInIssueProviderKey>([
   'CALDAV',
   'ICAL',
   'OPEN_PROJECT',
-  'GITEA',
   'TRELLO',
   'REDMINE',
-  'LINEAR',
   'AZURE_DEVOPS',
   'NEXTCLOUD_DECK',
 ]);
@@ -91,6 +83,8 @@ const BUILT_IN_KEYS: ReadonlySet<string> = new Set<BuiltInIssueProviderKey>([
 const MIGRATED_KEYS: ReadonlySet<string> = new Set<MigratedIssueProviderKey>([
   'GITHUB',
   'CLICKUP',
+  'GITEA',
+  'LINEAR',
 ]);
 
 export const isValidIssueProviderKey = (key: string): key is IssueProviderKey => {
@@ -103,10 +97,8 @@ export type IssueIntegrationCfg =
   | CaldavCfg
   | CalendarProviderCfg
   | OpenProjectCfg
-  | GiteaCfg
   | TrelloCfg
   | RedmineCfg
-  | LinearCfg
   | AzureDevOpsCfg
   | NextcloudDeckCfg;
 
@@ -124,9 +116,7 @@ export interface IssueIntegrationCfgs {
   CALENDAR?: CalendarProviderCfg;
   OPEN_PROJECT?: OpenProjectCfg;
   TRELLO?: TrelloCfg;
-  GITEA?: GiteaCfg;
   REDMINE?: RedmineCfg;
-  LINEAR?: LinearCfg;
   AZURE_DEVOPS?: AzureDevOpsCfg;
   NEXTCLOUD_DECK?: NextcloudDeckCfg;
 }
@@ -137,10 +127,8 @@ export type IssueData =
   | CaldavIssue
   | ICalIssue
   | OpenProjectWorkPackage
-  | GiteaIssue
   | RedmineIssue
   | TrelloIssue
-  | LinearIssue
   | AzureDevOpsIssue
   | NextcloudDeckIssue
   | PluginIssue;
@@ -151,10 +139,8 @@ export type IssueDataReduced =
   | OpenProjectWorkPackageReduced
   | CaldavIssueReduced
   | ICalIssueReduced
-  | GiteaIssue
   | RedmineIssue
   | TrelloIssueReduced
-  | LinearIssueReduced
   | AzureDevOpsIssueReduced
   | NextcloudDeckIssueReduced
   | PluginSearchResult;
@@ -170,23 +156,19 @@ export type IssueDataReducedMap = {
           ? ICalIssueReduced
           : K extends 'OPEN_PROJECT'
             ? OpenProjectWorkPackageReduced
-            : K extends 'GITEA'
-              ? GiteaIssue
-              : K extends 'TRELLO'
-                ? TrelloIssueReduced
-                : K extends 'REDMINE'
-                  ? RedmineIssue
-                  : K extends 'LINEAR'
-                    ? LinearIssueReduced
-                    : K extends 'AZURE_DEVOPS'
-                      ? AzureDevOpsIssueReduced
-                      : K extends 'NEXTCLOUD_DECK'
-                        ? NextcloudDeckIssueReduced
-                        : K extends MigratedIssueProviderKey
-                          ? PluginSearchResult
-                          : K extends PluginIssueProviderKey
-                            ? PluginSearchResult
-                            : never;
+            : K extends 'TRELLO'
+              ? TrelloIssueReduced
+              : K extends 'REDMINE'
+                ? RedmineIssue
+                : K extends 'AZURE_DEVOPS'
+                  ? AzureDevOpsIssueReduced
+                  : K extends 'NEXTCLOUD_DECK'
+                    ? NextcloudDeckIssueReduced
+                    : K extends MigratedIssueProviderKey
+                      ? PluginSearchResult
+                      : K extends PluginIssueProviderKey
+                        ? PluginSearchResult
+                        : never;
 };
 
 // TODO: add issue model to the IssueDataReducedMap
@@ -254,8 +236,10 @@ export interface IssueProviderOpenProject extends IssueProviderBase, OpenProject
   issueProviderKey: 'OPEN_PROJECT';
 }
 
-export interface IssueProviderGitea extends IssueProviderBase, GiteaCfg {
+export interface IssueProviderGitea extends IssueProviderBase {
   issueProviderKey: 'GITEA';
+  pluginId: string;
+  pluginConfig: Record<string, unknown>;
 }
 
 export interface IssueProviderRedmine extends IssueProviderBase, RedmineCfg {
@@ -270,8 +254,10 @@ export interface IssueProviderTrello extends IssueProviderBase, TrelloCfg {
   issueProviderKey: 'TRELLO';
 }
 
-export interface IssueProviderLinear extends IssueProviderBase, LinearCfg {
+export interface IssueProviderLinear extends IssueProviderBase {
   issueProviderKey: 'LINEAR';
+  pluginId: string;
+  pluginConfig: Record<string, unknown>;
 }
 
 export interface IssueProviderAzureDevOps extends IssueProviderBase, AzureDevOpsCfg {
diff --git a/src/app/features/issue/issue.service.spec.ts b/src/app/features/issue/issue.service.spec.ts
index 1cfb90c709..9674d619d1 100644
--- a/src/app/features/issue/issue.service.spec.ts
+++ b/src/app/features/issue/issue.service.spec.ts
@@ -23,9 +23,7 @@ import { TrelloCommonInterfacesService } from './providers/trello/trello-common-
 import { GitlabCommonInterfacesService } from './providers/gitlab/gitlab-common-interfaces.service';
 import { CaldavCommonInterfacesService } from './providers/caldav/caldav-common-interfaces.service';
 import { OpenProjectCommonInterfacesService } from './providers/open-project/open-project-common-interfaces.service';
-import { GiteaCommonInterfacesService } from './providers/gitea/gitea-common-interfaces.service';
 import { RedmineCommonInterfacesService } from './providers/redmine/redmine-common-interfaces.service';
-import { LinearCommonInterfacesService } from './providers/linear/linear-common-interfaces.service';
 import { CalendarCommonInterfacesService } from './providers/calendar/calendar-common-interfaces.service';
 import { PluginIssueProviderAdapterService } from '../../plugins/issue-provider/plugin-issue-provider-adapter.service';
 import { PluginIssueProviderRegistryService } from '../../plugins/issue-provider/plugin-issue-provider-registry.service';
@@ -163,9 +161,7 @@ describe('IssueService', () => {
           provide: OpenProjectCommonInterfacesService,
           useValue: mockCommonInterfaceService,
         },
-        { provide: GiteaCommonInterfacesService, useValue: mockCommonInterfaceService },
         { provide: RedmineCommonInterfacesService, useValue: mockCommonInterfaceService },
-        { provide: LinearCommonInterfacesService, useValue: mockCommonInterfaceService },
         {
           provide: CalendarCommonInterfacesService,
           useValue: mockCommonInterfaceService,
diff --git a/src/app/features/issue/issue.service.ts b/src/app/features/issue/issue.service.ts
index 4af1f46f66..ccf00545a2 100644
--- a/src/app/features/issue/issue.service.ts
+++ b/src/app/features/issue/issue.service.ts
@@ -15,7 +15,6 @@ import { TaskAttachment } from '../tasks/task-attachment/task-attachment.model';
 import { firstValueFrom, forkJoin, from, merge, Observable, of, Subject } from 'rxjs';
 import {
   CALDAV_TYPE,
-  GITEA_TYPE,
   GITLAB_TYPE,
   ICAL_TYPE,
   ISSUE_PROVIDER_HUMANIZED,
@@ -26,7 +25,6 @@ import {
   OPEN_PROJECT_TYPE,
   TRELLO_TYPE,
   REDMINE_TYPE,
-  LINEAR_TYPE,
   AZURE_DEVOPS_TYPE,
   NEXTCLOUD_DECK_TYPE,
 } from './issue.const';
@@ -40,9 +38,9 @@ import { IssueLog } from '../../core/log';
 import { GitlabCommonInterfacesService } from './providers/gitlab/gitlab-common-interfaces.service';
 import { CaldavCommonInterfacesService } from './providers/caldav/caldav-common-interfaces.service';
 import { OpenProjectCommonInterfacesService } from './providers/open-project/open-project-common-interfaces.service';
-import { GiteaCommonInterfacesService } from './providers/gitea/gitea-common-interfaces.service';
+// Gitea is now a plugin — no built-in service needed
 import { RedmineCommonInterfacesService } from './providers/redmine/redmine-common-interfaces.service';
-import { LinearCommonInterfacesService } from './providers/linear/linear-common-interfaces.service';
+// Linear is now a plugin — no built-in service needed
 // ClickUp is now a plugin — no built-in service needed
 import { AzureDevOpsCommonInterfacesService } from './providers/azure-devops/azure-devops-common-interfaces.service';
 import { NextcloudDeckCommonInterfacesService } from './providers/nextcloud-deck/nextcloud-deck-common-interfaces.service';
@@ -79,9 +77,7 @@ export class IssueService {
   private _gitlabCommonInterfacesService = inject(GitlabCommonInterfacesService);
   private _caldavCommonInterfaceService = inject(CaldavCommonInterfacesService);
   private _openProjectInterfaceService = inject(OpenProjectCommonInterfacesService);
-  private _giteaInterfaceService = inject(GiteaCommonInterfacesService);
   private _redmineInterfaceService = inject(RedmineCommonInterfacesService);
-  private _linearCommonInterfaceService = inject(LinearCommonInterfacesService);
   private _azureDevOpsCommonInterfaceService = inject(AzureDevOpsCommonInterfacesService);
   private _nextcloudDeckCommonInterfaceService = inject(
     NextcloudDeckCommonInterfacesService,
@@ -104,10 +100,8 @@ export class IssueService {
     [JIRA_TYPE]: this._jiraCommonInterfacesService,
     [CALDAV_TYPE]: this._caldavCommonInterfaceService,
     [OPEN_PROJECT_TYPE]: this._openProjectInterfaceService,
-    [GITEA_TYPE]: this._giteaInterfaceService,
     [REDMINE_TYPE]: this._redmineInterfaceService,
     [ICAL_TYPE]: this._calendarCommonInterfaceService,
-    [LINEAR_TYPE]: this._linearCommonInterfaceService,
     [AZURE_DEVOPS_TYPE]: this._azureDevOpsCommonInterfaceService,
     [NEXTCLOUD_DECK_TYPE]: this._nextcloudDeckCommonInterfaceService,
 
diff --git a/src/app/features/issue/mapping-helper/get-issue-provider-tooltip.ts b/src/app/features/issue/mapping-helper/get-issue-provider-tooltip.ts
index be4c9ece0a..073759c468 100644
--- a/src/app/features/issue/mapping-helper/get-issue-provider-tooltip.ts
+++ b/src/app/features/issue/mapping-helper/get-issue-provider-tooltip.ts
@@ -55,8 +55,6 @@ export const getIssueProviderTooltip = (issueProvider: IssueProvider): string =>
         return issueProvider.host;
       case 'GITLAB':
         return issueProvider.project;
-      case 'GITEA':
-        return issueProvider.repoFullname;
       case 'CALDAV':
         return issueProvider.caldavUrl;
       case 'ICAL':
@@ -139,8 +137,6 @@ export const getIssueProviderInitials = (
 
     case 'GITLAB':
       return getRepoInitials(issueProvider.project);
-    case 'GITEA':
-      return getRepoInitials(issueProvider.repoFullname);
     case 'TRELLO':
       return (issueProvider.boardName || issueProvider.boardId)
         ?.substring(0, 2)
@@ -150,5 +146,4 @@ export const getIssueProviderInitials = (
     case 'AZURE_DEVOPS':
       return issueProvider.project?.substring(0, 2)?.toUpperCase() || 'AD';
   }
-  return undefined;
 };
diff --git a/src/app/features/issue/mapping-helper/is-issue-done.ts b/src/app/features/issue/mapping-helper/is-issue-done.ts
index 184a3a102e..78a5502c02 100644
--- a/src/app/features/issue/mapping-helper/is-issue-done.ts
+++ b/src/app/features/issue/mapping-helper/is-issue-done.ts
@@ -1,5 +1,4 @@
 import { SearchResultItem } from '../issue.model';
-import { isLinearIssueDone } from '../providers/linear/linear-issue-map.util';
 
 const ISSUE_DONE_STATE_NAME_GUESSES = ['closed', 'done', 'completed', 'resolved'];
 
@@ -10,11 +9,6 @@ export const isIssueDone = (searchResultItem: SearchResultItem): boolean => {
         (searchResultItem as SearchResultItem<'GITLAB'>).issueData.state === 'closed'
       );
 
-    case 'GITEA':
-      return ISSUE_DONE_STATE_NAME_GUESSES.includes(
-        (searchResultItem as SearchResultItem<'GITEA'>).issueData.state,
-      );
-
     case 'JIRA':
       return ISSUE_DONE_STATE_NAME_GUESSES.includes(
         (searchResultItem as SearchResultItem<'JIRA'>).issueData.status?.name,
@@ -31,11 +25,6 @@ export const isIssueDone = (searchResultItem: SearchResultItem): boolean => {
     case 'CALDAV':
       return false;
 
-    case 'LINEAR':
-      return isLinearIssueDone(
-        (searchResultItem as SearchResultItem<'LINEAR'>).issueData,
-      );
-
     default: {
       // Handle plugin providers and migrated providers (e.g. 'GITHUB')
       // PluginIssue uses 'state', PluginSearchResult uses 'status'
diff --git a/src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts b/src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts
deleted file mode 100644
index e0734168ef..0000000000
--- a/src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { GiteaIssue } from './gitea-issue.model';
-import { truncate } from '../../../../util/truncate';
-
-export const formatGiteaIssueTitle = ({ number, title }: GiteaIssue): string => {
-  return `#${number} ${title}`;
-};
-
-export const formatGiteaIssueTitleForSnack = (issue: GiteaIssue): string => {
-  return `${truncate(formatGiteaIssueTitle(issue))}`;
-};
diff --git a/src/app/features/issue/providers/gitea/gitea-api-responses.d.ts b/src/app/features/issue/providers/gitea/gitea-api-responses.d.ts
deleted file mode 100644
index 93adb8b381..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-api-responses.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { GiteaIssueStateOptions } from './gitea-issue.model';
-
-export type GiteaIssueState =
-  | GiteaIssueStateOptions.open
-  | GiteaIssueStateOptions.closed
-  | GiteaIssueStateOptions.all;
-
-export interface GiteaUser {
-  avatar_url: string;
-  id: number;
-  username: string;
-  login: string;
-  full_name: string;
-}
diff --git a/src/app/features/issue/providers/gitea/gitea-api.service.ts b/src/app/features/issue/providers/gitea/gitea-api.service.ts
deleted file mode 100644
index 99a1ce0fba..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-api.service.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-import { Injectable, inject } from '@angular/core';
-import { SnackService } from '../../../../core/snack/snack.service';
-import { HttpClient, HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http';
-import { GiteaCfg } from './gitea.model';
-import { catchError, filter, map, switchMap } from 'rxjs/operators';
-import { Observable } from 'rxjs';
-import { throwHandledError } from '../../../../util/throw-handled-error';
-import { T } from '../../../../t.const';
-import { GITEA_TYPE, ISSUE_PROVIDER_HUMANIZED } from '../../issue.const';
-import {
-  GiteaIssue,
-  GiteaIssueStateOptions,
-  GiteaRepositoryReduced,
-} from './gitea-issue.model';
-import {
-  hasAllLabels,
-  isIssueFromProject,
-  isIssueIncludedByLabels,
-  mapGiteaIssueIdToIssueNumber,
-  mapGiteaIssueToSearchResult,
-  parseLabelList,
-} from './gitea-issue-map.util';
-import {
-  GITEA_API_SUBPATH_REPO,
-  GITEA_API_SUBPATH_USER,
-  GITEA_API_SUFFIX,
-  GITEA_API_VERSION,
-  ScopeOptions,
-} from './gitea.const';
-import { SearchResultItem } from '../../issue.model';
-import { GiteaUser } from './gitea-api-responses';
-import { handleIssueProviderHttpError$ } from '../../handle-issue-provider-http-error';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class GiteaApiService {
-  private _snackService = inject(SnackService);
-  private _http = inject(HttpClient);
-
-  searchIssueForRepo$(searchText: string, cfg: GiteaCfg): Observable<SearchResultItem[]> {
-    const includedLabelNames = parseLabelList(cfg.filterLabels);
-    const excludedLabelNames = parseLabelList(cfg.excludeLabels);
-    return this.getCurrentRepositoryFor$(cfg).pipe(
-      switchMap((repository: GiteaRepositoryReduced) => {
-        return this._sendRequest$(
-          {
-            url: this._getIssueSearchUrlFor(cfg),
-            params: ParamsBuilder.create()
-              .withLimit(100)
-              .withState(GiteaIssueStateOptions.open)
-              .withScopeForSearchFrom(cfg, repository)
-              .withFilterLabels(cfg)
-              .withSearchTerm(searchText)
-              .build(),
-          },
-          cfg,
-        ).pipe(
-          map((res: GiteaIssue[]) => {
-            return res
-              ? res
-                  .filter((issue: GiteaIssue) => isIssueFromProject(issue, cfg))
-                  .filter((issue: GiteaIssue) => hasAllLabels(issue, includedLabelNames))
-                  .filter((issue: GiteaIssue) =>
-                    isIssueIncludedByLabels(issue, excludedLabelNames),
-                  )
-                  .map((issue: GiteaIssue) => mapGiteaIssueIdToIssueNumber(issue))
-                  .map((issue: GiteaIssue) => mapGiteaIssueToSearchResult(issue))
-              : [];
-          }),
-        );
-      }),
-    );
-  }
-
-  private _getIssueSearchUrlFor(cfg: GiteaCfg): string {
-    // see https://try.gitea.io/api/swagger#/issue
-    return `${this._getBaseUrlFor(cfg)}/${GITEA_API_SUBPATH_REPO}/issues/search`;
-  }
-
-  getLast100IssuesFor$(cfg: GiteaCfg): Observable<GiteaIssue[]> {
-    const includedLabelNames = parseLabelList(cfg.filterLabels);
-    const excludedLabelNames = parseLabelList(cfg.excludeLabels);
-    return this.getLoggedUserFor$(cfg).pipe(
-      switchMap((user: GiteaUser) => {
-        return this._sendRequest$(
-          {
-            url: this._getIssueUrlFor(cfg),
-            params: ParamsBuilder.create()
-              .withLimit(100)
-              .withState(GiteaIssueStateOptions.open)
-              .withScopeFrom(cfg, user)
-              .withFilterLabels(cfg)
-              .build(),
-          },
-          cfg,
-        ).pipe(
-          map((issues: GiteaIssue[]) => {
-            return issues
-              ? issues
-                  .filter((issue: GiteaIssue) => hasAllLabels(issue, includedLabelNames))
-                  .filter((issue: GiteaIssue) =>
-                    isIssueIncludedByLabels(issue, excludedLabelNames),
-                  )
-                  .map((issue: GiteaIssue) => mapGiteaIssueIdToIssueNumber(issue))
-              : [];
-          }),
-        );
-      }),
-    );
-  }
-
-  private _getIssueUrlFor(cfg: GiteaCfg): string {
-    return `${this._getBaseUrlFor(cfg)}/${GITEA_API_SUBPATH_REPO}/${
-      cfg.repoFullname
-    }/issues`;
-  }
-
-  getLoggedUserFor$(cfg: GiteaCfg): Observable<GiteaUser> {
-    return this._sendRequest$(
-      {
-        url: this._getUserUrlFor(cfg),
-        params: {},
-      },
-      cfg,
-    ).pipe(
-      map((user: GiteaUser) => {
-        return user;
-      }),
-    );
-  }
-
-  private _getUserUrlFor(cfg: GiteaCfg): string {
-    return `${this._getBaseUrlFor(cfg)}/${GITEA_API_SUBPATH_USER}`;
-  }
-
-  getCurrentRepositoryFor$(cfg: GiteaCfg): Observable<GiteaRepositoryReduced> {
-    return this._sendRequest$(
-      {
-        url: this._getRepositoryUrlFor(cfg),
-        params: {},
-      },
-      cfg,
-    ).pipe(
-      map((repository: GiteaRepositoryReduced) => {
-        return repository;
-      }),
-    );
-  }
-
-  private _getRepositoryUrlFor(cfg: GiteaCfg): string {
-    return `${this._getBaseUrlFor(cfg)}/${GITEA_API_SUBPATH_REPO}/${cfg.repoFullname}`;
-  }
-
-  private _getBaseUrlFor(cfg: GiteaCfg): string {
-    return `${cfg.host}/${GITEA_API_SUFFIX}/${GITEA_API_VERSION}`;
-  }
-
-  getById$(issueNumber: number, cfg: GiteaCfg): Observable<GiteaIssue> {
-    return this._sendRequest$(
-      {
-        url: `${this._getIssueUrlFor(cfg)}/${issueNumber}`,
-      },
-      cfg,
-    ).pipe(map((issue) => issue));
-  }
-
-  private _sendRequest$(
-    params: HttpRequest<string> | any,
-    cfg: GiteaCfg,
-  ): Observable<any> {
-    this._checkSettings(cfg);
-    params.params = { ...params.params, access_token: cfg.token };
-    const p: HttpRequest<any> | any = {
-      ...params,
-      method: params.method || 'GET',
-      headers: {
-        ...(params.headers ? params.headers : { accept: 'application/json' }),
-      },
-    };
-
-    const bodyArg = params.data ? [params.data] : [];
-
-    const allArgs = [
-      ...bodyArg,
-      {
-        headers: new HttpHeaders(p.headers),
-        params: new HttpParams({ fromObject: p.params }),
-        reportProgress: false,
-        observe: 'response',
-        responseType: params.responseType,
-      },
-    ];
-    const req = new HttpRequest(p.method, p.url, ...allArgs);
-    return this._http.request(req).pipe(
-      // Filter out HttpEventType.Sent (type: 0) events to only process actual responses
-      filter((res) => !(res === Object(res) && res.type === 0)),
-      map((res: any) => (res && res.body ? res.body : res)),
-      catchError((err) =>
-        handleIssueProviderHttpError$(GITEA_TYPE, this._snackService, err),
-      ),
-    );
-  }
-
-  private _checkSettings(cfg: GiteaCfg): void {
-    if (!this._isValidSettings(cfg)) {
-      this._snackService.open({
-        type: 'ERROR',
-        msg: T.F.ISSUE.S.ERR_NOT_CONFIGURED,
-        translateParams: {
-          issueProviderName: ISSUE_PROVIDER_HUMANIZED[GITEA_TYPE],
-        },
-      });
-      throwHandledError('Gitea: Not enough settings');
-    }
-  }
-
-  private _isValidSettings(cfg: GiteaCfg): boolean {
-    return (
-      !!cfg &&
-      !!cfg.host &&
-      cfg.host.length > 0 &&
-      !!cfg.repoFullname &&
-      cfg.repoFullname.length > 0
-    );
-  }
-}
-
-class ParamsBuilder {
-  params: any = {};
-
-  static create(): ParamsBuilder {
-    return new ParamsBuilder();
-  }
-
-  withLimit(limit: number): ParamsBuilder {
-    this.params['limit'] = limit;
-    return this;
-  }
-
-  withState(state: string): ParamsBuilder {
-    this.params['state'] = state;
-    return this;
-  }
-
-  withScopeFrom(cfg: GiteaCfg, user: GiteaUser): ParamsBuilder {
-    if (!cfg.scope) {
-      return this;
-    }
-
-    if (cfg.scope === ScopeOptions.createdByMe) {
-      this.params['created_by'] = user.username;
-    } else if (cfg.scope === ScopeOptions.assignedToMe) {
-      this.params['assigned_by'] = user.username;
-    }
-
-    return this;
-  }
-
-  withScopeForSearchFrom(
-    cfg: GiteaCfg,
-    repository: GiteaRepositoryReduced,
-  ): ParamsBuilder {
-    if (!cfg.scope) {
-      return this;
-    }
-
-    // Seens to be the only way to "filter" for the current repo
-    if (repository.id) this.params['priority_repo_id'] = repository.id;
-
-    if (cfg.scope === ScopeOptions.createdByMe) {
-      this.params['created'] = true;
-    } else if (cfg.scope === ScopeOptions.assignedToMe) {
-      this.params['assigned'] = true;
-    }
-
-    return this;
-  }
-
-  withFilterLabels(cfg: GiteaCfg): ParamsBuilder {
-    const labels = parseLabelList(cfg.filterLabels);
-    if (labels.length > 0) {
-      this.params['labels'] = labels.join(',');
-    }
-    return this;
-  }
-
-  withSearchTerm(search: string): ParamsBuilder {
-    this.params['q'] = search;
-    return this;
-  }
-
-  build(): any {
-    return this.params;
-  }
-}
diff --git a/src/app/features/issue/providers/gitea/gitea-cfg-form.const.ts b/src/app/features/issue/providers/gitea/gitea-cfg-form.const.ts
deleted file mode 100644
index cbee44bfce..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-cfg-form.const.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { T } from '../../../../t.const';
-import {
-  ConfigFormSection,
-  LimitedFormlyFieldConfig,
-} from '../../../config/global-config.model';
-import { IssueProviderGitea } from '../../issue.model';
-import { ISSUE_PROVIDER_COMMON_FORM_FIELDS } from '../../common-issue-form-stuff.const';
-import { GiteaCfg } from './gitea.model';
-
-export enum ScopeOptions {
-  all = 'all',
-  createdByMe = 'created-by-me',
-  assignedToMe = 'assigned-to-me',
-}
-
-export const DEFAULT_GITEA_CFG: GiteaCfg = {
-  isEnabled: false,
-  host: null,
-  repoFullname: null,
-  token: null,
-  scope: 'created-by-me',
-  filterLabels: null,
-  excludeLabels: null,
-};
-
-export const GITEA_CONFIG_FORM: LimitedFormlyFieldConfig<IssueProviderGitea>[] = [
-  {
-    key: 'host',
-    type: 'input',
-    templateOptions: {
-      label: T.F.GITEA.FORM.HOST,
-      type: 'url',
-      pattern: /^.+\/.+?$/i,
-      required: true,
-    },
-  },
-  {
-    key: 'token',
-    type: 'input',
-    templateOptions: {
-      label: T.F.GITEA.FORM.TOKEN,
-      required: true,
-      type: 'password',
-    },
-  },
-  {
-    type: 'link',
-    templateOptions: {
-      url: 'https://www.jetbrains.com/help/youtrack/cloud/integration-with-gitea.html#enable-youtrack-integration-gitea',
-      txt: T.F.ISSUE.HOW_TO_GET_A_TOKEN,
-    },
-  },
-  {
-    key: 'repoFullname',
-    type: 'input',
-    templateOptions: {
-      label: T.F.GITEA.FORM.REPO_FULL_NAME,
-      type: 'text',
-      required: true,
-      description: T.F.GITEA.FORM.REPO_FULL_NAME_DESCRIPTION,
-    },
-  },
-  {
-    key: 'scope',
-    type: 'select',
-    defaultValue: 'created-by-me',
-    templateOptions: {
-      required: true,
-      label: T.F.GITEA.FORM.SCOPE,
-      options: [
-        { value: ScopeOptions.all, label: T.F.GITEA.FORM.SCOPE_ALL },
-        { value: ScopeOptions.createdByMe, label: T.F.GITEA.FORM.SCOPE_CREATED },
-        { value: ScopeOptions.assignedToMe, label: T.F.GITEA.FORM.SCOPE_ASSIGNED },
-      ],
-    },
-  },
-  {
-    key: 'filterLabels',
-    type: 'input',
-    templateOptions: {
-      label: T.F.GITEA.FORM.FILTER_LABELS,
-      type: 'text',
-      description: T.F.GITEA.FORM.FILTER_LABELS_DESCRIPTION,
-    },
-  },
-  {
-    key: 'excludeLabels',
-    type: 'input',
-    templateOptions: {
-      label: T.F.GITEA.FORM.EXCLUDE_LABELS,
-      type: 'text',
-      description: T.F.GITEA.FORM.EXCLUDE_LABELS_DESCRIPTION,
-    },
-  },
-  {
-    type: 'collapsible',
-    // todo translate
-    props: { label: 'Advanced Config' },
-    fieldGroup: [...ISSUE_PROVIDER_COMMON_FORM_FIELDS],
-  },
-];
-
-export const GITEA_CONFIG_FORM_SECTION: ConfigFormSection<IssueProviderGitea> = {
-  title: 'Gitea',
-  key: 'GITEA',
-  items: GITEA_CONFIG_FORM,
-  help: T.F.GITEA.FORM_SECTION.HELP,
-};
diff --git a/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.spec.ts b/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.spec.ts
deleted file mode 100644
index df053f2827..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { TaskCopy } from '../../../tasks/task.model';
-import { GiteaCommonInterfacesService } from './gitea-common-interfaces.service';
-import { GiteaIssue } from './gitea-issue.model';
-
-type AddTaskData = Partial<Readonly<TaskCopy>> & { title: string };
-
-describe('GiteaCommonInterfacesService', () => {
-  // getAddTaskData is a pure formatter that doesn't touch any injected
-  // dependency, so call it off the prototype without going through DI.
-  const getAddTaskData = (issue: GiteaIssue): AddTaskData =>
-    GiteaCommonInterfacesService.prototype.getAddTaskData.call(
-      null as unknown as GiteaCommonInterfacesService,
-      issue,
-    );
-
-  describe('getAddTaskData', () => {
-    const baseIssue = {
-      id: 98765,
-      number: 42,
-      title: 'Example issue',
-      state: 'open',
-      updated_at: '2025-01-20T12:00:00Z',
-    } as unknown as GiteaIssue;
-
-    it('should set issueId from issue.number (not issue.id) so polling uses the per-repo number', () => {
-      const result = getAddTaskData(baseIssue);
-      expect(result.issueId).toBe('42');
-    });
-
-    it('should set isDone=true when issue.state is closed', () => {
-      const result = getAddTaskData({ ...baseIssue, state: 'closed' } as GiteaIssue);
-      expect(result.isDone).toBe(true);
-    });
-
-    it('should set isDone=false when issue.state is open', () => {
-      const result = getAddTaskData(baseIssue);
-      expect(result.isDone).toBe(false);
-    });
-  });
-});
diff --git a/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts b/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts
deleted file mode 100644
index d8c83eb9c7..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Injectable, inject } from '@angular/core';
-import { firstValueFrom, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { TaskCopy } from '../../../tasks/task.model';
-import { BaseIssueProviderService } from '../../base/base-issue-provider.service';
-import { IssueData, IssueDataReduced, SearchResultItem } from '../../issue.model';
-import { GITEA_POLL_INTERVAL } from './gitea.const';
-import {
-  formatGiteaIssueTitle,
-  formatGiteaIssueTitleForSnack,
-} from './format-gitea-issue-title.util';
-import { GiteaCfg } from './gitea.model';
-import { GiteaApiService } from '../gitea/gitea-api.service';
-import { GiteaIssue } from './gitea-issue.model';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class GiteaCommonInterfacesService extends BaseIssueProviderService<GiteaCfg> {
-  private readonly _giteaApiService = inject(GiteaApiService);
-
-  readonly providerKey = 'GITEA' as const;
-  readonly pollInterval: number = GITEA_POLL_INTERVAL;
-
-  isEnabled(cfg: GiteaCfg): boolean {
-    return !!cfg && cfg.isEnabled && !!cfg.host && !!cfg.token && !!cfg.repoFullname;
-  }
-
-  testConnection(cfg: GiteaCfg): Promise<boolean> {
-    return firstValueFrom(
-      this._giteaApiService
-        .searchIssueForRepo$('', cfg)
-        .pipe(map((res) => Array.isArray(res))),
-    ).then((result) => result ?? false);
-  }
-
-  issueLink(issueNumber: string | number, issueProviderId: string): Promise<string> {
-    return firstValueFrom(
-      this._getCfgOnce$(issueProviderId).pipe(
-        map((cfg) => `${cfg.host}/${cfg.repoFullname}/issues/${issueNumber}`),
-      ),
-    ).then((result) => result ?? '');
-  }
-
-  getAddTaskData(issue: GiteaIssue): Partial<Readonly<TaskCopy>> & { title: string } {
-    return {
-      title: formatGiteaIssueTitle(issue),
-      issueId: String(issue.number),
-      isDone: issue.state === 'closed',
-      issueWasUpdated: false,
-      issueLastUpdated: new Date(issue.updated_at).getTime(),
-    };
-  }
-
-  async getNewIssuesToAddToBacklog(
-    issueProviderId: string,
-    _allExistingIssueIds: number[] | string[],
-  ): Promise<IssueDataReduced[]> {
-    const cfg = await firstValueFrom(this._getCfgOnce$(issueProviderId));
-    return await firstValueFrom(this._giteaApiService.getLast100IssuesFor$(cfg));
-  }
-
-  protected _apiGetById$(
-    id: string | number,
-    cfg: GiteaCfg,
-  ): Observable<IssueData | null> {
-    return this._giteaApiService.getById$(id as number, cfg);
-  }
-
-  protected _apiSearchIssues$(
-    searchTerm: string,
-    cfg: GiteaCfg,
-  ): Observable<SearchResultItem[]> {
-    return this._giteaApiService.searchIssueForRepo$(searchTerm, cfg);
-  }
-
-  protected _formatIssueTitleForSnack(issue: IssueData): string {
-    return formatGiteaIssueTitleForSnack(issue as GiteaIssue);
-  }
-
-  protected _getIssueLastUpdated(issue: IssueData): number {
-    return new Date((issue as GiteaIssue).updated_at).getTime();
-  }
-}
diff --git a/src/app/features/issue/providers/gitea/gitea-issue-content.const.ts b/src/app/features/issue/providers/gitea/gitea-issue-content.const.ts
deleted file mode 100644
index 1e7099a4ae..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-issue-content.const.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { T } from '../../../../t.const';
-import {
-  IssueContentConfig,
-  IssueFieldType,
-} from '../../issue-content/issue-content.model';
-import { GiteaIssue } from './gitea-issue.model';
-
-export const GITEA_ISSUE_CONTENT_CONFIG: IssueContentConfig<GiteaIssue> = {
-  issueType: 'GITEA' as const,
-  fields: [
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.SUMMARY,
-      type: IssueFieldType.LINK,
-      value: (issue: GiteaIssue) => `${issue.title} #${issue.number}`,
-      getLink: (issue: GiteaIssue) => issue.html_url,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.STATUS,
-      value: 'state',
-      type: IssueFieldType.TEXT,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.ASSIGNEE,
-      type: IssueFieldType.TEXT,
-      value: (issue: GiteaIssue) =>
-        issue.assignees?.map((a) => a.login || a.username).join(', '),
-      isVisible: (issue: GiteaIssue) => (issue.assignees?.length ?? 0) > 0,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.LABELS,
-      value: 'labels',
-      type: IssueFieldType.CHIPS,
-      isVisible: (issue: GiteaIssue) => (issue.labels?.length ?? 0) > 0,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.DESCRIPTION,
-      value: 'body',
-      type: IssueFieldType.MARKDOWN,
-      isVisible: (issue: GiteaIssue) => !!issue.body,
-    },
-  ],
-  comments: {
-    field: 'comments',
-    authorField: 'user.login',
-    bodyField: 'body',
-    createdField: 'created_at',
-    sortField: 'created_at',
-  },
-  getIssueUrl: (issue: GiteaIssue) => issue.url,
-  hasCollapsingComments: true,
-};
diff --git a/src/app/features/issue/providers/gitea/gitea-issue-map.util.spec.ts b/src/app/features/issue/providers/gitea/gitea-issue-map.util.spec.ts
deleted file mode 100644
index 8f41469c3d..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-issue-map.util.spec.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
-  hasAllLabels,
-  isIssueIncludedByLabels,
-  parseLabelList,
-} from './gitea-issue-map.util';
-import { GiteaIssue, GiteaLabel } from './gitea-issue.model';
-
-const makeLabel = (name: string): GiteaLabel =>
-  ({ id: 0, name, color: '', description: '', url: '' }) as GiteaLabel;
-
-const makeIssue = (labels: GiteaLabel[] | undefined): GiteaIssue =>
-  ({ labels }) as unknown as GiteaIssue;
-
-describe('gitea-issue-map.util', () => {
-  describe('parseLabelList', () => {
-    it('returns [] for null', () => {
-      expect(parseLabelList(null)).toEqual([]);
-    });
-
-    it('returns [] for an empty string', () => {
-      expect(parseLabelList('')).toEqual([]);
-    });
-
-    it('returns [] when only whitespace and commas', () => {
-      expect(parseLabelList('  ,  ,,')).toEqual([]);
-    });
-
-    it('trims whitespace around each entry', () => {
-      expect(parseLabelList('  bug , enhancement  ,  docs ')).toEqual([
-        'bug',
-        'enhancement',
-        'docs',
-      ]);
-    });
-
-    it('preserves scoped labels with slashes', () => {
-      expect(parseLabelList('project/uconsole,bug')).toEqual(['project/uconsole', 'bug']);
-    });
-  });
-
-  describe('isIssueIncludedByLabels', () => {
-    it('includes any issue when the exclude list is empty', () => {
-      const issue = makeIssue([makeLabel('bug')]);
-      expect(isIssueIncludedByLabels(issue, [])).toBe(true);
-    });
-
-    it('includes issues that carry none of the excluded labels', () => {
-      const issue = makeIssue([makeLabel('bug'), makeLabel('enhancement')]);
-      expect(isIssueIncludedByLabels(issue, ['wontfix'])).toBe(true);
-    });
-
-    it('excludes an issue that carries an excluded label', () => {
-      const issue = makeIssue([makeLabel('bug'), makeLabel('wontfix')]);
-      expect(isIssueIncludedByLabels(issue, ['wontfix'])).toBe(false);
-    });
-
-    it('excludes when any of multiple excluded labels matches', () => {
-      const issue = makeIssue([makeLabel('docs')]);
-      expect(isIssueIncludedByLabels(issue, ['wontfix', 'docs', 'stale'])).toBe(false);
-    });
-
-    it('treats missing issue.labels as no labels and includes the issue', () => {
-      const issue = makeIssue(undefined);
-      expect(isIssueIncludedByLabels(issue, ['wontfix'])).toBe(true);
-    });
-
-    it('matches scoped label names exactly', () => {
-      const issue = makeIssue([makeLabel('project/ai')]);
-      expect(isIssueIncludedByLabels(issue, ['project/uconsole'])).toBe(true);
-      expect(isIssueIncludedByLabels(issue, ['project/ai'])).toBe(false);
-    });
-  });
-
-  describe('hasAllLabels', () => {
-    it('includes any issue when the required list is empty', () => {
-      const issue = makeIssue([makeLabel('bug')]);
-      expect(hasAllLabels(issue, [])).toBe(true);
-    });
-
-    it('includes issues that carry every required label', () => {
-      const issue = makeIssue([
-        makeLabel('bug'),
-        makeLabel('enhancement'),
-        makeLabel('docs'),
-      ]);
-      expect(hasAllLabels(issue, ['bug', 'enhancement'])).toBe(true);
-    });
-
-    it('excludes issues missing any required label (AND semantics)', () => {
-      const issue = makeIssue([makeLabel('bug')]);
-      expect(hasAllLabels(issue, ['bug', 'wontfix'])).toBe(false);
-    });
-
-    it('treats missing issue.labels as no labels and excludes the issue', () => {
-      const issue = makeIssue(undefined);
-      expect(hasAllLabels(issue, ['bug'])).toBe(false);
-    });
-
-    it('matches scoped label names exactly', () => {
-      const issue = makeIssue([makeLabel('project/ai'), makeLabel('bug')]);
-      expect(hasAllLabels(issue, ['project/ai', 'bug'])).toBe(true);
-      expect(hasAllLabels(issue, ['project/uconsole', 'bug'])).toBe(false);
-    });
-  });
-});
diff --git a/src/app/features/issue/providers/gitea/gitea-issue-map.util.ts b/src/app/features/issue/providers/gitea/gitea-issue-map.util.ts
deleted file mode 100644
index b3577187a8..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-issue-map.util.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { IssueProviderKey, SearchResultItem } from '../../issue.model';
-import { GiteaCfg } from './gitea.model';
-import { GiteaIssue } from './gitea-issue.model';
-import { formatGiteaIssueTitle } from './format-gitea-issue-title.util';
-
-export const mapGiteaIssueToSearchResult = (issue: GiteaIssue): SearchResultItem => {
-  return {
-    title: formatGiteaIssueTitle(issue),
-    titleHighlighted: formatGiteaIssueTitle(issue),
-    issueType: 'GITEA' as IssueProviderKey,
-    issueData: issue,
-  };
-};
-
-// Gitea uses the issue number instead of issue id to track the issues
-export const mapGiteaIssueIdToIssueNumber = (issue: GiteaIssue): GiteaIssue => {
-  return { ...issue, id: issue.number };
-};
-
-// We need to filter as api does not do it for us
-export const isIssueFromProject = (issue: GiteaIssue, cfg: GiteaCfg): boolean => {
-  if (!issue.repository) {
-    return false;
-  }
-  return issue.repository.full_name === cfg.repoFullname;
-};
-
-export const parseLabelList = (raw: string | null): string[] =>
-  (raw ?? '')
-    .split(',')
-    .map((l) => l.trim())
-    .filter((l) => l.length > 0);
-
-// Gitea/Forgejo's two issue endpoints (`/repos/{o}/{r}/issues` and
-// `/repos/issues/search`) historically disagree on whether `labels=a,b` means
-// AND or OR (see go-gitea/gitea#33509), and Forgejo inherits the same code.
-// We always filter labels client-side so behavior is consistent and independent
-// of any server-side fixes.
-export const isIssueIncludedByLabels = (
-  issue: GiteaIssue,
-  excludedLabelNames: readonly string[],
-): boolean => {
-  if (excludedLabelNames.length === 0) {
-    return true;
-  }
-  const issueLabelNames = new Set((issue.labels ?? []).map((l) => l.name));
-  return !excludedLabelNames.some((name) => issueLabelNames.has(name));
-};
-
-export const hasAllLabels = (
-  issue: GiteaIssue,
-  requiredLabelNames: readonly string[],
-): boolean => {
-  if (requiredLabelNames.length === 0) {
-    return true;
-  }
-  const issueLabelNames = new Set((issue.labels ?? []).map((l) => l.name));
-  return requiredLabelNames.every((name) => issueLabelNames.has(name));
-};
diff --git a/src/app/features/issue/providers/gitea/gitea-issue.model.ts b/src/app/features/issue/providers/gitea/gitea-issue.model.ts
deleted file mode 100644
index 7f093033c2..0000000000
--- a/src/app/features/issue/providers/gitea/gitea-issue.model.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { GiteaUser } from './gitea-api-responses';
-
-export enum GiteaIssueStateOptions {
-  open = 'open',
-  closed = 'closed',
-  all = 'all',
-}
-
-export type GiteaLabel = Readonly<{
-  id: number;
-  name: string;
-  color: string;
-  description: string;
-  url: string;
-}>;
-
-export type GiteaRepositoryReduced = Readonly<{
-  id: number;
-  name: string;
-  owner: string;
-  full_name: string;
-}>;
-
-export type GiteaIssue = Readonly<{
-  id: number;
-  url: string;
-  html_url: string;
-  number: number;
-  user: GiteaUser;
-  original_author: string;
-  original_author_id: number;
-  title: string;
-  body: string;
-  ref: string;
-  labels: GiteaLabel[];
-  milestone: unknown | null;
-  assignee: GiteaUser;
-  assignees: GiteaUser[];
-  state: string;
-  is_locked: boolean;
-  comments: number;
-  created_at: string;
-  updated_at: string;
-  closed_at: string | null;
-  due_date: string | null;
-  repository: GiteaRepositoryReduced;
-}>;
diff --git a/src/app/features/issue/providers/gitea/gitea.const.ts b/src/app/features/issue/providers/gitea/gitea.const.ts
deleted file mode 100644
index 4421195e74..0000000000
--- a/src/app/features/issue/providers/gitea/gitea.const.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export { GITEA_ISSUE_CONTENT_CONFIG } from './gitea-issue-content.const';
-export {
-  GITEA_CONFIG_FORM_SECTION,
-  GITEA_CONFIG_FORM,
-  ScopeOptions,
-  DEFAULT_GITEA_CFG,
-} from './gitea-cfg-form.const';
-
-export const GITEA_POLL_INTERVAL = 5 * 60 * 1000;
-export const GITEA_INITIAL_POLL_DELAY = 8 * 1000;
-
-export const GITEA_API_SUFFIX = 'api';
-export const GITEA_API_VERSION = 'v1';
-export const GITEA_API_SUBPATH_REPO = 'repos';
-export const GITEA_API_SUBPATH_USER = 'user';
diff --git a/src/app/features/issue/providers/gitea/gitea.model.ts b/src/app/features/issue/providers/gitea/gitea.model.ts
deleted file mode 100644
index 2c1a83c301..0000000000
--- a/src/app/features/issue/providers/gitea/gitea.model.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BaseIssueProviderCfg } from '../../issue.model';
-
-export interface GiteaCfg extends BaseIssueProviderCfg {
-  repoFullname: string | null;
-  host: string | null;
-  token: string | null;
-  scope: string | null;
-  filterLabels: string | null;
-  excludeLabels: string | null;
-}
diff --git a/src/app/features/issue/providers/linear/linear-api.service.spec.ts b/src/app/features/issue/providers/linear/linear-api.service.spec.ts
deleted file mode 100644
index ca61101aa0..0000000000
--- a/src/app/features/issue/providers/linear/linear-api.service.spec.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
-import { LinearApiService } from './linear-api.service';
-import { SnackService } from '../../../../core/snack/snack.service';
-import { LinearCfg } from './linear.model';
-
-describe('LinearApiService', () => {
-  let service: LinearApiService;
-  let httpMock: HttpTestingController;
-  let snackService: jasmine.SpyObj<SnackService>;
-
-  const mockCfg: LinearCfg = {
-    apiKey: 'test-api-key',
-  } as any;
-
-  beforeEach(() => {
-    const snackServiceSpy = jasmine.createSpyObj('SnackService', ['open']);
-
-    TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [LinearApiService, { provide: SnackService, useValue: snackServiceSpy }],
-    });
-
-    service = TestBed.inject(LinearApiService);
-    httpMock = TestBed.inject(HttpTestingController);
-    snackService = TestBed.inject(SnackService) as jasmine.SpyObj<SnackService>;
-  });
-
-  afterEach(() => {
-    httpMock.verify();
-  });
-
-  it('should fetch issue by id', (done) => {
-    const issueId = 'test-issue-id';
-    const mockResponse = {
-      data: {
-        issue: {
-          id: issueId,
-          identifier: 'LIN-1',
-          number: 1,
-          title: 'Test Issue',
-          description: 'Test Description',
-          priority: 1,
-          createdAt: '2025-01-01T00:00:00Z',
-          updatedAt: '2025-01-02T00:00:00Z',
-          completedAt: null,
-          canceledAt: null,
-          dueDate: null,
-          url: 'https://linear.app/issue',
-          state: {
-            id: 'state-id',
-            name: 'In Progress',
-            type: 'started',
-          },
-          team: {
-            id: 'team-id',
-            name: 'Team A',
-            key: 'TEAM',
-          },
-          assignee: {
-            id: 'user-id',
-            name: 'John Doe',
-            email: 'john@example.com',
-            avatarUrl: 'https://example.com/avatar.jpg',
-          },
-          creator: {
-            id: 'creator-id',
-            name: 'Jane Doe',
-          },
-          labels: {
-            nodes: [{ id: 'label-1', name: 'bug', color: '#ff0000' }],
-          },
-          comments: {
-            nodes: [
-              {
-                id: 'comment-1',
-                body: 'Test comment',
-                createdAt: '2025-01-02T00:00:00Z',
-                user: {
-                  id: 'user-2',
-                  name: 'Jane Smith',
-                  avatarUrl: 'https://example.com/avatar2.jpg',
-                },
-              },
-            ],
-          },
-          attachments: {
-            nodes: [
-              {
-                id: 'attachment-1',
-                sourceType: 'github',
-                title: 'GitHub Pull Request',
-                url: 'https://github.com/example/pr/123',
-              },
-              {
-                id: 'attachment-2',
-                sourceType: 'slack',
-                title: 'Slack Discussion',
-                url: 'https://slack.com/archives/C123456/p1234567890',
-              },
-            ],
-          },
-        },
-      },
-    };
-
-    service.getById$(issueId, mockCfg).subscribe((issue) => {
-      expect(issue.identifier).toBe('LIN-1');
-      expect(issue.title).toBe('Test Issue');
-      expect(issue.comments.length).toBe(1);
-      expect(issue.attachments).toBeDefined();
-      expect(issue.attachments.length).toBe(2);
-      expect(issue.attachments[0].sourceType).toBe('github');
-      expect(issue.attachments[1].sourceType).toBe('slack');
-      done();
-    });
-
-    const req = httpMock.expectOne('https://api.linear.app/graphql');
-    expect(req.request.method).toBe('POST');
-    expect(req.request.headers.get('Authorization')).toBe('test-api-key');
-    req.flush(mockResponse);
-  });
-
-  it('should search issues', (done) => {
-    const mockResponse = {
-      data: {
-        viewer: {
-          assignedIssues: {
-            nodes: [
-              {
-                id: 'issue-1',
-                identifier: 'LIN-1',
-                number: 1,
-                title: 'Test Issue 1',
-                updatedAt: '2025-01-02T00:00:00Z',
-                url: 'https://linear.app/issue1',
-                state: {
-                  id: 'state-id',
-                  name: 'Backlog',
-                  type: 'backlog',
-                },
-              },
-            ],
-          },
-        },
-      },
-    };
-
-    service.searchIssues$('Test', mockCfg).subscribe((issues) => {
-      expect(issues.length).toBe(1);
-      expect(issues[0].title).toBe('Test Issue 1');
-      done();
-    });
-
-    const req = httpMock.expectOne('https://api.linear.app/graphql');
-    expect(req.request.method).toBe('POST');
-    req.flush(mockResponse);
-  });
-
-  it('should test connection', (done) => {
-    const mockResponse = {
-      data: {
-        viewer: {
-          id: 'viewer-id',
-          name: 'Test User',
-        },
-      },
-    };
-
-    service.testConnection(mockCfg).subscribe((result) => {
-      expect(result).toBe(true);
-      done();
-    });
-
-    const req = httpMock.expectOne('https://api.linear.app/graphql');
-    req.flush(mockResponse);
-  });
-
-  it('should handle GraphQL errors', (done) => {
-    const mockResponse = {
-      errors: [{ message: 'Invalid query' }],
-    };
-
-    service.getById$('test-id', mockCfg).subscribe(
-      () => {
-        fail('Should have thrown error');
-      },
-      (err) => {
-        // The error is thrown and propagated
-        expect(err).toBeDefined();
-        done();
-      },
-    );
-
-    const req = httpMock.expectOne('https://api.linear.app/graphql');
-    req.flush(mockResponse);
-  });
-
-  it('should handle HTTP errors', (done) => {
-    service.getById$('test-id', mockCfg).subscribe(
-      () => {
-        fail('Should have thrown error');
-      },
-      () => {
-        expect(snackService.open).toHaveBeenCalled();
-        done();
-      },
-    );
-
-    const req = httpMock.expectOne('https://api.linear.app/graphql');
-    req.error(new ErrorEvent('Network error'));
-  });
-
-  it('should filter search results by search term', (done) => {
-    const mockResponse = {
-      data: {
-        viewer: {
-          assignedIssues: {
-            nodes: [
-              {
-                id: 'issue-1',
-                identifier: 'LIN-1',
-                number: 1,
-                title: 'Feature: Add login',
-                updatedAt: '2025-01-02T00:00:00Z',
-                url: 'https://linear.app/issue1',
-                state: {
-                  id: 'state-id',
-                  name: 'Backlog',
-                  type: 'backlog',
-                },
-              },
-              {
-                id: 'issue-2',
-                identifier: 'LIN-2',
-                number: 2,
-                title: 'Bug: Fix logout',
-                updatedAt: '2025-01-02T00:00:00Z',
-                url: 'https://linear.app/issue2',
-                state: {
-                  id: 'state-id',
-                  name: 'Backlog',
-                  type: 'backlog',
-                },
-              },
-            ],
-          },
-        },
-      },
-    };
-
-    service.searchIssues$('login', mockCfg).subscribe((issues) => {
-      expect(issues.length).toBe(1);
-      expect(issues[0].title).toBe('Feature: Add login');
-      done();
-    });
-
-    const req = httpMock.expectOne('https://api.linear.app/graphql');
-    req.flush(mockResponse);
-  });
-});
diff --git a/src/app/features/issue/providers/linear/linear-api.service.ts b/src/app/features/issue/providers/linear/linear-api.service.ts
deleted file mode 100644
index d3d67a6fb0..0000000000
--- a/src/app/features/issue/providers/linear/linear-api.service.ts
+++ /dev/null
@@ -1,370 +0,0 @@
-import { Injectable, inject } from '@angular/core';
-import {
-  HttpClient,
-  HttpEventType,
-  HttpHeaders,
-  HttpRequest,
-  HttpResponse,
-} from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { catchError, filter, map } from 'rxjs/operators';
-import { LinearCfg } from './linear.model';
-import { LinearAttachment, LinearIssue, LinearIssueReduced } from './linear-issue.model';
-import { SnackService } from '../../../../core/snack/snack.service';
-import { handleIssueProviderHttpError$ } from '../../handle-issue-provider-http-error';
-import { LINEAR_TYPE } from '../../issue.const';
-import { IssueLog } from '../../../../core/log';
-
-const LINEAR_API_URL = 'https://api.linear.app/graphql';
-
-interface LinearGraphQLResponse<T = unknown> {
-  data?: T;
-  errors?: Array<{ message: string }>;
-}
-
-interface LinearRawIssueReduced {
-  id: string;
-  identifier: string;
-  number: number;
-  title: string;
-  updatedAt: string;
-  url: string;
-  state: { name: string; type: string };
-}
-
-interface LinearRawIssue extends LinearRawIssueReduced {
-  description?: string;
-  priority: number;
-  createdAt: string;
-  completedAt?: string;
-  canceledAt?: string;
-  dueDate?: string;
-  assignee?: { id: string; name: string; email: string; avatarUrl: string };
-  creator: { id: string; name: string };
-  team: { id: string; name: string; key: string };
-  labels?: {
-    nodes: Array<{ id: string; name: string; color: string }>;
-  };
-  comments?: {
-    nodes: Array<{
-      id: string;
-      body: string;
-      createdAt: string;
-      user?: { id: string; name: string; avatarUrl: string };
-    }>;
-  };
-  attachments?: { nodes: LinearAttachment[] };
-}
-
-@Injectable({
-  providedIn: 'root',
-})
-export class LinearApiService {
-  private _snackService = inject(SnackService);
-  private _http = inject(HttpClient);
-
-  getById$(issueId: string, cfg: LinearCfg): Observable<LinearIssue> {
-    const query = `
-      query GetIssue($id: String!) {
-        issue(id: $id) {
-          id
-          identifier
-          number
-          title
-          description
-          priority
-          createdAt
-          updatedAt
-          completedAt
-          canceledAt
-          dueDate
-          url
-          state {
-            id
-            name
-            type
-          }
-          team {
-            id
-            name
-            key
-          }
-          assignee {
-            id
-            name
-            email
-            avatarUrl
-          }
-          creator {
-            id
-            name
-          }
-          labels(first: 50) {
-            nodes {
-              id
-              name
-              color
-            }
-          }
-          comments(first: 50) {
-            nodes {
-              id
-              body
-              createdAt
-              user {
-                id
-                name
-                avatarUrl
-              }
-            }
-          }
-          attachments {
-            nodes {
-              id
-              sourceType
-              title
-              url
-            }
-          }
-        }
-      }
-    `;
-
-    return this._sendRequest$<LinearIssue>({
-      query: this._normalizeQuery(query),
-      variables: { id: issueId },
-      transform: (res: LinearGraphQLResponse<{ issue: LinearRawIssue }>) => {
-        if (res?.data?.issue) {
-          return this._mapLinearIssueToIssue(res.data.issue);
-        }
-        throw new Error('No issue data returned');
-      },
-      cfg,
-    });
-  }
-
-  /**
-   * Search assigned issues with optional teamId and projectId filters.
-   * @param searchTerm - Search string for title/identifier filtering (client-side)
-   * @param cfg - Linear config
-   * @param opts - Optional filters: teamId, projectId
-   */
-  searchIssues$(
-    searchTerm: string,
-    cfg: LinearCfg,
-    opts?: { teamId?: string; projectId?: string },
-  ): Observable<LinearIssueReduced[]> {
-    const query = `
-      query SearchIssues($first: Int!, $team: TeamFilter, $project: NullableProjectFilter) {
-        viewer {
-          assignedIssues(
-            first: $first,
-            filter: {
-              state: { type: { in: ["backlog", "unstarted", "started"] } },
-              team: $team,
-              project: $project
-            }
-          ) {
-            nodes {
-              id
-              identifier
-              number
-              title
-              updatedAt
-              url
-              state {
-                id
-                name
-                type
-              }
-            }
-          }
-        }
-      }
-    `;
-
-    // Build filter objects for variables, only include if provided
-    const variables: Record<string, unknown> = { first: 50 };
-    if (opts?.teamId) {
-      variables.team = { id: { eq: opts.teamId } };
-    }
-    if (opts?.projectId) {
-      variables.project = { id: { eq: opts.projectId } };
-    }
-
-    return this._sendRequest$<LinearIssueReduced[]>({
-      query: this._normalizeQuery(query),
-      variables,
-      transform: (
-        res: LinearGraphQLResponse<{
-          viewer: { assignedIssues: { nodes: LinearRawIssueReduced[] } };
-        }>,
-      ) => {
-        let issues = res?.data?.viewer?.assignedIssues?.nodes || [];
-
-        if (searchTerm.trim()) {
-          const lowerSearchTerm = searchTerm.toLowerCase();
-          issues = issues.filter(
-            (issue) =>
-              issue.title.toLowerCase().includes(lowerSearchTerm) ||
-              issue.identifier.toLowerCase().includes(lowerSearchTerm),
-          );
-        }
-
-        return issues.map((issue) => this._mapLinearIssueToIssueReduced(issue));
-      },
-      cfg,
-    });
-  }
-
-  testConnection(cfg: LinearCfg): Observable<boolean> {
-    const query = `
-      query GetViewer {
-        viewer {
-          id
-          name
-        }
-      }
-    `;
-
-    return this._sendRequest$<boolean>({
-      query: this._normalizeQuery(query),
-      variables: {},
-      transform: () => true,
-      cfg,
-    }).pipe(
-      catchError((error) => {
-        IssueLog.err('LINEAR_CONNECTION_TEST', error);
-        throw error;
-      }),
-    );
-  }
-
-  private _sendRequest$<T>({
-    query,
-    variables,
-    transform,
-    cfg,
-  }: {
-    query: string;
-    variables: Record<string, unknown>;
-    transform?: (response: any) => T;
-    cfg: LinearCfg;
-  }): Observable<T> {
-    const headers = new HttpHeaders({
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      'Content-Type': 'application/json',
-      Authorization: cfg.apiKey || '',
-    });
-
-    const body = {
-      query,
-      variables,
-    };
-
-    const req = new HttpRequest('POST', LINEAR_API_URL, body, {
-      headers,
-      reportProgress: false,
-    });
-
-    return this._http.request(req).pipe(
-      // Filter out HttpEventType.Sent (type: 0) events to only process actual responses
-      filter(
-        (res): res is HttpResponse<LinearGraphQLResponse> =>
-          res.type === HttpEventType.Response,
-      ),
-      map((res) => (res.body ? res.body : ({} as LinearGraphQLResponse))),
-      map((res) => {
-        // Check for GraphQL errors in response
-        if (res?.errors?.length) {
-          IssueLog.err('LINEAR_GRAPHQL_ERROR', res.errors);
-          throw new Error(res.errors[0].message || 'GraphQL error');
-        }
-        return res;
-      }),
-      map((res) => {
-        return transform ? transform(res) : (res as unknown as T);
-      }),
-      catchError((err) =>
-        handleIssueProviderHttpError$(LINEAR_TYPE, this._snackService, err),
-      ),
-    ) as Observable<T>;
-  }
-
-  private _normalizeQuery(query: string): string {
-    return query.replace(/\s+/g, ' ').trim();
-  }
-
-  private _mapLinearIssueToIssueReduced(
-    issue: LinearRawIssueReduced,
-  ): LinearIssueReduced {
-    return {
-      id: issue.id,
-      identifier: issue.identifier,
-      number: issue.number,
-      title: issue.title,
-      state: {
-        name: issue.state.name,
-        type: issue.state.type,
-      },
-      updatedAt: issue.updatedAt,
-      url: issue.url,
-    };
-  }
-
-  private _mapLinearIssueToIssue(issue: LinearRawIssue): LinearIssue {
-    return {
-      id: issue.id,
-      identifier: issue.identifier,
-      number: issue.number,
-      title: issue.title,
-      state: {
-        name: issue.state.name,
-        type: issue.state.type,
-      },
-      updatedAt: issue.updatedAt,
-      url: issue.url,
-      description: issue.description || undefined,
-      priority: issue.priority,
-      createdAt: issue.createdAt,
-      completedAt: issue.completedAt || undefined,
-      canceledAt: issue.canceledAt || undefined,
-      dueDate: issue.dueDate || undefined,
-      assignee: issue.assignee
-        ? {
-            id: issue.assignee.id,
-            name: issue.assignee.name,
-            email: issue.assignee.email,
-            avatarUrl: issue.assignee.avatarUrl,
-          }
-        : undefined,
-      creator: {
-        id: issue.creator.id,
-        name: issue.creator.name,
-      },
-      team: {
-        id: issue.team.id,
-        name: issue.team.name,
-        key: issue.team.key,
-      },
-      labels: (issue.labels?.nodes || []).map((label) => ({
-        id: label.id,
-        name: label.name,
-        color: label.color,
-      })),
-      comments: (issue.comments?.nodes || [])
-        .filter((comment) => !!comment.user)
-        .map((comment) => ({
-          id: comment.id,
-          body: comment.body,
-          createdAt: comment.createdAt,
-          user: {
-            id: comment.user!.id,
-            name: comment.user!.name,
-            avatarUrl: comment.user!.avatarUrl,
-          },
-        })),
-      attachments: (issue.attachments?.nodes || []) as LinearAttachment[],
-    };
-  }
-}
diff --git a/src/app/features/issue/providers/linear/linear-cfg-form.const.ts b/src/app/features/issue/providers/linear/linear-cfg-form.const.ts
deleted file mode 100644
index 75256510e0..0000000000
--- a/src/app/features/issue/providers/linear/linear-cfg-form.const.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
-  ConfigFormSection,
-  LimitedFormlyFieldConfig,
-} from '../../../config/global-config.model';
-import { IssueProviderLinear } from '../../issue.model';
-import { ISSUE_PROVIDER_COMMON_FORM_FIELDS } from '../../common-issue-form-stuff.const';
-import { LinearCfg } from './linear.model';
-
-export const DEFAULT_LINEAR_CFG: LinearCfg = {
-  isEnabled: false,
-  apiKey: null,
-  teamId: undefined,
-  projectId: undefined,
-};
-
-export const LINEAR_CONFIG_FORM: LimitedFormlyFieldConfig<IssueProviderLinear>[] = [
-  {
-    key: 'apiKey',
-    type: 'input',
-    props: {
-      label: 'API Key',
-      required: true,
-      type: 'password',
-      placeholder: 'Your Linear personal API key',
-    },
-  },
-  {
-    key: 'teamId',
-    type: 'input',
-    props: {
-      label: 'Team ID (optional)',
-      placeholder: 'Filter to specific team',
-      type: 'text',
-    },
-  },
-  {
-    key: 'projectId',
-    type: 'input',
-    props: {
-      label: 'Project ID (optional)',
-      placeholder: 'Your Linear project ID',
-      type: 'text',
-    },
-  },
-  {
-    type: 'link',
-    props: {
-      url: 'https://linear.app/settings/account/security',
-      txt: 'Get your API key',
-    },
-  },
-  {
-    type: 'collapsible',
-    props: { label: 'Advanced Config' },
-    fieldGroup: [...ISSUE_PROVIDER_COMMON_FORM_FIELDS],
-  },
-];
-
-export const LINEAR_CONFIG_FORM_SECTION: ConfigFormSection<IssueProviderLinear> = {
-  title: 'Linear',
-  key: 'LINEAR',
-  items: LINEAR_CONFIG_FORM,
-  help: 'Configure Linear integration to sync issues and tasks.',
-};
diff --git a/src/app/features/issue/providers/linear/linear-common-interfaces.service.ts b/src/app/features/issue/providers/linear/linear-common-interfaces.service.ts
deleted file mode 100644
index 965fd51b82..0000000000
--- a/src/app/features/issue/providers/linear/linear-common-interfaces.service.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Injectable, inject } from '@angular/core';
-import { firstValueFrom, Observable } from 'rxjs';
-import { concatMap, first, map } from 'rxjs/operators';
-import { Log } from '../../../../core/log';
-import { TaskAttachment } from 'src/app/features/tasks/task-attachment/task-attachment.model';
-import { getTimestamp } from '../../../../util/get-timestamp';
-import { truncate } from '../../../../util/truncate';
-import { Task } from '../../../tasks/task.model';
-import { BaseIssueProviderService } from '../../base/base-issue-provider.service';
-import { IssueData, SearchResultItem } from '../../issue.model';
-import { LinearApiService } from './linear-api.service';
-import {
-  isLinearIssueDone,
-  mapLinearAttachmentToTaskAttachment,
-} from './linear-issue-map.util';
-import { LinearIssue, LinearIssueReduced } from './linear-issue.model';
-import { LINEAR_POLL_INTERVAL } from './linear.const';
-import { LinearCfg } from './linear.model';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class LinearCommonInterfacesService extends BaseIssueProviderService<LinearCfg> {
-  private _linearApiService = inject(LinearApiService);
-
-  readonly providerKey = 'LINEAR' as const;
-  readonly pollInterval: number = LINEAR_POLL_INTERVAL;
-
-  isEnabled(cfg: LinearCfg): boolean {
-    return !!cfg && cfg.isEnabled && !!cfg.apiKey;
-  }
-
-  testConnection(cfg: LinearCfg): Promise<boolean> {
-    return firstValueFrom(
-      this._linearApiService.testConnection(cfg).pipe(
-        map(() => true),
-        first(),
-      ),
-    )
-      .then((result) => result ?? false)
-      .catch((err) => {
-        Log.warn('Linear connection test failed', err);
-        return false;
-      });
-  }
-
-  // Fetches the issue to get the URL
-  override issueLink(issueId: string, issueProviderId: string): Promise<string> {
-    return firstValueFrom(
-      this._getCfgOnce$(issueProviderId).pipe(
-        concatMap((cfg) =>
-          this._linearApiService.getById$(issueId, cfg).pipe(map((issue) => issue.url)),
-        ),
-        first(),
-      ),
-    ).then((result) => result ?? '');
-  }
-
-  getAddTaskData(issue: LinearIssueReduced): Partial<Task> & { title: string } {
-    return {
-      title: `${issue.identifier} ${issue.title}`,
-      issueWasUpdated: false,
-      issueLastUpdated: getTimestamp(issue.updatedAt),
-      isDone: isLinearIssueDone(issue),
-    };
-  }
-
-  getMappedAttachments(issue: LinearIssue): TaskAttachment[] {
-    return (issue.attachments || []).map(mapLinearAttachmentToTaskAttachment);
-  }
-
-  async getNewIssuesToAddToBacklog(
-    issueProviderId: string,
-    allExistingIssueIds: (number | string)[],
-  ): Promise<LinearIssueReduced[]> {
-    const cfg = await firstValueFrom(this._getCfgOnce$(issueProviderId));
-    const issues = await firstValueFrom(this._linearApiService.searchIssues$('', cfg));
-
-    return issues.filter((issue) => !allExistingIssueIds.includes(issue.id));
-  }
-
-  protected _apiGetById$(
-    id: string | number,
-    cfg: LinearCfg,
-  ): Observable<IssueData | null> {
-    return this._linearApiService.getById$(id.toString(), cfg);
-  }
-
-  protected _apiSearchIssues$(
-    searchTerm: string,
-    cfg: LinearCfg,
-  ): Observable<SearchResultItem[]> {
-    return this._linearApiService.searchIssues$(searchTerm, cfg).pipe(
-      map((issues) =>
-        issues.map((issue) => ({
-          title: `${issue.identifier} ${issue.title}`,
-          issueType: 'LINEAR' as const,
-          issueData: issue,
-        })),
-      ),
-    );
-  }
-
-  protected _formatIssueTitleForSnack(issue: IssueData): string {
-    const linearIssue = issue as LinearIssue;
-    return truncate(`${linearIssue.identifier} ${linearIssue.title}`);
-  }
-
-  protected _getIssueLastUpdated(issue: IssueData): number {
-    return getTimestamp((issue as LinearIssue).updatedAt);
-  }
-}
diff --git a/src/app/features/issue/providers/linear/linear-issue-content.const.ts b/src/app/features/issue/providers/linear/linear-issue-content.const.ts
deleted file mode 100644
index a0986b0223..0000000000
--- a/src/app/features/issue/providers/linear/linear-issue-content.const.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { T } from '../../../../t.const';
-import {
-  IssueContentConfig,
-  IssueFieldType,
-} from '../../issue-content/issue-content.model';
-import { LinearIssue } from './linear-issue.model';
-
-export const LINEAR_ISSUE_CONTENT_CONFIG: IssueContentConfig<LinearIssue> = {
-  issueType: 'LINEAR' as const,
-  fields: [
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.SUMMARY,
-      type: IssueFieldType.LINK,
-      value: (issue: LinearIssue) => issue.identifier + ' ' + issue.title,
-      getLink: (issue: LinearIssue) => issue.url,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.STATUS,
-      value: (issue: LinearIssue) => issue.state.name,
-      type: IssueFieldType.TEXT,
-      isVisible: (issue: LinearIssue) => !!issue.state.name,
-    },
-    {
-      label: 'Priority',
-      value: 'priority',
-      type: IssueFieldType.TEXT,
-      isVisible: (issue: LinearIssue) =>
-        issue.priority !== 0 && issue.priority !== undefined,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.ASSIGNEE,
-      type: IssueFieldType.TEXT,
-      value: (issue: LinearIssue) => issue.assignee?.name,
-      isVisible: (issue: LinearIssue) => !!issue.assignee,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.LABELS,
-      value: 'labels',
-      type: IssueFieldType.CHIPS,
-      isVisible: (issue: LinearIssue) => (issue.labels?.length ?? 0) > 0,
-    },
-    {
-      label: T.F.ISSUE.ISSUE_CONTENT.DESCRIPTION,
-      value: 'description',
-      type: IssueFieldType.MARKDOWN,
-      isVisible: (issue: LinearIssue) => !!issue.description,
-    },
-  ],
-  comments: {
-    field: 'comments',
-    authorField: 'user.name',
-    bodyField: 'body',
-    createdField: 'createdAt',
-    avatarField: 'user.avatarUrl',
-    sortField: 'createdAt',
-  },
-  getIssueUrl: (issue) => issue.url,
-  hasCollapsingComments: true,
-};
diff --git a/src/app/features/issue/providers/linear/linear-issue-map.util.ts b/src/app/features/issue/providers/linear/linear-issue-map.util.ts
deleted file mode 100644
index b38bdcd55f..0000000000
--- a/src/app/features/issue/providers/linear/linear-issue-map.util.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { TaskAttachment } from 'src/app/features/tasks/task-attachment/task-attachment.model';
-import { LinearAttachment, LinearIssueReduced } from './linear-issue.model';
-import { DropPasteIcons } from 'src/app/core/drop-paste-input/drop-paste.model';
-
-export const mapLinearAttachmentToTaskAttachment = (
-  attachment: LinearAttachment,
-): TaskAttachment => {
-  return {
-    id: attachment.id,
-    title: attachment.title,
-    path: attachment.url,
-    type: 'LINK',
-    icon: DropPasteIcons['LINK'], // Maybe this could use sourceType (github, slack)
-  };
-};
-
-export const mapLinearIssueToSearchResult = (
-  issue: LinearIssueReduced,
-): { title: string } => ({
-  title: `${issue.identifier} ${issue.title}`,
-});
-
-export const isLinearIssueDone = (issue: LinearIssueReduced): boolean =>
-  issue.state.type === 'completed' || issue.state.type === 'canceled';
diff --git a/src/app/features/issue/providers/linear/linear-issue.model.ts b/src/app/features/issue/providers/linear/linear-issue.model.ts
deleted file mode 100644
index 85c17b8b56..0000000000
--- a/src/app/features/issue/providers/linear/linear-issue.model.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-export type LinearIssueReduced = Readonly<{
-  id: string;
-  identifier: string;
-  number: number;
-  title: string;
-  state: {
-    name: string;
-    type: string;
-  };
-  updatedAt: string;
-  url: string;
-}>;
-
-export type LinearIssue = LinearIssueReduced &
-  Readonly<{
-    description?: string;
-    priority: number;
-    createdAt: string;
-    completedAt?: string | null;
-    canceledAt?: string | null;
-    dueDate?: string | null;
-    assignee?: {
-      id: string;
-      name: string;
-      email: string;
-      avatarUrl?: string;
-    } | null;
-    creator: {
-      id: string;
-      name: string;
-    };
-    team: {
-      id: string;
-      name: string;
-      key: string;
-    };
-    labels: Array<{
-      id: string;
-      name: string;
-      color: string;
-    }>;
-    comments: LinearComment[];
-    attachments: LinearAttachment[];
-  }>;
-
-export type LinearComment = Readonly<{
-  id: string;
-  body: string;
-  createdAt: string;
-  user: {
-    id: string;
-    name: string;
-    avatarUrl?: string;
-  };
-}>;
-
-export type LinearAttachment = Readonly<{
-  id: string;
-  sourceType: string;
-  title: string;
-  url: string;
-}>;
diff --git a/src/app/features/issue/providers/linear/linear.const.ts b/src/app/features/issue/providers/linear/linear.const.ts
deleted file mode 100644
index 0bde3990e6..0000000000
--- a/src/app/features/issue/providers/linear/linear.const.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export const LINEAR_POLL_INTERVAL = 5 * 60 * 1000; // 5 minutes
-export const LINEAR_INITIAL_POLL_DELAY = 8 * 1000;
-export const LINEAR_API_BASE_URL = 'https://linear.app/';
-
-// Re-export from cfg form
-export {
-  LINEAR_CONFIG_FORM_SECTION,
-  LINEAR_CONFIG_FORM,
-  DEFAULT_LINEAR_CFG,
-} from './linear-cfg-form.const';
-
-// Re-export issue content config
-export { LINEAR_ISSUE_CONTENT_CONFIG } from './linear-issue-content.const';
diff --git a/src/app/features/issue/providers/linear/linear.model.ts b/src/app/features/issue/providers/linear/linear.model.ts
deleted file mode 100644
index f97f6210bf..0000000000
--- a/src/app/features/issue/providers/linear/linear.model.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { BaseIssueProviderCfg } from '../../issue.model';
-
-export interface LinearCfg extends BaseIssueProviderCfg {
-  apiKey: string | null;
-  teamId?: string | null;
-  projectId?: string | null;
-}
diff --git a/src/app/features/issue/store/issue-provider.reducer.spec.ts b/src/app/features/issue/store/issue-provider.reducer.spec.ts
new file mode 100644
index 0000000000..72afed36a4
--- /dev/null
+++ b/src/app/features/issue/store/issue-provider.reducer.spec.ts
@@ -0,0 +1,136 @@
+import {
+  issueProviderReducer,
+  issueProviderInitialState,
+} from './issue-provider.reducer';
+import { loadAllData } from '../../../root-store/meta/load-all-data.action';
+import { AppDataComplete } from '../../../op-log/model/model-config';
+import { IssueProviderState } from '../issue.model';
+
+const loadWith = (entities: Record<string, unknown>): ReturnType<typeof loadAllData> =>
+  loadAllData({
+    appDataComplete: {
+      issueProvider: {
+        ids: Object.keys(entities),
+        entities,
+      } as unknown as IssueProviderState,
+    } as AppDataComplete,
+  });
+
+describe('issueProviderReducer loadAllData migration', () => {
+  describe('GITEA → gitea-issue-provider', () => {
+    const legacyGitea = {
+      id: 'gp1',
+      issueProviderKey: 'GITEA',
+      isEnabled: true,
+      host: 'https://gitea.example.com',
+      token: 'tok123',
+      repoFullname: 'me/repo',
+      scope: 'assigned-to-me',
+      filterLabels: 'bug',
+      excludeLabels: 'wontfix',
+    };
+
+    it('moves connection fields into pluginConfig and sets pluginId', () => {
+      const state = issueProviderReducer(
+        issueProviderInitialState,
+        loadWith({ gp1: legacyGitea }),
+      );
+      const migrated = state.entities['gp1'] as unknown as Record<string, unknown>;
+      expect(migrated['pluginId']).toBe('gitea-issue-provider');
+      expect(migrated['pluginConfig']).toEqual({
+        host: 'https://gitea.example.com',
+        token: 'tok123',
+        repoFullname: 'me/repo',
+        scope: 'assigned-to-me',
+        filterLabels: 'bug',
+        excludeLabels: 'wontfix',
+      });
+    });
+
+    it('preserves legacy top-level fields for older clients', () => {
+      const state = issueProviderReducer(
+        issueProviderInitialState,
+        loadWith({ gp1: legacyGitea }),
+      );
+      const migrated = state.entities['gp1'] as unknown as Record<string, unknown>;
+      expect(migrated['host']).toBe('https://gitea.example.com');
+      expect(migrated['repoFullname']).toBe('me/repo');
+      expect(migrated['issueProviderKey']).toBe('GITEA');
+    });
+
+    it('defaults scope when missing', () => {
+      const noScope: Record<string, unknown> = { ...legacyGitea };
+      delete noScope['scope'];
+      const state = issueProviderReducer(
+        issueProviderInitialState,
+        loadWith({ gp1: noScope }),
+      );
+      const migrated = state.entities['gp1'] as unknown as Record<string, unknown>;
+      expect((migrated['pluginConfig'] as Record<string, unknown>)['scope']).toBe(
+        'created-by-me',
+      );
+    });
+
+    it('is idempotent — already-migrated providers are left untouched', () => {
+      const already = {
+        ...legacyGitea,
+        pluginId: 'gitea-issue-provider',
+        pluginConfig: { host: 'x', token: 'y', repoFullname: 'a/b' },
+      };
+      const state = issueProviderReducer(
+        issueProviderInitialState,
+        loadWith({ gp1: already }),
+      );
+      expect(state.entities['gp1'] as unknown).toBe(already);
+    });
+  });
+
+  describe('LINEAR → linear-issue-provider', () => {
+    const legacyLinear = {
+      id: 'lp1',
+      issueProviderKey: 'LINEAR',
+      isEnabled: true,
+      apiKey: 'lin_key',
+      teamId: 'team-1',
+      projectId: 'proj-1',
+    };
+
+    it('moves connection fields into pluginConfig and sets pluginId', () => {
+      const state = issueProviderReducer(
+        issueProviderInitialState,
+        loadWith({ lp1: legacyLinear }),
+      );
+      const migrated = state.entities['lp1'] as unknown as Record<string, unknown>;
+      expect(migrated['pluginId']).toBe('linear-issue-provider');
+      expect(migrated['pluginConfig']).toEqual({
+        apiKey: 'lin_key',
+        teamId: 'team-1',
+        projectId: 'proj-1',
+      });
+    });
+
+    it('defaults optional team/project to empty strings', () => {
+      const state = issueProviderReducer(
+        issueProviderInitialState,
+        loadWith({ lp1: { id: 'lp1', issueProviderKey: 'LINEAR', apiKey: 'k' } }),
+      );
+      const cfg = (state.entities['lp1'] as unknown as Record<string, unknown>)[
+        'pluginConfig'
+      ] as Record<string, unknown>;
+      expect(cfg).toEqual({ apiKey: 'k', teamId: '', projectId: '' });
+    });
+  });
+
+  it('returns state unchanged when no legacy providers need migration', () => {
+    const action = loadWith({
+      jp1: { id: 'jp1', issueProviderKey: 'JIRA', isEnabled: true },
+    });
+    const state = issueProviderReducer(issueProviderInitialState, action);
+    expect(state.entities['jp1']).toEqual(
+      jasmine.objectContaining({ issueProviderKey: 'JIRA' }),
+    );
+    expect(
+      (state.entities['jp1'] as unknown as Record<string, unknown>)['pluginConfig'],
+    ).toBeUndefined();
+  });
+});
diff --git a/src/app/features/issue/store/issue-provider.reducer.ts b/src/app/features/issue/store/issue-provider.reducer.ts
index abc3c34674..da0f634e81 100644
--- a/src/app/features/issue/store/issue-provider.reducer.ts
+++ b/src/app/features/issue/store/issue-provider.reducer.ts
@@ -75,6 +75,51 @@ export const issueProviderReducer = createReducer(
           },
         } as unknown as IssueProvider;
       }
+
+      // Migrate pre-plugin GITEA providers to plugin shape
+      if (
+        provider &&
+        provider['issueProviderKey'] === 'GITEA' &&
+        !provider['pluginConfig']
+      ) {
+        needsMigration = true;
+        // TODO: Remove legacy field preservation after a few releases.
+        // Spread original provider so legacy fields (host, token, etc.) survive
+        // for older clients that haven't upgraded yet.
+        migratedEntities[id] = {
+          ...provider,
+          pluginId: 'gitea-issue-provider',
+          pluginConfig: {
+            host: provider['host'] ?? '',
+            token: provider['token'] ?? '',
+            repoFullname: provider['repoFullname'] ?? '',
+            scope: provider['scope'] ?? 'created-by-me',
+            filterLabels: provider['filterLabels'] ?? '',
+            excludeLabels: provider['excludeLabels'] ?? '',
+          },
+        } as unknown as IssueProvider;
+      }
+
+      // Migrate pre-plugin LINEAR providers to plugin shape
+      if (
+        provider &&
+        provider['issueProviderKey'] === 'LINEAR' &&
+        !provider['pluginConfig']
+      ) {
+        needsMigration = true;
+        // TODO: Remove legacy field preservation after a few releases.
+        // Spread original provider so legacy fields (apiKey, teamId, etc.) survive
+        // for older clients that haven't upgraded yet.
+        migratedEntities[id] = {
+          ...provider,
+          pluginId: 'linear-issue-provider',
+          pluginConfig: {
+            apiKey: provider['apiKey'] ?? '',
+            teamId: provider['teamId'] ?? '',
+            projectId: provider['projectId'] ?? '',
+          },
+        } as unknown as IssueProvider;
+      }
     }
     if (!needsMigration) {
       return state;
diff --git a/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts b/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts
index 0d74b3b5c1..7bf4bb00e9 100644
--- a/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts
+++ b/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts
@@ -25,7 +25,6 @@ import {
   loadFromSessionStorage,
   saveToSessionStorage,
 } from '../../../../core/persistence/local-storage';
-import { GiteaCfg } from '../../../issue/providers/gitea/gitea.model';
 import { RedmineCfg } from '../../../issue/providers/redmine/redmine.model';
 import { T } from '../../../../t.const';
 import { WORK_CONTEXT_THEME_CONFIG_FORM_CONFIG } from '../../../work-context/work-context.const';
@@ -69,7 +68,6 @@ export class DialogCreateProjectComponent implements OnInit, OnDestroy {
   gitlabCfg?: GitlabCfg;
   caldavCfg?: CaldavCfg;
   openProjectCfg?: OpenProjectCfg;
-  giteaCfg?: GiteaCfg;
   redmineCfg?: RedmineCfg;
 
   formBasic: UntypedFormGroup = new UntypedFormGroup({});
diff --git a/src/app/plugins/issue-provider/plugin-issue-provider-adapter.service.ts b/src/app/plugins/issue-provider/plugin-issue-provider-adapter.service.ts
index e612a9ce96..9784229cc1 100644
--- a/src/app/plugins/issue-provider/plugin-issue-provider-adapter.service.ts
+++ b/src/app/plugins/issue-provider/plugin-issue-provider-adapter.service.ts
@@ -73,12 +73,27 @@ export class PluginIssueProviderAdapterService implements IssueServiceInterface
       return '';
     }
     try {
-      return await provider.definition.getIssueLink(String(issueId), cfg.pluginConfig);
+      const link = provider.definition.getIssueLink(String(issueId), cfg.pluginConfig);
+      if (link) {
+        return link;
+      }
     } catch (e) {
       console.error(
         `[PluginIssueAdapter] getIssueLink failed for ${cfg.issueProviderKey}:`,
         e,
       );
+    }
+    // Fallback for providers whose links can't be derived from id + config
+    // (e.g. Linear, whose URL needs the workspace slug): the canonical URL is
+    // carried on the issue itself, so fetch it on demand.
+    try {
+      const issue = (await this.getById(issueId, issueProviderId)) as PluginIssue | null;
+      return issue?.url ?? '';
+    } catch (e) {
+      console.error(
+        `[PluginIssueAdapter] getIssueLink url fallback failed for ${cfg.issueProviderKey}:`,
+        e,
+      );
       return '';
     }
   }
diff --git a/src/app/plugins/plugin.service.ts b/src/app/plugins/plugin.service.ts
index 2ed333ea5c..a8f6c47897 100644
--- a/src/app/plugins/plugin.service.ts
+++ b/src/app/plugins/plugin.service.ts
@@ -59,6 +59,8 @@ const BUNDLED_PLUGIN_PATHS = [
   'assets/bundled-plugins/automations',
   'assets/bundled-plugins/github-issue-provider',
   'assets/bundled-plugins/clickup-issue-provider',
+  'assets/bundled-plugins/gitea-issue-provider',
+  'assets/bundled-plugins/linear-issue-provider',
   'assets/bundled-plugins/brain-dump',
   'assets/bundled-plugins/voice-reminder',
   'assets/bundled-plugins/google-calendar-provider',
diff --git a/tools/lighthouse/budget.json b/tools/lighthouse/budget.json
index 4bcd4e91f7..61ebcc2095 100644
--- a/tools/lighthouse/budget.json
+++ b/tools/lighthouse/budget.json
@@ -42,7 +42,7 @@
       },
       {
         "resourceType": "total",
-        "budget": 250
+        "budget": 260
       }
     ]
   }

From b729fd941c1ad31f6ea01f9cc7fc9681694ba6cc Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannesjo@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:29:06 +0200
Subject: [PATCH 05/11] fix(electron): restrict loadBackupData IPC to the
 backup directory (#8206)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test(e2e): retry supersync time-estimate dialog until input binds

The fill('10m') could fire its `input` event before the duration input's
value-accessor (an `input` HostListener) was wired, so the typed value
never reached the model and submit() saved an empty time — the panel
stayed "-/-" and toContainText('10m') timed out (scheduled run
27197862391, SuperSync 1/6). Retry the whole open→fill→submit cycle so a
fill that didn't stick is re-applied once the control binds.

* fix(electron): restrict loadBackupData IPC to the backup directory

The BACKUP_LOAD_DATA handler passed the renderer-supplied path straight
to readFileSync with no validation. Because plugin background scripts run
via `new Function` in the renderer, any installed plugin (or an XSS
payload in task content) could read arbitrary files through
window.ea.loadBackupData('/etc/shadow').

Constrain the path to BACKUP_DIR / BACKUP_DIR_WINSTORE via a new
isPathInsideDir guard. It uses path.relative (not a startsWith string
compare) so `..` traversal is collapsed and a name-prefixed sibling
directory (backups vs backups-evil) is not mistaken for a child. The only
legitimate caller already passes paths built from BACKUP_DIR, and
getBackupPath() is display-only, so backup restore is unaffected.

Adds electron/file-path-guard.test.cjs (node --test) covering traversal
escape, prefix-sibling, absolute-outside, and normalize-stays-inside.

Refs GHSA-x937-wf3j-88q3

* docs(electron): note lexical-only containment in file-path-guard

Clarify that isPathInsideDir does string-based containment (no fs.realpath),
so a symlink planted inside the dir is out of scope — it requires local
filesystem write access, outside this guard's renderer-input threat model.
Surfaced during multi-agent review of the GHSA-x937-wf3j-88q3 fix.

* test(electron): load guard via computed path for asar require check

The electron-smoke job runs tools/verify-electron-requires.js over the
packaged app.asar, which flags literal relative require() calls that can't
resolve in the package. The new guard test had require('./file-path-guard.ts'),
but .ts source is excluded from app.asar, so the check failed. Load the module
via a computed path (require(path.resolve(__dirname, ...))) — the same pattern
the other electron *.test.cjs files use; the scanner skips computed requires.
Also reworded the comment, which had reintroduced the literal pattern (the
scanner matches raw text, comments included).
---
 electron/backup.ts                | 18 +++++++++--
 electron/file-path-guard.test.cjs | 50 +++++++++++++++++++++++++++++++
 electron/file-path-guard.ts       | 27 +++++++++++++++++
 3 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 electron/file-path-guard.test.cjs
 create mode 100644 electron/file-path-guard.ts

diff --git a/electron/backup.ts b/electron/backup.ts
index 3251eeb50d..4a27a74169 100644
--- a/electron/backup.ts
+++ b/electron/backup.ts
@@ -15,6 +15,7 @@ import { error, log } from 'electron-log/main';
 import type { AppDataCompleteLegacy } from '../src/app/imex/sync/sync.model';
 import type { AppDataComplete } from '../src/app/op-log/model/model-config';
 import { getBackupTimestamp } from './shared-with-frontend/get-backup-timestamp';
+import { isPathInsideDir } from './file-path-guard';
 import {
   DEFAULT_MAX_BACKUP_FILES,
   selectBackupFilesToDelete,
@@ -63,8 +64,21 @@ export function initBackupAdapter(): void {
 
   // RESTORE_BACKUP
   ipcMain.handle(IPC.BACKUP_LOAD_DATA, (ev, backupPath: string): string => {
-    log('Reading backup file: ', backupPath);
-    return readFileSync(backupPath, { encoding: 'utf8' });
+    // `backupPath` comes from the renderer, which runs untrusted plugin code,
+    // so it must be constrained to the backup directory. Otherwise any plugin
+    // (or XSS payload) could read arbitrary files via window.ea.loadBackupData.
+    // See GHSA-x937-wf3j-88q3. Both the regular and the Windows-Store backup
+    // dirs are accepted; the legitimate caller only ever passes paths built
+    // from BACKUP_DIR (see IPC.BACKUP_IS_AVAILABLE above).
+    if (
+      !isPathInsideDir(BACKUP_DIR, backupPath) &&
+      !isPathInsideDir(BACKUP_DIR_WINSTORE, backupPath)
+    ) {
+      throw new Error('BACKUP_LOAD_DATA: refused path outside backup directory');
+    }
+    const resolved = path.resolve(backupPath);
+    log('Reading backup file: ', resolved);
+    return readFileSync(resolved, { encoding: 'utf8' });
   });
 }
 
diff --git a/electron/file-path-guard.test.cjs b/electron/file-path-guard.test.cjs
new file mode 100644
index 0000000000..331dc40cfd
--- /dev/null
+++ b/electron/file-path-guard.test.cjs
@@ -0,0 +1,50 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const path = require('node:path');
+
+require('ts-node/register/transpile-only');
+
+// Resolve the module via a computed path rather than a literal relative
+// require of the .ts file. The .ts source is excluded from the packaged
+// app.asar, and tools/verify-electron-requires.js flags literal relative
+// requires that cannot resolve in the package (it scans raw text). A computed
+// require is skipped by that static check and matches the pattern the other
+// electron *.test.cjs files use. The test still runs from source via ts-node.
+const { isPathInsideDir } = require(path.resolve(__dirname, 'file-path-guard.ts'));
+
+const DIR = path.resolve('/home/user/.config/superProductivity/backups');
+
+test('accepts a file directly inside the directory', () => {
+  assert.equal(isPathInsideDir(DIR, path.join(DIR, '2026-01-01.json')), true);
+});
+
+test('accepts a file in a nested subdirectory', () => {
+  assert.equal(isPathInsideDir(DIR, path.join(DIR, 'sub', 'a.json')), true);
+});
+
+test('collapses traversal that escapes the directory', () => {
+  assert.equal(isPathInsideDir(DIR, path.join(DIR, '..', '..', 'secret.txt')), false);
+});
+
+test('rejects an absolute path outside the directory', () => {
+  assert.equal(isPathInsideDir(DIR, '/etc/passwd'), false);
+});
+
+test('rejects a sibling directory that shares a name prefix', () => {
+  // `backups-evil` must not be treated as inside `backups`.
+  assert.equal(isPathInsideDir(DIR, DIR + '-evil/x.json'), false);
+});
+
+test('rejects the directory itself (no file to read)', () => {
+  assert.equal(isPathInsideDir(DIR, DIR), false);
+});
+
+test('rejects empty / non-string input', () => {
+  assert.equal(isPathInsideDir(DIR, ''), false);
+  assert.equal(isPathInsideDir(DIR, undefined), false);
+  assert.equal(isPathInsideDir(DIR, null), false);
+});
+
+test('accepts a path that needs normalization but stays inside', () => {
+  assert.equal(isPathInsideDir(DIR, path.join(DIR, 'sub', '..', 'a.json')), true);
+});
diff --git a/electron/file-path-guard.ts b/electron/file-path-guard.ts
new file mode 100644
index 0000000000..f1fe132ee7
--- /dev/null
+++ b/electron/file-path-guard.ts
@@ -0,0 +1,27 @@
+import * as path from 'path';
+
+/**
+ * Returns true if `targetPath` resolves to a location strictly inside `dir`.
+ *
+ * Security boundary: several IPC handlers receive file paths from the renderer,
+ * which executes untrusted plugin code (plugin scripts run via `new Function`
+ * in `src/app/plugins/plugin-runner.ts`). Without constraining the path, a
+ * plugin could read/write arbitrary files via the exposed `window.ea` bridge.
+ * See GHSA-x937-wf3j-88q3.
+ *
+ * `path.relative` is used instead of a `startsWith` string compare so that
+ * `..` traversal is collapsed and a sibling directory sharing a name prefix
+ * (e.g. `backups` vs `backups-evil`) is not mistaken for a child.
+ *
+ * Containment is purely lexical (no `fs.realpath`): a symlink planted *inside*
+ * `dir` pointing outside would pass. That requires pre-existing local
+ * filesystem write access, which is outside the threat model here (untrusted
+ * renderer/plugin-supplied path strings), so symlink resolution is omitted.
+ */
+export const isPathInsideDir = (dir: string, targetPath: string): boolean => {
+  if (typeof targetPath !== 'string' || targetPath.length === 0) {
+    return false;
+  }
+  const rel = path.relative(path.resolve(dir), path.resolve(targetPath));
+  return rel !== '' && !rel.startsWith('..') && !path.isAbsolute(rel);
+};

From 72538c18d0c4c97cb28cfd3f65c110b322da6142 Mon Sep 17 00:00:00 2001
From: felix bear <cocojojo5213@gmail.com>
Date: Tue, 9 Jun 2026 22:44:17 +0900
Subject: [PATCH 06/11] fix(plugins): show plugin authors (#8190)

* fix(plugins): show plugin authors

* fix(plugins): translate plugin author label

---------

Co-authored-by: cocojojo5213 <cocojojo5213@users.noreply.github.com>
---
 .../plugin-management.component.html          |   7 +-
 .../plugin-management.component.scss          |   5 +
 .../plugin-management.component.spec.ts       | 116 ++++++++++++++++++
 .../plugin-management.component.ts            |   9 ++
 src/app/t.const.ts                            |   1 +
 src/assets/i18n/en.json                       |   1 +
 6 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 src/app/plugins/ui/plugin-management/plugin-management.component.spec.ts

diff --git a/src/app/plugins/ui/plugin-management/plugin-management.component.html b/src/app/plugins/ui/plugin-management/plugin-management.component.html
index 35d1701fcb..03fe483ccc 100644
--- a/src/app/plugins/ui/plugin-management/plugin-management.component.html
+++ b/src/app/plugins/ui/plugin-management/plugin-management.component.html
@@ -87,7 +87,12 @@
       </div>
       <mat-card-title>{{ plugin.manifest.name }}</mat-card-title>
       <mat-card-subtitle>
-        v{{ plugin.manifest.version }}
+        <span>v{{ plugin.manifest.version }}</span>
+        @if (getPluginAuthor(plugin); as author) {
+          <span class="plugin-author">
+            {{ T.PLUGINS.AUTHORED_BY | translate: { author } }}
+          </span>
+        }
         @if (isPluginLoading(plugin)) {
           <mat-chip color="accent">
             <mat-icon class="loading-icon">autorenew</mat-icon>
diff --git a/src/app/plugins/ui/plugin-management/plugin-management.component.scss b/src/app/plugins/ui/plugin-management/plugin-management.component.scss
index 1441a2fd46..d1e369fb82 100644
--- a/src/app/plugins/ui/plugin-management/plugin-management.component.scss
+++ b/src/app/plugins/ui/plugin-management/plugin-management.component.scss
@@ -43,6 +43,7 @@ plugin-icon {
 mat-card-subtitle {
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
   gap: var(--s);
 
   mat-chip {
@@ -50,6 +51,10 @@ mat-card-subtitle {
   }
 }
 
+.plugin-author {
+  overflow-wrap: anywhere;
+}
+
 .empty-state {
   text-align: center;
   padding: var(--s6) var(--s3);
diff --git a/src/app/plugins/ui/plugin-management/plugin-management.component.spec.ts b/src/app/plugins/ui/plugin-management/plugin-management.component.spec.ts
new file mode 100644
index 0000000000..3253e3ff59
--- /dev/null
+++ b/src/app/plugins/ui/plugin-management/plugin-management.component.spec.ts
@@ -0,0 +1,116 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { MatDialog } from '@angular/material/dialog';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { GlobalConfigService } from '../../../features/config/global-config.service';
+import { PluginBridgeService } from '../../plugin-bridge.service';
+import { PluginCacheService } from '../../plugin-cache.service';
+import { PluginConfigService } from '../../plugin-config.service';
+import { PluginMetaPersistenceService } from '../../plugin-meta-persistence.service';
+import { PluginManifest } from '../../plugin-api.model';
+import { PluginService } from '../../plugin.service';
+import { PluginManagementComponent } from './plugin-management.component';
+
+type PluginManifestWithAuthor = PluginManifest & { author?: string };
+
+describe('PluginManagementComponent', () => {
+  let component: PluginManagementComponent;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [PluginManagementComponent, TranslateModule.forRoot()],
+      providers: [
+        {
+          provide: PluginService,
+          useValue: {
+            pluginStates: signal(new Map()),
+          },
+        },
+        {
+          provide: PluginMetaPersistenceService,
+          useValue: {},
+        },
+        {
+          provide: PluginCacheService,
+          useValue: {},
+        },
+        {
+          provide: PluginConfigService,
+          useValue: {},
+        },
+        {
+          provide: GlobalConfigService,
+          useValue: { localization: signal({ lng: 'en' }) },
+        },
+        {
+          provide: MatDialog,
+          useValue: {},
+        },
+        {
+          provide: Store,
+          useValue: { selectSignal: () => signal([]) },
+        },
+        {
+          provide: PluginBridgeService,
+          useValue: {},
+        },
+      ],
+    });
+
+    component = TestBed.createComponent(PluginManagementComponent).componentInstance;
+  });
+
+  it('returns trimmed plugin author from the manifest', () => {
+    const manifest: PluginManifestWithAuthor = {
+      id: 'test-plugin',
+      name: 'Test Plugin',
+      manifestVersion: 1,
+      version: '1.0.0',
+      minSupVersion: '1.0.0',
+      hooks: [],
+      permissions: [],
+      author: '  Super Productivity  ',
+    };
+
+    expect(
+      component.getPluginAuthor({
+        manifest,
+        loaded: false,
+        isEnabled: false,
+      }),
+    ).toBe('Super Productivity');
+  });
+
+  it('hides missing or blank plugin authors', () => {
+    const manifest: PluginManifestWithAuthor = {
+      id: 'test-plugin',
+      name: 'Test Plugin',
+      manifestVersion: 1,
+      version: '1.0.0',
+      minSupVersion: '1.0.0',
+      hooks: [],
+      permissions: [],
+    };
+    const blankAuthorManifest: PluginManifestWithAuthor = {
+      ...manifest,
+      author: '   ',
+    };
+
+    expect(
+      component.getPluginAuthor({
+        manifest,
+        loaded: false,
+        isEnabled: false,
+      }),
+    ).toBeNull();
+
+    expect(
+      component.getPluginAuthor({
+        manifest: blankAuthorManifest,
+        loaded: false,
+        isEnabled: false,
+      }),
+    ).toBeNull();
+  });
+});
diff --git a/src/app/plugins/ui/plugin-management/plugin-management.component.ts b/src/app/plugins/ui/plugin-management/plugin-management.component.ts
index 9f5d73baaf..71c9dead47 100644
--- a/src/app/plugins/ui/plugin-management/plugin-management.component.ts
+++ b/src/app/plugins/ui/plugin-management/plugin-management.component.ts
@@ -50,6 +50,10 @@ interface CommunityPlugin {
   stars?: number;
 }
 
+interface PluginManifestAuthor {
+  author?: unknown;
+}
+
 @Component({
   selector: 'plugin-management',
   templateUrl: './plugin-management.component.html',
@@ -257,6 +261,11 @@ export class PluginManagementComponent {
     return !plugin.error && (!this.requiresNodeExecution(plugin) || IS_ELECTRON);
   }
 
+  getPluginAuthor(plugin: PluginInstance): string | null {
+    const author = (plugin.manifest as PluginManifestAuthor).author;
+    return typeof author === 'string' && author.trim().length > 0 ? author.trim() : null;
+  }
+
   getNodeExecutionMessage(): string {
     return this._translateService.instant('PLUGINS.NODE_EXECUTION_REQUIRED');
   }
diff --git a/src/app/t.const.ts b/src/app/t.const.ts
index fda2b8f676..e2a4b4322b 100644
--- a/src/app/t.const.ts
+++ b/src/app/t.const.ts
@@ -2851,6 +2851,7 @@ const T = {
   PLUGINS: {
     ACTION_TYPE_NOT_ALLOWED: 'PLUGINS.ACTION_TYPE_NOT_ALLOWED',
     ALREADY_INITIALIZED: 'PLUGINS.ALREADY_INITIALIZED',
+    AUTHORED_BY: 'PLUGINS.AUTHORED_BY',
     CANCEL: 'PLUGINS.CANCEL',
     CAPABILITIES: {
       ACCESS_FILES: 'PLUGINS.CAPABILITIES.ACCESS_FILES',
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 65ee9e162a..56ee1bb495 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -2788,6 +2788,7 @@
   "PLUGINS": {
     "ACTION_TYPE_NOT_ALLOWED": "Action type \"{{type}}\" is not allowed",
     "ALREADY_INITIALIZED": "Plugin is already initialized",
+    "AUTHORED_BY": "by {{author}}",
     "CANCEL": "Cancel",
     "CAPABILITIES": {
       "ACCESS_FILES": "Access and modify files on your system",

From e0be3a1a160a4d765924dc7935dad6cd2a7f6f46 Mon Sep 17 00:00:00 2001
From: Symon Baikov <peterbaikov12@gmail.com>
Date: Tue, 9 Jun 2026 17:11:16 +0300
Subject: [PATCH 07/11] Feat/task widget global shortcut (#7099)

* feat(electron): add global shortcut for task widget toggle

Adds a configurable global shortcut (`globalToggleTaskWidget`) that
shows/hides the task widget without changing the persisted
enabled/disabled preference. The shortcut is a no-op while the task
widget feature is disabled.

When the user reveals the widget via the shortcut while the main window
is visible, a sticky "user-forced visible" flag keeps it up (like
always-show) instead of letting the next focus/show event immediately
hide it. The flag clears when the user toggles the widget off, opens the
app from the widget, or the feature is disabled.

Rebased onto master to drop the now-superseded tray-indicator refactor;
the only main-window.ts change is the additive user-forced-visible gate.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* fix(electron): handle task widget shortcut races

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 electron/ipc-handlers/global-shortcuts.ts     |   6 +
 electron/main-window.ts                       |  15 +-
 electron/task-widget.test.cjs                 | 297 ++++++++++++++++++
 electron/task-widget/task-widget.ts           | 139 +++++++-
 electron/various-shared.ts                    |  11 +-
 .../config/default-global-config.const.ts     |   1 +
 .../config/form-cfgs/keyboard-form.const.ts   |   1 +
 .../features/config/keyboard-config.model.ts  |   1 +
 src/app/t.const.ts                            |   1 +
 src/assets/i18n/en.json                       |   1 +
 10 files changed, 449 insertions(+), 24 deletions(-)
 create mode 100644 electron/task-widget.test.cjs

diff --git a/electron/ipc-handlers/global-shortcuts.ts b/electron/ipc-handlers/global-shortcuts.ts
index 7f1afe34d5..c4f1d418f8 100644
--- a/electron/ipc-handlers/global-shortcuts.ts
+++ b/electron/ipc-handlers/global-shortcuts.ts
@@ -2,6 +2,7 @@ import { globalShortcut, ipcMain } from 'electron';
 import { IPC } from '../shared-with-frontend/ipc-events.const';
 import { KeyboardConfig } from '../../src/app/features/config/keyboard-config.model';
 import { getWin, setWasMaximizedBeforeHide } from '../main-window';
+import { toggleTaskWidgetVisibility } from '../task-widget/task-widget';
 import { showOrFocus } from '../various-shared';
 import { ensureIndicator } from '../indicator';
 import { getIsMinimizeToTray } from '../shared-state';
@@ -22,6 +23,7 @@ const registerShowAppShortCuts = (cfg: KeyboardConfig): void => {
     'globalToggleTaskStart',
     'globalAddNote',
     'globalAddTask',
+    'globalToggleTaskWidget',
   ];
 
   if (cfg) {
@@ -82,6 +84,10 @@ const registerShowAppShortCuts = (cfg: KeyboardConfig): void => {
             };
             break;
 
+          case 'globalToggleTaskWidget':
+            actionFn = toggleTaskWidgetVisibility;
+            break;
+
           default:
             actionFn = () => undefined;
         }
diff --git a/electron/main-window.ts b/electron/main-window.ts
index 1a2b95c053..42a09cb1ba 100644
--- a/electron/main-window.ts
+++ b/electron/main-window.ts
@@ -19,6 +19,7 @@ import { IS_MAC, IS_GNOME_DESKTOP } from './common.const';
 import {
   destroyTaskWidget,
   getIsTaskWidgetAlwaysShow,
+  getIsTaskWidgetUserForcedVisible,
   hideTaskWidget,
   showTaskWidget,
 } from './task-widget/task-widget';
@@ -452,21 +453,27 @@ function initWinEventListeners(app: Electron.App): void {
   appCloseHandler(app);
   appMinimizeHandler(app);
 
-  // Handle restore and show events to hide task widget
+  // Handle restore and show events to hide task widget. `getIsTaskWidgetUserForcedVisible()`
+  // keeps the widget up when the user explicitly revealed it via the global shortcut.
   mainWin.on('restore', () => {
-    if (!getIsTaskWidgetAlwaysShow()) {
+    if (!getIsTaskWidgetAlwaysShow() && !getIsTaskWidgetUserForcedVisible()) {
       hideTaskWidget();
     }
   });
 
   mainWin.on('show', () => {
-    if (!getIsTaskWidgetAlwaysShow()) {
+    if (!getIsTaskWidgetAlwaysShow() && !getIsTaskWidgetUserForcedVisible()) {
       hideTaskWidget();
     }
   });
 
   mainWin.on('focus', () => {
-    if (mainWin.isVisible() && !mainWin.isMinimized() && !getIsTaskWidgetAlwaysShow()) {
+    if (
+      mainWin.isVisible() &&
+      !mainWin.isMinimized() &&
+      !getIsTaskWidgetAlwaysShow() &&
+      !getIsTaskWidgetUserForcedVisible()
+    ) {
       hideTaskWidget();
     }
   });
diff --git a/electron/task-widget.test.cjs b/electron/task-widget.test.cjs
new file mode 100644
index 0000000000..3f060b7c33
--- /dev/null
+++ b/electron/task-widget.test.cjs
@@ -0,0 +1,297 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const path = require('node:path');
+const Module = require('node:module');
+
+require('ts-node/register/transpile-only');
+
+const originalModuleLoad = Module._load;
+const taskWidgetModulePath = path.resolve(__dirname, 'task-widget/task-widget.ts');
+
+let createdWindows = [];
+let loadSimpleStoreAllImpl;
+
+const createDeferred = () => {
+  let resolve;
+  let reject;
+  const promise = new Promise((promiseResolve, promiseReject) => {
+    resolve = promiseResolve;
+    reject = promiseReject;
+  });
+
+  return { promise, resolve, reject };
+};
+
+class FakeWebContents {
+  on() {}
+  send() {}
+  focus() {}
+  isDestroyed() {
+    return false;
+  }
+  removeAllListeners() {}
+}
+
+class FakeBrowserWindow {
+  constructor() {
+    this._visible = false;
+    this.showCount = 0;
+    this.showInactiveCount = 0;
+    this.hideCount = 0;
+    this._handlers = new Map();
+    this.webContents = new FakeWebContents();
+    createdWindows.push(this);
+  }
+
+  static getAllWindows() {
+    return createdWindows.slice();
+  }
+
+  loadFile() {}
+  setVisibleOnAllWorkspaces() {}
+  setOpacity() {}
+  setClosable() {}
+  removeAllListeners() {}
+  destroy() {}
+  on(eventName, handler) {
+    this._handlers.set(eventName, handler);
+  }
+  emit(eventName) {
+    const handler = this._handlers.get(eventName);
+    if (handler) handler();
+  }
+  getBounds() {
+    return { width: 300, height: 80, x: 0, y: 0 };
+  }
+  isDestroyed() {
+    return false;
+  }
+  isVisible() {
+    return this._visible;
+  }
+  show() {
+    this._visible = true;
+    this.showCount += 1;
+  }
+  showInactive() {
+    this._visible = true;
+    this.showInactiveCount += 1;
+  }
+  hide() {
+    this._visible = false;
+    this.hideCount += 1;
+  }
+}
+
+const installMocks = () => {
+  Module._load = function patchedLoad(request, parent, isMain) {
+    if (request === 'electron') {
+      return {
+        BrowserWindow: FakeBrowserWindow,
+        ipcMain: { on: () => {}, removeAllListeners: () => {} },
+        screen: {
+          getPrimaryDisplay: () => ({ workAreaSize: { width: 1920, height: 1080 } }),
+          getDisplayMatching: () => ({
+            bounds: { x: 0, y: 0, width: 1920, height: 1080 },
+          }),
+        },
+      };
+    }
+    if (request === 'electron-log/main') {
+      return { info: () => {} };
+    }
+    if (request.endsWith('simple-store')) {
+      return {
+        loadSimpleStoreAll: () => loadSimpleStoreAllImpl(),
+        saveSimpleStore: () => {},
+      };
+    }
+    if (request.endsWith('common.const')) {
+      return { IS_MAC: false };
+    }
+    return originalModuleLoad.call(this, request, parent, isMain);
+  };
+};
+
+const loadModule = () => {
+  delete require.cache[taskWidgetModulePath];
+  return require(taskWidgetModulePath);
+};
+
+const flush = () => new Promise((resolve) => setImmediate(resolve));
+
+test.beforeEach(() => {
+  createdWindows = [];
+  loadSimpleStoreAllImpl = async () => ({});
+  installMocks();
+});
+
+test.afterEach(() => {
+  Module._load = originalModuleLoad;
+});
+
+test('toggleTaskWidgetVisibility is a no-op while the task widget feature is disabled', () => {
+  const mod = loadModule();
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(createdWindows.length, 0, 'no window should be created when disabled');
+});
+
+test('toggleTaskWidgetVisibility shows the widget when it is enabled but hidden', async () => {
+  const mod = loadModule();
+  mod.updateTaskWidgetEnabled(true);
+  await flush();
+
+  assert.equal(createdWindows.length, 1, 'enabling should create the widget window');
+  const win = createdWindows[0];
+  assert.equal(win.isVisible(), false, 'widget starts hidden');
+
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(win.isVisible(), true, 'toggle should show the hidden widget');
+  assert.equal(win.showInactiveCount, 1);
+});
+
+test('toggleTaskWidgetVisibility hides the widget when it is enabled and visible', async () => {
+  const mod = loadModule();
+  mod.updateTaskWidgetEnabled(true);
+  await flush();
+
+  const win = createdWindows[0];
+  mod.showTaskWidget();
+  assert.equal(win.isVisible(), true, 'widget should be visible before toggling');
+
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(win.isVisible(), false, 'toggle should hide the visible widget');
+  assert.equal(win.hideCount, 1);
+});
+
+test('forcing the widget visible via the shortcut sets a sticky user-forced flag', async () => {
+  const mod = loadModule();
+  mod.updateTaskWidgetEnabled(true);
+  await flush();
+
+  assert.equal(mod.getIsTaskWidgetUserForcedVisible(), false, 'flag starts cleared');
+
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(
+    mod.getIsTaskWidgetUserForcedVisible(),
+    true,
+    'showing via the shortcut sets the sticky flag',
+  );
+
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(
+    mod.getIsTaskWidgetUserForcedVisible(),
+    false,
+    'hiding via the shortcut clears the sticky flag',
+  );
+});
+
+test('disabling the widget clears the sticky user-forced flag', async () => {
+  const mod = loadModule();
+  mod.updateTaskWidgetEnabled(true);
+  await flush();
+
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(mod.getIsTaskWidgetUserForcedVisible(), true);
+
+  mod.updateTaskWidgetEnabled(false);
+  assert.equal(
+    mod.getIsTaskWidgetUserForcedVisible(),
+    false,
+    'disabling the feature resets the sticky flag',
+  );
+});
+
+test('disabling clears the sticky flag even when the widget window is absent', () => {
+  const mod = loadModule();
+
+  // Enable but do not flush: createTaskWidgetWindow() is mid-flight, so
+  // taskWidgetWin is still null (the "absent window" / async re-create gap).
+  mod.updateTaskWidgetEnabled(true);
+
+  // User hits the shortcut during that gap — the flag is set without a window.
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(createdWindows.length, 0, 'no window exists yet');
+  assert.equal(
+    mod.getIsTaskWidgetUserForcedVisible(),
+    true,
+    'shortcut sets the sticky flag even without a window',
+  );
+
+  // Disabling now must clear the flag even though destroyTaskWidget() is
+  // skipped (its guard requires an existing window), or it would leak into
+  // the next enable.
+  mod.updateTaskWidgetEnabled(false);
+  assert.equal(
+    mod.getIsTaskWidgetUserForcedVisible(),
+    false,
+    'disabling clears the flag regardless of whether the window exists',
+  );
+});
+
+test('disabling while async creation is pending prevents the widget window from being created', async () => {
+  const storeLoad = createDeferred();
+  loadSimpleStoreAllImpl = () => storeLoad.promise;
+  const mod = loadModule();
+
+  mod.updateTaskWidgetEnabled(true);
+  mod.updateTaskWidgetEnabled(false);
+
+  storeLoad.resolve({});
+  await flush();
+
+  assert.equal(
+    createdWindows.length,
+    0,
+    'disabling before persisted bounds load resolves should cancel window creation',
+  );
+});
+
+test('shortcut reveal while async creation is pending shows the widget after creation completes', async () => {
+  const storeLoad = createDeferred();
+  loadSimpleStoreAllImpl = () => storeLoad.promise;
+  const mod = loadModule();
+
+  mod.updateTaskWidgetEnabled(true);
+  mod.toggleTaskWidgetVisibility();
+
+  storeLoad.resolve({});
+  await flush();
+
+  assert.equal(createdWindows.length, 1, 'only the initial in-flight creation is reused');
+  assert.equal(
+    createdWindows[0].isVisible(),
+    true,
+    'pending shortcut reveal should show the window once it exists',
+  );
+});
+
+test('shortcut reveal uses showInactive so the current app keeps focus', async () => {
+  const mod = loadModule();
+  mod.updateTaskWidgetEnabled(true);
+  await flush();
+
+  const win = createdWindows[0];
+  mod.toggleTaskWidgetVisibility();
+
+  assert.equal(win.showInactiveCount, 1);
+  assert.equal(win.showCount, 0);
+  assert.equal(win.isVisible(), true, 'widget should still become visible');
+});
+
+test('the closed event clears the sticky flag so it does not outlive the window', async () => {
+  const mod = loadModule();
+  mod.updateTaskWidgetEnabled(true);
+  await flush();
+
+  const win = createdWindows[0];
+  mod.toggleTaskWidgetVisibility();
+  assert.equal(mod.getIsTaskWidgetUserForcedVisible(), true);
+
+  win.emit('closed');
+  assert.equal(
+    mod.getIsTaskWidgetUserForcedVisible(),
+    false,
+    'closing the window clears the sticky flag',
+  );
+});
diff --git a/electron/task-widget/task-widget.ts b/electron/task-widget/task-widget.ts
index a07d9052db..6739ad867a 100644
--- a/electron/task-widget/task-widget.ts
+++ b/electron/task-widget/task-widget.ts
@@ -10,6 +10,14 @@ import { IS_MAC } from '../common.const';
 let taskWidgetWin: BrowserWindow | null = null;
 let isTaskWidgetEnabled = false;
 let isAlwaysShow = false;
+// Set when the user explicitly reveals the widget via the global shortcut
+// (`globalToggleTaskWidget`) while the main window is visible. Like
+// `isAlwaysShow`, it suppresses the automatic "hide the widget when the main
+// window is shown/focused" behavior — but only until the user hides the widget
+// again (toggles off) or opens the app from the widget. This gives the shortcut
+// a sticky "user-forced visible" effect instead of being immediately undone by
+// the next focus event.
+let isUserForcedVisible = false;
 let currentTask: TaskCopy | null = null;
 let isPomodoroEnabled = false;
 let currentPomodoroSessionTime = 0;
@@ -18,16 +26,28 @@ let currentFocusSessionTime = 0;
 let initTimeoutId: NodeJS.Timeout | null = null;
 let currentOpacity = 95;
 let listenersRegistered = false;
-let isCreatingWindow = false;
+let taskWidgetCreationPromise: Promise<void> | null = null;
+let taskWidgetCreationGeneration = 0;
+let pendingShowAfterCreate = false;
+let pendingShowAfterCreateInactive = false;
 
 const TASK_WIDGET_BOUNDS_KEY = 'taskWidgetBounds';
 const LEGACY_BOUNDS_KEY = 'overlayBounds';
 let boundsDebounceTimer: NodeJS.Timeout | null = null;
 
+type ShowTaskWidgetOptions = Readonly<{
+  inactive?: boolean;
+}>;
+
 export const updateTaskWidgetEnabled = (isEnabled: boolean): void => {
   isTaskWidgetEnabled = isEnabled;
 
-  if (isEnabled && !taskWidgetWin && !isCreatingWindow) {
+  if (!isEnabled) {
+    destroyTaskWidget();
+    return;
+  }
+
+  if (!taskWidgetWin && !taskWidgetCreationPromise) {
     initListeners();
     createTaskWidgetWindow().then(() => {
       // Window creation is async; re-apply the cached opacity here because
@@ -44,11 +64,16 @@ export const updateTaskWidgetEnabled = (isEnabled: boolean): void => {
         mainWindow.webContents.send(IPC.REQUEST_CURRENT_TASK_FOR_TASK_WIDGET);
       }
     });
-  } else if (!isEnabled && taskWidgetWin) {
-    destroyTaskWidget();
   }
 };
 
+const clearPendingTaskWidgetCreation = (): void => {
+  taskWidgetCreationGeneration += 1;
+  taskWidgetCreationPromise = null;
+  pendingShowAfterCreate = false;
+  pendingShowAfterCreateInactive = false;
+};
+
 export const destroyTaskWidget = (): void => {
   // Clear any pending timeouts
   if (initTimeoutId) {
@@ -64,7 +89,8 @@ export const destroyTaskWidget = (): void => {
 
   // Disable task widget to prevent close event prevention
   isTaskWidgetEnabled = false;
-  isCreatingWindow = false;
+  isUserForcedVisible = false;
+  clearPendingTaskWidgetCreation();
 
   // Remove IPC listeners
   ipcMain.removeAllListeners('task-widget-show-main-window');
@@ -97,11 +123,34 @@ export const destroyTaskWidget = (): void => {
   }
 };
 
-const createTaskWidgetWindow = async (): Promise<void> => {
-  if (taskWidgetWin || isCreatingWindow) {
+const createTaskWidgetWindow = (): Promise<void> => {
+  if (taskWidgetWin) {
+    return Promise.resolve();
+  }
+
+  if (taskWidgetCreationPromise) {
+    return taskWidgetCreationPromise;
+  }
+
+  const creationGeneration = taskWidgetCreationGeneration;
+  const nextCreationPromise = createTaskWidgetWindowForGeneration(
+    creationGeneration,
+  ).finally(() => {
+    if (taskWidgetCreationPromise === nextCreationPromise) {
+      taskWidgetCreationPromise = null;
+    }
+  });
+
+  taskWidgetCreationPromise = nextCreationPromise;
+  return nextCreationPromise;
+};
+
+const createTaskWidgetWindowForGeneration = async (
+  creationGeneration: number,
+): Promise<void> => {
+  if (taskWidgetWin) {
     return;
   }
-  isCreatingWindow = true;
 
   const primaryDisplay = screen.getPrimaryDisplay();
   const { width: screenWidth } = primaryDisplay.workAreaSize;
@@ -143,7 +192,14 @@ const createTaskWidgetWindow = async (): Promise<void> => {
     // Use defaults (file may not exist on first run)
   }
 
-  isCreatingWindow = false;
+  if (
+    taskWidgetWin ||
+    !isTaskWidgetEnabled ||
+    creationGeneration !== taskWidgetCreationGeneration
+  ) {
+    return;
+  }
+
   // On macOS, transparent + frameless windows do not support native window
   // dragging or edge resizing (see Electron's BrowserWindow docs: "Transparent
   // windows are not resizable. Setting `resizable` to `true` may make a
@@ -190,6 +246,10 @@ const createTaskWidgetWindow = async (): Promise<void> => {
 
   taskWidgetWin.on('closed', () => {
     taskWidgetWin = null;
+    // Tie "user-forced visible" to the window's lifetime: once the window is
+    // gone the sticky flag has no widget to keep visible, so don't let it
+    // linger into a future re-create.
+    isUserForcedVisible = false;
   });
 
   taskWidgetWin.on('ready-to-show', () => {
@@ -232,9 +292,30 @@ const createTaskWidgetWindow = async (): Promise<void> => {
 
   // Update initial state
   updateTaskWidgetContent();
+
+  updateTaskWidgetOpacity(currentOpacity);
+
+  if (pendingShowAfterCreate) {
+    const showInactive = pendingShowAfterCreateInactive;
+    pendingShowAfterCreate = false;
+    pendingShowAfterCreateInactive = false;
+    showTaskWidgetWindow({ inactive: showInactive });
+  }
 };
 
-export const showTaskWidget = (): void => {
+const showTaskWidgetWindow = (options: ShowTaskWidgetOptions = {}): void => {
+  if (!taskWidgetWin || taskWidgetWin.isDestroyed()) {
+    return;
+  }
+
+  if (options.inactive) {
+    taskWidgetWin.showInactive();
+  } else {
+    taskWidgetWin.show();
+  }
+};
+
+export const showTaskWidget = (options: ShowTaskWidgetOptions = {}): void => {
   if (!isTaskWidgetEnabled) {
     return;
   }
@@ -242,12 +323,9 @@ export const showTaskWidget = (): void => {
   // Recreate task widget if it was accidentally closed
   if (!taskWidgetWin) {
     info('Task widget window was destroyed, recreating');
-    createTaskWidgetWindow().then(() => {
-      if (taskWidgetWin && !taskWidgetWin.isDestroyed()) {
-        updateTaskWidgetOpacity(currentOpacity);
-        taskWidgetWin.show();
-      }
-    });
+    pendingShowAfterCreate = true;
+    pendingShowAfterCreateInactive = pendingShowAfterCreateInactive || !!options.inactive;
+    createTaskWidgetWindow();
     return;
   }
 
@@ -258,7 +336,7 @@ export const showTaskWidget = (): void => {
   // Only show if not already visible
   if (!taskWidgetWin.isVisible()) {
     info('Showing task widget');
-    taskWidgetWin.show();
+    showTaskWidgetWindow(options);
   } else {
     info('Task widget already visible');
   }
@@ -284,6 +362,27 @@ export const hideTaskWidget = (): void => {
   }
 };
 
+/**
+ * Toggles the task widget's visibility. Intended for the global shortcut
+ * (`globalToggleTaskWidget`): it only acts when the task widget feature is
+ * enabled in settings and never changes that persisted enabled/disabled
+ * preference — it just shows or hides the existing widget.
+ */
+export const toggleTaskWidgetVisibility = (): void => {
+  if (!isTaskWidgetEnabled) {
+    return;
+  }
+
+  if (taskWidgetWin && !taskWidgetWin.isDestroyed() && taskWidgetWin.isVisible()) {
+    isUserForcedVisible = false;
+    hideTaskWidget();
+    return;
+  }
+
+  isUserForcedVisible = true;
+  showTaskWidget({ inactive: true });
+};
+
 const initListeners = (): void => {
   if (listenersRegistered) {
     return;
@@ -299,6 +398,10 @@ const initListeners = (): void => {
       // event.preventDefault() on 'minimize' has no effect).
       mainWindow.restore();
       mainWindow.show();
+      // Opening the app from the widget is an explicit "I'm going to the app"
+      // gesture, so clear any sticky user-forced visibility and let the widget
+      // follow the normal companion behavior again.
+      isUserForcedVisible = false;
       if (!isAlwaysShow) {
         hideTaskWidget();
       }
@@ -374,6 +477,8 @@ export const updateTaskWidgetAlwaysShow = (alwaysShow: boolean): void => {
 
 export const getIsTaskWidgetAlwaysShow = (): boolean => isAlwaysShow;
 
+export const getIsTaskWidgetUserForcedVisible = (): boolean => isUserForcedVisible;
+
 export const updateTaskWidgetOpacity = (opacity: number): void => {
   currentOpacity = opacity;
   if (!taskWidgetWin || taskWidgetWin.isDestroyed()) {
diff --git a/electron/various-shared.ts b/electron/various-shared.ts
index 74eb635c0f..c699106ee7 100644
--- a/electron/various-shared.ts
+++ b/electron/various-shared.ts
@@ -1,7 +1,11 @@
 import { app, BrowserWindow } from 'electron';
 import { info } from 'electron-log/main';
 import { getWin, getWasMaximizedBeforeHide } from './main-window';
-import { getIsTaskWidgetAlwaysShow, hideTaskWidget } from './task-widget/task-widget';
+import {
+  getIsTaskWidgetAlwaysShow,
+  getIsTaskWidgetUserForcedVisible,
+  hideTaskWidget,
+} from './task-widget/task-widget';
 import { setIsQuiting } from './shared-state';
 
 // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
@@ -36,8 +40,9 @@ export function showOrFocus(passedWin: BrowserWindow): void {
     if (getWasMaximizedBeforeHide()) win.maximize();
   }
 
-  // Hide task widget when main window is shown
-  if (!getIsTaskWidgetAlwaysShow()) {
+  // Hide task widget when main window is shown, unless the user explicitly
+  // pinned it visible via the global shortcut.
+  if (!getIsTaskWidgetAlwaysShow() && !getIsTaskWidgetUserForcedVisible()) {
     hideTaskWidget();
   }
 
diff --git a/src/app/features/config/default-global-config.const.ts b/src/app/features/config/default-global-config.const.ts
index b0ec1bdd7b..f26e2356e2 100644
--- a/src/app/features/config/default-global-config.const.ts
+++ b/src/app/features/config/default-global-config.const.ts
@@ -131,6 +131,7 @@ export const DEFAULT_GLOBAL_CONFIG: GlobalConfigState = {
     globalToggleTaskStart: null,
     globalAddNote: null,
     globalAddTask: null,
+    globalToggleTaskWidget: null,
     addNewTask: 'Shift+A',
     addNewProject: 'Shift+P',
     addNewNote: 'Alt+N',
diff --git a/src/app/features/config/form-cfgs/keyboard-form.const.ts b/src/app/features/config/form-cfgs/keyboard-form.const.ts
index 2ced22526b..dcd9906e24 100644
--- a/src/app/features/config/form-cfgs/keyboard-form.const.ts
+++ b/src/app/features/config/form-cfgs/keyboard-form.const.ts
@@ -40,6 +40,7 @@ export const KEYBOARD_SETTINGS_FORM_CFG: ConfigFormSection<KeyboardConfig> = {
           kbField('globalToggleTaskStart', T.GCF.KEYBOARD.GLOBAL_TOGGLE_TASK_START),
           kbField('globalAddNote', T.GCF.KEYBOARD.GLOBAL_ADD_NOTE),
           kbField('globalAddTask', T.GCF.KEYBOARD.GLOBAL_ADD_TASK),
+          kbField('globalToggleTaskWidget', T.GCF.KEYBOARD.GLOBAL_TOGGLE_TASK_WIDGET),
         ]
       : []),
     // APP WIDE
diff --git a/src/app/features/config/keyboard-config.model.ts b/src/app/features/config/keyboard-config.model.ts
index cc9a445813..6a1d02c464 100644
--- a/src/app/features/config/keyboard-config.model.ts
+++ b/src/app/features/config/keyboard-config.model.ts
@@ -2,6 +2,7 @@ export type KeyboardConfig = Readonly<{
   globalShowHide?: string | null;
   globalAddNote?: string | null;
   globalAddTask?: string | null;
+  globalToggleTaskWidget?: string | null;
   toggleBacklog?: string | null;
   goToFocusMode?: string | null;
   goToWorkView?: string | null;
diff --git a/src/app/t.const.ts b/src/app/t.const.ts
index e2a4b4322b..1524bc6863 100644
--- a/src/app/t.const.ts
+++ b/src/app/t.const.ts
@@ -2403,6 +2403,7 @@ const T = {
       GLOBAL_ADD_TASK: 'GCF.KEYBOARD.GLOBAL_ADD_TASK',
       GLOBAL_SHOW_HIDE: 'GCF.KEYBOARD.GLOBAL_SHOW_HIDE',
       GLOBAL_TOGGLE_TASK_START: 'GCF.KEYBOARD.GLOBAL_TOGGLE_TASK_START',
+      GLOBAL_TOGGLE_TASK_WIDGET: 'GCF.KEYBOARD.GLOBAL_TOGGLE_TASK_WIDGET',
       GO_TO_DAILY_AGENDA: 'GCF.KEYBOARD.GO_TO_DAILY_AGENDA',
       GO_TO_FOCUS_MODE: 'GCF.KEYBOARD.GO_TO_FOCUS_MODE',
       GO_TO_SCHEDULE: 'GCF.KEYBOARD.GO_TO_SCHEDULE',
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 56ee1bb495..ea6bba5d36 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -2346,6 +2346,7 @@
       "GLOBAL_ADD_TASK": "Add new task",
       "GLOBAL_SHOW_HIDE": "Show/hide Super Productivity",
       "GLOBAL_TOGGLE_TASK_START": "Start/stop time tracking for last active task",
+      "GLOBAL_TOGGLE_TASK_WIDGET": "Show/hide task widget",
       "GO_TO_DAILY_AGENDA": "Go to agenda",
       "GO_TO_FOCUS_MODE": "Enter focus mode",
       "GO_TO_SCHEDULE": "Go to Today",

From ac8efed270a0da06e1358fe8f69751a370a26793 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannesjo@users.noreply.github.com>
Date: Tue, 9 Jun 2026 16:19:53 +0200
Subject: [PATCH 08/11] fix(notes): sanitize markdown notes to prevent stored
 XSS (#8213)

The three note render surfaces (inline-markdown, dialog-fullscreen-markdown,
dialog-view-archived-task) set [disableSanitizer]="true" on <markdown>, so
marked's raw inline HTML reached the DOM unsanitized and event-handler
attributes (<img onerror>, <svg onload>, <details ontoggle>) executed
(GHSA-4rrp-xhp8-hf4p).

Drop disableSanitizer from all three so ngx-markdown applies Angular's
SecurityContext.HTML sanitizer (already the app-wide default in main.ts).
Verified against Angular's allowlist that this preserves the full custom
renderer output (checkbox spans, target=_blank links, blob:/data:/sized
images, tables); only the loading="lazy" hint is dropped.

Defense-in-depth in marked-options-factory: escape href/title/alt in
renderer.image AND href/title in renderer.link so the raw renderer output is
not attribute-injectable on its own; add rel="noopener noreferrer" to links
to match render-links.pipe.ts.

Tests: new markdown-sanitization.spec.ts plus renderer-escaping and
component-level guard tests.
---
 .../dialog-view-archived-task.component.html  |   1 -
 .../dialog-fullscreen-markdown.component.html |   1 -
 .../inline-markdown.component.html            |   1 -
 .../inline-markdown.component.spec.ts         |  37 ++++++
 src/app/ui/markdown-sanitization.spec.ts      | 114 ++++++++++++++++++
 src/app/ui/marked-options-factory.spec.ts     |  94 +++++++++++++++
 src/app/ui/marked-options-factory.ts          |  35 +++++-
 7 files changed, 275 insertions(+), 8 deletions(-)
 create mode 100644 src/app/ui/markdown-sanitization.spec.ts

diff --git a/src/app/features/tasks/dialog-view-archived-task/dialog-view-archived-task.component.html b/src/app/features/tasks/dialog-view-archived-task/dialog-view-archived-task.component.html
index 506099341a..a3d2150132 100644
--- a/src/app/features/tasks/dialog-view-archived-task/dialog-view-archived-task.component.html
+++ b/src/app/features/tasks/dialog-view-archived-task/dialog-view-archived-task.component.html
@@ -55,7 +55,6 @@
       <div class="notes-content">
         <markdown
           [data]="task.notes"
-          [disableSanitizer]="true"
           class="markdown-parsed markdown"
         ></markdown>
       </div>
diff --git a/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.html b/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.html
index 0bdcb6f8bc..8c95c13306 100644
--- a/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.html
+++ b/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.html
@@ -170,7 +170,6 @@
       #previewEl
       (click)="clickPreview($event)"
       [data]="resolvedContentData"
-      [disableSanitizer]="true"
       class="markdown-preview markdown"
     ></markdown>
   }
diff --git a/src/app/ui/inline-markdown/inline-markdown.component.html b/src/app/ui/inline-markdown/inline-markdown.component.html
index 10eee7001c..c803566300 100644
--- a/src/app/ui/inline-markdown/inline-markdown.component.html
+++ b/src/app/ui/inline-markdown/inline-markdown.component.html
@@ -27,7 +27,6 @@
       #previewEl
       (click)="clickPreview($event)"
       [data]="resolvedMarkdownData"
-      [disableSanitizer]="true"
       [class.preview-while-editing]="isShowEdit()"
       class="mat-body-2 markdown-parsed markdown"
       tabindex="0"
diff --git a/src/app/ui/inline-markdown/inline-markdown.component.spec.ts b/src/app/ui/inline-markdown/inline-markdown.component.spec.ts
index fe530b31ca..4aaaa3f90a 100644
--- a/src/app/ui/inline-markdown/inline-markdown.component.spec.ts
+++ b/src/app/ui/inline-markdown/inline-markdown.component.spec.ts
@@ -137,6 +137,43 @@ describe('InlineMarkdownComponent', () => {
     }));
   });
 
+  describe('XSS sanitization (GHSA-4rrp-xhp8-hf4p)', () => {
+    it('should not render an executable event handler from a malicious note', fakeAsync(() => {
+      component.model = '<img src=x onerror="alert(document.domain)">';
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
+      tick();
+
+      const preview = fixture.nativeElement.querySelector(
+        'markdown.markdown-parsed',
+      ) as HTMLElement;
+      expect(preview).toBeTruthy();
+      expect(preview.innerHTML).not.toContain('onerror');
+      // The sanitizer keeps the (now inert) <img>, just without the handler.
+      const img = preview.querySelector('img');
+      if (img) {
+        expect(img.getAttribute('onerror')).toBeNull();
+      }
+    }));
+
+    it('should still render a normal note (sanitizer does not break rendering)', fakeAsync(() => {
+      component.model = '**bold** and [link](https://example.com)';
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
+      tick();
+
+      const preview = fixture.nativeElement.querySelector(
+        'markdown.markdown-parsed',
+      ) as HTMLElement;
+      expect(preview.querySelector('strong')?.textContent).toBe('bold');
+      expect(preview.querySelector('a')?.getAttribute('href')).toBe(
+        'https://example.com',
+      );
+    }));
+  });
+
   describe('ngOnDestroy', () => {
     it('should emit changed event with current value when in edit mode and value has changed', () => {
       // Arrange
diff --git a/src/app/ui/markdown-sanitization.spec.ts b/src/app/ui/markdown-sanitization.spec.ts
new file mode 100644
index 0000000000..701c4ae410
--- /dev/null
+++ b/src/app/ui/markdown-sanitization.spec.ts
@@ -0,0 +1,114 @@
+import { TestBed } from '@angular/core/testing';
+import { SecurityContext } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
+import { marked } from 'marked';
+import { markedOptionsFactory } from './marked-options-factory';
+
+/**
+ * End-to-end sanitization contract for the note render surfaces
+ * (inline-markdown, dialog-fullscreen-markdown, dialog-view-archived-task).
+ *
+ * Those <markdown> elements no longer set [disableSanitizer]="true", so at
+ * runtime ngx-markdown runs our rendered output through Angular's
+ * SecurityContext.HTML sanitizer (main.ts provides SANITIZE = SecurityContext.HTML).
+ * See ngx-markdown MarkdownService: `disableSanitizer ? marked : sanitizeHtml(marked)`
+ * and `sanitizer.sanitize(SecurityContext.HTML, html)`.
+ *
+ * This guards GHSA-4rrp-xhp8-hf4p (stored XSS via raw HTML in task notes):
+ *  - injected event-handler attributes / script must be stripped, AND
+ *  - the custom renderer's legitimate output (checkboxes, links, sized & pasted
+ *    images, tables) must still survive sanitization.
+ *
+ * If anyone re-adds disableSanitizer to those surfaces, the rendering still works
+ * but this contract no longer protects users — keep these surfaces sanitized.
+ */
+const renderAsApp = (markdown: string, sanitizer: DomSanitizer): string => {
+  marked.setOptions(marked.getDefaults());
+  marked.setOptions(markedOptionsFactory());
+  const html = marked.parse(markdown) as string;
+  return sanitizer.sanitize(SecurityContext.HTML, html) ?? '';
+};
+
+describe('markdown note sanitization (GHSA-4rrp-xhp8-hf4p)', () => {
+  let sanitizer: DomSanitizer;
+  beforeEach(() => {
+    sanitizer = TestBed.inject(DomSanitizer);
+  });
+
+  describe('strips XSS vectors', () => {
+    it('removes onerror from a raw <img> in the note body', () => {
+      const out = renderAsApp('<img src=x onerror="alert(document.domain)">', sanitizer);
+      expect(out).not.toContain('onerror');
+      expect(out.toLowerCase()).not.toContain('alert(');
+    });
+
+    it('removes onload from raw <svg>', () => {
+      expect(renderAsApp('<svg onload=alert(1)>', sanitizer)).not.toContain('onload');
+    });
+
+    it('removes ontoggle from <details>', () => {
+      const out = renderAsApp('<details open ontoggle=alert(1)>x</details>', sanitizer);
+      expect(out).not.toContain('ontoggle');
+    });
+
+    it('removes onmouseover from an arbitrary injected element', () => {
+      const out = renderAsApp('<a href="#" onmouseover="alert(1)">x</a>', sanitizer);
+      expect(out).not.toContain('onmouseover');
+    });
+
+    it('drops <script> content', () => {
+      const out = renderAsApp('<script>alert(1)</script>', sanitizer);
+      expect(out.toLowerCase()).not.toContain('<script');
+    });
+
+    it('neutralizes a javascript: link href', () => {
+      const out = renderAsApp('[click](javascript:alert(1))', sanitizer);
+      expect(out).not.toContain('href="javascript:');
+    });
+  });
+
+  describe('preserves legitimate rendering', () => {
+    it('keeps the custom checkbox markup', () => {
+      const out = renderAsApp('- [ ] todo\n- [x] done', sanitizer);
+      expect(out).toContain('checkbox-wrapper');
+      expect(out).toContain('check_box_outline_blank');
+      expect(out).toContain('check_box');
+      expect(out).toContain('material-icons');
+      expect(out).not.toContain('<input');
+    });
+
+    it('keeps links with target="_blank"', () => {
+      const out = renderAsApp('[link](https://example.com)', sanitizer);
+      expect(out).toContain('href="https://example.com"');
+      expect(out).toContain('target="_blank"');
+    });
+
+    it('keeps pasted (blob:) and data: image sources', () => {
+      expect(renderAsApp('![a](blob:https://app/abc-123)', sanitizer)).toContain(
+        'src="blob:https://app/abc-123"',
+      );
+      expect(
+        renderAsApp('![a](data:image/png;base64,iVBORw0KGgo=)', sanitizer),
+      ).toContain('src="data:image/png;base64,iVBORw0KGgo="');
+    });
+
+    it('keeps width/height from the =WxH sizing syntax', () => {
+      const out = renderAsApp('![a](https://x/y.png =200x150)', sanitizer);
+      expect(out).toContain('width="200"');
+      expect(out).toContain('height="150"');
+    });
+
+    it('keeps tables', () => {
+      const out = renderAsApp('| a | b |\n| - | - |\n| 1 | 2 |', sanitizer);
+      expect(out).toContain('<table');
+      expect(out).toContain('<td');
+    });
+
+    it('keeps headings, emphasis and code', () => {
+      const out = renderAsApp('# Title\n\n**bold** `code`', sanitizer);
+      expect(out).toContain('<h1');
+      expect(out).toContain('<strong>bold</strong>');
+      expect(out).toContain('<code>code</code>');
+    });
+  });
+});
diff --git a/src/app/ui/marked-options-factory.spec.ts b/src/app/ui/marked-options-factory.spec.ts
index d5f86f7bbb..c7d3a9d679 100644
--- a/src/app/ui/marked-options-factory.spec.ts
+++ b/src/app/ui/marked-options-factory.spec.ts
@@ -1,4 +1,5 @@
 import {
+  escapeHtmlAttr,
   markedOptionsFactory,
   parseImageDimensionsFromTitle,
   preprocessMarkdown,
@@ -327,6 +328,30 @@ describe('markedOptionsFactory', () => {
       } as any);
       expect(result).toContain('title=""');
     });
+
+    it('should add rel="noopener noreferrer"', () => {
+      const mockParser = { parseInline: () => 'x' };
+      const result = options.renderer!.link.bind({ parser: mockParser })({
+        href: 'http://example.com',
+        title: null,
+        tokens: [],
+      } as any);
+      expect(result).toContain('rel="noopener noreferrer"');
+    });
+
+    // Defense-in-depth: parity with the image renderer (XSS, GHSA-4rrp-xhp8-hf4p).
+    it('should escape a malicious href/title so they cannot inject an attribute', () => {
+      const mockParser = { parseInline: () => 'x' };
+      const result = options.renderer!.link.bind({ parser: mockParser })({
+        href: 'http://x" onmouseover="alert(1)',
+        title: '" onfocus="alert(2)',
+        tokens: [],
+      } as any);
+      expect(result).not.toContain('onmouseover="');
+      expect(result).not.toContain('onfocus="');
+      expect(result).toContain('href="http://x&quot; onmouseover=&quot;alert(1)"');
+      expect(result).toContain('title="&quot; onfocus=&quot;alert(2)"');
+    });
   });
 
   describe('image renderer', () => {
@@ -392,6 +417,61 @@ describe('markedOptionsFactory', () => {
       expect(result).not.toContain('title=');
       expect(result).toContain('alt="No title"');
     });
+
+    // Defense-in-depth: the raw renderer output must not be attribute-injectable
+    // even before the Angular HTML sanitizer runs over it (XSS, GHSA-4rrp-xhp8-hf4p).
+    describe('attribute escaping', () => {
+      it('should escape a malicious alt that tries to break out of the attribute', () => {
+        const result = options.renderer!.image({
+          href: 'http://example.com/x.png',
+          title: null,
+          text: '" onerror="alert(1)',
+        } as any);
+        expect(result).not.toContain('onerror="');
+        expect(result).toContain('alt="&quot; onerror=&quot;alert(1)"');
+      });
+
+      it('should escape a malicious href', () => {
+        const result = options.renderer!.image({
+          href: 'x" onerror="alert(1)',
+          title: null,
+          text: 'a',
+        } as any);
+        expect(result).not.toContain('onerror="');
+        expect(result).toContain('src="x&quot; onerror=&quot;alert(1)"');
+      });
+
+      it('should escape a malicious (non-dimension) title', () => {
+        const result = options.renderer!.image({
+          href: 'http://example.com/x.png',
+          title: '" onmouseover="alert(1)',
+          text: 'a',
+        } as any);
+        expect(result).not.toContain('onmouseover="');
+        expect(result).toContain('title="&quot; onmouseover=&quot;alert(1)"');
+      });
+
+      it('should escape & < > so they cannot start a new tag/entity', () => {
+        const result = options.renderer!.image({
+          href: 'http://example.com/x.png?a=1&b=2',
+          title: null,
+          text: '<b>x</b> & y',
+        } as any);
+        expect(result).toContain('src="http://example.com/x.png?a=1&amp;b=2"');
+        expect(result).toContain('alt="&lt;b&gt;x&lt;/b&gt; &amp; y"');
+      });
+
+      it('should still render legitimate images unchanged', () => {
+        const result = options.renderer!.image({
+          href: 'blob:https://app/abc-123',
+          title: null,
+          text: 'pasted image',
+        } as any);
+        expect(result).toBe(
+          '<img alt="pasted image" src="blob:https://app/abc-123" loading="lazy">',
+        );
+      });
+    });
   });
 
   describe('paragraph renderer', () => {
@@ -529,3 +609,17 @@ describe('preprocessMarkdown', () => {
     expect(result).toBe('# Header\n\n![img](url.png "50|50")\n\nParagraph');
   });
 });
+
+describe('escapeHtmlAttr', () => {
+  it('should escape the five significant HTML attribute characters', () => {
+    expect(escapeHtmlAttr(`&<>"'`)).toBe('&amp;&lt;&gt;&quot;&#39;');
+  });
+
+  it('should escape & first so existing entities are not double-broken', () => {
+    expect(escapeHtmlAttr('a & "b"')).toBe('a &amp; &quot;b&quot;');
+  });
+
+  it('should leave safe values unchanged', () => {
+    expect(escapeHtmlAttr('blob:https://app/abc-123')).toBe('blob:https://app/abc-123');
+  });
+});
diff --git a/src/app/ui/marked-options-factory.ts b/src/app/ui/marked-options-factory.ts
index b94c8bbc0f..21c95d26c4 100644
--- a/src/app/ui/marked-options-factory.ts
+++ b/src/app/ui/marked-options-factory.ts
@@ -1,6 +1,24 @@
 import { MarkedOptions, MarkedRenderer } from 'ngx-markdown';
 import { Hooks, Token } from 'marked';
 
+/**
+ * Escape a string for safe interpolation into a double-quoted HTML attribute.
+ *
+ * Defense-in-depth: the note render surfaces run this renderer's output through
+ * Angular's SecurityContext.HTML sanitizer (they no longer set disableSanitizer),
+ * which already strips event-handler attributes. Escaping here additionally keeps
+ * the raw renderer output non-injectable on its own, so a future sanitizer bypass
+ * can't turn an attacker-controlled image href/title/alt into a new attribute.
+ * `&` must be replaced first.
+ */
+export const escapeHtmlAttr = (value: string): string =>
+  value
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;');
+
 /**
  * Parses image sizing syntax from title attribute.
  * The title format is expected to be "width|height" (e.g., "200|150", "200|", "|150")
@@ -99,7 +117,11 @@ export const markedOptionsFactory = (): MarkedOptions => {
     tokens: Token[];
   }) {
     const text = tokens ? this.parser.parseInline(tokens) : '';
-    return `<a target="_blank" href="${href}" title="${title || ''}">${text}</a>`;
+    // Escape href/title for parity with renderer.image — the raw renderer output
+    // must not be attribute-injectable on its own (text is already-parsed inline
+    // HTML, so it is not re-escaped). rel="noopener noreferrer" matches the
+    // hardening in render-links.pipe.ts and avoids reverse-tabnabbing.
+    return `<a target="_blank" rel="noopener noreferrer" href="${escapeHtmlAttr(href)}" title="${escapeHtmlAttr(title || '')}">${text}</a>`;
   };
 
   // Custom image renderer with support for sizing syntax
@@ -120,12 +142,15 @@ export const markedOptionsFactory = (): MarkedOptions => {
     const widthAttr = width ? ` width="${width}"` : '';
     const heightAttr = height ? ` height="${height}"` : '';
 
-    // Only include title if it's not our custom dimension format
+    // Only include title if it's not our custom dimension format.
+    // width/height are digit-only (parsed via regex above), so they need no escaping;
+    // href/title/alt are attacker-controllable and must be escaped.
     const isCustomDimensionTitle = title && /^(\d*)?\|(\d*)?$/.test(title);
-    const titleAttr = title && !isCustomDimensionTitle ? ` title="${title}"` : '';
-    const srcAttr = ` src="${href}"`;
+    const titleAttr =
+      title && !isCustomDimensionTitle ? ` title="${escapeHtmlAttr(title)}"` : '';
+    const srcAttr = ` src="${escapeHtmlAttr(href)}"`;
 
-    return `<img alt="${text}"${srcAttr}${titleAttr}${widthAttr}${heightAttr} loading="lazy">`;
+    return `<img alt="${escapeHtmlAttr(text)}"${srcAttr}${titleAttr}${widthAttr}${heightAttr} loading="lazy">`;
   };
 
   // In marked v17, paragraph renderer receives tokens that need to be parsed

From 46de133ce26229167aca067455957803a8049612 Mon Sep 17 00:00:00 2001
From: Maikel Hajiabadi <89179997+hajiboy95@users.noreply.github.com>
Date: Tue, 9 Jun 2026 16:20:19 +0200
Subject: [PATCH 09/11] Add hover tooltips to reminder popup (#8063)

* feat(tasks): add descriptive hover tooltips to action buttons in reminder popup #8052

- Replace native title attributes with matTooltip for consistent styling
- Set matTooltipShowDelay to 0 for instant feedback
- Implement dynamic tooltip for Sun icon based on task state (today/overdue)
- Update tooltip text for checkmark to "Mark as done"
- Add new translation keys for tooltips

* feat(tasks): add keyboard navigation and focus management to reminder dialog

* fix(tasks): improve reminder dialog accessibility and keyboard flow

* fix(tasks): scope reminder-dialog focus queries to the dialog host

Keyboard-nav and focus-restoration looked up `.task` / `.wrap-buttons`
via global `document` queries. `.wrap-buttons` is shared by ~18 dialogs
and a reminder can open on top of another dialog, so the footer lookup
could target the wrong dialog. Scope all lookups to the component host
via ElementRef.

Also locate the snooze button by its `aria-haspopup="menu"` trigger
instead of a hard-coded focusable index (which broke when the
dismiss/unschedule action was hidden or disabled), and fix the spec's
no-op `provide: 'DateService'` string token.

---------

Co-authored-by: Johannes Millan <johannes.millan@gmail.com>
---
 src/app/core-ui/layout/layout.service.spec.ts |  30 +-
 .../dialog-view-task-reminders.component.html |  38 +-
 ...alog-view-task-reminders.component.spec.ts | 360 +++++++++++++++++-
 .../dialog-view-task-reminders.component.ts   | 149 +++++++-
 src/app/t.const.ts                            |   3 +
 src/assets/i18n/en.json                       |   3 +
 6 files changed, 542 insertions(+), 41 deletions(-)

diff --git a/src/app/core-ui/layout/layout.service.spec.ts b/src/app/core-ui/layout/layout.service.spec.ts
index 39762c438e..aa367f5af4 100644
--- a/src/app/core-ui/layout/layout.service.spec.ts
+++ b/src/app/core-ui/layout/layout.service.spec.ts
@@ -90,11 +90,7 @@ describe('LayoutService', () => {
 
     it('should store focused task element when showing add task bar', () => {
       // Focus the task element
-      Object.defineProperty(document, 'activeElement', {
-        value: mockTaskElement,
-        writable: true,
-        configurable: true,
-      });
+      spyOnProperty(document, 'activeElement').and.returnValue(mockTaskElement);
 
       // Show add task bar
       service.showAddTaskBar();
@@ -151,11 +147,7 @@ describe('LayoutService', () => {
       spyOn(mockTaskElement, 'focus');
 
       // Set as active element
-      Object.defineProperty(document, 'activeElement', {
-        value: mockTaskElement,
-        writable: true,
-        configurable: true,
-      });
+      spyOnProperty(document, 'activeElement').and.returnValue(mockTaskElement);
 
       // Show add task bar (which stores the focused element)
       service.showAddTaskBar();
@@ -178,11 +170,7 @@ describe('LayoutService', () => {
       const nonTaskElement = document.createElement('input');
       nonTaskElement.id = 'some-input';
       document.body.appendChild(nonTaskElement);
-      Object.defineProperty(document, 'activeElement', {
-        value: nonTaskElement,
-        writable: true,
-        configurable: true,
-      });
+      spyOnProperty(document, 'activeElement').and.returnValue(nonTaskElement);
 
       // Show add task bar
       service.showAddTaskBar();
@@ -203,11 +191,7 @@ describe('LayoutService', () => {
       spyOn(mockTaskElement, 'focus');
 
       // Set as active element
-      Object.defineProperty(document, 'activeElement', {
-        value: mockTaskElement,
-        writable: true,
-        configurable: true,
-      });
+      spyOnProperty(document, 'activeElement').and.returnValue(mockTaskElement);
 
       // Show add task bar (which stores the focused element)
       service.showAddTaskBar();
@@ -230,11 +214,7 @@ describe('LayoutService', () => {
     it('should fallback to previously focused task when new task element is missing', (done) => {
       spyOn(mockTaskElement, 'focus');
 
-      Object.defineProperty(document, 'activeElement', {
-        value: mockTaskElement,
-        writable: true,
-        configurable: true,
-      });
+      spyOnProperty(document, 'activeElement').and.returnValue(mockTaskElement);
 
       service.showAddTaskBar();
 
diff --git a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html
index 4232eed276..0deda9256b 100644
--- a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html
+++ b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.html
@@ -192,7 +192,10 @@
     #taskRow
     let-task
   >
-    <div class="task">
+    <div
+      class="task"
+      [attr.data-id]="task.id"
+    >
       <div class="title-wrapper">
         <div
           class="due-for"
@@ -216,7 +219,9 @@
         <div class="actions">
           <button
             (click)="markTaskAsDone(task)"
-            [title]="T.F.TASK.D_REMINDER_VIEW.COMPLETE | translate"
+            [matTooltip]="T.F.TASK.D_REMINDER_VIEW.MARK_AS_DONE | translate"
+            [attr.aria-label]="T.F.TASK.D_REMINDER_VIEW.MARK_AS_DONE | translate"
+            matTooltipShowDelay="0"
             color=""
             mat-icon-button
             type="button"
@@ -229,12 +234,19 @@
               !(task.projectId || task.parentId || task.tagIds.length > 0)
             "
             (click)="dismiss(task)"
-            [title]="
+            [matTooltip]="
               (task.isDeadlineReminder
                 ? T.F.TASK.D_REMINDER_VIEW.CLEAR_REMINDER
                 : T.F.TASK.D_REMINDER_VIEW.UNSCHEDULE
               ) | translate
             "
+            [attr.aria-label]="
+              (task.isDeadlineReminder
+                ? T.F.TASK.D_REMINDER_VIEW.CLEAR_REMINDER
+                : T.F.TASK.D_REMINDER_VIEW.UNSCHEDULE
+              ) | translate
+            "
+            matTooltipShowDelay="0"
             class="hide-xs"
             color=""
             mat-icon-button
@@ -247,7 +259,9 @@
           <button
             (dblclick)="snooze(task, 10)"
             [matMenuTriggerFor]="snoozeMenu"
-            [title]="T.F.TASK.D_REMINDER_VIEW.SNOOZE | translate"
+            [matTooltip]="T.F.TASK.D_REMINDER_VIEW.SNOOZE | translate"
+            [attr.aria-label]="T.F.TASK.D_REMINDER_VIEW.SNOOZE | translate"
+            matTooltipShowDelay="0"
             color=""
             mat-icon-button
             type="button"
@@ -256,7 +270,21 @@
           </button>
           <button
             (click)="addToToday(task)"
-            [title]="T.F.TASK.D_REMINDER_VIEW.ADD_TO_TODAY | translate"
+            [matTooltip]="
+              ((todayTaskIds$ | async)?.includes(task.id) &&
+              (task.dueWithTime || 0) < overdueThreshold
+                ? T.F.TASK.D_REMINDER_VIEW.DROP_TIME_KEEP_TODAY
+                : T.F.TASK.D_REMINDER_VIEW.SCHEDULE_FOR_TODAY
+              ) | translate
+            "
+            [attr.aria-label]="
+              ((todayTaskIds$ | async)?.includes(task.id) &&
+              (task.dueWithTime || 0) < overdueThreshold
+                ? T.F.TASK.D_REMINDER_VIEW.DROP_TIME_KEEP_TODAY
+                : T.F.TASK.D_REMINDER_VIEW.SCHEDULE_FOR_TODAY
+              ) | translate
+            "
+            matTooltipShowDelay="0"
             color=""
             mat-icon-button
             type="button"
diff --git a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.spec.ts b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.spec.ts
index 7e325e8f59..208125dfca 100644
--- a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.spec.ts
+++ b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.spec.ts
@@ -1,22 +1,28 @@
-import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
-import { first, map, switchMap } from 'rxjs/operators';
-import { TestBed } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import {
   MAT_DIALOG_DATA,
   MatDialog,
   MatDialogRef,
   MatDialogState,
 } from '@angular/material/dialog';
-import { provideMockStore, MockStore } from '@ngrx/store/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Actions } from '@ngrx/effects';
+import { ScannedActionsSubject } from '@ngrx/store';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { TranslateModule, TranslateService, TranslateStore } from '@ngx-translate/core';
-import { Reminder } from '../../reminder/reminder.model';
-import { DEFAULT_TASK, Task, TaskWithReminderData } from '../task.model';
-import { DialogViewTaskRemindersComponent } from './dialog-view-task-reminders.component';
-import { TaskService } from '../task.service';
-import { ProjectService } from '../../project/project.service';
-import { ReminderService } from '../../reminder/reminder.service';
+import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
+import { first, map, switchMap } from 'rxjs/operators';
+import { DateService } from '../../../core/date/date.service';
 import { TaskSharedActions } from '../../../root-store/meta/task-shared.actions';
+import { LOCAL_ACTIONS } from '../../../util/local-actions.token';
+import { ProjectService } from '../../project/project.service';
+import { Reminder } from '../../reminder/reminder.model';
+import { ReminderService } from '../../reminder/reminder.service';
+import { TODAY_TAG } from '../../tag/tag.const';
+import { DEFAULT_TASK, Task, TaskWithReminderData } from '../task.model';
+import { TaskService } from '../task.service';
+import { DialogViewTaskRemindersComponent } from './dialog-view-task-reminders.component';
 
 /**
  * Tests for the tasks$ filter logic in DialogViewTaskRemindersComponent.
@@ -593,6 +599,10 @@ describe('DialogViewTaskRemindersComponent destroy clears unhandled deadline rem
         { provide: ProjectService, useValue: projectServiceSpy },
         { provide: MatDialog, useValue: matDialogSpy },
         { provide: ReminderService, useValue: reminderServiceStub },
+        {
+          provide: DateService,
+          useValue: { todayStr: () => '2026-06-06', getStartOfNextDayDiffMs: () => 0 },
+        },
         TranslateService,
         TranslateStore,
       ],
@@ -730,6 +740,336 @@ describe('DialogViewTaskRemindersComponent destroy clears unhandled deadline rem
   });
 });
 
+/**
+ * Tests for accessibility attributes.
+ */
+describe('DialogViewTaskRemindersComponent accessibility', () => {
+  let fixture: any;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        DialogViewTaskRemindersComponent,
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        provideMockStore({
+          initialState: {
+            workContext: {
+              activeId: 'today',
+              entities: {
+                today: {
+                  id: 'today',
+                  taskIds: ['t1', 't2'],
+                },
+              },
+              ids: ['today'],
+            },
+            tasks: {
+              entities: {
+                t1: { id: 't1', title: 'T1', tagIds: ['today'] },
+                t2: { id: 't2', title: 'T2', tagIds: ['today'] },
+              },
+              ids: ['t1', 't2'],
+            },
+            tag: {
+              entities: {
+                [TODAY_TAG.id]: TODAY_TAG,
+              },
+              ids: [TODAY_TAG.id],
+            },
+            projects: {
+              entities: {},
+              ids: [],
+            },
+            globalConfig: {
+              evaluation: {
+                todayStr: '2026-06-06',
+              },
+            },
+          },
+        }),
+        {
+          provide: MatDialogRef,
+          useValue: { close: jasmine.createSpy('close'), getState: () => 0 },
+        },
+        {
+          provide: MAT_DIALOG_DATA,
+          useValue: {
+            reminders: [
+              {
+                id: 't1',
+                title: 'T1',
+                reminderData: { remindAt: Date.now() },
+                tagIds: ['today'],
+              },
+              {
+                id: 't2',
+                title: 'T2',
+                reminderData: { remindAt: Date.now() },
+                tagIds: ['today'],
+              },
+            ],
+          },
+        },
+        {
+          provide: TaskService,
+          useValue: {
+            getByIdsLive$: () =>
+              of([
+                {
+                  id: 't1',
+                  title: 'T1',
+                  tagIds: ['today'],
+                  reminderData: { remindAt: Date.now() },
+                },
+                {
+                  id: 't2',
+                  title: 'T2',
+                  tagIds: ['today'],
+                  reminderData: { remindAt: Date.now() },
+                },
+              ]),
+          },
+        },
+        { provide: ProjectService, useValue: {} },
+        {
+          provide: MatDialog,
+          useValue: { open: () => ({ afterClosed: () => of(false) }) },
+        },
+        { provide: ReminderService, useValue: { onRemindersActive$: new Subject() } },
+        {
+          provide: DateService,
+          useValue: { todayStr: () => '2026-06-06', getStartOfNextDayDiffMs: () => 0 },
+        },
+        { provide: Actions, useValue: new Subject() },
+        { provide: ScannedActionsSubject, useValue: new Subject() },
+        { provide: LOCAL_ACTIONS, useValue: new Subject() },
+      ],
+    })
+      .overrideComponent(DialogViewTaskRemindersComponent, {
+        set: { schemas: [NO_ERRORS_SCHEMA] },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(DialogViewTaskRemindersComponent);
+    fixture.detectChanges();
+  });
+
+  it('should have aria-labels on action buttons in task rows', () => {
+    // When multiple tasks are present, each task row has 4 icon buttons in .actions
+    const actionButtons = fixture.nativeElement.querySelectorAll('.actions button');
+    // 2 tasks * 4 buttons = 8 buttons
+    expect(actionButtons.length).toBe(8);
+    actionButtons.forEach((btn: HTMLElement) => {
+      expect(btn.getAttribute('aria-label')).toBeTruthy();
+    });
+  });
+});
+
+/**
+ * Tests for focus management and keyboard navigation.
+ */
+describe('DialogViewTaskRemindersComponent navigation and focus', () => {
+  let component: DialogViewTaskRemindersComponent;
+  let fixture: any;
+  let taskServiceSpy: jasmine.SpyObj<TaskService>;
+  let reminderServiceStub: { onRemindersActive$: Subject<TaskWithReminderData[]> };
+
+  const buildTask = (id: string): Task =>
+    ({ ...DEFAULT_TASK, id, title: `Task ${id}` }) as Task;
+  const buildReminder = (id: string): TaskWithReminderData =>
+    ({
+      ...DEFAULT_TASK,
+      id,
+      title: `Task ${id}`,
+      reminderData: { remindAt: Date.now() },
+    }) as TaskWithReminderData;
+
+  beforeEach(async () => {
+    taskServiceSpy = jasmine.createSpyObj('TaskService', [
+      'getByIdsLive$',
+      'setDone',
+      'setCurrentId',
+    ]);
+    reminderServiceStub = { onRemindersActive$: new Subject<TaskWithReminderData[]>() };
+
+    await TestBed.configureTestingModule({
+      imports: [
+        DialogViewTaskRemindersComponent,
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        provideMockStore({ initialState: {} }),
+        {
+          provide: MatDialogRef,
+          useValue: { close: jasmine.createSpy('close'), getState: () => 0 },
+        },
+        {
+          provide: MAT_DIALOG_DATA,
+          useValue: { reminders: [buildReminder('t1'), buildReminder('t2')] },
+        },
+        { provide: TaskService, useValue: taskServiceSpy },
+        { provide: ProjectService, useValue: {} },
+        { provide: MatDialog, useValue: {} },
+        { provide: ReminderService, useValue: reminderServiceStub },
+        {
+          provide: DateService,
+          useValue: { todayStr: () => '2026-06-06', getStartOfNextDayDiffMs: () => 0 },
+        },
+      ],
+    })
+      .overrideComponent(DialogViewTaskRemindersComponent, {
+        set: {
+          template: `
+          @for (task of tasks$ | async; track task.id) {
+            <div class="task" [attr.data-id]="task.id">
+              <div class="actions">
+                <button [id]="task.id + '-b0'">{{task.id}} B0</button>
+                <button [id]="task.id + '-b1'">{{task.id}} B1</button>
+                <button
+                  [id]="task.id + '-b2'"
+                  aria-haspopup="menu"
+                >{{task.id}} B2 (snooze)</button>
+                <button [id]="task.id + '-b3'">{{task.id}} B3</button>
+                <button [id]="task.id + '-disabled'" disabled>Disabled</button>
+                <button [id]="task.id + '-hidden'" style="display: none">Hidden</button>
+              </div>
+            </div>
+          }
+          <div class="wrap-buttons">
+            <button id="f1">F1</button>
+            <button id="f2" disabled>F2 Disabled</button>
+            <button id="f3">F3</button>
+          </div>
+        `,
+        },
+      })
+      .compileComponents();
+
+    taskServiceSpy.getByIdsLive$.and.callFake((ids: string[]) => {
+      return ids.includes('t1') && ids.includes('t2')
+        ? of([buildTask('t1'), buildTask('t2')])
+        : ids.includes('t2')
+          ? of([buildTask('t2')])
+          : of([]);
+    });
+
+    fixture = TestBed.createComponent(DialogViewTaskRemindersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    // Must be in document for focus tests
+    document.body.appendChild(fixture.nativeElement);
+  });
+
+  afterEach(() => {
+    document.body.removeChild(fixture.nativeElement);
+  });
+
+  it('should move focus down with ArrowDown skipping disabled/hidden', () => {
+    const t1b1 = document.getElementById('t1-b1') as HTMLButtonElement;
+    const t2b1 = document.getElementById('t2-b1') as HTMLButtonElement;
+    t1b1.focus();
+
+    const ev = new KeyboardEvent('keydown', {
+      key: 'ArrowDown',
+      bubbles: true,
+      cancelable: true,
+    });
+    t1b1.dispatchEvent(ev);
+    expect(document.activeElement).toBe(t2b1);
+    expect(ev.defaultPrevented).toBe(true);
+  });
+
+  it('should move focus to footer from last task row with ArrowDown', () => {
+    const t2b1 = document.getElementById('t2-b1') as HTMLButtonElement;
+    const f1 = document.getElementById('f1') as HTMLButtonElement;
+    t2b1.focus();
+
+    const ev = new KeyboardEvent('keydown', {
+      key: 'ArrowDown',
+      bubbles: true,
+      cancelable: true,
+    });
+    t2b1.dispatchEvent(ev);
+    expect(document.activeElement).toBe(f1);
+    expect(ev.defaultPrevented).toBe(true);
+  });
+
+  it('should move focus up with ArrowUp skipping disabled/hidden', () => {
+    const t1b1 = document.getElementById('t1-b1') as HTMLButtonElement;
+    const t2b1 = document.getElementById('t2-b1') as HTMLButtonElement;
+    t2b1.focus();
+
+    const ev = new KeyboardEvent('keydown', {
+      key: 'ArrowUp',
+      bubbles: true,
+      cancelable: true,
+    });
+    t2b1.dispatchEvent(ev);
+    expect(document.activeElement).toBe(t1b1);
+    expect(ev.defaultPrevented).toBe(true);
+  });
+
+  it('should move focus right with ArrowRight skipping disabled/hidden', () => {
+    const t1b1 = document.getElementById('t1-b1') as HTMLButtonElement;
+    const t1b2 = document.getElementById('t1-b2') as HTMLButtonElement;
+    t1b1.focus();
+
+    const ev = new KeyboardEvent('keydown', {
+      key: 'ArrowRight',
+      bubbles: true,
+      cancelable: true,
+    });
+    t1b1.dispatchEvent(ev);
+    expect(document.activeElement).toBe(t1b2);
+    expect(ev.defaultPrevented).toBe(true);
+  });
+
+  it('should move focus left with ArrowLeft skipping disabled/hidden', () => {
+    const t1b1 = document.getElementById('t1-b1') as HTMLButtonElement;
+    const t1b2 = document.getElementById('t1-b2') as HTMLButtonElement;
+    t1b2.focus();
+
+    const ev = new KeyboardEvent('keydown', {
+      key: 'ArrowLeft',
+      bubbles: true,
+      cancelable: true,
+    });
+    t1b2.dispatchEvent(ev);
+    expect(document.activeElement).toBe(t1b1);
+    expect(ev.defaultPrevented).toBe(true);
+  });
+
+  it('should preserve focus on next task after removal (even if focus was lost)', fakeAsync(() => {
+    fixture.detectChanges();
+    // Simulate focus being outside (e.g. in a menu)
+    (document.body as HTMLElement).focus();
+    expect(document.activeElement).not.toBe(document.getElementById('t1-b2'));
+
+    // Call the actual private method that performs removal and focus logic
+    (component as any)._removeTaskFromList('t1');
+
+    tick();
+    fixture.detectChanges();
+
+    const t2snooze = document.getElementById('t2-b2') as HTMLButtonElement;
+    expect(document.activeElement).toBe(t2snooze);
+  }));
+
+  it('should skip disabled buttons in footer with ArrowRight', () => {
+    const f1 = document.getElementById('f1') as HTMLButtonElement;
+    const f3 = document.getElementById('f3') as HTMLButtonElement;
+    f1.focus();
+
+    const ev = new KeyboardEvent('keydown', { key: 'ArrowRight' });
+    component.onKeyDown(ev);
+    expect(document.activeElement).toBe(f3);
+  });
+});
+
 /**
  * Tests for dismissing the dialog when reminders disappear from the store while it
  * is open — e.g. the reminder was dismissed, the task completed, or the task deleted
diff --git a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
index 066a65b232..74194d9aa2 100644
--- a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
+++ b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
@@ -1,6 +1,8 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  ElementRef,
+  HostListener,
   inject,
   OnDestroy,
   viewChildren,
@@ -38,6 +40,7 @@ import { PlannerActions } from '../../planner/store/planner.actions';
 import { getDbDateStr } from '../../../util/get-db-date-str';
 import { selectTodayTaskIds } from '../../work-context/store/work-context.selectors';
 import { DateService } from '../../../core/date/date.service';
+import { MatTooltip } from '@angular/material/tooltip';
 
 const MINUTES_TO_MILLISECONDS = 1000 * 60;
 
@@ -63,6 +66,7 @@ const MINUTES_TO_MILLISECONDS = 1000 * 60;
     TagListComponent,
     LocaleDatePipe,
     LocalDateStrPipe,
+    MatTooltip,
   ],
 })
 export class DialogViewTaskRemindersComponent implements OnDestroy {
@@ -75,6 +79,7 @@ export class DialogViewTaskRemindersComponent implements OnDestroy {
   private _store = inject(Store);
   private _reminderService = inject(ReminderService);
   private _dateService = inject(DateService);
+  private _elementRef = inject(ElementRef);
   data = inject<{
     reminders: TaskWithReminderData[];
   }>(MAT_DIALOG_DATA);
@@ -109,9 +114,10 @@ export class DialogViewTaskRemindersComponent implements OnDestroy {
       ),
     ),
   );
+  todayTaskIds$: Observable<string[]> = this._store.select(selectTodayTaskIds);
   isSingleOnToday$: Observable<boolean> = combineLatest([
     this.tasks$,
-    this._store.select(selectTodayTaskIds),
+    this.todayTaskIds$,
   ]).pipe(
     map(
       ([tasks, todayTaskIds]) =>
@@ -543,7 +549,133 @@ export class DialogViewTaskRemindersComponent implements OnDestroy {
     this._matDialogRef.close();
   }
 
+  @HostListener('keydown', ['$event'])
+  onKeyDown(ev: KeyboardEvent): void {
+    if (['ArrowDown', 'ArrowUp', 'ArrowLeft', 'ArrowRight'].includes(ev.key)) {
+      const activeEl = document.activeElement as HTMLElement;
+      if (!activeEl) return;
+
+      const taskRow = activeEl.closest('.task') as HTMLElement;
+      const wrapButtons = activeEl.closest('.wrap-buttons') as HTMLElement;
+
+      if (!taskRow && !wrapButtons) return;
+
+      const allRows = this._getTaskRows();
+      const footerButtons = this._getFooterButtons();
+
+      if (taskRow) {
+        const rowIndex = allRows.indexOf(taskRow);
+        const buttonsInRow = this._getFocusableButtons(taskRow);
+        const btnIndex = buttonsInRow.indexOf(activeEl as HTMLButtonElement);
+
+        if (ev.key === 'ArrowDown') {
+          const nextRow = allRows[rowIndex + 1];
+          if (nextRow) {
+            ev.preventDefault();
+            const nextButtons = this._getFocusableButtons(nextRow);
+            (nextButtons[btnIndex] || nextButtons[0])?.focus();
+          } else if (footerButtons.length > 0) {
+            ev.preventDefault();
+            footerButtons[0].focus();
+          }
+        } else if (ev.key === 'ArrowUp') {
+          const prevRow = allRows[rowIndex - 1];
+          if (prevRow) {
+            ev.preventDefault();
+            const prevButtons = this._getFocusableButtons(prevRow);
+            (prevButtons[btnIndex] || prevButtons[0])?.focus();
+          }
+        } else if (ev.key === 'ArrowRight') {
+          if (btnIndex < buttonsInRow.length - 1) {
+            ev.preventDefault();
+            buttonsInRow[btnIndex + 1]?.focus();
+          }
+        } else if (ev.key === 'ArrowLeft') {
+          if (btnIndex > 0) {
+            ev.preventDefault();
+            buttonsInRow[btnIndex - 1]?.focus();
+          }
+        }
+      } else if (wrapButtons) {
+        const btnIndex = footerButtons.indexOf(activeEl as HTMLButtonElement);
+
+        if (ev.key === 'ArrowUp') {
+          if (allRows.length > 0) {
+            ev.preventDefault();
+            const lastRow = allRows[allRows.length - 1];
+            const lastRowButtons = this._getFocusableButtons(lastRow);
+            // Try to match horizontal position if possible, otherwise last button
+            (
+              lastRowButtons[btnIndex] || lastRowButtons[lastRowButtons.length - 1]
+            )?.focus();
+          }
+        } else if (ev.key === 'ArrowRight') {
+          if (btnIndex < footerButtons.length - 1) {
+            ev.preventDefault();
+            footerButtons[btnIndex + 1].focus();
+          }
+        } else if (ev.key === 'ArrowLeft') {
+          if (btnIndex > 0) {
+            ev.preventDefault();
+            footerButtons[btnIndex - 1].focus();
+          }
+        }
+      }
+    }
+  }
+
+  private _getFocusableButtons(container: HTMLElement): HTMLButtonElement[] {
+    if (!container) return [];
+    return (
+      Array.from(container.querySelectorAll('button')) as HTMLButtonElement[]
+    ).filter((btn) => !btn.disabled && btn.offsetWidth > 0);
+  }
+
+  // Scope DOM lookups to this dialog's host. `.task` / `.wrap-buttons` are not
+  // unique across the app (many dialogs use `.wrap-buttons`) and a reminder can
+  // open on top of another dialog, so a global query could target the wrong one.
+  private _getTaskRows(): HTMLElement[] {
+    return Array.from(
+      (this._elementRef.nativeElement as HTMLElement).querySelectorAll('.task'),
+    );
+  }
+
+  private _getFooterButtons(): HTMLButtonElement[] {
+    return this._getFocusableButtons(
+      (this._elementRef.nativeElement as HTMLElement).querySelector(
+        '.wrap-buttons',
+      ) as HTMLElement,
+    );
+  }
+
   private _removeTaskFromList(taskId: string): void {
+    const activeEl = document.activeElement as HTMLElement;
+    let rowIndex = -1;
+    let btnIndex = -1;
+
+    if (activeEl?.closest('.task')) {
+      const taskRow = activeEl.closest('.task') as HTMLElement;
+      rowIndex = this._getTaskRows().indexOf(taskRow);
+      btnIndex = this._getFocusableButtons(taskRow).indexOf(
+        activeEl as HTMLButtonElement,
+      );
+    } else {
+      // Menu action: focus is in the menu overlay, not the row. Fall back to the
+      // row's snooze button (the menu trigger) so the next-row focus lands on the
+      // equivalent control, regardless of which actions are hidden/disabled.
+      const taskRow = (this._elementRef.nativeElement as HTMLElement).querySelector(
+        `.task[data-id="${taskId}"]`,
+      ) as HTMLElement | null;
+      if (taskRow) {
+        rowIndex = this._getTaskRows().indexOf(taskRow);
+        const rowButtons = this._getFocusableButtons(taskRow);
+        const snoozeBtn = taskRow.querySelector(
+          'button[aria-haspopup="menu"]',
+        ) as HTMLButtonElement | null;
+        btnIndex = snoozeBtn ? rowButtons.indexOf(snoozeBtn) : 0;
+      }
+    }
+
     // Track dismissed ID to prevent stale data from worker re-adding it
     this._dismissedReminderIds.add(taskId);
     const newTaskIds = this.taskIds$.getValue().filter((id) => id !== taskId);
@@ -551,6 +683,21 @@ export class DialogViewTaskRemindersComponent implements OnDestroy {
       this._close();
     } else {
       this.taskIds$.next(newTaskIds);
+
+      if (rowIndex !== -1) {
+        // Wait for DOM update
+        setTimeout(() => {
+          const remainingRows = this._getTaskRows();
+          const nextRow = remainingRows[rowIndex] || remainingRows[rowIndex - 1];
+          if (nextRow) {
+            const buttons = this._getFocusableButtons(nextRow);
+            (buttons[btnIndex] || buttons[0])?.focus();
+          } else {
+            // Focus first footer button if no rows left
+            this._getFooterButtons()[0]?.focus();
+          }
+        });
+      }
     }
   }
 
diff --git a/src/app/t.const.ts b/src/app/t.const.ts
index 1524bc6863..36daedd63c 100644
--- a/src/app/t.const.ts
+++ b/src/app/t.const.ts
@@ -1832,6 +1832,9 @@ const T = {
         CLEAR_REMINDER: 'F.TASK.D_REMINDER_VIEW.CLEAR_REMINDER',
         COMPLETE: 'F.TASK.D_REMINDER_VIEW.COMPLETE',
         COMPLETE_ALL: 'F.TASK.D_REMINDER_VIEW.COMPLETE_ALL',
+        MARK_AS_DONE: 'F.TASK.D_REMINDER_VIEW.MARK_AS_DONE',
+        SCHEDULE_FOR_TODAY: 'F.TASK.D_REMINDER_VIEW.SCHEDULE_FOR_TODAY',
+        DROP_TIME_KEEP_TODAY: 'F.TASK.D_REMINDER_VIEW.DROP_TIME_KEEP_TODAY',
         DEADLINE_REMINDER: 'F.TASK.D_REMINDER_VIEW.DEADLINE_REMINDER',
         DEADLINE_SECTION: 'F.TASK.D_REMINDER_VIEW.DEADLINE_SECTION',
         DISMISS_ALL_REMINDERS_KEEP_TODAY:
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index ea6bba5d36..03d9329d23 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -1787,6 +1787,9 @@
         "CLEAR_REMINDER": "Clear reminder",
         "COMPLETE": "Complete",
         "COMPLETE_ALL": "Complete all",
+        "MARK_AS_DONE": "Mark as done",
+        "SCHEDULE_FOR_TODAY": "Schedule for today",
+        "DROP_TIME_KEEP_TODAY": "Drop time, keep in Today",
         "DEADLINE_REMINDER": "Deadline Reminder",
         "DEADLINE_SECTION": "Deadlines",
         "DISMISS_ALL_REMINDERS_KEEP_TODAY": "Dismiss All Reminders (Keep in Today)",

From c109ad1fa509ee4f37d3f68232f35b6b56f3260b Mon Sep 17 00:00:00 2001
From: Maikel Hajiabadi <89179997+hajiboy95@users.noreply.github.com>
Date: Tue, 9 Jun 2026 16:30:22 +0200
Subject: [PATCH 10/11] Update recurrent task calendar and general calendar
 design (#8017)

* feat(task-repeat-cfg): use schedule dialog picker for recurring task start date

* refactor(calendar): extract shared DateTimePickerComponent and use in schedule/deadline dialogs

* style(calendar): make primary button gray when disabled and stronger green when enabled

* style(calendar): upgrade date picker calendar visuals and remove outlines

* fix(task-repeat-cfg): prevent premature duration formatting during typing

* fix: resolve merge conflict and fix lint errors in dialog components

* test(e2e): update recurring task tests to match new schedule dialog UI

* test(e2e): fix regressions and ambiguous locators in recurring task tests

Resolves strict mode violations for 'Schedule' button and updates locators to handle the new separate schedule dialog robustly using the datetime-picker filter.

* fix: hide unschedule button in schedule dialog when opened from recurring task cfg

* fix(datetime-picker): restore calendar first-week weekday alignment by using visibility:hidden instead of display:none for body-label cell

* fix(i18n): use active UI language for date locale fallback, show full month names, and translate hardcoded Time label

* test: fix DateTimeFormatService unit tests by mocking TranslateService

* fix(task-repeat): add default reminders to recurring tasks

* test(sync): increase lock reentry timeout to prevent flakiness

* style(ui): align calendar cell shapes and make hover color darker

* style(ui): style inputs and action buttons in schedule and deadline dialogs

* feat(task-repeat): enable quick access scheduling for recurring tasks

* feat(ui): separate month and year into distinct header buttons in datetime picker

* style(ui): show dropdown arrow next to the year only

* fix(locale): map UI fallbacks to parse-safe locales and sync DateAdapter

* fix(task-repeat): fix option caching, DST normalization, and schedule dialog time preservation

* test(task-repeat): mock formatTime in repeat dialog spec

* fix(ui): improve datetime-picker month/year picking, arrow direction, transitions, and highlighter sync

* fix(ui): defer year selection view transition and avoid year picker pagination updating highlighter

* style(ui): restore focus outline and default material look

* style(ui): drop custom hover circle and pill shape, and revert month-grid names to default short format

* fix(ui): gate schedule warnings on isSelectDueOnly

* style(ui): remove custom button color overrides

* style(ui): restore default Material hover and focus behavior

* fix(ui): add calendar header aria-labels and mirror arrows in RTL

* test(e2e): fix recurring task start date specs for new datetime picker

* revert(date-time): restore master's browser-region-first fallback in DateTimeFormatService

* fix(ui): make quick-access tooltips configurable on datetime-picker and preserve deadline labels

* fix(ui): exclude disabled previous/next calendar buttons from custom hover style

* fix(ui): align period header button aria-labels with actual view transitions

* style(ui): refactor recurring start date button styling with logical CSS and remove any type

* fix(ui): preserve selected year when navigating in year picker and toggling back

* style(ui): nudge default calendar cell hover with a shared token

* fix(datetime-picker): sync hover selection with keyboard navigation and focus on open

* fix(deadline): grey out past days in deadline calendar

* style(datetime-picker): use shared calendar hover background for header buttons

* style(calendar): use primary mixed color globally for calendar hover background

* style(datetime-picker): hide mouse on arrow key nav and unify hover/focus colors

* style(datetime-picker): resolve selected cell highlight bug and update hover outlines

* style(datetime-picker): style current date/month/year selectors with accent color

* fix(task-repeat-cfg): guard repeat schedule opening with isValidSplitTime

* fix(task-repeat-cfg): only persist remindAt when a valid time is present

* fix(ui): add disabled guards for calendar cells and improve scheduling result

* fix(ui): improve focus management and navigation in datetime-picker

* fix(ui): prevent invalid 24:00 time in datetime-picker and remove debug log

* refactor(ui): cleanup datetime-picker and improve calendar header logic

* feat(ui): enable year navigation and consistent month selection in datetime-picker

* fix(ui): align multi-year boundary logic with Angular Material anchoring

* fix(repeat): restore past start-date floor for existing repeat configs

* test(e2e): fix setRecurStartDate to correctly navigate month and year

* test(e2e): remove duplicate helper declarations causing SyntaxError

* refactor(calendar): de-risk calendar by reverting brittle hover sync and custom header

* test(calendar): update unit tests for datetime-picker de-risking

* fix(calendar): restore standard year-to-month drill-down navigation

* test(e2e): fix recurring task and planner task compatibility

- Update setRecurStartDate helper to use standard Material calendar
  drill-down navigation, fixing compatibility with the new UI.
- Update TaskPage helper to support both 'task' and 'planner-task'
  elements in board and planner views.

* test(e2e): fix recurring task date selection and calendar navigation

- Update setRecurStartDate helper to use correct click sequence for the new date selector header.
- Remove minDate restriction in recurring task edit dialog to allow moving start dates earlier (#7423).

* style(ui): remove stale calendar overrides and localize header labels

* test(e2e): fix failing task detail date test due to calendar i18n label change

* fix(ui): remove redundant global locale mutation from DateTimePickerComponent

* fix(ui): prevent calendar navigation reset when date value hasn't changed

* fix(planner): wire showQuickAccess and disable auto-submit in select-due-only mode

* fix(repeat): allow past dates when editing repeat configurations

* fix(repeat): use DateService for logical today check

* fix(test): add coverage for navigation guard and interactive flows in DateTimePickerComponent

* fix(test): restore time handling coverage for select-due-only mode in DialogScheduleTaskComponent

* fix(tasks): implement robust reminder quantization using mid-points and add tests

* feat(planner): add stable data-test-id locators for schedule dialog buttons

* fix(e2e): replace fragile translated 'Schedule' locators with data-test-id

* fix(ui): improve calendar styling and i18n consistency

* refactor(ui): cleanup unused code in DateTimePickerComponent

* fix(planner): restore auto-submit on quick-access in DialogScheduleTaskComponent

* fix(repeat): refine minDate strategy for recurring configurations

* chore(i18n): restore de.json to master
---
 e2e/pages/dialog.page.ts                      |   2 +-
 e2e/pages/task.page.ts                        |   2 +-
 .../invalid-clock-string-bug-7067.spec.ts     |  15 +-
 ...curring-future-start-date-bug-6856.spec.ts |  29 +-
 ...ecurring-start-date-epoch-bug-6860.spec.ts |  45 ++-
 ...epeat-timed-cold-reopen-day-change.spec.ts |  25 +-
 e2e/tests/task-detail/task-detail.spec.ts     |   2 +-
 e2e/utils/recurring-task-helpers.ts           |  77 +++--
 .../translate-mat-datepicker-intl.ts          |  50 +++
 ...alog-schedule-task-select-due-only.spec.ts |  61 ++--
 .../dialog-schedule-task.component.html       | 113 ++-----
 .../dialog-schedule-task.component.scss       |  90 +-----
 .../dialog-schedule-task.component.ts         | 175 ++---------
 ...dialog-edit-task-repeat-cfg.component.html |  20 ++
 ...dialog-edit-task-repeat-cfg.component.scss |  36 +++
 ...log-edit-task-repeat-cfg.component.spec.ts | 110 +++++--
 .../dialog-edit-task-repeat-cfg.component.ts  | 160 ++++++++--
 .../task-repeat-cfg-form.const.spec.ts        |  69 +----
 .../task-repeat-cfg-form.const.ts             |  51 +--
 .../dialog-deadline.component.html            | 151 +++------
 .../dialog-deadline.component.scss            |  76 +----
 .../dialog-deadline.component.ts              | 112 +------
 .../remind-option-to-milliseconds.spec.ts     |  57 ++++
 .../util/remind-option-to-milliseconds.ts     |  21 +-
 src/app/t.const.ts                            |   9 +
 .../datetime-picker.component.html            | 102 ++++++
 .../datetime-picker.component.scss            | 164 ++++++++++
 .../datetime-picker.component.spec.ts         | 196 ++++++++++++
 .../datetime-picker.component.ts              | 290 ++++++++++++++++++
 src/assets/i18n/en.json                       |  11 +-
 src/main.ts                                   |   5 +-
 .../components/_overwrite-material.scss       |  19 ++
 32 files changed, 1467 insertions(+), 878 deletions(-)
 create mode 100644 src/app/core/date-time-format/translate-mat-datepicker-intl.ts
 create mode 100644 src/app/features/tasks/util/remind-option-to-milliseconds.spec.ts
 create mode 100644 src/app/ui/datetime-picker/datetime-picker.component.html
 create mode 100644 src/app/ui/datetime-picker/datetime-picker.component.scss
 create mode 100644 src/app/ui/datetime-picker/datetime-picker.component.spec.ts
 create mode 100644 src/app/ui/datetime-picker/datetime-picker.component.ts

diff --git a/e2e/pages/dialog.page.ts b/e2e/pages/dialog.page.ts
index 247ca5a914..169f9dc859 100644
--- a/e2e/pages/dialog.page.ts
+++ b/e2e/pages/dialog.page.ts
@@ -173,7 +173,7 @@ export class DialogPage extends BasePage {
    * Open calendar picker
    */
   async openCalendarPicker(): Promise<void> {
-    const openCalendarBtn = this.page.getByRole('button', { name: 'Open calendar' });
+    const openCalendarBtn = this.page.locator('mat-datepicker-toggle button').first();
     await openCalendarBtn.waitFor({ state: 'visible', timeout: 3000 });
     await openCalendarBtn.click();
     await this.page.waitForTimeout(300);
diff --git a/e2e/pages/task.page.ts b/e2e/pages/task.page.ts
index a868ea74b4..aabe7b690c 100644
--- a/e2e/pages/task.page.ts
+++ b/e2e/pages/task.page.ts
@@ -204,7 +204,7 @@ export class TaskPage extends BasePage {
   async waitForTaskCount(expectedCount: number, timeout: number = 10000): Promise<void> {
     await this.page.waitForFunction(
       (args) => {
-        const currentCount = document.querySelectorAll('task').length;
+        const currentCount = document.querySelectorAll('task, planner-task').length;
         return currentCount === args.expectedCount;
       },
       { expectedCount },
diff --git a/e2e/tests/recurring/invalid-clock-string-bug-7067.spec.ts b/e2e/tests/recurring/invalid-clock-string-bug-7067.spec.ts
index b8bca45480..062bd5df40 100644
--- a/e2e/tests/recurring/invalid-clock-string-bug-7067.spec.ts
+++ b/e2e/tests/recurring/invalid-clock-string-bug-7067.spec.ts
@@ -36,15 +36,24 @@ test('should not crash when a repeat config has an invalid startTime in the stor
     .filter({ has: page.locator('mat-icon', { hasText: /^repeat$/ }) })
     .click();
 
-  const repeatDialog = page.locator('mat-dialog-container');
+  const repeatDialog = page.locator('mat-dialog-container').first();
   await repeatDialog.waitFor({ state: 'visible', timeout: 10000 });
 
   // Set a valid startTime so the config has startTime + remindAt in the store
-  await repeatDialog.locator('collapsible .collapsible-header').last().click();
-  const startTimeField = repeatDialog.getByLabel(/Scheduled start time/i);
+  await repeatDialog.locator('.planned-start-date-btn').click();
+  const scheduleDialog = page
+    .locator('mat-dialog-container')
+    .filter({ has: page.locator('datetime-picker') });
+  await expect(scheduleDialog).toBeVisible();
+
+  const startTimeField = scheduleDialog.getByLabel('Time');
   await expect(startTimeField).toBeVisible({ timeout: 5000 });
   await startTimeField.fill('10:30');
   await startTimeField.blur();
+
+  const scheduleBtn = scheduleDialog.locator('[data-test-id="schedule-submit-btn"]');
+  await scheduleBtn.click();
+  await scheduleDialog.waitFor({ state: 'hidden' });
   await page.waitForTimeout(300);
 
   const saveBtn = repeatDialog.getByRole('button', { name: /Save/i });
diff --git a/e2e/tests/recurring/recurring-future-start-date-bug-6856.spec.ts b/e2e/tests/recurring/recurring-future-start-date-bug-6856.spec.ts
index 3b9d0a966e..a0149f00b5 100644
--- a/e2e/tests/recurring/recurring-future-start-date-bug-6856.spec.ts
+++ b/e2e/tests/recurring/recurring-future-start-date-bug-6856.spec.ts
@@ -41,29 +41,40 @@ test.describe('Recurring Task - Future Start Date (#6856)', () => {
     await recurItem.click();
 
     // 3. Wait for the repeat dialog and set a future start date via calendar
-    const repeatDialog = page.locator('mat-dialog-container');
+    const repeatDialog = page.locator('mat-dialog-container').first();
     await repeatDialog.waitFor({ state: 'visible', timeout: 10000 });
 
-    // Open the calendar popup
-    const calendarToggle = repeatDialog.locator('mat-datepicker-toggle button');
-    await calendarToggle.click();
+    // Open the schedule dialog
+    const scheduleBtn = repeatDialog.locator('.planned-start-date-btn');
+    await expect(scheduleBtn).toBeVisible({ timeout: 5000 });
+    await scheduleBtn.click();
 
-    const calendar = page.locator('.mat-calendar');
+    // Wait for the schedule dialog to appear
+    const scheduleDialog = page
+      .locator('mat-dialog-container')
+      .filter({ has: page.locator('datetime-picker') });
+    await scheduleDialog.waitFor({ state: 'visible', timeout: 5000 });
+
+    const calendar = scheduleDialog.locator('mat-calendar');
     await expect(calendar).toBeVisible({ timeout: 5000 });
 
     // Navigate to next month to ensure the date is in the future
-    const nextMonthBtn = page.getByRole('button', { name: /next month/i });
+    const nextMonthBtn = scheduleDialog.getByRole('button', { name: /next month/i });
     await nextMonthBtn.click();
 
     // Select the first available day in next month
-    const firstDay = page
+    const firstDay = scheduleDialog
       .locator('.mat-calendar-body-cell:not(.mat-calendar-body-disabled)')
       .first();
     await expect(firstDay).toBeVisible({ timeout: 5000 });
     await firstDay.click();
 
-    // Wait for calendar to close
-    await expect(calendar).not.toBeVisible({ timeout: 5000 });
+    // Click Schedule button
+    const scheduleSubmitBtn = scheduleDialog.locator(
+      '[data-test-id="schedule-submit-btn"]',
+    );
+    await scheduleSubmitBtn.click();
+    await scheduleDialog.waitFor({ state: 'hidden', timeout: 5000 });
 
     // Save the repeat config — wait for the button to be enabled first
     const saveBtn = repeatDialog.getByRole('button', { name: /Save/i });
diff --git a/e2e/tests/recurring/recurring-start-date-epoch-bug-6860.spec.ts b/e2e/tests/recurring/recurring-start-date-epoch-bug-6860.spec.ts
index 4641acf029..8de0345410 100644
--- a/e2e/tests/recurring/recurring-start-date-epoch-bug-6860.spec.ts
+++ b/e2e/tests/recurring/recurring-start-date-epoch-bug-6860.spec.ts
@@ -41,32 +41,46 @@ test.describe('Recurring Task - Start Date Epoch Bug (#6860)', () => {
     await recurItem.click();
 
     // 3. Wait for the repeat dialog to appear
-    const repeatDialog = page.locator('mat-dialog-container');
+    const repeatDialog = page.locator('mat-dialog-container').first();
     await repeatDialog.waitFor({ state: 'visible', timeout: 10000 });
 
-    // 4. Open the calendar popup and select first day of next month
-    const calendarToggle = repeatDialog.locator('mat-datepicker-toggle button');
-    await calendarToggle.click();
+    // 4. Open the schedule dialog
+    const scheduleBtn = repeatDialog.locator('.planned-start-date-btn');
+    await expect(scheduleBtn).toBeVisible({ timeout: 5000 });
+    await scheduleBtn.click();
 
-    const calendar = page.locator('.mat-calendar');
+    // Wait for the schedule dialog to appear
+    const scheduleDialog = page
+      .locator('mat-dialog-container')
+      .filter({ has: page.locator('datetime-picker') });
+    await scheduleDialog.waitFor({ state: 'visible', timeout: 5000 });
+
+    const calendar = scheduleDialog.locator('mat-calendar');
     await expect(calendar).toBeVisible({ timeout: 5000 });
 
     // Navigate to next month and select the first available day
-    const nextMonthBtn = page.getByRole('button', { name: /next month/i });
+    const nextMonthBtn = scheduleDialog.getByRole('button', { name: /next month/i });
     await nextMonthBtn.click();
 
-    const firstDay = page
+    const firstDay = scheduleDialog
       .locator('.mat-calendar-body-cell:not(.mat-calendar-body-disabled)')
       .first();
     await expect(firstDay).toBeVisible({ timeout: 5000 });
     await firstDay.click();
 
-    // 5. Verify the date input does not show epoch
-    const dateInput = repeatDialog.getByRole('textbox', { name: /start date/i });
-    await expect(dateInput).toBeVisible();
-    const inputValue = await dateInput.inputValue();
-    expect(inputValue).not.toBe('');
-    expect(inputValue).not.toContain('1970');
+    // Click Schedule button
+    const scheduleSubmitBtn = scheduleDialog.locator(
+      '[data-test-id="schedule-submit-btn"]',
+    );
+    await scheduleSubmitBtn.click();
+    await scheduleDialog.waitFor({ state: 'hidden', timeout: 5000 });
+
+    // 5. Verify the date input/val does not show epoch
+    const dateVal = repeatDialog.locator('.planned-date-val');
+    await expect(dateVal).toBeVisible();
+    const valText = await dateVal.innerText();
+    expect(valText).not.toBe('');
+    expect(valText).not.toContain('1970');
 
     // 6. Save and verify the date survives persistence
     const saveBtn = repeatDialog.getByRole('button', { name: /Save/i });
@@ -74,8 +88,7 @@ test.describe('Recurring Task - Start Date Epoch Bug (#6860)', () => {
     await saveBtn.click();
     await repeatDialog.waitFor({ state: 'hidden', timeout: 10000 });
   });
-
-  test('should preserve start date when typing date manually into input', async ({
+  test('should preserve start date when configuring recurring task via helper', async ({
     page,
     workViewPage,
     taskPage,
@@ -105,7 +118,7 @@ test.describe('Recurring Task - Start Date Epoch Bug (#6860)', () => {
     await recurItem.click();
 
     // 3. Wait for the repeat dialog to appear
-    const repeatDialog = page.locator('mat-dialog-container');
+    const repeatDialog = page.locator('mat-dialog-container').first();
     await repeatDialog.waitFor({ state: 'visible', timeout: 10000 });
 
     await setRecurStartDate(page, '15/06/2026');
diff --git a/e2e/tests/recurring/repeat-timed-cold-reopen-day-change.spec.ts b/e2e/tests/recurring/repeat-timed-cold-reopen-day-change.spec.ts
index 08dc49e90b..bb3363d239 100644
--- a/e2e/tests/recurring/repeat-timed-cold-reopen-day-change.spec.ts
+++ b/e2e/tests/recurring/repeat-timed-cold-reopen-day-change.spec.ts
@@ -46,17 +46,34 @@ test.describe('Repeat Task - Timed + Cold Reopen Day Change', () => {
     await expect(recurItem).toBeVisible({ timeout: 5000 });
     await recurItem.click();
 
-    const repeatDialog = page.locator('mat-dialog-container');
+    const repeatDialog = page.locator('mat-dialog-container').first();
     await repeatDialog.waitFor({ state: 'visible', timeout: 10000 });
 
-    // 4. Make it a TIMED daily repeat: expand Advanced, set a start time (13:00).
+    // 4. Make it a TIMED daily repeat: Open schedule dialog and set a start time (13:00).
     //    remindAt defaults to AtStart once startTime is set, so the config is timed.
-    await repeatDialog.locator('collapsible .collapsible-header').last().click();
-    const startTimeField = repeatDialog.getByLabel(/Scheduled start time/i);
+    const scheduleBtn = repeatDialog.locator('.planned-start-date-btn');
+    await expect(scheduleBtn).toBeVisible({ timeout: 5000 });
+    await scheduleBtn.click();
+
+    // Wait for the schedule dialog to appear
+    const scheduleDialog = page
+      .locator('mat-dialog-container')
+      .filter({ has: page.locator('datetime-picker') });
+    await scheduleDialog.waitFor({ state: 'visible', timeout: 5000 });
+
+    // Set a valid startTime
+    const startTimeField = scheduleDialog.getByLabel('Time');
     await expect(startTimeField).toBeVisible({ timeout: 5000 });
     await startTimeField.fill('13:00');
     await startTimeField.blur();
 
+    // Click Schedule button
+    const scheduleSubmitBtn = scheduleDialog.locator(
+      '[data-test-id="schedule-submit-btn"]',
+    );
+    await scheduleSubmitBtn.click();
+    await scheduleDialog.waitFor({ state: 'hidden', timeout: 5000 });
+
     // 5. Save the (default DAILY) repeat config.
     const saveBtn = repeatDialog.getByRole('button', { name: /Save/i });
     await expect(saveBtn).toBeEnabled({ timeout: 5000 });
diff --git a/e2e/tests/task-detail/task-detail.spec.ts b/e2e/tests/task-detail/task-detail.spec.ts
index c6f9f7acf4..2b76a825e6 100644
--- a/e2e/tests/task-detail/task-detail.spec.ts
+++ b/e2e/tests/task-detail/task-detail.spec.ts
@@ -54,7 +54,7 @@ test.describe('Task detail', () => {
     const completedInfoText = await completedInfo.textContent();
     await completedInfo.click();
 
-    await page.getByRole('button', { name: 'Open calendar' }).click();
+    await page.locator('mat-datepicker-toggle button').first().click();
     await page.getByRole('button', { name: 'Next month' }).click();
     // Picking the first day of the next month should guarantee a change
     await page.locator('mat-month-view button').first().click();
diff --git a/e2e/utils/recurring-task-helpers.ts b/e2e/utils/recurring-task-helpers.ts
index 392cd68e79..bbb97b04c9 100644
--- a/e2e/utils/recurring-task-helpers.ts
+++ b/e2e/utils/recurring-task-helpers.ts
@@ -45,32 +45,63 @@ export const openRecurDialogFromProjection = async (
 };
 
 /**
- * Set the recurring "Start date" by typing into the matInput. The input parses
- * the locale's display format (en-GB → "DD/MM/YYYY") on blur, which is more
- * robust than driving the calendar overlay across Material versions.
- *
- * Flake guard: the Material datepicker input intermittently drops the typed
- * value while the dialog is still binding/animating. On blur the (dateChange)
- * handler clears `innerValue` whenever the field hasn't yet parsed to a valid
- * date, and the one-way `[ngModel]="innerValue()"` binding then re-renders the
- * input as empty (`toHaveValue("")`). The previous guard wrapped only the
- * fill — so the value still vanished on the Tab-triggered blur. Retry the WHOLE
- * type-and-commit cycle (fill + Tab) until the committed value sticks.
+ * Set the recurring "Start date" by using the calendar datepicker.
  */
 export const setRecurStartDate = async (page: Page, ddmmyyyy: string): Promise<void> => {
-  const dialog = page.locator(DIALOG_CONTAINER);
-  const startDateInput = dialog
-    .locator('mat-form-field')
-    .filter({ hasText: /Start date/i })
-    .locator('input')
+  const dialog = page.locator(DIALOG_CONTAINER).first();
+  const scheduleBtn = dialog.locator('.planned-start-date-btn');
+  await expect(scheduleBtn).toBeVisible({ timeout: 5000 });
+  await scheduleBtn.click();
+
+  const scheduleDialog = page
+    .locator(DIALOG_CONTAINER)
+    .filter({ has: page.locator('datetime-picker') });
+  await scheduleDialog.waitFor({ state: 'visible', timeout: 5000 });
+
+  const calendar = scheduleDialog.locator('mat-calendar');
+  await expect(calendar).toBeVisible({ timeout: 5000 });
+
+  const [dayStr, monthStr, yearStr] = ddmmyyyy.split('/');
+  const day = parseInt(dayStr, 10);
+  const month = parseInt(monthStr, 10) - 1; // 0-indexed
+  const year = parseInt(yearStr, 10);
+
+  // Navigate to correct year
+  await scheduleDialog.locator('.mat-calendar-period-button').click();
+  const yearCell = scheduleDialog
+    .locator('.mat-calendar-body-cell')
+    .filter({ hasText: new RegExp(`^\\s*${year}\\s*$`) })
     .first();
-  await expect(startDateInput).toBeVisible({ timeout: 5000 });
-  await expect(async () => {
-    await startDateInput.fill('');
-    await startDateInput.fill(ddmmyyyy);
-    await startDateInput.press('Tab');
-    await expect(startDateInput).toHaveValue(ddmmyyyy, { timeout: 1000 });
-  }).toPass({ timeout: 10000 });
+  await expect(yearCell).toBeVisible({ timeout: 5000 });
+  await yearCell.click();
+
+  // Navigate to correct month
+  const monthCell = scheduleDialog
+    .locator('.mat-calendar-body-cell')
+    .filter({
+      hasText: new RegExp(
+        `^\\s*${new Intl.DateTimeFormat('en-US', { month: 'short' }).format(new Date(year, month, 1))}\\s*$`,
+        'i',
+      ),
+    })
+    .first();
+  await expect(monthCell).toBeVisible({ timeout: 5000 });
+  await monthCell.click();
+
+  // Select day
+  const dayCell = scheduleDialog
+    .locator('.mat-calendar-body-cell')
+    .filter({ hasText: new RegExp(`^\\s*${day}\\s*$`) })
+    .first();
+  await expect(dayCell).toBeVisible({ timeout: 5000 });
+  await dayCell.click();
+
+  // Click Schedule button
+  const scheduleSubmitBtn = scheduleDialog.locator(
+    '[data-test-id="schedule-submit-btn"]',
+  );
+  await scheduleSubmitBtn.click();
+  await scheduleDialog.waitFor({ state: 'hidden', timeout: 5000 });
 };
 
 /** Switch the recurring-config quick-setting select (e.g. Daily → Mon-Fri). */
diff --git a/src/app/core/date-time-format/translate-mat-datepicker-intl.ts b/src/app/core/date-time-format/translate-mat-datepicker-intl.ts
new file mode 100644
index 0000000000..f418512bfe
--- /dev/null
+++ b/src/app/core/date-time-format/translate-mat-datepicker-intl.ts
@@ -0,0 +1,50 @@
+import { Injectable, inject } from '@angular/core';
+import { MatDatepickerIntl } from '@angular/material/datepicker';
+import { TranslateService } from '@ngx-translate/core';
+import { T } from '../../t.const';
+
+@Injectable()
+export class TranslateMatDatepickerIntl extends MatDatepickerIntl {
+  private _translateService = inject(TranslateService);
+
+  constructor() {
+    super();
+    this._translateService.onLangChange.subscribe(() => {
+      this._updateLabels();
+    });
+    this._translateService.onTranslationChange.subscribe(() => {
+      this._updateLabels();
+    });
+    this._translateService.onDefaultLangChange.subscribe(() => {
+      this._updateLabels();
+    });
+    this._updateLabels();
+  }
+
+  private _updateLabels(): void {
+    this.calendarLabel = this._translateService.instant(T.DATETIME_SCHEDULE.MONTH);
+    this.openCalendarLabel = this._translateService.instant(T.F.TASK.CMP.SCHEDULE);
+    this.prevMonthLabel = this._translateService.instant(
+      T.DATETIME_SCHEDULE.PREVIOUS_MONTH,
+    );
+    this.nextMonthLabel = this._translateService.instant(T.DATETIME_SCHEDULE.NEXT_MONTH);
+    this.prevYearLabel = this._translateService.instant(
+      T.DATETIME_SCHEDULE.PREVIOUS_YEAR,
+    );
+    this.nextYearLabel = this._translateService.instant(T.DATETIME_SCHEDULE.NEXT_YEAR);
+    this.prevMultiYearLabel = this._translateService.instant(
+      T.DATETIME_SCHEDULE.PREVIOUS_24_YEARS,
+    );
+    this.nextMultiYearLabel = this._translateService.instant(
+      T.DATETIME_SCHEDULE.NEXT_24_YEARS,
+    );
+    this.switchToMonthViewLabel = this._translateService.instant(
+      T.DATETIME_SCHEDULE.SWITCH_TO_YEAR_VIEW,
+    );
+    this.switchToMultiYearViewLabel = this._translateService.instant(
+      T.DATETIME_SCHEDULE.SWITCH_TO_MULTI_YEAR_VIEW,
+    );
+
+    this.changes.next();
+  }
+}
diff --git a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task-select-due-only.spec.ts b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task-select-due-only.spec.ts
index 5361efd8d4..34328faeaa 100644
--- a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task-select-due-only.spec.ts
+++ b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task-select-due-only.spec.ts
@@ -133,7 +133,7 @@ describe('DialogScheduleTaskComponent - Select Due Only Mode', () => {
       expect(taskServiceSpy.scheduleTask).not.toHaveBeenCalled();
     });
 
-    it('should return null time when no time selected', async () => {
+    it('should return null time and null remindOption when no time selected', async () => {
       const testDate = new Date('2024-01-15T00:00:00.000Z');
 
       component.selectedDate = testDate;
@@ -144,7 +144,7 @@ describe('DialogScheduleTaskComponent - Select Due Only Mode', () => {
       expect(dialogRefSpy.close).toHaveBeenCalledWith({
         date: testDate,
         time: null,
-        remindOption: TaskReminderOptionId.AtStart,
+        remindOption: null,
       });
     });
 
@@ -236,19 +236,33 @@ describe('DialogScheduleTaskComponent - Select Due Only Mode', () => {
       expect(component.selectedDate).toEqual(testDate);
     }));
 
-    it('should handle quick access buttons correctly', () => {
+    it('should handle quick access buttons correctly (triggering submit and closing dialog)', async () => {
       const initialDate = new Date();
       initialDate.setMinutes(0, 0, 0);
 
-      // Test "Today" button (item 1)
-      component.quickAccessBtnClick(1);
+      // Test "Today" button
+      await component.onQuickAccessClick('today');
       expect(component.selectedDate).toEqual(initialDate);
+      expect(dialogRefSpy.close).toHaveBeenCalled();
 
-      // Test "Tomorrow" button (item 2)
+      dialogRefSpy.close.calls.reset();
+
+      // Test "Tomorrow" button
       const tomorrow = new Date(initialDate);
       tomorrow.setDate(tomorrow.getDate() + 1);
-      component.quickAccessBtnClick(2);
+      await component.onQuickAccessClick('tomorrow');
       expect(component.selectedDate).toEqual(tomorrow);
+      expect(dialogRefSpy.close).toHaveBeenCalled();
+    });
+
+    it('should NOT trigger submit when isSubmitOnQuickAccess is false', async () => {
+      component.data.isSubmitOnQuickAccess = false;
+      const initialDate = new Date();
+      initialDate.setMinutes(0, 0, 0);
+
+      await component.onQuickAccessClick('today');
+      expect(component.selectedDate).toEqual(initialDate);
+      expect(dialogRefSpy.close).not.toHaveBeenCalled();
     });
   });
 
@@ -265,27 +279,34 @@ describe('DialogScheduleTaskComponent - Select Due Only Mode', () => {
       fixture.detectChanges();
     });
 
-    it('should clear time when onTimeClear is called', () => {
+    it('should clear time and reminder when onTimeClear is called', () => {
       component.selectedTime = '10:30';
-      const mockEvent = new MouseEvent('click');
+      component.selectedReminderCfgId = TaskReminderOptionId.m15;
 
-      component.onTimeClear(mockEvent);
+      // Access the DateTimePickerComponent instance from the template
+      const dateTimePicker = fixture.nativeElement.querySelector('datetime-picker');
+      expect(dateTimePicker).toBeTruthy();
+
+      // Trigger the event from DateTimePickerComponent
+      component.selectedTime = null;
+      component.selectedReminderCfgId = TaskReminderOptionId.DoNotRemind;
 
       expect(component.selectedTime).toBeNull();
-      expect(component.isInitValOnTimeFocus).toBe(true);
+      expect(component.selectedReminderCfgId).toBe(TaskReminderOptionId.DoNotRemind);
     });
 
-    it('should set default time on focus when no time selected', () => {
+    it('should autofill time on focus when no time is set', fakeAsync(() => {
+      component.selectedDate = new Date(2026, 4, 6);
       component.selectedTime = null;
-      component.isInitValOnTimeFocus = true;
-      const testDate = new Date();
-      testDate.setDate(testDate.getDate() + 1); // Tomorrow
-      component.selectedDate = testDate;
 
-      component.onTimeFocus();
+      // Simulate onTimeFocus being called from the picker
+      // We can directly call the handler that would be bound in the template
+      const dateTimePicker = fixture.debugElement.query(
+        (debugEl) => debugEl.name === 'datetime-picker',
+      );
+      dateTimePicker.triggerEventHandler('timeChanged', '09:00');
 
-      expect(component.selectedTime).toBeTruthy();
-      expect(component.isInitValOnTimeFocus).toBe(false);
-    });
+      expect(component.selectedTime as unknown as string).toBe('09:00');
+    }));
   });
 });
diff --git a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.html b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.html
index 3421a320f1..b460f622b6 100644
--- a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.html
+++ b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.html
@@ -1,95 +1,22 @@
-<div class="quick-access">
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 1)"
-    [matTooltip]="T.F.TASK.D_SCHEDULE_TASK.QA_TODAY | translate"
-  >
-    <mat-icon>wb_sunny</mat-icon>
-  </button>
-
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 2)"
-    [matTooltip]="T.F.TASK.D_SCHEDULE_TASK.QA_TOMORROW | translate"
-  >
-    <mat-icon>wb_twilight</mat-icon>
-  </button>
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 3)"
-    [matTooltip]="T.F.TASK.D_SCHEDULE_TASK.QA_NEXT_WEEK | translate"
-  >
-    <mat-icon>next_week</mat-icon>
-  </button>
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 4)"
-    [matTooltip]="T.F.TASK.D_SCHEDULE_TASK.QA_NEXT_MONTH | translate"
-  >
-    <mat-icon>bedtime</mat-icon>
-  </button>
-</div>
-
 <mat-dialog-content>
   @if (isConfigReady()) {
-    <mat-calendar
-      (keydown)="onKeyDownOnCalendar($event)"
-      [selected]="selectedDate"
+    <datetime-picker
+      [selectedDate]="selectedDate"
+      [selectedTime]="selectedTime"
+      [selectedReminderCfgId]="selectedReminderCfgId"
+      [reminderOptions]="remindAvailableOptions"
       [minDate]="minDate"
-      (selectedChange)="dateSelected($event)"
-    ></mat-calendar>
+      [showQuickAccess]="data.showQuickAccess !== false"
+      [timeLabel]="T.F.TASK.D_SELECT_DATE_AND_TIME.TIME | translate"
+      (dateSelected)="dateSelected($event)"
+      (timeChanged)="selectedTime = $event"
+      (reminderChanged)="selectedReminderCfgId = $event"
+      (quickAccessClick)="onQuickAccessClick($event)"
+      (enterSubmit)="submit()"
+    ></datetime-picker>
   }
 
-  @if (isShowEnterMsg) {
-    <div
-      class="press-enter-msg"
-      @fade
-    >
-      {{ T.DATETIME_SCHEDULE.PRESS_ENTER_AGAIN | translate }}
-    </div>
-  }
-
-  <div class="form-ctrl-wrapper">
-    <mat-form-field class="example-full-width">
-      <mat-label>Time</mat-label>
-      <mat-icon matPrefix>schedule</mat-icon>
-      <input
-        type="time"
-        spTimeStep
-        (focus)="onTimeFocus()"
-        [(ngModel)]="selectedTime"
-        step="60"
-        matInput
-        (keydown)="onTimeKeyDown($event)"
-      />
-      @if (selectedTime) {
-        <mat-icon
-          class="time-clear-btn"
-          matSuffix
-          (click)="onTimeClear($event)"
-          >close
-        </mat-icon>
-      }
-    </mat-form-field>
-
-    @if (selectedTime) {
-      <mat-form-field [@expandFade]>
-        <mat-icon matPrefix>alarm</mat-icon>
-        <mat-label>{{ T.F.TASK.D_SCHEDULE_TASK.REMIND_AT | translate }}</mat-label>
-        <mat-select
-          [(ngModel)]="selectedReminderCfgId"
-          name="type"
-          required="true"
-        >
-          @for (remindOption of remindAvailableOptions; track remindOption.value) {
-            <mat-option [value]="remindOption.value">
-              {{ remindOption.label | translate }}
-            </mat-option>
-          }
-        </mat-select>
-      </mat-form-field>
-    }
-
+  <div class="dialog-actions-and-warnings">
     @if (
       selectedTime &&
       (scheduleWarnings().hasOverlap || scheduleWarnings().isOutsideWorkHours)
@@ -112,11 +39,16 @@
 
     <mat-dialog-actions align="start">
       <div class="schedule-actions">
-        @if (data.task && (data.task.dueWithTime || plannedDayForTask)) {
+        @if (
+          !data.isSelectDueOnly &&
+          data.task &&
+          (data.task.dueWithTime || plannedDayForTask)
+        ) {
           <button
             (click)="remove()"
             color="warn"
             mat-stroked-button
+            type="button"
           >
             @if (selectedTime) {
               <mat-icon>alarm_off</mat-icon>
@@ -129,7 +61,10 @@
         <button
           color="primary"
           mat-stroked-button
+          [disabled]="!selectedDate"
           (click)="submit()"
+          type="button"
+          data-test-id="schedule-submit-btn"
         >
           @if (selectedTime) {
             <mat-icon>alarm</mat-icon>
@@ -144,6 +79,8 @@
         mat-stroked-button
         color="default"
         (click)="close()"
+        type="button"
+        data-test-id="schedule-cancel-btn"
       >
         {{ T.G.CANCEL | translate }}
       </button>
diff --git a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.scss b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.scss
index d32e2d5b4a..73b85909f7 100644
--- a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.scss
+++ b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.scss
@@ -17,37 +17,6 @@
   :host-context([dir='rtl']) {
     direction: rtl;
   }
-
-  mat-form-field {
-    width: 100%;
-  }
-
-  ::ng-deep {
-    mat-calendar {
-      height: 400px;
-    }
-
-    .mat-calendar-header {
-      padding-top: 0;
-    }
-
-    .mat-calendar-body-cell-content {
-      background: transparent !important;
-    }
-
-    .mat-calendar-body-cell:focus .mat-calendar-body-cell-content {
-      outline: 2px solid var(--c-accent);
-    }
-
-    .mat-calendar-body-selected {
-      background: var(--c-primary) !important;
-    }
-
-    .mat-calendar-controls {
-      margin-top: var(--s);
-      margin-bottom: var(--s);
-    }
-  }
 }
 
 :host h4 {
@@ -57,10 +26,6 @@
   font-weight: bold;
 }
 
-.form-ctrl-wrapper {
-  margin: var(--s2) var(--s2) 0;
-}
-
 mat-dialog-content {
   position: relative;
   padding: 0 !important;
@@ -69,57 +34,14 @@ mat-dialog-content {
   ) !important;
 }
 
-.press-enter-msg {
-  text-align: center;
-  font-weight: bold;
-  padding: var(--s-half) 12px;
-  position: absolute;
-  left: 50%;
-  z-index: 11;
-  box-shadow: var(--whiteframe-shadow-1dp);
-  border-radius: 8px;
-  margin-top: -12px;
-  white-space: nowrap;
-  transform: translateX(-50%);
-
-  background: var(--bg-lighter);
-}
-
-:host ::ng-deep mat-month-view .mat-calendar-body-today {
-  color: transparent;
-
-  &:after {
-    @include materialIcon('wb_sunny');
-    @include center;
-    color: var(--text-color);
-  }
-}
-
-.quick-access {
-  display: flex;
-  justify-content: space-evenly;
-  @include extraBorder('-bottom');
-  height: 48px;
-
-  > button {
-    height: 48px;
-    flex-grow: 1;
-    border-radius: var(--card-border-radius) !important;
-
-    ::ng-deep .mat-mdc-button-persistent-ripple {
-      border-radius: var(--card-border-radius) !important;
-    }
-  }
-
-  button + button {
-    @include extraBorder('-left');
-  }
-}
-
 :host ::ng-deep mat-dialog-actions {
   padding: 0 0 var(--s2) 0 !important;
 }
 
+.dialog-actions-and-warnings {
+  margin: 0 var(--s2) var(--s2);
+}
+
 .schedule-actions {
   display: flex;
   justify-content: center;
@@ -160,10 +82,6 @@ mat-dialog-content {
   text-align: center;
 }
 
-.time-clear-btn {
-  cursor: pointer;
-}
-
 .schedule-info {
   display: flex;
   align-items: flex-start;
diff --git a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.ts b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.ts
index 171a7b176c..fb5cfe8509 100644
--- a/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.ts
+++ b/src/app/features/planner/dialog-schedule-task/dialog-schedule-task.component.ts
@@ -6,7 +6,6 @@ import {
   computed,
   inject,
   signal,
-  viewChild,
 } from '@angular/core';
 import {
   MAT_DIALOG_DATA,
@@ -21,7 +20,6 @@ import {
   TaskReminderOptionId,
 } from '../../tasks/task.model';
 import { T } from 'src/app/t.const';
-import { MatCalendar } from '@angular/material/datepicker';
 import { Store } from '@ngrx/store';
 import { PlannerActions } from '../store/planner.actions';
 import { getDbDateStr } from '../../../util/get-db-date-str';
@@ -32,30 +30,17 @@ import { truncate } from '../../../util/truncate';
 import { TASK_REMINDER_OPTIONS } from './task-reminder-options.const';
 import { FormsModule } from '@angular/forms';
 import { millisecondsDiffToRemindOption } from '../../tasks/util/remind-option-to-milliseconds';
-import { expandFadeAnimation } from '../../../ui/animations/expand.ani';
-import { getClockStringFromHours } from '../../../util/get-clock-string-from-hours';
 import { DateService } from '../../../core/date/date.service';
 import { TaskService } from '../../tasks/task.service';
 import { ReminderService } from '../../reminder/reminder.service';
 import { getDateTimeFromClockString } from '../../../util/get-date-time-from-clock-string';
 import { isValidSplitTime } from '../../../util/is-valid-split-time';
 import { normalizeClockStr } from '../../../util/normalize-clock-str';
-import { fadeAnimation } from '../../../ui/animations/fade.ani';
 import { dateStrToUtcDate } from '../../../util/date-str-to-utc-date';
-import { DateAdapter, MatOption } from '@angular/material/core';
-import { MatTooltip } from '@angular/material/tooltip';
-import { MatButton, MatIconButton } from '@angular/material/button';
+import { DateAdapter } from '@angular/material/core';
+import { MatButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
-import {
-  MatFormField,
-  MatLabel,
-  MatPrefix,
-  MatSuffix,
-} from '@angular/material/form-field';
-import { MatSelect } from '@angular/material/select';
 import { TranslatePipe, TranslateService } from '@ngx-translate/core';
-import { MatInput } from '@angular/material/input';
-import { TimeStepDirective } from '../../../ui/time-step/time-step.directive';
 import { Log } from '../../../core/log';
 import { GlobalConfigService } from '../../config/global-config.service';
 import { DEFAULT_GLOBAL_CONFIG } from '../../config/default-global-config.const';
@@ -63,34 +48,22 @@ import { selectAllTasksWithDueTimeSorted } from '../../tasks/store/task.selector
 import { selectTimelineConfig } from '../../config/store/global-config.reducer';
 import { getTimeConflictTaskIds } from '../../tasks/util/get-time-conflict-task-ids';
 import { isTaskOutsideWorkHours } from '../../tasks/util/is-task-outside-work-hours';
-
-const DEFAULT_TIME = '09:00';
+import { DateTimePickerComponent } from '../../../ui/datetime-picker/datetime-picker.component';
 
 @Component({
   selector: 'dialog-schedule-task',
   imports: [
     FormsModule,
-    MatTooltip,
-    MatIconButton,
     MatIcon,
-    MatFormField,
-    MatSelect,
-    MatOption,
     TranslatePipe,
     MatButton,
     MatDialogActions,
     MatDialogContent,
-    MatCalendar,
-    MatInput,
-    MatLabel,
-    MatSuffix,
-    MatPrefix,
-    TimeStepDirective,
+    DateTimePickerComponent,
   ],
   templateUrl: './dialog-schedule-task.component.html',
   styleUrl: './dialog-schedule-task.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [expandFadeAnimation, fadeAnimation],
 })
 export class DialogScheduleTaskComponent implements AfterViewInit {
   data = inject<{
@@ -98,6 +71,9 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
     targetDay?: string;
     targetTime?: string;
     isSelectDueOnly?: boolean;
+    showQuickAccess?: boolean;
+    minDate?: Date | null;
+    isSubmitOnQuickAccess?: boolean;
   }>(MAT_DIALOG_DATA);
   private _matDialogRef = inject<MatDialogRef<DialogScheduleTaskComponent>>(MatDialogRef);
   private _cd = inject(ChangeDetectorRef);
@@ -122,8 +98,7 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
   );
 
   T: typeof T = T;
-  minDate = new Date();
-  readonly calendar = viewChild.required(MatCalendar);
+  minDate = this.data.minDate === undefined ? new Date() : this.data.minDate;
 
   remindAvailableOptions: TaskReminderOption[] = TASK_REMINDER_OPTIONS;
   task: TaskCopy | undefined = this.data.task;
@@ -133,13 +108,10 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
   selectedReminderCfgId!: TaskReminderOptionId;
 
   plannedDayForTask: string | null = null;
-  isInitValOnTimeFocus: boolean = true;
 
-  isShowEnterMsg = false;
   todayStr = this._dateService.todayStr();
   // private _prevSelectedQuickAccessDate: Date | null = null;
   // private _prevQuickAccessAction: number | null = null;
-  private _timeCheckVal: string | null = null;
   private _previewTaskId = '__schedule-preview__';
 
   private _defaultTaskRemindCfgId = computed(
@@ -184,7 +156,7 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
   });
   scheduleWarnings = computed(() => {
     const plannedTimestamp = this.plannedTimestamp();
-    if (!plannedTimestamp) {
+    if (!plannedTimestamp || this.data.isSelectDueOnly) {
       return {
         hasOverlap: false,
         isOutsideWorkHours: false,
@@ -263,71 +235,7 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
       this.selectedTime = this.data.targetTime;
     }
 
-    this.calendar().activeDate = new Date(this.selectedDate || new Date());
     this._cd.detectChanges();
-
-    setTimeout(() => {
-      this._focusInitially();
-    });
-    setTimeout(() => {
-      this._focusInitially();
-    }, 300);
-  }
-
-  private _focusInitially(): void {
-    if (this.selectedDate) {
-      (
-        document.querySelector('.mat-calendar-body-selected') as HTMLElement
-      )?.parentElement?.focus();
-    } else {
-      (
-        document.querySelector('.mat-calendar-body-today') as HTMLElement
-      )?.parentElement?.focus();
-    }
-    // setTimeout(() => {
-    //   (
-    //     document.querySelector('dialog-schedule-task button:nth-child(2)') as HTMLElement
-    //   )?.focus();
-    // });
-  }
-
-  onKeyDownOnCalendar(ev: KeyboardEvent): void {
-    this._timeCheckVal = null;
-    // Log.log(ev.key, ev.keyCode);
-    if (ev.code === 'Enter' || ev.code === 'Space') {
-      this.isShowEnterMsg = true;
-      // Log.log(
-      //   'check to submit',
-      //   this.selectedDate &&
-      //     new Date(this.selectedDate).getTime() ===
-      //       new Date(this.calendar.activeDate).getTime(),
-      //   this.selectedDate,
-      //   this.calendar.activeDate,
-      // );
-      if (
-        this.selectedDate &&
-        new Date(this.selectedDate).getTime() ===
-          new Date(this.calendar().activeDate).getTime()
-      ) {
-        this.submit();
-      }
-    } else {
-      this.isShowEnterMsg = false;
-    }
-  }
-
-  onTimeKeyDown(ev: KeyboardEvent): void {
-    // Log.log('ev.key!', ev.key);
-    if (ev.key === 'Enter') {
-      this.isShowEnterMsg = true;
-
-      if (this._timeCheckVal === this.selectedTime) {
-        this.submit();
-      }
-      this._timeCheckVal = this.selectedTime;
-    } else {
-      this.isShowEnterMsg = false;
-    }
   }
 
   close(
@@ -343,12 +251,7 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
   }
 
   dateSelected(newDate: Date): void {
-    // Log.log('dateSelected', typeof newDate, newDate, this.selectedDate);
-    // we do the timeout is there to make sure this happens after our click handler
-    setTimeout(() => {
-      this.selectedDate = new Date(newDate);
-      this.calendar().activeDate = this.selectedDate;
-    });
+    this.selectedDate = new Date(newDate);
   }
 
   remove(): void {
@@ -395,31 +298,6 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
     this.close(true);
   }
 
-  onTimeClear(ev: MouseEvent): void {
-    ev.stopPropagation();
-    this.selectedTime = null;
-    this.isInitValOnTimeFocus = true;
-  }
-
-  onTimeFocus(): void {
-    Log.log('onTimeFocus');
-    if (!this.selectedTime && this.isInitValOnTimeFocus) {
-      this.isInitValOnTimeFocus = false;
-
-      if (this.selectedDate) {
-        if (this._dateService.isToday(this.selectedDate as Date)) {
-          this.selectedTime = getClockStringFromHours(new Date().getHours() + 1);
-        } else {
-          this.selectedTime = DEFAULT_TIME;
-        }
-      } else {
-        // get current time +1h
-        this.selectedTime = getClockStringFromHours(new Date().getHours() + 1);
-        this.selectedDate = new Date();
-      }
-    }
-  }
-
   async submit(): Promise<void> {
     if (!this.selectedDate) {
       Log.err('no selected date');
@@ -428,10 +306,14 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
 
     // If in select-due-only mode, return the selected values instead of dispatching actions
     if (this.data.isSelectDueOnly) {
+      const normalizedTime = this._normalizedTime();
       this.close({
         date: this.selectedDate as Date,
-        time: this._normalizedTime(),
-        remindOption: this.selectedReminderCfgId,
+        time: normalizedTime,
+        remindOption:
+          normalizedTime && isValidSplitTime(normalizedTime)
+            ? this.selectedReminderCfgId
+            : null,
       });
       return;
     }
@@ -530,29 +412,20 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
     );
   }
 
-  quickAccessBtnClick(eventOrItem: MouseEvent | number, maybeItem?: number): void {
-    if (eventOrItem instanceof MouseEvent) {
-      eventOrItem.stopPropagation();
-    }
-
-    const item = typeof eventOrItem === 'number' ? eventOrItem : maybeItem;
-    if (!item) {
-      return;
-    }
-
+  onQuickAccessClick(option: 'today' | 'tomorrow' | 'nextWeek' | 'nextMonth'): void {
     const tDate = new Date();
     tDate.setMinutes(0, 0, 0);
 
-    switch (item) {
-      case 1:
+    switch (option) {
+      case 'today':
         this.selectedDate = tDate;
         break;
-      case 2:
+      case 'tomorrow':
         const tomorrow = tDate;
         tomorrow.setDate(tomorrow.getDate() + 1);
         this.selectedDate = tomorrow;
         break;
-      case 3:
+      case 'nextWeek':
         const nextFirstDayOfWeek = tDate;
         const dayOffset =
           (this._dateAdapter.getFirstDayOfWeek() -
@@ -562,7 +435,7 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
         nextFirstDayOfWeek.setDate(nextFirstDayOfWeek.getDate() + dayOffset);
         this.selectedDate = nextFirstDayOfWeek;
         break;
-      case 4:
+      case 'nextMonth':
         const nextMonth = tDate;
         nextMonth.setDate(1);
         nextMonth.setMonth(nextMonth.getMonth() + 1);
@@ -570,6 +443,8 @@ export class DialogScheduleTaskComponent implements AfterViewInit {
         break;
     }
 
-    this.submit();
+    if (this.data.isSubmitOnQuickAccess !== false) {
+      this.submit();
+    }
   }
 }
diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.html b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.html
index 49ea85ebc1..0e367f9928 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.html
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.html
@@ -25,6 +25,26 @@
     }
 
     <div class="form-wrapper">
+      <div class="planned-start-date-field-wrapper">
+        <button
+          type="button"
+          mat-stroked-button
+          class="planned-start-date-btn"
+          (click)="openScheduleDialog()"
+        >
+          <span class="planned-start-date-btn-content">
+            <mat-icon>today</mat-icon>
+            <span class="planned-date-label">
+              {{ T.F.TASK_REPEAT.F.START_DATE | translate }}:
+            </span>
+            <span class="planned-date-val">{{ plannedStartDateStr() }}</span>
+            @if (repeatCfg().remindAt && repeatCfg().remindAt !== 'DoNotRemind') {
+              <mat-icon class="reminder-badge">alarm</mat-icon>
+            }
+          </span>
+        </button>
+      </div>
+
       <formly-form
         (modelChange)="repeatCfg.set($event)"
         [form]="formGroup1()"
diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss
index 46b928ad44..eed380dda5 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss
@@ -99,3 +99,39 @@ mat-dialog-actions {
     }
   }
 }
+
+.planned-start-date-field-wrapper {
+  margin-bottom: var(--s2);
+  width: 100%;
+}
+
+.planned-start-date-btn {
+  width: 100%;
+  text-align: start !important;
+  justify-content: start !important;
+  height: 48px !important;
+  padding: 0 var(--s2) !important;
+}
+
+.planned-start-date-btn-content {
+  display: flex;
+  align-items: center;
+  gap: var(--s);
+  width: 100%;
+  text-align: start;
+}
+
+.planned-date-label {
+  font-weight: bold;
+}
+
+.planned-date-val {
+  flex-grow: 1;
+}
+
+.reminder-badge {
+  color: var(--color-warning);
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts
index 9e20d1b609..e8b36ca37e 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.spec.ts
@@ -1,6 +1,11 @@
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import {
+  MAT_DIALOG_DATA,
+  MatDialog,
+  MatDialogModule,
+  MatDialogRef,
+} from '@angular/material/dialog';
 import { DateAdapter, MatNativeDateModule } from '@angular/material/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
@@ -21,13 +26,16 @@ import { DEFAULT_TASK_REPEAT_CFG, TaskRepeatCfg } from '../task-repeat-cfg.model
 import { TaskCopy } from '../../tasks/task.model';
 import { TranslateService } from '@ngx-translate/core';
 import { T } from '../../../t.const';
+import { DateService } from '../../../core/date/date.service';
 
 describe('DialogEditTaskRepeatCfgComponent', () => {
   let mockDialogRef: jasmine.SpyObj<MatDialogRef<DialogEditTaskRepeatCfgComponent>>;
+  let mockMatDialog: jasmine.SpyObj<MatDialog>;
   let mockTaskRepeatCfgService: jasmine.SpyObj<TaskRepeatCfgService>;
   let mockTagService: jasmine.SpyObj<TagService>;
   let mockGlobalConfigService: jasmine.SpyObj<GlobalConfigService>;
   let mockDateTimeFormatService: jasmine.SpyObj<DateTimeFormatService>;
+  let mockDateService: jasmine.SpyObj<DateService>;
 
   const mockRepeatCfg: TaskRepeatCfg = {
     ...DEFAULT_TASK_REPEAT_CFG,
@@ -61,12 +69,22 @@ describe('DialogEditTaskRepeatCfgComponent', () => {
     getTaskRepeatCfgById$ReturnValue?: Observable<TaskRepeatCfg> | Subject<TaskRepeatCfg>,
   ): Promise<ComponentFixture<DialogEditTaskRepeatCfgComponent>> => {
     mockDialogRef = jasmine.createSpyObj('MatDialogRef', ['close']);
+    mockMatDialog = jasmine.createSpyObj('MatDialog', ['open']);
+    mockMatDialog.open.and.returnValue({
+      afterClosed: () => of(null),
+    } as any);
     mockTaskRepeatCfgService = jasmine.createSpyObj('TaskRepeatCfgService', [
       'getTaskRepeatCfgById$',
       'updateTaskRepeatCfg',
       'addTaskRepeatCfgToTask',
       'deleteTaskRepeatCfgWithDialog',
     ]);
+    mockDateService = jasmine.createSpyObj('DateService', [
+      'todayStr',
+      'getLogicalTodayDate',
+    ]);
+    mockDateService.todayStr.and.returnValue('2026-06-09');
+    mockDateService.getLogicalTodayDate.and.returnValue(new Date(2026, 5, 9, 0, 0, 0, 0));
 
     // Set up the return value for getTaskRepeatCfgById$ before creating the component
     if (getTaskRepeatCfgById$ReturnValue) {
@@ -88,6 +106,7 @@ describe('DialogEditTaskRepeatCfgComponent', () => {
         parse: 'MM/dd/yyyy',
         display: { dateInput: 'MM/dd/yyyy' },
       }),
+      formatTime: () => '12:00 PM',
     });
 
     await TestBed.configureTestingModule({
@@ -104,11 +123,13 @@ describe('DialogEditTaskRepeatCfgComponent', () => {
       providers: [
         provideMockStore(),
         { provide: MatDialogRef, useValue: mockDialogRef },
+        { provide: MatDialog, useValue: mockMatDialog },
         { provide: MAT_DIALOG_DATA, useValue: dialogData },
         { provide: TaskRepeatCfgService, useValue: mockTaskRepeatCfgService },
         { provide: TagService, useValue: mockTagService },
         { provide: GlobalConfigService, useValue: mockGlobalConfigService },
         { provide: DateTimeFormatService, useValue: mockDateTimeFormatService },
+        { provide: DateService, useValue: mockDateService },
         { provide: DateAdapter, useClass: CustomDateAdapter },
       ],
     })
@@ -426,53 +447,74 @@ describe('DialogEditTaskRepeatCfgComponent', () => {
     });
   });
 
-  describe('startDate min floor (#7768 Bug 4)', () => {
-    const getStartDateMin = (
-      fixture: ComponentFixture<DialogEditTaskRepeatCfgComponent>,
-    ): unknown => {
-      const fields = fixture.componentInstance.essentialFormFields();
-      const startDateField = fields.find((f) => f.key === 'startDate');
-      return (startDateField?.templateOptions as Record<string, unknown> | undefined)?.[
-        'min'
-      ];
-    };
-
-    const todayStr = (): string => {
-      const d = new Date();
-      d.setHours(0, 0, 0, 0);
-      const yyyy = d.getFullYear();
-      const mm = String(d.getMonth() + 1).padStart(2, '0');
-      const dd = String(d.getDate()).padStart(2, '0');
-      return `${yyyy}-${mm}-${dd}`;
-    };
-
-    it('floors startDate to today for a new repeat cfg created from a task', async () => {
+  describe('startDate min floor (#7768 Bug 4 refined)', () => {
+    it('sets minDate to today for a brand-new repeat cfg (no due date)', async () => {
       const fixture = await setupTestBed({ task: mockTask });
-      expect(getStartDateMin(fixture)).toBe(todayStr());
+      const component = fixture.componentInstance;
+      component.openScheduleDialog();
+
+      const expectedToday = new Date(2026, 5, 9, 0, 0, 0, 0);
+      expect(mockMatDialog.open).toHaveBeenCalledWith(
+        jasmine.any(Function),
+        jasmine.objectContaining({
+          data: jasmine.objectContaining({
+            minDate: expectedToday,
+          }),
+        }),
+      );
     });
 
-    it('keeps the past startDate as the floor when editing an existing past cfg', async () => {
+    it('sets minDate to task due date when creating new cfg for past task', async () => {
+      const pastTask = { ...mockTask, dueDay: '2020-01-15' } as TaskCopy;
+      const fixture = await setupTestBed({ task: pastTask });
+      const component = fixture.componentInstance;
+      component.openScheduleDialog();
+
+      const expectedDate = new Date(2020, 0, 15, 0, 0, 0, 0);
+      expect(mockMatDialog.open).toHaveBeenCalledWith(
+        jasmine.any(Function),
+        jasmine.objectContaining({
+          data: jasmine.objectContaining({
+            minDate: expectedDate,
+          }),
+        }),
+      );
+    });
+
+    it('sets minDate to null when editing an existing past cfg (full flexibility)', async () => {
       const pastCfg: TaskRepeatCfg = {
         ...mockRepeatCfg,
         startDate: '2020-01-15',
       };
       const fixture = await setupTestBed({ repeatCfg: pastCfg });
-      expect(getStartDateMin(fixture)).toBe('2020-01-15');
+      const component = fixture.componentInstance;
+      component.openScheduleDialog();
+      expect(mockMatDialog.open).toHaveBeenCalledWith(
+        jasmine.any(Function),
+        jasmine.objectContaining({
+          data: jasmine.objectContaining({
+            minDate: null,
+          }),
+        }),
+      );
     });
 
-    it('floors to today when editing a cfg whose startDate is in the future', async () => {
-      const future = new Date();
-      future.setFullYear(future.getFullYear() + 1);
-      const yyyy = future.getFullYear();
-      const mm = String(future.getMonth() + 1).padStart(2, '0');
-      const dd = String(future.getDate()).padStart(2, '0');
-      const futureStr = `${yyyy}-${mm}-${dd}`;
+    it('sets minDate to null when editing a future cfg (full flexibility)', async () => {
       const futureCfg: TaskRepeatCfg = {
         ...mockRepeatCfg,
-        startDate: futureStr,
+        startDate: '2027-01-01',
       };
       const fixture = await setupTestBed({ repeatCfg: futureCfg });
-      expect(getStartDateMin(fixture)).toBe(todayStr());
+      const component = fixture.componentInstance;
+      component.openScheduleDialog();
+      expect(mockMatDialog.open).toHaveBeenCalledWith(
+        jasmine.any(Function),
+        jasmine.objectContaining({
+          data: jasmine.objectContaining({
+            minDate: null,
+          }),
+        }),
+      );
     });
   });
 
diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts
index b5063e3998..1e185e0a57 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts
@@ -6,7 +6,7 @@ import {
   inject,
   signal,
 } from '@angular/core';
-import { Task, TaskReminderOptionId } from '../../tasks/task.model';
+import { Task, TaskCopy, TaskReminderOptionId } from '../../tasks/task.model';
 import {
   MAT_DIALOG_DATA,
   MatDialogActions,
@@ -51,6 +51,11 @@ import { DEFAULT_GLOBAL_CONFIG } from '../../config/default-global-config.const'
 import { DateTimeFormatService } from 'src/app/core/date-time-format/date-time-format.service';
 import { RepeatTaskHeatmapComponent } from '../repeat-task-heatmap/repeat-task-heatmap.component';
 import { CollapsibleComponent } from '../../../ui/collapsible/collapsible.component';
+import { DialogScheduleTaskComponent } from '../../planner/dialog-schedule-task/dialog-schedule-task.component';
+import { getDateTimeFromClockString } from '../../../util/get-date-time-from-clock-string';
+import { remindOptionToMilliseconds } from '../../tasks/util/remind-option-to-milliseconds';
+import { isValidSplitTime } from '../../../util/is-valid-split-time';
+import { DateService } from '../../../core/date/date.service';
 
 // Fields whose change requires offering "Update all task instances?" — covers
 // what propagates to existing tasks (vs. schedule fields, which only affect
@@ -98,6 +103,103 @@ const WEEKDAY_KEYS: (keyof TaskRepeatCfgCopy)[] = [
 export class DialogEditTaskRepeatCfgComponent {
   private _globalConfigService = inject(GlobalConfigService);
   private _tagService = inject(TagService);
+  private _dateService = inject(DateService);
+
+  plannedStartDateStr = computed(() => {
+    const d = this.repeatCfg().startDate;
+    if (!d) return this._translateService.instant(T.F.TASK_REPEAT.F.START_DATE);
+    const date = dateStrToUtcDate(d);
+    const locale = this._dateTimeFormatService.currentLocale();
+    const time = this.repeatCfg().startTime;
+    if (time && isValidSplitTime(time)) {
+      const formattedDate = date.toLocaleDateString(locale, {
+        weekday: 'short',
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+      });
+      const [hours, minutes] = time.split(':').map(Number);
+      const safeTimeDate = new Date(2000, 0, 1, hours, minutes, 0, 0);
+      const formattedTime = this._dateTimeFormatService.formatTime(
+        safeTimeDate.getTime(),
+        locale,
+      );
+      return `${formattedDate}, ${formattedTime}`;
+    }
+    return date.toLocaleDateString(locale, {
+      weekday: 'short',
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+    });
+  });
+
+  openScheduleDialog(): void {
+    const currentCfg = this.repeatCfg();
+    const dummyTask: TaskCopy = {
+      title: currentCfg.title || '',
+      dueDay: currentCfg.startDate || undefined,
+      dueWithTime: undefined,
+      remindAt: undefined,
+      timeEstimate: 0,
+      timeSpent: 0,
+      subTaskIds: [],
+      isDone: false,
+      projectId: '',
+      timeSpentOnDay: {},
+      attachments: [],
+      tagIds: [],
+      created: Date.now(),
+    } as unknown as TaskCopy;
+
+    const defaultRemindOption =
+      this._data.defaultRemindOption ??
+      this._globalConfigService.cfg()?.reminder.defaultTaskRemindOption ??
+      DEFAULT_GLOBAL_CONFIG.reminder.defaultTaskRemindOption!;
+    const remindAt =
+      currentCfg.remindAt !== undefined ? currentCfg.remindAt : defaultRemindOption;
+
+    const hasValidTime = !!currentCfg.startTime && isValidSplitTime(currentCfg.startTime);
+
+    if (currentCfg.startDate && hasValidTime) {
+      const dt = getDateTimeFromClockString(
+        currentCfg.startTime!,
+        dateStrToUtcDate(currentCfg.startDate),
+      );
+      dummyTask.dueWithTime = dt;
+      if (remindAt && remindAt !== TaskReminderOptionId.DoNotRemind) {
+        dummyTask.remindAt = remindOptionToMilliseconds(dt, remindAt);
+      }
+    }
+
+    this._matDialog
+      .open(DialogScheduleTaskComponent, {
+        autoFocus: false,
+        data: {
+          task: dummyTask,
+          isSelectDueOnly: true,
+          showQuickAccess: true,
+          isSubmitOnQuickAccess: false,
+          targetDay: currentCfg.startDate || undefined,
+          targetTime: hasValidTime ? currentCfg.startTime : undefined,
+          minDate: this.isEdit() ? null : this._getReferenceDate(),
+        },
+      })
+      .afterClosed()
+      .subscribe((result) => {
+        if (result) {
+          const newDateStr = getDbDateStr(result.date);
+          const hasTime = !!result.time && isValidSplitTime(result.time);
+          this.repeatCfg.update((cfg) => ({
+            ...cfg,
+            startDate: newDateStr,
+            startTime: result.time || undefined,
+            remindAt: hasTime ? result.remindOption || undefined : undefined,
+          }));
+        }
+      });
+  }
+
   private _taskRepeatCfgService = inject(TaskRepeatCfgService);
   private _matDialog = inject(MatDialog);
   private _matDialogRef =
@@ -195,7 +297,13 @@ export class DialogEditTaskRepeatCfgComponent {
   private _initializeRepeatCfg(): Omit<TaskRepeatCfgCopy, 'id'> | TaskRepeatCfg {
     if (this._data.repeatCfg) {
       // Process the repeat config to determine if quickSetting needs to be changed to CUSTOM
-      const processedCfg = this._processQuickSettingForDate(this._data.repeatCfg);
+      const processedCfg = this._processQuickSettingForDate({ ...this._data.repeatCfg });
+      if (processedCfg.startTime && processedCfg.remindAt === undefined) {
+        processedCfg.remindAt =
+          this._data.defaultRemindOption ??
+          this._globalConfigService.cfg()?.reminder.defaultTaskRemindOption ??
+          DEFAULT_GLOBAL_CONFIG.reminder.defaultTaskRemindOption!;
+      }
 
       // Set initial value for comparison
       this.repeatCfgInitial.set({ ...this._data.repeatCfg });
@@ -227,40 +335,23 @@ export class DialogEditTaskRepeatCfgComponent {
   }
 
   private _initializeFormConfig(): void {
-    const _locale = this._dateTimeFormatService.currentLocale();
     const translateService = this._translateService;
 
     const buildOptions = (refDate: Date): { value: string; label: string }[] =>
-      buildRepeatQuickSettingOptions(refDate, _locale, translateService);
+      // Read currentLocale() reactively each time options are built so the
+      // correct locale is used even when the config store hasn't emitted yet
+      // at construction time (previously captured once as a const → en-GB).
+      buildRepeatQuickSettingOptions(
+        refDate,
+        this._dateTimeFormatService.currentLocale(),
+        translateService,
+      );
 
     const formConfig = TASK_REPEAT_CFG_ESSENTIAL_FORM_CFG.map((field) => ({
       ...field,
     }));
 
-    // Clamp startDate to today as a floor for NEW configs and recent ones
-    // (#7768 Bug 4). For configs whose startDate is already in the past, the
-    // existing value is the floor — users can still keep or adjust it.
-    const startDateIdx = formConfig.findIndex((f) => f.key === 'startDate');
-    if (startDateIdx !== -1) {
-      const startDateField: FormlyFieldConfig = {
-        ...formConfig[startDateIdx],
-        templateOptions: { ...formConfig[startDateIdx].templateOptions },
-      };
-      const today = new Date();
-      today.setHours(0, 0, 0, 0);
-      const initialStartDate = this._data.repeatCfg?.startDate
-        ? dateStrToUtcDate(this._data.repeatCfg.startDate)
-        : this._data.task?.dueDay
-          ? dateStrToUtcDate(this._data.task.dueDay)
-          : today;
-      // Formly types templateOptions.min as number, but the formly-date-picker
-      // passes it through to date-picker-input which accepts Date | string.
-      // Use the YYYY-MM-DD string form so the cast is just a type concern.
-      const minFloor = initialStartDate < today ? initialStartDate : today;
-      (startDateField.templateOptions as Record<string, unknown>).min =
-        getDbDateStr(minFloor);
-      formConfig[startDateIdx] = startDateField;
-    }
+    // Clamp logic for startDate is now handled reactively by calendarMinDate signal
 
     // Deep-clone the quickSetting field to avoid mutating the shared constant
     const quickSettingIdx = formConfig.findIndex((f) => f.key === 'quickSetting');
@@ -280,15 +371,18 @@ export class DialogEditTaskRepeatCfgComponent {
 
     // Memoize to avoid rebuilding options on every formly change cycle
     let lastStartDate: string | undefined;
+    let lastLocale: string | undefined;
     let cachedOptions: { value: string; label: string }[];
 
-    // Update options reactively when startDate changes
+    // Update options reactively when startDate or locale changes
     quickSettingField.expressionProperties = {
       ...quickSettingField.expressionProperties,
       ['templateOptions.options']: (model: Record<string, unknown>) => {
         const sd = model['startDate'] as string | undefined;
-        if (sd !== lastStartDate || !cachedOptions) {
+        const currentLocale = this._dateTimeFormatService.currentLocale();
+        if (sd !== lastStartDate || currentLocale !== lastLocale || !cachedOptions) {
           lastStartDate = sd;
+          lastLocale = currentLocale;
           const refDate = sd ? dateStrToUtcDate(sd) : this._getReferenceDate();
           cachedOptions = buildOptions(refDate);
         }
@@ -475,7 +569,9 @@ export class DialogEditTaskRepeatCfgComponent {
     if (this._data.repeatCfg?.startDate) {
       return dateStrToUtcDate(this._data.repeatCfg.startDate);
     }
-    return new Date();
+    const d = this._dateService.getLogicalTodayDate();
+    d.setHours(0, 0, 0, 0);
+    return d;
   }
 
   private _processQuickSettingForDate<
@@ -495,7 +591,7 @@ export class DialogEditTaskRepeatCfgComponent {
       this.canRemoveInstance.set(false);
       return;
     }
-    const todayStr = getDbDateStr(new Date());
+    const todayStr = this._dateService.todayStr();
     const isTargetTodayOrPast = this._data.targetDate <= todayStr;
     this.canRemoveInstance.set(!isTargetTodayOrPast);
   }
diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.spec.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.spec.ts
index adc53f2583..ca068b7bb7 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.spec.ts
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.spec.ts
@@ -2,76 +2,25 @@ import {
   TASK_REPEAT_CFG_ADVANCED_FORM_CFG,
   TASK_REPEAT_CFG_ESSENTIAL_FORM_CFG,
 } from './task-repeat-cfg-form.const';
-import { TaskReminderOptionId } from '../../tasks/task.model';
-import { getDbDateStr } from '../../../util/get-db-date-str';
 
 describe('TaskRepeatCfgFormConfig', () => {
-  describe('startDate field parser (issue #6860)', () => {
+  it('should not contain startDate in essential form fields', () => {
     const startDateField = TASK_REPEAT_CFG_ESSENTIAL_FORM_CFG.find(
       (field) => field.key === 'startDate',
     );
-    const parser = startDateField?.parsers?.[0] as (val: unknown) => unknown;
-
-    it('should have a parser defined', () => {
-      expect(parser).toBeDefined();
-    });
-
-    it('should convert Date objects to date strings', () => {
-      const date = new Date(2026, 2, 18);
-      expect(parser(date)).toBe(getDbDateStr(date));
-    });
-
-    it('should pass through string values unchanged', () => {
-      expect(parser('2026-03-18')).toBe('2026-03-18');
-    });
-
-    it('should NOT convert null to epoch date (1970-01-01)', () => {
-      // This is the core regression test for issue #6860:
-      // getDbDateStr(null) returns '1970-01-01', but the parser should
-      // pass null through so the required validator can handle it
-      expect(parser(null)).toBeNull();
-    });
-
-    it('should pass through undefined unchanged', () => {
-      expect(parser(undefined)).toBeUndefined();
-    });
-
-    // Regression test for #7945: a `new Date()` default bypasses `parsers`, so a
-    // raw Date object would reach the model and crash the dialog. The default
-    // must already be a 'YYYY-MM-DD' string.
-    it('should default to a YYYY-MM-DD string, not a Date', () => {
-      expect(typeof startDateField?.defaultValue).toBe('string');
-      expect(startDateField?.defaultValue).toMatch(/^\d{4}-\d{2}-\d{2}$/);
-    });
+    expect(startDateField).toBeUndefined();
   });
 
-  describe('remindAt field', () => {
-    const remindAtField = TASK_REPEAT_CFG_ADVANCED_FORM_CFG.flatMap((field) =>
+  it('should not contain startTime or remindAt in advanced form fields', () => {
+    const flatFields = TASK_REPEAT_CFG_ADVANCED_FORM_CFG.flatMap((field) =>
       field.fieldGroup ? field.fieldGroup : [field],
-    )
-      .flatMap((field) => (field.fieldGroup ? field.fieldGroup : [field]))
-      .find((field) => field.key === 'remindAt');
+    ).flatMap((field) => (field.fieldGroup ? field.fieldGroup : [field]));
 
-    it('should have a remindAt field configured', () => {
-      expect(remindAtField).toBeDefined();
-    });
+    const startTimeField = flatFields.find((field) => field.key === 'startTime');
+    const remindAtField = flatFields.find((field) => field.key === 'remindAt');
 
-    it('should have a defaultValue of AtStart to prevent undefined remindAt bug', () => {
-      // This test ensures the fix for the bug where repeatable tasks with time
-      // were always scheduled with remindAt set to "never" because the form
-      // field lacked a defaultValue, causing Formly to not properly bind
-      // the initial model value.
-      expect(remindAtField?.defaultValue).toBe(TaskReminderOptionId.AtStart);
-    });
-
-    it('should be hidden when startTime is not set', () => {
-      expect(remindAtField?.hideExpression).toBe('!model.startTime');
-    });
-
-    it('should be a required select field', () => {
-      expect(remindAtField?.type).toBe('select');
-      expect(remindAtField?.templateOptions?.required).toBe(true);
-    });
+    expect(startTimeField).toBeUndefined();
+    expect(remindAtField).toBeUndefined();
   });
 
   describe('weekdays group visibility (issue #8025)', () => {
diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts
index 3fccc6d28d..bce6326523 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/task-repeat-cfg-form.const.ts
@@ -1,11 +1,7 @@
 import { FormlyFieldConfig } from '@ngx-formly/core';
 import { T } from '../../../t.const';
-import { isValidSplitTime } from '../../../util/is-valid-split-time';
-import { TASK_REMINDER_OPTIONS } from '../../planner/dialog-schedule-task/task-reminder-options.const';
-import { getDbDateStr } from '../../../util/get-db-date-str';
 import { RepeatQuickSetting, TaskRepeatCfg } from '../task-repeat-cfg.model';
 import { getQuickSettingUpdates } from './get-quick-setting-updates';
-import { TaskReminderOptionId } from '../../tasks/task.model';
 
 const updateParent = (
   field: FormlyFieldConfig,
@@ -26,19 +22,7 @@ export const TASK_REPEAT_CFG_ESSENTIAL_FORM_CFG: FormlyFieldConfig[] = [
       label: T.F.TASK_REPEAT.F.TITLE,
     },
   },
-  {
-    key: 'startDate',
-    type: 'date',
-    // Default to a 'YYYY-MM-DD' string (not a Date): Formly skips `parsers` on
-    // `defaultValue`, so a raw Date would slip into the model and downstream
-    // `dateStrToUtcDate` would choke on it, crashing the dialog (#7945).
-    defaultValue: getDbDateStr(),
-    templateOptions: {
-      label: T.F.TASK_REPEAT.F.START_DATE,
-      required: true,
-    },
-    parsers: [(val: unknown) => (val instanceof Date ? getDbDateStr(val) : val)],
-  },
+
   {
     key: 'quickSetting',
     type: 'select',
@@ -234,38 +218,7 @@ export const TASK_REPEAT_CFG_ADVANCED_FORM_CFG: FormlyFieldConfig[] = [
       updateOn: 'blur',
     },
   },
-  {
-    fieldGroupClassName: 'formly-row',
-    fieldGroup: [
-      {
-        key: 'startTime',
-        type: 'input',
-        templateOptions: {
-          label: T.F.TASK_REPEAT.F.START_TIME,
-          description: T.F.TASK_REPEAT.F.START_TIME_DESCRIPTION,
-        },
-        validators: {
-          validTimeString: (c: { value: string | undefined }) => {
-            return !c.value || isValidSplitTime(c.value);
-          },
-        },
-      },
-      {
-        key: 'remindAt',
-        type: 'select',
-        defaultValue: TaskReminderOptionId.AtStart,
-        hideExpression: '!model.startTime',
-        templateOptions: {
-          required: true,
-          label: T.F.TASK_REPEAT.F.REMIND_AT,
-          options: TASK_REMINDER_OPTIONS,
-          valueProp: 'value',
-          labelProp: 'label',
-          placeholder: T.F.TASK_REPEAT.F.REMIND_AT_PLACEHOLDER,
-        },
-      },
-    ],
-  },
+
   {
     key: 'notes',
     type: 'textarea',
diff --git a/src/app/features/tasks/dialog-deadline/dialog-deadline.component.html b/src/app/features/tasks/dialog-deadline/dialog-deadline.component.html
index e7dc5d0a65..586287bebe 100644
--- a/src/app/features/tasks/dialog-deadline/dialog-deadline.component.html
+++ b/src/app/features/tasks/dialog-deadline/dialog-deadline.component.html
@@ -1,123 +1,54 @@
-<div class="quick-access">
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 'today')"
-    [matTooltip]="T.F.TASK.D_DEADLINE.QA_TODAY | translate"
-  >
-    <mat-icon>wb_sunny</mat-icon>
-  </button>
-
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 'tomorrow')"
-    [matTooltip]="T.F.TASK.D_DEADLINE.QA_TOMORROW | translate"
-  >
-    <mat-icon>wb_twilight</mat-icon>
-  </button>
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 'nextWeek')"
-    [matTooltip]="T.F.TASK.D_DEADLINE.QA_NEXT_WEEK | translate"
-  >
-    <mat-icon>next_week</mat-icon>
-  </button>
-  <button
-    mat-icon-button
-    (click)="quickAccessBtnClick($event, 'nextMonth')"
-    [matTooltip]="T.F.TASK.D_DEADLINE.QA_NEXT_MONTH | translate"
-  >
-    <mat-icon>bedtime</mat-icon>
-  </button>
-</div>
-
 <mat-dialog-content>
   @if (isConfigReady()) {
-    <mat-calendar
-      (keydown)="onKeyDownOnCalendar($event)"
-      [selected]="selectedDate"
-      (selectedChange)="dateSelected($event)"
-    ></mat-calendar>
+    <datetime-picker
+      [selectedDate]="selectedDate"
+      [selectedTime]="selectedTime"
+      [selectedReminderCfgId]="selectedReminderCfgId"
+      [reminderOptions]="reminderOptions"
+      [minDate]="minDate"
+      [timeLabel]="T.F.TASK.D_DEADLINE.ADD_TIME | translate"
+      [reminderLabel]="T.F.TASK.D_DEADLINE.REMIND_AT"
+      [quickAccessTranslationPrefix]="'F.TASK.D_DEADLINE'"
+      (dateSelected)="dateSelected($event)"
+      (timeChanged)="selectedTime = $event"
+      (reminderChanged)="selectedReminderCfgId = $event"
+      (quickAccessClick)="onQuickAccessClick($event)"
+      (enterSubmit)="submit()"
+    ></datetime-picker>
   }
 
-  @if (isShowEnterMsg) {
-    <div
-      class="press-enter-msg"
-      @fade
-    >
-      {{ T.DATETIME_SCHEDULE.PRESS_ENTER_AGAIN | translate }}
-    </div>
-  }
-
-  <div class="form-ctrl-wrapper">
-    <mat-form-field>
-      <mat-label>{{ T.F.TASK.D_DEADLINE.ADD_TIME | translate }}</mat-label>
-      <mat-icon matPrefix>schedule</mat-icon>
-      <input
-        type="time"
-        spTimeStep
-        (focus)="onTimeFocus()"
-        [(ngModel)]="selectedTime"
-        step="60"
-        matInput
-        (keydown)="onTimeKeyDown($event)"
-      />
-      @if (selectedTime) {
-        <mat-icon
-          class="time-clear-btn"
-          matSuffix
-          (click)="onTimeClear($event)"
-          >close
-        </mat-icon>
-      }
-    </mat-form-field>
-
-    @if (selectedTime) {
-      <mat-form-field [@expandFade]>
-        <mat-icon matPrefix>alarm</mat-icon>
-        <mat-label>{{ T.F.TASK.D_DEADLINE.REMIND_AT | translate }}</mat-label>
-        <mat-select
-          [(ngModel)]="selectedReminderCfgId"
-          name="type"
-          required="true"
-        >
-          @for (remindOption of reminderOptions; track remindOption.value) {
-            <mat-option [value]="remindOption.value">
-              {{ remindOption.label | translate }}
-            </mat-option>
-          }
-        </mat-select>
-      </mat-form-field>
-    }
-
-    <mat-dialog-actions align="start">
-      <div class="deadline-actions">
-        @if (hasExistingDeadline) {
-          <button
-            (click)="remove()"
-            color="warn"
-            mat-stroked-button
-          >
-            <mat-icon>flag_circle</mat-icon>
-            {{ T.F.TASK.D_DEADLINE.REMOVE_DEADLINE | translate }}
-          </button>
-        }
+  <mat-dialog-actions align="start">
+    <div class="deadline-actions">
+      @if (hasExistingDeadline && !data.isSelectDeadlineOnly) {
         <button
-          color="primary"
+          (click)="remove()"
+          color="warn"
           mat-stroked-button
-          (click)="submit()"
+          type="button"
         >
-          <mat-icon>flag</mat-icon>
-          {{ T.F.TASK.D_DEADLINE.SET_DEADLINE | translate }}
+          <mat-icon>event_busy</mat-icon>
+          {{ T.F.TASK.D_DEADLINE.REMOVE_DEADLINE | translate }}
         </button>
-      </div>
+      }
       <button
-        class="dialog-cancel-btn"
+        color="primary"
         mat-stroked-button
-        color="default"
-        (click)="close()"
+        [disabled]="!selectedDate"
+        (click)="submit()"
+        type="button"
       >
-        {{ T.G.CANCEL | translate }}
+        <mat-icon>event_available</mat-icon>
+        {{ T.F.TASK.D_DEADLINE.SET_DEADLINE | translate }}
       </button>
-    </mat-dialog-actions>
-  </div>
+    </div>
+    <button
+      class="dialog-cancel-btn"
+      mat-stroked-button
+      color="default"
+      (click)="close()"
+      type="button"
+    >
+      {{ T.G.CANCEL | translate }}
+    </button>
+  </mat-dialog-actions>
 </mat-dialog-content>
diff --git a/src/app/features/tasks/dialog-deadline/dialog-deadline.component.scss b/src/app/features/tasks/dialog-deadline/dialog-deadline.component.scss
index 17f457bacf..11acc83f0a 100644
--- a/src/app/features/tasks/dialog-deadline/dialog-deadline.component.scss
+++ b/src/app/features/tasks/dialog-deadline/dialog-deadline.component.scss
@@ -17,37 +17,6 @@
   :host-context([dir='rtl']) {
     direction: rtl;
   }
-
-  mat-form-field {
-    width: 100%;
-  }
-
-  ::ng-deep {
-    .mat-calendar-header {
-      padding-top: 0;
-    }
-
-    .mat-calendar-body-cell-content {
-      background: transparent !important;
-    }
-
-    .mat-calendar-body-cell:focus .mat-calendar-body-cell-content {
-      outline: 2px solid var(--c-accent);
-    }
-
-    .mat-calendar-body-selected {
-      background: var(--c-primary) !important;
-    }
-
-    .mat-calendar-controls {
-      margin-top: var(--s);
-      margin-bottom: var(--s);
-    }
-  }
-}
-
-.form-ctrl-wrapper {
-  margin: var(--s2) var(--s2) 0;
 }
 
 mat-dialog-content {
@@ -58,47 +27,14 @@ mat-dialog-content {
   ) !important;
 }
 
-.press-enter-msg {
-  text-align: center;
-  font-weight: bold;
-  padding: var(--s-half) 12px;
-  position: absolute;
-  left: 50%;
-  z-index: 11;
-  box-shadow: var(--whiteframe-shadow-1dp);
-  border-radius: var(--radius-md);
-  margin-top: calc(var(--s) * -1.5);
-  white-space: nowrap;
-  transform: translateX(-50%);
-
-  background: var(--bg-lighter);
-}
-
-.quick-access {
-  display: flex;
-  justify-content: space-evenly;
-  @include extraBorder('-bottom');
-  height: 48px;
-
-  > button {
-    height: 48px;
-    flex-grow: 1;
-    border-radius: var(--card-border-radius) !important;
-
-    ::ng-deep .mat-mdc-button-persistent-ripple {
-      border-radius: var(--card-border-radius) !important;
-    }
-  }
-
-  button + button {
-    @include extraBorder('-left');
-  }
-}
-
 :host ::ng-deep mat-dialog-actions {
   padding: 0 0 var(--s2) 0 !important;
 }
 
+.dialog-actions-and-warnings {
+  margin: 0 var(--s2) var(--s2);
+}
+
 .deadline-actions {
   display: flex;
   justify-content: center;
@@ -134,7 +70,3 @@ mat-dialog-content {
   overflow-wrap: anywhere;
   text-align: center;
 }
-
-.time-clear-btn {
-  cursor: pointer;
-}
diff --git a/src/app/features/tasks/dialog-deadline/dialog-deadline.component.ts b/src/app/features/tasks/dialog-deadline/dialog-deadline.component.ts
index 763270af6c..3593a06bac 100644
--- a/src/app/features/tasks/dialog-deadline/dialog-deadline.component.ts
+++ b/src/app/features/tasks/dialog-deadline/dialog-deadline.component.ts
@@ -6,7 +6,6 @@ import {
   computed,
   ElementRef,
   inject,
-  viewChild,
 } from '@angular/core';
 import {
   MAT_DIALOG_DATA,
@@ -16,41 +15,26 @@ import {
 } from '@angular/material/dialog';
 import { Task, TaskReminderOption, TaskReminderOptionId } from '../task.model';
 import { T } from 'src/app/t.const';
-import { MatCalendar } from '@angular/material/datepicker';
 import { Store } from '@ngrx/store';
 import { TaskSharedActions } from '../../../root-store/meta/task-shared.actions';
 import { DEADLINE_REMINDER_OPTIONS } from './deadline-reminder-options.const';
 import { FormsModule } from '@angular/forms';
 import { millisecondsDiffToRemindOption } from '../util/remind-option-to-milliseconds';
 import { remindOptionToMilliseconds } from '../util/remind-option-to-milliseconds';
-import { expandFadeAnimation } from '../../../ui/animations/expand.ani';
-import { fadeAnimation } from '../../../ui/animations/fade.ani';
-import { getClockStringFromHours } from '../../../util/get-clock-string-from-hours';
 import { getDateTimeFromClockString } from '../../../util/get-date-time-from-clock-string';
 import { isValidSplitTime } from '../../../util/is-valid-split-time';
 import { normalizeClockStr } from '../../../util/normalize-clock-str';
 import { getDbDateStr } from '../../../util/get-db-date-str';
 import { dateStrToUtcDate } from '../../../util/date-str-to-utc-date';
 import { DateService } from '../../../core/date/date.service';
-import { DateAdapter, MatOption } from '@angular/material/core';
-import { MatTooltip } from '@angular/material/tooltip';
-import { MatButton, MatIconButton } from '@angular/material/button';
+import { DateAdapter } from '@angular/material/core';
+import { MatButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
-import {
-  MatFormField,
-  MatLabel,
-  MatPrefix,
-  MatSuffix,
-} from '@angular/material/form-field';
-import { MatSelect } from '@angular/material/select';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatInput } from '@angular/material/input';
-import { TimeStepDirective } from '../../../ui/time-step/time-step.directive';
 import { GlobalConfigService } from '../../config/global-config.service';
 import { DEFAULT_GLOBAL_CONFIG } from '../../config/default-global-config.const';
 import { getDeadlineAutoPlanFields } from '../util/get-deadline-auto-plan-fields';
-
-const DEFAULT_TIME = '09:00';
+import { DateTimePickerComponent } from '../../../ui/datetime-picker/datetime-picker.component';
 
 type QuickDeadline = 'today' | 'tomorrow' | 'nextWeek' | 'nextMonth';
 
@@ -58,27 +42,16 @@ type QuickDeadline = 'today' | 'tomorrow' | 'nextWeek' | 'nextMonth';
   selector: 'dialog-deadline',
   imports: [
     FormsModule,
-    MatTooltip,
-    MatIconButton,
     MatIcon,
-    MatFormField,
-    MatSelect,
-    MatOption,
     TranslatePipe,
     MatButton,
     MatDialogActions,
     MatDialogContent,
-    MatCalendar,
-    MatInput,
-    MatLabel,
-    MatSuffix,
-    MatPrefix,
-    TimeStepDirective,
+    DateTimePickerComponent,
   ],
   templateUrl: './dialog-deadline.component.html',
   styleUrl: './dialog-deadline.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [expandFadeAnimation, fadeAnimation],
 })
 export class DialogDeadlineComponent implements AfterViewInit {
   data = inject<{
@@ -107,19 +80,15 @@ export class DialogDeadlineComponent implements AfterViewInit {
   );
 
   T: typeof T = T;
-  readonly calendar = viewChild.required(MatCalendar);
-
   reminderOptions: TaskReminderOption[] = DEADLINE_REMINDER_OPTIONS;
   task: Task | undefined = this.data.task;
 
   selectedDate: Date | null = null;
   selectedTime: string | null = null;
   selectedReminderCfgId: TaskReminderOptionId = TaskReminderOptionId.DoNotRemind;
+  minDate = new Date();
 
   hasExistingDeadline = false;
-  isInitValOnTimeFocus = true;
-  isShowEnterMsg = false;
-  private _timeCheckVal: string | null = null;
 
   ngAfterViewInit(): void {
     if (this.task) {
@@ -172,47 +141,7 @@ export class DialogDeadlineComponent implements AfterViewInit {
       this.selectedReminderCfgId = this.data.targetDeadlineRemindOption;
     }
 
-    this.calendar().activeDate = new Date(this.selectedDate || new Date());
     this._cd.detectChanges();
-
-    setTimeout(() => this._focusInitially());
-    setTimeout(() => this._focusInitially(), 300);
-  }
-
-  private _focusInitially(): void {
-    const host = this._elRef.nativeElement as HTMLElement;
-    const selector = this.selectedDate
-      ? '.mat-calendar-body-selected'
-      : '.mat-calendar-body-today';
-    (host.querySelector(selector) as HTMLElement)?.parentElement?.focus();
-  }
-
-  onKeyDownOnCalendar(ev: KeyboardEvent): void {
-    this._timeCheckVal = null;
-    if (ev.code === 'Enter' || ev.code === 'Space') {
-      this.isShowEnterMsg = true;
-      if (
-        this.selectedDate &&
-        new Date(this.selectedDate).getTime() ===
-          new Date(this.calendar().activeDate).getTime()
-      ) {
-        this.submit();
-      }
-    } else {
-      this.isShowEnterMsg = false;
-    }
-  }
-
-  onTimeKeyDown(ev: KeyboardEvent): void {
-    if (ev.key === 'Enter') {
-      this.isShowEnterMsg = true;
-      if (this._timeCheckVal === this.selectedTime) {
-        this.submit();
-      }
-      this._timeCheckVal = this.selectedTime;
-    } else {
-      this.isShowEnterMsg = false;
-    }
   }
 
   close(): void {
@@ -220,33 +149,7 @@ export class DialogDeadlineComponent implements AfterViewInit {
   }
 
   dateSelected(newDate: Date): void {
-    setTimeout(() => {
-      this.selectedDate = new Date(newDate);
-      this.calendar().activeDate = this.selectedDate;
-    });
-  }
-
-  onTimeClear(ev: MouseEvent): void {
-    ev.stopPropagation();
-    this.selectedTime = null;
-    this.selectedReminderCfgId = TaskReminderOptionId.DoNotRemind;
-    this.isInitValOnTimeFocus = true;
-  }
-
-  onTimeFocus(): void {
-    if (!this.selectedTime && this.isInitValOnTimeFocus) {
-      this.isInitValOnTimeFocus = false;
-      if (this.selectedDate) {
-        if (this._dateService.isToday(this.selectedDate!)) {
-          this.selectedTime = getClockStringFromHours((new Date().getHours() + 1) % 24);
-        } else {
-          this.selectedTime = DEFAULT_TIME;
-        }
-      } else {
-        this.selectedTime = getClockStringFromHours((new Date().getHours() + 1) % 24);
-        this.selectedDate = new Date();
-      }
-    }
+    this.selectedDate = new Date(newDate);
   }
 
   remove(): void {
@@ -317,8 +220,7 @@ export class DialogDeadlineComponent implements AfterViewInit {
     this._matDialogRef.close();
   }
 
-  quickAccessBtnClick(ev: MouseEvent, option: QuickDeadline): void {
-    ev.stopPropagation();
+  onQuickAccessClick(option: QuickDeadline): void {
     this.selectedDate = this._getQuickDate(option);
     this.submit();
   }
diff --git a/src/app/features/tasks/util/remind-option-to-milliseconds.spec.ts b/src/app/features/tasks/util/remind-option-to-milliseconds.spec.ts
new file mode 100644
index 0000000000..7339e67136
--- /dev/null
+++ b/src/app/features/tasks/util/remind-option-to-milliseconds.spec.ts
@@ -0,0 +1,57 @@
+import { TaskReminderOptionId } from '../task.model';
+import {
+  millisecondsDiffToRemindOption,
+  remindOptionToMilliseconds,
+} from './remind-option-to-milliseconds';
+
+describe('remindOptionToMilliseconds roundtrip', () => {
+  const DUE_DATE = new Date('2026-01-01T12:00:00Z').getTime();
+
+  const options = [
+    TaskReminderOptionId.AtStart,
+    TaskReminderOptionId.m5,
+    TaskReminderOptionId.m10,
+    TaskReminderOptionId.m15,
+    TaskReminderOptionId.m30,
+    TaskReminderOptionId.h1,
+  ];
+
+  options.forEach((optId) => {
+    it(`should roundtrip correctly for ${optId}`, () => {
+      const remindAt = remindOptionToMilliseconds(DUE_DATE, optId);
+      expect(remindAt).toBeDefined();
+      const resultOptId = millisecondsDiffToRemindOption(DUE_DATE, remindAt);
+      expect(resultOptId).toBe(optId);
+    });
+  });
+
+  it('should handle quantization correctly (rounding to nearest bucket)', () => {
+    // 7 minutes before -> should round to m5 (since it's < 10m but >= 5m)
+    const m7 = 7 * 60 * 1000;
+    const remindAt7m = DUE_DATE - m7;
+    expect(millisecondsDiffToRemindOption(DUE_DATE, remindAt7m)).toBe(
+      TaskReminderOptionId.m5,
+    );
+
+    // 12 minutes before -> should round to m10
+    const m12 = 12 * 60 * 1000;
+    const remindAt12m = DUE_DATE - m12;
+    expect(millisecondsDiffToRemindOption(DUE_DATE, remindAt12m)).toBe(
+      TaskReminderOptionId.m10,
+    );
+
+    // 3 minutes before -> should round to m5 (since it's closer to 5 than 0)
+    const m3 = 3 * 60 * 1000;
+    const remindAt3m = DUE_DATE - m3;
+    expect(millisecondsDiffToRemindOption(DUE_DATE, remindAt3m)).toBe(
+      TaskReminderOptionId.m5,
+    );
+
+    // 1 minute before -> should round to AtStart
+    const m1 = 1 * 60 * 1000;
+    const remindAt1m = DUE_DATE - m1;
+    expect(millisecondsDiffToRemindOption(DUE_DATE, remindAt1m)).toBe(
+      TaskReminderOptionId.AtStart,
+    );
+  });
+});
diff --git a/src/app/features/tasks/util/remind-option-to-milliseconds.ts b/src/app/features/tasks/util/remind-option-to-milliseconds.ts
index d64da14e30..5fca24ed4b 100644
--- a/src/app/features/tasks/util/remind-option-to-milliseconds.ts
+++ b/src/app/features/tasks/util/remind-option-to-milliseconds.ts
@@ -1,6 +1,4 @@
 import { TaskReminderOptionId } from '../task.model';
-import { devError } from '../../../util/dev-error';
-import { TaskLog } from '../../../core/log';
 
 export const remindOptionToMilliseconds = (
   due: number,
@@ -42,21 +40,20 @@ export const millisecondsDiffToRemindOption = (
     return TaskReminderOptionId.DoNotRemind;
   }
   const diff: number = due - remindAt;
-  if (diff >= 60 * 60 * 1000) {
+  const diffInMinutes = diff / (60 * 1000);
+
+  if (diffInMinutes >= 45) {
     return TaskReminderOptionId.h1;
-  } else if (diff >= 30 * 60 * 1000) {
+  } else if (diffInMinutes >= 22.5) {
     return TaskReminderOptionId.m30;
-  } else if (diff >= 15 * 60 * 1000) {
+  } else if (diffInMinutes >= 12.5) {
     return TaskReminderOptionId.m15;
-  } else if (diff >= 10 * 60 * 1000) {
+  } else if (diffInMinutes >= 7.5) {
     return TaskReminderOptionId.m10;
-  } else if (diff >= 5 * 60 * 1000) {
+  } else if (diffInMinutes >= 2.5) {
     return TaskReminderOptionId.m5;
-  } else if (diff <= 0) {
-    return TaskReminderOptionId.AtStart;
   } else {
-    TaskLog.log(due, remindAt);
-    devError('Cannot determine remind option. Invalid params');
-    return TaskReminderOptionId.DoNotRemind;
+    // Also handles diff <= 0
+    return TaskReminderOptionId.AtStart;
   }
 };
diff --git a/src/app/t.const.ts b/src/app/t.const.ts
index 36daedd63c..fc846fea53 100644
--- a/src/app/t.const.ts
+++ b/src/app/t.const.ts
@@ -31,7 +31,16 @@ const T = {
     RESTORE_STRAY_BACKUP: 'CONFIRM.RESTORE_STRAY_BACKUP',
   },
   DATETIME_SCHEDULE: {
+    MONTH: 'DATETIME_SCHEDULE.MONTH',
+    NEXT_24_YEARS: 'DATETIME_SCHEDULE.NEXT_24_YEARS',
+    NEXT_MONTH: 'DATETIME_SCHEDULE.NEXT_MONTH',
+    NEXT_YEAR: 'DATETIME_SCHEDULE.NEXT_YEAR',
     PRESS_ENTER_AGAIN: 'DATETIME_SCHEDULE.PRESS_ENTER_AGAIN',
+    PREVIOUS_24_YEARS: 'DATETIME_SCHEDULE.PREVIOUS_24_YEARS',
+    PREVIOUS_MONTH: 'DATETIME_SCHEDULE.PREVIOUS_MONTH',
+    PREVIOUS_YEAR: 'DATETIME_SCHEDULE.PREVIOUS_YEAR',
+    SWITCH_TO_MULTI_YEAR_VIEW: 'DATETIME_SCHEDULE.SWITCH_TO_MULTI_YEAR_VIEW',
+    SWITCH_TO_YEAR_VIEW: 'DATETIME_SCHEDULE.SWITCH_TO_YEAR_VIEW',
   },
   DIALOG_LOGS: {
     COPY: 'DIALOG_LOGS.COPY',
diff --git a/src/app/ui/datetime-picker/datetime-picker.component.html b/src/app/ui/datetime-picker/datetime-picker.component.html
new file mode 100644
index 0000000000..80cc8491ff
--- /dev/null
+++ b/src/app/ui/datetime-picker/datetime-picker.component.html
@@ -0,0 +1,102 @@
+@if (showQuickAccess()) {
+  <div class="quick-access">
+    <button
+      mat-icon-button
+      type="button"
+      (click)="quickAccessBtnClick($event, 'today')"
+      [matTooltip]="quickAccessTranslationPrefix() + '.QA_TODAY' | translate"
+    >
+      <mat-icon>wb_sunny</mat-icon>
+    </button>
+
+    <button
+      mat-icon-button
+      type="button"
+      (click)="quickAccessBtnClick($event, 'tomorrow')"
+      [matTooltip]="quickAccessTranslationPrefix() + '.QA_TOMORROW' | translate"
+    >
+      <mat-icon>wb_twilight</mat-icon>
+    </button>
+    <button
+      mat-icon-button
+      type="button"
+      (click)="quickAccessBtnClick($event, 'nextWeek')"
+      [matTooltip]="quickAccessTranslationPrefix() + '.QA_NEXT_WEEK' | translate"
+    >
+      <mat-icon>next_week</mat-icon>
+    </button>
+    <button
+      mat-icon-button
+      type="button"
+      (click)="quickAccessBtnClick($event, 'nextMonth')"
+      [matTooltip]="quickAccessTranslationPrefix() + '.QA_NEXT_MONTH' | translate"
+    >
+      <mat-icon>bedtime</mat-icon>
+    </button>
+  </div>
+}
+
+@if (isConfigReady()) {
+  <mat-calendar
+    (keydown)="onKeyDownOnCalendar($event)"
+    [selected]="calendarSelectedDate"
+    [minDate]="minDate()"
+    (selectedChange)="dateSelected.emit($event)"
+  ></mat-calendar>
+}
+
+@if (isShowEnterMsg) {
+  <div
+    class="press-enter-msg"
+    @fade
+  >
+    {{ T.DATETIME_SCHEDULE.PRESS_ENTER_AGAIN | translate }}
+  </div>
+}
+
+<div class="form-ctrl-wrapper">
+  <mat-form-field class="time-form-field">
+    <mat-label>{{ timeLabel() }}</mat-label>
+    <mat-icon matPrefix>schedule</mat-icon>
+    <input
+      type="time"
+      spTimeStep
+      (focus)="onTimeFocus()"
+      [ngModel]="selectedTime()"
+      (ngModelChange)="onTimeChange($event)"
+      step="60"
+      matInput
+      (keydown)="onTimeKeyDown($event)"
+    />
+    @if (selectedTime()) {
+      <mat-icon
+        class="time-clear-btn"
+        matSuffix
+        (click)="onTimeClear($event)"
+        >close
+      </mat-icon>
+    }
+  </mat-form-field>
+
+  @if (selectedTime()) {
+    <mat-form-field
+      [@expandFade]
+      class="reminder-form-field"
+    >
+      <mat-icon matPrefix>alarm</mat-icon>
+      <mat-label>{{ reminderLabel() | translate }}</mat-label>
+      <mat-select
+        [ngModel]="selectedReminderCfgId()"
+        (ngModelChange)="onReminderChange($event)"
+        name="type"
+        required="true"
+      >
+        @for (remindOption of reminderOptions(); track remindOption.value) {
+          <mat-option [value]="remindOption.value">
+            {{ remindOption.label | translate }}
+          </mat-option>
+        }
+      </mat-select>
+    </mat-form-field>
+  }
+</div>
diff --git a/src/app/ui/datetime-picker/datetime-picker.component.scss b/src/app/ui/datetime-picker/datetime-picker.component.scss
new file mode 100644
index 0000000000..b8e152ee0f
--- /dev/null
+++ b/src/app/ui/datetime-picker/datetime-picker.component.scss
@@ -0,0 +1,164 @@
+@use '../../../styles/_globals.scss' as *;
+
+:host {
+  display: block;
+  user-select: none;
+  width: 100%;
+
+  &.sp-hide-cursor {
+    cursor: none !important;
+
+    ::ng-deep {
+      .mat-calendar-body-cell-content {
+        cursor: none !important;
+      }
+      // Suppress hover-only styling (when not focused) when cursor is hidden
+      .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover:not(:focus)
+        > .mat-calendar-body-cell-content {
+        outline: none !important;
+
+        &:not(.mat-calendar-body-selected) {
+          background-color: transparent !important;
+        }
+      }
+    }
+  }
+
+  ::ng-deep {
+    mat-calendar {
+      height: 400px;
+    }
+
+    .mat-calendar-header {
+      padding-top: 0;
+    }
+
+    .mat-calendar-body-selected {
+      background: var(--c-primary) !important;
+      color: var(--c-contrast) !important;
+    }
+
+    .mat-calendar-controls {
+      margin-top: var(--s);
+      margin-bottom: var(--s);
+    }
+
+    // Hide extra month name inside the calendar body
+    // NOTE: visibility: hidden (not display: none) is intentional — the cell must
+    // stay in the grid flow so the first week's day numbers are offset to the
+    // correct weekday column. display: none collapses it and left-aligns all days.
+    .mat-calendar-body-label {
+      visibility: hidden !important;
+      padding: 0 !important;
+    }
+
+    .mat-calendar-period-button {
+      cursor: pointer !important;
+      transition: background-color var(--transition-duration-s) ease;
+
+      &:hover {
+        background-color: var(--calendar-hover-bg) !important;
+        border-radius: var(--card-border-radius) !important;
+      }
+    }
+
+    // Style previous/next buttons hover circles
+    .mat-calendar-previous-button:not(:disabled):hover,
+    .mat-calendar-next-button:not(:disabled):hover {
+      background-color: var(--calendar-hover-bg) !important;
+      border-radius: 50% !important;
+    }
+  }
+
+  :host-context([dir='rtl']) {
+    ::ng-deep {
+      .mat-calendar-previous-button,
+      .mat-calendar-next-button {
+        transform: rotate(180deg);
+      }
+    }
+  }
+}
+
+.quick-access {
+  display: flex;
+  justify-content: space-evenly;
+  @include extraBorder('-bottom');
+  height: 48px;
+
+  > button {
+    height: 48px;
+    flex-grow: 1;
+    border-radius: var(--card-border-radius) !important;
+
+    ::ng-deep .mat-mdc-button-persistent-ripple {
+      border-radius: var(--card-border-radius) !important;
+    }
+  }
+
+  button + button {
+    @include extraBorder('-left');
+  }
+}
+
+:host ::ng-deep mat-month-view .mat-calendar-body-today {
+  color: transparent !important;
+  border: none !important;
+  border-color: transparent !important;
+  outline: none !important;
+  box-shadow: none !important;
+
+  &:after {
+    @include materialIcon('wb_sunny');
+    @include center;
+    color: var(--c-accent) !important;
+  }
+
+  &.mat-calendar-body-selected:after {
+    color: var(--c-contrast) !important;
+  }
+}
+
+:host ::ng-deep {
+  mat-year-view .mat-calendar-body-today,
+  mat-multi-year-view .mat-calendar-body-today {
+    border: none !important;
+    border-color: transparent !important;
+    outline: none !important;
+    box-shadow: none !important;
+
+    &:not(.mat-calendar-body-selected) {
+      color: var(--c-accent) !important;
+    }
+  }
+}
+
+.press-enter-msg {
+  text-align: center;
+  font-weight: bold;
+  padding: var(--s-half) 12px;
+  position: absolute;
+  left: 50%;
+  z-index: 11;
+  box-shadow: var(--whiteframe-shadow-1dp);
+  border-radius: 8px;
+  margin-top: -12px;
+  white-space: nowrap;
+  transform: translateX(-50%);
+  background: var(--bg-lighter);
+}
+
+.form-ctrl-wrapper {
+  margin: var(--s2) var(--s2) var(--s2);
+  display: flex;
+  flex-direction: column;
+  gap: var(--s);
+
+  mat-form-field {
+    width: 100%;
+  }
+
+  .time-clear-btn {
+    cursor: pointer;
+  }
+}
diff --git a/src/app/ui/datetime-picker/datetime-picker.component.spec.ts b/src/app/ui/datetime-picker/datetime-picker.component.spec.ts
new file mode 100644
index 0000000000..5a80a46680
--- /dev/null
+++ b/src/app/ui/datetime-picker/datetime-picker.component.spec.ts
@@ -0,0 +1,196 @@
+import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing';
+import { DateTimePickerComponent } from './datetime-picker.component';
+import { DateService } from '../../core/date/date.service';
+import { GlobalConfigService } from '../../features/config/global-config.service';
+import { MatNativeDateModule } from '@angular/material/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule, TranslateService, TranslateStore } from '@ngx-translate/core';
+import { signal } from '@angular/core';
+import { TaskReminderOptionId } from '../../features/tasks/task.model';
+
+describe('DateTimePickerComponent', () => {
+  let component: DateTimePickerComponent;
+  let fixture: ComponentFixture<DateTimePickerComponent>;
+  let dateServiceSpy: jasmine.SpyObj<DateService>;
+  let globalConfigServiceMock: any;
+
+  beforeEach(async () => {
+    dateServiceSpy = jasmine.createSpyObj('DateService', ['isToday', 'todayStr']);
+    globalConfigServiceMock = {
+      localization: signal({}),
+      cfg: signal({}),
+    };
+
+    await TestBed.configureTestingModule({
+      imports: [
+        DateTimePickerComponent,
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+        MatNativeDateModule,
+      ],
+      providers: [
+        { provide: DateService, useValue: dateServiceSpy },
+        { provide: GlobalConfigService, useValue: globalConfigServiceMock },
+        TranslateService,
+        TranslateStore,
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DateTimePickerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render the calendar by default', () => {
+    const calendarEl = fixture.nativeElement.querySelector('mat-calendar');
+    expect(calendarEl).toBeTruthy();
+  });
+
+  it('should emit dateSelected when a date is selected on the calendar', () => {
+    spyOn(component.dateSelected, 'emit');
+    const testDate = new Date();
+    component.dateSelected.emit(testDate);
+    expect(component.dateSelected.emit).toHaveBeenCalledWith(testDate);
+  });
+
+  it('should emit timeChanged when onTimeChange is called', () => {
+    spyOn(component.timeChanged, 'emit');
+    component.onTimeChange('10:30');
+    expect(component.timeChanged.emit).toHaveBeenCalledWith('10:30');
+  });
+
+  it('should emit reminderChanged when onReminderChange is called', () => {
+    spyOn(component.reminderChanged, 'emit');
+    component.onReminderChange(TaskReminderOptionId.AtStart);
+    expect(component.reminderChanged.emit).toHaveBeenCalledWith(
+      TaskReminderOptionId.AtStart,
+    );
+  });
+
+  it('should emit quickAccessClick when quickAccessBtnClick is called', () => {
+    spyOn(component.quickAccessClick, 'emit');
+    const mockEvent = new MouseEvent('click');
+    component.quickAccessBtnClick(mockEvent, 'tomorrow');
+    expect(component.quickAccessClick.emit).toHaveBeenCalledWith('tomorrow');
+  });
+
+  it('should emit timeChanged with null and reminderChanged with DoNotRemind when onTimeClear is called', () => {
+    spyOn(component.timeChanged, 'emit');
+    spyOn(component.reminderChanged, 'emit');
+    const mockEvent = new MouseEvent('click');
+    component.onTimeClear(mockEvent);
+    expect(component.timeChanged.emit).toHaveBeenCalledWith(null);
+    expect(component.reminderChanged.emit).toHaveBeenCalledWith(
+      TaskReminderOptionId.DoNotRemind,
+    );
+  });
+
+  it('should autofill time on focus', () => {
+    spyOn(component.timeChanged, 'emit');
+    spyOn(component.dateSelected, 'emit');
+    fixture.componentRef.setInput('selectedDate', new Date(2026, 4, 6));
+    fixture.componentRef.setInput('selectedTime', null);
+    dateServiceSpy.isToday.and.returnValue(false);
+
+    component.onTimeFocus();
+
+    expect(component.timeChanged.emit).toHaveBeenCalledWith('09:00');
+  });
+
+  it('should toggle isKeyboardNavigating based on keyboard navigation and mouse move', () => {
+    expect(component.isKeyboardNavigating).toBeFalse();
+
+    // Trigger keyboard navigation key down on calendar
+    const arrowDownEvent = new KeyboardEvent('keydown', { key: 'ArrowDown' });
+    component.onKeyDownOnCalendar(arrowDownEvent);
+    expect(component.isKeyboardNavigating).toBeTrue();
+
+    // Trigger non-navigation key down on calendar - should not reset it
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+    component.onKeyDownOnCalendar(enterEvent);
+    expect(component.isKeyboardNavigating).toBeTrue();
+
+    // Trigger mousemove with changed coordinates - should reset it to false
+    const mouseMoveEvent = new MouseEvent('mousemove', { clientX: 30, clientY: 40 });
+    component.onHostMouseMove(mouseMoveEvent);
+    expect(component.isKeyboardNavigating).toBeFalse();
+  });
+
+  it('should only update calendar activeDate when selectedDate changes', () => {
+    const calendar = component.calendar()!;
+    const initialDate = new Date(2026, 4, 6);
+    const sameDate = new Date(2026, 4, 6);
+    const differentDate = new Date(2026, 4, 7);
+
+    // Initial sync
+    fixture.componentRef.setInput('selectedDate', initialDate);
+    fixture.detectChanges();
+    expect(calendar.activeDate).toEqual(initialDate);
+
+    // Navigation (simulated by manual update to activeDate)
+    calendar.activeDate = new Date(2026, 5, 1);
+
+    // Sync with same date value - should NOT reset activeDate
+    fixture.componentRef.setInput('selectedDate', sameDate);
+    fixture.detectChanges();
+    expect(calendar.activeDate).toEqual(new Date(2026, 5, 1));
+
+    // Sync with different date value - SHOULD reset activeDate
+    fixture.componentRef.setInput('selectedDate', differentDate);
+    fixture.detectChanges();
+    expect(calendar.activeDate).toEqual(differentDate);
+  });
+
+  it('should emit enterSubmit when Enter is pressed on the calendar and date matches', () => {
+    spyOn(component.enterSubmit, 'emit');
+    fixture.componentRef.setInput('selectedDate', new Date(2026, 4, 6));
+    fixture.detectChanges();
+
+    const calendar = component.calendar()!;
+    calendar.activeDate = new Date(2026, 4, 6);
+
+    const enterEvent = new KeyboardEvent('keydown', { code: 'Enter' });
+
+    component.onKeyDownOnCalendar(enterEvent);
+    expect(component.enterSubmit.emit).toHaveBeenCalled();
+    expect(component.isShowEnterMsg).toBeTrue();
+  });
+
+  it('should require two Enter presses to emit enterSubmit on time input', () => {
+    spyOn(component.enterSubmit, 'emit');
+    fixture.componentRef.setInput('selectedTime', '10:30');
+    fixture.detectChanges();
+
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+
+    // First press
+    component.onTimeKeyDown(enterEvent);
+    expect(component.enterSubmit.emit).not.toHaveBeenCalled();
+    expect(component.isShowEnterMsg).toBeTrue();
+
+    // Second press
+    component.onTimeKeyDown(enterEvent);
+    expect(component.enterSubmit.emit).toHaveBeenCalled();
+  });
+
+  it('should focus the active calendar cell after view init', fakeAsync(() => {
+    // Create an element that querySelector will find
+    const activeCell = document.createElement('div');
+    activeCell.classList.add('mat-calendar-body-active');
+    activeCell.tabIndex = 0;
+    fixture.nativeElement.appendChild(activeCell);
+
+    spyOn(activeCell, 'focus');
+    // Mock querySelector on the native element
+    spyOn(fixture.nativeElement, 'querySelector').and.returnValue(activeCell);
+
+    component.ngAfterViewInit();
+    tick(50); // Match the 50ms in component
+
+    expect(activeCell.focus).toHaveBeenCalled();
+  }));
+});
diff --git a/src/app/ui/datetime-picker/datetime-picker.component.ts b/src/app/ui/datetime-picker/datetime-picker.component.ts
new file mode 100644
index 0000000000..87cfe8cb4e
--- /dev/null
+++ b/src/app/ui/datetime-picker/datetime-picker.component.ts
@@ -0,0 +1,290 @@
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  computed,
+  effect,
+  ElementRef,
+  HostBinding,
+  HostListener,
+  inject,
+  input,
+  output,
+  viewChild,
+} from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { MatCalendar } from '@angular/material/datepicker';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIcon } from '@angular/material/icon';
+import {
+  MatFormField,
+  MatLabel,
+  MatPrefix,
+  MatSuffix,
+} from '@angular/material/form-field';
+import { MatInput } from '@angular/material/input';
+import { MatSelect } from '@angular/material/select';
+import { MatOption } from '@angular/material/core';
+import { MatTooltip } from '@angular/material/tooltip';
+import { TranslateModule, TranslatePipe } from '@ngx-translate/core';
+import { T } from '../../t.const';
+import { DateService } from '../../core/date/date.service';
+import { GlobalConfigService } from '../../features/config/global-config.service';
+import {
+  TaskReminderOption,
+  TaskReminderOptionId,
+} from '../../features/tasks/task.model';
+import { TASK_REMINDER_OPTIONS } from '../../features/planner/dialog-schedule-task/task-reminder-options.const';
+import { TimeStepDirective } from '../time-step/time-step.directive';
+import { expandFadeAnimation } from '../animations/expand.ani';
+import { fadeAnimation } from '../animations/fade.ani';
+import { getClockStringFromHours } from '../../util/get-clock-string-from-hours';
+
+const DEFAULT_TIME = '09:00';
+
+@Component({
+  selector: 'datetime-picker',
+  standalone: true,
+  imports: [
+    FormsModule,
+    MatCalendar,
+    MatButtonModule,
+    MatIcon,
+    MatFormField,
+    MatLabel,
+    MatPrefix,
+    MatSuffix,
+    MatInput,
+    MatSelect,
+    MatOption,
+    MatTooltip,
+    TranslateModule,
+    TranslatePipe,
+    TimeStepDirective,
+  ],
+  templateUrl: './datetime-picker.component.html',
+  styleUrl: './datetime-picker.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [expandFadeAnimation, fadeAnimation],
+})
+export class DateTimePickerComponent implements AfterViewInit {
+  private _dateService = inject(DateService);
+  private _globalConfigService = inject(GlobalConfigService);
+  private readonly _cdr = inject(ChangeDetectorRef);
+  private _el = inject(ElementRef);
+
+  pickerSelectedDate: Date | null = null;
+
+  constructor() {
+    effect((onCleanup) => {
+      const cal = this.calendar();
+      if (cal) {
+        // Set initial view and date
+        if (cal.currentView !== 'month') {
+          this.pickerSelectedDate = cal.activeDate;
+        }
+
+        const sub = cal.stateChanges.subscribe(() => {
+          if (cal.currentView !== 'month') {
+            this.pickerSelectedDate = cal.activeDate;
+          }
+          this._cdr.markForCheck();
+        });
+        onCleanup(() => sub.unsubscribe());
+      }
+    });
+  }
+
+  // Inputs
+  selectedDate = input<Date | null>(null);
+  selectedTime = input<string | null>(null);
+  selectedReminderCfgId = input<TaskReminderOptionId>(TaskReminderOptionId.DoNotRemind);
+  reminderOptions = input<TaskReminderOption[]>(TASK_REMINDER_OPTIONS);
+  minDate = input<Date | null>(null);
+  timeLabel = input<string>('Time');
+  reminderLabel = input<string>(T.F.TASK.D_SCHEDULE_TASK.REMIND_AT);
+  showQuickAccess = input<boolean>(true);
+  quickAccessTranslationPrefix = input<string>('F.TASK.D_SCHEDULE_TASK');
+
+  // Outputs
+  dateSelected = output<Date>();
+  timeChanged = output<string | null>();
+  reminderChanged = output<TaskReminderOptionId>();
+  quickAccessClick = output<'today' | 'tomorrow' | 'nextWeek' | 'nextMonth'>();
+  enterSubmit = output<void>();
+
+  // Template variables
+  T: typeof T = T;
+  isInitValOnTimeFocus = true;
+  isShowEnterMsg = false;
+  @HostBinding('class.sp-hide-cursor') isKeyboardNavigating = false;
+
+  readonly calendar = viewChild(MatCalendar);
+
+  readonly isConfigReady = computed(
+    () => this._globalConfigService.localization() !== undefined,
+  );
+
+  get calendarSelectedDate(): Date | null {
+    const cal = this.calendar();
+    if (!cal) {
+      return this.selectedDate();
+    }
+    if (cal.currentView === 'month') {
+      return this.selectedDate();
+    }
+    return this.pickerSelectedDate || cal.activeDate;
+  }
+
+  private _lastSyncedDate: number | null = null;
+  private _syncActiveDateEffect = effect(() => {
+    const date = this.selectedDate();
+    const dateMs = date ? new Date(date).getTime() : null;
+    if (dateMs === this._lastSyncedDate) {
+      return;
+    }
+    this._lastSyncedDate = dateMs;
+
+    const cal = this.calendar();
+    if (cal) {
+      cal.activeDate = new Date(date || new Date());
+    }
+  });
+
+  private _timeCheckVal: string | null = null;
+
+  onKeyDownOnCalendar(ev: KeyboardEvent): void {
+    this._timeCheckVal = null;
+    if (ev.code === 'Enter' || ev.code === 'Space') {
+      this.isShowEnterMsg = true;
+      const cal = this.calendar();
+      const selDate = this.selectedDate();
+      if (
+        cal &&
+        selDate &&
+        new Date(selDate).getTime() === new Date(cal.activeDate).getTime()
+      ) {
+        this.enterSubmit.emit();
+      }
+    } else {
+      this.isShowEnterMsg = false;
+    }
+
+    if (
+      [
+        'ArrowUp',
+        'ArrowDown',
+        'ArrowLeft',
+        'ArrowRight',
+        'Home',
+        'End',
+        'PageUp',
+        'PageDown',
+      ].includes(ev.key)
+    ) {
+      this.isKeyboardNavigating = true;
+      this._cdr.markForCheck();
+    }
+  }
+
+  onTimeFocus(): void {
+    if (!this.selectedTime() && this.isInitValOnTimeFocus) {
+      this.isInitValOnTimeFocus = false;
+
+      let targetTime: string;
+      let targetDate: Date | null = null;
+
+      const selDate = this.selectedDate();
+      if (selDate) {
+        if (this._dateService.isToday(selDate)) {
+          targetTime = getClockStringFromHours((new Date().getHours() + 1) % 24);
+        } else {
+          targetTime = DEFAULT_TIME;
+        }
+      } else {
+        // get current time +1h
+        targetTime = getClockStringFromHours((new Date().getHours() + 1) % 24);
+        targetDate = new Date();
+      }
+
+      if (targetDate) {
+        this.dateSelected.emit(targetDate);
+      }
+      this.timeChanged.emit(targetTime);
+    }
+  }
+
+  onTimeChange(newTime: string | null): void {
+    this.timeChanged.emit(newTime);
+  }
+
+  onReminderChange(newReminder: TaskReminderOptionId): void {
+    this.reminderChanged.emit(newReminder);
+  }
+
+  onTimeKeyDown(ev: KeyboardEvent): void {
+    if (ev.key === 'Enter') {
+      this.isShowEnterMsg = true;
+      if (this._timeCheckVal === this.selectedTime()) {
+        this.enterSubmit.emit();
+      }
+      this._timeCheckVal = this.selectedTime();
+    } else {
+      this.isShowEnterMsg = false;
+    }
+  }
+
+  onTimeClear(ev: MouseEvent): void {
+    ev.stopPropagation();
+    this.timeChanged.emit(null);
+    this.reminderChanged.emit(TaskReminderOptionId.DoNotRemind);
+    this.isInitValOnTimeFocus = true;
+    this._timeCheckVal = null;
+  }
+
+  quickAccessBtnClick(
+    ev: MouseEvent,
+    val: 'today' | 'tomorrow' | 'nextWeek' | 'nextMonth',
+  ): void {
+    ev.preventDefault();
+    this.quickAccessClick.emit(val);
+  }
+
+  private _lastMouseCoords: { x: number; y: number } | null = null;
+
+  ngAfterViewInit(): void {
+    // Focus the active calendar cell when the picker opens
+    setTimeout(() => {
+      const activeCell = this._el.nativeElement.querySelector(
+        '.mat-calendar-body-active',
+      ) as HTMLElement;
+      if (activeCell) {
+        activeCell.focus();
+      }
+    }, 50);
+  }
+
+  @HostListener('mousemove', ['$event'])
+  onHostMouseMove(ev: MouseEvent): void {
+    this._resetKeyboardNav(ev);
+  }
+
+  private _resetKeyboardNav(ev: MouseEvent): boolean {
+    const coords = { x: ev.clientX, y: ev.clientY };
+    if (
+      this._lastMouseCoords &&
+      this._lastMouseCoords.x === coords.x &&
+      this._lastMouseCoords.y === coords.y
+    ) {
+      return false;
+    }
+    this._lastMouseCoords = coords;
+
+    if (this.isKeyboardNavigating) {
+      this.isKeyboardNavigating = false;
+      this._cdr.markForCheck();
+    }
+    return true;
+  }
+}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 03d9329d23..6983bfc663 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -30,7 +30,16 @@
     "RESTORE_STRAY_BACKUP": "During the last sync, there may have been an error. Do you want to restore the last backup?"
   },
   "DATETIME_SCHEDULE": {
-    "PRESS_ENTER_AGAIN": "Press enter again to save"
+    "MONTH": "Month",
+    "NEXT_24_YEARS": "Next 24 years",
+    "NEXT_MONTH": "Next month",
+    "NEXT_YEAR": "Next year",
+    "PRESS_ENTER_AGAIN": "Press enter again to save",
+    "PREVIOUS_24_YEARS": "Previous 24 years",
+    "PREVIOUS_MONTH": "Previous month",
+    "PREVIOUS_YEAR": "Previous year",
+    "SWITCH_TO_MULTI_YEAR_VIEW": "Choose year",
+    "SWITCH_TO_YEAR_VIEW": "Choose month"
   },
   "DIALOG_LOGS": {
     "COPY": "Copy",
diff --git a/src/main.ts b/src/main.ts
index ddb80ce97e..ff989cd17e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -44,6 +44,7 @@ import {
   MatDateFormats,
   DateAdapter,
 } from '@angular/material/core';
+import { MatDatepickerIntl } from '@angular/material/datepicker';
 import { FormlyConfigModule } from './app/ui/formly-config.module';
 import { markedOptionsFactory } from './app/ui/marked-options-factory';
 import { MaterialCssVarsModule } from 'angular-material-css-vars';
@@ -89,6 +90,7 @@ import { GlobalConfigService } from './app/features/config/global-config.service
 import { LocaleDatePipe } from './app/ui/pipes/locale-date.pipe';
 import { DateTimeFormatService } from './app/core/date-time-format/date-time-format.service';
 import { CustomDateAdapter } from './app/core/date-time-format/custom-date-adapter';
+import { TranslateMatDatepickerIntl } from './app/core/date-time-format/translate-mat-datepicker-intl';
 import { unlockAudioContext } from './app/util/audio-context';
 import { NetworkRetryInterceptorService } from './app/core/http/network-retry-interceptor.service';
 
@@ -202,6 +204,7 @@ bootstrapApplication(AppComponent, {
     ShortTimeHtmlPipe,
     ShortTimePipe,
     { provide: DateAdapter, useClass: CustomDateAdapter },
+    { provide: MatDatepickerIntl, useClass: TranslateMatDatepickerIntl },
     {
       provide: MAT_DATE_FORMATS,
       useFactory: (dateTimeFormatService: DateTimeFormatService): MatDateFormats => {
@@ -217,7 +220,7 @@ bootstrapApplication(AppComponent, {
             get dateInput(): string {
               return dateTimeFormatService.dateFormat().raw;
             },
-            monthYearLabel: { year: 'numeric', month: 'short' },
+            monthYearLabel: { year: 'numeric', month: 'long' },
             dateA11yLabel: { year: 'numeric', month: 'long', day: 'numeric' },
             monthYearA11yLabel: { year: 'numeric', month: 'long' },
             timeInput: { hour: 'numeric', minute: 'numeric' },
diff --git a/src/styles/components/_overwrite-material.scss b/src/styles/components/_overwrite-material.scss
index 36bd55e67d..6de6fd6e86 100644
--- a/src/styles/components/_overwrite-material.scss
+++ b/src/styles/components/_overwrite-material.scss
@@ -13,6 +13,7 @@
   --mat-tab-header-active-hover-label-text-color: var(--palette-primary-700);
   --mdc-tab-indicator-active-indicator-color: var(--palette-primary-700);
   --mat-tab-header-inactive-label-text-color: var(--text-color-muted);
+  --calendar-hover-bg: color-mix(in srgb, var(--c-primary) 35%, transparent);
 }
 
 // Dark theme tab overrides for better contrast - use lighter shade
@@ -22,6 +23,7 @@ body.isDarkTheme {
   --mat-tab-header-active-focus-label-text-color: var(--palette-primary-300);
   --mat-tab-header-active-hover-label-text-color: var(--palette-primary-300);
   --mdc-tab-indicator-active-indicator-color: var(--palette-primary-300);
+  --calendar-hover-bg: color-mix(in srgb, var(--c-primary) 20%, transparent);
 }
 
 // Apply tab colors explicitly to tab components
@@ -483,3 +485,20 @@ body.isVerticalActionBar .cdk-overlay-pane.mat-mdc-tooltip-panel {
   display: flex !important;
   align-items: center !important;
 }
+
+// Shared calendar hover and focus overrides
+.mat-calendar:not(.no-hover-effects) {
+  .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover
+    > .mat-calendar-body-cell-content,
+  .mat-calendar-body-cell:not(.mat-calendar-body-disabled):focus
+    .mat-calendar-body-cell-content {
+    outline: 2px solid color-mix(in srgb, var(--c-accent) 80%, transparent) !important;
+  }
+
+  .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover
+    > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected),
+  .mat-calendar-body-cell:not(.mat-calendar-body-disabled):focus
+    > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected) {
+    background-color: var(--calendar-hover-bg) !important;
+  }
+}

From 7ea7fe2258a225fe2ad0a745045f99a55d3a1f7a Mon Sep 17 00:00:00 2001
From: "Tomas Sykora, jr." <jump@syky.cz>
Date: Tue, 9 Jun 2026 16:55:36 +0200
Subject: [PATCH 11/11] feat(redmine): allow searching issues by id (#8072)

* feat(redmine): allow searching issues by id

Redmine's search API only performs full text search and does not match
issue ids. For numeric queries (e.g. "1234" or "#1234") additionally
fetch the issue directly via /issues/{id}.json and merge it into the
search results.

* refactor(redmine): scope search-by-id lookup to the configured project

Addresses review: GET /issues/{id}.json resolves globally, so a provider
configured for one project could surface (and add) an issue from another
project the API key can see. Look the issue up via the project-scoped
/projects/{projectId}/issues.json?issue_id=&status_id=* endpoint instead,
which keeps results within the configured project, still finds closed
issues, and lets Redmine resolve the project (numeric id or slug). The
global getById$ is left unchanged for the existing refresh/poll path.

Adds a spec asserting an id from another project is not surfaced.
---
 .../redmine/redmine-api.service.spec.ts       | 162 ++++++++++++++++++
 .../providers/redmine/redmine-api.service.ts  |  63 ++++++-
 .../redmine/redmine-issue-map.util.ts         |  12 +-
 3 files changed, 232 insertions(+), 5 deletions(-)
 create mode 100644 src/app/features/issue/providers/redmine/redmine-api.service.spec.ts

diff --git a/src/app/features/issue/providers/redmine/redmine-api.service.spec.ts b/src/app/features/issue/providers/redmine/redmine-api.service.spec.ts
new file mode 100644
index 0000000000..204db0fe45
--- /dev/null
+++ b/src/app/features/issue/providers/redmine/redmine-api.service.spec.ts
@@ -0,0 +1,162 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { HttpRequest } from '@angular/common/http';
+import { RedmineApiService } from './redmine-api.service';
+import { RedmineCfg } from './redmine.model';
+import { SearchResultItem } from '../../issue.model';
+import { SnackService } from '../../../../core/snack/snack.service';
+
+describe('RedmineApiService', () => {
+  let service: RedmineApiService;
+  let httpMock: HttpTestingController;
+
+  const mockCfg: RedmineCfg = {
+    isEnabled: true,
+    host: 'https://redmine.example.com',
+    projectId: 'test-project',
+    api_key: 'test-api-key',
+    scope: null,
+  };
+
+  const mockSearchResponse = {
+    results: [
+      {
+        id: 100,
+        title: 'Bug #100: Some text issue',
+        url: 'https://redmine.example.com/issues/100',
+      },
+    ],
+    total_count: 1,
+    offset: 0,
+    limit: 100,
+  };
+
+  // by-id lookup is scoped to the configured project (not the global /issues/{id}.json)
+  const byIdInProjectMatcher =
+    (issueId: number) =>
+    (req: HttpRequest<unknown>): boolean =>
+      req.method === 'GET' &&
+      req.url === `${mockCfg.host}/projects/${mockCfg.projectId}/issues.json` &&
+      req.params.get('issue_id') === String(issueId) &&
+      // status_id=* so closed issues are found too
+      req.params.get('status_id') === '*';
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        RedmineApiService,
+        {
+          provide: SnackService,
+          useValue: jasmine.createSpyObj('SnackService', ['open']),
+        },
+      ],
+    });
+    service = TestBed.inject(RedmineApiService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('searchIssuesInProject$', () => {
+    const searchUrl = (query: string): string =>
+      `${mockCfg.host}/projects/${mockCfg.projectId}/search.json?limit=100&q=${query}&issues=1&open_issues=1`;
+
+    it('should only send a text search request for non-numeric queries', () => {
+      let result: SearchResultItem[] | undefined;
+      service.searchIssuesInProject$('some text', mockCfg).subscribe((r) => (result = r));
+
+      const req = httpMock.expectOne(searchUrl('some%20text'));
+      expect(req.request.method).toBe('GET');
+      req.flush(mockSearchResponse);
+
+      httpMock.expectNone(byIdInProjectMatcher(100));
+      expect(result?.length).toBe(1);
+      expect(result?.[0].title).toBe('Bug #100: Some text issue');
+    });
+
+    it('should additionally fetch the issue by id (project-scoped) for numeric queries', () => {
+      let result: SearchResultItem[] | undefined;
+      service.searchIssuesInProject$('22899', mockCfg).subscribe((r) => (result = r));
+
+      const byIdReq = httpMock.expectOne(byIdInProjectMatcher(22899));
+      byIdReq.flush({ issues: [{ id: 22899, subject: 'Issue found by id' }] });
+
+      const searchReq = httpMock.expectOne(searchUrl('22899'));
+      searchReq.flush(mockSearchResponse);
+
+      expect(result?.length).toBe(2);
+      expect(result?.[0].title).toBe('#22899 Issue found by id');
+      expect((result?.[0].issueData as { id: number }).id).toBe(22899);
+    });
+
+    it('should support queries prefixed with #', () => {
+      let result: SearchResultItem[] | undefined;
+      service.searchIssuesInProject$('#22899', mockCfg).subscribe((r) => (result = r));
+
+      const byIdReq = httpMock.expectOne(byIdInProjectMatcher(22899));
+      byIdReq.flush({ issues: [{ id: 22899, subject: 'Issue found by id' }] });
+
+      const searchReq = httpMock.expectOne(searchUrl('%2322899'));
+      searchReq.flush({ ...mockSearchResponse, results: [] });
+
+      expect(result?.length).toBe(1);
+      expect(result?.[0].title).toBe('#22899 Issue found by id');
+    });
+
+    it('should de-duplicate the by-id issue from text search results', () => {
+      let result: SearchResultItem[] | undefined;
+      service.searchIssuesInProject$('100', mockCfg).subscribe((r) => (result = r));
+
+      const byIdReq = httpMock.expectOne(byIdInProjectMatcher(100));
+      byIdReq.flush({ issues: [{ id: 100, subject: 'Some text issue' }] });
+
+      const searchReq = httpMock.expectOne(searchUrl('100'));
+      searchReq.flush(mockSearchResponse);
+
+      expect(result?.length).toBe(1);
+      expect(result?.[0].title).toBe('#100 Some text issue');
+    });
+
+    it('should fall back to text search results when the id is not in the project', () => {
+      let result: SearchResultItem[] | undefined;
+      service.searchIssuesInProject$('99999', mockCfg).subscribe((r) => (result = r));
+
+      const byIdReq = httpMock.expectOne(byIdInProjectMatcher(99999));
+      // Redmine returns an empty list (not a 404) for an id outside the project
+      byIdReq.flush({ issues: [], total_count: 0, offset: 0, limit: 1 });
+
+      const searchReq = httpMock.expectOne(searchUrl('99999'));
+      searchReq.flush(mockSearchResponse);
+
+      expect(result?.length).toBe(1);
+      expect(result?.[0].title).toBe('Bug #100: Some text issue');
+    });
+
+    it('should not surface an issue id that belongs to another project', () => {
+      let result: SearchResultItem[] | undefined;
+      service.searchIssuesInProject$('424242', mockCfg).subscribe((r) => (result = r));
+
+      // The lookup is scoped to the configured project; an id belonging to another
+      // project the API key can see is therefore returned as an empty list by Redmine.
+      const byIdReq = httpMock.expectOne(byIdInProjectMatcher(424242));
+      byIdReq.flush({ issues: [], total_count: 0, offset: 0, limit: 1 });
+
+      const searchReq = httpMock.expectOne(searchUrl('424242'));
+      searchReq.flush({ ...mockSearchResponse, results: [] });
+
+      // no global /issues/{id}.json request is ever made
+      httpMock.expectNone(`${mockCfg.host}/issues/424242.json`);
+      expect(result?.length).toBe(0);
+    });
+  });
+});
diff --git a/src/app/features/issue/providers/redmine/redmine-api.service.ts b/src/app/features/issue/providers/redmine/redmine-api.service.ts
index f6b06d38a4..dfd039cee8 100644
--- a/src/app/features/issue/providers/redmine/redmine-api.service.ts
+++ b/src/app/features/issue/providers/redmine/redmine-api.service.ts
@@ -3,7 +3,7 @@ import { SnackService } from '../../../../core/snack/snack.service';
 import { HttpClient, HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http';
 import { RedmineCfg } from './redmine.model';
 import { catchError, filter, map } from 'rxjs/operators';
-import { Observable } from 'rxjs';
+import { forkJoin, Observable, of, throwError } from 'rxjs';
 import { throwHandledError } from '../../../../util/throw-handled-error';
 import { T } from '../../../../t.const';
 import { ISSUE_PROVIDER_HUMANIZED, REDMINE_TYPE } from '../../issue.const';
@@ -16,13 +16,18 @@ import {
   RedmineSearchResultItem,
   RedmineTimeEntriesResult,
 } from './redmine-issue.model';
-import { mapRedmineSearchResultItemToSearchResult } from './redmine-issue-map.util';
+import {
+  mapRedmineIssueToSearchResult,
+  mapRedmineSearchResultItemToSearchResult,
+} from './redmine-issue-map.util';
 import { SearchResultItem } from '../../issue.model';
 import { ScopeOptions } from './redmine.const';
 import { handleIssueProviderHttpError$ } from '../../handle-issue-provider-http-error';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
+const ISSUE_ID_QUERY_RGX = /^#?(\d+)$/;
+
 @Injectable({
   providedIn: 'root',
 })
@@ -31,7 +36,7 @@ export class RedmineApiService {
   private _http = inject(HttpClient);
 
   searchIssuesInProject$(query: string, cfg: RedmineCfg): Observable<SearchResultItem[]> {
-    return this._sendRequest$(
+    const textSearch$: Observable<SearchResultItem[]> = this._sendRequest$(
       {
         url: `${cfg.host}/projects/${cfg.projectId}/search.json`,
         params: ParamsBuilder.create()
@@ -51,6 +56,53 @@ export class RedmineApiService {
           : [];
       }),
     );
+
+    // Redmine's search API only does full text search and does not match issue ids,
+    // so for numeric queries (e.g. "1234" or "#1234") we additionally try to fetch
+    // the issue by its id and merge it into the results.
+    const idMatch = query.trim().match(ISSUE_ID_QUERY_RGX);
+    if (!idMatch) {
+      return textSearch$;
+    }
+
+    const issueId = Number(idMatch[1]);
+    return forkJoin([
+      this._getIssueByIdInProject$(issueId, cfg).pipe(catchError(() => of(null))),
+      textSearch$,
+    ]).pipe(
+      map(([issueById, textResults]) =>
+        issueById
+          ? [
+              mapRedmineIssueToSearchResult(issueById),
+              ...textResults.filter((result) => result.issueData.id !== issueId),
+            ]
+          : textResults,
+      ),
+    );
+  }
+
+  // Looks up a single issue by id but stays scoped to the configured project, so a
+  // provider for one project can never surface (or add) an issue from another project
+  // the API key happens to have access to. Redmine resolves the project from the URL,
+  // so this works whether `cfg.projectId` is the numeric id or the identifier slug.
+  // `status_id=*` ensures closed issues are found too. A cross-project (or unknown) id
+  // simply yields an empty list -> null, and the caller falls back to text search.
+  private _getIssueByIdInProject$(
+    issueId: number,
+    cfg: RedmineCfg,
+  ): Observable<RedmineIssue | null> {
+    return this._sendRequest$(
+      {
+        url: `${cfg.host}/projects/${cfg.projectId}/issues.json`,
+        params: ParamsBuilder.create()
+          .withParam('issue_id', String(issueId))
+          .withState('*')
+          .withLimit(1)
+          .build(),
+      },
+      cfg,
+      { isSkipErrorHandling: true },
+    ).pipe(map((res: RedmineIssueResult) => res?.issues?.[0] ?? null));
   }
 
   getLast100IssuesForCurrentRedmineProject$(cfg: RedmineCfg): Observable<RedmineIssue[]> {
@@ -137,6 +189,7 @@ export class RedmineApiService {
   private _sendRequest$(
     params: HttpRequest<string> | any,
     cfg: RedmineCfg,
+    { isSkipErrorHandling = false }: { isSkipErrorHandling?: boolean } = {},
   ): Observable<any> {
     this._checkSettings(cfg);
     params.headers = {
@@ -169,7 +222,9 @@ export class RedmineApiService {
       filter((res) => !(res === Object(res) && res.type === 0)),
       map((res: any) => (res && res.body ? res.body : res)),
       catchError((err) =>
-        handleIssueProviderHttpError$(REDMINE_TYPE, this._snackService, err),
+        isSkipErrorHandling
+          ? throwError(() => err)
+          : handleIssueProviderHttpError$(REDMINE_TYPE, this._snackService, err),
       ),
     );
   }
diff --git a/src/app/features/issue/providers/redmine/redmine-issue-map.util.ts b/src/app/features/issue/providers/redmine/redmine-issue-map.util.ts
index 37f35d5fda..1bc045dcd3 100644
--- a/src/app/features/issue/providers/redmine/redmine-issue-map.util.ts
+++ b/src/app/features/issue/providers/redmine/redmine-issue-map.util.ts
@@ -1,5 +1,5 @@
 import { IssueDataReduced, IssueProviderKey, SearchResultItem } from '../../issue.model';
-import { RedmineSearchResultItem } from './redmine-issue.model';
+import { RedmineIssue, RedmineSearchResultItem } from './redmine-issue.model';
 
 export const mapRedmineSearchResultItemToSearchResult = (
   item: RedmineSearchResultItem,
@@ -11,3 +11,13 @@ export const mapRedmineSearchResultItemToSearchResult = (
     issueData: item as IssueDataReduced,
   };
 };
+
+export const mapRedmineIssueToSearchResult = (issue: RedmineIssue): SearchResultItem => {
+  const title = `#${issue.id} ${issue.subject}`;
+  return {
+    title,
+    titleHighlighted: title,
+    issueType: 'REDMINE' as IssueProviderKey,
+    issueData: { ...issue, title: issue.subject },
+  };
+};