Auto resolve conflict by keeping our changes

docs/README.md

@@ -6,6 +6,7 @@ General explanations of the available functionality and examples of how to use
 the SDK are available by topic:
 
 * [Ai](ai.md)
+* [Aistudio](aistudio.md)
 * [Appitemassociations](appitemassociations.md)
 * [Authorization](authorization.md)
 * [Avatars](avatars.md)

docs/aistudio.md

@@ -0,0 +1,158 @@
+# AiStudioManager
+
+
+- [List AI agents](#list-ai-agents)
+- [Create AI agent](#create-ai-agent)
+- [Update AI agent](#update-ai-agent)
+- [Get AI agent by agent ID](#get-ai-agent-by-agent-id)
+- [Delete AI agent](#delete-ai-agent)
+
+## List AI agents
+
+Lists AI agents based on the provided parameters.
+
+This operation is performed by calling function `getAiAgents`.
+
+See the endpoint docs at
+[API Reference](https://developer.box.com/reference/get-ai-agents/).
+
+<!-- sample get_ai_agents -->
+```
+client.getAiStudio().getAiAgents()
+```
+
+### Arguments
+
+- queryParams `GetAiAgentsQueryParams`
+  - Query parameters of getAiAgents method
+- headers `GetAiAgentsHeaders`
+  - Headers of getAiAgents method
+
+
+### Returns
+
+This function returns a value of type `AiMultipleAgentResponse`.
+
+A successful response including the agents list.
+
+
+## Create AI agent
+
+Creates an AI agent. At least one of the following capabilities must be provided: `ask`, `text_gen`, `extract`.
+
+This operation is performed by calling function `createAiAgent`.
+
+See the endpoint docs at
+[API Reference](https://developer.box.com/reference/post-ai-agents/).
+
+<!-- sample post_ai_agents -->
+```
+client.getAiStudio().createAiAgent(new CreateAiAgent.CreateAiAgentBuilder(agentName, "enabled").ask(new AiStudioAgentAsk("enabled", "desc1")).build())
+```
+
+### Arguments
+
+- requestBody `CreateAiAgent`
+  - Request body of createAiAgent method
+- headers `CreateAiAgentHeaders`
+  - Headers of createAiAgent method
+
+
+### Returns
+
+This function returns a value of type `AiSingleAgentResponseFull`.
+
+Definition of created AI agent.
+
+
+## Update AI agent
+
+Updates an AI agent.
+
+This operation is performed by calling function `updateAiAgentById`.
+
+See the endpoint docs at
+[API Reference](https://developer.box.com/reference/put-ai-agents-id/).
+
+<!-- sample put_ai_agents_id -->
+```
+client.getAiStudio().updateAiAgentById(createdAgent.getId(), new CreateAiAgent.CreateAiAgentBuilder(agentName, "enabled").ask(new AiStudioAgentAsk("disabled", "desc2")).build())
+```
+
+### Arguments
+
+- agentId `String`
+  - The ID of the agent to update. Example: "1234"
+- requestBody `CreateAiAgent`
+  - Request body of updateAiAgentById method
+- headers `UpdateAiAgentByIdHeaders`
+  - Headers of updateAiAgentById method
+
+
+### Returns
+
+This function returns a value of type `AiSingleAgentResponseFull`.
+
+Definition of created AI agent.
+
+
+## Get AI agent by agent ID
+
+Gets an AI Agent using the `agent_id` parameter.
+
+This operation is performed by calling function `getAiAgentById`.
+
+See the endpoint docs at
+[API Reference](https://developer.box.com/reference/get-ai-agents-id/).
+
+<!-- sample get_ai_agents_id -->
+```
+client.getAiStudio().getAiAgentById(createdAgent.getId(), new GetAiAgentByIdQueryParams.GetAiAgentByIdQueryParamsBuilder().fields(Arrays.asList("ask")).build())
+```
+
+### Arguments
+
+- agentId `String`
+  - The agent id to get. Example: "1234"
+- queryParams `GetAiAgentByIdQueryParams`
+  - Query parameters of getAiAgentById method
+- headers `GetAiAgentByIdHeaders`
+  - Headers of getAiAgentById method
+
+
+### Returns
+
+This function returns a value of type `AiSingleAgentResponseFull`.
+
+A successful response including the agent.
+
+
+## Delete AI agent
+
+Deletes an AI agent using the provided parameters.
+
+This operation is performed by calling function `deleteAiAgentById`.
+
+See the endpoint docs at
+[API Reference](https://developer.box.com/reference/delete-ai-agents-id/).
+
+<!-- sample delete_ai_agents_id -->
+```
+client.getAiStudio().deleteAiAgentById(createdAgent.getId())
+```
+
+### Arguments
+
+- agentId `String`
+  - The ID of the agent to delete. Example: "1234"
+- headers `DeleteAiAgentByIdHeaders`
+  - Headers of deleteAiAgentById method
+
+
+### Returns
+
+This function returns a value of type `void`.
+
+A successful response with no content.
+
+

docs/docgen.md

@@ -3,8 +3,8 @@
 
 - [Get Box Doc Gen job by ID](#get-box-doc-gen-job-by-id)
 - [List all Box Doc Gen jobs](#list-all-box-doc-gen-jobs)
-- [Get Box Doc Gen jobs in a batch with a specific ID](#get-box-doc-gen-jobs-in-a-batch-with-a-specific-id)
-- [Generate document using a Box Doc Gen template](#generate-document-using-a-box-doc-gen-template)
+- [Get Box Doc Gen jobs by batch ID](#get-box-doc-gen-jobs-by-batch-id)
+- [Generate document using Box Doc Gen template](#generate-document-using-box-doc-gen-template)
 
 ## Get Box Doc Gen job by ID
 
@@ -64,7 +64,7 @@ This function returns a value of type `DocGenJobsFullV2025R0`.
 A list of Box Doc Gen jobs.
 
 
-## Get Box Doc Gen jobs in a batch with a specific ID
+## Get Box Doc Gen jobs by batch ID
 
 Lists Box Doc Gen jobs in a batch
 
@@ -95,7 +95,7 @@ This function returns a value of type `DocGenJobsV2025R0`.
 Returns a list of Box Doc Gen jobs in a Box Doc Gen batch.
 
 
-## Generate document using a Box Doc Gen template
+## Generate document using Box Doc Gen template
 
 Generates a document using a Box Doc Gen template.
 

docs/docgentemplate.md

@@ -1,14 +1,14 @@
 # DocgenTemplateManager
 
 
-- [Create a Box Doc Gen template](#create-a-box-doc-gen-template)
+- [Create Box Doc Gen template](#create-box-doc-gen-template)
 - [List Box Doc Gen templates](#list-box-doc-gen-templates)
 - [Delete Box Doc Gen template](#delete-box-doc-gen-template)
 - [Get Box Doc Gen template by ID](#get-box-doc-gen-template-by-id)
 - [List all Box Doc Gen template tags in template](#list-all-box-doc-gen-template-tags-in-template)
 - [Get list of all Box Doc Gen jobs for template](#get-list-of-all-box-doc-gen-jobs-for-template)
 
-## Create a Box Doc Gen template
+## Create Box Doc Gen template
 
 Marks a file as a Box Doc Gen template.
 

src/main/java/com/box/sdkgen/client/BoxClient.java

@@ -4,6 +4,7 @@
 import static com.box.sdkgen.internal.utils.UtilsManager.mapOf;
 
 import com.box.sdkgen.managers.ai.AiManager;
+import com.box.sdkgen.managers.aistudio.AiStudioManager;
 import com.box.sdkgen.managers.appitemassociations.AppItemAssociationsManager;
 import com.box.sdkgen.managers.authorization.AuthorizationManager;
 import com.box.sdkgen.managers.avatars.AvatarsManager;
@@ -231,6 +232,8 @@ public class BoxClient {
 
   public final AiManager ai;
 
+  public final AiStudioManager aiStudio;
+
   public final DocgenTemplateManager docgenTemplate;
 
   public final DocgenManager docgen;
@@ -592,6 +595,11 @@ public BoxClient(Authentication auth) {
             .auth(this.auth)
             .networkSession(this.networkSession)
             .build();
+    this.aiStudio =
+        new AiStudioManager.AiStudioManagerBuilder()
+            .auth(this.auth)
+            .networkSession(this.networkSession)
+            .build();
     this.docgenTemplate =
         new DocgenTemplateManager.DocgenTemplateManagerBuilder()
             .auth(this.auth)
@@ -960,6 +968,11 @@ protected BoxClient(BoxClientBuilder builder) {
             .auth(this.auth)
             .networkSession(this.networkSession)
             .build();
+    this.aiStudio =
+        new AiStudioManager.AiStudioManagerBuilder()
+            .auth(this.auth)
+            .networkSession(this.networkSession)
+            .build();
     this.docgenTemplate =
         new DocgenTemplateManager.DocgenTemplateManagerBuilder()
             .auth(this.auth)
@@ -1319,6 +1332,10 @@ public AiManager getAi() {
     return ai;
   }
 
+  public AiStudioManager getAiStudio() {
+    return aiStudio;
+  }
+
   public DocgenTemplateManager getDocgenTemplate() {
     return docgenTemplate;
   }