@puredesktop/puredesktop-ui-bridge 1.0.0-beta.1 → 2.1.0

package/src/agents/runtime/agentRunEventTypes.ts

@@ -1,115 +1,115 @@
-import type { PlatformAgentMessage } from '../../bridge/agentTypes.js'
-import type { PlatformAgentRunUsage } from '../../bridge/agentTypes.js'
-import type { AgentUiRunState } from '../../components/agents/agentTypes.js'
-import type { AgentUiToolCall } from '../../components/agents/agentTypes.js'
-
-/** Vendor-agnostic run events — matches main → shell streaming payloads. */
-export const AgentRunEventType = {
-  TurnStarted: 'turn_started',
-  ThinkingDelta: 'thinking_delta',
-  TextDelta: 'text_delta',
-  ToolCallStarted: 'tool_call_started',
-  ToolCallArgsDelta: 'tool_call_args_delta',
-  ToolCallDone: 'tool_call_done',
-  TurnEnded: 'turn_ended',
-  ToolExecStarted: 'tool_exec_started',
-  ToolExecEnded: 'tool_exec_ended',
-  StateChanged: 'state_changed',
-  UsageUpdated: 'usage_updated',
-  ContextCompactionStarted: 'context_compaction_started',
-  ContextCompactionCompleted: 'context_compaction_completed',
-  Error: 'error',
-} as const
-
-export type AgentRunEventTypeName =
-  (typeof AgentRunEventType)[keyof typeof AgentRunEventType]
-
-export interface AgentUsageTurnDelta {
-  inputTokens: number
-  outputTokens: number
-  totalTokens?: number
-}
-
-interface AgentRunEventBase {
-  runId: string
-  seq: number
-  type: string
-}
-
-export interface PlatformAgentRunSnapshotEvent {
-  runId: string
-  state: AgentUiRunState
-  turn: number
-  messages: PlatformAgentMessage[]
-  error?: string
-  interruptedReason?: string
-  effectiveModelId?: string
-  routingTier?: 'low' | 'high'
-  usage?: PlatformAgentRunUsage
-}
-
-/** Bridge + shell IPC event payloads consumed by the live reducer. */
-export type PlatformAgentRunEventPayload =
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.TurnStarted
-      turn: number
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ThinkingDelta
-      delta: string
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.TextDelta
-      delta: string
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ToolCallStarted
-      toolCallId: string
-      name: string
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ToolCallArgsDelta
-      toolCallId: string
-      delta: string
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ToolCallDone
-      toolCall: AgentUiToolCall
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.TurnEnded
-      toolCallCount: number
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.UsageUpdated
-      usage: AgentUsageTurnDelta
-      estimated?: boolean
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ContextCompactionStarted
-      archivedMessageCount: number
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ContextCompactionCompleted
-      activeFromIndex: number
-      summaryChars: number
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ToolExecStarted
-      toolCallId: string
-      name: string
-      arguments: Record<string, unknown>
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.ToolExecEnded
-      result?: { toolCallId?: string; content?: string }
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.StateChanged
-      state: AgentUiRunState
-      snapshot: PlatformAgentRunSnapshotEvent
-    })
-  | (AgentRunEventBase & {
-      type: typeof AgentRunEventType.Error
-      message: string
-    })
+import type { PlatformAgentMessage } from '../../bridge/agentTypes.js'
+import type { PlatformAgentRunUsage } from '../../bridge/agentTypes.js'
+import type { AgentUiRunState } from '../../components/agents/agentTypes.js'
+import type { AgentUiToolCall } from '../../components/agents/agentTypes.js'
+
+/** Vendor-agnostic run events — matches main → shell streaming payloads. */
+export const AgentRunEventType = {
+  TurnStarted: 'turn_started',
+  ThinkingDelta: 'thinking_delta',
+  TextDelta: 'text_delta',
+  ToolCallStarted: 'tool_call_started',
+  ToolCallArgsDelta: 'tool_call_args_delta',
+  ToolCallDone: 'tool_call_done',
+  TurnEnded: 'turn_ended',
+  ToolExecStarted: 'tool_exec_started',
+  ToolExecEnded: 'tool_exec_ended',
+  StateChanged: 'state_changed',
+  UsageUpdated: 'usage_updated',
+  ContextCompactionStarted: 'context_compaction_started',
+  ContextCompactionCompleted: 'context_compaction_completed',
+  Error: 'error',
+} as const
+
+export type AgentRunEventTypeName =
+  (typeof AgentRunEventType)[keyof typeof AgentRunEventType]
+
+export interface AgentUsageTurnDelta {
+  inputTokens: number
+  outputTokens: number
+  totalTokens?: number
+}
+
+interface AgentRunEventBase {
+  runId: string
+  seq: number
+  type: string
+}
+
+export interface PlatformAgentRunSnapshotEvent {
+  runId: string
+  state: AgentUiRunState
+  turn: number
+  messages: PlatformAgentMessage[]
+  error?: string
+  interruptedReason?: string
+  effectiveModelId?: string
+  routingTier?: 'low' | 'high'
+  usage?: PlatformAgentRunUsage
+}
+
+/** Bridge + shell IPC event payloads consumed by the live reducer. */
+export type PlatformAgentRunEventPayload =
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.TurnStarted
+      turn: number
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ThinkingDelta
+      delta: string
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.TextDelta
+      delta: string
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ToolCallStarted
+      toolCallId: string
+      name: string
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ToolCallArgsDelta
+      toolCallId: string
+      delta: string
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ToolCallDone
+      toolCall: AgentUiToolCall
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.TurnEnded
+      toolCallCount: number
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.UsageUpdated
+      usage: AgentUsageTurnDelta
+      estimated?: boolean
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ContextCompactionStarted
+      archivedMessageCount: number
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ContextCompactionCompleted
+      activeFromIndex: number
+      summaryChars: number
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ToolExecStarted
+      toolCallId: string
+      name: string
+      arguments: Record<string, unknown>
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.ToolExecEnded
+      result?: { toolCallId?: string; content?: string }
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.StateChanged
+      state: AgentUiRunState
+      snapshot: PlatformAgentRunSnapshotEvent
+    })
+  | (AgentRunEventBase & {
+      type: typeof AgentRunEventType.Error
+      message: string
+    })

