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

package/src/agents/runtime/mapAgentSnapshot.ts

@@ -1,71 +1,124 @@
-import type {
-  PlatformAgentRunSnapshot,
-  PlatformAgentSessionToolPolicy,
-} from '../../bridge/agentTypes.js'
-import {
-  AgentUiRunState,
-  type AgentUiMessage,
-  type AgentUiToolCall,
-} from '../../components/agents/agentTypes.js'
-import { derivePendingToolCalls } from './pendingToolCalls.js'
-import { toolRequiresApproval } from './toolRequiresApproval.js'
-
-const VISIBLE_ROLES = new Set(['user', 'assistant', 'tool'])
-
-export function mapRunState(state: string): typeof AgentUiRunState[keyof typeof AgentUiRunState] {
-  return state as typeof AgentUiRunState[keyof typeof AgentUiRunState]
-}
-
-export function mapSnapshotToMessages(
-  snapshot: PlatformAgentRunSnapshot | null,
-): AgentUiMessage[] {
-  if (!snapshot) return []
-
-  return snapshot.messages
-    .filter(message => VISIBLE_ROLES.has(message.role))
-    .map((message, index) => ({
-      id: `${message.role}-${index}-${message.toolCallId ?? 'msg'}`,
-      role: message.role as AgentUiMessage['role'],
-      content: message.content,
-      toolCalls: message.toolCalls?.map(mapToolCall),
-    }))
-}
-
-export function mapPendingToolCalls(
-  snapshot: PlatformAgentRunSnapshot | null,
-): AgentUiToolCall[] {
-  if (!snapshot) return []
-  return derivePendingToolCalls(snapshot.messages, snapshot.state).map(mapToolCall)
-}
-
-/** Pending tools that still need explicit user approval. */
-export function mapApprovalPendingToolCalls(
-  snapshot: PlatformAgentRunSnapshot | null,
-  policy: PlatformAgentSessionToolPolicy | undefined,
-): AgentUiToolCall[] {
-  if (!snapshot || !policy) return []
-  return derivePendingToolCalls(snapshot.messages, snapshot.state)
-    .filter(call => toolRequiresApproval(call.name, policy))
-    .map(mapToolCall)
-}
-
-function mapToolCall(call: AgentUiToolCall): AgentUiToolCall {
-  return {
-    id: call.id,
-    name: call.name,
-    arguments: call.arguments,
-  }
-}
-
-export function isComposerEnabled(
-  runState: typeof AgentUiRunState[keyof typeof AgentUiRunState] | null,
-  busy: boolean,
-): boolean {
-  if (busy) return false
-  return (
-    runState === null ||
-    runState === AgentUiRunState.AwaitingUser ||
-    runState === AgentUiRunState.Failed ||
-    runState === AgentUiRunState.Interrupted
-  )
-}
+import type {
+  PlatformAgentRunSnapshot,
+  PlatformAgentSessionToolPolicy,
+} from '../../bridge/agentTypes.js'
+import {
+  AgentUiRunState,
+  type AgentUiMessage,
+  type AgentUiToolCall,
+} from '../../components/agents/agentTypes.js'
+import { derivePendingToolCalls } from './pendingToolCalls.js'
+import { toolRequiresApproval } from './toolRequiresApproval.js'
+
+const VISIBLE_ROLES = new Set(['user', 'assistant', 'tool'])
+
+export function mapRunState(state: string): typeof AgentUiRunState[keyof typeof AgentUiRunState] {
+  return state as typeof AgentUiRunState[keyof typeof AgentUiRunState]
+}
+
+export function mapSnapshotToMessages(
+  snapshot: PlatformAgentRunSnapshot | null,
+): AgentUiMessage[] {
+  if (!snapshot) return []
+
+  const messages = snapshot.messages.filter(message =>
+    VISIBLE_ROLES.has(message.role),
+  )
+
+  const assistantToolCallIds = new Set<string>()
+  for (const message of messages) {
+    if (message.role === 'assistant' && message.toolCalls) {
+      for (const call of message.toolCalls) {
+        assistantToolCallIds.add(call.id)
+      }
+    }
+  }
+
+  const toolResults = new Map<string, string>()
+  for (const message of messages) {
+    if (message.role === 'tool' && message.toolCallId) {
+      toolResults.set(message.toolCallId, message.content)
+    }
+  }
+
+  const uiMessages: AgentUiMessage[] = []
+  for (let index = 0; index < messages.length; index += 1) {
+    const message = messages[index]!
+    if (
+      message.role === 'tool' &&
+      message.toolCallId &&
+      assistantToolCallIds.has(message.toolCallId)
+    ) {
+      continue
+    }
+
+    uiMessages.push({
+      id: `${message.role}-${index}-${message.toolCallId ?? 'msg'}`,
+      role: message.role as AgentUiMessage['role'],
+      content: message.content,
+      toolCalls: message.toolCalls?.map(call =>
+        mapToolCallWithResult(call, toolResults),
+      ),
+    })
+  }
+
+  return uiMessages
+}
+
+export function mapPendingToolCalls(
+  snapshot: PlatformAgentRunSnapshot | null,
+): AgentUiToolCall[] {
+  if (!snapshot) return []
+  return derivePendingToolCalls(snapshot.messages, snapshot.state).map(mapToolCall)
+}
+
+/** Pending tools that still need explicit user approval. */
+export function mapApprovalPendingToolCalls(
+  snapshot: PlatformAgentRunSnapshot | null,
+  policy: PlatformAgentSessionToolPolicy | undefined,
+  acceptedPendingToolCallIds: readonly string[] = [],
+): AgentUiToolCall[] {
+  if (!snapshot || !policy) return []
+  const accepted = new Set(acceptedPendingToolCallIds)
+  return derivePendingToolCalls(snapshot.messages, snapshot.state)
+    .filter(
+      call => !accepted.has(call.id) && toolRequiresApproval(call.name, policy),
+    )
+    .map(mapToolCall)
+}
+
+function mapToolCall(call: AgentUiToolCall): AgentUiToolCall {
+  return {
+    id: call.id,
+    name: call.name,
+    arguments: call.arguments,
+  }
+}
+
+function mapToolCallWithResult(
+  call: AgentUiToolCall,
+  toolResults: Map<string, string>,
+): AgentUiToolCall {
+  const result = toolResults.get(call.id)
+  if (result === undefined) {
+    return mapToolCall(call)
+  }
+  return {
+    ...mapToolCall(call),
+    result,
+    status: 'done',
+  }
+}
+
+export function isComposerEnabled(
+  runState: typeof AgentUiRunState[keyof typeof AgentUiRunState] | null,
+  busy: boolean,
+): boolean {
+  if (busy) return false
+  return (
+    runState === null ||
+    runState === AgentUiRunState.AwaitingUser ||
+    runState === AgentUiRunState.Failed ||
+    runState === AgentUiRunState.Interrupted
+  )
+}

