diff --git a/src/features/access/components/connectorAdapters.tsx b/src/features/access/components/connectorAdapters.tsx
index 8bf023a1..dcd35027 100644
--- a/src/features/access/components/connectorAdapters.tsx
+++ b/src/features/access/components/connectorAdapters.tsx
@@ -1,8 +1,8 @@
 import { useAuth } from "../../../context/useAuth";
 import { TokenRow } from "../../settings/components/TokenRow";
-import { JiraCredentialAddForm } from "../../settings/components/jira/JiraCredentialAddForm";
-import { JiraCredentialRow } from "../../settings/components/jira/JiraCredentialRow";
-import type { JiraCredentialsDto } from "../../../services/sources/jiraService";
+import { AtlassianCredentialAddForm } from "../../settings/components/atlassian/AtlassianCredentialAddForm";
+import { AtlassianCredentialRow } from "../../settings/components/atlassian/AtlassianCredentialRow";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService";
 import type { AccessAddFormProps, AccessRowProps } from "../types";
 
 /**
@@ -18,20 +18,20 @@ export function GithubTokenRow({ entry, onSaved }: AccessRowProps<string>) {
   return <TokenRow name={entry.payload} onSaved={onSaved} />;
 }
 
-export function JiraAccessRow({ entry, onSaved }: AccessRowProps<JiraCredentialsDto>) {
-  return <JiraCredentialRow credential={entry.payload} onSaved={onSaved} />;
+export function AtlassianAccessRow({ entry, onSaved }: AccessRowProps<AtlassianCredentialDto>) {
+  return <AtlassianCredentialRow credential={entry.payload} onSaved={onSaved} />;
 }
 
 /**
- * The Jira form needs a default account email, which every other connector's
- * form does not — so the profile is read here rather than threaded through the
- * view and the registry.
+ * The Atlassian form needs a default account email, which every other
+ * connector's form does not — so the profile is read here rather than
+ * threaded through the view and the registry.
  */