package/src/agents/runtime/contextWindowUsage.test.ts

@@ -1,38 +1,38 @@
-import { describe, expect, it } from 'vitest'
-import {
-  contextUsagePercent,
-  withContextWindowUsage,
-} from './contextWindowUsage.js'
-
-describe('contextWindowUsage', () => {
-  it('attaches catalog context window to usage', () => {
-    expect(
-      withContextWindowUsage(
-        { inputTokens: 1, outputTokens: 2, totalTokens: 3 },
-        1_000_000,
-      ),
-    ).toEqual({
-      inputTokens: 1,
-      outputTokens: 2,
-      totalTokens: 3,
-      contextWindowTokens: 1_000_000,
-    })
-  })
-
-  it('computes usage percent capped at 100', () => {
-    expect(
-      contextUsagePercent({
-        totalTokens: 50_000,
-        contextFillTokens: 50_000,
-        contextWindowTokens: 1_000_000,
-      }),
-    ).toBe(5)
-    expect(
-      contextUsagePercent({
-        totalTokens: 2_000_000,
-        contextFillTokens: 950_000,
-        contextWindowTokens: 1_000_000,
-      }),
-    ).toBe(95)
-  })
-})
+import { describe, expect, it } from 'vitest'
+import {
+  contextUsagePercent,
+  withContextWindowUsage,
+} from './contextWindowUsage.js'
+
+describe('contextWindowUsage', () => {
+  it('attaches catalog context window to usage', () => {
+    expect(
+      withContextWindowUsage(
+        { inputTokens: 1, outputTokens: 2, totalTokens: 3 },
+        1_000_000,
+      ),
+    ).toEqual({
+      inputTokens: 1,
+      outputTokens: 2,
+      totalTokens: 3,
+      contextWindowTokens: 1_000_000,
+    })
+  })
+
+  it('computes usage percent capped at 100', () => {
+    expect(
+      contextUsagePercent({
+        totalTokens: 50_000,
+        contextFillTokens: 50_000,
+        contextWindowTokens: 1_000_000,
+      }),
+    ).toBe(5)
+    expect(
+      contextUsagePercent({
+        totalTokens: 2_000_000,
+        contextFillTokens: 950_000,
+        contextWindowTokens: 1_000_000,
+      }),
+    ).toBe(95)
+  })
+})