package/src/agents/runtime/mergeUsageTurn.ts

@@ -1,23 +1,23 @@
-import type { PlatformAgentRunUsage } from '../../bridge/agentTypes.js'
-import type { AgentUsageTurnDelta } from './agentRunEventTypes.js'
-
-export function mergeUsageTurn(
-  base: PlatformAgentRunUsage | undefined,
-  delta: AgentUsageTurnDelta,
-  estimated = false,
-): PlatformAgentRunUsage {
-  const turnTotal =
-    delta.totalTokens ?? delta.inputTokens + delta.outputTokens
-  const next: PlatformAgentRunUsage = {
-    inputTokens: (base?.inputTokens ?? 0) + delta.inputTokens,
-    outputTokens: (base?.outputTokens ?? 0) + delta.outputTokens,
-    totalTokens: (base?.totalTokens ?? 0) + turnTotal,
-    contextWindowTokens: base?.contextWindowTokens,
-    contextFillTokens: base?.contextFillTokens,
-    estimated: base?.estimated || estimated,
-  }
-  if (delta.inputTokens > 0) {
-    next.contextFillTokens = delta.inputTokens
-  }
-  return next
-}
+import type { PlatformAgentRunUsage } from '../../bridge/agentTypes.js'
+import type { AgentUsageTurnDelta } from './agentRunEventTypes.js'
+
+export function mergeUsageTurn(
+  base: PlatformAgentRunUsage | undefined,
+  delta: AgentUsageTurnDelta,
+  estimated = false,
+): PlatformAgentRunUsage {
+  const turnTotal =
+    delta.totalTokens ?? delta.inputTokens + delta.outputTokens
+  const next: PlatformAgentRunUsage = {
+    inputTokens: (base?.inputTokens ?? 0) + delta.inputTokens,
+    outputTokens: (base?.outputTokens ?? 0) + delta.outputTokens,
+    totalTokens: (base?.totalTokens ?? 0) + turnTotal,
+    contextWindowTokens: base?.contextWindowTokens,
+    contextFillTokens: base?.contextFillTokens,
+    estimated: base?.estimated || estimated,
+  }
+  if (delta.inputTokens > 0) {
+    next.contextFillTokens = delta.inputTokens
+  }
+  return next
+}

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

