@xalia/agent 0.6.9 → 0.6.10

package/scripts/test_chat

@@ -45,8 +45,9 @@ function stop_chat_server() {
 stop_chat_server
 
 # Start the server with full logging and short heartbeat timeout.
-export DEFAULT_LLM_MODEL=repeat
-export DEVELOPMENT=1
+export DEFAULT_LLM_MODEL="repeat:Main agent message"
+export RACE_MODE_MODEL="repeat:Agent B message"
+export TEST=1
 export GEN_IMAGE_MODEL=dummy:test_data/dummyllm_script_image_gen.json
 
 LOG_LEVEL=debug \
@@ -99,27 +100,27 @@ pushd _test_chat
   ${client} agent-profile set profile0 --profile agent_profile.json | jq -r .uuid > agent_profile.uuid
   agent_profile_id=`cat agent_profile.uuid`
 
-  # User 0 tries to join with invalid API key - fails with "invalid api key" error
+  # # User 0 tries to join with invalid API key - fails with "invalid api key" error
 
-  invalid_apikey0="invalid_api_key"
-  ${agent} chat client --session-id no_such_session --api-key "${invalid_apikey0}" 2>&1 | tee invalid_apikey_test.log | grep -i "invalid api key" || \
-      (echo "Expected 'invalid api key' error message"; cat invalid_apikey_test.log; exit 1)
+  # invalid_apikey0="invalid_api_key"
+  # ${agent} chat client --session-id no_such_session --api-key "${invalid_apikey0}" 2>&1 | tee invalid_apikey_test.log | grep -i "invalid api key" || \
+  #     (echo "Expected 'invalid api key' error message"; cat invalid_apikey_test.log; exit 1)
 
-  # User 0 tries to join non-existant session - fails
+  # # User 0 tries to join non-existant session - fails
 
-  ${agent} chat clear-sessions
-  ${agent} chat client --session-id no_such_session && \
-      (echo "Should not be able to join"; exit 1)
+  # ${agent} chat clear-sessions
+  # ${agent} chat client --session-id no_such_session && \
+  #     (echo "Should not be able to join"; exit 1)
 
-  # User 0 creates a new session with `crash_agent_profile` and interacts with
-  # it, exercising LLM error conditions.
+  # # User 0 creates a new session with `crash_agent_profile` and interacts with
+  # # it, exercising LLM error conditions.
 
-  echo ':si crash_session.id' > crash_script
-  echo 'Hello' >> crash_script
-  echo 'Hello again' >> crash_script
-  ${agent} chat client --session-title crash_test_session \
-           --agent-profile-id ${crash_agent_profile_id} \
-           --script crash_script
+  # echo ':si crash_session.id' > crash_script
+  # echo 'Hello' >> crash_script
+  # echo 'Hello again' >> crash_script
+  # ${agent} chat client --session-title crash_test_session \
+  #          --agent-profile-id ${crash_agent_profile_id} \
+  #          --script crash_script
 
   # User 0 creates empty session, which should not appear in the DB.
 
@@ -133,165 +134,183 @@ pushd _test_chat
 
   # User 0 creates a user session, sends message and writes session id to file
 
-  echo ':pause-agent 1' > init_session
-  echo 'tell me a joke' >> init_session
-  echo ':si session.id' >> init_session
-  echo ':share-session guest.key' >> init_session
-  echo ':pause-agent 0' >> init_session
-  echo 'now please' >> init_session
-  ${agent} chat client --session-title test_session \
-           --agent-profile-id ${agent_profile_id} \
-           --script init_session
-  session_id=`cat session.id`
-  guest_key=`cat guest.key`
-
-  # Check that the session got saved with the updated title
-
-  ${agent} chat list-sessions | grep '"title":"tell me a joke"'
-
-  # Check that a guest can join with the guest key
-
-  echo ":sleep 1000" > guest_script
-  echo "Hello from the guest" >> guest_script
+  echo ':si session.id' > race_mode
+  echo 'tell me a joke' > race_mode
+  echo 'race: tell me a longer joke' >> race_mode
+  echo ':sleep 10000' >> race_mode
+  echo 'B' >> race_mode
   ${agent} chat client \
-           --session-id ${session_id} \
-           --api-key ${guest_key} \
-           --script guest_script | tee guest_output.txt
-  grep "joke" guest_output.txt
-  grep "[Guest]" guest_output.txt
-
-  # Dummy session to invoke the image generation
-
-  echo '{"system_prompt":"prompt","model":"dummy:test_data/dummyllm_script_invoke_image_gen_tool.json","mcp_settings":{}}' > invoke_gen_image_profile.json
-  ${client} agent-profile set invoke_gen_image_agent_profile \
-            --profile invoke_gen_image_profile.json \
-      | jq -r .uuid > invoke_gen_image_profile.uuid
-  invoke_gen_image_profile_id=`cat invoke_gen_image_profile.uuid`
-
-  echo "Choose an animal and generate an image of it" > invoke_gen_image_script
-  echo ":list-files" >> invoke_gen_image_script
-  echo ":si invoke_gen_image.id" >> invoke_gen_image_script
-  echo ':add-custom-mcp-server custom-mcp http://localhost:8002' >> invoke_gen_image_script
-  echo ':list-custom-mcp-servers' >> invoke_gen_image_script
-
-  LOG_LEVEL=debug \
-      ${agent} chat client \
-      --session-title invoke_gen_image_session \
-      --agent-profile-id ${invoke_gen_image_profile_id} \
-      --script invoke_gen_image_script | tee invoke_gen_image_output.txt
-  grep 'frog.png' invoke_gen_image_output.txt
-  grep '"xalia/fileMimeType":"image/png"' invoke_gen_image_output.txt
-  grep 'structuredContent example' invoke_gen_image_output.txt
-  grep '_meta example' invoke_gen_image_output.txt
-  grep 'custom-mcp": ' invoke_gen_image_output.txt
-
-  # User 1 tries to join the session.  Should be rejected.
-
-  ${agent} chat client --session-id ${session_id} --api-key ${apikey1} \
-           --script init_session > join_unauthorized.log 2>&1 && \
-      (echo "Should exit with error when joining invalid session"; exit 1)
-
-  grep -i "not authorized" join_unauthorized.log || \
-      (echo "Should include error message"; exit 1)
-
-  # User 0 create a team, and write team id to a file
-
-  echo ':ct team0' > script_create_team
-  echo ':ci team0.id' >> script_create_team
-  ${agent} chat client \
-           --session-id ${session_id} \
-           --script script_create_team
-  team_id=`cat team0.id`
-
-  # User 0 create a new team session (including a new paused agent), and write
-  # session id to a file.  Extract the agent_profile UUID.
-
-  echo ':pause-agent 1' > script_team_chat
-  echo 'tell me a joke' >> script_team_chat
-  echo ':si team_session.id' >> script_team_chat
-  ${agent} chat client --session-title test_team_session \
-           --team-id ${team_id} \
-           --script script_team_chat | tee team_chat_1
-  team_session_id=`cat team_session.id`
-
-  get_profile_id_query='.[] | select(.uuid=="'${team_session_id}'") | .agent_profile_uuid'
-  ${agent} chat list-sessions | jq -r "${get_profile_id_query}" > team_agent.id
-  team_agent_id=`cat team_agent.id`
-
-  # Check that the agent has not said anything
-
-  grep AGENT team_chat_1 && \
-      (echo "Unexpected AGENT messages"; exit 1)
-
-  # User 1 tries to join the team session.  Should be rejected.
-
-  ${agent} chat client --session-id ${team_session_id} --api-key ${apikey1} \
-           --script init_session > join_unauthorized_team.log 2>&1 && \
-      (echo "Should exit with error when joining invalid team session"; exit 1)
-  grep -i "not authorized" join_unauthorized_team.log || \
-      (echo "Should include error message (no auth team session)"; exit 1)
-
-  # User0 sets up the session
-  #   add charuser1 to the team
-  #   add duckduckgo-search
-  #   add a session file (md file)
-  #   add an image to the workspace
-  #   unpause the agent
-
-  echo ":ap ${team_id} chatuser1" > script_setup_team_session
-  echo ':lp' >> script_setup_team_session
-  echo ":as duckduckgo-search" >> script_setup_team_session
-  echo ':put-file plan.md data:text/markdown,#PLAN\n##STEP1\n##STEP2\n' \
-       >> script_setup_team_session
-  echo ':sw file:../test_data/frog.png For context, this image represents our shared workspace' >> script_setup_team_session
-  echo ':pause-agent 0' >> script_setup_team_session
-  ${agent} chat client \
-           --session-id ${team_session_id} \
-           --script script_setup_team_session
-
-  # checks the DB for chatuser2 participant and duckduckgo mcp server
-
-  ${agent} chat list-participants --session ${team_session_id} | grep chatuser1
-  ${client} agent-profile get ${team_agent_id} | grep duckduckgo
-
-  # Check the state.  Clean the workspace, file and mcp servers
-
-  echo ':sleep 1000' > script_check_state
-  echo ':list-files filelist.json' >> script_check_state
-  echo 'Tell me about the image in our workspace?' >> script_check_state
-  echo ':sw' >> script_check_state
-  echo 'How many steps are in plan.md?' >> script_check_state
-  echo ':sleep 5000' >> script_check_state
-  echo ':delete-file plan.md' >> script_check_state
-  echo ':rs duckduckgo-search' >> script_check_state
-  ${agent} chat client \
-           --session-id ${team_session_id} \
-           --script script_check_state
-
-  sleep 1
-
-  # Check duckduckgo-search got removed
-  (${client} agent-profile get ${team_agent_id} | grep duckduckgo) && ( \
-      echo "ERROR: expected duckduckgo to be removed from agent profile" ; \
-      exit 1 \
-      )
-
-  # Check the file manager list
-  grep 'plan.md' filelist.json
-
-  # Run both clients with a script that continues the conversation
-
-  echo -e "why is that funny?\ntell me another.\nwhat is my name?\nhow old are you?\nwhere are your parents?" > script1
-  ${agent} chat client --session-id ${team_session_id} --script script1 &
-  pid0=$!
-  ${agent} chat client --session-id ${team_session_id} --api-key ${apikey1} --script script1 >chatuser1.output
-  wait ${pid0}
-
-  # The name chatuser0 and AGENT should appear in chatuser1's session output
-
-  grep "Chat User0" chatuser1.output
-  grep "Chat User1" chatuser1.output
-  grep AGENT chatuser1.output
+           --session-title test_session \
+           --agent-profile-id ${agent_profile_id} \
+           --script race_mode
+
+  # echo ':pause-agent 1' > init_session
+  # echo 'tell me a joke' >> init_session
+  # echo ':si session.id' >> init_session
+  # echo ':share-session guest.key' >> init_session
+  # echo ':pause-agent 0' >> init_session
+  # echo 'now please' >> init_session
+  # ${agent} chat client --session-title test_session \
+  #          --agent-profile-id ${agent_profile_id} \
+  #          --script init_session
+  # session_id=`cat session.id`
+  # guest_key=`cat guest.key`
+
+  # # Check that the session got saved with the updated title
+
+  # ${agent} chat list-sessions | grep '"title":"tell me a joke"'
+
+  # # Try race-mode
+  # echo 'race: tell me a better joke' > race_mode
+  # echo ':sleep 5000' >> race_mode
+  # echo 'B' >> race_mode
+  # ${agent} chat client \
+  #          --session-id ${session_id} \
+  #          --script race_mode | tee race_mode_output.txt
+
+  # # Check that a guest can join with the guest key
+
+  # echo ":sleep 1000" > guest_script
+  # echo "Hello from the guest" >> guest_script
+  # ${agent} chat client \
+  #          --session-id ${session_id} \
+  #          --api-key ${guest_key} \
+  #          --script guest_script | tee guest_output.txt
+  # grep "joke" guest_output.txt
+  # grep "[Guest]" guest_output.txt
+
+  # # Dummy session to invoke the image generation
+
+  # echo '{"system_prompt":"prompt","model":"dummy:test_data/dummyllm_script_invoke_image_gen_tool.json","mcp_settings":{}}' > invoke_gen_image_profile.json
+  # ${client} agent-profile set invoke_gen_image_agent_profile \
+  #           --profile invoke_gen_image_profile.json \
+  #     | jq -r .uuid > invoke_gen_image_profile.uuid
+  # invoke_gen_image_profile_id=`cat invoke_gen_image_profile.uuid`
+
+  # echo "Choose an animal and generate an image of it" > invoke_gen_image_script
+  # echo ":list-files" >> invoke_gen_image_script
+  # echo ":si invoke_gen_image.id" >> invoke_gen_image_script
+  # echo ':add-custom-mcp-server custom-mcp http://localhost:8002' >> invoke_gen_image_script
+  # echo ':list-custom-mcp-servers' >> invoke_gen_image_script
+
+  # LOG_LEVEL=debug \
+  #     ${agent} chat client \
+  #     --session-title invoke_gen_image_session \
+  #     --agent-profile-id ${invoke_gen_image_profile_id} \
+  #     --script invoke_gen_image_script | tee invoke_gen_image_output.txt
+  # grep 'frog.png' invoke_gen_image_output.txt
+  # grep '"xalia/fileMimeType":"image/png"' invoke_gen_image_output.txt
+  # grep 'structuredContent example' invoke_gen_image_output.txt
+  # grep '_meta example' invoke_gen_image_output.txt
+  # grep 'custom-mcp": ' invoke_gen_image_output.txt
+
+  # # User 1 tries to join the session.  Should be rejected.
+
+  # ${agent} chat client --session-id ${session_id} --api-key ${apikey1} \
+  #          --script init_session > join_unauthorized.log 2>&1 && \
+  #     (echo "Should exit with error when joining invalid session"; exit 1)
+
+  # grep -i "not authorized" join_unauthorized.log || \
+  #     (echo "Should include error message"; exit 1)
+
+  # # User 0 create a team, and write team id to a file
+
+  # echo ':ct team0' > script_create_team
+  # echo ':ci team0.id' >> script_create_team
+  # ${agent} chat client \
+  #          --session-id ${session_id} \
+  #          --script script_create_team
+  # team_id=`cat team0.id`
+
+  # # User 0 create a new team session (including a new paused agent), and write
+  # # session id to a file.  Extract the agent_profile UUID.
+
+  # echo ':pause-agent 1' > script_team_chat
+  # echo 'tell me a joke' >> script_team_chat
+  # echo ':si team_session.id' >> script_team_chat
+  # ${agent} chat client --session-title test_team_session \
+  #          --team-id ${team_id} \
+  #          --script script_team_chat | tee team_chat_1
+  # team_session_id=`cat team_session.id`
+
+  # get_profile_id_query='.[] | select(.uuid=="'${team_session_id}'") | .agent_profile_uuid'
+  # ${agent} chat list-sessions | jq -r "${get_profile_id_query}" > team_agent.id
+  # team_agent_id=`cat team_agent.id`
+
+  # # Check that the agent has not said anything
+
+  # grep AGENT team_chat_1 && \
+  #     (echo "Unexpected AGENT messages"; exit 1)
+
+  # # User 1 tries to join the team session.  Should be rejected.
+
+  # ${agent} chat client --session-id ${team_session_id} --api-key ${apikey1} \
+  #          --script init_session > join_unauthorized_team.log 2>&1 && \
+  #     (echo "Should exit with error when joining invalid team session"; exit 1)
+  # grep -i "not authorized" join_unauthorized_team.log || \
+  #     (echo "Should include error message (no auth team session)"; exit 1)
+
+  # # User0 sets up the session
+  # #   add charuser1 to the team
+  # #   add duckduckgo-search
+  # #   add a session file (md file)
+  # #   add an image to the workspace
+  # #   unpause the agent
+
+  # echo ":ap ${team_id} chatuser1" > script_setup_team_session
+  # echo ':lp' >> script_setup_team_session
+  # echo ":as duckduckgo-search" >> script_setup_team_session
+  # echo ':put-file plan.md data:text/markdown,#PLAN\n##STEP1\n##STEP2\n' \
+  #      >> script_setup_team_session
+  # echo ':sw file:../test_data/frog.png For context, this image represents our shared workspace' >> script_setup_team_session
+  # echo ':pause-agent 0' >> script_setup_team_session
+  # ${agent} chat client \
+  #          --session-id ${team_session_id} \
+  #          --script script_setup_team_session
+
+  # # checks the DB for chatuser2 participant and duckduckgo mcp server
+
+  # ${agent} chat list-participants --session ${team_session_id} | grep chatuser1
+  # ${client} agent-profile get ${team_agent_id} | grep duckduckgo
+
+  # # Check the state.  Clean the workspace, file and mcp servers
+
+  # echo ':sleep 1000' > script_check_state
+  # echo ':list-files filelist.json' >> script_check_state
+  # echo 'Tell me about the image in our workspace?' >> script_check_state
+  # echo ':sw' >> script_check_state
+  # echo 'How many steps are in plan.md?' >> script_check_state
+  # echo ':sleep 5000' >> script_check_state
+  # echo ':delete-file plan.md' >> script_check_state
+  # echo ':rs duckduckgo-search' >> script_check_state
+  # ${agent} chat client \
+  #          --session-id ${team_session_id} \
+  #          --script script_check_state
+
+  # sleep 1
+
+  # # Check duckduckgo-search got removed
+  # (${client} agent-profile get ${team_agent_id} | grep duckduckgo) && ( \
+  #     echo "ERROR: expected duckduckgo to be removed from agent profile" ; \
+  #     exit 1 \
+  #     )
+
+  # # Check the file manager list
+  # grep 'plan.md' filelist.json
+
+  # # Run both clients with a script that continues the conversation
+
+  # echo -e "why is that funny?\ntell me another.\nwhat is my name?\nhow old are you?\nwhere are your parents?" > script1
+  # ${agent} chat client --session-id ${team_session_id} --script script1 &
+  # pid0=$!
+  # ${agent} chat client --session-id ${team_session_id} --api-key ${apikey1} --script script1 >chatuser1.output
+  # wait ${pid0}
+
+  # # The name chatuser0 and AGENT should appear in chatuser1's session output
+
+  # grep "Chat User0" chatuser1.output
+  # grep "Chat User1" chatuser1.output
+  # grep AGENT chatuser1.output
 
 popd
 

package/src/agent/agent.ts

@@ -20,9 +20,15 @@ import { IAgentEventHandler } from "./iAgentEventHandler";
 import { IContextManager, IContextTransaction } from "./context";
 import { ChatCompletionContentPartImage } from "openai/resources";
 
+import { MAX_TOOL_CALL_RESPONSE_LENGTH } from "./toolSettings";
+
 export const DEFAULT_LLM_URL = "http://localhost:5001/v1";
 
-const MAX_TOOL_CALL_RESPONSE_LENGTH = 4000;
+/**
+ * The message to append to the agent output if the agent is interrupted by a
+ * signal from the user.
+ */
+export const USER_STOP_MESSAGE = " AGENT INTERRUPTED";
 
 /**
  * An agent's response, with optional extra image data.
@@ -102,10 +108,21 @@ type RegisteredTools = {
   handler: ToolHandler;
 };
 
+/**
+ * An agent attached to an ILLM which updates a context via an
+ * IContextTransaction interface (where IContextTransaction is like a DB tx or
+ * DB writer, for staging changes and reading back state as-if those changes
+ * were applied).
+ */
 export class AgentEx {
   mcpServerManager: McpServerManager;
   llm: ILLM;
 
+  /// Flag to stop the Agent loop.
+  stopFlag: boolean;
+  /// Function to stop the LLM (only present while it is active)
+  stopFn: ((msg: string) => void) | undefined;
+
   /// The full list of tools, ready to pass to the LLM
   private tools: ToolDescriptor[] = [];
 
@@ -116,12 +133,22 @@ export class AgentEx {
   constructor(mcpServerManager: McpServerManager, llm: ILLM) {
     this.mcpServerManager = mcpServerManager;
     this.llm = llm;
+    this.stopFlag = false;
+    this.stopFn = undefined;
   }
 
   public async shutdown(): Promise<void> {
+    this.stop("shutting down");
     return this.mcpServerManager.shutdown();
   }
 
+  public stop(msg?: string) {
+    this.stopFlag = true;
+    if (this.stopFn) {
+      this.stopFn(msg || USER_STOP_MESSAGE);
+    }
+  }
+
   public getMcpServerManager(): McpServerManager {
     return this.mcpServerManager;
   }
@@ -131,6 +158,8 @@ export class AgentEx {
     contextTx: IContextTransaction,
     eventHandler: IAgentEventHandler
   ): Promise<AssistantResponse | undefined> {
+    this.stopFlag = false;
+
     // New user messages have already been added to the `contextTx`.
 
     // Image and audio handling
@@ -157,6 +186,12 @@ export class AgentEx {
     // While there are tool calls to make, invoke them and loop
 
     while (message.tool_calls && message.tool_calls.length > 0) {
+      // Signal the event handler of the assistant message with tool calls
+      // BEFORE processing tool results. This ensures the order of messages
+      // in pendingMessages matches the order in the LLM context:
+      // [user, assistant(tool_calls), tool_result, assistant(final)]
+      eventHandler.onCompletion(message);
+
       // TODO: Execute all tool calls in parallel
 
       // [indexInContext, ToolCallResult][]
@@ -180,6 +215,12 @@ export class AgentEx {
         const toolResultHandle = contextTx.addMessage(toolResult);
         toolCallResults.push([toolResultHandle, result]);
 
+        // Immediately broadcast the tool result to the frontend for UI
+        // feedback. This ensures the frontend knows the tool executed
+        // successfully without waiting for the next LLM completion to
+        // finish streaming
+        eventHandler.onToolCallResult(toolResult);
+
         // If the tool call requested that its args be redacted, this can be
         // done now - before the next LLM invocation.
 
@@ -192,11 +233,6 @@ export class AgentEx {
         }
       }
 
-      // Now that any args have been overwritten, signal the event handler of
-      // the prevoius completion.
-
-      eventHandler.onCompletion(message);
-
       // Get a new completion using the untouched tool call results.  Note
       // that, since we are deferring the `onToolCallResult` calls (so they
       // can be redacted), we must take care that the errors in
@@ -212,19 +248,16 @@ export class AgentEx {
         contextTx.addMessage(message);
       } finally {
         // Now that the tool call results have been passed to the LLM, perform
-        // any updates on them.  Pass the (updated) tool-call-result LLM
-        // messages to the event handler - note, we want to do this even if an
-        // error occured, so that the caller has an up-to-date picture of the
-        // context state when the error occured.
+        // any updates on them if overwriteResponse was requested. If so, send
+        // the updated tool result to the frontend to replace the original.
 
         toolCallResults.forEach(([handle, tcr]) => {
-          const ctxMsg = contextTx.getMessage(handle);
           if (tcr.overwriteResponse) {
+            const ctxMsg = contextTx.getMessage(handle);
             ctxMsg.content = tcr.overwriteResponse;
+            assert(ctxMsg.role === "tool");
+            eventHandler.onToolCallResult(ctxMsg);
           }
-
-          assert(ctxMsg.role === "tool");
-          eventHandler.onToolCallResult(ctxMsg);
         });
 
         // Note, if an error DID occur, the ContextManager does not see any of
@@ -242,6 +275,27 @@ export class AgentEx {
     context: MessageParam[],
     eventHandler: IAgentEventHandler
   ): Promise<Completion> {
+    if (this.stopFlag) {
+      return {
+        id: "user_stopped",
+        choices: [
+          {
+            finish_reason: "stop",
+            index: 0,
+            message: {
+              content: USER_STOP_MESSAGE,
+              role: "assistant",
+              refusal: null,
+            },
+            logprobs: null,
+          },
+        ],
+        created: Date.now(),
+        model: this.llm.getModel(),
+        object: "chat.completion",
+      };
+    }
+
     // Compute the full list of available tools
 
     let tools: ToolDescriptor[] | undefined;
@@ -252,12 +306,27 @@ export class AgentEx {
       tools = enabledTools;
     }
     logger.debug(`[chatCompletion] tools: ${JSON.stringify(tools)}`);
-    const completion = await this.llm.getConversationResponse(
-      context,
-      tools,
-      eventHandler.onAgentMessage.bind(eventHandler),
-      eventHandler.onReasoning.bind(eventHandler)
-    );
+
+    // Log system prompt length
+    if (context.length > 0 && context[0].role === "system") {
+      const systemPrompt = context[0].content as string;
+      logger.info(
+        `[chatCompletion] System prompt length: ${String(systemPrompt.length)}`
+      );
+    }
+
+    const { stop, completion: completionP } =
+      await this.llm.getConversationResponse(
+        context,
+        tools,
+        eventHandler.onAgentMessage.bind(eventHandler),
+        eventHandler.onReasoning.bind(eventHandler)
+      );
+
+    this.stopFn = stop;
+    const completion = await completionP;
+    this.stopFn = undefined;
+
     logger.debug(`Received chat completion ${JSON.stringify(completion)}`);
     return completion;
   }
@@ -310,6 +379,10 @@ export class AgentEx {
     toolCall: MessageToolCall,
     eventHandler: IAgentEventHandler
   ): Promise<ToolCallResult> {
+    if (this.stopFlag) {
+      return { response: USER_STOP_MESSAGE };
+    }
+
     // If the tool is and "agent" (internal) tool, we can just execute it.
     // Otherwise, call the event handler to get permission and invoke the
     // external tool handler.
@@ -390,8 +463,10 @@ export class AgentEx {
 }
 
 /**
- * Higher-level abstraction over AgentEx, which abstracts out the transactions
- * to the context manager.
+ * Higher-level abstraction over AgentEx, which abstracts out the context
+ * transactions.  A single agent is associated with an IContextManager and
+ * internally creates and commits transactions during each call to
+ * `userMessage*`.
  */
 export class Agent implements IConversation {
   private eventHandler: IAgentEventHandler;
@@ -564,7 +639,7 @@ export function createUserMessageEnsure(
   name?: string
 ): UserMessageParam {
   const userMsg = createUserMessage(msg, imageB64, name);
-  assert(userMsg);
+  assert(userMsg, "createUserMessageEnsure");
   return userMsg;
 }
 

package/src/agent/agentUtils.ts

@@ -125,8 +125,9 @@ export async function createSpecializedLLM(
 
   if (model && model.startsWith("dummy:")) {
     llm = await DummyLLM.initFromModelUrl(model, platform);
-  } else if (model === "repeat") {
-    llm = new RepeatLLM();
+  } else if (model && model.startsWith("repeat")) {
+    const prefix = model.startsWith("repeat:") ? model.slice(7) : "";
+    llm = new RepeatLLM(prefix);
   }
   return llm;
 }