package/src/agents/runtime/contextWindowUsage.ts

@@ -1,25 +1,25 @@
-import type { PlatformAgentRunUsage } from '../../bridge/agentTypes.js'
-
-export function withContextWindowUsage(
-  usage: PlatformAgentRunUsage | undefined,
-  contextWindowTokens: number | undefined,
-): PlatformAgentRunUsage | undefined {
-  if (!usage) return undefined
-  if (!contextWindowTokens) return usage
-  return { ...usage, contextWindowTokens }
-}
-
-/** 0–100 when a context window is known; otherwise undefined. */
-export function contextUsagePercent(
-  usage: Pick<
-    PlatformAgentRunUsage,
-    'totalTokens' | 'contextWindowTokens' | 'contextFillTokens'
-  >,
-): number | undefined {
-  const { contextWindowTokens } = usage
-  const fill = usage.contextFillTokens ?? usage.totalTokens
-  if (!contextWindowTokens || contextWindowTokens <= 0 || fill <= 0) {
-    return undefined
-  }
-  return Math.min(100, Math.round((fill / contextWindowTokens) * 100))
-}
+import type { PlatformAgentRunUsage } from '../../bridge/agentTypes.js'
+
+export function withContextWindowUsage(
+  usage: PlatformAgentRunUsage | undefined,
+  contextWindowTokens: number | undefined,
+): PlatformAgentRunUsage | undefined {
+  if (!usage) return undefined
+  if (!contextWindowTokens) return usage
+  return { ...usage, contextWindowTokens }
+}
+
+/** 0–100 when a context window is known; otherwise undefined. */
+export function contextUsagePercent(
+  usage: Pick<
+    PlatformAgentRunUsage,
+    'totalTokens' | 'contextWindowTokens' | 'contextFillTokens'
+  >,
+): number | undefined {
+  const { contextWindowTokens } = usage
+  const fill = usage.contextFillTokens ?? usage.totalTokens
+  if (!contextWindowTokens || contextWindowTokens <= 0 || fill <= 0) {
+    return undefined
+  }
+  return Math.min(100, Math.round((fill / contextWindowTokens) * 100))
+}

package/src/agents/runtime/index.ts

@@ -1,24 +1,24 @@
-export {
-  AgentRunEventType,
-  type AgentRunEventTypeName,
-  type AgentUsageTurnDelta,
-  type PlatformAgentRunEventPayload,
-  type PlatformAgentRunSnapshotEvent,
-} from './agentRunEventTypes.js'
-export { createIdleLiveTurn, reduceAgentLiveTurn } from './agentLiveReducer.js'
-export { unresolvedToolCalls } from './unresolvedToolCalls.js'
-export { derivePendingToolCalls } from './pendingToolCalls.js'
-export { toolRequiresApproval } from './toolRequiresApproval.js'
-export { mergeUsageTurn } from './mergeUsageTurn.js'
-export {
-  contextUsagePercent,
-  withContextWindowUsage,
-} from './contextWindowUsage.js'
-export {
-  isComposerEnabled,
-  mapApprovalPendingToolCalls,
-  mapPendingToolCalls,
-  mapRunState,
-  mapSnapshotToMessages,
-} from './mapAgentSnapshot.js'
-export { mapAgentMessages } from './mapAgentMessages.js'
+export {
+  AgentRunEventType,
+  type AgentRunEventTypeName,
+  type AgentUsageTurnDelta,
+  type PlatformAgentRunEventPayload,
+  type PlatformAgentRunSnapshotEvent,
+} from './agentRunEventTypes.js'
+export { createIdleLiveTurn, reduceAgentLiveTurn } from './agentLiveReducer.js'
+export { unresolvedToolCalls } from './unresolvedToolCalls.js'
+export { derivePendingToolCalls } from './pendingToolCalls.js'
+export { toolRequiresApproval } from './toolRequiresApproval.js'
+export { mergeUsageTurn } from './mergeUsageTurn.js'
+export {
+  contextUsagePercent,
+  withContextWindowUsage,
+} from './contextWindowUsage.js'
+export {
+  isComposerEnabled,
+  mapApprovalPendingToolCalls,
+  mapPendingToolCalls,
+  mapRunState,
+  mapSnapshotToMessages,
+} from './mapAgentSnapshot.js'
+export { mapAgentMessages } from './mapAgentMessages.js'

