@shipfox/client-logs 4.0.0 → 6.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-logs",
   "license": "MIT",
-  "version": "4.0.0",
+  "version": "6.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -10,9 +10,6 @@
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "imports": {
-    "#*": "./dist/*"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -21,15 +18,18 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.17",
-    "@shipfox/api-logs-dto": "5.0.0",
-    "@shipfox/client-api": "4.0.0",
-    "@shipfox/react-ui": "0.3.5"
+    "@shipfox/api-logs-dto": "9.0.1",
+    "@shipfox/react-ui": "0.3.6",
+    "@shipfox/client-api": "6.0.1"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
+  "imports": {
+    "#*": "./dist/*"
+  },
   "scripts": {
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",

package/src/components/agent-session-rows.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import type {SessionViewRow, SessionViewRowMeta} from '@shipfox/api-logs-dto';
 import {Icon} from '@shipfox/react-ui/icon';
 import {
   LogContent,
@@ -12,6 +11,7 @@ import {
 import {Tooltip, TooltipContent, TooltipTrigger} from '@shipfox/react-ui/tooltip';
 import {cn} from '@shipfox/react-ui/utils';
 import {Fragment, useState} from 'react';
+import type {SessionViewRow, SessionViewRowMeta} from '#core/log-model.js';
 
 const PREVIEW_CHAR_LIMIT = 1200;
 const WORD_SUMMARY_CHAR_LIMIT = 5000;

package/src/components/log-group.stories.tsx

@@ -13,8 +13,8 @@ const groupStart = (groupId: string, name: string): GroupStartLogRecord => ({
   v: 1,
   ts: at(0),
   type: 'group_start',
-  group_id: groupId,
-  parent_group_id: null,
+  groupId,
+  parentGroupId: null,
   name,
 });
 

package/src/components/log-view.stories.tsx

@@ -1,5 +1,5 @@
-import type {LogRecord, SessionViewRow} from '@shipfox/api-logs-dto';
 import type {Meta, StoryObj} from '@storybook/react';
+import type {LogRecord, SessionViewRow} from '#core/log-model.js';
 import {LogView, LogViewSkeleton} from './log-view.js';
 
 const ESC = String.fromCharCode(27);
@@ -28,15 +28,15 @@ const groupStart = (
   v: 1,
   ts: at(offset),
   type: 'group_start',
-  group_id: groupId,
-  parent_group_id: parentGroupId,
+  groupId,
+  parentGroupId,
   name,
 });
 const groupEnd = (groupId: string, offset: number): LogRecord => ({
   v: 1,
   ts: at(offset),
   type: 'group_end',
-  group_id: groupId,
+  groupId,
 });
 
 const showcaseRecords: LogRecord[] = [
@@ -53,8 +53,8 @@ const showcaseRecords: LogRecord[] = [
   out('running 42 tests\n', 10),
   out('FAIL client.test.ts > retries on 503\n', 11, 'stderr'),
   groupEnd('g3', 12),
-  {v: 1, ts: at(13), type: 'gap', dropped_bytes: 2048},
-  {v: 1, ts: at(14), type: 'end', total_bytes: 15_360},
+  {v: 1, ts: at(13), type: 'gap', droppedBytes: 2048},
+  {v: 1, ts: at(14), type: 'end', totalBytes: 15_360},
 ];
 
 // A pipeline nested three levels deep: Deploy > Build > Compile, and Deploy >
@@ -85,7 +85,7 @@ const nestedRecords: LogRecord[] = [
   groupEnd('g7', 14),
   groupEnd('g5', 14.5),
   groupEnd('g1', 15),
-  {v: 1, ts: at(15.2), type: 'end', total_bytes: 9_216},
+  {v: 1, ts: at(15.2), type: 'end', totalBytes: 9_216},
 ];
 
 const unifiedAgentRecords: LogRecord[] = [
@@ -155,7 +155,7 @@ const unifiedAgentRecords: LogRecord[] = [
     },
     4,
   ),
-  {v: 1, ts: at(5), type: 'end', total_bytes: 4096},
+  {v: 1, ts: at(5), type: 'end', totalBytes: 4096},
 ];
 
 const awaitingAgentRecords: LogRecord[] = [
@@ -415,7 +415,7 @@ const allAgentSessionTypeRecords: LogRecord[] = [
     16,
   ),
   session({kind: 'raw', timestamp: 0, label: 'Malformed session entry', raw: '{not-json'}, 17),
-  {v: 1, ts: at(20), type: 'end', total_bytes: 12_288},
+  {v: 1, ts: at(20), type: 'end', totalBytes: 12_288},
 ];
 
 const meta = {
@@ -483,7 +483,7 @@ export const MinimalOutput: Story = {
   args: {showLineNumbers: true},
   render: (args) => (
     <div className="max-w-3xl">
-      <LogView {...args} records={[{v: 1, ts: at(1), type: 'end', total_bytes: 0}]} />
+      <LogView {...args} records={[{v: 1, ts: at(1), type: 'end', totalBytes: 0}]} />
     </div>
   ),
 };

package/src/components/log-view.test.tsx

@@ -1,5 +1,5 @@
-import type {LogRecord} from '@shipfox/api-logs-dto';
 import {fireEvent, render, screen, waitFor} from '@testing-library/react';
+import type {LogRecord} from '#core/log-model.js';
 import {LogView, LogViewSkeleton} from './log-view.js';
 
 const ts = new Date('2026-06-23T10:00:00.000Z').getTime();
@@ -58,7 +58,7 @@ describe('LogView', () => {
   });
 
   test('renders no-output copy before the end marker for an end-marker-only stream', () => {
-    render(<LogView records={[{v: 1, ts, type: 'end', total_bytes: 0}]} />);
+    render(<LogView records={[{v: 1, ts, type: 'end', totalBytes: 0}]} />);
 
     expect(screen.getByText('Step produced no output')).toBeDefined();
     expect(screen.getByText('End of log')).toBeDefined();
@@ -67,7 +67,7 @@ describe('LogView', () => {
 
   test.each([
     {record: {v: 1, ts, type: 'runner_lost'} as const, label: 'Runner disconnected'},
-    {record: {v: 1, ts, type: 'gap', dropped_bytes: 2048} as const, label: 'Output missing'},
+    {record: {v: 1, ts, type: 'gap', droppedBytes: 2048} as const, label: 'Output missing'},
     {record: {v: 1, ts, type: 'capped'} as const, label: 'Log size limit reached'},
   ])('does not show no-output copy for a $record.type marker-only stream', ({record, label}) => {
     render(<LogView records={[record]} />);

package/src/components/log-view.tsx

@@ -1,10 +1,10 @@
 'use client';
 
-import type {LogRecord} from '@shipfox/api-logs-dto';
 import {Icon} from '@shipfox/react-ui/icon';
 import {LogContent, LogRow, LogRows, type LogTimestampMode} from '@shipfox/react-ui/log';
 import {Skeleton} from '@shipfox/react-ui/skeleton';
 import {type ReactNode, type UIEventHandler, useEffect, useMemo, useRef} from 'react';
+import type {LogRecord} from '#core/log-model.js';
 import {
   assertNever,
   buildLogTree,

package/src/components/system-markers.stories.tsx

@@ -19,7 +19,7 @@ export const Playground: Story = {
     <div className="max-w-3xl">
       <LogRows>
         <EndMarker
-          record={{v: 1, ts, type: 'end', total_bytes: 15_360}}
+          record={{v: 1, ts, type: 'end', totalBytes: 15_360}}
           lineCount={412}
           durationMs={2100}
         />
@@ -32,11 +32,11 @@ export const Variants: Story = {
   render: () => (
     <div className="max-w-3xl">
       <LogRows>
-        <GapMarker record={{v: 1, ts, type: 'gap', dropped_bytes: 2048}} />
+        <GapMarker record={{v: 1, ts, type: 'gap', droppedBytes: 2048}} />
         <CappedMarker record={{v: 1, ts, type: 'capped'}} />
         <RunnerLostMarker record={{v: 1, ts, type: 'runner_lost'}} />
         <EndMarker
-          record={{v: 1, ts, type: 'end', total_bytes: 15_360}}
+          record={{v: 1, ts, type: 'end', totalBytes: 15_360}}
           lineCount={412}
           durationMs={2100}
         />

package/src/components/system-markers.tsx

@@ -93,7 +93,7 @@ export interface EndMarkerProps {
 export function EndMarker({record, lineCount, durationMs = null}: EndMarkerProps) {
   const meta = [
     `${lineCount} ${lineCount === 1 ? 'line' : 'lines'}`,
-    formatBytes(record.total_bytes),
+    formatBytes(record.totalBytes),
     ...(durationMs != null ? [formatDuration(durationMs)] : []),
   ].join(' · ');
 
@@ -111,7 +111,7 @@ export function GapMarker({record}: {record: GapLogRecord}) {
       icon="errorWarningLine"
       tone="warning"
       timestamp={new Date(record.ts)}
-      detail={`the runner fell behind and dropped ${formatBytes(record.dropped_bytes)}`}
+      detail={`the runner fell behind and dropped ${formatBytes(record.droppedBytes)}`}
     >
       Output missing
     </LogMarkerRow>

package/src/core/log-model.ts

@@ -0,0 +1,76 @@
+export interface SessionViewRowMeta {
+  label: string;
+  value: string;
+  inline?: boolean | undefined;
+}
+
+export type SessionViewRow =
+  | {
+      kind: 'message';
+      timestamp: number;
+      role: string;
+      label: string;
+      meta: readonly SessionViewRowMeta[];
+      text: string;
+      terminalFailure: boolean;
+    }
+  | {kind: 'thinking'; timestamp: number; text: string}
+  | {kind: 'tool-call'; timestamp: number; id: string | null; name: string; input: string}
+  | {
+      kind: 'tool-result';
+      timestamp: number;
+      toolCallId: string | null;
+      toolName: string;
+      output: string;
+      isError: boolean;
+    }
+  | {
+      kind: 'lifecycle';
+      timestamp: number;
+      label: string;
+      detail: string | null;
+      meta: readonly SessionViewRowMeta[];
+      tone: 'default' | 'warning' | 'error';
+      terminalFailure: boolean;
+    }
+  | {kind: 'raw'; timestamp: number; label: string; raw: string};
+
+interface LogRecordBase {
+  v: 1;
+  ts: number;
+}
+
+export type LogRecord =
+  | (LogRecordBase & {type: 'output'; stream: 'stdout' | 'stderr'; data: string})
+  | (LogRecordBase & {
+      type: 'group_start';
+      groupId: string;
+      parentGroupId: string | null;
+      name: string;
+    })
+  | (LogRecordBase & {type: 'group_end'; groupId: string})
+  | (LogRecordBase & {type: 'end'; totalBytes: number})
+  | (LogRecordBase & {type: 'gap'; droppedBytes: number})
+  | (LogRecordBase & {type: 'agent_session'; row: SessionViewRow})
+  | (LogRecordBase & {type: 'capped'})
+  | (LogRecordBase & {type: 'runner_lost'});
+
+export type LogSource = 'inline' | 'presigned';
+export type LogState = 'open' | 'closed' | 'compacted';
+
+export interface InlineLogRead {
+  mode: 'inline';
+  ndjson: string;
+  nextCursor: number;
+  hasMore: boolean;
+  state: 'open' | 'closed';
+  truncated: boolean;
+}
+
+export interface PresignedLogRead {
+  mode: 'presigned';
+  url: string;
+  expiresAt: string;
+  totalBytes: number;
+  truncated: boolean;
+}

package/src/core/log-read.test.ts

@@ -1,7 +1,6 @@
-import type {LogRecord, ReadLogsResponseDto} from '@shipfox/api-logs-dto';
+import type {InlineLogRead, LogRecord, PresignedLogRead} from './log-model.js';
 import {
   mergeLogRead,
-  parseLogNdjson,
   STEP_LOG_DRAIN_REFETCH_MS,
   STEP_LOG_LIVE_REFETCH_MS,
   type StepLogSnapshot,
@@ -16,75 +15,27 @@ const output = (data: string, ts = 1): LogRecord => ({
   data,
 });
 
-const line = (record: LogRecord): string => `${JSON.stringify(record)}\n`;
-const inline = (params: {
-  ndjson: string;
-  nextCursor?: number;
-  hasMore?: boolean;
-  state?: 'open' | 'closed';
-  truncated?: boolean;
-}): Extract<ReadLogsResponseDto, {mode: 'inline'}> => ({
+const inline = (params: Partial<InlineLogRead> = {}): InlineLogRead => ({
   mode: 'inline',
-  ndjson: params.ndjson,
-  next_cursor: params.nextCursor ?? 1,
-  has_more: params.hasMore ?? false,
-  state: params.state ?? 'open',
-  truncated: params.truncated ?? false,
+  ndjson: '',
+  nextCursor: 1,
+  hasMore: false,
+  state: 'open',
+  truncated: false,
+  ...params,
 });
 
-const presigned = (
-  params: Partial<Extract<ReadLogsResponseDto, {mode: 'presigned'}>> = {},
-): Extract<ReadLogsResponseDto, {mode: 'presigned'}> => ({
+const presigned = (params: Partial<PresignedLogRead> = {}): PresignedLogRead => ({
   mode: 'presigned',
-  url: params.url ?? 'https://storage.example.test/logs/object?sig=1',
-  state: params.state ?? 'closed',
-  expires_at: params.expires_at ?? '2026-06-23T10:00:00.000Z',
-  total_bytes: params.total_bytes ?? 128,
-  truncated: params.truncated ?? false,
-});
-
-describe('parseLogNdjson', () => {
-  test('returns an empty record list for an empty body', () => {
-    const records = parseLogNdjson('');
-
-    expect(records).toEqual([]);
-  });
-
-  test('parses multiple record lines', () => {
-    const first = output('first\n', 1);
-    const second = output('second\n', 2);
-
-    const records = parseLogNdjson(line(first) + line(second));
-
-    expect(records).toEqual([first, second]);
-  });
-
-  test('throws when a line is not a valid log record', () => {
-    const parse = () => parseLogNdjson('{"v":1,"ts":1,"type":"nope"}\n');
-
-    expect(parse).toThrow();
-  });
-
-  test('splits records on CRLF line breaks', () => {
-    const first = output('first\n', 1);
-    const second = output('second\n', 2);
-
-    const records = parseLogNdjson(`${JSON.stringify(first)}\r\n${JSON.stringify(second)}\r\n`);
-
-    expect(records).toEqual([first, second]);
-  });
-
-  test('skips blank lines between records', () => {
-    const record = output('only\n', 1);
-
-    const records = parseLogNdjson(`\n${line(record)}\n`);
-
-    expect(records).toEqual([record]);
-  });
+  url: 'https://storage.example.test/logs/object?sig=1',
+  expiresAt: '2026-06-23T10:00:00.000Z',
+  totalBytes: 128,
+  truncated: false,
+  ...params,
 });
 
 describe('mergeLogRead', () => {
-  test('appends inline records and advances the cursor', () => {
+  test('appends validated inline records and advances the cursor', () => {
     const previous: StepLogSnapshot = {
       records: [output('old\n', 1)],
       nextCursor: 3,
@@ -96,9 +47,12 @@ describe('mergeLogRead', () => {
       totalBytes: null,
       expiresAt: null,
     };
-    const response = inline({ndjson: line(output('new\n', 2)), nextCursor: 4, hasMore: true});
 
-    const snapshot = mergeLogRead(previous, {mode: 'inline', response});
+    const snapshot = mergeLogRead(previous, {
+      mode: 'inline',
+      response: inline({nextCursor: 4, hasMore: true}),
+      records: [output('new\n', 2)],
+    });
 
     expect(snapshot.records).toEqual([output('old\n', 1), output('new\n', 2)]);
     expect(snapshot.nextCursor).toBe(4);
@@ -106,7 +60,7 @@ describe('mergeLogRead', () => {
     expect(snapshot.complete).toBe(false);
   });
 
-  test('preserves records on an empty open inline page', () => {
+  test('does not advance the cursor when no validated records are supplied', () => {
     const previous: StepLogSnapshot = {
       records: [output('old\n', 1)],
       nextCursor: 3,
@@ -118,58 +72,45 @@ describe('mergeLogRead', () => {
       totalBytes: null,
       expiresAt: null,
     };
-    const response = inline({ndjson: '', nextCursor: 3, state: 'open'});
 
-    const snapshot = mergeLogRead(previous, {mode: 'inline', response});
+    const snapshot = mergeLogRead(previous, {
+      mode: 'inline',
+      response: inline({nextCursor: 3}),
+      records: [],
+    });
 
     expect(snapshot.records).toEqual(previous.records);
     expect(snapshot.nextCursor).toBe(3);
-    expect(snapshot.state).toBe('open');
-    expect(snapshot.complete).toBe(false);
-  });
-
-  test('marks a closed drained inline stream complete', () => {
-    const response = inline({ndjson: line(output('done\n')), state: 'closed', hasMore: false});
-
-    const snapshot = mergeLogRead(undefined, {mode: 'inline', response});
-
-    expect(snapshot.records).toEqual([output('done\n')]);
-    expect(snapshot.state).toBe('closed');
-    expect(snapshot.complete).toBe(true);
-    expect(snapshot.hasMore).toBe(false);
   });
 
-  test('replaces partial inline records with the compacted object records', () => {
-    const previous: StepLogSnapshot = {
-      records: [output('partial\n', 1)],
-      nextCursor: 2,
-      source: 'inline',
-      state: 'closed',
-      complete: false,
-      hasMore: true,
-      truncated: false,
-      totalBytes: null,
-      expiresAt: null,
-    };
-    const response = presigned({
-      expires_at: '2026-06-23T10:00:00.000Z',
-      total_bytes: 256,
+  test('replaces partial inline records with compacted records', () => {
+    const snapshot = mergeLogRead(
+      {
+        records: [output('partial\n', 1)],
+        nextCursor: 2,
+        source: 'inline',
+        state: 'closed',
+        complete: false,
+        hasMore: true,
+        truncated: false,
+        totalBytes: null,
+        expiresAt: null,
+      },
+      {
+        mode: 'presigned',
+        response: presigned({totalBytes: 256, truncated: true}),
+        records: [output('full\n', 2)],
+      },
+    );
+
+    expect(snapshot).toMatchObject({
+      records: [output('full\n', 2)],
+      source: 'presigned',
+      state: 'compacted',
+      complete: true,
+      totalBytes: 256,
       truncated: true,
     });
-
-    const snapshot = mergeLogRead(previous, {
-      mode: 'presigned',
-      response,
-      ndjson: line(output('full\n', 2)),
-    });
-
-    expect(snapshot.records).toEqual([output('full\n', 2)]);
-    expect(snapshot.source).toBe('presigned');
-    expect(snapshot.state).toBe('compacted');
-    expect(snapshot.complete).toBe(true);
-    expect(snapshot.totalBytes).toBe(256);
-    expect(snapshot.expiresAt).toBe('2026-06-23T10:00:00.000Z');
-    expect(snapshot.truncated).toBe(true);
   });
 });
 
@@ -187,33 +128,11 @@ describe('stepLogRefetchInterval', () => {
     ...overrides,
   });
 
-  test('does not poll before the first snapshot', () => {
-    const interval = stepLogRefetchInterval(undefined);
-
-    expect(interval).toBe(false);
-  });
-
-  test('polls quickly while draining buffered inline pages', () => {
-    const interval = stepLogRefetchInterval(snapshot({hasMore: true}));
-
-    expect(interval).toBe(STEP_LOG_DRAIN_REFETCH_MS);
-  });
-
-  test('polls at live-tail cadence for an open drained stream', () => {
-    const interval = stepLogRefetchInterval(snapshot({state: 'open', hasMore: false}));
-
-    expect(interval).toBe(STEP_LOG_LIVE_REFETCH_MS);
-  });
-
-  test('stops polling once the stream is complete', () => {
-    const interval = stepLogRefetchInterval(snapshot({state: 'closed', complete: true}));
-
-    expect(interval).toBe(false);
-  });
-
-  test('stops polling after a fetch errors out instead of re-polling the dead cursor', () => {
-    const interval = stepLogRefetchInterval(snapshot({hasMore: true}), true);
-
-    expect(interval).toBe(false);
+  test('keeps drain, live-tail, terminal, and error polling policies', () => {
+    expect(stepLogRefetchInterval(undefined)).toBe(false);
+    expect(stepLogRefetchInterval(snapshot({hasMore: true}))).toBe(STEP_LOG_DRAIN_REFETCH_MS);
+    expect(stepLogRefetchInterval(snapshot({}))).toBe(STEP_LOG_LIVE_REFETCH_MS);
+    expect(stepLogRefetchInterval(snapshot({complete: true}))).toBe(false);
+    expect(stepLogRefetchInterval(snapshot({}), true)).toBe(false);
   });
 });

package/src/core/log-read.ts

@@ -1,18 +1,13 @@
-import {type LogRecord, parseLogRecordLine, type ReadLogsResponseDto} from '@shipfox/api-logs-dto';
+import type {InlineLogRead, LogRecord, LogSource, LogState, PresignedLogRead} from './log-model.js';
 
 export const STEP_LOG_DRAIN_REFETCH_MS = 250;
 export const STEP_LOG_LIVE_REFETCH_MS = 2_000;
 
-const NDJSON_LINE_BREAK = /\r?\n/;
-
-type InlineReadLogsResponse = Extract<ReadLogsResponseDto, {mode: 'inline'}>;
-type PresignedReadLogsResponse = Extract<ReadLogsResponseDto, {mode: 'presigned'}>;
-
 export interface StepLogSnapshot {
   records: LogRecord[];
   nextCursor: number;
-  source: 'inline' | 'presigned';
-  state: 'open' | 'closed' | 'compacted';
+  source: LogSource;
+  state: LogState;
   complete: boolean;
   hasMore: boolean;
   truncated: boolean;
@@ -21,15 +16,8 @@ export interface StepLogSnapshot {
 }
 
 export type ResolvedStepLogRead =
-  | {mode: 'inline'; response: InlineReadLogsResponse}
-  | {mode: 'presigned'; response: PresignedReadLogsResponse; ndjson: string};
-
-export function parseLogNdjson(ndjson: string): LogRecord[] {
-  return ndjson
-    .split(NDJSON_LINE_BREAK)
-    .filter((line) => line.length > 0)
-    .map(parseLogRecordLine);
-}
+  | {mode: 'inline'; response: InlineLogRead; records: readonly LogRecord[]}
+  | {mode: 'presigned'; response: PresignedLogRead; records: readonly LogRecord[]};
 
 export function mergeLogRead(
   previous: StepLogSnapshot | undefined,
@@ -37,28 +25,27 @@ export function mergeLogRead(
 ): StepLogSnapshot {
   if (read.mode === 'presigned') {
     return {
-      records: parseLogNdjson(read.ndjson),
+      records: [...read.records],
       nextCursor: 0,
       source: 'presigned',
       state: 'compacted',
       complete: true,
       hasMore: false,
       truncated: read.response.truncated,
-      totalBytes: read.response.total_bytes,
-      expiresAt: read.response.expires_at,
+      totalBytes: read.response.totalBytes,
+      expiresAt: read.response.expiresAt,
     };
   }
 
-  const records = parseLogNdjson(read.response.ndjson);
-  const complete = read.response.state === 'closed' && !read.response.has_more;
+  const complete = read.response.state === 'closed' && !read.response.hasMore;
 
   return {
-    records: [...(previous?.records ?? []), ...records],
-    nextCursor: read.response.next_cursor,
+    records: [...(previous?.records ?? []), ...read.records],
+    nextCursor: read.response.nextCursor,
     source: 'inline',
     state: read.response.state,
     complete,
-    hasMore: read.response.has_more,
+    hasMore: read.response.hasMore,
     truncated: read.response.truncated,
     totalBytes: null,
     expiresAt: null,