@@ -1,85 +1,85 @@
-import { describe, expect, it } from 'vitest'
-import { AgentUiRunState } from '../../components/agents/agentTypes.js'
-import { derivePendingToolCalls } from './pendingToolCalls.js'
-import { toolRequiresApproval } from './toolRequiresApproval.js'
-
-describe('derivePendingToolCalls', () => {
-  it('returns unresolved tool calls when state is pending_tools', () => {
-    const pending = derivePendingToolCalls(
-      [
-        {
-          role: 'assistant',
-          content: '',
-          toolCalls: [
-            {
-              id: 'tc-1',
-              name: 'book:read',
-              arguments: {},
-            },
-          ],
-        },
-      ],
-      AgentUiRunState.PendingTools,
-    )
-    expect(pending.map(call => call.id)).toEqual(['tc-1'])
-  })
-
-  it('returns empty when state is not pending_tools', () => {
-    expect(
-      derivePendingToolCalls(
-        [
-          {
-            role: 'assistant',
-            content: '',
-            toolCalls: [
-              { id: 'tc-1', name: 'book:read', arguments: {} },
-            ],
-          },
-        ],
-        AgentUiRunState.AwaitingUser,
-      ),
-    ).toEqual([])
-  })
-})
-
-describe('toolRequiresApproval', () => {
-  it('honors approval overrides over defaults', () => {
-    expect(
-      toolRequiresApproval('book:read', {
-        allowedTargetApps: ['book'],
-        approvalOverrides: { 'book:read': false },
-      }),
-    ).toBe(false)
-    expect(
-      toolRequiresApproval('book:write', {
-        allowedTargetApps: ['book'],
-        approvalOverrides: { 'book:read': false },
-        defaultRequiresApproval: true,
-      }),
-    ).toBe(true)
-  })
-
-  it('never requires approval for harness context read tools when policy is merged', () => {
-    expect(
-      toolRequiresApproval('harness.grep_context', {
-        allowedTargetApps: ['book'],
-        defaultRequiresApproval: true,
-        approvalOverrides: {
-          'harness.grep_context': false,
-          'harness.invoke_agent': true,
-          'harness.read_context_chunk': false,
-        },
-      }),
-    ).toBe(false)
-    expect(
-      toolRequiresApproval('harness.invoke_agent', {
-        allowedTargetApps: ['book'],
-        defaultRequiresApproval: true,
-        approvalOverrides: {
-          'harness.grep_context': false,
-          'harness.invoke_agent': true,
-        },
-      }),
-    ).toBe(true)
-  })
-})
+import { describe, expect, it } from 'vitest'
+import { AgentUiRunState } from '../../components/agents/agentTypes.js'
+import { derivePendingToolCalls } from './pendingToolCalls.js'
+import { toolRequiresApproval } from './toolRequiresApproval.js'
+
+describe('derivePendingToolCalls', () => {
+  it('returns unresolved tool calls when state is pending_tools', () => {
+    const pending = derivePendingToolCalls(
+      [
+        {
+          role: 'assistant',
+          content: '',
+          toolCalls: [
+            {
+              id: 'tc-1',
+              name: 'book:read',
+              arguments: {},
+            },
+          ],
+        },
+      ],
+      AgentUiRunState.PendingTools,
+    )
+    expect(pending.map(call => call.id)).toEqual(['tc-1'])
+  })
+
+  it('returns empty when state is not pending_tools', () => {
+    expect(
+      derivePendingToolCalls(
+        [
+          {
+            role: 'assistant',
+            content: '',
+            toolCalls: [
+              { id: 'tc-1', name: 'book:read', arguments: {} },
+            ],
+          },
+        ],
+        AgentUiRunState.AwaitingUser,
+      ),
+    ).toEqual([])
+  })
+})
+
+describe('toolRequiresApproval', () => {
+  it('honors approval overrides over defaults', () => {
+    expect(
+      toolRequiresApproval('book:read', {
+        allowedTargetApps: ['book'],
+        approvalOverrides: { 'book:read': false },
+      }),
+    ).toBe(false)
+    expect(
+      toolRequiresApproval('book:write', {
+        allowedTargetApps: ['book'],
+        approvalOverrides: { 'book:read': false },
+        defaultRequiresApproval: true,
+      }),
+    ).toBe(true)
+  })
+
+  it('never requires approval for harness context read tools when policy is merged', () => {
+    expect(
+      toolRequiresApproval('harness.grep_context', {
+        allowedTargetApps: ['book'],
+        defaultRequiresApproval: true,
+        approvalOverrides: {
+          'harness.grep_context': false,
+          'harness.invoke_agent': true,
+          'harness.read_context_chunk': false,
+        },
+      }),
+    ).toBe(false)
+    expect(
+      toolRequiresApproval('harness.invoke_agent', {
+        allowedTargetApps: ['book'],
+        defaultRequiresApproval: true,
+        approvalOverrides: {
+          'harness.grep_context': false,
+          'harness.invoke_agent': true,
+        },
+      }),
+    ).toBe(true)
+  })
+})

