From 8b6ef61f0079374f5a79fcb4e1e11bf4fc1feb84 Mon Sep 17 00:00:00 2001
From: Anirudh Oppiliappan <anirudh@tangled.org>
Date: Wed, 19 Aug 2026 23:23:32 +0300
Subject: [PATCH] web: watch toggles, feed.subscription writes and notif prefs

Signed-off-by: Anirudh Oppiliappan <anirudh@tangled.org>
---
 api/tangled/cbor_gen.go                       |  12 +--
 api/tangled/feedsubscription.go               |  28 ++---
 lexicons/feed/subscription.json               |   2 +-
 web/src/lib/api/graph.ts                      |  47 ++++++++
 .../components/comment/CommentEditor.svelte   |   5 +
 web/src/lib/components/repo/RepoHeader.svelte |   2 +
 .../components/repo/SubscribeButton.svelte    | 101 ++++++++++++++++++
 .../components/repo/issues/IssueForm.svelte   |   9 ++
 .../repo/issues/IssueThreadView.svelte        |  67 ++++++++++++
 .../components/repo/pulls/PullCompose.svelte  |   6 +-
 web/src/lib/oauth-client-metadata.json        |   2 +-
 .../[repo]/issues/[aturi]/+page.svelte        |   3 +-
 .../[aturi]/[version]/[[range]]/+page.svelte  |   2 +-
 .../[version]/[[range]]/PullViewPage.svelte   |  72 ++++++++++++-
 14 files changed, 330 insertions(+), 28 deletions(-)
 create mode 100644 web/src/lib/components/repo/SubscribeButton.svelte

diff --git a/api/tangled/cbor_gen.go b/api/tangled/cbor_gen.go
index 2f597c25..3d1c7fe3 100644
--- a/api/tangled/cbor_gen.go
+++ b/api/tangled/cbor_gen.go
@@ -4254,10 +4254,10 @@ func (t *FeedSubscription) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.feed.subscription"))); err != nil {
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("org.tangled.feed.subscription"))); err != nil {
 		return err
 	}
-	if _, err := cw.WriteString(string("sh.tangled.feed.subscription")); err != nil {
+	if _, err := cw.WriteString(string("org.tangled.feed.subscription")); err != nil {
 		return err
 	}
 
@@ -4519,10 +4519,10 @@ func (t *FeedSubscription_Uri) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.feed.subscription#uri"))); err != nil {
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("org.tangled.feed.subscription#uri"))); err != nil {
 		return err
 	}
-	if _, err := cw.WriteString(string("sh.tangled.feed.subscription#uri")); err != nil {
+	if _, err := cw.WriteString(string("org.tangled.feed.subscription#uri")); err != nil {
 		return err
 	}
 	return nil
@@ -4649,10 +4649,10 @@ func (t *FeedSubscription_Repo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
-	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.feed.subscription#repo"))); err != nil {
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("org.tangled.feed.subscription#repo"))); err != nil {
 		return err
 	}