package/src/agents/runtime/mapAgentMessages.ts

@@ -1,54 +1,79 @@
-import type { PlatformAgentRunSnapshot } from '../../bridge/agentTypes.js'
-import {
-  AgentLivePhase,
-  type AgentLiveTurn,
-  type AgentUiMessage,
-} from '../../components/agents/agentTypes.js'
-import { mapSnapshotToMessages } from './mapAgentSnapshot.js'
-
-export function mapAgentMessages(
-  snapshot: PlatformAgentRunSnapshot | null,
-  liveTurn: AgentLiveTurn | null,
-): AgentUiMessage[] {
-  const committed = mapSnapshotToMessages(snapshot)
-  if (!liveTurn || liveTurn.phase === AgentLivePhase.Idle) {
-    return committed
-  }
-
-  if (
-    liveTurn.phase === AgentLivePhase.ToolsPending ||
-    liveTurn.phase === AgentLivePhase.ToolRunning
-  ) {
-    return committed
-  }
-
-  if (
-    liveTurn.phase === AgentLivePhase.Thinking &&
-    !liveTurn.text &&
-    liveTurn.toolCalls.length === 0
-  ) {
-    return [
-      ...committed,
-      {
-        id: 'live-assistant',
-        role: 'assistant',
-        content: '',
-        thinking: liveTurn.thinking,
-        streaming: true,
-      },
-    ]
-  }
-
-  return [
-    ...committed,
-    {
-      id: 'live-assistant',
-      role: 'assistant',
-      content: liveTurn.text,
-      thinking: liveTurn.thinking || undefined,
-      streaming: true,
-      toolCalls: liveTurn.toolCalls.length > 0 ? liveTurn.toolCalls : undefined,
-      activeTool: liveTurn.activeTool,
-    },
-  ]
-}
+import type { PlatformAgentRunSnapshot } from '../../bridge/agentTypes.js'
+import {
+  AgentLivePhase,
+  type AgentLiveTurn,
+  type AgentUiMessage,
+} from '../../components/agents/agentTypes.js'
+import { mapSnapshotToMessages } from './mapAgentSnapshot.js'
+
+export function mapAgentMessages(
+  snapshot: PlatformAgentRunSnapshot | null,
+  liveTurn: AgentLiveTurn | null,
+): AgentUiMessage[] {
+  const committed = mapSnapshotToMessages(snapshot)
+  if (!liveTurn || liveTurn.phase === AgentLivePhase.Idle) {
+    return committed
+  }
+
+  if (
+    liveTurn.phase === AgentLivePhase.ToolsPending ||
+    liveTurn.phase === AgentLivePhase.ToolRunning
+  ) {
+    return withLiveToolStatus(committed, liveTurn)
+  }
+
+  if (
+    liveTurn.phase === AgentLivePhase.Thinking &&
+    !liveTurn.text &&
+    liveTurn.toolCalls.length === 0
+  ) {
+    return [
+      ...committed,
+      {
+        id: 'live-assistant',
+        role: 'assistant',
+        content: '',
+        thinking: liveTurn.thinking,
+        streaming: true,
+      },
+    ]
+  }
+
+  return withLiveToolStatus(
+    [
+      ...committed,
+      {
+        id: 'live-assistant',
+        role: 'assistant',
+        content: liveTurn.text,
+        thinking: liveTurn.thinking || undefined,
+        streaming: true,
+        toolCalls:
+          liveTurn.toolCalls.length > 0 ? liveTurn.toolCalls : undefined,
+      },
+    ],
+    liveTurn,
+  )
+}
+
+function withLiveToolStatus(
+  messages: AgentUiMessage[],
+  liveTurn: AgentLiveTurn,
+): AgentUiMessage[] {
+  const active = liveTurn.activeTool
+  if (!active) return messages
+
+  return messages.map(message => {
+    if (!message.toolCalls?.some(call => call.id === active.toolCallId)) {
+      return message
+    }
+    return {
+      ...message,
+      toolCalls: message.toolCalls.map(call =>
+        call.id === active.toolCallId
+          ? { ...call, status: 'running' as const }
+          : call,
+      ),
+    }
+  })
+}