package/src/agents/runtime/pendingToolCalls.ts

@@ -1,14 +1,14 @@
-import type { PlatformAgentMessage } from '../../bridge/agentTypes.js'
-import { AgentUiRunState } from '../../components/agents/agentTypes.js'
-import type { AgentUiToolCall } from '../../components/agents/agentTypes.js'
-import { unresolvedToolCalls } from './unresolvedToolCalls.js'
-
-export function derivePendingToolCalls(
-  messages: readonly PlatformAgentMessage[],
-  state: string,
-): AgentUiToolCall[] {
-  if (state !== AgentUiRunState.PendingTools) {
-    return []
-  }
-  return unresolvedToolCalls(messages)
-}
+import type { PlatformAgentMessage } from '../../bridge/agentTypes.js'
+import { AgentUiRunState } from '../../components/agents/agentTypes.js'
+import type { AgentUiToolCall } from '../../components/agents/agentTypes.js'
+import { unresolvedToolCalls } from './unresolvedToolCalls.js'
+
+export function derivePendingToolCalls(
+  messages: readonly PlatformAgentMessage[],
+  state: string,
+): AgentUiToolCall[] {
+  if (state !== AgentUiRunState.PendingTools) {
+    return []
+  }
+  return unresolvedToolCalls(messages)
+}

package/src/agents/runtime/toolRequiresApproval.ts

