fix: stabilize cli tests and web trace parsing

Author: brandonkachen

.github/workflows/ci.yml

@@ -85,10 +85,8 @@ jobs:
         package:
           [
             .agents,
-            backend,
             cli,
             common,
-            npm-app,
             packages/agent-runtime,
             packages/billing,
             packages/internal,
@@ -97,10 +95,8 @@ jobs:
           ]
         include:
           - package: .agents
-          - package: backend
           - package: cli
           - package: common
-          - package: npm-app
           - package: packages/agent-runtime
           - package: packages/billing
           - package: packages/internal
@@ -180,10 +176,8 @@ jobs:
         package:
           [
             .agents,
-            backend,
             cli,
             common,
-            npm-app,
             packages/agent-runtime,
             packages/billing,
             packages/internal,
@@ -192,10 +186,8 @@ jobs:
           ]
         include:
           - package: .agents
-          - package: backend
           - package: cli
           - package: common
-          - package: npm-app
           - package: packages/agent-runtime
           - package: packages/billing
           - package: packages/internal

cli/src/__tests__/e2e/logout-relogin-flow.test.ts

@@ -20,6 +20,7 @@ import {
 import { setProjectRoot } from '../../project-files'
 
 import type * as AuthModule from '../../utils/auth'
+import type * as CodebuffApiModule from '../../utils/codebuff-api'
 
 type User = AuthModule.User
 
@@ -63,8 +64,16 @@ describe('Logout and Re-login helpers', () => {
     )
   }
 
+  const mockLogoutApi = () => {
+    const apiModule = require('../../utils/codebuff-api') as typeof CodebuffApiModule
+    spyOn(apiModule, 'getApiClient').mockReturnValue({
+      logout: async () => ({ ok: true, status: 200 }),
+    } as any)
+  }
+
   test('logoutUser removes credentials file and returns true', async () => {
     mockConfigPaths()
+    mockLogoutApi()
     saveUserCredentials(ORIGINAL_USER)
 
     const credentialsPath = path.join(tempConfigDir, 'credentials.json')
@@ -77,6 +86,7 @@ describe('Logout and Re-login helpers', () => {
 
   test('re-login can persist new credentials after logout', async () => {
     mockConfigPaths()
+    mockLogoutApi()
 
     saveUserCredentials(ORIGINAL_USER)
     const firstLoaded = getUserCredentials()

cli/src/hooks/__tests__/use-user-details-query.test.ts

@@ -1,9 +1,10 @@
-import { describe, test, expect, mock, beforeEach, afterEach } from 'bun:test'
+import { describe, test, expect, mock, beforeEach, afterEach, spyOn } from 'bun:test'
 
 import { createMockApiClient } from '../../__tests__/helpers/mock-api-client'
 import { fetchUserDetails } from '../use-user-details-query'
 
 import type { Logger } from '@codebuff/common/types/contracts/logger'
+import type * as CodebuffApiModule from '../../utils/codebuff-api'
 
 describe('fetchUserDetails', () => {
   const mockLogger: Logger = {
@@ -179,18 +180,29 @@ describe('fetchUserDetails', () => {
   })
 
   describe('environment validation', () => {
-    test('throws error when NEXT_PUBLIC_CODEBUFF_APP_URL is not set', async () => {
-      delete process.env.NEXT_PUBLIC_CODEBUFF_APP_URL
+    test('uses shared API client when apiClient is not provided', async () => {
+      const meMock = mock(() =>
+        Promise.resolve({
+          ok: true,
+          status: 200,
+          data: { email: 'test@example.com' },
+        }),
+      )
+      const apiClient = createMockApiClient({ me: meMock })
+
+      const apiModule = require('../../utils/codebuff-api') as typeof CodebuffApiModule
+      const setTokenSpy = spyOn(apiModule, 'setApiClientAuthToken')
+      spyOn(apiModule, 'getApiClient').mockReturnValue(apiClient as any)
 
-      // When no apiClient is provided and env is not set, createCodebuffApiClient
-      // will throw due to missing baseUrl (or we test directly)
       await expect(
         fetchUserDetails({
           authToken: 'valid-token',
           fields: ['email'] as const,
           logger: mockLogger,
         }),
-      ).rejects.toThrow()
+      ).resolves.toEqual({ email: 'test@example.com' })
+
+      expect(setTokenSpy).toHaveBeenCalledWith('valid-token')
     })
   })
 })

common/src/util/xml-parser.ts

@@ -0,0 +1,27 @@
+/**
+ * Parses XML content for a tool call into a structured object with only string values.
+ * Example input:
+ * <type>click</type>
+ * <selector>#button</selector>
+ * <timeout>5000</timeout>
+ */
+export function parseToolCallXml(xmlString: string): Record<string, string> {
+  if (!xmlString.trim()) return {}
+
+  const result: Record<string, string> = {}
+  const tagPattern = /<(\w+)>([\s\S]*?)<\/\1>/g
+  let match
+
+  while ((match = tagPattern.exec(xmlString)) !== null) {
+    const [, key, rawValue] = match
+
+    // Remove leading/trailing whitespace but preserve internal whitespace
+    const value = rawValue.replace(/^\s+|\s+$/g, '')
+
+    // Assign all values as strings
+    result[key] = value
+  }
+
+  return result
+}
+

packages/internal/src/utils/xml-parser.ts

@@ -1,34 +1,5 @@
-/**
- * Shared XML parsing utilities for tool calls
- * Used by both backend and web applications
- */
-
-/**
- * Parses XML content for a tool call into a structured object with only string values.
- * Example input:
- * <type>click</type>
- * <selector>#button</selector>
- * <timeout>5000</timeout>
- */
-export function parseToolCallXml(xmlString: string): Record<string, string> {
-  if (!xmlString.trim()) return {}
-
-  const result: Record<string, string> = {}
-  const tagPattern = /<(\w+)>([\s\S]*?)<\/\1>/g
-  let match
-
-  while ((match = tagPattern.exec(xmlString)) !== null) {
-    const [_, key, rawValue] = match
-
-    // Remove leading/trailing whitespace but preserve internal whitespace
-    const value = rawValue.replace(/^\s+|\s+$/g, '')
-
-    // Assign all values as strings
-    result[key] = value
-  }
-
-  return result
-}
+// Re-exported from @codebuff/common to keep it browser-safe and avoid duplication.
+export { parseToolCallXml } from '@codebuff/common/util/xml-parser'
 
 /**
  * Tool result part interface

web/src/app/admin/traces/utils/trace-processing.ts

@@ -1,4 +1,4 @@
-import { parseToolCallXml } from '@codebuff/internal'
+import { parseToolCallXml } from '@codebuff/common/util/xml-parser'
 
 import type { TraceMessage } from '@/app/api/admin/traces/[clientRequestId]/messages/route'
 import type { TimelineEvent } from '@/app/api/admin/traces/[clientRequestId]/timeline/route'