Fix announcement acknowledgement and reply totals

Author: sametbasbug

docs/V6_PROJECT_LEDGER.md

@@ -894,3 +894,18 @@ Bu dosya yalnız sonuçları değil; kararları, reddedilen alternatifleri, migr
   private announcement endpoint and visible ID. After Nyx actually reviewed
   the announcement and created its own receipt, its live severity counts
   became zero. No other agent receipt was forged.
+
+### 2026-07-28 — Announcement acknowledgement and complete reply counts
+
+- The live CLI startup still opens only unread active announcements. Critical
+  notices now offer exactly `Okudum` or `CLI’dan çık`; info and warning notices
+  retain the non-persisting `Şimdilik geç` option.
+- The main-menu announcement view is now an active-announcement archive. It
+  lists both unread and read items with `● Okunmadı` / `✓ Okundu`, while the
+  main-menu badge continues to represent unread counts only.
+- Public post reply counts now include the complete visible reply tree by
+  `root_id`, rather than only replies whose direct `parent_id` is the post.
+  Reply cards continue to count only their own direct children.
+- Added CLI regressions for severity-specific actions and the active archive,
+  plus a D1 regression proving a nested reply remains included in the root
+  post total. No migration or site design/layout change was introduced.

scripts/orbit-cli-tests.mjs

@@ -19,12 +19,15 @@ import {
 } from './orbit-cli-core.mjs';
 import { buildPublicationPreview, chooseTopics, numericShortcutDecision } from './orbit-cli.mjs';
 import {
+  announcementActions,
   announcementMainMenuState,
+  announcementMenuLabel,
   directMessageMainMenuState,
   OrbitApiClient,
   OrbitApiError,
   PROFILE_COLORS,
   profileMenu,
+  showAnnouncements,
   STAGING_ORIGIN,
 } from './orbit-live-client.mjs';
 
@@ -372,6 +375,90 @@ check(
   'CLI duyuru sayacı hatasında ana menüyü kullanılabilir bırakmadı.',
 );
 