@@ -1,20 +1,20 @@
-import type { PlatformAgentSessionToolPolicy } from '../../bridge/agentTypes.js'
-
-/** Resolve whether a qualified tool name needs user approval before routing. */
-export function toolRequiresApproval(
-  qualifiedName: string,
-  policy: PlatformAgentSessionToolPolicy,
-): boolean {
-  if (
-    policy.approvalOverrides &&
-    Object.hasOwn(policy.approvalOverrides, qualifiedName)
-  ) {
-    return policy.approvalOverrides[qualifiedName]!
-  }
-
-  if (policy.defaultRequiresApproval !== undefined) {
-    return policy.defaultRequiresApproval
-  }
-
-  return true
-}
+import type { PlatformAgentSessionToolPolicy } from '../../bridge/agentTypes.js'
+
+/** Resolve whether a qualified tool name needs user approval before routing. */
+export function toolRequiresApproval(
+  qualifiedName: string,
+  policy: PlatformAgentSessionToolPolicy,
+): boolean {
+  if (
+    policy.approvalOverrides &&
+    Object.hasOwn(policy.approvalOverrides, qualifiedName)
+  ) {
+    return policy.approvalOverrides[qualifiedName]!
+  }
+
+  if (policy.defaultRequiresApproval !== undefined) {
+    return policy.defaultRequiresApproval
+  }
+
+  return true
+}

package/src/agents/runtime/unresolvedToolCalls.ts

@@ -1,42 +1,42 @@
-import type { PlatformAgentMessage } from '../../bridge/agentTypes.js'
-import type { AgentUiToolCall } from '../../components/agents/agentTypes.js'
-
-function lastAssistantToolRequest(
-  messages: readonly PlatformAgentMessage[],
-): PlatformAgentMessage | undefined {
-  for (let index = messages.length - 1; index >= 0; index -= 1) {
-    const message = messages[index]
-    if (message.role === 'assistant' && message.toolCalls?.length) {
-      return message
-    }
-  }
-  return undefined
-}
-
-/** Tool calls on the latest assistant tool-request turn that lack a matching tool result. */
-export function unresolvedToolCalls(
-  messages: readonly PlatformAgentMessage[],
-): AgentUiToolCall[] {
-  const assistantTurn = lastAssistantToolRequest(messages)
-  if (!assistantTurn?.toolCalls?.length) {
-    return []
-  }
-
-  const resolvedIds = new Set(
-    messages
-      .filter(
-        message =>
-          message.role === 'tool' &&
-          typeof message.toolCallId === 'string',
-      )
-      .map(message => message.toolCallId as string),
-  )
-
-  return assistantTurn.toolCalls
-    .filter(call => !resolvedIds.has(call.id))
-    .map(call => ({
-      id: call.id,
-      name: call.name,
-      arguments: { ...call.arguments },
-    }))
-}
+import type { PlatformAgentMessage } from '../../bridge/agentTypes.js'
+import type { AgentUiToolCall } from '../../components/agents/agentTypes.js'
+
+function lastAssistantToolRequest(
+  messages: readonly PlatformAgentMessage[],
+): PlatformAgentMessage | undefined {
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const message = messages[index]
+    if (message.role === 'assistant' && message.toolCalls?.length) {
+      return message
+    }
+  }
+  return undefined
+}
+
+/** Tool calls on the latest assistant tool-request turn that lack a matching tool result. */
+export function unresolvedToolCalls(
+  messages: readonly PlatformAgentMessage[],
+): AgentUiToolCall[] {
+  const assistantTurn = lastAssistantToolRequest(messages)
+  if (!assistantTurn?.toolCalls?.length) {
+    return []
+  }
+
+  const resolvedIds = new Set(
+    messages
+      .filter(
+        message =>
+          message.role === 'tool' &&
+          typeof message.toolCallId === 'string',
+      )
+      .map(message => message.toolCallId as string),
+  )
+
+  return assistantTurn.toolCalls
+    .filter(call => !resolvedIds.has(call.id))
+    .map(call => ({
+      id: call.id,
+      name: call.name,
+      arguments: { ...call.arguments },
+    }))
+}

package/src/bridge/agentModelTiers.ts