package/src/agents/runtime/mapAgentSnapshot.test.ts

@@ -0,0 +1,98 @@
+import { describe, expect, it } from 'vitest'
+import type {
+  PlatformAgentRunSnapshot,
+  PlatformAgentSessionToolPolicy,
+} from '../../bridge/agentTypes.js'
+import {
+  mapApprovalPendingToolCalls,
+  mapSnapshotToMessages,
+} from './mapAgentSnapshot.js'
+
+describe('mapSnapshotToMessages', () => {
+  it('merges tool results into assistant tool calls and drops duplicate tool rows', () => {
+    const snapshot: PlatformAgentRunSnapshot = {
+      runId: 'run-1',
+      turn: 1,
+      state: 'awaiting_user',
+      messages: [
+        { role: 'user', content: 'list files' },
+        {
+          role: 'assistant',
+          content: '',
+          toolCalls: [
+            {
+              id: 'call-1',
+              name: 'purefiles.listFiles',
+              arguments: { path: '/tmp' },
+            },
+          ],
+        },
+        { role: 'tool', content: 'file-a, file-b', toolCallId: 'call-1' },
+        { role: 'assistant', content: 'Here are the files.' },
+      ],
+    }
+
+    expect(mapSnapshotToMessages(snapshot)).toEqual([
+      {
+        id: 'user-0-msg',
+        role: 'user',
+        content: 'list files',
+        toolCalls: undefined,
+      },
+      {
+        id: 'assistant-1-msg',
+        role: 'assistant',
+        content: '',
+        toolCalls: [
+          {
+            id: 'call-1',
+            name: 'purefiles.listFiles',
+            arguments: { path: '/tmp' },
+            result: 'file-a, file-b',
+            status: 'done',
+          },
+        ],
+      },
+      {
+        id: 'assistant-3-msg',
+        role: 'assistant',
+        content: 'Here are the files.',
+        toolCalls: undefined,
+      },
+    ])
+  })
+})
+
+describe('mapApprovalPendingToolCalls', () => {
+  it('excludes accepted pending tool calls while unresolved tools remain pending', () => {
+    const snapshot: PlatformAgentRunSnapshot = {
+      runId: 'run-1',
+      turn: 1,
+      state: 'pending_tools',
+      messages: [
+        { role: 'user', content: 'write and review' },
+        {
+          role: 'assistant',
+          content: '',
+          toolCalls: [
+            { id: 'call-accepted', name: 'book.write', arguments: {} },
+            { id: 'call-manual', name: 'book.review', arguments: {} },
+          ],
+        },
+      ],
+    }
+    const policy: PlatformAgentSessionToolPolicy = {
+      allowedTargetApps: ['book'],
+      defaultRequiresApproval: false,
+      approvalOverrides: {
+        'book.write': true,
+        'book.review': true,
+      },
+    }
+    expect(
+      mapApprovalPendingToolCalls(snapshot, policy, ['call-accepted']),
+    ).toEqual([
+      { id: 'call-manual', name: 'book.review', arguments: {} },
+    ])
+  })
+})