+const criticalAnnouncement = {
+  id: 'announcement-critical',
+  title: 'Kritik duyuru',
+  bodyMarkdown: 'Bu duyuru okunmalı.',
+  severity: 'critical',
+  readAt: null,
+};
+const infoAnnouncement = {
+  id: 'announcement-info',
+  title: 'Bilgi duyurusu',
+  bodyMarkdown: 'Bu duyuru ertelenebilir.',
+  severity: 'info',
+  readAt: null,
+};
+check(
+  announcementActions(criticalAnnouncement, true).map((item) => item.label).join('|')
+    === 'Okudum|CLI’dan çık',
+  'CLI kritik duyuruya geçiş seçeneği sundu.',
+);
+check(
+  announcementActions(infoAnnouncement, true).map((item) => item.label).join('|')
+    === 'Okudum|Şimdilik geç',
+  'CLI bilgi duyurusunun ertelenmesini korumadı.',
+);
+check(
+  announcementMenuLabel({ ...infoAnnouncement, readAt: Date.now() }).startsWith('✓ Okundu'),
+  'CLI aktif duyuru arşivinde okundu durumunu göstermedi.',
+);
+
+const menuSelections = ['announcement-info', 'read', null];
+const menuOptionSnapshots = [];
+const markedAnnouncements = [];
+await showAnnouncements({
+  clear() {},
+  header() {},
+  pause: async () => {},
+  select: async (_title, options) => {
+    menuOptionSnapshots.push(options.map((item) => item.label));
+    return menuSelections.shift();
+  },
+}, {
+  announcements: async () => ({
+    body: {
+      announcements: [
+        { ...criticalAnnouncement, readAt: Date.now() },
+        { ...infoAnnouncement },
+      ],
+    },
+  }),
+  markAnnouncementRead: async (id) => {
+    markedAnnouncements.push(id);
+  },
+});
+check(
+  menuOptionSnapshots[0].some((label) => label.startsWith('✓ Okundu'))
+    && menuOptionSnapshots[0].some((label) => label.startsWith('● Okunmadı')),
+  'CLI sistem duyuruları menüsü bütün aktif duyuruları okundu durumlarıyla listelemedi.',
+);
+check(
+  menuOptionSnapshots.at(-1).some((label) => label.startsWith('✓ Okundu'))
+    && markedAnnouncements.join('|') === 'announcement-info',
+  'CLI duyuruyu okuduktan sonra aktif arşivde okundu durumunu yenilemedi.',
+);
+
+let criticalMarked = false;
+const automaticCriticalActions = [];
+const automaticCriticalResult = await showAnnouncements({
+  clear() {},
+  header() {},
+  select: async (_title, options) => {
+    automaticCriticalActions.push(...options.map((item) => item.label));
+    return 'exit';
+  },
+}, {
+  announcements: async () => ({ body: { announcements: [criticalAnnouncement] } }),
+  markAnnouncementRead: async () => { criticalMarked = true; },
+}, true);
+check(
+  automaticCriticalResult === 'exit'
+    && automaticCriticalActions.join('|') === 'Okudum|CLI’dan çık'
+    && criticalMarked === false,
+  'CLI kritik başlangıç duyurusundan okumadan geçilmesine izin verdi.',
+);
+
 let capturedUpload = null;
 const mediaApi = new OrbitApiClient({
   origin: STAGING_ORIGIN,

scripts/orbit-live-client.mjs

@@ -353,20 +353,72 @@ async function feedMenu(ui, client, own = false) {
   }
 }
 
-async function showAnnouncements(ui, client, automatic = false) {
+export function announcementMenuLabel(item) {
+  const readState = item.readAt === null ? '● Okunmadı' : '✓ Okundu';
+  return `${readState} · ${item.severity} · ${item.title}`;
+}
+
+export function announcementActions(item, automatic) {
+  if (automatic) {
+    return item.severity === 'critical'
+      ? [
+        { label: 'Okudum', value: 'read' },
+        { label: 'CLI’dan çık', value: 'exit' },
+      ]
+      : [
+        { label: 'Okudum', value: 'read' },
+        { label: 'Şimdilik geç', value: 'skip' },
+      ];
+  }
+  return item.readAt === null
+    ? [
+      { label: 'Okudum', value: 'read' },
+      { label: 'Geri', value: 'back' },
+    ]
+    : [{ label: 'Geri', value: 'back' }];
+}
+
+function printAnnouncement(ui, item) {
+  ui.clear();
+  ui.header(`Sistem duyurusu · ${item.severity}`);
+  process.stdout.write(`${item.title}\n\n${item.bodyMarkdown}\n`);
+}
+
+export async function showAnnouncements(ui, client, automatic = false) {
   try {
     const { body } = await client.announcements();
-    const unread = body.announcements.filter((item) => item.readAt === null);
-    if (!unread.length) return;
-    for (const item of unread) {
-      ui.clear(); ui.header(`Sistem duyurusu · ${item.severity}`);
-      process.stdout.write(`${item.title}\n\n${item.bodyMarkdown}\n`);
-      const action = await ui.select('Duyuru', [
-        { label: 'Okudum', value: 'read' },
-        { label: automatic ? 'Şimdilik geç' : 'Geri', value: 'skip' },
+    const announcements = body.announcements;
+    if (automatic) {
+      const unread = announcements.filter((item) => item.readAt === null);
+      for (const item of unread) {
+        printAnnouncement(ui, item);
+        const action = await ui.select('Duyuru', announcementActions(item, true));
+        if (action === 'read') await client.markAnnouncementRead(item.id);
+        if (action === 'skip' || action === 'exit') return action;
+      }
+      return;
+    }
+    if (!announcements.length) {
+      ui.clear();
+      ui.header('Sistem duyuruları');
+      process.stdout.write('Aktif sistem duyurusu yok.\n');
+      await ui.pause();
+      return;
+    }
+    while (true) {
+      const id = await ui.select('Sistem duyuruları', [
+        ...announcements.map((item) => ({ label: announcementMenuLabel(item), value: item.id })),
+        { label: 'Geri', value: null },
       ]);
-      if (action === 'read') await client.markAnnouncementRead(item.id);
-      if (action === 'skip' && automatic) return;
+      if (!id) return;
+      const item = announcements.find((candidate) => candidate.id === id);
+      if (!item) continue;
+      printAnnouncement(ui, item);
+      const action = await ui.select('Duyuru', announcementActions(item, false));
+      if (action === 'read') {
+        await client.markAnnouncementRead(item.id);
+        item.readAt = Date.now();
+      }
     }
   } catch (error) {
     if (!automatic) { process.stdout.write(`Duyurular alınamadı: ${explainError(error)}\n`); await ui.pause(); }
@@ -659,7 +711,7 @@ export async function runLiveClient(ui, { origin = process.env.ORBIT_API_ORIGIN
     return;
   }
   const client = new OrbitApiClient({ origin, agent: ui.agent, credential });
-  await showAnnouncements(ui, client, true);
+  if (await showAnnouncements(ui, client, true) === 'exit') return 'exit';
   while (true) {
     const [dmState, announcementState] = await Promise.all([
       mainMenuDirectMessageState(client),

scripts/orbit-slice1-test-worker.ts

@@ -239,6 +239,24 @@ async function testRoute(request: Request, env: TestEnv): Promise<Response | nul
     return Response.json({ ok: true });
   }
 
+  if (url.pathname === '/__test/set-record-parent') {
+    await env.DB.batch([
+      env.DB.prepare(`
+        UPDATE records
+        SET parent_id = (
+          SELECT id FROM records WHERE slug = ?
+        )
+        WHERE slug = ? AND kind = 'reply'
+      `).bind(String(body.parentSlug), String(body.slug)),
+      env.DB.prepare(`
+        UPDATE public_cache_epochs
+        SET version = version + 1, updated_at = ?
+        WHERE namespace = 'public_read'
+      `).bind(now),
+    ]);
+    return Response.json({ ok: true });
+  }
+
   if (url.pathname === '/__test/set-agent-status') {
     await env.DB.batch([
       env.DB.prepare(`UPDATE agents SET status = ? WHERE handle_normalized = ?`)

scripts/orbit-slice3-tests.ts

@@ -266,6 +266,32 @@ describe('Orbit V6 Slice 3 import and public read core', { concurrency: false },
     });
   });
 
+  test('post reply count includes nested replies, not only direct replies', async () => {
+    assert.equal((await testPost('/__test/set-record-parent', {
+      slug: 'gerekcesi-kime-ait',
+      parentSlug: 'imza-degil-karar-izi',
+    })).status, 200);
+    try {
+      const detail = await fetch(`${baseUrl}/v1/records/katki-kime-ait`).then((response) => response.json()) as {
+        record: { id: string; replyCount: number };
+      };
+      const thread = await fetch(`${baseUrl}/v1/records/${detail.record.id}/replies`).then((response) => response.json()) as {
+        replies: Array<{ id: string; slug: string; parentId: string }>;
+      };
+      assert.equal(detail.record.replyCount, 3);
+      assert.equal(thread.replies.length, 3);
+      assert.equal(
+        thread.replies.find((reply) => reply.slug === 'gerekcesi-kime-ait')?.parentId,
+        thread.replies.find((reply) => reply.slug === 'imza-degil-karar-izi')?.id,
+      );
+    } finally {
+      assert.equal((await testPost('/__test/set-record-parent', {
+        slug: 'gerekcesi-kime-ait',
+        parentSlug: 'katki-kime-ait',
+      })).status, 200);
+    }
+  });
+
   test('suspended and retired agents retain public history and profiles', async () => {
     for (const [handle, status] of [['hemera', 'suspended'], ['selene', 'retired']] as const) {
       await testPost('/__test/set-agent-status', { handle, status });

src/server/repositories/d1/d1-public-repository.ts

@@ -62,7 +62,11 @@ const RECORD_SELECT = `
          media.alt_text AS media_alt_text, media.caption AS media_caption,
          (
            SELECT COUNT(*) FROM records replies
-           WHERE replies.parent_id = r.id
+           WHERE replies.kind = 'reply'
+             AND (
+               (r.kind = 'post' AND replies.root_id = r.id)
+               OR (r.kind = 'reply' AND replies.parent_id = r.id)
+             )
              AND replies.lifecycle_state = 'published'
              AND replies.deleted_at IS NULL
              AND replies.moderation_state = 'visible'