Cleanup ASYNC_AGENTS_ENABLED

Author: jahooma

backend/src/live-user-inputs.ts

@@ -1,5 +1,3 @@
-import { ASYNC_AGENTS_ENABLED } from '@codebuff/common/old-constants'
-
 import { logger } from './util/logger'
 
 let liveUserInputCheckEnabled = true
@@ -34,14 +32,6 @@ export function cancelUserInput(userId: string, userInputId: string): void {
   }
 }
 
-export function endUserInput(userId: string, userInputId: string): void {
-  if (ASYNC_AGENTS_ENABLED) {
-    // Don't remove user input id, since it can still be triggered by async agents.
-  } else {
-    cancelUserInput(userId, userInputId)
-  }
-}
-
 export function checkLiveUserInput(
   userId: string | undefined,
   userInputId: string,

backend/src/run-agent-step.ts

@@ -2,7 +2,6 @@ import { insertTrace } from '@codebuff/bigquery'
 import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
 import {
-  ASYNC_AGENTS_ENABLED,
   supportsCacheControl,
 } from '@codebuff/common/old-constants'
 import { TOOLS_WHICH_WONT_FORCE_NEXT_STEP } from '@codebuff/common/tools/constants'

backend/src/websockets/server.ts

@@ -1,4 +1,3 @@
-import { ASYNC_AGENTS_ENABLED } from '@codebuff/common/old-constants'
 import { CLIENT_MESSAGE_SCHEMA } from '@codebuff/common/websockets/websocket-schema'
 import { isError } from 'lodash'
 import { WebSocketServer } from 'ws'

backend/src/websockets/websocket-action.ts

@@ -3,10 +3,7 @@ import { trackEvent } from '@codebuff/common/analytics'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
 import db from '@codebuff/common/db/index'
 import * as schema from '@codebuff/common/db/schema'
-import {
-  ASYNC_AGENTS_ENABLED,
-  toOptionalFile,
-} from '@codebuff/common/old-constants'
+import { toOptionalFile } from '@codebuff/common/old-constants'
 import { getErrorObject } from '@codebuff/common/util/error'
 import { ensureEndsWithNewline } from '@codebuff/common/util/file'
 import { generateCompactId } from '@codebuff/common/util/string'
@@ -15,7 +12,6 @@ import { eq } from 'drizzle-orm'
 import {
   cancelUserInput,
   checkLiveUserInput,
-  endUserInput,
   startUserInput,
 } from '../live-user-inputs'
 import { mainPrompt } from '../main-prompt'
@@ -177,7 +173,7 @@ const onPrompt = async (
           message: response,
         })
       } finally {
-        endUserInput(userId, promptId)
+        cancelUserInput(userId, promptId)
         const usageResponse = await genUsageResponse(
           fingerprintId,
           userId,

common/src/old-constants.ts

@@ -13,9 +13,6 @@ export const API_KEY_ENV_VAR = 'CODEBUFF_API_KEY'
 export const INVALID_AUTH_TOKEN_MESSAGE =
   'Invalid auth token. You may have been logged out from the web portal. Please log in again.'
 
-// Enable async agents to run tool calls even when main user input is cancelled
-export const ASYNC_AGENTS_ENABLED = true
-
 // Allowed model prefixes for validation
 export const ALLOWED_MODEL_PREFIXES = [
   'anthropic',

npm-app/src/cli.ts

@@ -5,10 +5,7 @@ import path, { basename, dirname, isAbsolute, parse } from 'path'
 import * as readline from 'readline'
 
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
-import {
-  API_KEY_ENV_VAR,
-  ASYNC_AGENTS_ENABLED,
-} from '@codebuff/common/old-constants'
+import { API_KEY_ENV_VAR } from '@codebuff/common/old-constants'
 import {
   getAllAgents,
   getAgentDisplayName,
@@ -718,9 +715,7 @@ export class CLI {
     const client = Client.getInstance()
     Spinner.get().stop()
     this.isReceivingResponse = false
-    if (!ASYNC_AGENTS_ENABLED) {
-      client.cancelCurrentInput()
-    }
+    client.cancelCurrentInput()
 
     if (this.shouldReconnectWhenIdle) {
       client.reconnect()

npm-app/src/client.ts

@@ -30,7 +30,6 @@ import {
   REQUEST_CREDIT_SHOW_THRESHOLD,
   SHOULD_ASK_CONFIG,
   UserState,
-  ASYNC_AGENTS_ENABLED,
   API_KEY_ENV_VAR,
 } from '@codebuff/common/old-constants'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
@@ -209,7 +208,6 @@ export class Client {
   private costMode: CostMode
   private responseComplete: boolean = false
   private userInputId: string | undefined
-  private nonCancelledUserInputIds: string[] = []
   private currentOnChunk: ((chunk: string | PrintModeEvent) => void) | undefined
 
   public usageData: UsageData = {
@@ -808,17 +806,15 @@ export class Client {
       const { requestId, toolName, input, userInputId, mcpConfig } = action
 
       // Check if the userInputId matches or is from a spawned agent
-      const isValidUserInput = ASYNC_AGENTS_ENABLED
-        ? this.nonCancelledUserInputIds.some((id) => userInputId.startsWith(id))
-        : this.userInputId && userInputId.startsWith(this.userInputId)
+      const isValidUserInput =
+        this.userInputId && userInputId.startsWith(this.userInputId)
 
       if (!isValidUserInput) {
         logger.warn(
           {
             requestId,
             toolName,
             currentUserInputId: this.userInputId,
-            nonCancelledUserInputIds: this.nonCancelledUserInputIds,
             receivedUserInputId: userInputId,
           },
           'User input ID mismatch - rejecting tool call request',
@@ -831,9 +827,7 @@ export class Client {
             {
               type: 'json',
               value: {
-                errorMessage: ASYNC_AGENTS_ENABLED
-                  ? `User input ID mismatch: expected one of ${this.nonCancelledUserInputIds.join(', ')}, got ${userInputId}. That user input id might have been cancelled by the user.`
-                  : `User input ID mismatch: expected ${this.userInputId}, got ${userInputId}. Most likely cancelled by user.`,
+                errorMessage: `User input ID mismatch: expected ${this.userInputId}, got ${userInputId}. Most likely cancelled by user.`,
               },
             },
           ],
@@ -1131,9 +1125,6 @@ export class Client {
     loggerContext.clientRequestId = userInputId
     const startTime = Date.now() // Capture start time
 
-    // Add to non-cancelled list
-    this.nonCancelledUserInputIds.push(userInputId)
-
     const f = this.subscribeToResponse.bind(this)
 
     const { responsePromise, stopResponse } = f(
@@ -1319,11 +1310,6 @@ export class Client {
       return
     }
 
-    // Remove the cancelled input ID from the non-cancelled list
-    this.nonCancelledUserInputIds = this.nonCancelledUserInputIds.filter(
-      (id) => id !== this.userInputId,
-    )
-
     sendActionAndHandleError(this.webSocket, {
       type: 'cancel-user-input',
       authToken: this.user?.authToken,
@@ -1562,10 +1548,8 @@ Go to https://www.codebuff.com/config for more information.`) +
         // Always cleanup xmlStreamParser to prevent memory leaks and MaxListenersExceededWarning
         xmlStreamParser.end()
 
-        if (!ASYNC_AGENTS_ENABLED) {
-          unsubscribeChunks()
-          unsubscribeComplete()
-        }
+        unsubscribeChunks()
+        unsubscribeComplete()
 
         // Clear the onChunk callback when response is complete
         this.currentOnChunk = undefined