@@ -0,0 +1,12 @@
+---
+'@object-ui/plugin-detail': patch
+---
+
+fix(record page): one action reads as one timeline row, and every row of the timeline panel names who acted
+
+Clause-②: no
+Metadata-protocol: none
+
+- **One row per action.** When one action wrote both an activity row and an audit-log entry (same record, matching kind: create and created, update and updated, delete and deleted; same actor; stamped within `TIMELINE_PAIR_WINDOW_MS`, 5 seconds), the record page's timeline draws it once: the activity row keeps its actor and summary and shows the field changes, before and after, on the same row. A reader who cannot read the audit log sees the same single row without them. The Changes chip, and the panel's `changes_only`, still show each audit entry on its own. Rows that pair with nothing draw as before.
+- **The 动态 panel's peek rows name the actor**, beside the time.
+- The record page's 动态 count still comes from the server's `timeline` count, which the spec defines as an upper bound: for a record created with field history on it can still read one more than the rows drawn.
@@ -819,7 +819,9 @@ newest entries and 「查看全部 N 条 →」, which opens the stream in full
 All / Activity / Discussion chips, a Changes chip while the record shows its
 field history (the host's `RecordFieldHistoryContext`; it holds the audit's
 field changes with their before and after values, and every activity event,
-`created` and `updated` included, sits under Activity), and paging
+`created` and `updated` included, sits under Activity; one action that wrote
+both an activity row and an audit entry is one row, its before and after values
+on it), and paging
 (`?related=timeline`) — then each related list in the reader's arrangement, then Approvals and
 Attachments. The reader's ⊟ (`rightColumn`) takes the right column out of the
 two-column tiers; there is no tabbed tier.
 
@@ -44,8 +44,9 @@ import { useDetailTranslation } from './useDetailTranslation';
 import { foldFeedItems, type ActivityTimelineEntry } from './renderers/recordActivityFeed';
 import {
   TIMELINE_STREAM_FILTERS,
+  fieldHistoryEntriesOf,
+  fieldHistoryOf,
   filterTimelineStream,
-  isFieldHistoryEntry,
   isSystemStreamEntry,
   type TimelineStreamFilter,
 } from './recordTimelineStream';
