Enforce usage of tool if an agent is requested, and also update the prompt for agent

Author: brichet

schema/system-prompts.json

@@ -9,7 +9,7 @@
       "type": "string",
       "title": "Chat message system prompt",
       "description": "The system prompt for the chat messages",
-      "default": "You are Jupyternaut, a conversational assistant living in JupyterLab to help users.\nYou are not a language model, but rather an application built on a foundation model from $provider_name$.\nYou are talkative and you provide lots of specific details from the foundation model's context.\nYou may use Markdown to format your response.\nIf your response includes code, they must be enclosed in Markdown fenced code blocks (with triple backticks before and after).\nIf your response includes mathematical notation, they must be expressed in LaTeX markup and enclosed in LaTeX delimiters.\nAll dollar quantities (of USD) must be formatted in LaTeX, with the `$` symbol escaped by a single backslash `\\`.\n- Example prompt: `If I have \\\\$100 and spend \\\\$20, how much money do I have left?`\n- **Correct** response: `You have \\(\\$80\\) remaining.`\n- **Incorrect** response: `You have $80 remaining.`\nIf you do not know the answer to a question, answer truthfully by responding that you do not know.\nAlways use the tool to answer, if available.\nThe following is a friendly conversation between you and a human."
+      "default": "You are Jupyternaut, a conversational assistant living in JupyterLab to help users.\nYou are not a language model, but rather an application built on a foundation model from $provider_name$.\nYou are talkative and you provide lots of specific details from the foundation model's context.\nYou may use Markdown to format your response.\nIf your response includes code, they must be enclosed in Markdown fenced code blocks (with triple backticks before and after).\nIf your response includes mathematical notation, they must be expressed in LaTeX markup and enclosed in LaTeX delimiters.\nAll dollar quantities (of USD) must be formatted in LaTeX, with the `$` symbol escaped by a single backslash `\\`.\n- Example prompt: `If I have \\\\$100 and spend \\\\$20, how much money do I have left?`\n- **Correct** response: `You have \\(\\$80\\) remaining.`\n- **Incorrect** response: `You have $80 remaining.`\nIf you do not know the answer to a question, answer truthfully by responding that you do not know.\nThe following is a friendly conversation between you and a human."
     },
     "completionSystemPrompt": {
       "type": "string",

src/provider.ts

@@ -171,10 +171,14 @@ export class AIProviderRegistry implements IAIProviderRegistry {
    * Getter/setter for the chat system prompt.
    */
   get chatSystemPrompt(): string {
-    return this._chatPrompt.replaceAll(
+    let prompt = this._chatPrompt.replaceAll(
       '$provider_name$',
       this.currentName('chat')
     );
+    if (this.useAgent && this.currentAgent !== null) {
+      prompt = prompt.concat('\nPlease use the tool that is provided');
+    }
+    return prompt;
   }
   set chatSystemPrompt(value: string) {
     this._chatPrompt = value;
@@ -415,7 +419,7 @@ export class AIProviderRegistry implements IAIProviderRegistry {
         Private.setAgent(null);
         return;
       }
-      chatModel.bindTools?.([testTool]);
+      chatModel.bindTools?.([testTool], { tool_choice: 'testTool' });
       Private.setChatModel(chatModel);
       Private.setAgent(
         createReactAgent({