-export function JiraAccessAddForm({ onClose, onSaved }: AccessAddFormProps) {
+export function AtlassianAccessAddForm({ onClose, onSaved }: AccessAddFormProps) {
   const { profile } = useAuth();
 
   return (
-    <JiraCredentialAddForm
+    <AtlassianCredentialAddForm
       defaultUserEmail={profile?.email ?? null}
       onClose={onClose}
       onSaved={onSaved}
diff --git a/src/features/access/registry.ts b/src/features/access/registry.ts
index 86898ae0..5501ca9a 100644
--- a/src/features/access/registry.ts
+++ b/src/features/access/registry.ts
@@ -1,10 +1,14 @@
 import { useMemo } from "react";
 import { GitBranch, Ticket } from "lucide-react";
 import { useGithubTokens } from "../settings/hooks/useGithubTokens";
-import { useJiraCredentials } from "../settings/hooks/useJiraCredentials";
+import { useAtlassianCredentials } from "../settings/hooks/useAtlassianCredentials";
 import { TokenAddForm } from "../settings/components/TokenAddForm";
-import { GithubTokenRow, JiraAccessAddForm, JiraAccessRow } from "./components/connectorAdapters";
-import type { JiraCredentialsDto } from "../../services/sources/jiraService";
+import {
+  GithubTokenRow,
+  AtlassianAccessAddForm,
+  AtlassianAccessRow,
+} from "./components/connectorAdapters";
+import type { AtlassianCredentialDto } from "../../services/sources/atlassianService";
 import type { AccessConnector } from "./types";
 
 /**
@@ -48,19 +52,19 @@ export const githubConnector = defineAccessConnector<string>({
   Row: GithubTokenRow,
 });
 
-export const jiraConnector = defineAccessConnector<JiraCredentialsDto>({
-  id: "jira",
-  label: "Jira",
+export const atlassianConnector = defineAccessConnector<AtlassianCredentialDto>({
+  id: "atlassian",
+  label: "Atlassian",
   icon: Ticket,
   noun: { one: "credential", many: "credentials" },
   addLabel: "Add credential",
   emptyTitle: "No credentials yet",
-  emptyDescription: "Add a Jira API token to connect and ingest Jira instances.",
+  emptyDescription: "Add an Atlassian API token to connect Jira instances and Confluence spaces.",
   useEntries: () => {
-    const { credentials, loaded, error, isRefreshing, reload } = useJiraCredentials();
+    const { credentials, loaded, error, isRefreshing, reload } = useAtlassianCredentials();
 
     // Credentials are keyed by `(userEmail, tokenName)` server-side; the same
-    // name may exist for two Jira accounts, so the key needs both.
+    // name may exist for two Atlassian accounts, so the key needs both.
     const entries = useMemo(
       () =>
         credentials.map((credential) => ({
@@ -72,8 +76,8 @@ export const jiraConnector = defineAccessConnector<JiraCredentialsDto>({
 
     return { entries, loaded, error, isRefreshing, reload };
   },
-  AddForm: JiraAccessAddForm,
-  Row: JiraAccessRow,
+  AddForm: AtlassianAccessAddForm,
+  Row: AtlassianAccessRow,
 });
 
 /**
@@ -83,4 +87,4 @@ export const jiraConnector = defineAccessConnector<JiraCredentialsDto>({
  * form — no new tab, no page change, no layout change. Keep the list short
  * enough that the source filter stays useful.
  */
-export const ACCESS_CONNECTORS: AccessConnector[] = [githubConnector, jiraConnector];
+export const ACCESS_CONNECTORS: AccessConnector[] = [githubConnector, atlassianConnector];
diff --git a/src/features/admin/components/CreateProjectWizard.tsx b/src/features/admin/components/CreateProjectWizard.tsx
index fc9e3367..2183bc80 100644
--- a/src/features/admin/components/CreateProjectWizard.tsx
+++ b/src/features/admin/components/CreateProjectWizard.tsx
@@ -13,10 +13,12 @@ import {
 import {
   addDraftSource,
   connectDraftSources,
+  createConfluenceDraft,
   createDraftSourceFromDiscovery,
   createJiraDraft,
   createUploadDraft,
   hasFailedSources,
+  isValidConfluenceSpaceId,
   removeDraftSource,
   setDraftSourceOwner,
   type DraftSource,
@@ -24,8 +26,8 @@ import {
 import { sortOwnerOptions } from "../sourceOwners";
 import type { DiscoverySelection } from "../../data-ingestion/components/GithubRepositoryDiscovery";
 import type { SourceSystem } from "../../data-ingestion/types";
-import { useJiraCredentials } from "../../settings/hooks/useJiraCredentials";
-import type { JiraCredentialsDto } from "../../../services/sources/jiraService";
+import { useAtlassianCredentials } from "../../settings/hooks/useAtlassianCredentials";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService";
 import { useGithubTokens } from "../../settings/hooks/useGithubTokens";
 import { getDisplayName } from "../data";
 import type { AdminUser } from "../types";
@@ -72,8 +74,8 @@ const STEP_INDEX: Record<Exclude<WizardPhase, "provisioning">, number> = {
   review: 3,
 };
 
-// All three connectors can now be staged from the add-source sub-flow.
-const AVAILABLE_SOURCE_TYPES: SourceSystem[] = ["GITHUB", "JIRA", "UPLOAD"];
+// All four connectors can now be staged from the add-source sub-flow.
+const AVAILABLE_SOURCE_TYPES: SourceSystem[] = ["GITHUB", "JIRA", "UPLOAD", "CONFLUENCE"];
 
 /**
  * Transactional create-project wizard: everything is drafted locally across the
@@ -141,6 +143,10 @@ export function CreateProjectWizard({
   const [jiraUrl, setJiraUrl] = useState("");
   const [jiraCredentialName, setJiraCredentialName] = useState("");
 
+  const [confluenceBaseUrl, setConfluenceBaseUrl] = useState("");
+  const [confluenceSpaceId, setConfluenceSpaceId] = useState("");
+  const [confluenceCredentialName, setConfluenceCredentialName] = useState("");
+
   // Upload files staged in memory; uploaded during provisioning once a project
   // id exists.
   const [uploadFiles, setUploadFiles] = useState<File[]>([]);
@@ -181,6 +187,9 @@ export function CreateProjectWizard({
   };
 
   const isJiraDetail = isAddingSource && addStep === "detail" && addType === "JIRA";
+  const isConfluenceDetail = isAddingSource && addStep === "detail" && addType === "CONFLUENCE";
+  // Jira and Confluence share the same Atlassian credential store, so one
+  // instance of the hook backs both detail screens' pickers.
   const {
     credentials: jiraCredentials,
     loaded: jiraCredentialsLoaded,
@@ -188,7 +197,7 @@ export function CreateProjectWizard({
     isRefreshing: jiraCredentialsLoading,
     reload: reloadJiraCredentials,
     addCredentialLocally,
-  } = useJiraCredentials(isOpen && isJiraDetail);
+  } = useAtlassianCredentials(isOpen && (isJiraDetail || isConfluenceDetail));
 
   // The token list arrives asynchronously; adopt the first token as soon as it
   // does (and heal a stale selection) so discovery is usable on the first open.
@@ -202,8 +211,10 @@ export function CreateProjectWizard({
     });
   }, [effectiveTokenNames]);
 
-  // Same adoption pattern for the Jira credential picker: select the first
-  // stored credential once the list arrives, keeping a still-valid choice.
+  // Same adoption pattern for the Jira and Confluence credential pickers:
+  // select the first stored credential once the list arrives, keeping a
+  // still-valid choice. Both fields share the list, so a credential just added
+  // from either detail screen is adopted here too.
   useEffect(() => {
     if (!jiraCredentialsLoaded || jiraCredentialsLoading) return;
 
@@ -214,6 +225,12 @@ export function CreateProjectWizard({
           ? current
           : jiraCredentials[0].displayName;
       });
+      setConfluenceCredentialName((current) => {
+        if (jiraCredentials.length === 0) return "";
+        return current && jiraCredentials.some((credential) => credential.displayName === current)
+          ? current
+          : jiraCredentials[0].displayName;
+      });
     });
   }, [jiraCredentials, jiraCredentialsLoaded, jiraCredentialsLoading]);
 
@@ -240,6 +257,12 @@ export function CreateProjectWizard({
     void Promise.resolve().then(loadManagerCandidates);
   }, [isOpen, loadManagerCandidates]);
 
+  const resetConfluenceDraftFields = () => {
+    setConfluenceBaseUrl("");
+    setConfluenceSpaceId("");
+    setConfluenceCredentialName("");
+  };
+
   const resetWizard = () => {
     setPhase("details");
     setName("");
@@ -255,6 +278,7 @@ export function CreateProjectWizard({
     setAddType("GITHUB");
     setGithubSelection([]);
     resetJiraDraftFields();
+    resetConfluenceDraftFields();
     setUploadFiles([]);
     setCreatedProjectId("");
   };
@@ -268,6 +292,7 @@ export function CreateProjectWizard({
   const resetSourceDraftFields = () => {
     setGithubSelection([]);
     resetJiraDraftFields();
+    resetConfluenceDraftFields();
     setUploadFiles([]);
   };
 
@@ -397,16 +422,26 @@ export function CreateProjectWizard({
     await loadTokenNames();
   };
 
-  const handleCredentialSaved = async (credential: JiraCredentialsDto) => {
+  const handleCredentialSaved = async (credential: AtlassianCredentialDto) => {
     addCredentialLocally(credential);
     setJiraCredentialName(credential.displayName);
     await reloadJiraCredentials();
   };
 
+  const handleConfluenceCredentialSaved = async (credential: AtlassianCredentialDto) => {
+    addCredentialLocally(credential);
+    setConfluenceCredentialName(credential.displayName);
+    await reloadJiraCredentials();
+  };
+
   const selectedJiraCredential = jiraCredentials.find(
     (credential) => credential.displayName === jiraCredentialName,
   );
 
+  const selectedConfluenceCredential = jiraCredentials.find(
+    (credential) => credential.displayName === confluenceCredentialName,
+  );
+
   const canAddSource =
     addType === "GITHUB"
       ? githubSelection.length > 0
@@ -414,7 +449,13 @@ export function CreateProjectWizard({
         ? Boolean(jiraDisplayName.trim() && jiraUrl.trim() && selectedJiraCredential)
         : addType === "UPLOAD"
           ? uploadFiles.length > 0
-          : false;
+          : addType === "CONFLUENCE"
+            ? Boolean(
+                confluenceBaseUrl.trim() &&
+                isValidConfluenceSpaceId(confluenceSpaceId) &&
+                selectedConfluenceCredential,
+              )
+            : false;
 
   const commitAddSource = () => {
     if (!canAddSource) return;
@@ -442,6 +483,17 @@ export function CreateProjectWizard({
     } else if (addType === "UPLOAD") {
       const displayName = uploadFiles.length === 1 ? uploadFiles[0].name : "Uploaded documents";
       setSources((current) => addDraftSource(current, createUploadDraft(displayName, uploadFiles)));
+    } else if (addType === "CONFLUENCE" && selectedConfluenceCredential) {
+      setSources((current) =>
+        addDraftSource(
+          current,
+          createConfluenceDraft({
+            baseUrl: confluenceBaseUrl.trim(),
+            spaceId: confluenceSpaceId.trim(),
+            credentialName: selectedConfluenceCredential.displayName,
+          }),
+        ),
+      );
     }
 
     closeAddSource();
@@ -804,6 +856,21 @@ export function CreateProjectWizard({
                       current.filter((_, position) => position !== index),
                     ),
                 }}
+                confluence={{
+                  baseUrl: confluenceBaseUrl,
+                  spaceId: confluenceSpaceId,
+                  credentialName: confluenceCredentialName,
+                  credentials: jiraCredentials,
+                  credentialsLoaded: jiraCredentialsLoaded,
+                  credentialsLoading: jiraCredentialsLoading,
+                  credentialsError: jiraCredentialsError,
+                  defaultUserEmail: null,
+                  onBaseUrlChange: setConfluenceBaseUrl,
+                  onSpaceIdChange: setConfluenceSpaceId,
+                  onCredentialNameChange: setConfluenceCredentialName,
+                  onSubmit: commitAddSource,
+                  onCredentialSaved: handleConfluenceCredentialSaved,
+                }}
               />
             ) : (
               <WizardSourcesStep
diff --git a/src/features/admin/components/StagedSourceList.tsx b/src/features/admin/components/StagedSourceList.tsx
index 45b799c6..ff20912c 100644
--- a/src/features/admin/components/StagedSourceList.tsx
+++ b/src/features/admin/components/StagedSourceList.tsx
@@ -1,5 +1,6 @@
 import {
   AlertCircle,
+  BookOpen,
   Check,
   FileText,
   GitBranch,
@@ -55,6 +56,10 @@ function TypeIcon({ source }: { source: DraftSource }) {
     return <FileText className="h-4 w-4 text-app-text-muted" />;
   }
 
+  if (source.type === "CONFLUENCE") {
+    return <BookOpen className="h-4 w-4 text-app-text-muted" />;
+  }
+
   return <GitBranch className="h-4 w-4 text-app-text-muted" />;
 }
 
@@ -95,6 +100,10 @@ function sourceDetail(source: DraftSource): string {
     return source.url;
   }
 
+  if (source.type === "CONFLUENCE") {
+    return `${source.baseUrl} (${source.spaceId})`;
+  }
+
   return source.tokenName;
 }
 
diff --git a/src/features/admin/components/wizard/sources/AddSourceFlow.tsx b/src/features/admin/components/wizard/sources/AddSourceFlow.tsx
index cd18ac03..5532a1c5 100644
--- a/src/features/admin/components/wizard/sources/AddSourceFlow.tsx
+++ b/src/features/admin/components/wizard/sources/AddSourceFlow.tsx
@@ -19,12 +19,13 @@ import {
   type DiscoverySelection,
 } from "../../../../data-ingestion/components/GithubRepositoryDiscovery";
 import { JiraConnectStep } from "../../../../data-ingestion/components/JiraConnectStep";
+import { ConfluenceConnectStep } from "../../../../data-ingestion/components/ConfluenceConnectStep";
 import { SourceTypeStep } from "../../../../data-ingestion/components/SourceTypeStep";
 import { FileUploadZone } from "../../../../knowledge-base/components/FileUploadZone";
 import { TokenAddForm } from "../../../../settings/components/TokenAddForm";
-import { JiraCredentialAddForm } from "../../../../settings/components/jira/JiraCredentialAddForm";
+import { AtlassianCredentialAddForm } from "../../../../settings/components/atlassian/AtlassianCredentialAddForm";
 import type { SourceSystem } from "../../../../data-ingestion/types";
-import type { JiraCredentialsDto } from "../../../../../services/sources/jiraService";
+import type { AtlassianCredentialDto } from "../../../../../services/sources/atlassianService";
 
 /**
  * Below this width the credential form stays inline (phone/tablet); at or above
@@ -59,7 +60,7 @@ type JiraDetailProps = {
   displayName: string;
   url: string;
   credentialName: string;
-  credentials: JiraCredentialsDto[];
+  credentials: AtlassianCredentialDto[];
   credentialsLoaded: boolean;
   credentialsLoading: boolean;
   credentialsError: string | null;
@@ -71,7 +72,7 @@ type JiraDetailProps = {
   /** Enter in a field stages the source (guarded), matching "Add to list". */
   onSubmit: () => void;
   /** Adds the new credential to the list, selects it, and reconciles with the server. */
-  onCredentialSaved: (credential: JiraCredentialsDto) => Promise<void>;
+  onCredentialSaved: (credential: AtlassianCredentialDto) => Promise<void>;
 };
 
 /** Upload detail — files are staged in memory and uploaded during provisioning. */
@@ -82,6 +83,26 @@ type UploadDetailProps = {
   onRemoveFile: (index: number) => void;
 };
 
+/** Confluence detail — a staged form; nothing connects until provisioning. */
+type ConfluenceDetailProps = {
+  baseUrl: string;
+  spaceId: string;
+  credentialName: string;
+  credentials: AtlassianCredentialDto[];
+  credentialsLoaded: boolean;
+  credentialsLoading: boolean;
+  credentialsError: string | null;
+  /** Prefill for the inline "add credential" form's account-email field. */
+  defaultUserEmail: string | null;
+  onBaseUrlChange: (value: string) => void;
+  onSpaceIdChange: (value: string) => void;
+  onCredentialNameChange: (value: string) => void;
+  /** Enter in a field stages the source (guarded), matching "Add to list". */
+  onSubmit: () => void;
+  /** Adds the new credential to the list, selects it, and reconciles with the server. */
+  onCredentialSaved: (credential: AtlassianCredentialDto) => Promise<void>;
+};
+
 type AddSourceFlowProps = {
   step: AddSourceStep;
   selectedType: SourceSystem;
@@ -98,6 +119,7 @@ type AddSourceFlowProps = {
   github: GithubDetailProps;
   jira: JiraDetailProps;
   upload: UploadDetailProps;
+  confluence: ConfluenceDetailProps;
   /**
    * Told when the desktop credential companion opens/closes, so the wizard can
    * slide its modal left to make room for it.
@@ -387,12 +409,12 @@ function JiraDetail({
   return (
     <div className="space-y-4">
       <CredentialSlot
-        buttonLabel="Add Jira credential"
-        panelTitle="New Jira credential"
+        buttonLabel="Add Atlassian credential"
+        panelTitle="New Atlassian credential"
         onCompanionOpenChange={onCompanionOpenChange}
         missingLabel={missingCredential ? "No credential yet" : undefined}
         renderForm={(close, embedded) => (
-          <JiraCredentialAddForm
+          <AtlassianCredentialAddForm
             defaultUserEmail={jira.defaultUserEmail}
             onClose={close}
             onSaved={jira.onCredentialSaved}
@@ -454,11 +476,62 @@ function UploadDetail({ files, onAddFiles, onRemoveFile }: UploadDetailProps) {
   );
 }
 
+/** Confluence detail with an "add credential" trigger above the form. */
+function ConfluenceDetail({
+  isBusy,
+  confluence,
+  onCompanionOpenChange,
+}: {
+  isBusy: boolean;
+  confluence: ConfluenceDetailProps;
+  onCompanionOpenChange?: (open: boolean) => void;
+}) {
+  // Only hint "nothing stored" once the list has loaded, so the chip does not
+  // flash while credentials are still being fetched.
+  const missingCredential = confluence.credentialsLoaded && confluence.credentials.length === 0;
+
+  return (
+    <div className="space-y-4">
+      <CredentialSlot
+        buttonLabel="Add Atlassian credential"
+        panelTitle="New Atlassian credential"
+        onCompanionOpenChange={onCompanionOpenChange}
+        missingLabel={missingCredential ? "No credential yet" : undefined}
+        renderForm={(close, embedded) => (
+          <AtlassianCredentialAddForm
+            defaultUserEmail={confluence.defaultUserEmail}
+            onClose={close}
+            onSaved={confluence.onCredentialSaved}
+            embedded={embedded}
+          />
+        )}
+      />
+
+      <ConfluenceConnectStep
+        baseUrl={confluence.baseUrl}
+        spaceId={confluence.spaceId}
+        credentialName={confluence.credentialName}
+        credentials={confluence.credentials}
+        credentialsLoaded={confluence.credentialsLoaded}
+        credentialsLoading={confluence.credentialsLoading}
+        credentialsError={confluence.credentialsError}
+        isBusy={isBusy}
+        onBaseUrlChange={confluence.onBaseUrlChange}
+        onSpaceIdChange={confluence.onSpaceIdChange}
+        onCredentialNameChange={confluence.onCredentialNameChange}
+        onSubmit={confluence.onSubmit}
+        suppressMissingCredentialNotice
+      />
+    </div>
+  );
+}
+
 /** One-line brief shown under the detail header, per source type. */
 const DETAIL_SUBTITLE: Record<SourceSystem, string> = {
   GITHUB: "Pick the repositories to index, then add them to your source list.",
   JIRA: "Point to your Jira instance and pick a credential, then add it to the list.",
   UPLOAD: "Files are staged now and uploaded right after the project is created.",
+  CONFLUENCE: "Point to your Confluence space and pick a credential, then add it to the list.",
 };
 
 /**
@@ -516,6 +589,7 @@ export function AddSourceFlow({
   github,
   jira,
   upload,
+  confluence,
   onCompanionOpenChange,
 }: AddSourceFlowProps) {
   const prefersReducedMotion = useReducedMotion();
@@ -529,6 +603,12 @@ export function AddSourceFlow({
         onAddFiles={upload.onAddFiles}
         onRemoveFile={upload.onRemoveFile}
       />
+    ) : selectedType === "CONFLUENCE" ? (
+      <ConfluenceDetail
+        isBusy={isBusy}
+        confluence={confluence}
+        onCompanionOpenChange={onCompanionOpenChange}
+      />
     ) : (
       <GithubDetail isBusy={isBusy} github={github} onCompanionOpenChange={onCompanionOpenChange} />
     );
diff --git a/src/features/admin/components/wizard/steps/WizardReviewStep.tsx b/src/features/admin/components/wizard/steps/WizardReviewStep.tsx
index f8953dd8..7c8b6d22 100644
--- a/src/features/admin/components/wizard/steps/WizardReviewStep.tsx
+++ b/src/features/admin/components/wizard/steps/WizardReviewStep.tsx
@@ -1,4 +1,4 @@
-import { GitBranch, Ticket, FileText } from "lucide-react";
+import { GitBranch, Ticket, FileText, BookOpen } from "lucide-react";
 import type { ComponentType, ReactNode } from "react";
 import { UserAvatar } from "../../../../../components/common/UserAvatar";
 import { SourceTypeBadge } from "../../../../data-ingestion/components/SourceTypeBadge";
@@ -28,12 +28,14 @@ const typeIcons: Record<DraftSourceType, ComponentType<{ className?: string }>>
   GITHUB: GitBranch,
   JIRA: Ticket,
   UPLOAD: FileText,
+  CONFLUENCE: BookOpen,
 };
 
 const typeLabels: Record<DraftSourceType, string> = {
   GITHUB: "GitHub",
   JIRA: "Jira",
   UPLOAD: "Upload",
+  CONFLUENCE: "Confluence",
 };
 
 function sourceTitle(source: DraftSource): string {
diff --git a/src/features/admin/components/wizard/steps/WizardSourcesStep.tsx b/src/features/admin/components/wizard/steps/WizardSourcesStep.tsx
index 6bd43267..fb4591c6 100644
--- a/src/features/admin/components/wizard/steps/WizardSourcesStep.tsx
+++ b/src/features/admin/components/wizard/steps/WizardSourcesStep.tsx
@@ -43,7 +43,7 @@ export function WizardSourcesStep({
         onRemove={onRemove}
         ownerOptions={ownerOptions}
         onOwnerChange={onOwnerChange}
-        emptyMessage="No sources yet. Add a GitHub repo, Jira project, or files to start."
+        emptyMessage="No sources yet. Add a GitHub repo, Jira project, Confluence space, or files to start."
       />
 
       <Button
diff --git a/src/features/admin/projectSourcesDraft.ts b/src/features/admin/projectSourcesDraft.ts
index b2be1651..98f497b3 100644
--- a/src/features/admin/projectSourcesDraft.ts
+++ b/src/features/admin/projectSourcesDraft.ts
@@ -3,6 +3,7 @@ import {
   connectGithubRepository,
 } from "../../services/sources/githubService";
 import { connectJiraInstance } from "../../services/sources/jiraService";
+import { confluenceService } from "../../services/sources/confluenceService";
 import { knowledgeGapService } from "../../services/knowledgeGapService";
 import { knowledgeService } from "../../services/knowledgeService";
 import type { DiscoverySelection } from "../data-ingestion/components/GithubRepositoryDiscovery";
@@ -15,16 +16,16 @@ import type { DiscoverySelection } from "../data-ingestion/components/GithubRepo
  * outcome so a partial failure can be shown and retried per source instead of
  * failing the whole batch.
  *
- * A source can be one of three kinds — a GitHub repository, a Jira instance, or
- * an in-memory file upload — modelled as a discriminated union on `type` so a
- * single list can hold a mix of all three. Nothing here touches the backend
- * until {@link connectDraftSources} runs during provisioning; uploads in
- * particular hold their `File[]` in memory until then.
+ * A source can be one of four kinds — a GitHub repository, a Jira instance,
+ * an in-memory file upload, or a Confluence space — modelled as a discriminated
+ * union on `type` so a single list can hold a mix of all four. Nothing here
+ * touches the backend until {@link connectDraftSources} runs during
+ * provisioning; uploads in particular hold their `File[]` in memory until then.
  */
 
 export type DraftSourceStatus = "pending" | "connecting" | "connected" | "failed";
 
-export type DraftSourceType = "GITHUB" | "JIRA" | "UPLOAD";
+export type DraftSourceType = "GITHUB" | "JIRA" | "UPLOAD" | "CONFLUENCE";
 
 /** Fields every staged source carries regardless of its type. */
 type DraftSourceBase = {
@@ -91,7 +92,17 @@ export type UploadDraftSource = DraftSourceBase & {
   files: File[];
 };
 
-export type DraftSource = GithubDraftSource | JiraDraftSource | UploadDraftSource;
+export type ConfluenceDraftSource = DraftSourceBase & {
+  type: "CONFLUENCE";
+  displayName: string;
+  baseUrl: string;
+  spaceId: string;
+  /** Name of a stored Atlassian credential, shared with the Jira connector. */
+  credentialName: string;
+};
+
+export type DraftSource =
+  GithubDraftSource | JiraDraftSource | UploadDraftSource | ConfluenceDraftSource;
 
 let draftSourceCounter = 0;
 
@@ -168,6 +179,35 @@ export function createUploadDraft(displayName: string, files: File[]): UploadDra
   };
 }
 
+/**
+ * Whether a Confluence space ID is well-formed. Only the numeric space ID is
+ * accepted, so the space *key* ("ENG") — the value actually visible in
+ * Confluence's own UI, and the obvious thing to paste — has to be caught while
+ * the source is being staged rather than at provisioning time.
+ */
+export function isValidConfluenceSpaceId(spaceId: string): boolean {
+  return /^\d+$/.test(spaceId.trim());
+}
+
+export function createConfluenceDraft(params: {
+  displayName?: string;
+  baseUrl: string;
+  spaceId: string;
+  credentialName: string;
+}): ConfluenceDraftSource {
+  return {
+    id: nextDraftSourceId(),
+    type: "CONFLUENCE",
+    displayName: params.displayName || `Confluence Space ${params.spaceId}`,
+    baseUrl: params.baseUrl,
+    spaceId: params.spaceId,
+    credentialName: params.credentialName,
+    status: "pending",
+    errorMessage: "",
+    ownerAssignmentFailed: false,
+  };
+}
+
 /**
  * Whether two drafts point at the same underlying source, used to dedupe on
  * add. Identity is per type: GitHub by `owner/name`, Jira by instance URL; two
@@ -188,6 +228,13 @@ export function isSameSource(left: DraftSource, right: DraftSource): boolean {
     return left.url.trim().toLowerCase() === right.url.trim().toLowerCase();
   }
 
+  if (left.type === "CONFLUENCE" && right.type === "CONFLUENCE") {
+    return (
+      left.baseUrl.trim().toLowerCase() === right.baseUrl.trim().toLowerCase() &&
+      left.spaceId.trim().toLowerCase() === right.spaceId.trim().toLowerCase()
+    );
+  }
+
   return false;
 }
 
@@ -311,6 +358,22 @@ async function connectOneDraftSource(source: DraftSource, projectId: string): Pr
     return false;
   }
 
+  if (source.type === "CONFLUENCE") {
+    // No error remapping here: a failed connect comes back with a precise
+    // message ("Confluence space 123 was not found", "Atlassian credential 'x'
+    // was not found"), and 404 covers both cases — the backend's own message is
+    // more useful than anything this layer could guess from the status alone.
+    await confluenceService.createConnection(projectId, {
+      baseUrl: source.baseUrl,
+      spaceId: source.spaceId,
+      credentialName: source.credentialName,
+      pageAllowlist: [],
+      pageDenylist: [],
+    });
+
+    return false;
+  }
+
   // UPLOAD: files are uploaded now that the project exists. uploadDocuments
   // settles every file itself and never throws, so a per-file error surfaces as
   // a `status: "error"` entry rather than a rejection — turn any into a failure
diff --git a/src/features/chatbot/hooks/useAvailableSources.ts b/src/features/chatbot/hooks/useAvailableSources.ts
index 89a84d0f..0f22df66 100644
--- a/src/features/chatbot/hooks/useAvailableSources.ts
+++ b/src/features/chatbot/hooks/useAvailableSources.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { connectorService } from "../../../services/connectorService";
-import type { SourceSystem } from "../types";
+import { SOURCE_SYSTEMS, type SourceSystem } from "../types";
 
 /**
  * Uploads are not a connector: there is nothing to configure or enable, and the backend
@@ -10,13 +10,11 @@ const ALWAYS_AVAILABLE: readonly SourceSystem[] = ["UPLOAD"];
 
 /**
  * Maps a backend connector id onto the source system the chat filters by. Connector ids are
- * lowercase (`github`, `jira`); the filter values are the uppercase enum constants.
+ * lowercase (`github`, `jira`, `confluence`); the filter values are the uppercase enum constants.
  */
 function toSourceSystem(connectorId: string): SourceSystem | null {
   const candidate = connectorId.toUpperCase();
-  return candidate === "GITHUB" || candidate === "JIRA" || candidate === "UPLOAD"
-    ? candidate
-    : null;
+  return SOURCE_SYSTEMS.includes(candidate as SourceSystem) ? (candidate as SourceSystem) : null;
 }
 
 /**
diff --git a/src/features/chatbot/types.ts b/src/features/chatbot/types.ts
index ce204c4e..f599ffc1 100644
--- a/src/features/chatbot/types.ts
+++ b/src/features/chatbot/types.ts
@@ -148,6 +148,6 @@ export type StreamHandlers = {
   onError?: (message: string) => void;
 };
 
-export const SOURCE_SYSTEMS = ["GITHUB", "UPLOAD", "JIRA"] as const;
+export const SOURCE_SYSTEMS = ["GITHUB", "UPLOAD", "JIRA", "CONFLUENCE"] as const;
 
 export type SourceSystem = (typeof SOURCE_SYSTEMS)[number];
diff --git a/src/features/connectors/components/ConnectorSourcesSection.tsx b/src/features/connectors/components/ConnectorSourcesSection.tsx
index 60309511..93789d1e 100644
--- a/src/features/connectors/components/ConnectorSourcesSection.tsx
+++ b/src/features/connectors/components/ConnectorSourcesSection.tsx
@@ -137,7 +137,14 @@ export function ConnectorSourcesSection({
       .map((source) => ({ sourceId: source.id, enabled: source.enabled }));
 
     try {
-      const response = await connectorService.patchConnectorSources(connector.id, patches);
+      // The same project scope the sources were loaded with: a project-scoped
+      // connector (Confluence) rejects a patch without it, and the others
+      // ignore it.
+      const response = await connectorService.patchConnectorSources(
+        connector.id,
+        patches,
+        projectId ?? undefined,
+      );
 
       setSources(response.sources);
       setDraft(EMPTY_DRAFT);
diff --git a/src/features/connectors/components/useConfluenceSync.ts b/src/features/connectors/components/useConfluenceSync.ts
new file mode 100644
index 00000000..f7c8b736
--- /dev/null
+++ b/src/features/connectors/components/useConfluenceSync.ts
@@ -0,0 +1,64 @@
+import { useState } from "react";
+import { useToast } from "../../../context/useToast.ts";
+import { parseApiError } from "../../../services/apiError.ts";
+import {
+  confluenceService,
+  type ConfluenceIngestionResult,
+} from "../../../services/sources/confluenceService.ts";
+
+/**
+ * Hook to trigger a manual sync for a Confluence space connection and surface
+ * result toasts based on the ingestion status.
+ *
+ * The sync endpoint runs synchronously, so the toasts raised here are the final
+ * word on the outcome. Failures are reported *and* rethrown: the caller still
+ * needs to know that the run failed (to set its own error state), but it must
+ * not report the failure a second time.
+ */
+export function useConfluenceSync(projectId?: string | null) {
+  const [syncingId, setSyncingId] = useState<string | null>(null);
+  const toast = useToast();
+
+  const syncConnection = async (
+    connectionId: string,
+    onSuccess?: (result: ConfluenceIngestionResult) => void,
+  ): Promise<ConfluenceIngestionResult> => {
+    if (!projectId) {
+      const error = new Error("Project ID is required to sync Confluence spaces.");
+      toast.error(error.message);
+      throw error;
+    }
+
+    setSyncingId(connectionId);
+    try {
+      const result = await confluenceService.syncConnection(projectId, connectionId);
+
+      if (result.status === "COMPLETED") {
+        toast.success("Confluence sync completed", {
+          description: `${result.created} created, ${result.updated} updated, ${result.unchanged} unchanged.`,
+        });
+      } else if (result.status === "PARTIAL") {
+        toast.warning("Confluence sync finished with errors", {
+          description: `${result.failed} pages failed out of ${result.discovered} discovered.`,
+        });
+      } else {
+        toast.error("Confluence sync failed", {
+          description: "No pages could be ingested. Check connection permissions.",
+        });
+      }
+
+      onSuccess?.(result);
+      return result;
+    } catch (error) {
+      toast.error(parseApiError(error, "Failed to synchronize Confluence space."));
+      throw error;
+    } finally {
+      setSyncingId(null);
+    }
+  };
+
+  return {
+    syncConnection,
+    syncingId,
+  };
+}
diff --git a/src/features/connectors/data.ts b/src/features/connectors/data.ts
index 895cf17d..8e0ccfcf 100644
--- a/src/features/connectors/data.ts
+++ b/src/features/connectors/data.ts
@@ -1,11 +1,9 @@
-import { GitBranch, Plug } from "lucide-react";
+import { BookOpen, GitBranch, Plug } from "lucide-react";
 import type { ConnectorDto } from "../../services/connectorService.ts";
 import type { ConnectorListItem, ConnectorMeta } from "./types.ts";
 
 /**
  * Presentation metadata for connectors known to the frontend today.
- * Only "github" is implemented; any other connector id the backend returns
- * (e.g. a future Jira connector) falls back to `getConnectorMeta` below.
  */
 const CONNECTOR_META: Record<string, ConnectorMeta> = {
   github: {
@@ -14,6 +12,11 @@ const CONNECTOR_META: Record<string, ConnectorMeta> = {
       "Commits, files, issues and pull request metadata from connected GitHub repositories.",
     icon: GitBranch,
   },
+  confluence: {
+    label: "Confluence Cloud Connector",
+    description: "Pages and spaces from connected Confluence Cloud tenants.",
+    icon: BookOpen,
+  },
 };
 
 const FALLBACK_CONNECTOR_META: Omit<ConnectorMeta, "label"> = {
diff --git a/src/features/data-ingestion/components/AddSourceModal.tsx b/src/features/data-ingestion/components/AddSourceModal.tsx
index 2082127a..552b60a9 100644
--- a/src/features/data-ingestion/components/AddSourceModal.tsx
+++ b/src/features/data-ingestion/components/AddSourceModal.tsx
@@ -9,10 +9,12 @@ import { getTeamOverview } from "../../../services/teamManagementService.ts";
 import {
   addDraftSource,
   connectDraftSources,
+  createConfluenceDraft,
   createDraftSourceFromDiscovery,
   createJiraDraft,
   createUploadDraft,
   hasFailedSources,
+  isValidConfluenceSpaceId,
   removeDraftSource,
   setDraftSourceOwner,
   type DraftSource,
@@ -26,11 +28,11 @@ import {
   type AddSourceStep,
 } from "../../admin/components/wizard/sources/AddSourceFlow.tsx";
 import { useGithubTokens } from "../../settings/hooks/useGithubTokens.ts";
-import { useJiraCredentials } from "../../settings/hooks/useJiraCredentials.ts";
+import { useAtlassianCredentials } from "../../settings/hooks/useAtlassianCredentials.ts";
 import { SOURCE_META, SOURCE_SYSTEMS } from "../data.ts";
 import type { SourceSystem } from "../types.ts";
 import type { DiscoverySelection } from "./GithubRepositoryDiscovery.tsx";
-import type { JiraCredentialsDto } from "../../../services/sources/jiraService.ts";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService.ts";
 
 type AddSourceModalProps = {
   projectId: string | null;
@@ -147,10 +149,18 @@ export function AddSourceModal({
   const [jiraUrl, setJiraUrl] = useState("");
   const [jiraCredentialName, setJiraCredentialName] = useState("");
 
+  // Confluence detail state.
+  const [confluenceBaseUrl, setConfluenceBaseUrl] = useState("");
+  const [confluenceSpaceId, setConfluenceSpaceId] = useState("");
+  const [confluenceCredentialName, setConfluenceCredentialName] = useState("");
+
   // Upload detail state — files staged in memory until the list is connected.
   const [uploadFiles, setUploadFiles] = useState<File[]>([]);
 
   const isJiraDetail = isAddingSource && addStep === "detail" && addType === "JIRA";
+  const isConfluenceDetail = isAddingSource && addStep === "detail" && addType === "CONFLUENCE";
+  // Jira and Confluence share the same Atlassian credential store, so one
+  // instance of the hook backs both detail screens' pickers.
   const {
     credentials: jiraCredentials,
     loaded: jiraCredentialsLoaded,
@@ -158,7 +168,7 @@ export function AddSourceModal({
     isRefreshing: jiraCredentialsLoading,
     reload: reloadJiraCredentials,
     addCredentialLocally,
-  } = useJiraCredentials(isJiraDetail);
+  } = useAtlassianCredentials(isJiraDetail || isConfluenceDetail);
 
   // Adopt the first token as soon as the list arrives (and heal a stale
   // selection) so discovery is usable on the first open.
@@ -172,8 +182,8 @@ export function AddSourceModal({
     });
   }, [effectiveTokenNames]);
 
-  // Adopt the first stored Jira credential once the list arrives, keeping a
-  // still-valid choice.
+  // Adopt the first stored Atlassian credential once the list arrives, keeping
+  // a still-valid choice — shared by the Jira and Confluence pickers.
   useEffect(() => {
     if (!jiraCredentialsLoaded || jiraCredentialsLoading) return;
 
@@ -184,6 +194,12 @@ export function AddSourceModal({
           ? current
           : jiraCredentials[0].displayName;
       });
+      setConfluenceCredentialName((current) => {
+        if (jiraCredentials.length === 0) return "";
+        return current && jiraCredentials.some((credential) => credential.displayName === current)
+          ? current
+          : jiraCredentials[0].displayName;
+      });
     });
   }, [jiraCredentials, jiraCredentialsLoaded, jiraCredentialsLoading]);
 
@@ -193,6 +209,9 @@ export function AddSourceModal({
     setJiraUrl("");
     setJiraCredentialName("");
     setUploadFiles([]);
+    setConfluenceBaseUrl("");
+    setConfluenceSpaceId("");
+    setConfluenceCredentialName("");
   };
 
   // --- Add-source sub-flow ---
@@ -229,16 +248,26 @@ export function AddSourceModal({
     await loadTokenNames();
   };
 
-  const handleCredentialSaved = async (credential: JiraCredentialsDto) => {
+  const handleCredentialSaved = async (credential: AtlassianCredentialDto) => {
     addCredentialLocally(credential);
     setJiraCredentialName(credential.displayName);
     await reloadJiraCredentials();
   };
 
+  const handleConfluenceCredentialSaved = async (credential: AtlassianCredentialDto) => {
+    addCredentialLocally(credential);
+    setConfluenceCredentialName(credential.displayName);
+    await reloadJiraCredentials();
+  };
+
   const selectedJiraCredential = jiraCredentials.find(
     (credential) => credential.displayName === jiraCredentialName,
   );
 
+  const selectedConfluenceCredential = jiraCredentials.find(
+    (credential) => credential.displayName === confluenceCredentialName,
+  );
+
   const canAddSource =
     addType === "GITHUB"
       ? githubSelection.length > 0
@@ -246,11 +275,17 @@ export function AddSourceModal({
         ? Boolean(jiraDisplayName.trim() && jiraUrl.trim() && selectedJiraCredential)
         : addType === "UPLOAD"
           ? uploadFiles.length > 0
-          : false;
+          : addType === "CONFLUENCE"
+            ? Boolean(
+                confluenceBaseUrl.trim() &&
+                isValidConfluenceSpaceId(confluenceSpaceId) &&
+                selectedConfluenceCredential,
+              )
+            : false;
 
   /**
    * The draft(s) captured on the current detail screen — several at once for the
-   * GitHub multi-select, one for Jira/Upload. Empty when the detail isn't
+   * GitHub multi-select, one for Jira/Upload/Confluence. Empty when the detail isn't
    * complete enough to stage.
    */
   const buildDetailDrafts = (): DraftSource[] => {
@@ -278,6 +313,16 @@ export function AddSourceModal({
       return [createUploadDraft(displayName, uploadFiles)];
     }
 
+    if (addType === "CONFLUENCE" && selectedConfluenceCredential) {
+      return [
+        createConfluenceDraft({
+          baseUrl: confluenceBaseUrl.trim(),
+          spaceId: confluenceSpaceId.trim(),
+          credentialName: selectedConfluenceCredential.displayName,
+        }),
+      ];
+    }
+
     return [];
   };
 
@@ -546,6 +591,21 @@ export function AddSourceModal({
                 onRemoveFile: (index) =>
                   setUploadFiles((current) => current.filter((_, position) => position !== index)),
               }}
+              confluence={{
+                baseUrl: confluenceBaseUrl,
+                spaceId: confluenceSpaceId,
+                credentialName: confluenceCredentialName,
+                credentials: jiraCredentials,
+                credentialsLoaded: jiraCredentialsLoaded,
+                credentialsLoading: jiraCredentialsLoading,
+                credentialsError: jiraCredentialsError,
+                defaultUserEmail: null,
+                onBaseUrlChange: setConfluenceBaseUrl,
+                onSpaceIdChange: setConfluenceSpaceId,
+                onCredentialNameChange: setConfluenceCredentialName,
+                onSubmit: commitAddSource,
+                onCredentialSaved: handleConfluenceCredentialSaved,
+              }}
             />
           </div>
         ) : (
diff --git a/src/features/data-ingestion/components/ConfluenceConnectStep.tsx b/src/features/data-ingestion/components/ConfluenceConnectStep.tsx
new file mode 100644
index 00000000..2ac10f3b
--- /dev/null
+++ b/src/features/data-ingestion/components/ConfluenceConnectStep.tsx
@@ -0,0 +1,146 @@
+import { AlertTriangle } from "lucide-react";
+import { DropdownSelect } from "../../../components/ui/DropdownSelect.tsx";
+import { Field } from "../../../components/ui/Field.tsx";
+import { Input } from "../../../components/ui/Input.tsx";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService.ts";
+
+/**
+ * Controlled Confluence connect form for a base URL, space ID, and a stored
+ * Atlassian credential.
+ *
+ * Shared between the Data Ingestion "Add source" wizard and the project-creation
+ * wizard so the Confluence connect experience is identical in both places.
+ */
+export function ConfluenceConnectStep({
+  baseUrl,
+  spaceId,
+  credentialName,
+  credentials,
+  credentialsLoaded,
+  credentialsLoading,
+  credentialsError,
+  isBusy = false,
+  canIngest = true,
+  ingestBlockedReason,
+  errorMessage,
+  onBaseUrlChange,
+  onSpaceIdChange,
+  onCredentialNameChange,
+  onSubmit,
+  suppressMissingCredentialNotice = false,
+}: {
+  baseUrl: string;
+  spaceId: string;
+  credentialName: string;
+  credentials: AtlassianCredentialDto[];
+  credentialsLoaded: boolean;
+  credentialsLoading: boolean;
+  credentialsError: string | null;
+  isBusy?: boolean;
+  canIngest?: boolean;
+  ingestBlockedReason?: string;
+  errorMessage?: string | null;
+  onBaseUrlChange: (value: string) => void;
+  onSpaceIdChange: (value: string) => void;
+  onCredentialNameChange: (value: string) => void;
+  onSubmit?: () => void;
+  /**
+   * Hides the built-in "no stored credential" banner. Set when the parent shows
+   * its own missing-credential hint (e.g. the wizard's compact notice next to
+   * its inline "Add credential" button) so the message is not duplicated.
+   */
+  suppressMissingCredentialNotice?: boolean;
+}) {
+  const hasCredentials = credentials.length > 0;
+  const showNoCredentials =
+    credentialsLoaded && !credentialsLoading && !hasCredentials && !suppressMissingCredentialNotice;
+
+  return (
+    <form
+      className="space-y-4"
+      onSubmit={(event) => {
+        event.preventDefault();
+        onSubmit?.();
+      }}
+    >
+      {!canIngest && (
+        <div className="rounded-2xl border border-app-warning-border bg-app-warning-bg px-4 py-3 text-sm text-app-warning-text">
+          {ingestBlockedReason ?? "You can only connect sources to projects you manage."}
+        </div>
+      )}
+
+      {showNoCredentials && (
+        <div className="rounded-2xl border border-app-warning-border bg-app-warning-bg px-4 py-3 text-sm text-app-warning-text">
+          No Atlassian credentials are stored for your account. Add one under Settings, Access
+          Tokens, Atlassian first, then come back to connect.
+        </div>
+      )}
+
+      <Field label="Confluence base URL" controlId="confluence-base-url" disabled={isBusy}>
+        <Input
+          data-testid="confluence-base-url"
+          type="url"
+          value={baseUrl}
+          onChange={(event) => onBaseUrlChange(event.target.value)}
+          placeholder="https://your-domain.atlassian.net"
+          required
+        />
+      </Field>
+
+      <Field
+        label="Space ID"
+        controlId="confluence-space-id"
+        disabled={isBusy}
+        hint="Numeric ID of the space in Confluence Cloud."
+      >
+        <Input
+          data-testid="confluence-space-id"
+          type="text"
+          inputMode="numeric"
+          pattern="[0-9]+"
+          value={spaceId}
+          onChange={(event) => onSpaceIdChange(event.target.value)}
+          placeholder="e.g. 123456"
+          required
+        />
+      </Field>
+
+      <div className="flex flex-col gap-1.5">
+        <span className="text-sm font-medium text-app-text">Credential</span>
+        <DropdownSelect
+          label="Credential"
+          value={credentialName}
+          options={
+            hasCredentials
+              ? credentials.map((credential) => ({
+                  value: credential.displayName,
+                  label: `${credential.displayName} - ${credential.userEmail}`,
+                }))
+              : [
+                  {
+                    value: "",
+                    label: credentialsLoading ? "Loading credentials..." : "No credentials",
+                  },
+                ]
+          }
+          onChange={onCredentialNameChange}
+          disabled={isBusy || !hasCredentials}
+        />
+      </div>
+
+      {credentialsError && (
+        <div className="flex items-start gap-2 rounded-2xl border border-app-warning-border bg-app-warning-bg px-4 py-3 text-sm text-app-warning-text">
+          <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+          <span>{credentialsError}</span>
+        </div>
+      )}
+
+      {errorMessage && (
+        <div className="flex items-start gap-2 rounded-2xl border border-app-danger-border bg-app-danger-bg px-4 py-3 text-sm text-app-danger-text">
+          <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+          <span>{errorMessage}</span>
+        </div>
+      )}
+    </form>
+  );
+}
diff --git a/src/features/data-ingestion/components/JiraConnectStep.tsx b/src/features/data-ingestion/components/JiraConnectStep.tsx
index 35c0424c..eacb7e76 100644
--- a/src/features/data-ingestion/components/JiraConnectStep.tsx
+++ b/src/features/data-ingestion/components/JiraConnectStep.tsx
@@ -3,7 +3,7 @@ import { AlertTriangle } from "lucide-react";
 import { DropdownSelect } from "../../../components/ui/DropdownSelect.tsx";
 import { Field } from "../../../components/ui/Field.tsx";
 import { Input } from "../../../components/ui/Input.tsx";
-import type { JiraCredentialsDto } from "../../../services/sources/jiraService.ts";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService.ts";
 
 /**
  * Jira connect form for an instance URL and a credential owned by the
@@ -33,7 +33,7 @@ export function JiraConnectStep({
   displayName: string;
   url: string;
   credentialName: string;
-  credentials: JiraCredentialsDto[];
+  credentials: AtlassianCredentialDto[];
   credentialsLoaded: boolean;
   credentialsLoading: boolean;
   credentialsError: string | null;
@@ -73,7 +73,7 @@ export function JiraConnectStep({
       {showNoCredentials && (
         <div className="rounded-2xl border border-app-warning-border bg-app-warning-bg px-4 py-3 text-sm text-app-warning-text">
           No Jira credentials are stored for your account. Add one under Settings, Access Tokens,
-          Jira first, then come back to connect.
+          Atlassian first, then come back to connect.
         </div>
       )}
       <Field label="Display name" controlId="jira-display-name" disabled={isBusy}>
@@ -119,7 +119,7 @@ export function JiraConnectStep({
       </div>
       <p className="text-xs text-app-text-subtle">
         Jira account emails are stored with each credential. Manage them under Settings, Access
-        Tokens, Jira.
+        Tokens, Atlassian.
       </p>
       {credentialsError && (
         <div className="flex items-start gap-2 rounded-2xl border border-app-warning-border bg-app-warning-bg px-4 py-3 text-sm text-app-warning-text">
diff --git a/src/features/data-ingestion/components/RunDetailsPanel.tsx b/src/features/data-ingestion/components/RunDetailsPanel.tsx
index f030817a..ed693cc7 100644
--- a/src/features/data-ingestion/components/RunDetailsPanel.tsx
+++ b/src/features/data-ingestion/components/RunDetailsPanel.tsx
@@ -14,7 +14,7 @@ import { DetailsSideDrawer } from "../../../components/layout/DetailsSideDrawer"
 import { DrawerCard } from "../../admin/components/DrawerCard";
 import {
   formatDateTime,
-  formatJiraInstanceDomain,
+  formatInstanceDomain,
   formatNumber,
   getAiSyncStatusLabel,
   getRunStatusLabel,
@@ -181,7 +181,7 @@ export function RunDetailsPanel({ run, sourceLabel, onClose }: RunDetailsPanelPr
  */
 function buildOriginRow(run: IngestionRun): { label: string; value: string } | null {
   if (run.sourceSystem === "JIRA") {
-    return run.sourceId ? { label: "Domain", value: formatJiraInstanceDomain(run.sourceId) } : null;
+    return run.sourceId ? { label: "Domain", value: formatInstanceDomain(run.sourceId) } : null;
   }
 
   if (run.sourceSystem === "GITHUB") {
@@ -189,6 +189,10 @@ function buildOriginRow(run: IngestionRun): { label: string; value: string } | n
     return owner ? { label: "Owner", value: owner } : null;
   }
 
+  if (run.sourceSystem === "CONFLUENCE") {
+    return run.sourceId ? { label: "Space", value: run.sourceId } : null;
+  }
+
   return null;
 }
 
diff --git a/src/features/data-ingestion/components/SourceDetailsPanel.tsx b/src/features/data-ingestion/components/SourceDetailsPanel.tsx
index 45330555..cdef3a5a 100644
--- a/src/features/data-ingestion/components/SourceDetailsPanel.tsx
+++ b/src/features/data-ingestion/components/SourceDetailsPanel.tsx
@@ -1,5 +1,6 @@
 import {
   ArrowUp,
+  BookOpen,
   CalendarClock,
   Clock3,
   Database,
@@ -34,7 +35,10 @@ import {
   SOURCE_META,
 } from "../data.ts";
 import type { DataSource, LoadingState } from "../types.ts";
-import { GithubRepositorySyncSettings } from "./GithubRepositorySyncSettings.tsx";
+import {
+  GithubRepositorySyncSettings,
+  type SyncScheduleConfig,
+} from "./GithubRepositorySyncSettings.tsx";
 import { SourceStatusChip } from "./SourceStatusChip.tsx";
 import { SourceTypeBadge } from "./SourceTypeBadge.tsx";
 
@@ -57,6 +61,13 @@ type SourceDetailsPanelProps = {
     instanceUrl: string,
     request: Omit<ConfigureJiraInstanceRequest, "instanceUrl">,
   ) => Promise<void>;
+  /** Loads the sync schedule of a Confluence space (by connection id). */
+  onLoadConfluenceConfig?: (connectionId: string) => Promise<SyncScheduleConfig>;
+  /** Saves the sync schedule of a Confluence space (by connection id). */
+  onSaveConfluenceConfig?: (
+    connectionId: string,
+    request: ConfigureGithubRepositoryRequest,
+  ) => Promise<void>;
   /** Enables/disables the source in the connector (allow/deny for ingestion). */
   onSetSourceEnabled?: (
     repository: NonNullable<DataSource["githubRepository"]>,
@@ -85,6 +96,8 @@ export function SourceDetailsPanel({
   onSaveRepositoryConfig,
   onLoadJiraConfig,
   onSaveJiraConfig,
+  onLoadConfluenceConfig,
+  onSaveConfluenceConfig,
   onSetSourceEnabled,
   onSetJiraSourceEnabled,
   onUnlinkSource,
@@ -99,14 +112,23 @@ export function SourceDetailsPanel({
   const Icon = SOURCE_META[source.sourceSystem].icon;
   const repository = source.githubRepository;
   const jira = source.jiraInstance ?? null;
+  const confluence = source.confluenceSpace ?? null;
   const isJira = source.sourceSystem === "JIRA";
+  const isConfluence = source.sourceSystem === "CONFLUENCE";
   const isUpdating = updateState === "loading";
   const isRefreshing = refreshState === "loading";
-  // Update is available for a GitHub repo (needs owner/name) or a Jira instance
-  // (needs its URL); enable/disable and unlink stay GitHub-only for now.
+  // Update is available for a GitHub repo (needs owner/name), a Jira instance
+  // (needs its URL), or a Confluence space (needs its ID).
   const canUpdate =
     onUpdateSource !== undefined &&
-    ((source.sourceSystem === "GITHUB" && repository !== null) || (isJira && jira !== null));
+    ((source.sourceSystem === "GITHUB" && repository !== null) ||
+      (isJira && jira !== null) ||
+      (isConfluence && Boolean(confluence?.connectionId)));
+  // GitHub and Jira start an asynchronous run, so "Update started" is the whole
+  // story here. Confluence ingests synchronously and its caller already reports
+  // the outcome (completed, partial or failed) — a second toast from here would
+  // duplicate it and, on a failed run, contradict it.
+  const reportsUpdateItself = isConfluence;
   const canManageRepositoryConfig =
     canManageSyncSettings &&
     source.sourceSystem === "GITHUB" &&
@@ -119,6 +141,12 @@ export function SourceDetailsPanel({
     jira !== null &&
     onLoadJiraConfig !== undefined &&
     onSaveJiraConfig !== undefined;
+  const canManageConfluenceConfig =
+    canManageSyncSettings &&
+    isConfluence &&
+    Boolean(confluence?.connectionId) &&
+    onLoadConfluenceConfig !== undefined &&
+    onSaveConfluenceConfig !== undefined;
   const canToggleEnabled =
     canManageSyncSettings &&
     source.sourceSystem === "GITHUB" &&
@@ -132,17 +160,28 @@ export function SourceDetailsPanel({
   const isTogglingEnabled = enabledState === "loading";
   // Authorization is presence-based — the parent only passes onUnlinkSource when
   // the caller may manage the project's sources. GitHub needs the connection's
-  // repositoryId; Jira is identified by its instance URL.
+  // repositoryId; Jira is identified by its instance URL, Confluence by its
+  // connection id.
   const canUnlinkSource =
     onUnlinkSource !== undefined &&
     ((source.sourceSystem === "GITHUB" &&
       repository !== null &&
       repository.repositoryId !== null) ||
-      (isJira && jira !== null));
+      (isJira && jira !== null) ||
+      (isConfluence && Boolean(confluence?.connectionId)));
   const isUnlinking = unlinkState === "loading";
   // Noun for the unlink copy: GitHub sources are repositories, Jira sources are
-  // instances. Keeps each connector's wording accurate.
-  const removableNoun = isJira ? "instance" : "repository";
+  // instances, Confluence sources are spaces. Keeps each connector's wording
+  // accurate.
+  const removableNoun = isJira ? "instance" : isConfluence ? "space" : "repository";
+  // What removal actually costs, per connector. A GitHub repository and a Jira
+  // instance are shared between projects and only lose the project association,
+  // so re-linking restores the source as it was. A Confluence connection belongs
+  // to a single project, so removing it deletes the connection itself — the
+  // pages already ingested stay, but the space has to be set up again.
+  const removalHint = isConfluence
+    ? "The pages it already ingested are kept. Connecting the space again sets it up from scratch."
+    : `The ${removableNoun} and its artifacts are kept. You can re-link it later.`;
   // GitHub exposes one timestamp per resource type; Jira refreshes issue data
   // (including comments and change history) as one combined resource.
   const hasResourceSyncTimes =
@@ -217,14 +256,18 @@ export function SourceDetailsPanel({
     try {
       await onUpdateSource(source);
       setUpdateState("success");
-      toast.success("Update started", {
-        description: "Details refresh while ingestion runs.",
-      });
+      if (!reportsUpdateItself) {
+        toast.success("Update started", {
+          description: "Details refresh while ingestion runs.",
+        });
+      }
     } catch (error) {
       setUpdateState("error");
-      toast.error(error instanceof Error ? error.message : "Couldn't start the update.");
+      if (!reportsUpdateItself) {
+        toast.error(error instanceof Error ? error.message : "Couldn't start the update.");
+      }
     }
-  }, [canUpdate, onUpdateSource, source, toast]);
+  }, [canUpdate, onUpdateSource, reportsUpdateItself, source, toast]);
 
   const handleConfirmUnlink = useCallback(async () => {
     if (!onUnlinkSource) return;
@@ -308,16 +351,26 @@ export function SourceDetailsPanel({
             }}
             disabled={!canUpdate || isRefreshing}
             loading={isUpdating}
-            icon={isJira ? <Ticket className="h-4 w-4" /> : <GitBranch className="h-4 w-4" />}
+            icon={
+              isJira ? (
+                <Ticket className="h-4 w-4" />
+              ) : isConfluence ? (
+                <BookOpen className="h-4 w-4" />
+              ) : (
+                <GitBranch className="h-4 w-4" />
+              )
+            }
             title={
               canUpdate
                 ? undefined
                 : isJira
                   ? "Instance updates need the Jira instance URL."
-                  : "Repository updates need GitHub owner and repository name."
+                  : isConfluence
+                    ? "Space updates need the Confluence space ID."
+                    : "Repository updates need GitHub owner and repository name."
             }
           >
-            {isJira ? "Update instance" : "Update repo"}
+            {isJira ? "Update instance" : isConfluence ? "Update space" : "Update repo"}
           </Button>
 
           <Button
@@ -396,7 +449,21 @@ export function SourceDetailsPanel({
         </DrawerCard>
       )}
 
-      {!isJira && (
+      {isConfluence && (
+        <DrawerCard label="Space" icon={Icon} index={1} className="mt-4 sm:mt-5">
+          <dl className="-my-1">
+            <InfoRow label="Space name" value={source.name} />
+            {confluence?.spaceKey && <InfoRow label="Space key" value={confluence.spaceKey} />}
+            {confluence?.baseUrl && <InfoLinkRow label="Base URL" value={confluence.baseUrl} />}
+            <InfoRow label="Space ID" value={confluence?.spaceId ?? source.sourceId} mono />
+            {confluence?.credentialName && (
+              <InfoRow label="Credential" value={confluence.credentialName} />
+            )}
+          </dl>
+        </DrawerCard>
+      )}
+
+      {source.sourceSystem === "GITHUB" && (
         <DrawerCard label="Repository" icon={GitBranch} index={1} className="mt-4 sm:mt-5">
           <dl className="-my-1">
             <InfoRow label="Full name" value={repository?.fullName} />
@@ -478,6 +545,24 @@ export function SourceDetailsPanel({
         </DrawerCard>
       )}
 
+      {canManageConfluenceConfig &&
+        confluence?.connectionId &&
+        onLoadConfluenceConfig &&
+        onSaveConfluenceConfig && (
+          <DrawerCard label="Sync Schedule" icon={CalendarClock} index={3} className="mt-4 sm:mt-5">
+            {/* Same control again: Confluence connections carry the identical
+                schedule contract, only the load/save endpoints differ. */}
+            <GithubRepositorySyncSettings
+              loadKey={confluence.connectionId}
+              loadConfig={() => onLoadConfluenceConfig(confluence.connectionId)}
+              onSave={(request) => onSaveConfluenceConfig(confluence.connectionId, request)}
+              autoUpdateOnText="Due checks update this Confluence space."
+              autoUpdateOffText="Due checks only mark this Confluence space out of date."
+              toggleAriaLabel="Toggle Confluence space auto update"
+            />
+          </DrawerCard>
+        )}
+
       {source.failedItems.length > 0 && (
         <DrawerCard label="Failed Items" icon={XCircle} index={4} className="mt-4 sm:mt-5">
           <div className="space-y-3">
@@ -505,8 +590,7 @@ export function SourceDetailsPanel({
           className="mt-4 sm:mt-5"
         >
           <p className="text-sm text-app-danger-text">
-            Remove this {removableNoun} from the current project. The {removableNoun} and its
-            artifacts are kept. You can re-link it later.
+            Remove this {removableNoun} from the current project. {removalHint}
           </p>
           <Button
             variant="dangerSoft"
@@ -523,7 +607,7 @@ export function SourceDetailsPanel({
       <AlertDialog
         isOpen={isUnlinkDialogOpen}
         title={`Remove ${removableNoun} from project?`}
-        description={`"${source.name}" will no longer feed this project's knowledge base. The ${removableNoun} and its artifacts are kept, and you can re-link it later.`}
+        description={`"${source.name}" will no longer feed this project's knowledge base. ${removalHint}`}
         confirmLabel="Remove"
         loadingLabel="Removing…"
         variant="danger"
diff --git a/src/features/data-ingestion/components/SourceList.tsx b/src/features/data-ingestion/components/SourceList.tsx
index f6d6471f..773beee5 100644
--- a/src/features/data-ingestion/components/SourceList.tsx
+++ b/src/features/data-ingestion/components/SourceList.tsx
@@ -11,7 +11,7 @@ import { Button } from "../../../components/ui/Button.tsx";
 import {
   deriveConnectionStatus,
   deriveSyncStatus,
-  formatJiraInstanceDomain,
+  formatInstanceDomain,
   formatNumber,
 } from "../data.ts";
 import type { DataSource } from "../types.ts";
@@ -107,7 +107,13 @@ export function SourceList({
 
                     {source.jiraInstance?.instanceUrl && (
                       <p className="mt-0.5 truncate text-xs text-app-text-subtle sm:overflow-visible sm:break-words sm:whitespace-normal">
-                        {formatJiraInstanceDomain(source.jiraInstance.instanceUrl)}
+                        {formatInstanceDomain(source.jiraInstance.instanceUrl)}
+                      </p>
+                    )}
+
+                    {source.confluenceSpace?.baseUrl && (
+                      <p className="mt-0.5 truncate text-xs text-app-text-subtle sm:overflow-visible sm:break-words sm:whitespace-normal">
+                        {formatInstanceDomain(source.confluenceSpace.baseUrl)}
                       </p>
                     )}
                   </div>
diff --git a/src/features/data-ingestion/components/SourceTypeStep.tsx b/src/features/data-ingestion/components/SourceTypeStep.tsx
index f7ba2dfc..a8d29822 100644
--- a/src/features/data-ingestion/components/SourceTypeStep.tsx
+++ b/src/features/data-ingestion/components/SourceTypeStep.tsx
@@ -7,8 +7,9 @@ import type { SourceSystem } from "../types.ts";
  * wizard. Each card carries its own description so the differences between the
  * options -- the actual decision being made here -- are visible. Which
  * connectors count as available depends on the context (`availableTypes`): both
- * wizards now wire GitHub, Jira and Upload, but any connector left out of
- * `availableTypes` still renders with a "Soon" badge instead of being hidden.
+ * wizards now wire GitHub, Jira, Upload and Confluence, but any connector left
+ * out of `availableTypes` still renders with a "Soon" badge instead of being
+ * hidden.
  */
 export function SourceTypeStep({
   selectedType,
@@ -38,7 +39,10 @@ export function SourceTypeStep({
           <p className="mt-1 text-sm leading-relaxed text-app-text-muted">{description}</p>
         )}
 
-        <div className="mt-3 grid gap-3 sm:grid-cols-3">
+        {/* Two columns from `sm` up rather than one row per connector: with four
+            source types a three-column grid leaves a single card stranded on the
+            second row, and the cards carry a description each. */}
+        <div className="mt-3 grid gap-3 sm:grid-cols-2">
           {SOURCE_SYSTEMS.map((sourceSystem) => {
             const meta = SOURCE_META[sourceSystem];
             const Icon = meta.icon;
diff --git a/src/features/data-ingestion/data.ts b/src/features/data-ingestion/data.ts
index 3c136126..d0d0b957 100644
--- a/src/features/data-ingestion/data.ts
+++ b/src/features/data-ingestion/data.ts
@@ -1,5 +1,6 @@
 import {
   AlertTriangle,
+  BookOpen,
   CheckCircle2,
   CircleSlash,
   FileText,
@@ -21,8 +22,9 @@ import type {
   SourceSystem,
 } from "./types.ts";
 import type { JiraInstanceDto } from "../../services/sources/jiraService.ts";
+import type { ConfluenceConnectionDto } from "../../services/sources/confluenceService.ts";
 
-export const SOURCE_SYSTEMS: SourceSystem[] = ["GITHUB", "JIRA", "UPLOAD"];
+export const SOURCE_SYSTEMS: SourceSystem[] = ["GITHUB", "JIRA", "UPLOAD", "CONFLUENCE"];
 
 export const SOURCE_META: Record<SourceSystem, SourceMeta> = {
   GITHUB: {
@@ -43,6 +45,12 @@ export const SOURCE_META: Record<SourceSystem, SourceMeta> = {
     icon: FileText,
     description: "Indexes manually uploaded documentation, markdown files and project knowledge.",
   },
+  CONFLUENCE: {
+    name: "Confluence Space",
+    type: "Confluence",
+    icon: BookOpen,
+    description: "Indexes pages, hierarchical documents and spaces from Confluence Cloud.",
+  },
 };
 
 export const INGESTION_RUN_LIMIT = 50;
@@ -224,6 +232,151 @@ export function createUploadSourceFromInstance(status: SourceInstanceIngestionSt
     failedItems: status.failedItems,
     githubRepository: null,
     jiraInstance: null,
+    confluenceSpace: null,
+    lastCommitsSyncAt: null,
+    lastIssuesSyncAt: null,
+    lastPullRequestsSyncAt: null,
+  };
+}
+
+/**
+ * Maps a CONFLUENCE status row from `/api/v1/ingestion-sources/status` into the
+ * full {@link DataSource} model rendered on the ingestion page.
+ */
+export function createConfluenceSourceFromInstance(
+  status: SourceInstanceIngestionStatus,
+  connection?: ConfluenceConnectionDto | null,
+  connectorEnabled?: boolean,
+): DataSource {
+  const meta = SOURCE_META.CONFLUENCE;
+  const backendStatus: BackendProjectSourceStatus =
+    status.enabled === false ? "DISABLED" : status.connectionStatus;
+  const hasErrors = status.failedCount > 0;
+  const hasNeverSynced = status.lastRunTime === null;
+
+  return {
+    sourceId: connection?.id ?? status.sourceId,
+    sourceSystem: "CONFLUENCE",
+    name: status.displayName,
+    type: meta.type,
+    icon: meta.icon,
+    status: getSourceStatusFromBackend(backendStatus),
+    backendStatus,
+    statusLabel: getBackendSourceStatusLabel(backendStatus),
+    ingestionStatus: getSourceStatus(hasNeverSynced, hasErrors, null),
+    ingestionStatusLabel:
+      !hasNeverSynced && !hasErrors
+        ? "Synced"
+        : getSourceStatusLabel(hasNeverSynced, hasErrors, null),
+    statusView: deriveSourceStatus({
+      backendStatus,
+      hasErrors,
+      hasNeverSynced,
+      connectorEnabled,
+    }),
+    artifacts: status.artifactCount,
+    lastSync: formatDateTime(status.lastRunTime),
+    nextSync: connection?.nextSyncAt ? formatDateTime(connection.nextSyncAt) : "Not scheduled",
+    errors: status.failedCount,
+    description: meta.description,
+    lastRunAt: status.lastRunTime,
+    latestIngestedCount: status.ingestedCount,
+    latestUpdatedCount: status.updatedCount,
+    deletedCount: status.deletedCount,
+    totalArtifactCount: status.artifactCount,
+    runIds: [],
+    sharesSourceSystem: false,
+    failedItems: status.failedItems,
+    githubRepository: null,
+    jiraInstance: null,
+    // Same shape as the connection-built card below: the details drawer only
+    // renders the space name and credential rows when they are present, and a
+    // card must not lose them just because a status row exists for it.
+    confluenceSpace: connection
+      ? {
+          connectionId: connection.id,
+          baseUrl: connection.baseUrl,
+          spaceId: connection.spaceId,
+          spaceKey: connection.spaceKey,
+          spaceName: connection.spaceName,
+          credentialName: connection.credentialName,
+        }
+      : null,
+    lastCommitsSyncAt: null,
+    lastIssuesSyncAt: null,
+    lastPullRequestsSyncAt: null,
+  };
+}
+
+/**
+ * Creates a DataSource directly from a {@link ConfluenceConnectionDto},
+ * matching against recent ingestion runs for counters and sync status.
+ */
+export function createConfluenceSourceFromConnection(
+  connection: ConfluenceConnectionDto,
+  runs: IngestionRun[] = [],
+  connectorEnabled?: boolean,
+): DataSource {
+  const meta = SOURCE_META.CONFLUENCE;
+  const compositeRef = `${connection.baseUrl}|${connection.spaceId}`.toLowerCase();
+  const latestRun = runs.find(
+    (r) =>
+      r.sourceSystem === "CONFLUENCE" &&
+      (r.sourceId?.toLowerCase() === compositeRef ||
+        r.sourceId?.toLowerCase() === connection.spaceId.toLowerCase() ||
+        r.sourceId?.toLowerCase() === connection.id.toLowerCase() ||
+        r.sourceId?.toLowerCase() === connection.spaceKey.toLowerCase() ||
+        r.repositoryId === connection.id),
+  );
+
+  const hasNeverSynced = !latestRun;
+  const hasErrors = (latestRun?.failedCount ?? 0) > 0;
+  const backendStatus: BackendProjectSourceStatus =
+    connection.sourceEnabled === false ? "DISABLED" : "CONNECTED";
+
+  return {
+    sourceId: connection.id,
+    sourceSystem: "CONFLUENCE",
+    name: connection.spaceName ?? connection.spaceKey ?? connection.spaceId,
+    type: meta.type,
+    icon: meta.icon,
+    status: getSourceStatusFromBackend(backendStatus),
+    backendStatus,
+    statusLabel: getBackendSourceStatusLabel(backendStatus),
+    ingestionStatus: getSourceStatus(hasNeverSynced, hasErrors, latestRun?.status ?? null),
+    ingestionStatusLabel:
+      !hasNeverSynced && !hasErrors
+        ? "Synced"
+        : getSourceStatusLabel(hasNeverSynced, hasErrors, latestRun?.status ?? null),
+    statusView: deriveSourceStatus({
+      backendStatus,
+      hasErrors,
+      hasNeverSynced,
+      connectorEnabled,
+    }),
+    artifacts: (latestRun?.ingestedCount ?? 0) + (latestRun?.updatedCount ?? 0),
+    lastSync: formatDateTime(latestRun?.finishedAt ?? latestRun?.startedAt),
+    nextSync: connection.nextSyncAt ? formatDateTime(connection.nextSyncAt) : "Not scheduled",
+    errors: latestRun?.failedCount ?? 0,
+    description: meta.description,
+    lastRunAt: latestRun?.startedAt ?? null,
+    latestIngestedCount: latestRun?.ingestedCount ?? 0,
+    latestUpdatedCount: latestRun?.updatedCount ?? 0,
+    deletedCount: latestRun?.deletedCount ?? 0,
+    totalArtifactCount: (latestRun?.ingestedCount ?? 0) + (latestRun?.updatedCount ?? 0),
+    runIds: latestRun ? [latestRun.runId] : [],
+    sharesSourceSystem: false,
+    failedItems: latestRun?.failedItems ?? [],
+    githubRepository: null,
+    jiraInstance: null,
+    confluenceSpace: {
+      connectionId: connection.id,
+      baseUrl: connection.baseUrl,
+      spaceId: connection.spaceId,
+      spaceKey: connection.spaceKey,
+      spaceName: connection.spaceName,
+      credentialName: connection.credentialName,
+    },
     lastCommitsSyncAt: null,
     lastIssuesSyncAt: null,
     lastPullRequestsSyncAt: null,
@@ -525,11 +678,13 @@ export function getSourceLabel(sourceSystem: SourceSystem) {
 }
 
 /**
- * The host of a Jira instance URL without the scheme, e.g.
+ * The host of an instance URL without the scheme, e.g.
  * `"acme.atlassian.net"` for `"https://acme.atlassian.net"`. Falls back to
  * stripping the scheme/trailing slash by hand if the value is not a valid URL.
+ *
+ * Used for the Jira instance and the Confluence base URL alike.
  */
-export function formatJiraInstanceDomain(instanceUrl: string): string {
+export function formatInstanceDomain(instanceUrl: string): string {
   try {
     return new URL(instanceUrl).host;
   } catch {
@@ -550,9 +705,23 @@ export function buildRunSourceLabels(sources: DataSource[]): Map<string, string>
   const labels = new Map<string, string>();
 
   sources.forEach((source) => {
-    const ref = source.jiraInstance?.instanceUrl ?? source.githubRepository?.fullName;
-    if (ref && !labels.has(ref)) {
-      labels.set(ref, source.name);
+    if (source.jiraInstance?.instanceUrl) {
+      labels.set(source.jiraInstance.instanceUrl, source.name);
+    }
+
+    if (source.githubRepository?.fullName) {
+      labels.set(source.githubRepository.fullName, source.name);
+    }
+
+    if (source.confluenceSpace) {
+      const { connectionId, baseUrl, spaceId, spaceKey } = source.confluenceSpace;
+      if (connectionId) labels.set(connectionId, source.name);
+      if (baseUrl && spaceId) {
+        labels.set(`${baseUrl}|${spaceId}`, source.name);
+        labels.set(`${baseUrl}|${spaceId}`.toLowerCase(), source.name);
+      }
+      if (spaceKey) labels.set(spaceKey, source.name);
+      if (spaceId) labels.set(spaceId, source.name);
     }
   });
 
@@ -573,7 +742,7 @@ export function getRunSourceLabel(run: IngestionRun, labelBySourceRef?: Map<stri
   return getSourceLabel(run.sourceSystem);
 }
 
-export function formatDateTime(value: string | null) {
+export function formatDateTime(value: string | null | undefined) {
   if (!value) return "Never";
 
   const date = new Date(value);
diff --git a/src/features/data-ingestion/types.ts b/src/features/data-ingestion/types.ts
index 7bf41f29..38c24bca 100644
--- a/src/features/data-ingestion/types.ts
+++ b/src/features/data-ingestion/types.ts
@@ -1,6 +1,6 @@
 import type { LucideIcon } from "lucide-react";
 
-export type SourceSystem = "GITHUB" | "JIRA" | "UPLOAD";
+export type SourceSystem = "GITHUB" | "JIRA" | "UPLOAD" | "CONFLUENCE";
 
 export type BackendProjectSourceStatus =
   | "CONNECTED"
@@ -189,6 +189,18 @@ export type JiraInstanceSourceDetails = {
   credentialUserEmail: string;
 };
 
+/**
+ * Confluence-specific identity for a source card.
+ */
+export type ConfluenceSpaceSourceDetails = {
+  connectionId: string;
+  baseUrl: string;
+  spaceId: string;
+  spaceKey: string;
+  spaceName?: string | null;
+  credentialName?: string;
+};
+
 export type ActiveTab = "sources" | "artifacts" | "runs" | "connectors";
 
 /**
@@ -266,6 +278,8 @@ export type SourceDetailsSource = {
   githubRepository?: GithubRepositoryDetails | null;
   /** Jira instance identity; null/absent for non-Jira sources. */
   jiraInstance?: JiraInstanceSourceDetails | null;
+  /** Confluence space identity; null/absent for non-Confluence sources. */
+  confluenceSpace?: ConfluenceSpaceSourceDetails | null;
   description?: string;
   nextSync?: string;
 };
@@ -287,6 +301,7 @@ export type DataSource = SourceDetailsSource & {
   sharesSourceSystem: boolean;
   failedItems: FailedArtifact[];
   githubRepository: GithubRepositoryDetails | null;
+  confluenceSpace?: ConfluenceSpaceSourceDetails | null;
   /** Per-artifact-type last-sync timestamps (GitHub, from endpoint #5). */
   lastCommitsSyncAt: string | null;
   lastIssuesSyncAt: string | null;
diff --git a/src/features/knowledge-base/components/ArtifactList.tsx b/src/features/knowledge-base/components/ArtifactList.tsx
index 7b316693..96bacebb 100644
--- a/src/features/knowledge-base/components/ArtifactList.tsx
+++ b/src/features/knowledge-base/components/ArtifactList.tsx
@@ -1,12 +1,13 @@
 import { memo } from "react";
 import { AnimatePresence, motion } from "framer-motion";
 import {
-  FileText,
-  FileCode,
-  CircleDot,
-  GitPullRequest,
+  BookOpen,
   Building2,
   ChevronRight,
+  CircleDot,
+  FileCode,
+  FileText,
+  GitPullRequest,
 } from "lucide-react";
 import type { Artifact, ArtifactType } from "../types";
 import { SpotlightCard } from "../../../components/ui/SpotlightCard";
@@ -31,6 +32,8 @@ const getIcon = (type: ArtifactType) => {
       return <CircleDot className="h-5 w-5 text-app-warning-text" />;
     case "PULL_REQUEST":
       return <GitPullRequest className="h-5 w-5 text-app-success-text" />;
+    case "PAGE":
+      return <BookOpen className="h-5 w-5 text-app-brand" />;
     case "ORG_METADATA":
       // Neutral like COMMIT so it never reads as a status; organizations are
       // a distinct shape, not a success/warning condition.
diff --git a/src/features/knowledge-base/components/ArtifactViewerDrawer.tsx b/src/features/knowledge-base/components/ArtifactViewerDrawer.tsx
index ded9be7f..a5aa3e6b 100644
--- a/src/features/knowledge-base/components/ArtifactViewerDrawer.tsx
+++ b/src/features/knowledge-base/components/ArtifactViewerDrawer.tsx
@@ -169,7 +169,8 @@ function drawerReducer(state: DrawerState, action: DrawerAction): DrawerState {
 
 /**
  * Determines whether an artifact should be rendered as Markdown.
- * Issues, Pull Requests, Jira items, and Markdown files (.md/.markdown) are always rendered as Markdown.
+ * Issues, Pull Requests, Jira items, Confluence artifacts, and Markdown files (.md/.markdown) are always rendered as Markdown.
+ * Confluence is detected via sourceSystem or a /wiki/spaces/ URL pattern.
  */
 const shouldRenderAsMarkdown = (
   content: ArtifactContent | null | undefined,
@@ -196,7 +197,10 @@ const shouldRenderAsMarkdown = (
     sourceUrl.includes("/issues/") ||
     sourceUrl.includes("/browse/");
 
-  return content.mimeType.startsWith("text/markdown") || isPrOrIssue || isMd;
+  const isConfluence =
+    artifact?.sourceSystem === "CONFLUENCE" || sourceUrl.includes("/wiki/spaces/");
+
+  return content.mimeType.startsWith("text/markdown") || isPrOrIssue || isMd || isConfluence;
 };
 
 // Hoisted to module scope so ReactMarkdown doesn't see a new array on every render
diff --git a/src/features/knowledge-base/types.ts b/src/features/knowledge-base/types.ts
index 4deffaae..0e179f11 100644
--- a/src/features/knowledge-base/types.ts
+++ b/src/features/knowledge-base/types.ts
@@ -2,13 +2,13 @@
  * Defines the specific entity type of an artifact.
  * Used by the UI to determine icon representations and filtering logic.
  */
-export type ArtifactType = "COMMIT" | "FILE" | "ISSUE" | "PULL_REQUEST" | "ORG_METADATA";
+export type ArtifactType = "COMMIT" | "FILE" | "ISSUE" | "PULL_REQUEST" | "PAGE" | "ORG_METADATA";
 
 /**
  * Origin source of the artifact data.
  * Used to route API calls (e.g., Github vs internal Uploads).
  */
-export type SourceSystem = "GITHUB" | "JIRA" | "UPLOAD";
+export type SourceSystem = "GITHUB" | "JIRA" | "UPLOAD" | "CONFLUENCE";
 
 /**
  * Core business entity representing any indexed piece of knowledge.
diff --git a/src/features/settings/components/jira/JiraCredentialAddForm.tsx b/src/features/settings/components/atlassian/AtlassianCredentialAddForm.tsx
similarity index 74%
rename from src/features/settings/components/jira/JiraCredentialAddForm.tsx
rename to src/features/settings/components/atlassian/AtlassianCredentialAddForm.tsx
index ebfd7df2..1052a488 100644
--- a/src/features/settings/components/jira/JiraCredentialAddForm.tsx
+++ b/src/features/settings/components/atlassian/AtlassianCredentialAddForm.tsx
@@ -5,14 +5,17 @@ import { Field } from "../../../../components/ui/Field";
 import { Input } from "../../../../components/ui/Input";
 import { useToast } from "../../../../context/useToast";
 import { parseApiError, describeRefreshFailure } from "../../../../services/apiError";
-import { addJiraCredential, type JiraCredentialsDto } from "../../../../services/sources/jiraService";
+import {
+  addAtlassianCredential,
+  type AtlassianCredentialDto,
+} from "../../../../services/sources/atlassianService";
 
-type JiraCredentialAddFormProps = {
-  /** Login email used only as the initial Jira account email. */
+type AtlassianCredentialAddFormProps = {
+  /** Login email used only as the initial Atlassian account email. */
   defaultUserEmail: string | null;
   onClose: () => void;
   /** Receives the credential just added, for an optimistic list update. */
-  onSaved: (credential: JiraCredentialsDto) => Promise<void>;
+  onSaved: (credential: AtlassianCredentialDto) => Promise<void>;
   /**
    * When the form is already inside a titled container (the wizard's desktop
    * companion), drop its own card chrome and header so the inputs sit directly
@@ -21,19 +24,20 @@ type JiraCredentialAddFormProps = {
   embedded?: boolean;
 };
 
-const ADD_FALLBACK = "Failed to add Jira credential.";
+const ADD_FALLBACK = "Failed to add Atlassian credential.";
 
 /**
- * Inline form for storing a Jira account email and API token for the
- * authenticated user. The login email is only a convenience default because
- * the Jira account may use a different address.
+ * Inline form for storing an Atlassian account email and API token for the
+ * authenticated user, shared by the Jira and Confluence connectors. The login
+ * email is only a convenience default because the Atlassian account may use a
+ * different address.
  */
-export function JiraCredentialAddForm({
+export function AtlassianCredentialAddForm({
   defaultUserEmail,
   onClose,
   onSaved,
   embedded = false,
-}: JiraCredentialAddFormProps) {
+}: AtlassianCredentialAddFormProps) {
   const [userEmail, setUserEmail] = useState(defaultUserEmail ?? "");
   const [name, setName] = useState("");
   const [token, setToken] = useState("");
@@ -67,7 +71,7 @@ export function JiraCredentialAddForm({
     setIsSaving(true);
     try {
       try {
-        await addJiraCredential({
+        await addAtlassianCredential({
           userEmail: trimmedEmail,
           tokenName: trimmedName,
           authToken: token.trim(),
@@ -84,7 +88,7 @@ export function JiraCredentialAddForm({
         onClose();
         return;
       }
-      toast.success("Jira credential added");
+      toast.success("Atlassian credential added");
       onClose();
     } finally {
       savingRef.current = false;
@@ -95,7 +99,7 @@ export function JiraCredentialAddForm({
   return (
     <form
       onSubmit={(e) => void handleSubmit(e)}
-      aria-label="Add Jira credential"
+      aria-label="Add Atlassian credential"
       className={
         embedded
           ? ""
@@ -104,7 +108,7 @@ export function JiraCredentialAddForm({
     >
       {!embedded && (
         <div className="mb-4 flex items-start justify-between gap-3">
-          <span className="text-sm font-semibold text-app-text">New Jira credential</span>
+          <span className="text-sm font-semibold text-app-text">New Atlassian credential</span>
           <Button
             variant="ghost"
             size="sm"
@@ -119,23 +123,27 @@ export function JiraCredentialAddForm({
       )}
 
       <div className="space-y-3">
-        <Field label="Jira account email" controlId="settings-jira-add-email" disabled={isSaving}>
+        <Field
+          label="Atlassian account email"
+          controlId="settings-atlassian-add-email"
+          disabled={isSaving}
+        >
           <Input
             ref={emailInputRef}
-            data-testid="settings-jira-add-email"
+            data-testid="settings-atlassian-add-email"
             type="email"
             value={userEmail}
             onChange={(e) => setUserEmail(e.target.value)}
-            placeholder="jira-account@example.com"
+            placeholder="atlassian-account@example.com"
             required
             autoComplete="email"
           />
         </Field>
 
-        <Field label="Credential name" controlId="settings-jira-add-name" disabled={isSaving}>
+        <Field label="Credential name" controlId="settings-atlassian-add-name" disabled={isSaving}>
           <Input
             ref={nameInputRef}
-            data-testid="settings-jira-add-name"
+            data-testid="settings-atlassian-add-name"
             value={name}
             onChange={(e) => setName(e.target.value)}
             placeholder="e.g. default"
@@ -146,16 +154,16 @@ export function JiraCredentialAddForm({
 
         <Field
           label="API token"
-          controlId="settings-jira-add-token"
+          controlId="settings-atlassian-add-token"
           disabled={isSaving}
           hint="The token is stored encrypted and cannot be retrieved after saving."
         >
           <Input
-            data-testid="settings-jira-add-token"
+            data-testid="settings-atlassian-add-token"
             type="password"
             value={token}
             onChange={(e) => setToken(e.target.value)}
-            placeholder="Jira API token"
+            placeholder="Atlassian API token"
             required
             autoComplete="off"
           />
@@ -168,7 +176,7 @@ export function JiraCredentialAddForm({
           <Button
             variant="primary"
             type="submit"
-            data-testid="settings-jira-add-submit"
+            data-testid="settings-atlassian-add-submit"
             loading={isSaving}
           >
             {isSaving ? "Adding..." : "Add credential"}
diff --git a/src/features/settings/components/jira/JiraCredentialRow.tsx b/src/features/settings/components/atlassian/AtlassianCredentialRow.tsx
similarity index 83%
rename from src/features/settings/components/jira/JiraCredentialRow.tsx
rename to src/features/settings/components/atlassian/AtlassianCredentialRow.tsx
index bbd91249..2f10e064 100644
--- a/src/features/settings/components/jira/JiraCredentialRow.tsx
+++ b/src/features/settings/components/atlassian/AtlassianCredentialRow.tsx
@@ -8,27 +8,28 @@ import { useToast } from "../../../../context/useToast";
 import { centralSpringToken } from "../../../../styles/tokens";
 import { parseApiError, describeRefreshFailure } from "../../../../services/apiError";
 import {
-  changeJiraCredentialName,
-  changeJiraCredentialToken,
-  deleteJiraCredential,
-} from "../../../../services/sources/jiraService";
-import type { JiraCredentialsDto } from "../../../../services/sources/jiraService";
+  changeAtlassianCredentialName,
+  changeAtlassianCredentialToken,
+  deleteAtlassianCredential,
+} from "../../../../services/sources/atlassianService";
+import type { AtlassianCredentialDto } from "../../../../services/sources/atlassianService";
 
-type JiraCredentialRowProps = {
-  credential: JiraCredentialsDto;
+type AtlassianCredentialRowProps = {
+  credential: AtlassianCredentialDto;
   onSaved: () => Promise<void>;
 };
 
 type Panel = "none" | "rename" | "rotate" | "delete";
 
 /**
- * One row in the Jira credential list. Only one inline panel (rename, rotate or
- * delete) is open at a time; they share a single input/error/busy state since
- * they are mutually exclusive. Rename and rotate reuse the same text field
- * (rename prefilled with the current name, rotate empty and masked). The
- * credential is identified by `(userEmail, displayName)` for every mutation.
+ * One row in the Atlassian credential list. Only one inline panel (rename,
+ * rotate or delete) is open at a time; they share a single input/error/busy
+ * state since they are mutually exclusive. Rename and rotate reuse the same
+ * text field (rename prefilled with the current name, rotate empty and
+ * masked). The credential is identified by `(userEmail, displayName)` for
+ * every mutation.
  */
-export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProps) {
+export function AtlassianCredentialRow({ credential, onSaved }: AtlassianCredentialRowProps) {
   const { userEmail, displayName } = credential;
 
   const [panel, setPanel] = useState<Panel>("none");
@@ -92,7 +93,7 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
   const submitRename = () =>
     void runMutation(
       () =>
-        changeJiraCredentialName({
+        changeAtlassianCredentialName({
           userEmail,
           oldName: displayName,
           newName: value.trim(),
@@ -104,18 +105,18 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
   const submitRotate = () =>
     void runMutation(
       () =>
-        changeJiraCredentialToken({
+        changeAtlassianCredentialToken({
           userEmail,
           tokenName: displayName,
           newToken: value.trim(),
         }),
       "Couldn't rotate the token.",
-      "Jira token rotated",
+      "Atlassian token rotated",
     );
 
   const confirmDelete = () =>
     void runMutation(
-      () => deleteJiraCredential({ userEmail, tokenName: displayName }),
+      () => deleteAtlassianCredential({ userEmail, tokenName: displayName }),
       "Couldn't delete the credential.",
       "Credential deleted",
     );
@@ -145,7 +146,7 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
               variant="secondary"
               size="sm"
               onClick={openRename}
-              data-testid={`settings-jira-rename-open-${displayName}`}
+              data-testid={`settings-atlassian-rename-open-${displayName}`}
               icon={<Pencil className="h-3.5 w-3.5" />}
               aria-label={`Rename credential ${displayName}`}
               className="flex-1 sm:flex-none"
@@ -156,7 +157,7 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
               variant="secondary"
               size="sm"
               onClick={openRotate}
-              data-testid={`settings-jira-rotate-open-${displayName}`}
+              data-testid={`settings-atlassian-rotate-open-${displayName}`}
               icon={<RefreshCw className="h-3.5 w-3.5" />}
               aria-label={`Rotate token ${displayName}`}
               className="flex-1 sm:flex-none"
@@ -167,7 +168,7 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
               variant="dangerSoft"
               size="sm"
               onClick={openDelete}
-              data-testid={`settings-jira-delete-open-${displayName}`}
+              data-testid={`settings-atlassian-delete-open-${displayName}`}
               icon={<Trash2 className="h-3.5 w-3.5" />}
               aria-label={`Delete credential ${displayName}`}
               className="flex-1 sm:flex-none"
@@ -197,12 +198,12 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
             <div className="flex flex-col gap-3 xl:flex-row xl:items-end">
               <Field
                 label="New name"
-                controlId={`settings-jira-rename-${displayName}`}
+                controlId={`settings-atlassian-rename-${displayName}`}
                 disabled={isBusy}
                 className="min-w-0 flex-1"
               >
                 <Input
-                  data-testid={`settings-jira-rename-input-${displayName}`}
+                  data-testid={`settings-atlassian-rename-input-${displayName}`}
                   value={value}
                   onChange={(e) => setValue(e.target.value)}
                   placeholder="e.g. default"
@@ -214,7 +215,7 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
                 <Button
                   variant="primary"
                   type="submit"
-                  data-testid={`settings-jira-rename-submit-${displayName}`}
+                  data-testid={`settings-atlassian-rename-submit-${displayName}`}
                   loading={isBusy}
                   icon={<Pencil className="h-4 w-4" />}
                 >
@@ -246,16 +247,16 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
             <div className="flex flex-col gap-3 xl:flex-row xl:items-end">
               <Field
                 label="New API token"
-                controlId={`settings-jira-rotate-${displayName}`}
+                controlId={`settings-atlassian-rotate-${displayName}`}
                 disabled={isBusy}
                 className="min-w-0 flex-1"
               >
                 <Input
-                  data-testid={`settings-jira-rotate-input-${displayName}`}
+                  data-testid={`settings-atlassian-rotate-input-${displayName}`}
                   type="password"
                   value={value}
                   onChange={(e) => setValue(e.target.value)}
-                  placeholder="New Jira API token"
+                  placeholder="New Atlassian API token"
                   required
                   autoComplete="off"
                   icon={<KeyRound className="h-4 w-4" />}
@@ -265,7 +266,7 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
                 <Button
                   variant="primary"
                   type="submit"
-                  data-testid={`settings-jira-rotate-submit-${displayName}`}
+                  data-testid={`settings-atlassian-rotate-submit-${displayName}`}
                   loading={isBusy}
                   icon={<RefreshCw className="h-4 w-4" />}
                 >
@@ -290,14 +291,14 @@ export function JiraCredentialRow({ credential, onSaved }: JiraCredentialRowProp
           >
             <p className="mb-3 text-sm text-app-danger-text">
               Delete <strong>{displayName}</strong>? This cannot be undone and may break connected
-              Jira instances.
+              Jira instances and Confluence spaces.
             </p>
             <div className="flex flex-col gap-2 sm:flex-row">
               <Button
                 variant="danger"
                 size="sm"
                 onClick={confirmDelete}
-                data-testid={`settings-jira-delete-confirm-${displayName}`}
+                data-testid={`settings-atlassian-delete-confirm-${displayName}`}
                 loading={isBusy}
               >
                 {isBusy ? "Deleting..." : "Delete"}
diff --git a/src/features/settings/hooks/useJiraCredentials.ts b/src/features/settings/hooks/useAtlassianCredentials.ts
similarity index 75%
rename from src/features/settings/hooks/useJiraCredentials.ts
rename to src/features/settings/hooks/useAtlassianCredentials.ts
index 276a2f57..35f0f57c 100644
--- a/src/features/settings/hooks/useJiraCredentials.ts
+++ b/src/features/settings/hooks/useAtlassianCredentials.ts
@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import { getMyJiraCredentials } from "../../../services/sources/jiraService";
-import type { JiraCredentialsDto } from "../../../services/sources/jiraService";
+import { getMyAtlassianCredentials } from "../../../services/sources/atlassianService";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService";
 
-type UseJiraCredentialsResult = {
-  credentials: JiraCredentialsDto[];
+type UseAtlassianCredentialsResult = {
+  credentials: AtlassianCredentialDto[];
   loaded: boolean;
   error: string | null;
   isRefreshing: boolean;
@@ -14,17 +14,18 @@ type UseJiraCredentialsResult = {
    * successful add is reflected immediately even if the follow-up reload fails
    * or is aborted. A later `reload` reconciles with the server.
    */
-  addCredentialLocally: (credential: JiraCredentialsDto) => void;
+  addCredentialLocally: (credential: AtlassianCredentialDto) => void;
 };
 
 /**
- * Loads the Jira credentials owned by the authenticated user.
+ * Loads the Atlassian credentials owned by the authenticated user, shared by
+ * the Jira and Confluence connectors.
  *
  * When disabled, the hook settles into a loaded-empty state without fetching.
  * Reloads abort any in-flight request so stale data cannot win a race.
  */
-export function useJiraCredentials(enabled = true): UseJiraCredentialsResult {
-  const [credentials, setCredentials] = useState<JiraCredentialsDto[]>([]);
+export function useAtlassianCredentials(enabled = true): UseAtlassianCredentialsResult {
+  const [credentials, setCredentials] = useState<AtlassianCredentialDto[]>([]);
   const [loaded, setLoaded] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [isRefreshing, setIsRefreshing] = useState(false);
@@ -60,7 +61,7 @@ export function useJiraCredentials(enabled = true): UseJiraCredentialsResult {
 
     setIsRefreshing(true);
     try {
-      const list = await getMyJiraCredentials(controller.signal);
+      const list = await getMyAtlassianCredentials(controller.signal);
       if (id === requestIdRef.current && mountedRef.current) {
         setCredentials(list);
         setLoaded(true);
@@ -71,7 +72,7 @@ export function useJiraCredentials(enabled = true): UseJiraCredentialsResult {
       if (id === requestIdRef.current && mountedRef.current) {
         setLoaded(true);
         setError(
-          loadError instanceof Error ? loadError.message : "Failed to load Jira credentials.",
+          loadError instanceof Error ? loadError.message : "Failed to load Atlassian credentials.",
         );
       }
     } finally {
@@ -81,7 +82,7 @@ export function useJiraCredentials(enabled = true): UseJiraCredentialsResult {
     }
   }, [enabled]);
 
-  const addCredentialLocally = useCallback((credential: JiraCredentialsDto) => {
+  const addCredentialLocally = useCallback((credential: AtlassianCredentialDto) => {
     setCredentials((prev) =>
       prev.some((existing) => existing.displayName === credential.displayName)
         ? prev
diff --git a/src/pages/DataIngestionPage.tsx b/src/pages/DataIngestionPage.tsx
index 6fbb3e78..5eaf67b8 100644
--- a/src/pages/DataIngestionPage.tsx
+++ b/src/pages/DataIngestionPage.tsx
@@ -24,10 +24,13 @@ import { SourceList } from "../features/data-ingestion/components/SourceList.tsx
 import { ConnectorList } from "../features/connectors/components/ConnectorList.tsx";
 import { ConnectorsLoadingState } from "../features/connectors/components/ConnectorsLoadingState.tsx";
 import { toConnectorListItems } from "../features/connectors/data.ts";
+import { useConfluenceSync } from "../features/connectors/components/useConfluenceSync.ts";
 import type { ConnectorListItem } from "../features/connectors/types.ts";
 import { connectorService } from "../services/connectorService.ts";
 import {
   buildRunSourceLabels,
+  createConfluenceSourceFromConnection,
+  createConfluenceSourceFromInstance,
   createJiraSourceFromInstance,
   createUploadSourceFromInstance,
   deriveSourceStatus,
@@ -78,6 +81,10 @@ import {
   type ConfigureJiraInstanceRequest,
   type JiraInstanceDto,
 } from "../services/sources/jiraService.ts";
+import {
+  confluenceService,
+  type ConfluenceConnectionDto,
+} from "../services/sources/confluenceService.ts";
 import { projectService, type ProjectSource } from "../services/projectService.ts";
 import { parseGithubRepositoryReference } from "../services/sources/githubRepositoryInput.ts";
 
@@ -91,12 +98,28 @@ const DEFAULT_GLOBAL_JIRA_SYNC_CONFIG: ConfigureGithubRepositoryRequest = {
   schedule: { type: "INTERVAL", everyMinutes: 60 },
 };
 
-type SyncSettingsProvider = "github" | "jira";
+const DEFAULT_GLOBAL_CONFLUENCE_SYNC_CONFIG: ConfigureGithubRepositoryRequest = {
+  autoUpdate: true,
+  schedule: { type: "INTERVAL", everyMinutes: 60 },
+};
+
+type SyncSettingsProvider = "github" | "jira" | "confluence";
+
+/**
+ * Wording for the global sync-settings modal, per connector. `one` and `many`
+ * name the connector's sources so the copy reads naturally in both the
+ * "overwrites every connected …" and the "updates all connected …" sentences.
+ */
+const SYNC_SETTINGS_COPY: Record<
+  SyncSettingsProvider,
+  { label: string; one: string; many: string }
+> = {
+  github: { label: "GitHub", one: "GitHub repository", many: "GitHub repositories" },
+  jira: { label: "Jira", one: "Jira instance", many: "Jira instances" },
+  confluence: { label: "Confluence", one: "Confluence space", many: "Confluence spaces" },
+};
 
-const SYNC_SETTINGS_PROVIDERS: SegmentedTabOption<SyncSettingsProvider>[] = [
-  { value: "github", label: "GitHub" },
-  { value: "jira", label: "Jira" },
-];
+const SYNC_SETTINGS_PROVIDER_ORDER: SyncSettingsProvider[] = ["github", "jira", "confluence"];
 
 // Small enough that the run table stays scannable and pagination is actually
 // reachable rather than a single page of rows.
@@ -104,11 +127,11 @@ const RUN_PAGE_SIZE = 10;
 
 type RunFilterState = {
   status: RunStatusFilter;
-  /** The selected source's `value` (GitHub repo id or Jira instance URL), or `"ALL"`. */
+  /** The selected source's `value` (GitHub repo id, Jira instance URL, or Confluence ID), or `"ALL"`. */
   sourceValue: string;
   /**
    * How to translate `sourceValue` into a query param: GitHub filters by
-   * `repositoryId`, Jira by the connector-neutral `sourceRef`. Null while no
+   * `repositoryId`, Jira/Confluence by the connector-neutral `sourceRef`. Null while no
    * specific source is selected.
    */
   sourceSystem: SourceSystem | null;
@@ -122,8 +145,8 @@ const DEFAULT_RUN_FILTER: RunFilterState = {
 
 /**
  * A source offered in the run-history filter. `value` is the GitHub repository
- * id or Jira instance URL; `sourceSystem` decides which query param it maps to
- * (repositoryId vs. sourceRef).
+ * id, Jira instance URL, or Confluence space id; `sourceSystem` decides which
+ * query param it maps to (repositoryId vs. sourceRef).
  */
 type RunSourceFilterOption = {
   value: string;
@@ -134,7 +157,12 @@ type RunSourceFilterOption = {
 function toSourceSystem(value: string): SourceSystem | null {
   const normalized = value.toUpperCase();
 
-  if (normalized === "GITHUB" || normalized === "JIRA" || normalized === "UPLOAD") {
+  if (
+    normalized === "GITHUB" ||
+    normalized === "JIRA" ||
+    normalized === "UPLOAD" ||
+    normalized === "CONFLUENCE"
+  ) {
     return normalized;
   }
 
@@ -240,8 +268,8 @@ function buildProjectDataSources(
     const sourceSystem = toSourceSystem(projectSource.type);
     if (!sourceSystem) return [];
 
-    // Jira cards are built solely from the connector-neutral status rows.
-    if (sourceSystem === "JIRA") return [];
+    // Jira and Confluence cards are built solely from the connector-neutral status rows.
+    if (sourceSystem === "JIRA" || sourceSystem === "CONFLUENCE") return [];
     // Skip UPLOAD only when an authoritative status row already exists so the card
     // does not vanish when artifact count is 0 or when run status fallback is needed.
     if (sourceSystem === "UPLOAD" && sourceInstances.some((s) => s.sourceSystem === "UPLOAD")) {
@@ -440,6 +468,7 @@ export function DataIngestionPage() {
   // ProjectSourceProvider on the backend, so its instances never appear in
   // `projectSources`/`sourceInstances` and are loaded separately here.
   const [jiraInstances, setJiraInstances] = useState<JiraInstanceDto[]>([]);
+  const [confluenceConnections, setConfluenceConnections] = useState<ConfluenceConnectionDto[]>([]);
   const [projectDataVersion, setProjectDataVersion] = useState(0);
   const [sourceStatusErrorMessage, setSourceStatusErrorMessage] = useState<string | null>(null);
   const [projectSourcesErrorMessage, setProjectSourcesErrorMessage] = useState<string | null>(null);
@@ -454,6 +483,8 @@ export function DataIngestionPage() {
     useState<ConfigureGithubRepositoryRequest>(DEFAULT_GLOBAL_GITHUB_SYNC_CONFIG);
   const [globalJiraSyncConfig, setGlobalJiraSyncConfig] =
     useState<ConfigureGithubRepositoryRequest>(DEFAULT_GLOBAL_JIRA_SYNC_CONFIG);
+  const [globalConfluenceSyncConfig, setGlobalConfluenceSyncConfig] =
+    useState<ConfigureGithubRepositoryRequest>(DEFAULT_GLOBAL_CONFLUENCE_SYNC_CONFIG);
   const [syncSettingsProvider, setSyncSettingsProvider] = useState<SyncSettingsProvider>("github");
   const [githubTokenNames, setGithubTokenNames] = useState<string[]>([]);
   const [pollingUntil, setPollingUntil] = useState<number | null>(null);
@@ -472,6 +503,8 @@ export function DataIngestionPage() {
   const { selectedProject, selectedProjectId, setSelectedProjectId, reloadProjects } =
     useProjectContext();
 
+  const { syncConnection: syncConfluenceConnection } = useConfluenceSync(selectedProjectId);
+
   const requestedProjectId = searchParams.get("projectId") ?? "";
   const requestedSourceId = searchParams.get("sourceId") ?? "";
 
@@ -528,6 +561,7 @@ export function DataIngestionPage() {
         setProjectSources([]);
         setSourceInstances([]);
         setJiraInstances([]);
+        setConfluenceConnections([]);
       }
       setProjectSourcesErrorMessage(null);
       setSourceStatusErrorMessage(null);
@@ -541,11 +575,13 @@ export function DataIngestionPage() {
         setIsProjectDataLoading(true);
       }
 
-      const [projectResult, sourceStatusResult, jiraResult] = await Promise.allSettled([
-        projectService.getAccessibleProject(selectedProjectId),
-        getIngestionSourceStatuses(selectedProjectId),
-        getJiraInstances(selectedProjectId),
-      ]);
+      const [projectResult, sourceStatusResult, jiraResult, confluenceResult] =
+        await Promise.allSettled([
+          projectService.getAccessibleProject(selectedProjectId),
+          getIngestionSourceStatuses(selectedProjectId),
+          getJiraInstances(selectedProjectId),
+          confluenceService.listConnections(selectedProjectId),
+        ]);
 
       if (!isMounted) return;
 
@@ -569,10 +605,13 @@ export function DataIngestionPage() {
         );
       }
 
-      // Jira instances degrade quietly: a load failure (e.g. an HR user without
+      // Jira and Confluence degrade quietly: a load failure (e.g. an HR user without
       // the PM/ADMIN role the endpoint requires) must not blank the page or
-      // surface an error banner — it just means no Jira cards.
+      // surface an error banner.
       setJiraInstances(jiraResult.status === "fulfilled" ? jiraResult.value : []);
+      setConfluenceConnections(
+        confluenceResult.status === "fulfilled" ? confluenceResult.value : [],
+      );
 
       setIsProjectDataLoading(false);
     });
@@ -593,10 +632,13 @@ export function DataIngestionPage() {
         page,
         size: RUN_PAGE_SIZE,
         projectId: selectedProjectId || undefined,
-        // GitHub scopes by repositoryId; Jira (and any connector-neutral source)
-        // scopes by the run's sourceInstanceRef via sourceRef.
+        // GitHub and Confluence scope by repositoryId (filtering on backend sourceInstanceId UUID);
+        // Jira scopes by the run's sourceInstanceRef via sourceRef (instance URL).
         repositoryId:
-          hasSource && runFilter.sourceSystem === "GITHUB" ? runFilter.sourceValue : undefined,
+          hasSource &&
+          (runFilter.sourceSystem === "GITHUB" || runFilter.sourceSystem === "CONFLUENCE")
+            ? runFilter.sourceValue
+            : undefined,
         sourceRef:
           hasSource && runFilter.sourceSystem === "JIRA" ? runFilter.sourceValue : undefined,
         status: runFilter.status !== "ALL" ? runFilter.status : undefined,
@@ -672,13 +714,19 @@ export function DataIngestionPage() {
       // the cards.
     }
 
-    // Independent of the GitHub status refresh: a Jira failure must not stop the
-    // GitHub statuses from updating, and vice versa.
+    // Independent of the GitHub status refresh: a Jira/Confluence failure must not stop other
+    // statuses from updating.
     try {
       setJiraInstances(await getJiraInstances(selectedProjectId));
     } catch {
       // Keep the last-known Jira instances on a failed in-place refresh.
     }
+
+    try {
+      setConfluenceConnections(await confluenceService.listConnections(selectedProjectId));
+    } catch {
+      // Keep the last-known Confluence connections on a failed in-place refresh.
+    }
   }, [selectedProjectId]);
 
   // Runs on mount and whenever the run query changes (project, filters or the
@@ -748,12 +796,41 @@ export function DataIngestionPage() {
         ),
       );
 
+    const confluenceSources = confluenceConnections.map((conn) => {
+      const status = sourceInstances.find(
+        (s) =>
+          s.sourceSystem === "CONFLUENCE" &&
+          (s.sourceId.toLowerCase() === `${conn.baseUrl}|${conn.spaceId}`.toLowerCase() ||
+            s.sourceId.toLowerCase() === conn.spaceId.toLowerCase() ||
+            s.sourceId.toLowerCase() === conn.id.toLowerCase()),
+      );
+      if (status) {
+        return createConfluenceSourceFromInstance(
+          status,
+          conn,
+          connectorEnabledById.get("confluence"),
+        );
+      }
+      return createConfluenceSourceFromConnection(
+        conn,
+        runs,
+        connectorEnabledById.get("confluence"),
+      );
+    });
+
     const uploadSources = sourceInstances
       .filter((status) => status.sourceSystem === "UPLOAD")
       .map((status) => createUploadSourceFromInstance(status));
 
-    return [...githubAndUpload, ...jiraSources, ...uploadSources];
-  }, [connectorEnabledById, jiraInstances, projectSources, runs, sourceInstances]);
+    return [...githubAndUpload, ...jiraSources, ...confluenceSources, ...uploadSources];
+  }, [
+    confluenceConnections,
+    connectorEnabledById,
+    jiraInstances,
+    projectSources,
+    runs,
+    sourceInstances,
+  ]);
 
   const totalArtifactCount = useMemo(
     () => sourceInstances.reduce((sum, s) => sum + s.artifactCount, 0),
@@ -799,6 +876,21 @@ export function DataIngestionPage() {
   );
   const hasGithubSources = visibleSourceSystems.has("GITHUB");
   const hasJiraSources = visibleSourceSystems.has("JIRA");
+  const hasConfluenceSources = visibleSourceSystems.has("CONFLUENCE");
+  // The connectors whose global sync policy can be edited right now: one tab per
+  // connector that actually has sources on this project.
+  const syncSettingsProviders = useMemo<SegmentedTabOption<SyncSettingsProvider>[]>(() => {
+    const hasSources: Record<SyncSettingsProvider, boolean> = {
+      github: hasGithubSources,
+      jira: hasJiraSources,
+      confluence: hasConfluenceSources,
+    };
+
+    return SYNC_SETTINGS_PROVIDER_ORDER.filter((provider) => hasSources[provider]).map(
+      (provider) => ({ value: provider, label: SYNC_SETTINGS_COPY[provider].label }),
+    );
+  }, [hasConfluenceSources, hasGithubSources, hasJiraSources]);
+  const syncSettingsCopy = SYNC_SETTINGS_COPY[syncSettingsProvider];
 
   const sourceHealth = useMemo(() => {
     const count = (state: DataSource["statusView"]["state"]) =>
@@ -857,6 +949,16 @@ export function DataIngestionPage() {
           ];
         }
 
+        if (source.sourceSystem === "CONFLUENCE" && source.confluenceSpace?.connectionId) {
+          return [
+            {
+              value: source.confluenceSpace.connectionId,
+              label: source.name,
+              sourceSystem: "CONFLUENCE",
+            },
+          ];
+        }
+
         return [];
       }),
     [sources],
@@ -1016,6 +1118,17 @@ export function DataIngestionPage() {
         return;
       }
 
+      if (source.sourceSystem === "CONFLUENCE") {
+        // Use confluenceSpace.connectionId (the connection UUID) rather than
+        // source.sourceId which may hold a raw status-row ref string.
+        const connectionId = source.confluenceSpace?.connectionId;
+        if (!connectionId) {
+          throw new Error("Confluence connection ID is not available for this source.");
+        }
+        await syncConfluenceConnection(connectionId, () => refreshAfterUpdate());
+        return;
+      }
+
       if (source.sourceSystem !== "GITHUB" || !source.githubRepository) {
         throw new Error("Repository details are not available for this source.");
       }
@@ -1023,7 +1136,7 @@ export function DataIngestionPage() {
       await updateGithubRepository(source.githubRepository);
       refreshAfterUpdate();
     },
-    [refreshAfterUpdate],
+    [refreshAfterUpdate, syncConfluenceConnection],
   );
 
   const handleSaveGlobalGithubConfig = useCallback(
@@ -1048,6 +1161,60 @@ export function DataIngestionPage() {
     },
     [loadData, reloadSourceStatuses],
   );
+
+  // Confluence has no "configure all" endpoint; the schedule lives on each
+  // connection, so the global policy is applied per connection. Every space is
+  // attempted even if one fails, and the failures are reported as one error so
+  // the form can show what did not go through.
+  const handleSaveGlobalConfluenceConfig = useCallback(
+    async (request: ConfigureGithubRepositoryRequest) => {
+      if (!selectedProjectId) {
+        throw new Error("Select a project before saving the sync schedule.");
+      }
+
+      const results = await Promise.allSettled(
+        confluenceConnections.map((connection) =>
+          confluenceService.configureSchedule(selectedProjectId, connection.id, {
+            schedule: request.schedule,
+            autoUpdate: request.autoUpdate,
+          }),
+        ),
+      );
+
+      const failed = results.filter((result) => result.status === "rejected").length;
+      if (failed > 0) {
+        throw new Error(
+          `Couldn't apply the schedule to ${failed} of ${results.length} Confluence spaces.`,
+        );
+      }
+
+      setGlobalConfluenceSyncConfig(request);
+      await Promise.all([loadData(false), reloadSourceStatuses()]);
+    },
+    [confluenceConnections, loadData, reloadSourceStatuses, selectedProjectId],
+  );
+
+  // Memoized because the schedule form reloads itself whenever `initialConfig`
+  // changes identity — a record rebuilt on every render would discard whatever
+  // the user had just selected.
+  const globalSyncConfigs = useMemo<Record<SyncSettingsProvider, ConfigureGithubRepositoryRequest>>(
+    () => ({
+      github: globalGithubSyncConfig,
+      jira: globalJiraSyncConfig,
+      confluence: globalConfluenceSyncConfig,
+    }),
+    [globalConfluenceSyncConfig, globalGithubSyncConfig, globalJiraSyncConfig],
+  );
+
+  const globalSyncSavers: Record<
+    SyncSettingsProvider,
+    (request: ConfigureGithubRepositoryRequest) => Promise<void>
+  > = {
+    github: handleSaveGlobalGithubConfig,
+    jira: handleSaveGlobalJiraConfig,
+    confluence: handleSaveGlobalConfluenceConfig,
+  };
+
   const handleLoadGithubRepositoryConfig = useCallback(
     async (repository: GithubRepositoryDetails) => {
       return getGithubRepositoryConfig(repository);
@@ -1081,6 +1248,40 @@ export function DataIngestionPage() {
     [loadData, reloadSourceStatuses],
   );
 
+  // Confluence has no dedicated config endpoint: the connection itself carries
+  // the schedule, so the form reads it straight off the connection DTO.
+  const handleLoadConfluenceConfig = useCallback(
+    async (connectionId: string) => {
+      if (!selectedProjectId) {
+        throw new Error("Select a project before loading the sync schedule.");
+      }
+
+      const connection = await confluenceService.getConnection(selectedProjectId, connectionId);
+
+      return {
+        autoUpdate: connection.autoUpdate ?? false,
+        spec: connection.spec ?? null,
+        nextSyncAt: connection.nextSyncAt ?? null,
+      };
+    },
+    [selectedProjectId],
+  );
+
+  const handleSaveConfluenceConfig = useCallback(
+    async (connectionId: string, request: ConfigureGithubRepositoryRequest) => {
+      if (!selectedProjectId) {
+        throw new Error("Select a project before saving the sync schedule.");
+      }
+
+      await confluenceService.configureSchedule(selectedProjectId, connectionId, {
+        schedule: request.schedule,
+        autoUpdate: request.autoUpdate,
+      });
+      await Promise.all([loadData(false), reloadSourceStatuses()]);
+    },
+    [loadData, reloadSourceStatuses, selectedProjectId],
+  );
+
   // Refreshes just this page's data after a source-level mutation (enable/disable,
   // "Refresh details"). It intentionally does NOT reloadProjects(): the switcher's
   // project list is unaffected by these actions, and reloading it can transiently
@@ -1116,10 +1317,11 @@ export function DataIngestionPage() {
     [refreshSourceDetails],
   );
 
-  // Removes a GitHub repository's link to the selected project (the DELETE
-  // counterpart to linking it via the Add Source flow). The repository and its
-  // artifacts are kept; only this project stops using it. Closes the drawer and
-  // refreshes the project-scoped lists so the source card disappears.
+  // Removes a source's link to the selected project (the DELETE counterpart to
+  // linking it via the Add Source flow), keyed per connector: a repository id
+  // for GitHub, the instance URL for Jira, the connection id for Confluence. The
+  // source and its artifacts are kept; only this project stops using it. Closes
+  // the drawer and refreshes the project-scoped lists so the card disappears.
   const handleUnlinkSource = useCallback(
     async (source: DataSource) => {
       if (source.sourceSystem === "JIRA") {
@@ -1134,6 +1336,20 @@ export function DataIngestionPage() {
         return;
       }
 
+      if (source.sourceSystem === "CONFLUENCE") {
+        const connectionId = source.confluenceSpace?.connectionId;
+
+        if (!connectionId || !selectedProjectId) {
+          throw new Error("This source cannot be removed from the project.");
+        }
+
+        await confluenceService.deleteConnection(selectedProjectId, connectionId);
+
+        setSelectedSourceId(null);
+        await refreshSourceDetails();
+        return;
+      }
+
       const repositoryId = source.githubRepository?.repositoryId;
 
       if (source.sourceSystem !== "GITHUB" || !repositoryId || !selectedProjectId) {
@@ -1291,12 +1507,12 @@ export function DataIngestionPage() {
                             <span className="min-w-0 truncate">Manage connectors</span>
                           </Button>
 
-                          {hasGithubSources || hasJiraSources ? (
+                          {syncSettingsProviders.length > 0 ? (
                             <Button
                               variant="secondary"
                               size="sm"
                               onClick={() => {
-                                setSyncSettingsProvider(hasGithubSources ? "github" : "jira");
+                                setSyncSettingsProvider(syncSettingsProviders[0].value);
                                 setIsSyncSettingsModalOpen(true);
                               }}
                               icon={<CalendarClock className="h-4 w-4" />}
@@ -1389,6 +1605,8 @@ export function DataIngestionPage() {
             onSaveRepositoryConfig={handleSaveGithubRepositoryConfig}
             onLoadJiraConfig={handleLoadJiraConfig}
             onSaveJiraConfig={handleSaveJiraConfig}
+            onLoadConfluenceConfig={handleLoadConfluenceConfig}
+            onSaveConfluenceConfig={handleSaveConfluenceConfig}
             onSetSourceEnabled={handleSetSourceEnabled}
             onSetJiraSourceEnabled={handleSetJiraSourceEnabled}
             onUnlinkSource={canIngestIntoSelectedProject ? handleUnlinkSource : undefined}
@@ -1441,19 +1659,17 @@ export function DataIngestionPage() {
 
       <Modal
         isOpen={isSyncSettingsModalOpen}
-        title={`${syncSettingsProvider === "github" ? "GitHub" : "Jira"} Sync Settings`}
-        description={`Apply one sync policy to all connected ${
-          syncSettingsProvider === "github" ? "GitHub repositories" : "Jira instances"
-        }.`}
+        title={`${syncSettingsCopy.label} Sync Settings`}
+        description={`Apply one sync policy to all connected ${syncSettingsCopy.many}.`}
         size="lg"
         bodyClassName="px-5 py-5 sm:px-7 sm:py-6"
         onClose={() => setIsSyncSettingsModalOpen(false)}
       >
-        {hasGithubSources && hasJiraSources ? (
+        {syncSettingsProviders.length > 1 ? (
           <div className="mb-5">
             <SegmentedTabs
               value={syncSettingsProvider}
-              options={SYNC_SETTINGS_PROVIDERS}
+              options={syncSettingsProviders}
               onChange={setSyncSettingsProvider}
               layoutId="sync-settings-provider-pill"
               ariaLabel="Sync settings connector"
@@ -1463,33 +1679,13 @@ export function DataIngestionPage() {
 
         <GithubRepositorySyncSettings
           key={syncSettingsProvider}
-          initialConfig={
-            syncSettingsProvider === "github" ? globalGithubSyncConfig : globalJiraSyncConfig
-          }
-          onSave={
-            syncSettingsProvider === "github"
-              ? handleSaveGlobalGithubConfig
-              : handleSaveGlobalJiraConfig
-          }
+          initialConfig={globalSyncConfigs[syncSettingsProvider]}
+          onSave={globalSyncSavers[syncSettingsProvider]}
           showNextSync={false}
-          disclaimer={
-            syncSettingsProvider === "github"
-              ? "Applying global settings overwrites the sync settings of every connected GitHub repository."
-              : "Applying global settings overwrites the sync settings of every connected Jira instance."
-          }
-          autoUpdateOnText={
-            syncSettingsProvider === "github"
-              ? "Due checks update all connected GitHub repositories."
-              : "Due checks update all connected Jira instances."
-          }
-          autoUpdateOffText={
-            syncSettingsProvider === "github"
-              ? "Due checks only mark connected GitHub repositories out of date."
-              : "Due checks only mark connected Jira instances out of date."
-          }
-          toggleAriaLabel={`Toggle global ${
-            syncSettingsProvider === "github" ? "GitHub" : "Jira"
-          } auto update`}
+          disclaimer={`Applying global settings overwrites the sync settings of every connected ${syncSettingsCopy.one}.`}
+          autoUpdateOnText={`Due checks update all connected ${syncSettingsCopy.many}.`}
+          autoUpdateOffText={`Due checks only mark connected ${syncSettingsCopy.many} out of date.`}
+          toggleAriaLabel={`Toggle global ${syncSettingsCopy.label} auto update`}
           saveLabel="Apply globally"
         />
       </Modal>
diff --git a/src/services/connectorService.ts b/src/services/connectorService.ts
index a4c48958..3e1d1232 100644
--- a/src/services/connectorService.ts
+++ b/src/services/connectorService.ts
@@ -124,13 +124,21 @@ export const connectorService = {
    *
    * @param connectorId - Lowercase connector id, e.g. "github".
    * @param sources - The sources to patch; must be non-empty.
+   * @param projectId - Scopes the patch to that project (the backend
+   *   `projectId` query param). Required for project-scoped connectors such as
+   *   Confluence, whose sources belong to exactly one project; connectors with
+   *   globally shared sources ignore it. Pass it wherever the sources were
+   *   loaded project-scoped.
    */
   async patchConnectorSources(
     connectorId: string,
     sources: PatchSourceRequest[],
+    projectId?: string,
   ): Promise<PatchSourcesOfConnectorResponse> {
+    const query = projectId ? `?projectId=${encodeURIComponent(projectId)}` : "";
+
     return apiClient.fetch<PatchSourcesOfConnectorResponse>(
-      `/api/v1/connectors/${connectorId}/sources/status`,
+      `/api/v1/connectors/${connectorId}/sources/status${query}`,
       {
         method: "PATCH",
         body: JSON.stringify({ sources } satisfies PatchSourcesRequest),
diff --git a/src/services/sources/atlassianService.ts b/src/services/sources/atlassianService.ts
new file mode 100644
index 00000000..7f00099c
--- /dev/null
+++ b/src/services/sources/atlassianService.ts
@@ -0,0 +1,112 @@
+import { apiClient } from "../apiClient.ts";
+
+// ---- Credentials ----
+
+export type AddAtlassianCredentialRequest = {
+  userEmail: string;
+  tokenName: string;
+  /** The actual Atlassian API token. */
+  authToken: string;
+};
+
+export type DeleteAtlassianCredentialRequest = {
+  userEmail: string;
+  tokenName: string;
+};
+
+export type ChangeAtlassianCredentialNameRequest = {
+  userEmail: string;
+  oldName: string;
+  newName: string;
+};
+
+export type ChangeAtlassianCredentialTokenRequest = {
+  userEmail: string;
+  tokenName: string;
+  newToken: string;
+};
+
+/**
+ * A stored credential as returned by the backend: only `userEmail` plus the
+ * credential/token name (`displayName`). The token secret is never returned.
+ * Shared by the Jira and Confluence connectors.
+ */
+export type AtlassianCredentialDto = {
+  userEmail: string;
+  displayName: string;
+};
+
+/**
+ * Stores a new Atlassian credential for a user. Credentials are keyed by the
+ * `(userEmail, tokenName)` pair.
+ *
+ * @throws ApiError — 400 when a credential with that name already exists,
+ *   403 for an insufficient role.
+ */
+export async function addAtlassianCredential(
+  request: AddAtlassianCredentialRequest,
+): Promise<void> {
+  await apiClient.fetch<void>("/api/v1/atlassian/credentials", {
+    method: "POST",
+    body: JSON.stringify(request),
+  });
+}
+
+/**
+ * Lists the Atlassian credentials owned by the authenticated user. Token
+ * secrets are never returned.
+ *
+ * @param signal - Optional AbortSignal for cancelling an in-flight request.
+ * @throws ApiError when the request fails.
+ */
+export async function getMyAtlassianCredentials(
+  signal?: AbortSignal,
+): Promise<AtlassianCredentialDto[]> {
+  return apiClient.fetch<AtlassianCredentialDto[]>("/api/v1/atlassian/credentials", {
+    signal,
+  });
+}
+
+/**
+ * Deletes a stored Atlassian credential identified by its `(userEmail, tokenName)`.
+ *
+ * @throws ApiError — 404 when the credential is unknown, 403 for an insufficient role.
+ */
+export async function deleteAtlassianCredential(
+  request: DeleteAtlassianCredentialRequest,
+): Promise<void> {
+  await apiClient.fetch<void>("/api/v1/atlassian/credentials", {
+    method: "DELETE",
+    body: JSON.stringify(request),
+  });
+}
+
+/**
+ * Renames a stored Atlassian credential.
+ *
+ * @returns The credential in its renamed state.
+ * @throws ApiError — 404 when the credential is unknown, 403 for an insufficient role.
+ */
+export async function changeAtlassianCredentialName(
+  request: ChangeAtlassianCredentialNameRequest,
+): Promise<AtlassianCredentialDto> {
+  return apiClient.fetch<AtlassianCredentialDto>("/api/v1/atlassian/credentials/patch/name", {
+    method: "PATCH",
+    body: JSON.stringify(request),
+  });
+}
+
+/**
+ * Replaces the token secret of a stored Atlassian credential.
+ *
+ * @returns The (unchanged) credential metadata.
+ * @throws ApiError — 404 when the credential is unknown, 403 for an insufficient role.
+ */
+export async function changeAtlassianCredentialToken(
+  request: ChangeAtlassianCredentialTokenRequest,
+): Promise<AtlassianCredentialDto> {
+  return apiClient.fetch<AtlassianCredentialDto>("/api/v1/atlassian/credentials/patch/token", {
+    method: "PATCH",
+    body: JSON.stringify(request),
+  });
+}
diff --git a/src/services/sources/confluenceService.ts b/src/services/sources/confluenceService.ts
new file mode 100644
index 00000000..75ef5f3a
--- /dev/null
+++ b/src/services/sources/confluenceService.ts
@@ -0,0 +1,160 @@
+import { apiClient } from "../apiClient.ts";
+import type { GithubScheduleSpec } from "./githubService.ts";
+
+export type CreateConfluenceConnectionRequest = {
+  baseUrl: string;
+  spaceId: string;
+  /** Name of a stored Atlassian credential, shared with the Jira connector. */
+  credentialName: string;
+  pageAllowlist?: string[];
+  pageDenylist?: string[];
+};
+
+/**
+ * Confluence connections are scheduled through the same shared spec as GitHub
+ * repositories and Jira instances (interval, daily, weekly, monthly or cron),
+ * so the schedule form is shared with them as well.
+ */
+export type ScheduleSpec = GithubScheduleSpec;
+
+export type ConfigureConfluenceScheduleRequest = {
+  schedule: ScheduleSpec;
+  autoUpdate: boolean;
+};
+
+export type ConfluenceConnectionDto = {
+  id: string;
+  projectId: string;
+  baseUrl: string;
+  spaceId: string;
+  spaceKey: string;
+  spaceName: string | null;
+  credentialName: string;
+  pageAllowlist: string[];
+  pageDenylist: string[];
+  credentialsConfigured: boolean;
+  createdAt: string;
+  updatedAt: string;
+  version: number;
+  sourceEnabled: boolean;
+  autoUpdate?: boolean;
+  spec?: ScheduleSpec | null;
+  schedule?: string;
+  nextSyncAt?: string | null;
+};
+
+export type ConfluenceIngestionStatus = "COMPLETED" | "PARTIAL" | "FAILED";
+
+export type ConfluenceIngestionFailure = {
+  pageId: string;
+  stage: string;
+  httpStatus?: number | null;
+  attempts?: number;
+  message: string;
+};
+
+export type ConfluenceIngestionResult = {
+  runId: string;
+  connectionId: string;
+  discovered: number;
+  eligible: number;
+  filtered: number;
+  created: number;
+  updated: number;
+  unchanged: number;
+  failed: number;
+  failures: ConfluenceIngestionFailure[];
+  status: ConfluenceIngestionStatus;
+};
+
+/**
+ * Client for project-scoped Confluence connection and synchronization operations
+ * (`/api/v1/confluence/projects/{projectId}/connections`).
+ */
+export const confluenceService = {
+  /**
+   * Validates credentials and space ID before storing a new connection.
+   */
+  async createConnection(
+    projectId: string,
+    request: CreateConfluenceConnectionRequest,
+  ): Promise<ConfluenceConnectionDto> {
+    return apiClient.fetch<ConfluenceConnectionDto>(
+      `/api/v1/confluence/projects/${encodeURIComponent(projectId)}/connections`,
+      {
+        method: "POST",
+        body: JSON.stringify({
+          baseUrl: request.baseUrl.trim(),
+          spaceId: request.spaceId.trim(),
+          credentialName: request.credentialName.trim(),
+          pageAllowlist: request.pageAllowlist ?? [],
+          pageDenylist: request.pageDenylist ?? [],
+        }),
+      },
+    );
+  },
+
+  /**
+   * Lists the configured Confluence connections belonging to a managed project.
+   */
+  async listConnections(projectId: string): Promise<ConfluenceConnectionDto[]> {
+    return apiClient.fetch<ConfluenceConnectionDto[]>(
+      `/api/v1/confluence/projects/${encodeURIComponent(projectId)}/connections`,
+    );
+  },
+
+  /**
+   * Retrieves a single Confluence connection scoped to a project.
+   */
+  async getConnection(projectId: string, connectionId: string): Promise<ConfluenceConnectionDto> {
+    return apiClient.fetch<ConfluenceConnectionDto>(
+      `/api/v1/confluence/projects/${encodeURIComponent(projectId)}/connections/${encodeURIComponent(connectionId)}`,
+    );
+  },
+
+  /**
+   * Runs the ingestion flow for one project-owned Confluence connection.
+   */
+  async syncConnection(
+    projectId: string,
+    connectionId: string,
+  ): Promise<ConfluenceIngestionResult> {
+    return apiClient.fetch<ConfluenceIngestionResult>(
+      `/api/v1/confluence/projects/${encodeURIComponent(projectId)}/connections/${encodeURIComponent(connectionId)}/update`,
+      {
+        method: "POST",
+      },
+    );
+  },
+
+  /**
+   * Removes one Confluence space connection from a project. The pages already
+   * ingested stay in the knowledge base; only this project stops syncing the
+   * space.
+   */
+  async deleteConnection(projectId: string, connectionId: string): Promise<void> {
+    await apiClient.fetch<void>(
+      `/api/v1/confluence/projects/${encodeURIComponent(projectId)}/connections/${encodeURIComponent(connectionId)}`,
+      {
+        method: "DELETE",
+      },
+    );
+  },
+
+  /**
+   * Updates automatic synchronization settings for one Confluence connection.
+   */
+  async configureSchedule(
+    projectId: string,
+    connectionId: string,
+    request: ConfigureConfluenceScheduleRequest,
+  ): Promise<ConfluenceConnectionDto> {
+    return apiClient.fetch<ConfluenceConnectionDto>(
+      `/api/v1/confluence/projects/${encodeURIComponent(projectId)}/connections/${encodeURIComponent(connectionId)}/schedule`,
+      {
+        method: "PUT",
+        body: JSON.stringify(request),
+      },
+    );
+  },
+};
diff --git a/src/services/sources/jiraService.ts b/src/services/sources/jiraService.ts
index 65c01346..1c009d7b 100644
--- a/src/services/sources/jiraService.ts
+++ b/src/services/sources/jiraService.ts
@@ -73,41 +73,6 @@ export type JiraInstanceDto = {
   updateCredentialUserEmail: string;
 };
 
-// ---- Credentials ----
-
-export type AddCredentialRequest = {
-  userEmail: string;
-  tokenName: string;
-  /** The actual Jira API token. */
-  authToken: string;
-};
-
-export type DeleteJiraCredentialRequest = {
-  userEmail: string;
-  tokenName: string;
-};
-
-export type ChangeJiraCredentialNameRequest = {
-  userEmail: string;
-  oldName: string;
-  newName: string;
-};
-
-export type ChangeJiraCredentialTokenRequest = {
-  userEmail: string;
-  tokenName: string;
-  newToken: string;
-};
-
-/**
- * A stored credential as returned by the backend: only `userEmail` plus the
- * credential/token name (`displayName`). The token secret is never returned.
- */
-export type JiraCredentialsDto = {
-  userEmail: string;
-  displayName: string;
-};
-
 // ---- Config ----
 
 export type ConfigureAllJiraInstancesRequest = {
@@ -214,77 +179,6 @@ export async function updateAllJiraInstances(): Promise<UpdateJiraInstanceRespon
   });
 }
 
-// ---- Credentials ----
-
-/**
- * Stores a new Jira credential for a user. Credentials are keyed by the
- * `(userEmail, tokenName)` pair.
- *
- * @throws ApiError — 400 when a credential with that name already exists,
- *   403 for an insufficient role.
- */
-export async function addJiraCredential(request: AddCredentialRequest): Promise<void> {
-  await apiClient.fetch<void>("/api/v1/jira/credentials", {
-    method: "POST",
-    body: JSON.stringify(request),
-  });
-}
-
-/**
- * Lists the Jira credentials owned by the authenticated user. Token secrets
- * are never returned.
- *
- * @param signal - Optional AbortSignal for cancelling an in-flight request.
- * @throws ApiError when the request fails.
- */
-export async function getMyJiraCredentials(signal?: AbortSignal): Promise<JiraCredentialsDto[]> {
-  return apiClient.fetch<JiraCredentialsDto[]>("/api/v1/jira/credentials", {
-    signal,
-  });
-}
-
-/**
- * Deletes a stored Jira credential identified by its `(userEmail, tokenName)`.
- *
- * @throws ApiError — 404 when the credential is unknown, 403 for an insufficient role.
- */
-export async function deleteJiraCredential(request: DeleteJiraCredentialRequest): Promise<void> {
-  await apiClient.fetch<void>("/api/v1/jira/credentials", {
-    method: "DELETE",
-    body: JSON.stringify(request),
-  });
-}
-
-/**
- * Renames a stored Jira credential.
- *
- * @returns The credential in its renamed state.
- * @throws ApiError — 404 when the credential is unknown, 403 for an insufficient role.
- */
-export async function changeJiraCredentialName(
-  request: ChangeJiraCredentialNameRequest,
-): Promise<JiraCredentialsDto> {
-  return apiClient.fetch<JiraCredentialsDto>("/api/v1/jira/credentials/patch/name", {
-    method: "PATCH",
-    body: JSON.stringify(request),
-  });
-}
-
-/**
- * Replaces the token secret of a stored Jira credential.
- *
- * @returns The (unchanged) credential metadata.
- * @throws ApiError — 404 when the credential is unknown, 403 for an insufficient role.
- */
-export async function changeJiraCredentialToken(
-  request: ChangeJiraCredentialTokenRequest,
-): Promise<JiraCredentialsDto> {
-  return apiClient.fetch<JiraCredentialsDto>("/api/v1/jira/credentials/patch/token", {
-    method: "PATCH",
-    body: JSON.stringify(request),
-  });
-}
-
 // ---- Config ----
 
 /**
diff --git a/tests/unit/a11y/AccessManagementView.a11y.test.tsx b/tests/unit/a11y/AccessManagementView.a11y.test.tsx
index 69cb30d0..be018fba 100644
--- a/tests/unit/a11y/AccessManagementView.a11y.test.tsx
+++ b/tests/unit/a11y/AccessManagementView.a11y.test.tsx
@@ -21,17 +21,17 @@ vi.mock("../../../src/services/sources/githubService", () => ({
   deleteGithubPat: vi.fn(),
 }));
 
-vi.mock("../../../src/services/sources/jiraService", () => ({
-  getMyJiraCredentials: vi.fn(),
-  addJiraCredential: vi.fn(),
-  changeJiraCredentialName: vi.fn(),
-  changeJiraCredentialToken: vi.fn(),
-  deleteJiraCredential: vi.fn(),
+vi.mock("../../../src/services/sources/atlassianService", () => ({
+  getMyAtlassianCredentials: vi.fn(),
+  addAtlassianCredential: vi.fn(),
+  changeAtlassianCredentialName: vi.fn(),
+  changeAtlassianCredentialToken: vi.fn(),
+  deleteAtlassianCredential: vi.fn(),
 }));
 
 import { useAuth } from "../../../src/context/useAuth";
 import { getGithubPatNames } from "../../../src/services/sources/githubService";
-import { getMyJiraCredentials } from "../../../src/services/sources/jiraService";
+import { getMyAtlassianCredentials } from "../../../src/services/sources/atlassianService";
 
 function ViewHost() {
   const [sourceFilter, setSourceFilter] = useState<string>(DEFAULT_ACCESS_SOURCE_FILTER);
@@ -65,8 +65,8 @@ describe("AccessManagementView Accessibility", () => {
   it("has no axe violations while listing sources, filtering and adding", async () => {
     const user = userEvent.setup();
     vi.mocked(getGithubPatNames).mockResolvedValue(["gh-default"]);
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([
-      { userEmail: "user@corp.com", displayName: "jira-default" },
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([
+      { userEmail: "user@corp.com", displayName: "atlassian-default" },
     ]);
 
     const { baseElement } = renderView();
@@ -75,7 +75,7 @@ describe("AccessManagementView Accessibility", () => {
     expect(await axe(baseElement)).toHaveNoViolations();
 
     await user.click(screen.getByRole("combobox", { name: "Filter access by source" }));
-    expect(await screen.findByRole("option", { name: "Jira" })).toBeInTheDocument();
+    expect(await screen.findByRole("option", { name: "Atlassian" })).toBeInTheDocument();
     /*
       `region` is switched off for this one assertion, and only while a dropdown is open.
 
@@ -104,7 +104,7 @@ describe("AccessManagementView Accessibility", () => {
 
   it("has no axe violations in the fully empty state", async () => {
     vi.mocked(getGithubPatNames).mockResolvedValue([]);
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([]);
 
     const { baseElement } = renderView();
 
diff --git a/tests/unit/a11y/SourceConnectModal.a11y.test.tsx b/tests/unit/a11y/SourceConnectModal.a11y.test.tsx
index df4ad56e..136f75d7 100644
--- a/tests/unit/a11y/SourceConnectModal.a11y.test.tsx
+++ b/tests/unit/a11y/SourceConnectModal.a11y.test.tsx
@@ -17,6 +17,12 @@ describe("SourceConnectModal Accessibility", () => {
       },
       JIRA: { name: "Jira", description: "Connect to Jira", type: "Tracker", icon: Activity },
       UPLOAD: { name: "Upload", description: "Upload File", type: "File", icon: Activity },
+      CONFLUENCE: {
+        name: "Confluence",
+        description: "Connect to Confluence",
+        type: "Space",
+        icon: Activity,
+      },
     };
     const { baseElement } = render(
       <MemoryRouter>
diff --git a/tests/unit/features/access/AccessConnectorGroup.jira.test.tsx b/tests/unit/features/access/AccessConnectorGroup.atlassian.test.tsx
similarity index 57%
rename from tests/unit/features/access/AccessConnectorGroup.jira.test.tsx
rename to tests/unit/features/access/AccessConnectorGroup.atlassian.test.tsx
index 7631f97b..3946d80e 100644
--- a/tests/unit/features/access/AccessConnectorGroup.jira.test.tsx
+++ b/tests/unit/features/access/AccessConnectorGroup.atlassian.test.tsx
@@ -5,32 +5,32 @@ import userEvent from "@testing-library/user-event";
 import { MemoryRouter } from "react-router-dom";
 import { ThemeProvider } from "../../../../src/context/ThemeProvider";
 import { AccessConnectorGroup } from "../../../../src/features/access/components/AccessConnectorGroup";
-import { jiraConnector } from "../../../../src/features/access/registry";
-import type { JiraCredentialsDto } from "../../../../src/services/sources/jiraService";
+import { atlassianConnector } from "../../../../src/features/access/registry";
+import type { AtlassianCredentialDto } from "../../../../src/services/sources/atlassianService";
 
 vi.mock("../../../../src/context/useAuth", () => ({
   useAuth: vi.fn(),
 }));
 
-vi.mock("../../../../src/services/sources/jiraService", () => ({
-  getMyJiraCredentials: vi.fn(),
-  addJiraCredential: vi.fn(),
-  changeJiraCredentialName: vi.fn(),
-  changeJiraCredentialToken: vi.fn(),
-  deleteJiraCredential: vi.fn(),
+vi.mock("../../../../src/services/sources/atlassianService", () => ({
+  getMyAtlassianCredentials: vi.fn(),
+  addAtlassianCredential: vi.fn(),
+  changeAtlassianCredentialName: vi.fn(),
+  changeAtlassianCredentialToken: vi.fn(),
+  deleteAtlassianCredential: vi.fn(),
 }));
 
 import { useAuth } from "../../../../src/context/useAuth";
 import {
-  getMyJiraCredentials,
-  addJiraCredential,
-  changeJiraCredentialName,
-  changeJiraCredentialToken,
-  deleteJiraCredential,
-} from "../../../../src/services/sources/jiraService";
+  getMyAtlassianCredentials,
+  addAtlassianCredential,
+  changeAtlassianCredentialName,
+  changeAtlassianCredentialToken,
+  deleteAtlassianCredential,
+} from "../../../../src/services/sources/atlassianService";
 
 const EMAIL = "user@corp.com";
-const cred = (displayName: string, userEmail = EMAIL): JiraCredentialsDto => ({
+const cred = (displayName: string, userEmail = EMAIL): AtlassianCredentialDto => ({
   userEmail,
   displayName,
 });
@@ -79,7 +79,7 @@ function GroupHarness() {
         open add form
       </button>
       <AccessConnectorGroup
-        connector={jiraConnector}
+        connector={atlassianConnector}
         isHidden={false}
         isAddOpen={isAddOpen}
         onAddClose={() => setIsAddOpen(false)}
@@ -99,19 +99,19 @@ function renderGroup() {
   );
 }
 
-describe("AccessConnectorGroup — Jira", () => {
+describe("AccessConnectorGroup — Atlassian", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockAuthEmail(EMAIL);
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([cred("default")]);
-    vi.mocked(addJiraCredential).mockResolvedValue(undefined);
-    vi.mocked(changeJiraCredentialName).mockResolvedValue(cred("renamed"));
-    vi.mocked(changeJiraCredentialToken).mockResolvedValue(cred("default"));
-    vi.mocked(deleteJiraCredential).mockResolvedValue(undefined);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([cred("default")]);
+    vi.mocked(addAtlassianCredential).mockResolvedValue(undefined);
+    vi.mocked(changeAtlassianCredentialName).mockResolvedValue(cred("renamed"));
+    vi.mocked(changeAtlassianCredentialToken).mockResolvedValue(cred("default"));
+    vi.mocked(deleteAtlassianCredential).mockResolvedValue(undefined);
   });
 
-  it("renders all credentials with their Jira account emails", async () => {
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([
+  it("renders all credentials with their Atlassian account emails", async () => {
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([
       cred("default"),
       cred("support", "support@corp.com"),
     ]);
@@ -123,11 +123,11 @@ describe("AccessConnectorGroup — Jira", () => {
     expect(screen.getByText(EMAIL)).toBeInTheDocument();
     expect(screen.getByText("support@corp.com")).toBeInTheDocument();
     expect(screen.getByText("2 credentials")).toBeInTheDocument();
-    expect(getMyJiraCredentials).toHaveBeenCalledWith(expect.any(AbortSignal));
+    expect(getMyAtlassianCredentials).toHaveBeenCalledWith(expect.any(AbortSignal));
   });
 
-  it("keeps two credentials of the same name apart by Jira account", async () => {
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([
+  it("keeps two credentials of the same name apart by Atlassian account", async () => {
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([
       cred("default"),
       cred("default", "other@corp.com"),
     ]);
@@ -143,23 +143,23 @@ describe("AccessConnectorGroup — Jira", () => {
     renderGroup();
 
     expect(await screen.findByText("default")).toBeInTheDocument();
-    expect(getMyJiraCredentials).toHaveBeenCalled();
+    expect(getMyAtlassianCredentials).toHaveBeenCalled();
 
     await userEvent.setup().click(screen.getByRole("button", { name: "open add form" }));
-    expect(screen.getByTestId("settings-jira-add-email")).toHaveValue("");
+    expect(screen.getByTestId("settings-atlassian-add-email")).toHaveValue("");
   });
 
   it("shows the empty state when there are no credentials", async () => {
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([]);
 
     renderGroup();
 
     expect(await screen.findByText("No credentials yet")).toBeInTheDocument();
   });
 
-  it("prefills the Jira email and adds a credential", async () => {
+  it("prefills the Atlassian email and adds a credential", async () => {
     const user = userEvent.setup();
-    vi.mocked(getMyJiraCredentials)
+    vi.mocked(getMyAtlassianCredentials)
       .mockResolvedValueOnce([cred("default")])
       .mockResolvedValueOnce([cred("default"), cred("ci")]);
 
@@ -167,13 +167,13 @@ describe("AccessConnectorGroup — Jira", () => {
     await screen.findByText("default");
 
     await user.click(screen.getByRole("button", { name: "open add form" }));
-    expect(screen.getByTestId("settings-jira-add-email")).toHaveValue(EMAIL);
-    await user.type(screen.getByTestId("settings-jira-add-name"), "ci");
-    await user.type(screen.getByTestId("settings-jira-add-token"), "secret-token");
-    await user.click(screen.getByTestId("settings-jira-add-submit"));
+    expect(screen.getByTestId("settings-atlassian-add-email")).toHaveValue(EMAIL);
+    await user.type(screen.getByTestId("settings-atlassian-add-name"), "ci");
+    await user.type(screen.getByTestId("settings-atlassian-add-token"), "secret-token");
+    await user.click(screen.getByTestId("settings-atlassian-add-submit"));
 
     await waitFor(() =>
-      expect(addJiraCredential).toHaveBeenCalledWith({
+      expect(addAtlassianCredential).toHaveBeenCalledWith({
         userEmail: EMAIL,
         tokenName: "ci",
         authToken: "secret-token",
@@ -182,21 +182,21 @@ describe("AccessConnectorGroup — Jira", () => {
     expect(await screen.findByText("2 credentials")).toBeInTheDocument();
   });
 
-  it("allows a Jira email different from the login email", async () => {
+  it("allows an Atlassian email different from the login email", async () => {
     const user = userEvent.setup();
     renderGroup();
     await screen.findByText("default");
 
     await user.click(screen.getByRole("button", { name: "open add form" }));
-    const emailInput = screen.getByTestId("settings-jira-add-email");
+    const emailInput = screen.getByTestId("settings-atlassian-add-email");
     await user.clear(emailInput);
     await user.type(emailInput, "jira-account@atlassian.com");
-    await user.type(screen.getByTestId("settings-jira-add-name"), "work");
-    await user.type(screen.getByTestId("settings-jira-add-token"), "tok");
-    await user.click(screen.getByTestId("settings-jira-add-submit"));
+    await user.type(screen.getByTestId("settings-atlassian-add-name"), "work");
+    await user.type(screen.getByTestId("settings-atlassian-add-token"), "tok");
+    await user.click(screen.getByTestId("settings-atlassian-add-submit"));
 
     await waitFor(() =>
-      expect(addJiraCredential).toHaveBeenCalledWith({
+      expect(addAtlassianCredential).toHaveBeenCalledWith({
         userEmail: "jira-account@atlassian.com",
         tokenName: "work",
         authToken: "tok",
@@ -204,19 +204,19 @@ describe("AccessConnectorGroup — Jira", () => {
     );
   });
 
-  it("renames a credential using its stored Jira email", async () => {
+  it("renames a credential using its stored Atlassian email", async () => {
     const user = userEvent.setup();
     renderGroup();
     await screen.findByText("default");
 
-    await user.click(screen.getByTestId("settings-jira-rename-open-default"));
-    const input = screen.getByTestId("settings-jira-rename-input-default");
+    await user.click(screen.getByTestId("settings-atlassian-rename-open-default"));
+    const input = screen.getByTestId("settings-atlassian-rename-input-default");
     await user.clear(input);
     await user.type(input, "renamed");
-    await user.click(screen.getByTestId("settings-jira-rename-submit-default"));
+    await user.click(screen.getByTestId("settings-atlassian-rename-submit-default"));
 
     await waitFor(() =>
-      expect(changeJiraCredentialName).toHaveBeenCalledWith({
+      expect(changeAtlassianCredentialName).toHaveBeenCalledWith({
         userEmail: EMAIL,
         oldName: "default",
         newName: "renamed",
@@ -224,17 +224,17 @@ describe("AccessConnectorGroup — Jira", () => {
     );
   });
 
-  it("rotates a credential token using its stored Jira email", async () => {
+  it("rotates a credential token using its stored Atlassian email", async () => {
     const user = userEvent.setup();
     renderGroup();
     await screen.findByText("default");
 
-    await user.click(screen.getByTestId("settings-jira-rotate-open-default"));
-    await user.type(screen.getByTestId("settings-jira-rotate-input-default"), "new-token");
-    await user.click(screen.getByTestId("settings-jira-rotate-submit-default"));
+    await user.click(screen.getByTestId("settings-atlassian-rotate-open-default"));
+    await user.type(screen.getByTestId("settings-atlassian-rotate-input-default"), "new-token");
+    await user.click(screen.getByTestId("settings-atlassian-rotate-submit-default"));
 
     await waitFor(() =>
-      expect(changeJiraCredentialToken).toHaveBeenCalledWith({
+      expect(changeAtlassianCredentialToken).toHaveBeenCalledWith({
         userEmail: EMAIL,
         tokenName: "default",
         newToken: "new-token",
@@ -242,20 +242,20 @@ describe("AccessConnectorGroup — Jira", () => {
     );
   });
 
-  it("deletes a credential using its stored Jira email and refreshes", async () => {
+  it("deletes a credential using its stored Atlassian email and refreshes", async () => {
     const user = userEvent.setup();
-    vi.mocked(getMyJiraCredentials)
+    vi.mocked(getMyAtlassianCredentials)
       .mockResolvedValueOnce([cred("default")])
       .mockResolvedValueOnce([]);
 
     renderGroup();
     await screen.findByText("default");
 
-    await user.click(screen.getByTestId("settings-jira-delete-open-default"));
-    await user.click(screen.getByTestId("settings-jira-delete-confirm-default"));
+    await user.click(screen.getByTestId("settings-atlassian-delete-open-default"));
+    await user.click(screen.getByTestId("settings-atlassian-delete-confirm-default"));
 
     await waitFor(() =>
-      expect(deleteJiraCredential).toHaveBeenCalledWith({
+      expect(deleteAtlassianCredential).toHaveBeenCalledWith({
         userEmail: EMAIL,
         tokenName: "default",
       }),
diff --git a/tests/unit/features/access/AccessManagementView.test.tsx b/tests/unit/features/access/AccessManagementView.test.tsx
index ad447dad..55d3e60d 100644
--- a/tests/unit/features/access/AccessManagementView.test.tsx
+++ b/tests/unit/features/access/AccessManagementView.test.tsx
@@ -21,17 +21,17 @@ vi.mock("../../../../src/services/sources/githubService", () => ({
   deleteGithubPat: vi.fn(),
 }));
 
-vi.mock("../../../../src/services/sources/jiraService", () => ({
-  getMyJiraCredentials: vi.fn(),
-  addJiraCredential: vi.fn(),
-  changeJiraCredentialName: vi.fn(),
-  changeJiraCredentialToken: vi.fn(),
-  deleteJiraCredential: vi.fn(),
+vi.mock("../../../../src/services/sources/atlassianService", () => ({
+  getMyAtlassianCredentials: vi.fn(),
+  addAtlassianCredential: vi.fn(),
+  changeAtlassianCredentialName: vi.fn(),
+  changeAtlassianCredentialToken: vi.fn(),
+  deleteAtlassianCredential: vi.fn(),
 }));
 
 import { useAuth } from "../../../../src/context/useAuth";
 import { getGithubPatNames } from "../../../../src/services/sources/githubService";
-import { getMyJiraCredentials } from "../../../../src/services/sources/jiraService";
+import { getMyAtlassianCredentials } from "../../../../src/services/sources/atlassianService";
 
 /**
  * The filter is owned by whoever hosts the view, so that it survives the admin
@@ -68,8 +68,8 @@ describe("AccessManagementView", () => {
       status: "authenticated",
     } as unknown as ReturnType<typeof useAuth>);
     vi.mocked(getGithubPatNames).mockResolvedValue(["gh-default"]);
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([
-      { userEmail: "user@corp.com", displayName: "jira-default" },
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([
+      { userEmail: "user@corp.com", displayName: "atlassian-default" },
     ]);
   });
 
@@ -79,13 +79,13 @@ describe("AccessManagementView", () => {
     // Visibility rather than presence: a filtered-out source stays mounted, so
     // its rows are in the DOM either way.
     await waitFor(() => expect(screen.getByTestId("access-group-github")).toBeVisible());
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).toBeVisible());
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).toBeVisible());
     expect(screen.getByText("gh-default")).toBeInTheDocument();
-    expect(screen.getByText("jira-default")).toBeInTheDocument();
+    expect(screen.getByText("atlassian-default")).toBeInTheDocument();
 
     // Both sources fetched without anyone switching to them.
     expect(getGithubPatNames).toHaveBeenCalled();
-    expect(getMyJiraCredentials).toHaveBeenCalled();
+    expect(getMyAtlassianCredentials).toHaveBeenCalled();
   });
 
   it("renders one group per registered connector, in registry order", async () => {
@@ -115,27 +115,27 @@ describe("AccessManagementView", () => {
 
   it("hides a source with no credentials by default and reveals it under All sources", async () => {
     const user = userEvent.setup();
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([]);
 
     renderView();
 
     await waitFor(() => expect(screen.getByTestId("access-group-github")).toBeVisible());
-    expect(screen.getByTestId("access-group-jira")).not.toBeVisible();
+    expect(screen.getByTestId("access-group-atlassian")).not.toBeVisible();
 
     await selectSource(user, "All sources");
 
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).toBeVisible());
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).toBeVisible());
     expect(screen.getByText("No credentials yet")).toBeVisible();
   });
 
   it("keeps loading every source while unused ones are hidden", async () => {
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([]);
 
     renderView();
 
     // The filter can only know which sources are in use because the hidden
     // ones are still mounted and still fetch.
-    await waitFor(() => expect(getMyJiraCredentials).toHaveBeenCalled());
+    await waitFor(() => expect(getMyAtlassianCredentials).toHaveBeenCalled());
   });
 
   it("narrows the list to a single source and back", async () => {
@@ -144,30 +144,30 @@ describe("AccessManagementView", () => {
 
     await waitFor(() => expect(screen.getByText("gh-default")).toBeInTheDocument());
 
-    await selectSource(user, "Jira");
+    await selectSource(user, "Atlassian");
     await waitFor(() => expect(screen.getByTestId("access-group-github")).not.toBeVisible());
-    expect(screen.getByTestId("access-group-jira")).toBeVisible();
+    expect(screen.getByTestId("access-group-atlassian")).toBeVisible();
 
     await selectSource(user, "All sources");
     await waitFor(() => expect(screen.getByTestId("access-group-github")).toBeVisible());
-    expect(screen.getByTestId("access-group-jira")).toBeVisible();
+    expect(screen.getByTestId("access-group-atlassian")).toBeVisible();
   });
 
   it("adds to a hidden source through the global add button", async () => {
     const user = userEvent.setup();
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([]);
 
     renderView();
 
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).not.toBeVisible());
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).not.toBeVisible());
 
     await user.click(screen.getByTestId("access-add-open"));
-    await user.click(await screen.findByTestId("access-add-source-jira"));
+    await user.click(await screen.findByTestId("access-add-source-atlassian"));
 
     // Choosing a source reveals it and opens its form, even though it holds
     // nothing and the default filter had hidden it.
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).toBeVisible());
-    expect(screen.getByTestId("settings-jira-add-email")).toBeVisible();
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).toBeVisible());
+    expect(screen.getByTestId("settings-atlassian-add-email")).toBeVisible();
   });
 
   it("takes the filter from its host instead of owning it", async () => {
@@ -186,27 +186,27 @@ describe("AccessManagementView", () => {
       </MemoryRouter>,
     );
 
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).not.toBeVisible());
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).not.toBeVisible());
     expect(screen.getByTestId("access-group-github")).toBeVisible();
 
     await user.click(screen.getByRole("combobox", { name: "Filter access by source" }));
-    await user.click(await screen.findByRole("option", { name: "Jira" }));
+    await user.click(await screen.findByRole("option", { name: "Atlassian" }));
 
-    expect(onSourceFilterChange).toHaveBeenCalledWith("jira");
-    expect(screen.getByTestId("access-group-jira")).not.toBeVisible();
+    expect(onSourceFilterChange).toHaveBeenCalledWith("atlassian");
+    expect(screen.getByTestId("access-group-atlassian")).not.toBeVisible();
   });
 
   it("leaves the filter where the user put it and hides the source again on cancel", async () => {
     const user = userEvent.setup();
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([]);
 
     renderView();
 
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).not.toBeVisible());
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).not.toBeVisible());
 
     await user.click(screen.getByTestId("access-add-open"));
-    await user.click(await screen.findByTestId("access-add-source-jira"));
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).toBeVisible());
+    await user.click(await screen.findByTestId("access-add-source-atlassian"));
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).toBeVisible());
 
     // Revealing a source for the add form must not rewrite the filter.
     expect(screen.getByRole("combobox", { name: "Filter access by source" })).toHaveTextContent(
@@ -215,7 +215,7 @@ describe("AccessManagementView", () => {
 
     await user.click(screen.getByRole("button", { name: "Cancel" }));
 
-    await waitFor(() => expect(screen.getByTestId("access-group-jira")).not.toBeVisible());
+    await waitFor(() => expect(screen.getByTestId("access-group-atlassian")).not.toBeVisible());
     expect(screen.getByRole("combobox", { name: "Filter access by source" })).toHaveTextContent(
       "In use",
     );
@@ -226,23 +226,23 @@ describe("AccessManagementView", () => {
     renderView();
 
     await user.click(screen.getByTestId("access-add-open"));
-    expect(await screen.findByTestId("access-add-source-jira")).toBeInTheDocument();
+    expect(await screen.findByTestId("access-add-source-atlassian")).toBeInTheDocument();
 
     await user.keyboard("{Escape}");
 
     await waitFor(() =>
-      expect(screen.queryByTestId("access-add-source-jira")).not.toBeInTheDocument(),
+      expect(screen.queryByTestId("access-add-source-atlassian")).not.toBeInTheDocument(),
     );
   });
 
   it("explains the empty view when no source is set up at all", async () => {
     vi.mocked(getGithubPatNames).mockResolvedValue([]);
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([]);
 
     renderView();
 
     expect(await screen.findByText("No source is set up yet")).toBeVisible();
     expect(screen.getByTestId("access-group-github")).not.toBeVisible();
-    expect(screen.getByTestId("access-group-jira")).not.toBeVisible();
+    expect(screen.getByTestId("access-group-atlassian")).not.toBeVisible();
   });
 });
diff --git a/tests/unit/features/admin/components/CreateProjectWizard.test.tsx b/tests/unit/features/admin/components/CreateProjectWizard.test.tsx
index c310ce07..42a8a598 100644
--- a/tests/unit/features/admin/components/CreateProjectWizard.test.tsx
+++ b/tests/unit/features/admin/components/CreateProjectWizard.test.tsx
@@ -30,14 +30,23 @@ vi.mock("../../../../../src/services/ingestionService", () => ({
 
 vi.mock("../../../../../src/services/sources/jiraService", () => ({
   connectJiraInstance: vi.fn(),
-  getMyJiraCredentials: vi.fn(),
-  addJiraCredential: vi.fn(),
+}));
+
+vi.mock("../../../../../src/services/sources/atlassianService", () => ({
+  getMyAtlassianCredentials: vi.fn(),
+  addAtlassianCredential: vi.fn(),
 }));
 
 vi.mock("../../../../../src/services/knowledgeService", () => ({
   knowledgeService: { uploadDocuments: vi.fn() },
 }));
 
+vi.mock("../../../../../src/services/sources/confluenceService", () => ({
+  confluenceService: {
+    createConnection: vi.fn(),
+  },
+}));
+
 import { projectService } from "../../../../../src/services/projectService";
 import {
   addGithubPat,
@@ -46,11 +55,12 @@ import {
   discoverRepositories,
   getGithubPatNames,
 } from "../../../../../src/services/sources/githubService";
+import { connectJiraInstance } from "../../../../../src/services/sources/jiraService";
 import {
-  addJiraCredential,
-  connectJiraInstance,
-  getMyJiraCredentials,
-} from "../../../../../src/services/sources/jiraService";
+  addAtlassianCredential,
+  getMyAtlassianCredentials,
+} from "../../../../../src/services/sources/atlassianService";
+import { confluenceService } from "../../../../../src/services/sources/confluenceService";
 import { knowledgeService } from "../../../../../src/services/knowledgeService";
 import { getIngestionSourceStatuses } from "../../../../../src/services/ingestionService";
 
@@ -189,15 +199,31 @@ describe("CreateProjectWizard", () => {
     vi.mocked(getIngestionSourceStatuses).mockResolvedValue([]);
     vi.mocked(getGithubPatNames).mockResolvedValue(["team-pat"]);
     vi.mocked(addGithubPat).mockResolvedValue(undefined);
-    vi.mocked(addJiraCredential).mockResolvedValue(undefined);
+    vi.mocked(addAtlassianCredential).mockResolvedValue(undefined);
     vi.mocked(projectService.assignUsersToProject).mockResolvedValue([]);
     vi.mocked(connectJiraInstance).mockResolvedValue(undefined);
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([
       { userEmail: "me@example.com", displayName: "Team token" },
     ]);
     vi.mocked(knowledgeService.uploadDocuments).mockResolvedValue([
       { filename: "spec.md", status: "success" },
     ]);
+    vi.mocked(confluenceService.createConnection).mockResolvedValue({
+      id: "conn-1",
+      projectId: "proj-new",
+      baseUrl: "https://acme.atlassian.net/wiki",
+      spaceId: "123456",
+      spaceKey: "DOCS",
+      spaceName: "Docs",
+      credentialName: "Team token",
+      pageAllowlist: [],
+      pageDenylist: [],
+      credentialsConfigured: true,
+      createdAt: "2026-01-01T00:00:00Z",
+      updatedAt: "2026-01-01T00:00:00Z",
+      version: 1,
+      sourceEnabled: true,
+    });
   });
 
   /** From the sources step, stage a Jira board through the add-source sub-flow. */
@@ -214,6 +240,24 @@ describe("CreateProjectWizard", () => {
     await user.click(screen.getByRole("button", { name: /add to list/i }));
   }
 
+  /** From the sources step, stage a Confluence space through the add-source sub-flow. */
+  async function stageConfluenceSpace(user: ReturnType<typeof userEvent.setup>) {
+    await user.click(screen.getByRole("button", { name: /add source/i }));
+    await user.click(
+      screen.getByRole("button", { name: /indexes pages, hierarchical documents/i }),
+    );
+
+    // The stored credential is shared with Jira and adopted automatically.
+    await screen.findByText(/Team token - me@example.com/i);
+
+    await user.type(
+      screen.getByLabelText("Confluence base URL"),
+      "https://acme.atlassian.net/wiki",
+    );
+    await user.type(screen.getByLabelText("Space ID"), "123456");
+    await user.click(screen.getByRole("button", { name: /add to list/i }));
+  }
+
   it("keeps details on a blank name and explains why instead of a dead button", async () => {
     const user = userEvent.setup();
     renderWizard();
@@ -535,6 +579,85 @@ describe("CreateProjectWizard", () => {
     );
   });
 
+  it("stages a Confluence space and connects it against the new project on Create", async () => {
+    const user = userEvent.setup();
+    renderWizard();
+
+    await goToSources(user);
+    await stageConfluenceSpace(user);
+
+    // Back on the sources list, the space is staged under its space ID (the
+    // draft has no readable name yet — that only exists after the backend
+    // resolves the connection).
+    expect(screen.getByText("Confluence Space 123456")).toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: /continue/i }));
+    await user.click(screen.getByRole("button", { name: /create project/i }));
+
+    await waitFor(() =>
+      expect(vi.mocked(confluenceService.createConnection)).toHaveBeenCalledWith("proj-new", {
+        baseUrl: "https://acme.atlassian.net/wiki",
+        spaceId: "123456",
+        credentialName: "Team token",
+        pageAllowlist: [],
+        pageDenylist: [],
+      }),
+    );
+  });
+
+  it("refuses to stage a Confluence space key, which is not the numeric space ID", async () => {
+    const user = userEvent.setup();
+    renderWizard();
+
+    await goToSources(user);
+    await user.click(screen.getByRole("button", { name: /add source/i }));
+    await user.click(
+      screen.getByRole("button", { name: /indexes pages, hierarchical documents/i }),
+    );
+    await screen.findByText(/Team token - me@example.com/i);
+
+    await user.type(
+      screen.getByLabelText("Confluence base URL"),
+      "https://acme.atlassian.net/wiki",
+    );
+    // "DOCS" is what Confluence's own UI shows, so it is the obvious thing to
+    // paste — and the backend would only reject it at provisioning time.
+    await user.type(screen.getByLabelText("Space ID"), "DOCS");
+
+    expect(screen.getByRole("button", { name: /add to list/i })).toBeDisabled();
+  });
+
+  it("adds an Atlassian credential inline while staging a Confluence space and selects the new one", async () => {
+    vi.mocked(getMyAtlassianCredentials)
+      .mockResolvedValueOnce([]) // initial load: none stored
+      .mockResolvedValue([{ userEmail: "new@example.com", displayName: "Fresh cred" }]);
+    const user = userEvent.setup();
+    renderWizard();
+
+    await goToSources(user);
+    await user.click(screen.getByRole("button", { name: /add source/i }));
+    await user.click(
+      screen.getByRole("button", { name: /indexes pages, hierarchical documents/i }),
+    );
+
+    await user.click(screen.getByRole("button", { name: /add atlassian credential/i }));
+    await user.type(screen.getByTestId("settings-atlassian-add-email"), "new@example.com");
+    await user.type(screen.getByTestId("settings-atlassian-add-name"), "Fresh cred");
+    await user.type(screen.getByTestId("settings-atlassian-add-token"), "confluence-token");
+    await user.click(screen.getByTestId("settings-atlassian-add-submit"));
+
+    await waitFor(() =>
+      expect(vi.mocked(addAtlassianCredential)).toHaveBeenCalledWith({
+        userEmail: "new@example.com",
+        tokenName: "Fresh cred",
+        authToken: "confluence-token",
+      }),
+    );
+    // The refreshed credential is adopted and shown as the picker's label.
+    await screen.findByText(/Fresh cred - new@example.com/i);
+    expect(screen.getByLabelText("Credential")).toHaveTextContent("Fresh cred");
+  });
+
   it("stages uploaded files and uploads them against the new project on Create", async () => {
     const user = userEvent.setup();
     renderWizard();
@@ -587,7 +710,7 @@ describe("CreateProjectWizard", () => {
   });
 
   it("adds a Jira credential inline and selects the new one", async () => {
-    vi.mocked(getMyJiraCredentials)
+    vi.mocked(getMyAtlassianCredentials)
       .mockResolvedValueOnce([]) // initial load: none stored
       .mockResolvedValue([{ userEmail: "new@example.com", displayName: "Fresh cred" }]);
     const user = userEvent.setup();
@@ -597,14 +720,14 @@ describe("CreateProjectWizard", () => {
     await user.click(screen.getByRole("button", { name: /add source/i }));
     await user.click(screen.getByRole("button", { name: /indexes jira issues/i }));
 
-    await user.click(screen.getByRole("button", { name: /add jira credential/i }));
-    await user.type(screen.getByTestId("settings-jira-add-email"), "new@example.com");
-    await user.type(screen.getByTestId("settings-jira-add-name"), "Fresh cred");
-    await user.type(screen.getByTestId("settings-jira-add-token"), "jira-token");
-    await user.click(screen.getByTestId("settings-jira-add-submit"));
+    await user.click(screen.getByRole("button", { name: /add atlassian credential/i }));
+    await user.type(screen.getByTestId("settings-atlassian-add-email"), "new@example.com");
+    await user.type(screen.getByTestId("settings-atlassian-add-name"), "Fresh cred");
+    await user.type(screen.getByTestId("settings-atlassian-add-token"), "jira-token");
+    await user.click(screen.getByTestId("settings-atlassian-add-submit"));
 
     await waitFor(() =>
-      expect(vi.mocked(addJiraCredential)).toHaveBeenCalledWith({
+      expect(vi.mocked(addAtlassianCredential)).toHaveBeenCalledWith({
         userEmail: "new@example.com",
         tokenName: "Fresh cred",
         authToken: "jira-token",
@@ -651,11 +774,11 @@ describe("CreateProjectWizard", () => {
 
   it("keeps the new Jira credential visible and selected when the post-add refetch fails", async () => {
     let added = false;
-    vi.mocked(addJiraCredential).mockImplementation(() => {
+    vi.mocked(addAtlassianCredential).mockImplementation(() => {
       added = true;
       return Promise.resolve();
     });
-    vi.mocked(getMyJiraCredentials).mockImplementation(() =>
+    vi.mocked(getMyAtlassianCredentials).mockImplementation(() =>
       added ? Promise.reject(new Error("Network error")) : Promise.resolve([]),
     );
     const user = userEvent.setup();
@@ -665,16 +788,16 @@ describe("CreateProjectWizard", () => {
     await user.click(screen.getByRole("button", { name: /add source/i }));
     await user.click(screen.getByRole("button", { name: /indexes jira issues/i }));
 
-    await user.click(screen.getByRole("button", { name: /add jira credential/i }));
-    await user.type(screen.getByTestId("settings-jira-add-email"), "new@example.com");
-    await user.type(screen.getByTestId("settings-jira-add-name"), "Fresh cred");
-    await user.type(screen.getByTestId("settings-jira-add-token"), "jira-token");
-    await user.click(screen.getByTestId("settings-jira-add-submit"));
+    await user.click(screen.getByRole("button", { name: /add atlassian credential/i }));
+    await user.type(screen.getByTestId("settings-atlassian-add-email"), "new@example.com");
+    await user.type(screen.getByTestId("settings-atlassian-add-name"), "Fresh cred");
+    await user.type(screen.getByTestId("settings-atlassian-add-token"), "jira-token");
+    await user.click(screen.getByTestId("settings-atlassian-add-submit"));
 
-    await waitFor(() => expect(vi.mocked(addJiraCredential)).toHaveBeenCalledTimes(1));
+    await waitFor(() => expect(vi.mocked(addAtlassianCredential)).toHaveBeenCalledTimes(1));
     await screen.findByText(/Fresh cred - new@example.com/i);
     expect(screen.getByLabelText("Credential")).toHaveTextContent("Fresh cred");
-    expect(vi.mocked(addJiraCredential)).toHaveBeenCalledTimes(1);
+    expect(vi.mocked(addAtlassianCredential)).toHaveBeenCalledTimes(1);
   });
 
   it("does not create the project when cancelled on the first step", async () => {
diff --git a/tests/unit/features/admin/projectSourcesDraft.test.ts b/tests/unit/features/admin/projectSourcesDraft.test.ts
index 9ad391d7..6b712dbc 100644
--- a/tests/unit/features/admin/projectSourcesDraft.test.ts
+++ b/tests/unit/features/admin/projectSourcesDraft.test.ts
@@ -9,6 +9,7 @@ import {
   createUploadDraft,
   hasFailedSources,
   isSameSource,
+  isValidConfluenceSpaceId,
   removeDraftSource,
   setDraftSourceOwner,
   type DraftSource,
@@ -130,6 +131,20 @@ describe("createJiraDraft / createUploadDraft", () => {
   });
 });
 
+describe("isValidConfluenceSpaceId", () => {
+  it("accepts a numeric space id, ignoring surrounding whitespace", () => {
+    expect(isValidConfluenceSpaceId("123456")).toBe(true);
+    expect(isValidConfluenceSpaceId("  123456 ")).toBe(true);
+  });
+
+  it("rejects a space key and anything else non-numeric", () => {
+    expect(isValidConfluenceSpaceId("ENG")).toBe(false);
+    expect(isValidConfluenceSpaceId("")).toBe(false);
+    expect(isValidConfluenceSpaceId("12a")).toBe(false);
+    expect(isValidConfluenceSpaceId("~123456")).toBe(false);
+  });
+});
+
 describe("isSameSource", () => {
   it("matches GitHub repositories by owner/name regardless of casing", () => {
     expect(
diff --git a/tests/unit/features/chatbot/useAvailableSources.test.tsx b/tests/unit/features/chatbot/useAvailableSources.test.tsx
new file mode 100644
index 00000000..77e55a63
--- /dev/null
+++ b/tests/unit/features/chatbot/useAvailableSources.test.tsx
@@ -0,0 +1,51 @@
+import { renderHook, waitFor } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { useAvailableSources } from "../../../../src/features/chatbot/hooks/useAvailableSources";
+
+const { mockListConnectors } = vi.hoisted(() => ({ mockListConnectors: vi.fn() }));
+
+vi.mock("../../../../src/services/connectorService", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../../../../src/services/connectorService")>();
+  return {
+    ...actual,
+    connectorService: { ...actual.connectorService, listConnectors: mockListConnectors },
+  };
+});
+
+function connector(id: string, enabled = true) {
+  return {
+    id,
+    name: `${id} connector`,
+    enabled,
+    firstConfiguredAt: null,
+    lastConfiguredAt: null,
+  };
+}
+
+describe("useAvailableSources", () => {
+  it("offers every enabled connector the chat can filter by, uploads included", async () => {
+    mockListConnectors.mockResolvedValue([
+      connector("github"),
+      connector("jira"),
+      connector("confluence"),
+    ]);
+
+    const { result } = renderHook(() => useAvailableSources());
+
+    await waitFor(() => expect(result.current.loading).toBe(false));
+    expect([...result.current.sources].sort()).toEqual(["CONFLUENCE", "GITHUB", "JIRA", "UPLOAD"]);
+  });
+
+  it("leaves out a disabled connector and any id the chat has no filter for", async () => {
+    mockListConnectors.mockResolvedValue([
+      connector("github"),
+      connector("confluence", false),
+      connector("sonarqube"),
+    ]);
+
+    const { result } = renderHook(() => useAvailableSources());
+
+    await waitFor(() => expect(result.current.loading).toBe(false));
+    expect([...result.current.sources].sort()).toEqual(["GITHUB", "UPLOAD"]);
+  });
+});
diff --git a/tests/unit/features/connectors/ConnectorSourcesSection.test.tsx b/tests/unit/features/connectors/ConnectorSourcesSection.test.tsx
index d138ae13..955742d8 100644
--- a/tests/unit/features/connectors/ConnectorSourcesSection.test.tsx
+++ b/tests/unit/features/connectors/ConnectorSourcesSection.test.tsx
@@ -160,4 +160,61 @@ describe("ConnectorSourcesSection", () => {
 
     expect(screen.getByRole("button", { name: /save 1 change/i })).toBeInTheDocument();
   });
+
+  it("offers a Confluence space the same include/exclude toggle as any other source", async () => {
+    const user = userEvent.setup();
+    const confluenceConnector: ConnectorListItem = {
+      ...connector,
+      id: "confluence",
+      name: "Confluence Cloud Connector",
+      meta: {
+        label: "Confluence Cloud Connector",
+        description: "Pages and spaces from connected Confluence Cloud tenants.",
+        icon: GitBranch,
+      },
+    };
+
+    const space = {
+      id: "11111111-1111-1111-1111-111111111111",
+      name: "Engineering",
+      url: "https://acme.atlassian.net/wiki/spaces/ENG",
+      enabled: true,
+    };
+    let patchUrl: string | null = null;
+
+    server.use(
+      http.get("/api/v1/connectors/confluence/sources", () =>
+        HttpResponse.json({ connectorId: "confluence", sources: [space] }),
+      ),
+      http.patch("/api/v1/connectors/confluence/sources/status", ({ request }) => {
+        patchUrl = request.url;
+
+        return HttpResponse.json({
+          connectorId: "confluence",
+          sources: [{ ...space, enabled: false }],
+        });
+      }),
+    );
+
+    render(<ConnectorSourcesSection connector={confluenceConnector} projectId="proj-1" />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Engineering")).toBeInTheDocument();
+    });
+
+    // Enabling and disabling is all this modal does — no connecting, no syncing.
+    expect(screen.queryByRole("button", { name: /add space/i })).not.toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: /sync now/i })).not.toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: /exclude engineering/i }));
+    await user.click(screen.getByRole("button", { name: /save 1 change/i }));
+
+    await waitFor(() => {
+      expect(screen.getByRole("button", { name: /include engineering/i })).toBeInTheDocument();
+    });
+
+    // Confluence sources belong to one project, so the backend rejects a patch
+    // that does not name it.
+    expect(patchUrl).toContain("projectId=proj-1");
+  });
 });
diff --git a/tests/unit/features/data-ingestion/ConfluenceConnectStep.test.tsx b/tests/unit/features/data-ingestion/ConfluenceConnectStep.test.tsx
new file mode 100644
index 00000000..46a4ec27
--- /dev/null
+++ b/tests/unit/features/data-ingestion/ConfluenceConnectStep.test.tsx
@@ -0,0 +1,95 @@
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { describe, it, expect, vi } from "vitest";
+import { ConfluenceConnectStep } from "../../../../src/features/data-ingestion/components/ConfluenceConnectStep";
+import type { AtlassianCredentialDto } from "../../../../src/services/sources/atlassianService";
+
+const credentials: AtlassianCredentialDto[] = [
+  { userEmail: "user@test.com", displayName: "default" },
+  { userEmail: "other@test.com", displayName: "ci" },
+];
+
+describe("ConfluenceConnectStep (data-ingestion)", () => {
+  it("renders form fields and handles input changes", async () => {
+    const user = userEvent.setup();
+    const onBaseUrlChange = vi.fn();
+    const onSpaceIdChange = vi.fn();
+    const onCredentialNameChange = vi.fn();
+    const onSubmit = vi.fn();
+
+    render(
+      <ConfluenceConnectStep
+        baseUrl=""
+        spaceId=""
+        credentialName="default"
+        credentials={credentials}
+        credentialsLoaded
+        credentialsLoading={false}
+        credentialsError={null}
+        onBaseUrlChange={onBaseUrlChange}
+        onSpaceIdChange={onSpaceIdChange}
+        onCredentialNameChange={onCredentialNameChange}
+        onSubmit={onSubmit}
+      />,
+    );
+
+    const baseUrlInput = screen.getByLabelText(/confluence base url/i);
+    const spaceIdInput = screen.getByLabelText(/space id/i);
+
+    expect(baseUrlInput).toBeInTheDocument();
+    expect(spaceIdInput).toBeInTheDocument();
+    expect(screen.getByLabelText("Credential")).toBeInTheDocument();
+
+    await user.type(baseUrlInput, "https://test.atlassian.net");
+    expect(onBaseUrlChange).toHaveBeenCalled();
+
+    await user.type(spaceIdInput, "123456");
+    expect(onSpaceIdChange).toHaveBeenCalled();
+
+    await user.click(screen.getByLabelText("Credential"));
+    await user.click(await screen.findByRole("option", { name: "ci - other@test.com" }));
+    expect(onCredentialNameChange).toHaveBeenCalledWith("ci");
+  });
+
+  it("shows a warning when no credentials are stored", () => {
+    render(
+      <ConfluenceConnectStep
+        baseUrl=""
+        spaceId=""
+        credentialName=""
+        credentials={[]}
+        credentialsLoaded
+        credentialsLoading={false}
+        credentialsError={null}
+        onBaseUrlChange={vi.fn()}
+        onSpaceIdChange={vi.fn()}
+        onCredentialNameChange={vi.fn()}
+        onSubmit={vi.fn()}
+      />,
+    );
+
+    expect(screen.getByText(/no atlassian credentials are stored/i)).toBeInTheDocument();
+    expect(screen.getByLabelText("Credential")).toBeDisabled();
+  });
+
+  it("suppresses the missing-credential banner when asked", () => {
+    render(
+      <ConfluenceConnectStep
+        baseUrl=""
+        spaceId=""
+        credentialName=""
+        credentials={[]}
+        credentialsLoaded
+        credentialsLoading={false}
+        credentialsError={null}
+        onBaseUrlChange={vi.fn()}
+        onSpaceIdChange={vi.fn()}
+        onCredentialNameChange={vi.fn()}
+        onSubmit={vi.fn()}
+        suppressMissingCredentialNotice
+      />,
+    );
+
+    expect(screen.queryByText(/no atlassian credentials are stored/i)).not.toBeInTheDocument();
+  });
+});
diff --git a/tests/unit/features/data-ingestion/components/AddSourceModal.test.tsx b/tests/unit/features/data-ingestion/components/AddSourceModal.test.tsx
index 9f419cc3..863bd6aa 100644
--- a/tests/unit/features/data-ingestion/components/AddSourceModal.test.tsx
+++ b/tests/unit/features/data-ingestion/components/AddSourceModal.test.tsx
@@ -70,8 +70,8 @@ function sourceStatusHandler({ inThisProject = [] as string[] } = {}) {
   });
 }
 
-function jiraCredentialsHandler(names: string[], email = "me@corp.com") {
-  return http.get("/api/v1/jira/credentials", () =>
+function atlassianCredentialsHandler(names: string[], email = "me@corp.com") {
+  return http.get("/api/v1/atlassian/credentials", () =>
     HttpResponse.json(names.map((displayName) => ({ userEmail: email, displayName }))),
   );
 }
@@ -109,7 +109,7 @@ describe("AddSourceModal", () => {
   });
 
   it("offers both 'Add to list' and 'Connect now' on a detail screen", async () => {
-    server.use(jiraCredentialsHandler(["default"]));
+    server.use(atlassianCredentialsHandler(["default"]));
     const user = userEvent.setup();
     renderModal();
 
@@ -127,7 +127,7 @@ describe("AddSourceModal", () => {
   it("stages a Jira instance and connects the list", async () => {
     let capturedBody: unknown = null;
     server.use(
-      jiraCredentialsHandler(["default"]),
+      atlassianCredentialsHandler(["default"]),
       http.post("/api/v1/jira/connect", async ({ request }) => {
         capturedBody = await request.json();
         return new HttpResponse(null, { status: 202 });
@@ -163,7 +163,7 @@ describe("AddSourceModal", () => {
   it("connects a source immediately with 'Connect now'", async () => {
     let capturedBody: unknown = null;
     server.use(
-      jiraCredentialsHandler(["default"]),
+      atlassianCredentialsHandler(["default"]),
       http.post("/api/v1/jira/connect", async ({ request }) => {
         capturedBody = await request.json();
         return new HttpResponse(null, { status: 202 });
@@ -192,7 +192,7 @@ describe("AddSourceModal", () => {
 
   it("surfaces a failed connect on the connecting screen with a retry", async () => {
     server.use(
-      jiraCredentialsHandler(["default"]),
+      atlassianCredentialsHandler(["default"]),
       http.post("/api/v1/jira/connect", () =>
         HttpResponse.json({ message: "bad gateway" }, { status: 502 }),
       ),
@@ -350,7 +350,7 @@ describe("AddSourceModal", () => {
   });
 
   it("keeps building the list across source types before connecting", async () => {
-    server.use(discoveryHandler, jiraCredentialsHandler(["default"]));
+    server.use(discoveryHandler, atlassianCredentialsHandler(["default"]));
     const user = userEvent.setup();
     renderModal();
 
diff --git a/tests/unit/features/data-ingestion/components/SourceDetailsPanel.test.tsx b/tests/unit/features/data-ingestion/components/SourceDetailsPanel.test.tsx
index 2b6e50de..3c1e5991 100644
--- a/tests/unit/features/data-ingestion/components/SourceDetailsPanel.test.tsx
+++ b/tests/unit/features/data-ingestion/components/SourceDetailsPanel.test.tsx
@@ -1,4 +1,4 @@
-import { render as rtlRender, screen, waitFor } from "@testing-library/react";
+import { render as rtlRender, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { GitBranch } from "lucide-react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -70,6 +70,23 @@ const jiraSource: DataSource = {
   },
 };
 
+const confluenceSource: DataSource = {
+  ...mockSource,
+  sourceId: "https://acme.atlassian.net|123456",
+  sourceSystem: "CONFLUENCE",
+  name: "Engineering",
+  type: "Confluence",
+  githubRepository: null,
+  confluenceSpace: {
+    connectionId: "conn-1",
+    baseUrl: "https://acme.atlassian.net",
+    spaceId: "123456",
+    spaceKey: "ENG",
+    spaceName: "Engineering",
+    credentialName: "default",
+  },
+};
+
 describe("SourceDetailsPanel", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -181,6 +198,87 @@ describe("SourceDetailsPanel", () => {
     });
   });
 
+  it("renders the Confluence sync schedule and loads it for the connection", async () => {
+    const onLoadConfluenceConfig = vi.fn().mockResolvedValue({
+      autoUpdate: true,
+      spec: { type: "INTERVAL", everyMinutes: 30 },
+      nextSyncAt: null,
+    });
+
+    render(
+      <SourceDetailsPanel
+        source={confluenceSource}
+        canManageSyncSettings
+        onLoadConfluenceConfig={onLoadConfluenceConfig}
+        onSaveConfluenceConfig={vi.fn().mockResolvedValue(undefined)}
+        onClose={vi.fn()}
+      />,
+    );
+
+    expect(screen.getByText("Sync Schedule")).toBeInTheDocument();
+    await waitFor(() => {
+      expect(onLoadConfluenceConfig).toHaveBeenCalledWith("conn-1");
+    });
+  });
+
+  it("saves the Confluence sync schedule via onSaveConfluenceConfig", async () => {
+    const user = userEvent.setup();
+    const onLoadConfluenceConfig = vi.fn().mockResolvedValue({
+      autoUpdate: true,
+      spec: { type: "INTERVAL", everyMinutes: 30 },
+      nextSyncAt: null,
+    });
+    const onSaveConfluenceConfig = vi.fn().mockResolvedValue(undefined);
+
+    render(
+      <SourceDetailsPanel
+        source={confluenceSource}
+        canManageSyncSettings
+        onLoadConfluenceConfig={onLoadConfluenceConfig}
+        onSaveConfluenceConfig={onSaveConfluenceConfig}
+        onClose={vi.fn()}
+      />,
+    );
+
+    await waitFor(() => expect(onLoadConfluenceConfig).toHaveBeenCalled());
+
+    const minutes = screen.getByLabelText("Minutes");
+    await user.clear(minutes);
+    await user.type(minutes, "45");
+    await user.click(screen.getByRole("button", { name: /save/i }));
+
+    await waitFor(() => {
+      expect(onSaveConfluenceConfig).toHaveBeenCalledWith(
+        "conn-1",
+        expect.objectContaining({
+          autoUpdate: true,
+          schedule: { type: "INTERVAL", everyMinutes: 45 },
+        }),
+      );
+    });
+  });
+
+  it("leaves the update toasts to the caller for a Confluence space", async () => {
+    const user = userEvent.setup();
+    const onUpdateSource = vi.fn().mockRejectedValue(new Error("Confluence sync failed"));
+
+    render(
+      <SourceDetailsPanel
+        source={confluenceSource}
+        onUpdateSource={onUpdateSource}
+        onClose={vi.fn()}
+      />,
+    );
+
+    await user.click(screen.getByRole("button", { name: /Update space/ }));
+
+    await waitFor(() => expect(onUpdateSource).toHaveBeenCalledWith(confluenceSource));
+    // The Confluence sync reports its own outcome, so neither the success nor
+    // the failure copy of this panel may appear.
+    expect(screen.queryByText("Update started")).not.toBeInTheDocument();
+    expect(screen.queryByText("Confluence sync failed")).not.toBeInTheDocument();
+  });
+
   it("renders repository and ingestion details", () => {
     render(<SourceDetailsPanel source={mockSource} onClose={vi.fn()} />);
 
@@ -290,6 +388,33 @@ describe("SourceDetailsPanel", () => {
     expect(onUnlinkSource).toHaveBeenCalledWith(jiraSource);
   });
 
+  it("unlinks a Confluence space after confirming the dialog", async () => {
+    const user = userEvent.setup();
+    const onUnlinkSource = vi.fn().mockResolvedValue(undefined);
+
+    render(
+      <SourceDetailsPanel
+        source={confluenceSource}
+        onUnlinkSource={onUnlinkSource}
+        onClose={vi.fn()}
+      />,
+    );
+
+    await user.click(screen.getByRole("button", { name: /Remove from project/ }));
+
+    // The Confluence copy calls it a "space", and it must not promise a
+    // re-link: removing the connection deletes it.
+    const dialog = screen.getByRole("alertdialog", { name: /Remove space from project/ });
+    expect(
+      within(dialog).getByText(/Connecting the space again sets it up from scratch/),
+    ).toBeVisible();
+    expect(screen.queryByText(/re-link it later/)).not.toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: /^Remove$/ }));
+
+    expect(onUnlinkSource).toHaveBeenCalledWith(confluenceSource);
+  });
+
   it("surfaces the error message when unlinking fails", async () => {
     const user = userEvent.setup();
     const onUnlinkSource = vi.fn().mockRejectedValue(new Error("You cannot access this project."));
diff --git a/tests/unit/features/data-ingestion/data.test.ts b/tests/unit/features/data-ingestion/data.test.ts
index 7ba4858b..4f7b2b1c 100644
--- a/tests/unit/features/data-ingestion/data.test.ts
+++ b/tests/unit/features/data-ingestion/data.test.ts
@@ -5,6 +5,10 @@ import {
   INGESTION_RUN_LIMIT,
   DETAILS_RUN_LIMIT,
   createJiraSourceFromInstance,
+  createConfluenceSourceFromConnection,
+  createConfluenceSourceFromInstance,
+  buildRunSourceLabels,
+  getRunSourceLabel,
   deriveConnectionStatus,
   deriveSyncStatus,
   getSourceStatus,
@@ -19,15 +23,17 @@ import {
 } from "../../../../src/features/data-ingestion/data";
 import type {
   ConnectionStatus,
+  IngestionRun,
   IngestionRunStatus,
   SourceInstanceIngestionStatus,
 } from "../../../../src/features/data-ingestion/types";
 import type { JiraInstanceDto } from "../../../../src/services/sources/jiraService";
+import type { ConfluenceConnectionDto } from "../../../../src/services/sources/confluenceService";
 
 describe("data-ingestion data helpers", () => {
   describe("SOURCE_SYSTEMS / SOURCE_META", () => {
     it("lists all known source systems", () => {
-      expect(SOURCE_SYSTEMS).toEqual(["GITHUB", "JIRA", "UPLOAD"]);
+      expect(SOURCE_SYSTEMS).toEqual(["GITHUB", "JIRA", "UPLOAD", "CONFLUENCE"]);
     });
 
     it("provides meta for every source system", () => {
@@ -376,4 +382,165 @@ describe("data-ingestion data helpers", () => {
       expect(deriveSyncStatus(source).label).toBe("Not synced");
     });
   });
+
+  describe("buildRunSourceLabels and getRunSourceLabel with Confluence", () => {
+    const confluenceConn: ConfluenceConnectionDto = {
+      id: "conn-uuid-1",
+      projectId: "proj-1",
+      baseUrl: "https://myteam.atlassian.net",
+      spaceId: "123456",
+      spaceKey: "DOCS",
+      spaceName: null,
+      credentialName: "default",
+      pageAllowlist: [],
+      pageDenylist: [],
+      credentialsConfigured: true,
+      createdAt: "2026-08-28T10:00:00Z",
+      updatedAt: "2026-08-28T10:00:00Z",
+      version: 1,
+      sourceEnabled: true,
+    };
+
+    it("resolves Confluence runs by composite baseUrl|spaceId, spaceKey, and connectionId", () => {
+      const source = createConfluenceSourceFromConnection(confluenceConn);
+      const labels = buildRunSourceLabels([source]);
+
+      expect(labels.get("conn-uuid-1")).toBe("DOCS");
+      expect(labels.get("https://myteam.atlassian.net|123456")).toBe("DOCS");
+      expect(labels.get("https://myteam.atlassian.net|123456".toLowerCase())).toBe("DOCS");
+      expect(labels.get("DOCS")).toBe("DOCS");
+
+      const runWithCompositeRef: IngestionRun = {
+        runId: "run-1",
+        sourceSystem: "CONFLUENCE",
+        sourceId: "https://myteam.atlassian.net|123456",
+        owner: null,
+        name: null,
+        repositoryId: "conn-uuid-1",
+        startedAt: "2026-08-28T10:00:00Z",
+        finishedAt: "2026-08-28T10:05:00Z",
+        ingestedCount: 10,
+        updatedCount: 2,
+        deletedCount: 0,
+        failedCount: 0,
+        status: "COMPLETED",
+        failedItems: [],
+        failureReason: null,
+        aiSyncStatus: "SUCCEEDED",
+        aiSyncFailureReason: null,
+      };
+
+      expect(getRunSourceLabel(runWithCompositeRef, labels)).toBe("DOCS");
+    });
+
+    it("matches Confluence runs in createConfluenceSourceFromConnection using repositoryId", () => {
+      const run: IngestionRun = {
+        runId: "run-2",
+        sourceSystem: "CONFLUENCE",
+        sourceId: "https://different-ref|9999",
+        owner: null,
+        name: null,
+        repositoryId: "conn-uuid-1",
+        startedAt: "2026-08-28T10:00:00Z",
+        finishedAt: "2026-08-28T10:05:00Z",
+        ingestedCount: 5,
+        updatedCount: 1,
+        deletedCount: 0,
+        failedCount: 0,
+        status: "COMPLETED",
+        failedItems: [],
+        failureReason: null,
+        aiSyncStatus: "SUCCEEDED",
+        aiSyncFailureReason: null,
+      };
+
+      const source = createConfluenceSourceFromConnection(confluenceConn, [run]);
+      expect(source.ingestionStatusLabel).toBe("Synced");
+      expect(source.artifacts).toBe(6);
+    });
+
+    it("names the card from spaceName, falling back to spaceKey when there is none", () => {
+      expect(
+        createConfluenceSourceFromConnection({ ...confluenceConn, spaceName: "Docs Space" }).name,
+      ).toBe("Docs Space");
+      expect(
+        createConfluenceSourceFromConnection({ ...confluenceConn, spaceName: null }).name,
+      ).toBe("DOCS");
+    });
+
+    it("carries spaceName and credentialName onto the source's confluenceSpace details", () => {
+      const source = createConfluenceSourceFromConnection({
+        ...confluenceConn,
+        spaceName: "Docs Space",
+        credentialName: "team-cred",
+      });
+
+      expect(source.confluenceSpace?.spaceName).toBe("Docs Space");
+      expect(source.confluenceSpace?.credentialName).toBe("team-cred");
+    });
+
+    it("creates Confluence source from status instance", () => {
+      const status: SourceInstanceIngestionStatus = {
+        sourceSystem: "CONFLUENCE",
+        sourceId: "https://myteam.atlassian.net|123456",
+        displayName: "DOCS",
+        repositoryId: null,
+        owner: null,
+        name: null,
+        sourceUrl: "https://myteam.atlassian.net/wiki/spaces/DOCS",
+        connectionStatus: "CONNECTED",
+        enabled: true,
+        lastRunTime: "2026-08-28T10:00:00Z",
+        ingestedCount: 10,
+        updatedCount: 2,
+        deletedCount: 0,
+        failedCount: 0,
+        failedItems: [],
+        artifactCount: 12,
+        lastCommitsSyncAt: null,
+        lastIssuesSyncAt: null,
+        lastPullRequestsSyncAt: null,
+      };
+
+      const source = createConfluenceSourceFromInstance(status, confluenceConn);
+      expect(source.sourceId).toBe("conn-uuid-1");
+      expect(source.sourceSystem).toBe("CONFLUENCE");
+      expect(source.name).toBe("DOCS");
+      expect(source.ingestionStatusLabel).toBe("Synced");
+      expect(source.artifacts).toBe(12);
+    });
+
+    it("keeps spaceName and credentialName once a status row takes over the card", () => {
+      const status: SourceInstanceIngestionStatus = {
+        sourceSystem: "CONFLUENCE",
+        sourceId: "https://myteam.atlassian.net|123456",
+        displayName: "Docs Space",
+        repositoryId: null,
+        owner: null,
+        name: null,
+        sourceUrl: "https://myteam.atlassian.net/wiki/spaces/DOCS",
+        connectionStatus: "CONNECTED",
+        enabled: true,
+        lastRunTime: "2026-08-28T10:00:00Z",
+        ingestedCount: 10,
+        updatedCount: 2,
+        deletedCount: 0,
+        failedCount: 0,
+        failedItems: [],
+        artifactCount: 12,
+        lastCommitsSyncAt: null,
+        lastIssuesSyncAt: null,
+        lastPullRequestsSyncAt: null,
+      };
+
+      const source = createConfluenceSourceFromInstance(status, {
+        ...confluenceConn,
+        spaceName: "Docs Space",
+        credentialName: "team-cred",
+      });
+
+      expect(source.confluenceSpace?.spaceName).toBe("Docs Space");
+      expect(source.confluenceSpace?.credentialName).toBe("team-cred");
+    });
+  });
 });
diff --git a/tests/unit/features/knowledge-base/components/ArtifactViewerDrawer.test.tsx b/tests/unit/features/knowledge-base/components/ArtifactViewerDrawer.test.tsx
index c7fcbb40..1d2d3f7f 100644
--- a/tests/unit/features/knowledge-base/components/ArtifactViewerDrawer.test.tsx
+++ b/tests/unit/features/knowledge-base/components/ArtifactViewerDrawer.test.tsx
@@ -315,6 +315,50 @@ describe("ArtifactViewerDrawer", () => {
       expect(await screen.findByText("Bug Report")).toBeInTheDocument();
     });
 
+    it("renders Confluence page artifacts as markdown even with text/plain mime type", async () => {
+      const { knowledgeService } = await import("../../../../../src/services/knowledgeService");
+      vi.mocked(knowledgeService.getArtifactContent).mockResolvedValueOnce({
+        content: "## Meeting Notes\n- Attendees\n- Goals",
+        mimeType: "text/plain",
+        isObjectUrl: false,
+      });
+
+      renderDrawer(
+        createArtifact({
+          title: "Vorlage: Besprechungsnotizen",
+          artifactType: "PAGE",
+          sourceSystem: "CONFLUENCE",
+          sourceUrl: "https://company.atlassian.net/wiki/spaces/SPACE/pages/123",
+        }),
+      );
+
+      const rawContent = await screen.findByTestId("raw-content");
+      expect(rawContent.querySelector(".prose")).toBeInTheDocument();
+      expect(await screen.findByText("Meeting Notes")).toBeInTheDocument();
+    });
+
+    it("does not render a PAGE artifact from a non-Confluence source as markdown", async () => {
+      const { knowledgeService } = await import("../../../../../src/services/knowledgeService");
+      vi.mocked(knowledgeService.getArtifactContent).mockResolvedValueOnce({
+        content: "## Should NOT be markdown",
+        mimeType: "text/plain",
+        isObjectUrl: false,
+      });
+
+      renderDrawer(
+        createArtifact({
+          title: "Some Page",
+          artifactType: "PAGE",
+          sourceSystem: "GITHUB", // not CONFLUENCE, not a /wiki/spaces/ URL
+          sourceUrl: "https://github.com/org/repo/blob/main/page.txt",
+        }),
+      );
+
+      const rawContent = await screen.findByTestId("raw-content");
+      // Should be rendered in the syntax highlighter, not in the .prose markdown container.
+      expect(rawContent.querySelector(".prose")).not.toBeInTheDocument();
+    });
+
     it("gracefully handles KaTeX math parse errors without breaking the drawer", async () => {
       const { knowledgeService } = await import("../../../../../src/services/knowledgeService");
       vi.mocked(knowledgeService.getArtifactContent).mockResolvedValueOnce({
@@ -402,6 +446,31 @@ describe("ArtifactViewerDrawer", () => {
       expect(codeElement).toBeInTheDocument();
     });
 
+    it("uses markdown language when switching to source mode for Confluence page artifacts", async () => {
+      const { knowledgeService } = await import("../../../../../src/services/knowledgeService");
+      vi.mocked(knowledgeService.getArtifactContent).mockResolvedValueOnce({
+        content: "## Meeting Notes",
+        mimeType: "text/plain",
+        isObjectUrl: false,
+      });
+
+      renderDrawer(
+        createArtifact({
+          title: "Meeting Notes",
+          artifactType: "PAGE",
+          sourceSystem: "CONFLUENCE",
+          sourceUrl: "https://company.atlassian.net/wiki/spaces/SPACE/pages/123",
+        }),
+      );
+
+      const sourceBtn = await screen.findByTestId("view-source-btn");
+      await userEvent.click(sourceBtn);
+
+      const rawContent = await screen.findByTestId("raw-content");
+      const codeElement = rawContent.querySelector("code[class*='language-markdown']");
+      expect(codeElement).toBeInTheDocument();
+    });
+
     it("does not generate duplicate line id attributes on inline code elements", async () => {
       const { knowledgeService } = await import("../../../../../src/services/knowledgeService");
       vi.mocked(knowledgeService.getArtifactContent).mockResolvedValueOnce({
diff --git a/tests/unit/features/onboarding-metrics/OnboardingMetricsPage.filter.test.tsx b/tests/unit/features/onboarding-metrics/OnboardingMetricsPage.filter.test.tsx
index 082fa94d..a64b06ca 100644
--- a/tests/unit/features/onboarding-metrics/OnboardingMetricsPage.filter.test.tsx
+++ b/tests/unit/features/onboarding-metrics/OnboardingMetricsPage.filter.test.tsx
@@ -53,7 +53,13 @@ const metrics = {
   stalledCount: 1,
   waitingOnResponseCount: 0,
   hires: [
-    hire({ userId: "a", displayName: "Ada", githubLogin: "ada", stalled: true, stalledReason: "x" }),
+    hire({
+      userId: "a",
+      displayName: "Ada",
+      githubLogin: "ada",
+      stalled: true,
+      stalledReason: "x",
+    }),
     hire({ userId: "b", displayName: "Bob", githubLogin: "bob" }),
     // Healthy active contributor: has open work in flight but already gets
     // responses. Must NOT count as needing attention (the old criterion wrongly
diff --git a/tests/unit/features/settings/useJiraCredentials.test.ts b/tests/unit/features/settings/useAtlassianCredentials.test.ts
similarity index 59%
rename from tests/unit/features/settings/useJiraCredentials.test.ts
rename to tests/unit/features/settings/useAtlassianCredentials.test.ts
index de6de463..a891739e 100644
--- a/tests/unit/features/settings/useJiraCredentials.test.ts
+++ b/tests/unit/features/settings/useAtlassianCredentials.test.ts
@@ -1,47 +1,47 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { renderHook, waitFor, act } from "@testing-library/react";
-import { useJiraCredentials } from "../../../../src/features/settings/hooks/useJiraCredentials";
-import type { JiraCredentialsDto } from "../../../../src/services/sources/jiraService";
+import { useAtlassianCredentials } from "../../../../src/features/settings/hooks/useAtlassianCredentials";
+import type { AtlassianCredentialDto } from "../../../../src/services/sources/atlassianService";
 
-vi.mock("../../../../src/services/sources/jiraService", () => ({
-  getMyJiraCredentials: vi.fn(),
+vi.mock("../../../../src/services/sources/atlassianService", () => ({
+  getMyAtlassianCredentials: vi.fn(),
 }));
 
-import { getMyJiraCredentials } from "../../../../src/services/sources/jiraService";
+import { getMyAtlassianCredentials } from "../../../../src/services/sources/atlassianService";
 
-const cred = (displayName: string): JiraCredentialsDto => ({
+const cred = (displayName: string): AtlassianCredentialDto => ({
   userEmail: "a@b.com",
   displayName,
 });
 
-describe("useJiraCredentials", () => {
+describe("useAtlassianCredentials", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
   it("loads the authenticated user's credentials on mount", async () => {
-    vi.mocked(getMyJiraCredentials).mockResolvedValue([cred("default"), cred("ci")]);
+    vi.mocked(getMyAtlassianCredentials).mockResolvedValue([cred("default"), cred("ci")]);
 
-    const { result } = renderHook(() => useJiraCredentials());
+    const { result } = renderHook(() => useAtlassianCredentials());
 
     await waitFor(() => expect(result.current.loaded).toBe(true));
     expect(result.current.credentials.map((c) => c.displayName)).toEqual(["default", "ci"]);
     expect(result.current.error).toBeNull();
-    expect(getMyJiraCredentials).toHaveBeenCalledWith(expect.any(AbortSignal));
+    expect(getMyAtlassianCredentials).toHaveBeenCalledWith(expect.any(AbortSignal));
   });
 
   it("settles into a loaded-empty state without fetching when disabled", async () => {
-    const { result } = renderHook(() => useJiraCredentials(false));
+    const { result } = renderHook(() => useAtlassianCredentials(false));
 
     await waitFor(() => expect(result.current.loaded).toBe(true));
     expect(result.current.credentials).toEqual([]);
-    expect(getMyJiraCredentials).not.toHaveBeenCalled();
+    expect(getMyAtlassianCredentials).not.toHaveBeenCalled();
   });
 
   it("surfaces an error message when loading fails", async () => {
-    vi.mocked(getMyJiraCredentials).mockRejectedValue(new Error("Network down"));
+    vi.mocked(getMyAtlassianCredentials).mockRejectedValue(new Error("Network down"));
 
-    const { result } = renderHook(() => useJiraCredentials());
+    const { result } = renderHook(() => useAtlassianCredentials());
 
     await waitFor(() => expect(result.current.loaded).toBe(true));
     expect(result.current.error).toBe("Network down");
@@ -49,11 +49,11 @@ describe("useJiraCredentials", () => {
   });
 
   it("reloads credentials via reload", async () => {
-    vi.mocked(getMyJiraCredentials)
+    vi.mocked(getMyAtlassianCredentials)
       .mockResolvedValueOnce([cred("a")])
       .mockResolvedValueOnce([cred("a"), cred("b")]);
 
-    const { result } = renderHook(() => useJiraCredentials());
+    const { result } = renderHook(() => useAtlassianCredentials());
 
     await waitFor(() =>
       expect(result.current.credentials.map((c) => c.displayName)).toEqual(["a"]),
@@ -69,15 +69,15 @@ describe("useJiraCredentials", () => {
   });
 
   it("a slow stale fetch does not overwrite a newer one", async () => {
-    let resolveSlow: (list: JiraCredentialsDto[]) => void = () => {};
-    const slow = new Promise<JiraCredentialsDto[]>((resolve) => {
+    let resolveSlow: (list: AtlassianCredentialDto[]) => void = () => {};
+    const slow = new Promise<AtlassianCredentialDto[]>((resolve) => {
       resolveSlow = resolve;
     });
-    vi.mocked(getMyJiraCredentials)
+    vi.mocked(getMyAtlassianCredentials)
       .mockReturnValueOnce(slow)
       .mockResolvedValueOnce([cred("fresh")]);
 
-    const { result } = renderHook(() => useJiraCredentials());
+    const { result } = renderHook(() => useAtlassianCredentials());
 
     await waitFor(() => expect(result.current.isRefreshing).toBe(true));
     await act(async () => {
diff --git a/tests/unit/features/starter-work/CorpusIssueBrowser.test.tsx b/tests/unit/features/starter-work/CorpusIssueBrowser.test.tsx
index f353ef07..5fc53603 100644
--- a/tests/unit/features/starter-work/CorpusIssueBrowser.test.tsx
+++ b/tests/unit/features/starter-work/CorpusIssueBrowser.test.tsx
@@ -89,9 +89,7 @@ describe("CorpusIssueBrowser", () => {
     vi.spyOn(starterWorkService, "fetchCandidates").mockResolvedValue([]);
     render(<CorpusIssueBrowser projectId="p1" canAct onPromoted={vi.fn()} />);
 
-    expect(
-      await screen.findByText(/a second way in besides mining/i),
-    ).toBeInTheDocument();
+    expect(await screen.findByText(/a second way in besides mining/i)).toBeInTheDocument();
   });
 
   it("hides issues somebody is on by default, and counts them rather than swallowing them", async () => {
diff --git a/tests/unit/pages/DataIngestionPage.test.tsx b/tests/unit/pages/DataIngestionPage.test.tsx
index 836ee993..ff2b5392 100644
--- a/tests/unit/pages/DataIngestionPage.test.tsx
+++ b/tests/unit/pages/DataIngestionPage.test.tsx
@@ -2,6 +2,8 @@ import { render, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { MemoryRouter, useLocation } from "react-router-dom";
+import { http, HttpResponse } from "msw";
+import { server } from "../setup/vitest.setup";
 import { DataIngestionPage } from "../../../src/pages/DataIngestionPage";
 import { createProjectContextValue, createSelectableProject } from "../setup/projectContext";
 
@@ -995,6 +997,76 @@ describe("DataIngestionPage", () => {
     expect(mockConfigureAllGithubRepositories).not.toHaveBeenCalled();
   });
 
+  it("applies the global sync schedule to every Confluence connection", async () => {
+    mockGetAccessibleProject.mockResolvedValue({
+      id: "proj1",
+      name: "Project Alpha",
+      description: "",
+      manager: null,
+      sources: [],
+      users: [],
+    });
+
+    const scheduleRequests: unknown[] = [];
+    server.use(
+      http.get("/api/v1/confluence/projects/:projectId/connections", () =>
+        HttpResponse.json([
+          {
+            id: "conn-1",
+            projectId: "proj1",
+            baseUrl: "https://acme.atlassian.net",
+            spaceId: "123456",
+            spaceKey: "ENG",
+            spaceName: "Engineering",
+            credentialName: "default",
+            pageAllowlist: [],
+            pageDenylist: [],
+            credentialsConfigured: true,
+            createdAt: "2026-07-01T00:00:00Z",
+            updatedAt: "2026-07-01T00:00:00Z",
+            version: 1,
+            sourceEnabled: true,
+            autoUpdate: true,
+            spec: { type: "INTERVAL", everyMinutes: 60 },
+            schedule: "every 60m",
+            nextSyncAt: null,
+          },
+        ]),
+      ),
+      http.put(
+        "/api/v1/confluence/projects/:projectId/connections/:connectionId/schedule",
+        async ({ request, params }) => {
+          scheduleRequests.push({ connectionId: params.connectionId, body: await request.json() });
+          return HttpResponse.json({});
+        },
+      ),
+    );
+
+    const user = userEvent.setup();
+    render(
+      <MemoryRouter>
+        <DataIngestionPage />
+      </MemoryRouter>,
+    );
+
+    const manageButton = await screen.findByRole("button", { name: /manage sync settings/i });
+    await user.click(manageButton);
+
+    expect(await screen.findByText("Confluence Sync Settings")).toBeInTheDocument();
+
+    await user.click(screen.getByRole("switch", { name: /toggle global confluence auto update/i }));
+    await user.click(screen.getByRole("button", { name: /apply globally/i }));
+
+    await waitFor(() => {
+      expect(scheduleRequests).toEqual([
+        {
+          connectionId: "conn-1",
+          body: { autoUpdate: false, schedule: { type: "INTERVAL", everyMinutes: 60 } },
+        },
+      ]);
+    });
+  });
+
   it("opens the connectors modal from Manage connectors", async () => {
     const user = userEvent.setup();
     render(
diff --git a/tests/unit/services/atlassianService.test.ts b/tests/unit/services/atlassianService.test.ts
new file mode 100644
index 00000000..84db65d9
--- /dev/null
+++ b/tests/unit/services/atlassianService.test.ts
@@ -0,0 +1,132 @@
+import { describe, expect, it } from "vitest";
+import { http, HttpResponse } from "msw";
+import { server } from "../setup/vitest.setup";
+import {
+  addAtlassianCredential,
+  changeAtlassianCredentialName,
+  changeAtlassianCredentialToken,
+  deleteAtlassianCredential,
+  getMyAtlassianCredentials,
+} from "../../../src/services/sources/atlassianService";
+
+describe("atlassianService credential endpoints", () => {
+  it("addAtlassianCredential posts the credential payload", async () => {
+    expect.assertions(1);
+
+    server.use(
+      http.post("/api/v1/atlassian/credentials", async ({ request }) => {
+        expect(await request.json()).toEqual({
+          userEmail: "pm@example.com",
+          tokenName: "token-a",
+          authToken: "secret",
+        });
+
+        return new HttpResponse(null, { status: 204 });
+      }),
+    );
+
+    await addAtlassianCredential({
+      userEmail: "pm@example.com",
+      tokenName: "token-a",
+      authToken: "secret",
+    });
+  });
+
+  it("getMyAtlassianCredentials lists the authenticated user's credentials", async () => {
+    server.use(
+      http.get("/api/v1/atlassian/credentials", () =>
+        HttpResponse.json([{ userEmail: "pm+user@example.com", displayName: "token-a" }]),
+      ),
+    );
+
+    const credentials = await getMyAtlassianCredentials();
+
+    expect(credentials).toHaveLength(1);
+    expect(credentials[0]).toEqual({
+      userEmail: "pm+user@example.com",
+      displayName: "token-a",
+    });
+  });
+
+  it("deleteAtlassianCredential sends a DELETE with the credential identity", async () => {
+    expect.assertions(1);
+
+    server.use(
+      http.delete("/api/v1/atlassian/credentials", async ({ request }) => {
+        expect(await request.json()).toEqual({
+          userEmail: "pm@example.com",
+          tokenName: "token-a",
+        });
+
+        return new HttpResponse(null, { status: 204 });
+      }),
+    );
+
+    await deleteAtlassianCredential({
+      userEmail: "pm@example.com",
+      tokenName: "token-a",
+    });
+  });
+
+  it("deleteAtlassianCredential rejects with an ApiError on 404", async () => {
+    server.use(
+      http.delete("/api/v1/atlassian/credentials", () =>
+        HttpResponse.json({ message: "unknown credential" }, { status: 404 }),
+      ),
+    );
+
+    await expect(
+      deleteAtlassianCredential({ userEmail: "pm@example.com", tokenName: "gone" }),
+    ).rejects.toThrow();
+  });
+
+  it("changeAtlassianCredentialName patches the name and returns the credential", async () => {
+    server.use(
+      http.patch("/api/v1/atlassian/credentials/patch/name", async ({ request }) => {
+        expect(await request.json()).toEqual({
+          userEmail: "pm@example.com",
+          oldName: "token-a",
+          newName: "token-b",
+        });
+
+        return HttpResponse.json({
+          userEmail: "pm@example.com",
+          displayName: "token-b",
+        });
+      }),
+    );
+
+    const credential = await changeAtlassianCredentialName({
+      userEmail: "pm@example.com",
+      oldName: "token-a",
+      newName: "token-b",
+    });
+
+    expect(credential.displayName).toBe("token-b");
+  });
+
+  it("changeAtlassianCredentialToken patches the token secret", async () => {
+    server.use(
+      http.patch("/api/v1/atlassian/credentials/patch/token", async ({ request }) => {
+        expect(await request.json()).toEqual({
+          userEmail: "pm@example.com",
+          tokenName: "token-a",
+          newToken: "new-secret",
+        });
+
+        return HttpResponse.json({
+          userEmail: "pm@example.com",
+          displayName: "token-a",
+        });
+      }),
+    );
+
+    const credential = await changeAtlassianCredentialToken({
+      userEmail: "pm@example.com",
+      tokenName: "token-a",
+      newToken: "new-secret",
+    });
+
+    expect(credential.displayName).toBe("token-a");
+  });
+});
diff --git a/tests/unit/services/confluenceService.test.ts b/tests/unit/services/confluenceService.test.ts
new file mode 100644
index 00000000..0c4358c2
--- /dev/null
+++ b/tests/unit/services/confluenceService.test.ts
@@ -0,0 +1,149 @@
+import { describe, expect, it } from "vitest";
+import { http, HttpResponse } from "msw";
+import { server } from "../setup/vitest.setup";
+import {
+  confluenceService,
+  type ConfluenceConnectionDto,
+  type ConfluenceIngestionResult,
+} from "../../../src/services/sources/confluenceService";
+
+const mockConnection: ConfluenceConnectionDto = {
+  id: "conn-123",
+  projectId: "proj-1",
+  baseUrl: "https://example.atlassian.net/wiki",
+  spaceId: "SPACE-1",
+  spaceKey: "SP",
+  spaceName: "Sprint Planning",
+  credentialName: "default",
+  pageAllowlist: [],
+  pageDenylist: [],
+  credentialsConfigured: true,
+  createdAt: "2026-01-01T00:00:00Z",
+  updatedAt: "2026-01-01T00:00:00Z",
+  version: 1,
+  sourceEnabled: true,
+};
+
+describe("confluenceService", () => {
+  it("createConnection sends POST with correct payload", async () => {
+    expect.assertions(2);
+
+    server.use(
+      http.post("/api/v1/confluence/projects/proj-1/connections", async ({ request }) => {
+        const body = await request.json();
+        expect(body).toEqual({
+          baseUrl: "https://example.atlassian.net/wiki",
+          spaceId: "SPACE-1",
+          credentialName: "default",
+          pageAllowlist: [],
+          pageDenylist: [],
+        });
+
+        return HttpResponse.json(mockConnection);
+      }),
+    );
+
+    const result = await confluenceService.createConnection("proj-1", {
+      baseUrl: "https://example.atlassian.net/wiki",
+      spaceId: "SPACE-1",
+      credentialName: "default",
+    });
+
+    expect(result).toEqual(mockConnection);
+  });
+
+  it("listConnections calls GET /api/v1/confluence/projects/:projectId/connections", async () => {
+    expect.assertions(2);
+
+    server.use(
+      http.get("/api/v1/confluence/projects/proj-1/connections", () => {
+        return HttpResponse.json([mockConnection]);
+      }),
+    );
+
+    const result = await confluenceService.listConnections("proj-1");
+    expect(result).toHaveLength(1);
+    expect(result[0].id).toBe("conn-123");
+  });
+
+  it("getConnection calls GET /api/v1/confluence/projects/:projectId/connections/:connectionId", async () => {
+    expect.assertions(2);
+
+    server.use(
+      http.get("/api/v1/confluence/projects/proj-1/connections/conn-123", () => {
+        return HttpResponse.json(mockConnection);
+      }),
+    );
+
+    const result = await confluenceService.getConnection("proj-1", "conn-123");
+    expect(result.id).toBe("conn-123");
+    expect(result.spaceId).toBe("SPACE-1");
+  });
+
+  it("syncConnection calls POST /api/v1/confluence/projects/:projectId/connections/:connectionId/update", async () => {
+    expect.assertions(2);
+
+    const mockResult: ConfluenceIngestionResult = {
+      runId: "run-1",
+      connectionId: "conn-123",
+      discovered: 10,
+      eligible: 10,
+      filtered: 0,
+      created: 10,
+      updated: 0,
+      unchanged: 0,
+      failed: 0,
+      failures: [],
+      status: "COMPLETED",
+    };
+
+    server.use(
+      http.post("/api/v1/confluence/projects/proj-1/connections/conn-123/update", () => {
+        return HttpResponse.json(mockResult);
+      }),
+    );
+
+    const result = await confluenceService.syncConnection("proj-1", "conn-123");
+    expect(result.status).toBe("COMPLETED");
+    expect(result.created).toBe(10);
+  });
+
+  it("deleteConnection calls DELETE /api/v1/confluence/projects/:projectId/connections/:connectionId", async () => {
+    expect.assertions(1);
+
+    server.use(
+      http.delete("/api/v1/confluence/projects/proj-1/connections/conn-123", ({ request }) => {
+        expect(request.method).toBe("DELETE");
+
+        return new HttpResponse(null, { status: 204 });
+      }),
+    );
+
+    await confluenceService.deleteConnection("proj-1", "conn-123");
+  });
+
+  it("configureSchedule calls PUT /api/v1/confluence/projects/:projectId/connections/:connectionId/schedule", async () => {
+    expect.assertions(2);
+
+    server.use(
+      http.put(
+        "/api/v1/confluence/projects/proj-1/connections/conn-123/schedule",
+        async ({ request }) => {
+          const body = await request.json();
+          expect(body).toEqual({
+            autoUpdate: true,
+            schedule: { type: "INTERVAL", everyMinutes: 60 },
+          });
+
+          return HttpResponse.json({ ...mockConnection, autoUpdate: true });
+        },
+      ),
+    );
+
+    const result = await confluenceService.configureSchedule("proj-1", "conn-123", {
+      autoUpdate: true,
+      schedule: { type: "INTERVAL", everyMinutes: 60 },
+    });
+    expect(result.autoUpdate).toBe(true);
+  });
+});
diff --git a/tests/unit/services/connectorService.test.ts b/tests/unit/services/connectorService.test.ts
index 16dea36f..dc2d3291 100644
--- a/tests/unit/services/connectorService.test.ts
+++ b/tests/unit/services/connectorService.test.ts
@@ -107,6 +107,26 @@ describe("connectorService", () => {
     expect(response.sources[0].enabled).toBe(false);
   });
 
+  it("patchConnectorSources scopes the update to a project when one is given", async () => {
+    let requestUrl: string | null = null;
+
+    server.use(
+      http.patch("/api/v1/connectors/confluence/sources/status", ({ request }) => {
+        requestUrl = request.url;
+
+        return HttpResponse.json({ connectorId: "confluence", sources: [] });
+      }),
+    );
+
+    await connectorService.patchConnectorSources(
+      "confluence",
+      [{ sourceId: "11111111-1111-1111-1111-111111111111", enabled: false }],
+      "proj-1",
+    );
+
+    expect(requestUrl).toContain("projectId=proj-1");
+  });
+
   it("patchConnectorSources rejects with an ApiError on 400", async () => {
     server.use(
       http.patch("/api/v1/connectors/github/sources/status", () =>
diff --git a/tests/unit/services/jiraService.test.ts b/tests/unit/services/jiraService.test.ts
index da376514..c619fed9 100644
--- a/tests/unit/services/jiraService.test.ts
+++ b/tests/unit/services/jiraService.test.ts
@@ -2,16 +2,11 @@ import { describe, expect, it } from "vitest";
 import { http, HttpResponse } from "msw";
 import { server } from "../setup/vitest.setup";
 import {
-  addJiraCredential,
-  changeJiraCredentialName,
-  changeJiraCredentialToken,
   configureAllJiraInstances,
   configureJiraInstance,
   connectJiraInstance,
-  deleteJiraCredential,
   getAllJiraConfigs,
   getJiraConfig,
-  getMyJiraCredentials,
   getJiraInstances,
   removeJiraInstanceFromProject,
   updateAllJiraInstances,
@@ -136,127 +131,6 @@ describe("jiraService instance endpoints", () => {
   });
 });
 
-describe("jiraService credential endpoints", () => {
-  it("addJiraCredential posts the credential payload", async () => {
-    expect.assertions(1);
-
-    server.use(
-      http.post("/api/v1/jira/credentials", async ({ request }) => {
-        expect(await request.json()).toEqual({
-          userEmail: "pm@example.com",
-          tokenName: "token-a",
-          authToken: "secret",
-        });
-
-        return new HttpResponse(null, { status: 204 });
-      }),
-    );
-
-    await addJiraCredential({
-      userEmail: "pm@example.com",
-      tokenName: "token-a",
-      authToken: "secret",
-    });
-  });
-
-  it("getMyJiraCredentials lists the authenticated user's credentials", async () => {
-    server.use(
-      http.get("/api/v1/jira/credentials", () =>
-        HttpResponse.json([{ userEmail: "pm+user@example.com", displayName: "token-a" }]),
-      ),
-    );
-
-    const credentials = await getMyJiraCredentials();
-
-    expect(credentials).toHaveLength(1);
-    expect(credentials[0]).toEqual({
-      userEmail: "pm+user@example.com",
-      displayName: "token-a",
-    });
-  });
-  it("deleteJiraCredential sends a DELETE with the credential identity", async () => {
-    expect.assertions(1);
-
-    server.use(
-      http.delete("/api/v1/jira/credentials", async ({ request }) => {
-        expect(await request.json()).toEqual({
-          userEmail: "pm@example.com",
-          tokenName: "token-a",
-        });
-
-        return new HttpResponse(null, { status: 204 });
-      }),
-    );
-
-    await deleteJiraCredential({
-      userEmail: "pm@example.com",
-      tokenName: "token-a",
-    });
-  });
-
-  it("deleteJiraCredential rejects with an ApiError on 404", async () => {
-    server.use(
-      http.delete("/api/v1/jira/credentials", () =>
-        HttpResponse.json({ message: "unknown credential" }, { status: 404 }),
-      ),
-    );
-
-    await expect(
-      deleteJiraCredential({ userEmail: "pm@example.com", tokenName: "gone" }),
-    ).rejects.toThrow();
-  });
-
-  it("changeJiraCredentialName patches the name and returns the credential", async () => {
-    server.use(
-      http.patch("/api/v1/jira/credentials/patch/name", async ({ request }) => {
-        expect(await request.json()).toEqual({
-          userEmail: "pm@example.com",
-          oldName: "token-a",
-          newName: "token-b",
-        });
-
-        return HttpResponse.json({
-          userEmail: "pm@example.com",
-          displayName: "token-b",
-        });
-      }),
-    );
-
-    const credential = await changeJiraCredentialName({
-      userEmail: "pm@example.com",
-      oldName: "token-a",
-      newName: "token-b",
-    });
-
-    expect(credential.displayName).toBe("token-b");
-  });
-
-  it("changeJiraCredentialToken patches the token secret", async () => {
-    server.use(
-      http.patch("/api/v1/jira/credentials/patch/token", async ({ request }) => {
-        expect(await request.json()).toEqual({
-          userEmail: "pm@example.com",
-          tokenName: "token-a",
-          newToken: "new-secret",
-        });
-
-        return HttpResponse.json({
-          userEmail: "pm@example.com",
-          displayName: "token-a",
-        });
-      }),
-    );
-
-    const credential = await changeJiraCredentialToken({
-      userEmail: "pm@example.com",
-      tokenName: "token-a",
-      newToken: "new-secret",
-    });
-
-    expect(credential.displayName).toBe("token-a");
-  });
-});
-
 describe("jiraService config endpoints", () => {
   it("getAllJiraConfigs lists every instance config", async () => {
     server.use(
diff --git a/tests/unit/setup/msw-handlers.ts b/tests/unit/setup/msw-handlers.ts
index f046d71d..981e075a 100644
--- a/tests/unit/setup/msw-handlers.ts
+++ b/tests/unit/setup/msw-handlers.ts
@@ -117,7 +117,7 @@ export const handlers = [
   // management view mounts every connector at once, so both are needed even in
   // tests that are not about credentials at all.
   http.get("/api/v1/github/pat", () => HttpResponse.json([])),
-  http.get("/api/v1/jira/credentials", () => HttpResponse.json([])),
+  http.get("/api/v1/atlassian/credentials", () => HttpResponse.json([])),
 
   http.get("/api/v1/projects/:projectId/artifacts", () =>
     HttpResponse.json({
@@ -521,4 +521,88 @@ export const handlers = [
   }),
 
   http.post("/api/v1/users/:userId/project-roles", () => new HttpResponse(null, { status: 200 })),
+
+  http.get("/api/v1/confluence/projects/:projectId/connections", () => HttpResponse.json([])),
+  http.post("/api/v1/confluence/projects/:projectId/connections", () =>
+    HttpResponse.json({
+      id: "conn-default",
+      projectId: "proj-1",
+      baseUrl: "https://example.atlassian.net/wiki",
+      spaceId: "123456",
+      spaceKey: "EX",
+      spaceName: "Example Space",
+      credentialName: "default",
+      pageAllowlist: [],
+      pageDenylist: [],
+      credentialsConfigured: true,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      version: 1,
+      sourceEnabled: true,
+    }),
+  ),
+  http.post("/api/v1/confluence/projects/:projectId/connections/:connectionId/update", () =>
+    HttpResponse.json({
+      runId: "run-default",
+      connectionId: "conn-default",
+      discovered: 0,
+      eligible: 0,
+      filtered: 0,
+      created: 0,
+      updated: 0,
+      unchanged: 0,
+      failed: 0,
+      failures: [],
+      status: "COMPLETED",
+    }),
+  ),
+  http.get("/api/v1/confluence/projects/:projectId/connections/:connectionId", ({ params }) =>
+    HttpResponse.json({
+      id: params.connectionId,
+      projectId: params.projectId,
+      baseUrl: "https://example.atlassian.net/wiki",
+      spaceId: "123456",
+      spaceKey: "EX",
+      spaceName: "Example Space",
+      credentialName: "default",
+      pageAllowlist: [],
+      pageDenylist: [],
+      credentialsConfigured: true,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      version: 1,
+      sourceEnabled: true,
+      autoUpdate: true,
+      spec: { type: "INTERVAL", everyMinutes: 60 },
+      schedule: "every 60m",
+      nextSyncAt: null,
+    }),
+  ),
+  http.put(
+    "/api/v1/confluence/projects/:projectId/connections/:connectionId/schedule",
+    ({ params }) =>
+      HttpResponse.json({
+        id: params.connectionId,
+        projectId: params.projectId,
+        baseUrl: "https://example.atlassian.net/wiki",
+        spaceId: "123456",
+        spaceKey: "EX",
+        spaceName: "Example Space",
+        credentialName: "default",
+        pageAllowlist: [],
+        pageDenylist: [],
+        credentialsConfigured: true,
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        version: 2,
+        sourceEnabled: true,
+        autoUpdate: true,
+        spec: { type: "INTERVAL", everyMinutes: 60 },
+        schedule: "every 60m",
+        nextSyncAt: null,
+      }),
+  ),
+  http.get("/api/v1/connectors/confluence/sources", () =>
+    HttpResponse.json({ connectorId: "confluence", sources: [] }),
+  ),
 ];