@@ -288,7 +289,7 @@ function filterItems(items: FeedItem[], mode: FeedFilterMode): FeedItem[] {
     // The stream's 变更 rule (objectstack#30074, ruling C): the audit's field
     // changes only, so the panel and the stream agree on what a change is.
     case 'changes_only':
-      return items.filter(isFieldHistoryEntry);
+      return fieldHistoryEntriesOf(items);
     case 'tasks_only':
       return items.filter((i) => i.type === 'task');
     default:
@@ -583,15 +584,21 @@ export const RecordActivityTimeline: React.FC<RecordActivityTimelineProps> = ({
   // same function when expanded (objectstack#25959).
   // objectstack#27055 — a system entry of the stream: ONE muted line, the
   // change itself, then who and when. 「状态 新建 → 已联系 · Dev Admin · 昨天」.
+  const changesText = (item: FeedItem): string =>
+    (item.fieldChanges ?? [])
+      .map((change) => {
+        const label = change.fieldLabel || labelOfField(change.field);
+        const from = change.oldDisplayValue ?? (change.oldValue == null ? '' : String(change.oldValue));
+        const to = change.newDisplayValue ?? (change.newValue == null ? '' : String(change.newValue));
+        return `${label} ${from || '—'} → ${to || '—'}`;
+      })
+      .join('; ');
+  // An activity row paired with its audit entry (objectstack#30122) reads as
+  // its own summary; the before and after values sit on the same row.
   const systemLineText = (item: FeedItem): string => {
-    const changes = (item.fieldChanges ?? []).map((change) => {
-      const label = change.fieldLabel || labelOfField(change.field);
-      const from = change.oldDisplayValue ?? (change.oldValue == null ? '' : String(change.oldValue));
-      const to = change.newDisplayValue ?? (change.newValue == null ? '' : String(change.newValue));
-      return `${label} ${from || '—'} → ${to || '—'}`;
-    });
-    return changes.length > 0
-      ? changes.join('; ')
+    const changes = fieldHistoryOf(item) ? '' : changesText(item);
+    return changes
+      ? changes
       : item.body && item.body.trim()
         ? item.body
         : item.changedFields && item.changedFields.length > 0
@@ -603,6 +610,7 @@ export const RecordActivityTimeline: React.FC<RecordActivityTimelineProps> = ({
   const renderSystemLine = (item: FeedItem): React.ReactNode => {
     const Icon = FEED_TYPE_ICONS[item.type] || Zap;
     const what = systemLineText(item);
+    const paired = fieldHistoryOf(item);
     return (
       <div key={item.id} className="flex items-start gap-2 py-0.5 text-xs text-muted-foreground" data-stream-system-row="">
         <span className="z-10 flex h-8 w-8 shrink-0 items-center justify-center">
@@ -614,6 +622,11 @@ export const RecordActivityTimeline: React.FC<RecordActivityTimelineProps> = ({
           <span>{item.actor}</span>
           <span aria-hidden>{' · '}</span>
           <span>{formatTimestamp(item.createdAt, t, displayLocale)}</span>
+          {paired && (
+            <span className="block text-foreground/70" data-stream-change-diff="">
+              {changesText(paired)}
+            </span>
+          )}
         </p>
       </div>
     );
@@ -877,6 +890,10 @@ export const RecordActivityTimeline: React.FC<RecordActivityTimelineProps> = ({
         >
           <Icon className="h-3.5 w-3.5 shrink-0 text-muted-foreground" aria-hidden />
           <span className="min-w-0 flex-1 truncate">{what}</span>
+          {/* Every row says who (objectstack#30122). */}
+          <span className="max-w-[40%] shrink-0 truncate text-[11.5px] text-muted-foreground" data-record-timeline-peek-actor="">
+            {item.actor}
+          </span>
           <span className="shrink-0 text-[11.5px] text-muted-foreground tabular-nums">{when}</span>
         </div>
       );
 
@@ -26,6 +26,8 @@ import {
   mergeTimelineStream,
   RecordFieldChangesContext,
   RecordFieldHistoryContext,
+  TIMELINE_PAIR_WINDOW_MS,
+  fieldHistoryOf,
 } from '../recordTimelineStream';
 import { RecordActivityTimeline } from '../RecordActivityTimeline';
 import { RecordActivityRenderer } from '../renderers/record-activity';
@@ -246,3 +248,108 @@ describe('an activity row sits under 活动 whatever the history flag; 变更 ho
     expect(screen.queryByText('Logged a call')).toBeNull();
   });
 });
+
+describe('one action, one row: an activity row carries its audit entry (objectstack#30122)', () => {
+  const at = (ms: number) => new Date(Date.UTC(2026, 10, 1, 9, 0, 0) + ms).toISOString();
+  const activityRow = (id: string, activityType: string, ms: number, actorId: string | null = 'u1', actor = 'Dev Admin') =>
+    ({ id, type: 'field_change', actor, body: `Activity ${id}`, createdAt: at(ms), activityType, actorId }) as FeedItem;
+  const auditOf = (id: number, action: string, ms: number, user_id: string | null = 'u1', user_name = 'Dev Admin') =>
+    auditEntriesToFeedItems(
+      [{ id, action, created_at: at(ms), user_id, user_name, changes: [{ field: 'company', label: 'Company', from: 'Old Co', to: `New Co ${id}` }] }],
+      { unknownUser: 'Unknown' },
+    );
+
+  it('a create: the activity `created` row and the audit `create` entry are one row, the diff on it', () => {
+    const stream = mergeTimelineStream([activityRow('a1', 'created', 0)], auditOf(1, 'create', 200));
+    expect(stream.map((i) => i.id)).toEqual(['a1']);
+    expect(fieldHistoryOf(stream[0])?.id).toBe('audit:1');
+    // Ruling C: 变更 still shows the audit entry on its own; 活动 the activity row.
+    expect(filterTimelineStream(stream, 'changes').map((i) => i.id)).toEqual(['audit:1']);
+    expect(filterTimelineStream(stream, 'activity').map((i) => i.id)).toEqual(['a1']);
+  });
+
+  it('an update: the activity `updated` row and the audit `update` entry are one row', () => {
+    const stream = mergeTimelineStream([activityRow('a2', 'updated', 1000)], auditOf(2, 'update', 1000));
+    expect(stream.map((i) => i.id)).toEqual(['a2']);
+    expect(fieldHistoryOf(stream[0])?.fieldChanges?.[0]).toMatchObject({ field: 'company', newDisplayValue: 'New Co 2' });
+  });
+
+  it('unpaired rows draw as before: an audit entry with no activity row, an activity row with no audit entry', () => {
+    const stream = mergeTimelineStream([activityRow('a3', 'created', 0)], auditOf(3, 'update', 60_000));
+    expect(stream.map((i) => i.id)).toEqual(['audit:3', 'a3']);
+    expect(stream.every((i) => fieldHistoryOf(i) === undefined)).toBe(true);
+  });
+
+  it('different actors do not pair', () => {
+    const stream = mergeTimelineStream([activityRow('a4', 'created', 0, 'u1')], auditOf(4, 'create', 100, 'u2', 'Other'));
+    expect(stream.map((i) => i.id).sort()).toEqual(['a4', 'audit:4']);
+  });
+
+  it(`outside the ${TIMELINE_PAIR_WINDOW_MS} ms window does not pair; at its edge it does`, () => {
+    const outside = mergeTimelineStream([activityRow('a5', 'created', 0)], auditOf(5, 'create', TIMELINE_PAIR_WINDOW_MS + 1));
+    expect(outside.map((i) => i.id).sort()).toEqual(['a5', 'audit:5']);
+    const edge = mergeTimelineStream([activityRow('a6', 'created', 0)], auditOf(6, 'create', TIMELINE_PAIR_WINDOW_MS));
+    expect(edge.map((i) => i.id)).toEqual(['a6']);
+  });
+
+  it('a different action kind does not pair, and a row pairs once (nearest in time)', () => {
+    const kinds = mergeTimelineStream([activityRow('a7', 'created', 0)], auditOf(7, 'delete', 0));
+    expect(kinds.map((i) => i.id).sort()).toEqual(['a7', 'audit:7']);
+    const twice = mergeTimelineStream(
+      [activityRow('a8', 'created', 0)],
+      [...auditOf(8, 'create', 1500), ...auditOf(9, 'create', 300)],
+    );
+    expect(twice.map((i) => i.id).sort()).toEqual(['a8', 'audit:8']);
+    expect(fieldHistoryOf(twice.find((i) => i.id === 'a8')!)?.id).toBe('audit:9');
+  });
+
+  it('the system on both sides (no user id) pairs by name', () => {
+    const stream = mergeTimelineStream([activityRow('a10', 'updated', 0, null, 'System')], auditOf(10, 'update', 50, null, 'System'));
+    expect(stream.map((i) => i.id)).toEqual(['a10']);
+  });
+
+  const page = (fieldChanges: FeedItem[] | null) => (
+    <DefaultRecordPageContext.Provider value>
+      <DiscussionContextProvider items={[activityRow('r1', 'created', 0)] as any[]} loading={false}>
+        <RecordFieldChangesContext.Provider value={fieldChanges}>
+          <RecordActivityRenderer schema={{ type: 'record:activity', showCompleted: true } as any} />
+        </RecordFieldChangesContext.Provider>
+      </DiscussionContextProvider>
+    </DefaultRecordPageContext.Provider>
+  );
+
+  it('an audit reader sees ONE row: the summary, who, and the diff on it', () => {
+    const { container } = render(page(auditOf(11, 'create', 100)));
+    const rows = container.querySelectorAll('[data-stream-system-row]');
+    expect(rows).toHaveLength(1);
+    expect(rows[0].querySelector('[data-stream-change]')?.textContent).toBe('Activity r1');
+    expect(rows[0].textContent).toContain('Dev Admin');
+    expect(rows[0].querySelector('[data-stream-change-diff]')?.textContent).toBe('Company Old Co → New Co 11');
+  });
+
+  it('a reader without the audit log sees the same ONE row, without a diff', () => {
+    const { container } = render(page(null));
+    const rows = container.querySelectorAll('[data-stream-system-row]');
+    expect(rows).toHaveLength(1);
+    expect(rows[0].querySelector('[data-stream-change]')?.textContent).toBe('Activity r1');
+    expect(rows[0].querySelector('[data-stream-change-diff]')).toBeNull();
+  });
+
+  it('变更 shows the audit diff on its own row (ruling C)', () => {
+    const { container } = render(page(auditOf(12, 'create', 100)));
+    fireEvent.click(container.querySelector('[data-stream-filter="changes"]')!);
+    const rows = container.querySelectorAll('[data-stream-system-row]');
+    expect(rows).toHaveLength(1);
+    expect(rows[0].querySelector('[data-stream-change]')?.textContent).toBe('Company Old Co → New Co 12');
+    expect(rows[0].querySelector('[data-stream-change-diff]')).toBeNull();
+  });
+
+  it('every peek row says who', () => {
+    const { container } = render(
+      <RecordActivityTimeline items={[comment, activityRow('p1', 'created', 0)]} variant="peek" />,
+    );
+    const actors = Array.from(container.querySelectorAll('[data-record-timeline-peek-actor]')).map((e) => e.textContent);
+    expect(actors).toEqual(expect.arrayContaining(['Ada', 'Dev Admin']));
+    expect(container.querySelectorAll('[data-record-timeline-peek-row]')).toHaveLength(2);
+  });
+});