@shipfox/api-logs 10.0.0 → 10.2.0

package/src/core/session/claude-parser.ts

@@ -1,10 +1,14 @@
-import type {SessionViewRow} from '@shipfox/api-logs-dto';
+import type {SessionViewRow, SessionViewToolCallRow} from '@shipfox/api-logs-dto';
 import {z} from 'zod';
 import {
   assistantRows,
+  authStatusRow,
+  flushPendingToolRows,
   PURE_PROGRESS_CLAUDE_SYSTEM_SUBTYPES,
+  rateLimitRow,
   resultRow,
   systemRow,
+  toolUseSummary,
   userRows,
 } from './claude/rows.js';
 import {stringField} from './object.js';
@@ -21,10 +25,25 @@ export interface ClaudeParseContext {
   hasInit: boolean;
   sessionId: string | null;
   turn: number;
+  pendingToolRows: SessionViewRow[];
+  toolCallRows: Map<string, SessionViewToolCallRow>;
 }
 
-export function createClaudeParseContext(): ClaudeParseContext {
-  return {hasInit: false, sessionId: null, turn: 0};
+export function createClaudeParseContext(
+  pendingToolRows: readonly SessionViewRow[] = [],
+  state: Pick<ClaudeParseContext, 'hasInit' | 'sessionId' | 'turn'> = {
+    hasInit: false,
+    sessionId: null,
+    turn: 0,
+  },
+): ClaudeParseContext {
+  const rows = [...pendingToolRows];
+  const toolCallRows = new Map<string, SessionViewToolCallRow>();
+  for (const row of rows) {
+    if (row.kind === 'tool-call' && row.id !== null) toolCallRows.set(row.id, row);
+  }
+
+  return {...state, pendingToolRows: rows, toolCallRows};
 }
 
 export function claudeInitSessionId(record: AgentSessionRecord): string | undefined {
@@ -58,11 +77,13 @@ export function parseClaudeSessionRecord(
   try {
     json = JSON.parse(record.data);
   } catch {
-    return [rawRecordRow(record, 'Malformed session entry')];
+    return [...flushPendingToolRows(context), rawRecordRow(record, 'Malformed session entry')];
   }
 
   const parsed = claudeMessageSchema.safeParse(json);
-  if (!parsed.success) return [rawRecordRow(record, 'Unsupported Claude message')];
+  if (!parsed.success) {
+    return [...flushPendingToolRows(context), rawRecordRow(record, 'Unsupported Claude message')];
+  }
 
   const message = parsed.data;
   if (
@@ -75,15 +96,43 @@ export function parseClaudeSessionRecord(
 
   switch (message.type) {
     case 'system':
+      if (stringField(message, 'subtype') === 'init') {
+        return [...flushPendingToolRows(context), systemRow(record.ts, message, context)];
+      }
+      return deferRow(context, systemRow(record.ts, message, context));
     case 'init':
-      return [systemRow(record.ts, message, context)];
+      return [...flushPendingToolRows(context), systemRow(record.ts, message, context)];
+    case 'tool_progress':
+    case 'prompt_suggestion':
+      // These messages describe an already-emitted tool call or an interactive client state.
+      // They have no standalone row representation and must not look like parser failures.
+      return [];
+    case 'tool_use_summary':
+      return toolUseSummary(message, context) ? flushPendingToolRows(context) : [];
+    case 'auth_status':
+      return deferRow(context, authStatusRow(record.ts, message));
+    case 'rate_limit_event':
+      return deferRow(context, rateLimitRow(record.ts, message));
     case 'assistant':
-      return assistantRows(record.ts, message);
+      return [...flushPendingToolRows(context), ...assistantRows(record.ts, message, context)];
     case 'user':
-      return userRows(record.ts, message);
+      return userRows(record.ts, message, context);
     case 'result':
-      return [resultRow(record.ts, message, context.turn, isFinalResult)];
+      return [
+        ...flushPendingToolRows(context),
+        resultRow(record.ts, message, context.turn, isFinalResult),
+      ];
     default:
-      return [rawRecordRow(record, `Unknown Claude message: ${message.type}`)];
+      return [
+        ...flushPendingToolRows(context),
+        rawRecordRow(record, `Unknown Claude message: ${message.type}`),
+      ];
   }
 }
+
+function deferRow(context: ClaudeParseContext, row: SessionViewRow): readonly SessionViewRow[] {
+  if (context.toolCallRows.size === 0) return [row];
+
+  context.pendingToolRows.push(row);
+  return [];
+}

package/src/db/schema/attempt-streams.ts

@@ -1,4 +1,4 @@
-import type {SessionViewLifecycleRow} from '@shipfox/api-logs-dto';
+import type {SessionViewLifecycleRow, SessionViewRow} from '@shipfox/api-logs-dto';
 import {uuidv7PrimaryKey} from '@shipfox/node-drizzle';
 import {sql} from 'drizzle-orm';
 import {
@@ -55,6 +55,7 @@ export const attemptStreams = pgTable(
     claudeSessionId: text('claude_session_id'),
     claudeTurn: integer('claude_turn').notNull().default(0),
     claudePendingResult: jsonb('claude_pending_result').$type<SessionViewLifecycleRow>(),
+    claudePendingToolRows: jsonb('claude_pending_tool_rows').$type<SessionViewRow[]>(),
     truncated: boolean('truncated').notNull().default(false),
     objectKey: text('object_key'),
     createdAt: timestamp('created_at', {withTimezone: true}).notNull().defaultNow(),
@@ -107,6 +108,7 @@ export function toAttemptStream(row: AttemptStreamDb): AttemptStream {
     claudeSessionId: row.claudeSessionId,
     claudeTurn: row.claudeTurn,
     claudePendingResult: row.claudePendingResult ?? null,
+    claudePendingToolRows: row.claudePendingToolRows ?? [],
     truncated: row.truncated,
     objectKey: row.objectKey,
     createdAt: row.createdAt,

package/src/db/streams.ts

@@ -1,4 +1,4 @@
-import type {SessionViewLifecycleRow} from '@shipfox/api-logs-dto';
+import type {SessionViewLifecycleRow, SessionViewRow} from '@shipfox/api-logs-dto';
 import {and, asc, eq, getTableColumns, isNull, lt, notInArray, sql} from 'drizzle-orm';
 import type {AttemptStream, StreamCloseReason} from '#core/entities/attempt-stream.js';
 import {LeaseStreamMismatchError} from '#core/errors.js';
@@ -169,6 +169,7 @@ export async function setClaudeParseContext(
     sessionId: string | null;
     turn: number;
     pendingResult: SessionViewLifecycleRow | null;
+    pendingToolRows: readonly SessionViewRow[];
   },
 ): Promise<void> {
   await tx
@@ -178,6 +179,7 @@ export async function setClaudeParseContext(
       claudeSessionId: params.sessionId,
       claudeTurn: params.turn,
       claudePendingResult: params.pendingResult,
+      claudePendingToolRows: [...params.pendingToolRows],
       updatedAt: sql`now()`,
     })
     .where(eq(attemptStreams.id, params.streamId));
@@ -193,7 +195,11 @@ export async function setClaudeParseContext(
 export async function markStreamClosed(
   tx: Transaction,
   params: {streamId: string; reason: StreamCloseReason; markTruncated: boolean},
-): Promise<{stream: AttemptStream; pendingClaudeResult: SessionViewLifecycleRow | null} | null> {
+): Promise<{
+  stream: AttemptStream;
+  pendingClaudeResult: SessionViewLifecycleRow | null;
+  pendingClaudeToolRows: SessionViewRow[];
+} | null> {
   const [open] = await tx
     .select()
     .from(attemptStreams)
@@ -209,6 +215,7 @@ export async function markStreamClosed(
       closedAt: sql`now()`,
       updatedAt: sql`now()`,
       claudePendingResult: null,
+      claudePendingToolRows: null,
       ...(params.markTruncated ? {truncated: true} : {}),
     })
     .where(and(eq(attemptStreams.id, params.streamId), eq(attemptStreams.state, 'open')))
@@ -218,6 +225,7 @@ export async function markStreamClosed(
     ? {
         stream: toAttemptStream(row),
         pendingClaudeResult: open.claudePendingResult ?? null,
+        pendingClaudeToolRows: open.claudePendingToolRows ?? [],
       }
     : null;
 }

package/test/fixtures/claude-session/agent-step.jsonl

@@ -0,0 +1,12 @@
+{"type":"system","subtype":"init","apiKeySource":"user","claude_code_version":"1.0.0","cwd":"/workspace","tools":["Read","Bash"],"mcp_servers":[],"model":"claude-sonnet-4-20250514","permissionMode":"default","slash_commands":[],"output_style":"default","skills":[],"plugins":[],"uuid":"init-1","session_id":"session-1"}
+{"type":"assistant","message":{"id":"msg-1","type":"message","role":"assistant","model":"claude-sonnet-4-20250514","content":[{"type":"text","text":"I will inspect the repository."},{"type":"tool_use","id":"toolu-1","name":"Read","input":{"file_path":"README.md"}}],"stop_reason":"tool_use","stop_sequence":null,"usage":{"input_tokens":100,"output_tokens":20}},"parent_tool_use_id":null,"uuid":"assistant-1","session_id":"session-1"}
+{"type":"user","message":{"role":"user","content":[{"type":"tool_result","tool_use_id":"toolu-1","content":[{"type":"text","text":"# Shipfox\n"}],"is_error":false}]},"parent_tool_use_id":null,"uuid":"user-1","session_id":"session-1"}
+{"type":"system","subtype":"permission_denied","tool_name":"mcp__shipfox_outputs__set_output","tool_use_id":"toolu-2","decision_reason_type":"mode","decision_reason":"Permission mode","message":"Permission denied","uuid":"permission-1","session_id":"session-1"}
+{"type":"system","subtype":"api_retry","attempt":2,"max_retries":3,"retry_delay_ms":1500,"error_status":429,"error":"rate_limit","uuid":"retry-1","session_id":"session-1"}
+{"type":"system","subtype":"hook_response","hook_id":"hook-1","hook_name":"PreToolUse","hook_event":"PreToolUse","output":"Hook completed","stdout":"","stderr":"","exit_code":0,"outcome":"success","uuid":"hook-1","session_id":"session-1"}
+{"type":"system","subtype":"compact_boundary","compact_metadata":{"trigger":"auto","pre_tokens":12000,"post_tokens":4000,"duration_ms":250},"uuid":"compact-1","session_id":"session-1"}
+{"type":"result","subtype":"success","is_error":false,"result":"First turn response","duration_ms":1200,"duration_api_ms":900,"num_turns":1,"total_cost_usd":0.0042,"uuid":"result-1","session_id":"session-1"}
+{"type":"system","subtype":"init","apiKeySource":"user","claude_code_version":"1.0.0","cwd":"/workspace","tools":["Read","Bash"],"mcp_servers":[],"model":"claude-sonnet-4-20250514","permissionMode":"default","slash_commands":[],"output_style":"default","skills":[],"plugins":[],"uuid":"init-2","session_id":"session-1"}
+{"type":"user","message":{"role":"user","content":"The previous turn ended without setting required workflow outputs: answer. Call set_output for each missing key, then provide your final response."},"parent_tool_use_id":null,"isSynthetic":true,"uuid":"user-2","session_id":"session-1"}
+{"type":"assistant","message":{"id":"msg-2","type":"message","role":"assistant","model":"claude-sonnet-4-20250514","content":[{"type":"text","text":"The answer is ready."}],"stop_reason":"end_turn","stop_sequence":null,"usage":{"input_tokens":120,"output_tokens":8}},"parent_tool_use_id":null,"uuid":"assistant-2","session_id":"session-1"}
+{"type":"result","subtype":"success","is_error":false,"result":"Final response","duration_ms":800,"duration_api_ms":600,"num_turns":1,"total_cost_usd":0.0021,"uuid":"result-2","session_id":"session-1"}

package/test/fixtures/claude-session/sdk-system-subtypes.json

@@ -0,0 +1,32 @@
+{
+  "package": "@anthropic-ai/claude-agent-sdk",
+  "version": "0.3.200",
+  "subtypes": [
+    "api_retry",
+    "commands_changed",
+    "compact_boundary",
+    "elicitation_complete",
+    "files_persisted",
+    "hook_progress",
+    "hook_response",
+    "hook_started",
+    "informational",
+    "init",
+    "local_command_output",
+    "memory_recall",
+    "mirror_error",
+    "model_refusal_fallback",
+    "model_refusal_no_fallback",
+    "notification",
+    "permission_denied",
+    "plugin_install",
+    "session_state_changed",
+    "status",
+    "task_notification",
+    "task_progress",
+    "task_started",
+    "task_updated",
+    "thinking_tokens",
+    "worker_shutting_down"
+  ]
+}

package/test/fixtures/claude-session.ts

@@ -0,0 +1,45 @@
+import {readFileSync} from 'node:fs';
+import type {AgentSessionRecord} from '#core/session/session-record.js';
+
+export interface ClaudeSystemSubtypeFixture {
+  package: string;
+  version: string;
+  subtypes: string[];
+}
+
+const SDK_ENTRY_URL = import.meta.resolve('@anthropic-ai/claude-agent-sdk');
+const SDK_TYPES_URL = new URL('./sdk.d.ts', SDK_ENTRY_URL);
+
+export function readClaudeSessionFixture(name: string): AgentSessionRecord[] {
+  const contents = readFileSync(
+    new URL(`./claude-session/${name}`, import.meta.url),
+    'utf8',
+  ).trim();
+
+  return contents.split('\n').map((data, index) => ({data, ts: index + 1}));
+}
+
+export function readClaudeSystemSubtypeFixture(): ClaudeSystemSubtypeFixture {
+  const contents = readFileSync(
+    new URL('./claude-session/sdk-system-subtypes.json', import.meta.url),
+    'utf8',
+  );
+  return JSON.parse(contents) as ClaudeSystemSubtypeFixture;
+}
+
+export function readInstalledClaudeSdkVersion(): string {
+  const contents = readFileSync(new URL('./package.json', SDK_TYPES_URL), 'utf8');
+  const packageJson = JSON.parse(contents) as {version?: unknown};
+  if (typeof packageJson.version !== 'string') {
+    throw new Error('The installed Claude SDK package has no version');
+  }
+  return packageJson.version;
+}
+
+export function readInstalledClaudeSystemSubtypes(): string[] {
+  const declaration = readFileSync(SDK_TYPES_URL, 'utf8');
+  return [...declaration.matchAll(/type: 'system';\s+subtype: '([^']+)'/g)]
+    .map((match) => match[1])
+    .filter((subtype): subtype is string => subtype !== undefined)
+    .sort();
+}