Skip to content

Commit c862f59

Browse files
brandonkachenbrandonkachen
committed
Revert "Merge remote-tracking branch 'origin/main' into brandon/upgrade-opentui-2025-10-28"
This reverts commit 6fe5cde, reversing changes made to 65932f5.
1 parent 6fe5cde commit c862f59

File tree

3 files changed

+4
-62
lines changed

3 files changed

+4
-62
lines changed

‎web/src/app/api/v1/agent-runs/[runId]/steps/__tests__/steps.test.ts‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
import { TEST_USER_ID } from '@codebuff/common/old-constants'
2-
import { beforeEach, describe, expect, mock, test } from 'bun:test'
2+
import { beforeEach, describe, expect, test } from 'bun:test'
33
import { NextRequest } from 'next/server'
44

55
import { postAgentRunsSteps } from '../_post'
66

77
import type { TrackEventFn } from '@codebuff/common/types/contracts/analytics'
88
import type { GetUserInfoFromApiKeyFn } from '@codebuff/common/types/contracts/database'
9-
import type {
10-
Logger,
11-
LoggerWithContextFn,
12-
} from '@codebuff/common/types/contracts/logger'
9+
import type { Logger } from '@codebuff/common/types/contracts/logger'
1310

1411
describe('agentRunsStepsPost', () => {
1512
let mockGetUserInfoFromApiKey: GetUserInfoFromApiKeyFn
1613
let mockLogger: Logger
17-
let mockLoggerWithContext: LoggerWithContextFn
1814
let mockTrackEvent: TrackEventFn
1915
let mockDb: any
2016

@@ -46,8 +42,6 @@ describe('agentRunsStepsPost', () => {
4642
debug: () => {},
4743
}
4844

49-
mockLoggerWithContext = mock(() => mockLogger)
50-
5145
mockTrackEvent = () => {}
5246

5347
// Default mock DB with successful operations
@@ -79,7 +73,6 @@ describe('agentRunsStepsPost', () => {
7973
runId: 'run-123',
8074
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
8175
logger: mockLogger,
82-
loggerWithContext: mockLoggerWithContext,
8376
trackEvent: mockTrackEvent,
8477
db: mockDb,
8578
})
@@ -104,7 +97,6 @@ describe('agentRunsStepsPost', () => {
10497
runId: 'run-123',
10598
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
10699
logger: mockLogger,
107-
loggerWithContext: mockLoggerWithContext,
108100
trackEvent: mockTrackEvent,
109101
db: mockDb,
110102
})
@@ -129,7 +121,6 @@ describe('agentRunsStepsPost', () => {
129121
runId: 'run-123',
130122
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
131123
logger: mockLogger,
132-
loggerWithContext: mockLoggerWithContext,
133124
trackEvent: mockTrackEvent,
134125
db: mockDb,
135126
})
@@ -154,7 +145,6 @@ describe('agentRunsStepsPost', () => {
154145
runId: 'run-123',
155146
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
156147
logger: mockLogger,
157-
loggerWithContext: mockLoggerWithContext,
158148
trackEvent: mockTrackEvent,
159149
db: mockDb,
160150
})
@@ -190,7 +180,6 @@ describe('agentRunsStepsPost', () => {
190180
runId: 'run-123',
191181
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
192182
logger: mockLogger,
193-
loggerWithContext: mockLoggerWithContext,
194183
trackEvent: mockTrackEvent,
195184
db: dbWithNoRun,
196185
})
@@ -226,7 +215,6 @@ describe('agentRunsStepsPost', () => {
226215
runId: 'run-123',
227216
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
228217
logger: mockLogger,
229-
loggerWithContext: mockLoggerWithContext,
230218
trackEvent: mockTrackEvent,
231219
db: dbWithDifferentUser,
232220
})
@@ -251,7 +239,6 @@ describe('agentRunsStepsPost', () => {
251239
runId: 'run-123',
252240
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
253241
logger: mockLogger,
254-
loggerWithContext: mockLoggerWithContext,
255242
trackEvent: mockTrackEvent,
256243
db: mockDb,
257244
})
@@ -282,7 +269,6 @@ describe('agentRunsStepsPost', () => {
282269
runId: 'run-123',
283270
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
284271
logger: mockLogger,
285-
loggerWithContext: mockLoggerWithContext,
286272
trackEvent: mockTrackEvent,
287273
db: mockDb,
288274
})
@@ -324,7 +310,6 @@ describe('agentRunsStepsPost', () => {
324310
runId: 'run-123',
325311
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
326312
logger: mockLogger,
327-
loggerWithContext: mockLoggerWithContext,
328313
trackEvent: mockTrackEvent,
329314
db: dbWithError,
330315
})

‎web/src/app/api/v1/agent-runs/__tests__/agent-runs.test.ts‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import type {
1010
GetUserInfoFromApiKeyFn,
1111
GetUserInfoFromApiKeyOutput,
1212
} from '@codebuff/common/types/contracts/database'
13-
import type {
14-
Logger,
15-
LoggerWithContextFn,
16-
} from '@codebuff/common/types/contracts/logger'
13+
import type { Logger } from '@codebuff/common/types/contracts/logger'
1714

1815
describe('/api/v1/agent-runs POST endpoint', () => {
1916
const mockUserData: Record<
@@ -42,7 +39,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
4239
}
4340

4441
let mockLogger: Logger
45-
let mockLoggerWithContext: LoggerWithContextFn
4642
let mockTrackEvent: TrackEventFn
4743
let mockDb: any
4844

@@ -53,7 +49,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
5349
info: mock(() => {}),
5450
debug: mock(() => {}),
5551
}
56-
mockLoggerWithContext = mock(() => mockLogger)
5752

5853
mockTrackEvent = mock(() => {})
5954

@@ -87,7 +82,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
8782
req,
8883
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
8984
logger: mockLogger,
90-
loggerWithContext: mockLoggerWithContext,
9185
trackEvent: mockTrackEvent,
9286
db: mockDb,
9387
})
@@ -111,7 +105,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
111105
req,
112106
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
113107
logger: mockLogger,
114-
loggerWithContext: mockLoggerWithContext,
115108
trackEvent: mockTrackEvent,
116109
db: mockDb,
117110
})
@@ -135,7 +128,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
135128
req,
136129
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
137130
logger: mockLogger,
138-
loggerWithContext: mockLoggerWithContext,
139131
trackEvent: mockTrackEvent,
140132
db: mockDb,
141133
})
@@ -158,7 +150,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
158150
req,
159151
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
160152
logger: mockLogger,
161-
loggerWithContext: mockLoggerWithContext,
162153
trackEvent: mockTrackEvent,
163154
db: mockDb,
164155
})
@@ -181,7 +172,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
181172
req,
182173
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
183174
logger: mockLogger,
184-
loggerWithContext: mockLoggerWithContext,
185175
trackEvent: mockTrackEvent,
186176
db: mockDb,
187177
})
@@ -204,7 +194,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
204194
req,
205195
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
206196
logger: mockLogger,
207-
loggerWithContext: mockLoggerWithContext,
208197
trackEvent: mockTrackEvent,
209198
db: mockDb,
210199
})
@@ -227,7 +216,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
227216
req,
228217
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
229218
logger: mockLogger,
230-
loggerWithContext: mockLoggerWithContext,
231219
trackEvent: mockTrackEvent,
232220
db: mockDb,
233221
})
@@ -251,7 +239,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
251239
req,
252240
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
253241
logger: mockLogger,
254-
loggerWithContext: mockLoggerWithContext,
255242
trackEvent: mockTrackEvent,
256243
db: mockDb,
257244
})
@@ -276,7 +263,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
276263
req,
277264
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
278265
logger: mockLogger,
279-
loggerWithContext: mockLoggerWithContext,
280266
trackEvent: mockTrackEvent,
281267
db: mockDb,
282268
})
@@ -300,7 +286,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
300286
req,
301287
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
302288
logger: mockLogger,
303-
loggerWithContext: mockLoggerWithContext,
304289
trackEvent: mockTrackEvent,
305290
db: mockDb,
306291
})
@@ -339,7 +324,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
339324
req,
340325
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
341326
logger: mockLogger,
342-
loggerWithContext: mockLoggerWithContext,
343327
trackEvent: mockTrackEvent,
344328
db: mockDb,
345329
})
@@ -374,7 +358,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
374358
req,
375359
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
376360
logger: mockLogger,
377-
loggerWithContext: mockLoggerWithContext,
378361
trackEvent: mockTrackEvent,
379362
db: mockDb,
380363
})
@@ -411,7 +394,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
411394
req,
412395
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
413396
logger: mockLogger,
414-
loggerWithContext: mockLoggerWithContext,
415397
trackEvent: mockTrackEvent,
416398
db: mockDb,
417399
})
@@ -449,7 +431,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
449431
req,
450432
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
451433
logger: mockLogger,
452-
loggerWithContext: mockLoggerWithContext,
453434
trackEvent: mockTrackEvent,
454435
db: mockDb,
455436
})
@@ -477,7 +458,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
477458
req,
478459
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
479460
logger: mockLogger,
480-
loggerWithContext: mockLoggerWithContext,
481461
trackEvent: mockTrackEvent,
482462
db: mockDb,
483463
})
@@ -505,7 +485,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
505485
req,
506486
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
507487
logger: mockLogger,
508-
loggerWithContext: mockLoggerWithContext,
509488
trackEvent: mockTrackEvent,
510489
db: mockDb,
511490
})
@@ -533,7 +512,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
533512
req,
534513
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
535514
logger: mockLogger,
536-
loggerWithContext: mockLoggerWithContext,
537515
trackEvent: mockTrackEvent,
538516
db: mockDb,
539517
})
@@ -561,7 +539,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
561539
req,
562540
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
563541
logger: mockLogger,
564-
loggerWithContext: mockLoggerWithContext,
565542
trackEvent: mockTrackEvent,
566543
db: mockDb,
567544
})
@@ -605,7 +582,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
605582
req,
606583
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
607584
logger: mockLogger,
608-
loggerWithContext: mockLoggerWithContext,
609585
trackEvent: mockTrackEvent,
610586
db: mockDb,
611587
})
@@ -647,7 +623,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
647623
req,
648624
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
649625
logger: mockLogger,
650-
loggerWithContext: mockLoggerWithContext,
651626
trackEvent: mockTrackEvent,
652627
db: mockDb,
653628
})
@@ -689,7 +664,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
689664
req,
690665
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
691666
logger: mockLogger,
692-
loggerWithContext: mockLoggerWithContext,
693667
trackEvent: mockTrackEvent,
694668
db: mockDb,
695669
})
@@ -724,7 +698,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
724698
req,
725699
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
726700
logger: mockLogger,
727-
loggerWithContext: mockLoggerWithContext,
728701
trackEvent: mockTrackEvent,
729702
db: mockDb,
730703
})
@@ -763,7 +736,6 @@ describe('/api/v1/agent-runs POST endpoint', () => {
763736
req,
764737
getUserInfoFromApiKey: mockGetUserInfoFromApiKey,
765738
logger: mockLogger,
766-
loggerWithContext: mockLoggerWithContext,
767739
trackEvent: mockTrackEvent,
768740
db: mockDb,
769741
})

0 commit comments

Comments
 (0)