fix(jira): resets stale custom scope reference on disconnect or deletion

Closes BUG-008. viewState.tabFilters.jiraAssigned.scope could hold a
reference to a custom Jira scope ID that no longer exists after (1)
disconnecting Jira (clearJiraConfigFull wipes customScopes but left
the tab filter untouched), or (2) deleting the active custom scope via
JiraScopePicker. Either path let a stale scope ID survive into the
next fetchJiraAssigned() call, which fired an invalid JQL query and
surfaced a confusing 'Custom scope not supported' toast before the
existing error-handler/tab-mount guards self-healed it.

Extracts the validity check into a pure, exported staleJiraScopeReset()
helper shared by both call sites (handleJiraDisconnect and the scope
picker's onSave), matching the same built-in-scope list already used
by JiraAssignedTab's reactive guard. Adds direct unit tests for the
helper plus two integration tests covering the disconnect path.

Author: wgordon17

src/app/components/settings/SettingsPage.tsx

@@ -4,7 +4,8 @@ import * as Sentry from "@sentry/solid";
 import { getRelayStatus } from "../../lib/mcp-relay";
 import { useNavigate } from "@solidjs/router";
 import { config, updateConfig, updateJiraConfig, updateJiraCustomFields, updateJiraCustomScopes, setMonitoredRepo, isActionsBasedTab } from "../../stores/config";
-import { viewState, updateViewState } from "../../stores/view";
+import type { JiraCustomField } from "../../../shared/schemas";
+import { viewState, updateViewState, setTabFilter } from "../../stores/view";
 import { clearAuth, jiraAuth, setJiraAuth, clearJiraConfigFull, isJiraAuthenticated, token, setAuthFromPat } from "../../stores/auth";
 import type { GitHubUser } from "../../stores/auth";
 import { isValidPatFormat } from "../../lib/pat";
@@ -60,6 +61,21 @@ export const SETTINGS_PAGE_SECTION_IDS = [
   "data",
 ] as const;
 
+// Built-in Jira scope values, duplicated from JiraAssignedTab.tsx's BUILTIN_SCOPE_OPTIONS
+// (not exported there to avoid a cross-component coupling for 3 literal strings).
+const BUILTIN_JIRA_SCOPES = ["assigned", "reported", "watching"];
+
+/**
+ * Returns the scope value to fall back to if `activeScope` no longer exists in
+ * `scopes` (e.g. the custom scope backing it was just deleted, or Jira was
+ * disconnected and `scopes` is empty) — otherwise null. Guards against firing
+ * an invalid JQL query with a stale custom scope ID (BUG-008).
+ */
+export function staleJiraScopeReset(activeScope: string, scopes: JiraCustomField[]): string | null {
+  const validScopeIds = new Set([...BUILTIN_JIRA_SCOPES, ...scopes.map((s) => s.id)]);
+  return validScopeIds.has(activeScope) ? null : "assigned";
+}
+
 export default function SettingsPage() {
   const navigate = useNavigate();
 
@@ -433,6 +449,11 @@ export default function SettingsPage() {
     if (viewState.lastActiveTab === "jiraAssigned") {
       updateViewState({ lastActiveTab: "issues" });
     }
+    // Stale scope guard: clearJiraConfigFull() wipes customScopes, so a tab
+    // filter pointing at a custom scope ID would otherwise survive reconnect
+    // and fire an invalid JQL query against the new Jira instance (BUG-008).
+    const reset = staleJiraScopeReset(viewState.tabFilters.jiraAssigned.scope, []);
+    if (reset) setTabFilter("jiraAssigned", "scope", reset);
   }
 
   // ── Refresh interval options ──────────────────────────────────────────────
@@ -1270,7 +1291,15 @@ export default function SettingsPage() {
                   <JiraScopePicker
                     client={jiraClient()!}
                     selectedScopes={config.jira?.customScopes ?? []}
-                    onSave={(scopes) => { updateJiraCustomScopes(scopes); setShowScopePicker(false); }}
+                    onSave={(scopes) => {
+                      updateJiraCustomScopes(scopes);
+                      setShowScopePicker(false);
+                      // Stale scope guard: if the active Jira tab filter pointed at a
+                      // custom scope that was just removed, reset it before it can fire
+                      // an invalid JQL query (BUG-008).
+                      const reset = staleJiraScopeReset(viewState.tabFilters.jiraAssigned.scope, scopes);
+                      if (reset) setTabFilter("jiraAssigned", "scope", reset);
+                    }}
                     onCancel={() => setShowScopePicker(false)}
                   />
                 </div>

tests/components/settings/JiraSection.test.tsx

@@ -103,9 +103,10 @@ vi.mock("../../../src/app/stores/config", () => ({
 }));
 
 vi.mock("../../../src/app/stores/view", () => ({
-  viewState: { lastActiveTab: "issues", tabFilters: {}, expandedRepos: {}, lockedRepos: {}, trackedItems: [], activeScopeTab: "involved" },
+  viewState: { lastActiveTab: "issues", tabFilters: { jiraAssigned: { scope: "assigned" } }, expandedRepos: {}, lockedRepos: {}, trackedItems: [], activeScopeTab: "involved" },
   updateViewState: vi.fn(),
   resetViewState: vi.fn(),
+  setTabFilter: vi.fn(),
   ViewStateSchema: { parse: vi.fn((x: unknown) => x) },
 }));
 
@@ -163,7 +164,8 @@ vi.mock("../../../src/app/services/jira-keys", () => ({
 }));
 
 // Component imports after all mocks
-import SettingsPage from "../../../src/app/components/settings/SettingsPage";
+import SettingsPage, { staleJiraScopeReset } from "../../../src/app/components/settings/SettingsPage";
+import { viewState, setTabFilter } from "../../../src/app/stores/view";
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
@@ -525,6 +527,31 @@ describe("SettingsPage Jira section — connected state", () => {
     expect(mockClearJiraConfigFull).toHaveBeenCalled();
   });
 
+  it("Disconnect resets a stale custom jiraAssigned scope to 'assigned' (BUG-008)", async () => {
+    viewState.tabFilters.jiraAssigned.scope = "customfield_10001";
+    renderSettings();
+    await waitFor(() => {
+      expect(screen.getByRole("button", { name: /Disconnect/i })).toBeTruthy();
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: /Disconnect/i }));
+
+    expect(setTabFilter).toHaveBeenCalledWith("jiraAssigned", "scope", "assigned");
+  });
+
+  it("Disconnect does not touch jiraAssigned scope when it's already 'assigned'", async () => {
+    viewState.tabFilters.jiraAssigned.scope = "assigned";
+    renderSettings();
+    await waitFor(() => {
+      expect(screen.getByRole("button", { name: /Disconnect/i })).toBeTruthy();
+    });
+
+    vi.mocked(setTabFilter).mockClear();
+    fireEvent.click(screen.getByRole("button", { name: /Disconnect/i }));
+
+    expect(setTabFilter).not.toHaveBeenCalled();
+  });
+
   it("Disconnect does not show OAuth connect buttons (only when disconnected)", async () => {
     renderSettings();
     await waitFor(() => {
@@ -535,3 +562,24 @@ describe("SettingsPage Jira section — connected state", () => {
     expect(screen.queryByText(/Use API token/i)).toBeNull();
   });
 });
+
+describe("staleJiraScopeReset (BUG-008)", () => {
+  it("returns null when the active scope is a built-in value", () => {
+    expect(staleJiraScopeReset("assigned", [])).toBeNull();
+    expect(staleJiraScopeReset("reported", [{ id: "customfield_1", name: "Foo" }])).toBeNull();
+    expect(staleJiraScopeReset("watching", [])).toBeNull();
+  });
+
+  it("returns null when the active scope matches a surviving custom scope id", () => {
+    expect(
+      staleJiraScopeReset("customfield_10001", [{ id: "customfield_10001", name: "Epic Filter" }])
+    ).toBeNull();
+  });
+
+  it("returns 'assigned' when the active scope is a custom id no longer present", () => {
+    expect(staleJiraScopeReset("customfield_10001", [])).toBe("assigned");
+    expect(
+      staleJiraScopeReset("customfield_10001", [{ id: "customfield_9999", name: "Other" }])
+    ).toBe("assigned");
+  });
+});