change WithDefaults to OptionalFields

Author: charleslien

backend/src/main-prompt.ts

@@ -26,8 +26,6 @@ export const mainPrompt = async (
     ws: WebSocket
     action: ClientAction<'prompt'>
 
-    userId: string | undefined
-    clientSessionId: string
     onResponseChunk: (chunk: string | PrintModeEvent) => void
     localAgentTemplates: Record<string, AgentTemplate>
 
@@ -51,8 +49,7 @@ export const mainPrompt = async (
   sessionState: SessionState
   output: AgentOutput
 }> => {
-  const { ws, action, userId, clientSessionId, localAgentTemplates, logger } =
-    params
+  const { ws, action, localAgentTemplates, logger } = params
 
   const {
     prompt,

backend/src/tools/handlers/tool/spawn-agent-utils.ts

@@ -14,7 +14,10 @@ import type {
   Subgoal,
 } from '@codebuff/common/types/session-state'
 import type { ProjectFileContext } from '@codebuff/common/util/file'
-import type { ParamsExcluding, WithDefaults } from '@codebuff/common/types/function-params'
+import type {
+  ParamsExcluding,
+  OptionalFields,
+} from '@codebuff/common/types/function-params'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type { WebSocket } from 'ws'
 
@@ -310,7 +313,7 @@ export function logAgentSpawn(params: {
  * Executes a subagent using loopAgentSteps
  */
 export async function executeSubagent(
-  options: WithDefaults<
+  options: OptionalFields<
     {
       agentTemplate: AgentTemplate
       parentAgentState: AgentState

common/src/types/function-params.ts

@@ -16,7 +16,7 @@ export type ParamsOf<T> = Prettify<
   T extends any[] ? ParamsOfArray<T> : ParamsOfUnion<T>
 >
 
-export type WithDefaults<T, K extends keyof T> = Prettify<
+export type OptionalFields<T, K extends keyof T> = Prettify<
   Omit<T, K> & Partial<Pick<T, K>>
 >
 

packages/billing/src/balance-calculator.ts

@@ -7,13 +7,13 @@ import { failure, success } from '@codebuff/common/util/error'
 import { and, asc, gt, isNull, or, eq, sql } from 'drizzle-orm'
 
 import type { GrantType } from '@codebuff/common/db/schema'
-import type { ErrorOr } from '@codebuff/common/util/error'
+import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type {
   ParamsExcluding,
   ParamsOf,
-  WithDefaults,
+  OptionalFields,
 } from '@codebuff/common/types/function-params'
-import type { Logger } from '@codebuff/common/types/contracts/logger'
+import type { ErrorOr } from '@codebuff/common/util/error'
 
 export interface CreditBalance {
   totalRemaining: number
@@ -200,7 +200,7 @@ export async function consumeFromOrderedGrants(
  * This is more efficient than calculating them separately.
  */
 export async function calculateUsageAndBalance(
-  params: WithDefaults<
+  params: OptionalFields<
     {
       userId: string
       quotaResetDate: Date

packages/billing/src/org-billing.ts

@@ -15,8 +15,8 @@ import type {
   CreditConsumptionResult,
 } from './balance-calculator'
 import type { GrantType } from '@codebuff/common/db/schema'
-import type { WithDefaults } from '@codebuff/common/types/function-params'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
+import type { OptionalFields } from '@codebuff/common/types/function-params'
 
 // Add a minimal structural type that both `db` and `tx` satisfy
 type DbConn = Pick<typeof db, 'select' | 'update'>
@@ -128,7 +128,7 @@ export async function syncOrganizationBillingCycle(params: {
  * Gets active grants for an organization, ordered by expiration, priority, and creation date.
  */
 export async function getOrderedActiveOrganizationGrants(
-  params: WithDefaults<
+  params: OptionalFields<
     {
       organizationId: string
       now: Date
@@ -163,7 +163,7 @@ export async function getOrderedActiveOrganizationGrants(
  * Calculates both the current balance and usage in this cycle for an organization.
  */
 export async function calculateOrganizationUsageAndBalance(
-  params: WithDefaults<
+  params: OptionalFields<
     {
       organizationId: string
       quotaResetDate: Date
@@ -310,7 +310,7 @@ export async function consumeOrganizationCredits(params: {
  * Grants credits to an organization.
  */
 export async function grantOrganizationCredits(
-  params: WithDefaults<
+  params: OptionalFields<
     {
       organizationId: string
       userId: string

packages/internal/src/loops/client.ts

@@ -4,7 +4,10 @@ import { eq } from 'drizzle-orm'
 import { LoopsClient, APIError } from 'loops'
 
 import type { LoopsEmailData, SendEmailResult } from './types'
-import type { ParamsExcluding, WithDefaults } from '@codebuff/common/types/function-params'
+import type {
+  ParamsExcluding,
+  OptionalFields,
+} from '@codebuff/common/types/function-params'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 
 const ORGANIZATION_INVITATION_TRANSACTIONAL_ID = 'cmbikixxm15xo4a0iiemzkzw1'
@@ -17,7 +20,7 @@ if (process.env.LOOPS_API_KEY) {
 }
 
 async function sendTransactionalEmail(
-  params: WithDefaults<
+  params: OptionalFields<
     {
       transactionalId: string
       email: string