Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): prevent duplicate pet notifications

JeffreyDeng-specd199e7e28c42
diff --git a/src/web/src/components/home-pet/cloud-code-monster-pet.test.ts b/src/web/src/components/home-pet/cloud-code-monster-pet.test.ts
index 6c0f6ab86..f4c02c254 100644
--- a/src/web/src/components/home-pet/cloud-code-monster-pet.test.ts
+++ b/src/web/src/components/home-pet/cloud-code-monster-pet.test.ts
@@ -611,6 +611,7 @@ describe("production workspace PET mounting", () => {
expect(workspacePetLayer).toContain("dynamic<CloudCodeMonsterPetProps>");
expect(inboxCountContext).toContain("notificationToken");
expect(inboxCountContext).toContain("setNotificationToken((token) => token + 1)");
+ expect(inboxCountContext).not.toContain("prevCountRef.current = next");
expect(workspacePetLayer).toContain("useInboxCount");
expect(workspacePetLayer).toContain("notificationToken={notificationToken}");
expect(petComponent).toContain("const EMPTY_PEEK_TARGETS");
@@ -621,6 +622,9 @@ describe("production workspace PET mounting", () => {
expect(petComponent).toContain("setPetTimer(\"peek\"");
expect(petComponent).toContain("usePetDrag({");
expect(petComponent).toContain("useInboxCount");
+ expect(petComponent).toContain("lastNotificationTokenRef");
+ expect(petComponent).toContain("notificationToken === lastNotificationTokenRef.current");
+ expect(petComponent).toContain("isDragging || fainted || notificationActive");
expect(petComponent).toContain("useWalkToTarget");
expect(petComponent).toContain("useAgentContextSafe");
expect(petComponent).toContain("activeTaskDetails");
diff --git a/src/web/src/components/home-pet/cloud-code-monster-pet.tsx b/src/web/src/components/home-pet/cloud-code-monster-pet.tsx
index b1d299fd0..b824d669c 100644
--- a/src/web/src/components/home-pet/cloud-code-monster-pet.tsx
+++ b/src/web/src/components/home-pet/cloud-code-monster-pet.tsx
@@ -361,6 +361,7 @@ export function CloudCodeMonsterPet({
const [cursorPose, setCursorPose] =
useState<CloudCodeMonsterCursorPose>(EMPTY_CURSOR_POSE);
const [footprints, setFootprints] = useState<Footprint[]>([]);
+ const lastNotificationTokenRef = useRef(0);
const lastFootstepAtRef = useRef(0);
const autoWalkVelocityRef = useRef<PetPoint | null>(null);
const nextFootprintIdRef = useRef(1);
@@ -967,7 +968,7 @@ export function CloudCodeMonsterPet({
}, [clearPetTimer]);
useEffect(() => {
- if (isDragging || fainted) {
+ if (isDragging || fainted || notificationActive) {
return;
}
@@ -1001,6 +1002,7 @@ export function CloudCodeMonsterPet({
fainted,
isDragging,
isUserTyping,
+ notificationActive,
setPetTimer,
setPlatformActivity,
stopTemporaryMotion,
@@ -1076,9 +1078,13 @@ export function CloudCodeMonsterPet({
}, [setPetTimer]);
useEffect(() => {
- if (notificationToken <= 0) {
+ if (
+ notificationToken <= 0 ||
+ notificationToken === lastNotificationTokenRef.current
+ ) {
return;
}
+ lastNotificationTokenRef.current = notificationToken;
stopTemporaryMotion();
const showNotification = () => {
diff --git a/src/web/src/contexts/inbox-count-context.tsx b/src/web/src/contexts/inbox-count-context.tsx
index 7b7e102c4..a6f312089 100644
--- a/src/web/src/contexts/inbox-count-context.tsx
+++ b/src/web/src/contexts/inbox-count-context.tsx
@@ -67,9 +67,7 @@ export function InboxCountProvider({ children }: { children: ReactNode }) {
const decrement = useCallback(() => {
setCount((c) => {
- const next = Math.max(0, c - 1);
- prevCountRef.current = next;
- return next;
+ return Math.max(0, c - 1);
});
}, []);