-	if _, err := cw.WriteString(string("sh.tangled.feed.subscription#repo")); err != nil {
+	if _, err := cw.WriteString(string("org.tangled.feed.subscription#repo")); err != nil {
 		return err
 	}
 	return nil
diff --git a/api/tangled/feedsubscription.go b/api/tangled/feedsubscription.go
index 99f963d9..776e3d63 100644
--- a/api/tangled/feedsubscription.go
+++ b/api/tangled/feedsubscription.go
@@ -2,7 +2,7 @@
 
 package tangled
 
-// schema: sh.tangled.feed.subscription
+// schema: org.tangled.feed.subscription
 
 import (
 	"bytes"
@@ -15,26 +15,26 @@ import (
 )
 
 const (
-	FeedSubscriptionNSID = "sh.tangled.feed.subscription"
+	FeedSubscriptionNSID = "org.tangled.feed.subscription"
 )
 
 func init() {
-	util.RegisterType("sh.tangled.feed.subscription", &FeedSubscription{})
+	util.RegisterType("org.tangled.feed.subscription", &FeedSubscription{})
 } //
 // RECORDTYPE: FeedSubscription
 type FeedSubscription struct {
-	LexiconTypeID string `json:"$type,const=sh.tangled.feed.subscription" cborgen:"$type,const=sh.tangled.feed.subscription"`
+	LexiconTypeID string `json:"$type,const=org.tangled.feed.subscription" cborgen:"$type,const=org.tangled.feed.subscription"`
 	// collections: Optional collection NSIDs to filter which notifications are sent. Empty or absent means all collections.
 	Collections []string                  `json:"collections,omitempty" cborgen:"collections,omitempty"`
 	CreatedAt   string                    `json:"createdAt" cborgen:"createdAt"`
 	Subject     *FeedSubscription_Subject `json:"subject" cborgen:"subject"`
 }
 
-// FeedSubscription_Repo is a "repo" in the sh.tangled.feed.subscription schema.
+// FeedSubscription_Repo is a "repo" in the org.tangled.feed.subscription schema.
 //
 // RECORDTYPE: FeedSubscription_Repo
 type FeedSubscription_Repo struct {
-	LexiconTypeID string `json:"$type,const=sh.tangled.feed.subscription#repo" cborgen:"$type,const=sh.tangled.feed.subscription#repo"`
+	LexiconTypeID string `json:"$type,const=org.tangled.feed.subscription#repo" cborgen:"$type,const=org.tangled.feed.subscription#repo"`
 	Did           string `json:"did" cborgen:"did"`
 }
 
@@ -45,11 +45,11 @@ type FeedSubscription_Subject struct {
 
 func (t *FeedSubscription_Subject) MarshalJSON() ([]byte, error) {
 	if t.FeedSubscription_Uri != nil {
-		t.FeedSubscription_Uri.LexiconTypeID = "sh.tangled.feed.subscription#uri"
+		t.FeedSubscription_Uri.LexiconTypeID = "org.tangled.feed.subscription#uri"
 		return json.Marshal(t.FeedSubscription_Uri)
 	}
 	if t.FeedSubscription_Repo != nil {
-		t.FeedSubscription_Repo.LexiconTypeID = "sh.tangled.feed.subscription#repo"
+		t.FeedSubscription_Repo.LexiconTypeID = "org.tangled.feed.subscription#repo"
 		return json.Marshal(t.FeedSubscription_Repo)
 	}
 	return nil, fmt.Errorf("cannot marshal empty enum")
@@ -61,10 +61,10 @@ func (t *FeedSubscription_Subject) UnmarshalJSON(b []byte) error {
 	}
 
 	switch typ {
-	case "sh.tangled.feed.subscription#uri":
+	case "org.tangled.feed.subscription#uri":
 		t.FeedSubscription_Uri = new(FeedSubscription_Uri)
 		return json.Unmarshal(b, t.FeedSubscription_Uri)
-	case "sh.tangled.feed.subscription#repo":
+	case "org.tangled.feed.subscription#repo":
 		t.FeedSubscription_Repo = new(FeedSubscription_Repo)
 		return json.Unmarshal(b, t.FeedSubscription_Repo)
 
@@ -94,10 +94,10 @@ func (t *FeedSubscription_Subject) UnmarshalCBOR(r io.Reader) error {
 	}
 
 	switch typ {
-	case "sh.tangled.feed.subscription#uri":
+	case "org.tangled.feed.subscription#uri":
 		t.FeedSubscription_Uri = new(FeedSubscription_Uri)
 		return t.FeedSubscription_Uri.UnmarshalCBOR(bytes.NewReader(b))
-	case "sh.tangled.feed.subscription#repo":
+	case "org.tangled.feed.subscription#repo":
 		t.FeedSubscription_Repo = new(FeedSubscription_Repo)
 		return t.FeedSubscription_Repo.UnmarshalCBOR(bytes.NewReader(b))
 
@@ -106,10 +106,10 @@ func (t *FeedSubscription_Subject) UnmarshalCBOR(r io.Reader) error {
 	}
 }
 
-// FeedSubscription_Uri is a "uri" in the sh.tangled.feed.subscription schema.
+// FeedSubscription_Uri is a "uri" in the org.tangled.feed.subscription schema.
 //
 // RECORDTYPE: FeedSubscription_Uri
 type FeedSubscription_Uri struct {
-	LexiconTypeID string `json:"$type,const=sh.tangled.feed.subscription#uri" cborgen:"$type,const=sh.tangled.feed.subscription#uri"`
+	LexiconTypeID string `json:"$type,const=org.tangled.feed.subscription#uri" cborgen:"$type,const=org.tangled.feed.subscription#uri"`
 	Uri           string `json:"uri" cborgen:"uri"`
 }
diff --git a/lexicons/feed/subscription.json b/lexicons/feed/subscription.json
index e5e02c01..21856811 100644
--- a/lexicons/feed/subscription.json
+++ b/lexicons/feed/subscription.json
@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "sh.tangled.feed.subscription",
+  "id": "org.tangled.feed.subscription",
   "defs": {
     "main": {
       "type": "record",
diff --git a/web/src/lib/api/graph.ts b/web/src/lib/api/graph.ts
index 40a2d702..9262f337 100644
--- a/web/src/lib/api/graph.ts
+++ b/web/src/lib/api/graph.ts
@@ -88,7 +88,54 @@ export const createStar = async (agent: OAuthUserAgent, repoDid: string): Promis
 export const deleteStar = async (agent: OAuthUserAgent, rkey: string): Promise<void> => {
 	await deleteRecord(agent, STAR_COLLECTION, rkey);
 };
+const SUBSCRIPTION_COLLECTION = "org.tangled.feed.subscription" as Nsid;
 
+export const createSubscription = async (agent: OAuthUserAgent, repoDid: string): Promise<string> => {
+	const { uri } = await createRecord(agent, SUBSCRIPTION_COLLECTION, {
+		$type: SUBSCRIPTION_COLLECTION,
+		subject: {
+			$type: "org.tangled.feed.subscription#repo",
+			did: repoDid as Did
+		},
+		createdAt: new Date().toISOString()
+	});
+	return rkeyFromUri(uri);
+};
+
+export const deleteSubscription = async (agent: OAuthUserAgent, rkey: string): Promise<void> => {
+	await deleteRecord(agent, SUBSCRIPTION_COLLECTION, rkey);
+};
+
+export const createEntitySubscription = async (agent: OAuthUserAgent, entityUri: string): Promise<string> => {
+	const { uri } = await createRecord(agent, SUBSCRIPTION_COLLECTION, {
+		$type: SUBSCRIPTION_COLLECTION,
+		subject: {
+			$type: "org.tangled.feed.subscription#uri",
+			uri: entityUri
+		},
+		createdAt: new Date().toISOString()
+	});
+	return rkeyFromUri(uri);
+};
+
+// 404 means no subscription exists, other errors propagate.
+export const getSubscriptionRkey = async (
+	ctx: BobbinContext,
+	actor: string,
+	subject: string
+): Promise<string | null> => {
+	try {
+		const { uri } = await jsonGet<{ uri: string }>(
+			ctx,
+			"org.tangled.feed.subscription.getForActor",
+			{ actor: actor as Did, subject }
+		);
+		return rkeyFromUri(uri);
+	} catch (cause) {
+		if (cause instanceof ClientResponseError && httpStatusFor(cause) === 404) return null;
+		throw cause;
+	}
+};
 export type VouchKind = "vouch" | "denounce";
 
 export interface VouchInput {
diff --git a/web/src/lib/components/comment/CommentEditor.svelte b/web/src/lib/components/comment/CommentEditor.svelte
index 6f045e54..e62f3a70 100644
--- a/web/src/lib/components/comment/CommentEditor.svelte
+++ b/web/src/lib/components/comment/CommentEditor.svelte
@@ -5,6 +5,7 @@
 	import type { Did } from "@atcute/lexicons/syntax";
 	import X from "$icon/x";
 	import { putComment } from "$lib/api/comment";
+	import { createEntitySubscription } from "$lib/api/graph";
 	import { getAuth } from "$lib/auth.svelte";
 	import AccountSelector from "$lib/components/auth/AccountSelector.svelte";
 	import Button from "$lib/components/ui/Button.svelte";
@@ -93,6 +94,10 @@
 			record.replyTo = { uri: replyToUri, cid: replyToCid } as CommentRecord["replyTo"];
 		}
 		const saved = await putComment(agent, targetRkey, record);
+		// auto-subscribe the commenter to notifications on the parent entity
+		createEntitySubscription(agent, subjectUri).catch((err) => {
+			console.error("Failed to auto-subscribe via comment:", err);
+		});
 		// render markdown client-side so the optimistic comment matches a real one
 		const bodyHtml = await renderMarkup(body, markup).catch(() => null);
 		onsubmitted?.({
diff --git a/web/src/lib/components/repo/RepoHeader.svelte b/web/src/lib/components/repo/RepoHeader.svelte
index 600ef012..86b1d951 100644
--- a/web/src/lib/components/repo/RepoHeader.svelte
+++ b/web/src/lib/components/repo/RepoHeader.svelte
@@ -11,6 +11,7 @@
 	import uiLoadingprimitivesCount from "$lib/bones/ui-loadingprimitives--count.bones.json";
 	import StarButton from "./StarButton.svelte";
 	import type { RepoCounts, RepoInfo, RepoSource } from "./types";
+	import SubscribeButton from "./SubscribeButton.svelte";
 	import { formatCount } from "$lib/format";
 	interface Props {
 		repo: RepoInfo;
@@ -35,6 +36,7 @@
 			initialCount={counts}
 			initialRkey={viewerStarRkey}
 		/>
+		<SubscribeButton repoDid={repo.repoDid ?? ""} />
 
 		<ButtonGroup class="flex-1">
 			<Button
diff --git a/web/src/lib/components/repo/SubscribeButton.svelte b/web/src/lib/components/repo/SubscribeButton.svelte
new file mode 100644
index 00000000..f843a767
--- /dev/null
+++ b/web/src/lib/components/repo/SubscribeButton.svelte
@@ -0,0 +1,101 @@
+<script lang="ts">
+  import { page } from "$app/state";
+  import Eye from "$icon/eye";
+  import EyeOff from "$icon/eye-off";
+  import { getAuth } from "$lib/auth.svelte";
+  import { loginWithReturn } from "$lib/auth/guards";
+  import { createSubscription, deleteSubscription, getSubscriptionRkey } from "$lib/api/graph";
+  import { createBobbinClient } from "$lib/api/client";
+  import Button from "$lib/components/ui/Button.svelte";
+
+
+  import ButtonGroup from "$lib/components/ui/ButtonGroup.svelte";
+  import { resolve } from "$app/paths";
+
+  interface Props {
+    repoDid: string;
+  }
+
+  let { repoDid }: Props = $props();
+
+  const auth = getAuth();
+  const signedIn = $derived(Boolean(auth.currentDid));
+  const loginHref = $derived(
+    resolve(loginWithReturn(page.url.pathname + page.url.search) as "/login"),
+  );
+
+  let subscribed = $state(false);
+  let loading = $state(true);
+  let toggling = $state(false);
+  let subRkey = $state<string | null>(null);
+  let error = $state<string | null>(null);
+
+  $effect(() => {
+    const agent = auth.agent;
+    const did = auth.currentDid;
+    if (!agent || !did || !repoDid) { subscribed = false; subRkey = null; loading = false; return; }
+    let cancelled = false;
+    loading = true;
+    error = null;
+    const bobbinUrl = (page.data as { publicConfig?: { bobbinUrl?: string } })?.publicConfig?.bobbinUrl;
+    if (!bobbinUrl) { loading = false; return; }
+    const ctx = createBobbinClient({ serviceUrl: bobbinUrl });
+    getSubscriptionRkey(ctx, did, repoDid).then((rkey) => {
+      if (cancelled) return;
+      subRkey = rkey;
+      subscribed = !!rkey;
+      loading = false;
+    }).catch(() => {
+      if (!cancelled) { loading = false; error = "Could not load subscription state"; }
+    });
+    return () => { cancelled = true; };
+  });
+
+  const toggle = async () => {
+    const agent = auth.agent;
+    if (!agent || loading || toggling || !repoDid) return;
+    error = null;
+    toggling = true;
+    try {
+      if (subscribed && subRkey) {
+        await deleteSubscription(agent, subRkey);
+        subscribed = false;
+        subRkey = null;
+      } else {
+        subRkey = await createSubscription(agent, repoDid);
+        subscribed = true;
+      }
+    } catch {
+      error = "Failed to update subscription";
+    } finally {
+      toggling = false;
+    }
+  };
+</script>
+
+{#if signedIn}
+  <ButtonGroup>
+    {#if loading}
+      <Button variant="default" size="small" disabled loading aria-label="Loading subscription state" />
+    {:else}
+      <Button
+        variant="default"
+        size="small"
+        icon={subscribed ? EyeOff : Eye}
+        onclick={toggle}
+        loading={toggling}
+        disabled={toggling}
+        aria-label={subscribed ? "Unsubscribe from notifications" : "Subscribe to notifications"}
+      >
+        {subscribed ? "Watching" : "Watch"}
+      </Button>
+    {/if}
+  </ButtonGroup>
+  {#if error}
+    <span class="typography-paragraph-mini text-foreground-danger">{error}</span>
+  {/if}
+{:else}
+  <Button variant="default" size="small" icon={Eye} href={loginHref}>
+    Watch
+  </Button>
+{/if}
diff --git a/web/src/lib/components/repo/issues/IssueForm.svelte b/web/src/lib/components/repo/issues/IssueForm.svelte
index e04d6282..ecc68726 100644
--- a/web/src/lib/components/repo/issues/IssueForm.svelte
+++ b/web/src/lib/components/repo/issues/IssueForm.svelte
@@ -6,6 +6,7 @@
 	import Pencil from "$icon/pencil";
 	import X from "$icon/x";
 	import { putIssue } from "$lib/api/issue";
+	import { createEntitySubscription } from "$lib/api/graph";
 	import { getAuth } from "$lib/auth.svelte";
 	import AccountSelector from "$lib/components/auth/AccountSelector.svelte";
 	import Button from "$lib/components/ui/Button.svelte";
@@ -83,11 +84,19 @@
 			createdAt: createdAt ?? new Date().toISOString()
 		};
 		const saved = await putIssue(agent, targetRkey, record);
+		// auto-subscribe the creator to notifications on this issue (create only)
+		if (mode === "create") {
+			const entityUri = `at://${actingDid}/sh.tangled.repo.issue/${targetRkey}`;
+			createEntitySubscription(agent, entityUri).catch((err) => {
+				console.error("Failed to auto-subscribe to issue:", err);
+			});
+		}
 		onsaved?.(saved);
 	});
 	const canSubmit = $derived(title.trim() !== "" && !save.loading);
 </script>
 
+
 <form onsubmit={save.run} class="flex flex-col gap-4">
 	<div class="flex flex-col gap-1.5">
 		<label for="issue-title" class="typography-paragraph-small text-foreground-default"
diff --git a/web/src/lib/components/repo/issues/IssueThreadView.svelte b/web/src/lib/components/repo/issues/IssueThreadView.svelte
index a23eb301..ab8e5940 100644
--- a/web/src/lib/components/repo/issues/IssueThreadView.svelte
+++ b/web/src/lib/components/repo/issues/IssueThreadView.svelte
@@ -22,7 +22,11 @@
 	import { resolve } from "$app/paths";
 	import Pencil from "$icon/pencil";
 	import Trash2 from "$icon/trash-2";
+	import Eye from "$icon/eye";
+	import EyeOff from "$icon/eye-off";
 	import { createAction } from "$lib/action.svelte";
+	import { createBobbinClient } from "$lib/api/client";
+	import { createEntitySubscription, deleteSubscription, getSubscriptionRkey } from "$lib/api/graph";
 	import { deleteIssue, type IssueRecord } from "$lib/api/issue";
 	import type { RecordView } from "$lib/api/records";
 	import { getAuth } from "$lib/auth.svelte";
@@ -49,6 +53,7 @@
 		comments: CommentThread[];
 		markup: MarkupContext;
 		repo: RepoInfo;
+		bobbinUrl?: string;
 	}
 
 	let props: Props = $props();
@@ -65,6 +70,53 @@
 
 	let editing = $state(false);
 
+	const entityUri = $derived(`at://${issue.authorDid}/sh.tangled.repo.issue/${issue.rkey}`);
+
+	$effect(() => {
+		void notifications.markEntityVisited(entityUri);
+	});
+
+	let subscribed = $state(false);
+	let subLoading = $state(true);
+	let subRkey = $state<string | null>(null);
+	let subError = $state<string | null>(null);
+
+	$effect(() => {
+		const did = auth.currentDid;
+		if (!props.bobbinUrl || !did) { subscribed = false; subRkey = null; subLoading = false; return; }
+		let cancelled = false;
+		subLoading = true;
+		subError = null;
+		const ctx = createBobbinClient({ serviceUrl: props.bobbinUrl });
+		getSubscriptionRkey(ctx, did, entityUri).then((rkey) => {
+			if (cancelled) return;
+			subRkey = rkey;
+			subscribed = !!rkey;
+			subLoading = false;
+		}).catch(() => {
+			if (!cancelled) { subLoading = false; subError = "Could not load subscription state"; }
+		});
+		return () => { cancelled = true; };
+	});
+
+	const toggleSubscription = async () => {
+		const agent = auth.agent;
+		if (!agent) return;
+		subError = null;
+		try {
+			if (subscribed && subRkey) {
+				await deleteSubscription(agent, subRkey);
+				subscribed = false;
+				subRkey = null;
+			} else {
+				subRkey = await createEntitySubscription(agent, entityUri);
+				subscribed = true;
+			}
+		} catch {
+			subError = "Failed to update subscription";
+		}
+	};
+
 	const isAuthor = $derived(auth.hasAccount(issue.authorDid));
 	const issuesBase = $derived(`/${props.repo.ownerHandle}/${props.repo.name}/issues`);
 
@@ -131,6 +183,21 @@
 </svelte:head>
 
 {#snippet issueActions()}
+	{#if auth.currentDid}
+		<button
+			type="button"
+			aria-label={subscribed ? "Unsubscribe from notifications" : "Subscribe to notifications"}
+			class="cursor-pointer text-foreground-subtle hover:text-foreground-default disabled:opacity-50"
+			onclick={toggleSubscription}
+			disabled={subLoading}
+		>
+			{#if subscribed}
+				<EyeOff class="size-3" />
+			{:else}
+				<Eye class="size-3" />
+			{/if}
+		</button>
+	{/if}
 	<button
 		type="button"
 		aria-label="Edit issue"
diff --git a/web/src/lib/components/repo/pulls/PullCompose.svelte b/web/src/lib/components/repo/pulls/PullCompose.svelte
index 63d8ad04..9dee87f2 100644
--- a/web/src/lib/components/repo/pulls/PullCompose.svelte
+++ b/web/src/lib/components/repo/pulls/PullCompose.svelte
@@ -15,6 +15,7 @@
 	import { createBobbinClient } from "$lib/api/client";
 	import { getBranch, getMergeBase } from "$lib/api/knotmirror";
 	import { keepCommit, putPull } from "$lib/api/pull";
+	import { createEntitySubscription } from "$lib/api/graph";
 	import {
 		composeQuery,
 		loadCompose,
@@ -244,7 +245,10 @@
 			createdAt: createdAt as PullRecord["createdAt"]
 		};
 		await putPull(agent, rkey, record);
-
+		// auto-subscribe the creator to notifications on this PR
+		createEntitySubscription(agent, uri).catch((err) => {
+			console.error("Failed to auto-subscribe to pull:", err);
+		});
 		await goto(resolve(base as "/"));
 	});
 
diff --git a/web/src/lib/oauth-client-metadata.json b/web/src/lib/oauth-client-metadata.json
index dc185428..3ba341b4 100644
--- a/web/src/lib/oauth-client-metadata.json
+++ b/web/src/lib/oauth-client-metadata.json
@@ -3,7 +3,7 @@
 	"client_name": "Tangled",
 	"client_uri": "https://tangled.org",
 	"redirect_uris": ["https://tangled.org/oauth/callback"],
-	"scope": "atproto repo:sh.tangled.actor.profile repo:sh.tangled.feed.comment repo:sh.tangled.feed.reaction repo:sh.tangled.feed.star repo:sh.tangled.graph.follow repo:sh.tangled.graph.vouch repo:sh.tangled.knot repo:sh.tangled.knot.member repo:sh.tangled.label.definition repo:sh.tangled.label.op repo:sh.tangled.publicKey repo:sh.tangled.repo repo:sh.tangled.repo.artifact repo:sh.tangled.repo.collaborator repo:sh.tangled.repo.issue repo:sh.tangled.repo.issue.comment repo:sh.tangled.repo.issue.state repo:sh.tangled.repo.pull repo:sh.tangled.repo.pull.comment repo:sh.tangled.repo.pull.status repo:sh.tangled.spindle repo:sh.tangled.spindle.member repo:sh.tangled.string blob:*/* rpc:sh.tangled.graph.listNetworkVouches?aud=* rpc:sh.tangled.knot.addMember?aud=* rpc:sh.tangled.knot.removeMember?aud=* rpc:sh.tangled.ci.triggerPipeline?aud=* rpc:sh.tangled.ci.cancelPipeline?aud=* rpc:sh.tangled.repo.addCollaborator?aud=* rpc:sh.tangled.repo.addSecret?aud=* rpc:sh.tangled.repo.create?aud=* rpc:sh.tangled.repo.delete?aud=* rpc:sh.tangled.repo.deleteBranch?aud=* rpc:sh.tangled.repo.forkStatus?aud=* rpc:sh.tangled.repo.forkSync?aud=* rpc:sh.tangled.repo.hiddenRef?aud=* rpc:sh.tangled.repo.listSecrets?aud=* rpc:sh.tangled.repo.merge?aud=* rpc:sh.tangled.repo.mergeCheck?aud=* rpc:sh.tangled.repo.removeCollaborator?aud=* rpc:sh.tangled.repo.removeSecret?aud=* rpc:sh.tangled.repo.setDefaultBranch?aud=* rpc:org.tangled.temp.notification.getPreferences?aud=* rpc:org.tangled.temp.notification.updatePreferences?aud=* rpc:org.tangled.temp.site.getDomainClaim?aud=* rpc:org.tangled.temp.site.claimDomain?aud=* rpc:org.tangled.temp.site.releaseDomain?aud=* rpc:sh.tangled.git.keepCommit?aud=* rpc:sh.tangled.git.mergeCommit?aud=* rpc:com.atproto.moderation.createReport?aud=*",
+	"scope": "atproto repo:org.tangled.feed.subscription repo:sh.tangled.actor.profile repo:sh.tangled.feed.comment repo:sh.tangled.feed.reaction repo:sh.tangled.feed.star repo:sh.tangled.graph.follow repo:sh.tangled.graph.vouch repo:sh.tangled.knot repo:sh.tangled.knot.member repo:sh.tangled.label.definition repo:sh.tangled.label.op repo:sh.tangled.publicKey repo:sh.tangled.repo repo:sh.tangled.repo.artifact repo:sh.tangled.repo.collaborator repo:sh.tangled.repo.issue repo:sh.tangled.repo.issue.comment repo:sh.tangled.repo.issue.state repo:sh.tangled.repo.pull repo:sh.tangled.repo.pull.comment repo:sh.tangled.repo.pull.status repo:sh.tangled.spindle repo:sh.tangled.spindle.member repo:sh.tangled.string blob:*/* rpc:sh.tangled.graph.listNetworkVouches?aud=* rpc:sh.tangled.knot.addMember?aud=* rpc:sh.tangled.knot.removeMember?aud=* rpc:sh.tangled.ci.triggerPipeline?aud=* rpc:sh.tangled.ci.cancelPipeline?aud=* rpc:sh.tangled.repo.addCollaborator?aud=* rpc:sh.tangled.repo.addSecret?aud=* rpc:sh.tangled.repo.create?aud=* rpc:sh.tangled.repo.delete?aud=* rpc:sh.tangled.repo.deleteBranch?aud=* rpc:sh.tangled.repo.forkStatus?aud=* rpc:sh.tangled.repo.forkSync?aud=* rpc:sh.tangled.repo.hiddenRef?aud=* rpc:sh.tangled.repo.listSecrets?aud=* rpc:sh.tangled.repo.merge?aud=* rpc:sh.tangled.repo.mergeCheck?aud=* rpc:sh.tangled.repo.removeCollaborator?aud=* rpc:sh.tangled.repo.removeSecret?aud=* rpc:sh.tangled.repo.setDefaultBranch?aud=* rpc:org.tangled.temp.notification.getPreferences?aud=* rpc:org.tangled.temp.notification.updatePreferences?aud=* rpc:org.tangled.temp.site.getDomainClaim?aud=* rpc:org.tangled.temp.site.claimDomain?aud=* rpc:org.tangled.temp.site.releaseDomain?aud=* rpc:sh.tangled.git.keepCommit?aud=* rpc:sh.tangled.git.mergeCommit?aud=* rpc:com.atproto.moderation.createReport?aud=*",
 	"grant_types": ["authorization_code", "refresh_token"],
 	"response_types": ["code"],
 	"token_endpoint_auth_method": "none",
diff --git a/web/src/routes/[handle]/[repo]/issues/[aturi]/+page.svelte b/web/src/routes/[handle]/[repo]/issues/[aturi]/+page.svelte
index 0dec8f12..25463f2b 100644
--- a/web/src/routes/[handle]/[repo]/issues/[aturi]/+page.svelte
+++ b/web/src/routes/[handle]/[repo]/issues/[aturi]/+page.svelte
@@ -6,7 +6,7 @@
 	import ErrorAlert from "$lib/components/ui/Error.svelte";
 	import Pending from "$lib/components/ui/Pending.svelte";
 
-	let { data } = $props();
+	let { data }: { data: PageData } = $props();
 </script>
 
 <Pending>
@@ -21,6 +21,7 @@
 			comments={result.comments}
 			markup={result.markup}
 			{repo}
+			bobbinUrl={data.publicConfig?.bobbinUrl}
 		/>
 	{:else if result.kind === "not-found"}
 		<EmptyState message="Issue not found." />
diff --git a/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/+page.svelte b/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/+page.svelte
index 604132ac..1b40c293 100644
--- a/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/+page.svelte
+++ b/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/+page.svelte
@@ -9,7 +9,7 @@
 
 	type LoadedPullViewData = Awaited<ComponentProps<typeof PullViewPage>["data"]>;
 
-	let { data } = $props();
+	let { data }: { data: PageData } = $props();
 
 	const page = $derived(data.page.then((loaded) => ({ ...data, ...loaded })));
 
diff --git a/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte b/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte
index 7ae3b897..9431e9ba 100644
--- a/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte
+++ b/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte
@@ -2,13 +2,15 @@
 	import { goto } from "$app/navigation";
 	import { resolve } from "$app/paths";
 	import { now as tidNow } from "@atcute/tid";
-	import Bell from "$icon/bell";
+	import Eye from "$icon/eye";
+	import EyeOff from "$icon/eye-off";
 	import Workflow from "$icon/workflow";
 	import IterationCcw from "$icon/iteration-ccw";
 	import PanelRightClose from "$icon/panel-right-close";
 	import MessagesSquare from "$icon/messages-square";
 	import Circle from "$icon/circle";
 	import { createBobbinClient } from "$lib/api/client";
+	import { createEntitySubscription, deleteSubscription, getSubscriptionRkey } from "$lib/api/graph";
 	import { putComment, type CommentRecord } from "$lib/api/comment";
 	import { mergeCheck } from "$lib/api/gitmirror";
 	import {
@@ -73,6 +75,55 @@
 
 	const pullState = $derived(pull.state);
 	const head = $derived(pull.versions.at(-1)?.head);
+
+	const entityUri = $derived(`at://${pull.author.did}/sh.tangled.repo.pull/${pull.rkey}`);
+
+	$effect(() => {
+		void notifications.markEntityVisited(entityUri);
+	});
+
+	let subscribed = $state(false);
+	let subLoading = $state(true);
+	let subRkey = $state<string | null>(null);
+	let subError = $state<string | null>(null);
+
+	$effect(() => {
+		const bobbinUrl = data.publicConfig?.bobbinUrl;
+		const did = auth.currentDid;
+		if (!bobbinUrl || !did) { subscribed = false; subRkey = null; subLoading = false; return; }
+		let cancelled = false;
+		subLoading = true;
+		subError = null;
+		const ctx = createBobbinClient({ serviceUrl: bobbinUrl });
+		getSubscriptionRkey(ctx, did, entityUri).then((rkey) => {
+			if (cancelled) return;
+			subRkey = rkey;
+			subscribed = !!rkey;
+			subLoading = false;
+		}).catch(() => {
+			if (!cancelled) { subLoading = false; subError = "Could not load subscription state"; }
+		});
+		return () => { cancelled = true; };
+	});
+
+	const toggleSubscription = async () => {
+		const agent = auth.agent;
+		if (!agent) return;
+		subError = null;
+		try {
+			if (subscribed && subRkey) {
+				await deleteSubscription(agent, subRkey);
+				subscribed = false;
+				subRkey = null;
+			} else {
+				subRkey = await createEntitySubscription(agent, entityUri);
+				subscribed = true;
+			}
+		} catch {
+			subError = "Failed to update subscription";
+		}
+	};
+
 	const check = createLoad(async () => {
 		if (pullState !== "open" || !data.repo.repoDid || !head) return undefined;
 		const mirror = createBobbinClient({
@@ -220,6 +271,10 @@
 			embed,
 			createdAt
 		});
+		// auto-subscribe the commenter to notifications on this PR
+		createEntitySubscription(agent, data.uri).catch((err) => {
+			console.error("Failed to auto-subscribe via PR comment:", err);
+		});
 		comments = [
 			...comments,
 			{
@@ -386,10 +441,21 @@
 				{#snippet extraActions()}
 					<Dropdown variant="button" align="right" label="Subscribe">
 						{#snippet trigger()}
-							<Bell class="size-4" />
+							<Eye class="size-4" />
 							<span>Subscribe</span>
 						{/snippet}
-						<div class="p-2 debug-border">todo: subscribe menu</div>
+						<button
+							type="button"
+							aria-label={subscribed ? "Unsubscribe from notifications" : "Subscribe to notifications"}
+							class="cursor-pointer rounded px-2 py-1 text-sm hover:bg-background-subtle"
+							onclick={toggleSubscription}
+						>
+							{#if subscribed}
+								<EyeOff class="size-4" /> Unsubscribe
+							{:else}
+								<Eye class="size-4" /> Subscribe
+							{/if}
+						</button>
 					</Dropdown>
 					{#if !discussionOpen}
 						<Button icon={Circle} onclick={() => (discussionOpen = true)} />
-- 
2.51.2