@@ -1,50 +1,50 @@
-/** Default high-tier model id (matches shell catalog). */
-export const DEFAULT_AGENT_HIGH_LEVEL_MODEL_ID = 'deepseek:deepseek-v4-pro'
-
-/** Default low-tier model id (matches shell catalog). */
-export const DEFAULT_AGENT_LOW_LEVEL_MODEL_ID = 'deepseek:deepseek-v4-flash'
-
-/** Session model sentinel — resolved per user message in the shell agent host. */
-export const AGENT_AUTO_MODEL_ID = 'auto'
-export const AGENT_AUTO_MODEL_LABEL = 'Auto'
-
-export function isAgentAutoModelId(modelId: string | undefined | null): boolean {
-  return modelId === AGENT_AUTO_MODEL_ID
-}
-
-export interface PlatformAgentModelTiers {
-  lowLevelModelId: string
-  highLevelModelId: string
-}
-
-export interface PlatformAgentSessionConfigPatch {
-  modelId?: string
-  sessionPrompt?: string
-  toolPolicy?: {
-    allowedTargetApps?: string[]
-    routeReadinessMs?: number
-    handlerResponseMs?: number
-    defaultRequiresApproval?: boolean
-    approvalOverrides?: Record<string, boolean>
-  }
-}
-
-export interface PlatformAgentSessionScopeDefaults {
-  global?: PlatformAgentSessionConfigPatch
-  apps?: Record<string, PlatformAgentSessionConfigPatch>
-}
-
-/** Resolve tier ids from shell preferences with catalog fallbacks. */
-export function resolveAgentModelTiersFromPrefs(
-  prefs: {
-    agentModelTiers?: Partial<PlatformAgentModelTiers>
-  } | null | undefined,
-): PlatformAgentModelTiers {
-  const stored = prefs?.agentModelTiers
-  return {
-    lowLevelModelId:
-      stored?.lowLevelModelId?.trim() || DEFAULT_AGENT_LOW_LEVEL_MODEL_ID,
-    highLevelModelId:
-      stored?.highLevelModelId?.trim() || DEFAULT_AGENT_HIGH_LEVEL_MODEL_ID,
-  }
-}
+/** Default high-tier model id (matches shell catalog). */
+export const DEFAULT_AGENT_HIGH_LEVEL_MODEL_ID = 'deepseek:deepseek-v4-pro'
+
+/** Default low-tier model id (matches shell catalog). */
+export const DEFAULT_AGENT_LOW_LEVEL_MODEL_ID = 'deepseek:deepseek-v4-flash'
+
+/** Session model sentinel — resolved per user message in the shell agent host. */
+export const AGENT_AUTO_MODEL_ID = 'auto'
+export const AGENT_AUTO_MODEL_LABEL = 'Auto'
+
+export function isAgentAutoModelId(modelId: string | undefined | null): boolean {
+  return modelId === AGENT_AUTO_MODEL_ID
+}
+
+export interface PlatformAgentModelTiers {
+  lowLevelModelId: string
+  highLevelModelId: string
+}
+
+export interface PlatformAgentSessionConfigPatch {
+  modelId?: string
+  sessionPrompt?: string
+  toolPolicy?: {
+    allowedTargetApps?: string[]
+    routeReadinessMs?: number
+    handlerResponseMs?: number
+    defaultRequiresApproval?: boolean
+    approvalOverrides?: Record<string, boolean>
+  }
+}
+
+export interface PlatformAgentSessionScopeDefaults {
+  global?: PlatformAgentSessionConfigPatch
+  apps?: Record<string, PlatformAgentSessionConfigPatch>
+}
+
+/** Resolve tier ids from shell preferences with catalog fallbacks. */
+export function resolveAgentModelTiersFromPrefs(
+  prefs: {
+    agentModelTiers?: Partial<PlatformAgentModelTiers>
+  } | null | undefined,
+): PlatformAgentModelTiers {
+  const stored = prefs?.agentModelTiers
+  return {
+    lowLevelModelId:
+      stored?.lowLevelModelId?.trim() || DEFAULT_AGENT_LOW_LEVEL_MODEL_ID,
+    highLevelModelId:
+      stored?.highLevelModelId?.trim() || DEFAULT_AGENT_HIGH_LEVEL_MODEL_ID,
+  }
+}