The open-source agent harness - the runtime layer that turns an LLM into a working agent.
feat: allow deleting models, mcp, skills from settings (#876)
Abhishek Choudhary29e7aabab888
diff --git a/.changeset/catalog-entry-delete.md b/.changeset/catalog-entry-delete.mdnew file mode 100644index 000000000..00a88863c--- /dev/null+++ b/.changeset/catalog-entry-delete.md@@ -0,0 +1,6 @@+---+"@truefoundry/trueforge-ui": patch+"@truefoundry/trueforge": patch+---++Add `DELETE` for settings catalog entries (model providers, MCP servers, skills), rejected with 409 naming the agents that still reference the entry; a model-provider update that drops a model in use is rejected the same way. Deleting an MCP server also clears its stored OAuth grants. Settings now confirms removals (including connectors) and keeps a refused removal's reason in the dialog; removing a provider's last model removes the provider. The connector list offers Connect on added-but-unauthenticated OAuth servers.diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.jsonindex 7fbf631d3..a29609952 100644--- a/.github/fern/openapi/openapi.json+++ b/.github/fern/openapi/openapi.json@@ -1292,6 +1292,14 @@"properties": {},"type": "object"},+ "DeleteMCPServerResponse": {+ "properties": {},+ "type": "object"+ },+ "DeleteModelProviderResponse": {+ "properties": {},+ "type": "object"+ },"DeleteSandboxEnvironmentResponse": {"properties": {},"type": "object"@@ -1300,6 +1308,10 @@"properties": {},"type": "object"},+ "DeleteSkillResponse": {+ "properties": {},+ "type": "object"+ },"DynamicSubAgentsConfig": {"default": {"enabled": true@@ -10761,6 +10773,73 @@}},"/api/v1/settings/mcp-servers/{name}": {+ "delete": {+ "description": "Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.",+ "parameters": [+ {+ "description": "MCP server name.",+ "in": "path",+ "name": "name",+ "required": true,+ "schema": {+ "description": "MCP server name.",+ "minLength": 1,+ "type": "string"+ }+ }+ ],+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/DeleteMCPServerResponse"+ }+ }+ },+ "description": "MCP server deleted."+ },+ "404": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "MCP server not found."+ },+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "One or more agents still use this MCP server."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Unsupported operation because the MCP servers are managed by external system"+ }+ },+ "summary": "Delete an MCP server",+ "tags": [+ "MCP Servers"+ ],+ "x-fern-sdk-group-name": [+ "settings",+ "mcpServers"+ ],+ "x-fern-sdk-method-name": "delete"+ },"get": {"description": "A single MCP server by name, with nested live auth_status (settings / admin projection). Header auth values are redacted.","parameters": [@@ -10951,6 +11030,16 @@},"description": "Invalid request body, or redacted API key with no stored secret to keep."},+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "The update drops a model that one or more agents still use."+ },"424": {"content": {"application/json": {@@ -10973,6 +11062,75 @@"x-fern-sdk-method-name": "create_or_update"}},+ "/api/v1/settings/model-providers/{name}": {+ "delete": {+ "description": "Deletes a provider and every model it declares. Rejected while any agent still uses one of them.",+ "parameters": [+ {+ "description": "Model provider name.",+ "in": "path",+ "name": "name",+ "required": true,+ "schema": {+ "description": "Model provider name.",+ "minLength": 1,+ "type": "string"+ }+ }+ ],+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/DeleteModelProviderResponse"+ }+ }+ },+ "description": "Model provider deleted."+ },+ "404": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Model provider not found."+ },+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "One or more agents still use a model from this provider."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Unsupported operation because the model providers are managed by external system"+ }+ },+ "summary": "Delete a model provider",+ "tags": [+ "Models"+ ],+ "x-fern-sdk-group-name": [+ "settings",+ "modelProviders"+ ],+ "x-fern-sdk-method-name": "delete"+ }+ },"/api/v1/settings/sandbox-providers": {"get": {"description": "The single configured sandbox provider for this tenant. `auth.api_key` is redacted.",@@ -11227,6 +11385,75 @@"x-fern-sdk-method-name": "create_or_update"}},+ "/api/v1/settings/skills/{name}": {+ "delete": {+ "description": "Deletes a skill by `name`. Rejected while any agent still lists the skill.",+ "parameters": [+ {+ "description": "Skill name.",+ "in": "path",+ "name": "name",+ "required": true,+ "schema": {+ "description": "Skill name.",+ "minLength": 1,+ "type": "string"+ }+ }+ ],+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/DeleteSkillResponse"+ }+ }+ },+ "description": "Skill deleted."+ },+ "404": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Skill not found."+ },+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "One or more agents still use this skill."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Unsupported because skills are managed by an external system."+ }+ },+ "summary": "Delete a skill",+ "tags": [+ "Skills"+ ],+ "x-fern-sdk-group-name": [+ "settings",+ "skills"+ ],+ "x-fern-sdk-method-name": "delete"+ }+ },"/api/v1/settings/web-search-providers": {"get": {"description": "The configured provider for this tenant. `auth.api_key` is redacted when present.",diff --git a/docs/openapi.json b/docs/openapi.jsonindex 7fbf631d3..a29609952 100644--- a/docs/openapi.json+++ b/docs/openapi.json@@ -1292,6 +1292,14 @@"properties": {},"type": "object"},+ "DeleteMCPServerResponse": {+ "properties": {},+ "type": "object"+ },+ "DeleteModelProviderResponse": {+ "properties": {},+ "type": "object"+ },"DeleteSandboxEnvironmentResponse": {"properties": {},"type": "object"@@ -1300,6 +1308,10 @@"properties": {},"type": "object"},+ "DeleteSkillResponse": {+ "properties": {},+ "type": "object"+ },"DynamicSubAgentsConfig": {"default": {"enabled": true@@ -10761,6 +10773,73 @@}},"/api/v1/settings/mcp-servers/{name}": {+ "delete": {+ "description": "Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.",+ "parameters": [+ {+ "description": "MCP server name.",+ "in": "path",+ "name": "name",+ "required": true,+ "schema": {+ "description": "MCP server name.",+ "minLength": 1,+ "type": "string"+ }+ }+ ],+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/DeleteMCPServerResponse"+ }+ }+ },+ "description": "MCP server deleted."+ },+ "404": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "MCP server not found."+ },+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "One or more agents still use this MCP server."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Unsupported operation because the MCP servers are managed by external system"+ }+ },+ "summary": "Delete an MCP server",+ "tags": [+ "MCP Servers"+ ],+ "x-fern-sdk-group-name": [+ "settings",+ "mcpServers"+ ],+ "x-fern-sdk-method-name": "delete"+ },"get": {"description": "A single MCP server by name, with nested live auth_status (settings / admin projection). Header auth values are redacted.","parameters": [@@ -10951,6 +11030,16 @@},"description": "Invalid request body, or redacted API key with no stored secret to keep."},+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "The update drops a model that one or more agents still use."+ },"424": {"content": {"application/json": {@@ -10973,6 +11062,75 @@"x-fern-sdk-method-name": "create_or_update"}},+ "/api/v1/settings/model-providers/{name}": {+ "delete": {+ "description": "Deletes a provider and every model it declares. Rejected while any agent still uses one of them.",+ "parameters": [+ {+ "description": "Model provider name.",+ "in": "path",+ "name": "name",+ "required": true,+ "schema": {+ "description": "Model provider name.",+ "minLength": 1,+ "type": "string"+ }+ }+ ],+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/DeleteModelProviderResponse"+ }+ }+ },+ "description": "Model provider deleted."+ },+ "404": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Model provider not found."+ },+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "One or more agents still use a model from this provider."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Unsupported operation because the model providers are managed by external system"+ }+ },+ "summary": "Delete a model provider",+ "tags": [+ "Models"+ ],+ "x-fern-sdk-group-name": [+ "settings",+ "modelProviders"+ ],+ "x-fern-sdk-method-name": "delete"+ }+ },"/api/v1/settings/sandbox-providers": {"get": {"description": "The single configured sandbox provider for this tenant. `auth.api_key` is redacted.",@@ -11227,6 +11385,75 @@"x-fern-sdk-method-name": "create_or_update"}},+ "/api/v1/settings/skills/{name}": {+ "delete": {+ "description": "Deletes a skill by `name`. Rejected while any agent still lists the skill.",+ "parameters": [+ {+ "description": "Skill name.",+ "in": "path",+ "name": "name",+ "required": true,+ "schema": {+ "description": "Skill name.",+ "minLength": 1,+ "type": "string"+ }+ }+ ],+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/DeleteSkillResponse"+ }+ }+ },+ "description": "Skill deleted."+ },+ "404": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Skill not found."+ },+ "409": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "One or more agents still use this skill."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Unsupported because skills are managed by an external system."+ }+ },+ "summary": "Delete a skill",+ "tags": [+ "Skills"+ ],+ "x-fern-sdk-group-name": [+ "settings",+ "skills"+ ],+ "x-fern-sdk-method-name": "delete"+ }+ },"/api/v1/settings/web-search-providers": {"get": {"description": "The configured provider for this tenant. `auth.api_key` is redacted when present.",diff --git a/packages/trueforge-sdk/reference.md b/packages/trueforge-sdk/reference.mdindex 57c6aa278..6a22bb7fa 100644--- a/packages/trueforge-sdk/reference.md+++ b/packages/trueforge-sdk/reference.md@@ -3979,6 +3979,69 @@ await client.settings.mcpServers.get("name");</dl>+</dd>+</dl>+</details>++<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">delete</a>(name) -> TrueForge.DeleteMcpServerResponse</code></summary>+<dl>+<dd>++#### 📝 Description++<dl>+<dd>++<dl>+<dd>++Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.+</dd>+</dl>+</dd>+</dl>++#### 🔌 Usage++<dl>+<dd>++<dl>+<dd>++```typescript+await client.settings.mcpServers.delete("name");++```+</dd>+</dl>+</dd>+</dl>++#### ⚙️ Parameters++<dl>+<dd>++<dl>+<dd>++**name:** `string` — MCP server name.++</dd>+</dl>++<dl>+<dd>++**requestOptions:** `McpServersClient.RequestOptions`++</dd>+</dl>+</dd>+</dl>++</dd></dl></details>@@ -4185,6 +4248,69 @@ await client.settings.modelProviders.createOrUpdate({</dl>+</dd>+</dl>+</details>++<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">delete</a>(name) -> TrueForge.DeleteModelProviderResponse</code></summary>+<dl>+<dd>++#### 📝 Description++<dl>+<dd>++<dl>+<dd>++Deletes a provider and every model it declares. Rejected while any agent still uses one of them.+</dd>+</dl>+</dd>+</dl>++#### 🔌 Usage++<dl>+<dd>++<dl>+<dd>++```typescript+await client.settings.modelProviders.delete("name");++```+</dd>+</dl>+</dd>+</dl>++#### ⚙️ Parameters++<dl>+<dd>++<dl>+<dd>++**name:** `string` — Model provider name.++</dd>+</dl>++<dl>+<dd>++**requestOptions:** `ModelProvidersClient.RequestOptions`++</dd>+</dl>+</dd>+</dl>++</dd></dl></details>@@ -4513,6 +4639,69 @@ await client.settings.skills.createOrUpdate({</dl>+</dd>+</dl>+</details>++<details><summary><code>client.settings.skills.<a href="/src/api/resources/settings/resources/skills/client/Client.ts">delete</a>(name) -> TrueForge.DeleteSkillResponse</code></summary>+<dl>+<dd>++#### 📝 Description++<dl>+<dd>++<dl>+<dd>++Deletes a skill by `name`. Rejected while any agent still lists the skill.+</dd>+</dl>+</dd>+</dl>++#### 🔌 Usage++<dl>+<dd>++<dl>+<dd>++```typescript+await client.settings.skills.delete("name");++```+</dd>+</dl>+</dd>+</dl>++#### ⚙️ Parameters++<dl>+<dd>++<dl>+<dd>++**name:** `string` — Skill name.++</dd>+</dl>++<dl>+<dd>++**requestOptions:** `SkillsClient.RequestOptions`++</dd>+</dl>+</dd>+</dl>++</dd></dl></details>diff --git a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts b/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.tsindex c1e8ea7be..fb8bc100b 100644--- a/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts+++ b/packages/trueforge-sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts@@ -464,4 +464,116 @@ export class McpServersClient {"/api/v1/settings/mcp-servers/{name}",);}++ /**+ * Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.+ *+ * @param {string} name - MCP server name.+ * @param {McpServersClient.RequestOptions} requestOptions - Request-specific configuration.+ *+ * @throws {@link TrueForge.NotFoundError}+ * @throws {@link TrueForge.ConflictError}+ * @throws {@link TrueForge.FailedDependencyError}+ * @throws {@link errors.TrueForgeError}+ * @throws {@link errors.TrueForgeTimeoutError}+ *+ * @example+ * await client.settings.mcpServers.delete("name")+ */+ public delete(+ name: string,+ requestOptions?: McpServersClient.RequestOptions,+ ): core.HttpResponsePromise<TrueForge.DeleteMcpServerResponse> {+ return core.HttpResponsePromise.fromPromise(this.__delete(name, requestOptions));+ }++ private async __delete(+ name: string,+ requestOptions?: McpServersClient.RequestOptions,+ ): Promise<core.WithRawResponse<TrueForge.DeleteMcpServerResponse>> {+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(+ _authRequest.headers,+ this._options?.headers,+ requestOptions?.headers,+ );+ const _response = await (this._options.fetcher ?? core.fetcher)({+ url: core.url.join(+ (await core.Supplier.get(this._options.baseUrl)) ??+ (await core.Supplier.get(this._options.environment)),+ `api/v1/settings/mcp-servers/${core.url.encodePathParam(name)}`,+ ),+ method: "DELETE",+ headers: _headers,+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,+ abortSignal: requestOptions?.abortSignal,+ fetchFn: this._options?.fetch,+ logging: this._options.logging,+ });+ if (_response.ok) {+ return {+ data: serializers.DeleteMcpServerResponse.parseOrThrow(_response.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ rawResponse: _response.rawResponse,+ };+ }++ if (_response.error.reason === "status-code") {+ switch (_response.error.statusCode) {+ case 404:+ throw new TrueForge.NotFoundError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ case 409:+ throw new TrueForge.ConflictError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ case 424:+ throw new TrueForge.FailedDependencyError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ default:+ throw new errors.TrueForgeError({+ statusCode: _response.error.statusCode,+ body: _response.error.body,+ rawResponse: _response.rawResponse,+ });+ }+ }++ return handleNonStatusCodeError(+ _response.error,+ _response.rawResponse,+ "DELETE",+ "/api/v1/settings/mcp-servers/{name}",+ );+ }}diff --git a/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts b/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.tsindex 9dadd382d..3bfcf80f7 100644--- a/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts+++ b/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts@@ -262,6 +262,7 @@ export class ModelProvidersClient {* @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.** @throws {@link TrueForge.BadRequestError}+ * @throws {@link TrueForge.ConflictError}* @throws {@link TrueForge.FailedDependencyError}* @throws {@link errors.TrueForgeError}* @throws {@link errors.TrueForgeTimeoutError}@@ -350,6 +351,17 @@ export class ModelProvidersClient {}),_response.rawResponse,);+ case 409:+ throw new TrueForge.ConflictError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );case 424:throw new TrueForge.FailedDependencyError(serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {@@ -377,4 +389,116 @@ export class ModelProvidersClient {"/api/v1/settings/model-providers",);}++ /**+ * Deletes a provider and every model it declares. Rejected while any agent still uses one of them.+ *+ * @param {string} name - Model provider name.+ * @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.+ *+ * @throws {@link TrueForge.NotFoundError}+ * @throws {@link TrueForge.ConflictError}+ * @throws {@link TrueForge.FailedDependencyError}+ * @throws {@link errors.TrueForgeError}+ * @throws {@link errors.TrueForgeTimeoutError}+ *+ * @example+ * await client.settings.modelProviders.delete("name")+ */+ public delete(+ name: string,+ requestOptions?: ModelProvidersClient.RequestOptions,+ ): core.HttpResponsePromise<TrueForge.DeleteModelProviderResponse> {+ return core.HttpResponsePromise.fromPromise(this.__delete(name, requestOptions));+ }++ private async __delete(+ name: string,+ requestOptions?: ModelProvidersClient.RequestOptions,+ ): Promise<core.WithRawResponse<TrueForge.DeleteModelProviderResponse>> {+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(+ _authRequest.headers,+ this._options?.headers,+ requestOptions?.headers,+ );+ const _response = await (this._options.fetcher ?? core.fetcher)({+ url: core.url.join(+ (await core.Supplier.get(this._options.baseUrl)) ??+ (await core.Supplier.get(this._options.environment)),+ `api/v1/settings/model-providers/${core.url.encodePathParam(name)}`,+ ),+ method: "DELETE",+ headers: _headers,+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,+ abortSignal: requestOptions?.abortSignal,+ fetchFn: this._options?.fetch,+ logging: this._options.logging,+ });+ if (_response.ok) {+ return {+ data: serializers.DeleteModelProviderResponse.parseOrThrow(_response.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ rawResponse: _response.rawResponse,+ };+ }++ if (_response.error.reason === "status-code") {+ switch (_response.error.statusCode) {+ case 404:+ throw new TrueForge.NotFoundError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ case 409:+ throw new TrueForge.ConflictError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ case 424:+ throw new TrueForge.FailedDependencyError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ default:+ throw new errors.TrueForgeError({+ statusCode: _response.error.statusCode,+ body: _response.error.body,+ rawResponse: _response.rawResponse,+ });+ }+ }++ return handleNonStatusCodeError(+ _response.error,+ _response.rawResponse,+ "DELETE",+ "/api/v1/settings/model-providers/{name}",+ );+ }}diff --git a/packages/trueforge-sdk/src/api/resources/settings/resources/skills/client/Client.ts b/packages/trueforge-sdk/src/api/resources/settings/resources/skills/client/Client.tsindex 592178bee..d35819957 100644--- a/packages/trueforge-sdk/src/api/resources/settings/resources/skills/client/Client.ts+++ b/packages/trueforge-sdk/src/api/resources/settings/resources/skills/client/Client.ts@@ -352,4 +352,116 @@ export class SkillsClient {return handleNonStatusCodeError(_response.error, _response.rawResponse, "PUT", "/api/v1/settings/skills");}++ /**+ * Deletes a skill by `name`. Rejected while any agent still lists the skill.+ *+ * @param {string} name - Skill name.+ * @param {SkillsClient.RequestOptions} requestOptions - Request-specific configuration.+ *+ * @throws {@link TrueForge.NotFoundError}+ * @throws {@link TrueForge.ConflictError}+ * @throws {@link TrueForge.FailedDependencyError}+ * @throws {@link errors.TrueForgeError}+ * @throws {@link errors.TrueForgeTimeoutError}+ *+ * @example+ * await client.settings.skills.delete("name")+ */+ public delete(+ name: string,+ requestOptions?: SkillsClient.RequestOptions,+ ): core.HttpResponsePromise<TrueForge.DeleteSkillResponse> {+ return core.HttpResponsePromise.fromPromise(this.__delete(name, requestOptions));+ }++ private async __delete(+ name: string,+ requestOptions?: SkillsClient.RequestOptions,+ ): Promise<core.WithRawResponse<TrueForge.DeleteSkillResponse>> {+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(+ _authRequest.headers,+ this._options?.headers,+ requestOptions?.headers,+ );+ const _response = await (this._options.fetcher ?? core.fetcher)({+ url: core.url.join(+ (await core.Supplier.get(this._options.baseUrl)) ??+ (await core.Supplier.get(this._options.environment)),+ `api/v1/settings/skills/${core.url.encodePathParam(name)}`,+ ),+ method: "DELETE",+ headers: _headers,+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,+ abortSignal: requestOptions?.abortSignal,+ fetchFn: this._options?.fetch,+ logging: this._options.logging,+ });+ if (_response.ok) {+ return {+ data: serializers.DeleteSkillResponse.parseOrThrow(_response.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ rawResponse: _response.rawResponse,+ };+ }++ if (_response.error.reason === "status-code") {+ switch (_response.error.statusCode) {+ case 404:+ throw new TrueForge.NotFoundError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ case 409:+ throw new TrueForge.ConflictError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ case 424:+ throw new TrueForge.FailedDependencyError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ default:+ throw new errors.TrueForgeError({+ statusCode: _response.error.statusCode,+ body: _response.error.body,+ rawResponse: _response.rawResponse,+ });+ }+ }++ return handleNonStatusCodeError(+ _response.error,+ _response.rawResponse,+ "DELETE",+ "/api/v1/settings/skills/{name}",+ );+ }}diff --git a/packages/trueforge-sdk/src/api/types/DeleteMcpServerResponse.ts b/packages/trueforge-sdk/src/api/types/DeleteMcpServerResponse.tsnew file mode 100644index 000000000..970f48ebc--- /dev/null+++ b/packages/trueforge-sdk/src/api/types/DeleteMcpServerResponse.ts@@ -0,0 +1,3 @@+// This file was auto-generated by Fern from our API Definition.++export type DeleteMcpServerResponse = {};diff --git a/packages/trueforge-sdk/src/api/types/DeleteModelProviderResponse.ts b/packages/trueforge-sdk/src/api/types/DeleteModelProviderResponse.tsnew file mode 100644index 000000000..10cab146f--- /dev/null+++ b/packages/trueforge-sdk/src/api/types/DeleteModelProviderResponse.ts@@ -0,0 +1,3 @@+// This file was auto-generated by Fern from our API Definition.++export type DeleteModelProviderResponse = {};diff --git a/packages/trueforge-sdk/src/api/types/DeleteSkillResponse.ts b/packages/trueforge-sdk/src/api/types/DeleteSkillResponse.tsnew file mode 100644index 000000000..999d2e603--- /dev/null+++ b/packages/trueforge-sdk/src/api/types/DeleteSkillResponse.ts@@ -0,0 +1,3 @@+// This file was auto-generated by Fern from our API Definition.++export type DeleteSkillResponse = {};diff --git a/packages/trueforge-sdk/src/api/types/index.ts b/packages/trueforge-sdk/src/api/types/index.tsindex 8132075c7..e05a49b08 100644--- a/packages/trueforge-sdk/src/api/types/index.ts+++ b/packages/trueforge-sdk/src/api/types/index.ts@@ -55,8 +55,11 @@ export * from "./CronExpression.js";export * from "./CustomModelProvider.js";export * from "./DaytonaSandboxProviderAuth.js";export * from "./DeleteAgentResponse.js";+export * from "./DeleteMcpServerResponse.js";+export * from "./DeleteModelProviderResponse.js";export * from "./DeleteSandboxEnvironmentResponse.js";export * from "./DeleteScheduleResponse.js";+export * from "./DeleteSkillResponse.js";export * from "./DynamicSubAgentsConfig.js";export * from "./ExtendedChunkDeltaToolCall.js";export * from "./FileContent.js";diff --git a/packages/trueforge-sdk/src/serialization/types/DeleteMcpServerResponse.ts b/packages/trueforge-sdk/src/serialization/types/DeleteMcpServerResponse.tsnew file mode 100644index 000000000..ddc8d76ad--- /dev/null+++ b/packages/trueforge-sdk/src/serialization/types/DeleteMcpServerResponse.ts@@ -0,0 +1,14 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";++export const DeleteMcpServerResponse: core.serialization.ObjectSchema<+ serializers.DeleteMcpServerResponse.Raw,+ TrueForge.DeleteMcpServerResponse+> = core.serialization.object({});++export declare namespace DeleteMcpServerResponse {+ export type Raw = {};+}diff --git a/packages/trueforge-sdk/src/serialization/types/DeleteModelProviderResponse.ts b/packages/trueforge-sdk/src/serialization/types/DeleteModelProviderResponse.tsnew file mode 100644index 000000000..03174285e--- /dev/null+++ b/packages/trueforge-sdk/src/serialization/types/DeleteModelProviderResponse.ts@@ -0,0 +1,14 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";++export const DeleteModelProviderResponse: core.serialization.ObjectSchema<+ serializers.DeleteModelProviderResponse.Raw,+ TrueForge.DeleteModelProviderResponse+> = core.serialization.object({});++export declare namespace DeleteModelProviderResponse {+ export type Raw = {};+}diff --git a/packages/trueforge-sdk/src/serialization/types/DeleteSkillResponse.ts b/packages/trueforge-sdk/src/serialization/types/DeleteSkillResponse.tsnew file mode 100644index 000000000..724793a95--- /dev/null+++ b/packages/trueforge-sdk/src/serialization/types/DeleteSkillResponse.ts@@ -0,0 +1,14 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";++export const DeleteSkillResponse: core.serialization.ObjectSchema<+ serializers.DeleteSkillResponse.Raw,+ TrueForge.DeleteSkillResponse+> = core.serialization.object({});++export declare namespace DeleteSkillResponse {+ export type Raw = {};+}diff --git a/packages/trueforge-sdk/src/serialization/types/index.ts b/packages/trueforge-sdk/src/serialization/types/index.tsindex 8132075c7..e05a49b08 100644--- a/packages/trueforge-sdk/src/serialization/types/index.ts+++ b/packages/trueforge-sdk/src/serialization/types/index.ts@@ -55,8 +55,11 @@ export * from "./CronExpression.js";export * from "./CustomModelProvider.js";export * from "./DaytonaSandboxProviderAuth.js";export * from "./DeleteAgentResponse.js";+export * from "./DeleteMcpServerResponse.js";+export * from "./DeleteModelProviderResponse.js";export * from "./DeleteSandboxEnvironmentResponse.js";export * from "./DeleteScheduleResponse.js";+export * from "./DeleteSkillResponse.js";export * from "./DynamicSubAgentsConfig.js";export * from "./ExtendedChunkDeltaToolCall.js";export * from "./FileContent.js";diff --git a/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.ts b/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.tsindex 9e92895a3..db78a3207 100644--- a/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.ts+++ b/packages/trueforge-sdk/tests/wire/settings/mcpServers.test.ts@@ -448,4 +448,79 @@ describe("McpServersClient", () => {return await client.settings.mcpServers.get("name");}).rejects.toThrow(TrueForgeTypes.NotFoundError);});++ test("delete (1)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = {};++ server+ .mockEndpoint()+ .delete("/api/v1/settings/mcp-servers/name")+ .respondWith()+ .statusCode(200)+ .jsonBody(rawResponseBody)+ .build();++ const response = await client.settings.mcpServers.delete("name");+ expect(response).toEqual({});+ });++ test("delete (2)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/mcp-servers/name")+ .respondWith()+ .statusCode(404)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.mcpServers.delete("name");+ }).rejects.toThrow(TrueForgeTypes.NotFoundError);+ });++ test("delete (3)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/mcp-servers/name")+ .respondWith()+ .statusCode(409)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.mcpServers.delete("name");+ }).rejects.toThrow(TrueForgeTypes.ConflictError);+ });++ test("delete (4)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/mcp-servers/name")+ .respondWith()+ .statusCode(424)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.mcpServers.delete("name");+ }).rejects.toThrow(TrueForgeTypes.FailedDependencyError);+ });});diff --git a/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.ts b/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.tsindex 6551d91b6..ebec93df8 100644--- a/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.ts+++ b/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.ts@@ -432,6 +432,54 @@ describe("ModelProvidersClient", () => {};const rawResponseBody = { error: { message: "message" } };+ server+ .mockEndpoint()+ .put("/api/v1/settings/model-providers")+ .jsonBody(rawRequestBody)+ .respondWith()+ .statusCode(409)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.modelProviders.createOrUpdate({+ manifest: {+ auth: {+ apiKey: "x",+ },+ models: [+ {+ modelId: "x",+ name: "xy",+ properties: {},+ },+ {+ modelId: "x",+ name: "xy",+ properties: {},+ },+ ],+ type: "alibaba",+ },+ });+ }).rejects.toThrow(TrueForgeTypes.ConflictError);+ });++ test("create_or_update (4)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });+ const rawRequestBody = {+ manifest: {+ auth: { api_key: "x" },+ models: [+ { model_id: "x", name: "xy", properties: {} },+ { model_id: "x", name: "xy", properties: {} },+ ],+ type: "alibaba",+ },+ };+ const rawResponseBody = { error: { message: "message" } };+server.mockEndpoint().put("/api/v1/settings/model-providers")@@ -464,4 +512,79 @@ describe("ModelProvidersClient", () => {});}).rejects.toThrow(TrueForgeTypes.FailedDependencyError);});++ test("delete (1)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = {};++ server+ .mockEndpoint()+ .delete("/api/v1/settings/model-providers/name")+ .respondWith()+ .statusCode(200)+ .jsonBody(rawResponseBody)+ .build();++ const response = await client.settings.modelProviders.delete("name");+ expect(response).toEqual({});+ });++ test("delete (2)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/model-providers/name")+ .respondWith()+ .statusCode(404)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.modelProviders.delete("name");+ }).rejects.toThrow(TrueForgeTypes.NotFoundError);+ });++ test("delete (3)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/model-providers/name")+ .respondWith()+ .statusCode(409)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.modelProviders.delete("name");+ }).rejects.toThrow(TrueForgeTypes.ConflictError);+ });++ test("delete (4)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/model-providers/name")+ .respondWith()+ .statusCode(424)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.modelProviders.delete("name");+ }).rejects.toThrow(TrueForgeTypes.FailedDependencyError);+ });});diff --git a/packages/trueforge-sdk/tests/wire/settings/skills.test.ts b/packages/trueforge-sdk/tests/wire/settings/skills.test.tsindex d21edc6a0..637634e49 100644--- a/packages/trueforge-sdk/tests/wire/settings/skills.test.ts+++ b/packages/trueforge-sdk/tests/wire/settings/skills.test.ts@@ -326,4 +326,79 @@ describe("SkillsClient", () => {});}).rejects.toThrow(TrueForgeTypes.FailedDependencyError);});++ test("delete (1)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = {};++ server+ .mockEndpoint()+ .delete("/api/v1/settings/skills/name")+ .respondWith()+ .statusCode(200)+ .jsonBody(rawResponseBody)+ .build();++ const response = await client.settings.skills.delete("name");+ expect(response).toEqual({});+ });++ test("delete (2)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/skills/name")+ .respondWith()+ .statusCode(404)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.skills.delete("name");+ }).rejects.toThrow(TrueForgeTypes.NotFoundError);+ });++ test("delete (3)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/skills/name")+ .respondWith()+ .statusCode(409)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.skills.delete("name");+ }).rejects.toThrow(TrueForgeTypes.ConflictError);+ });++ test("delete (4)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .delete("/api/v1/settings/skills/name")+ .respondWith()+ .statusCode(424)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.skills.delete("name");+ }).rejects.toThrow(TrueForgeTypes.FailedDependencyError);+ });});diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/ConfirmDeleteDialog.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/ConfirmDeleteDialog.tsxnew file mode 100644index 000000000..6dcd2fbf2--- /dev/null+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/ConfirmDeleteDialog.tsx@@ -0,0 +1,78 @@+'use client';++import type { ReactNode } from 'react';++import { Button } from '@/atoms/primitives/Button.js';+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from '@/atoms/primitives/Dialog.js';++export type ConfirmDeleteDialogProps = {+ title: string;+ description: ReactNode;+ confirmLabel?: string;+ busy?: boolean;+ /** Kept in the dialog: a rejected delete explains which agents still use the entry. */+ error?: string | null;+ onCancel: () => void;+ onConfirm: () => void;+};++/** "Remove skill?" → "Can't remove skill" so a refused delete is not another confirm. */+function refusedTitle(title: string): string {+ return title.replace(/\?$/, '').replace(/^Remove /i, "Can't remove ");+}++/** Render only while a removal is pending; closing is the caller's `onCancel`. */+const ConfirmDeleteDialog = ({+ title,+ description,+ confirmLabel = 'Remove',+ busy = false,+ error = null,+ onCancel,+ onConfirm,+}: ConfirmDeleteDialogProps) => {+ const refused = error != null && error !== '';+ const heading = refused ? refusedTitle(title) : title;++ return (+ <Dialog+ open+ onOpenChange={next => {+ if (!next) onCancel();+ }}+ aria-label={heading}+ className="max-w-md"+ >+ <DialogContent>+ <DialogHeader>+ <DialogTitle>{heading}</DialogTitle>+ {refused ? (+ <p role="alert" className="text-sm text-failure-bg">+ {error}+ </p>+ ) : (+ <p className="text-sm text-text-secondary">{description}</p>+ )}+ </DialogHeader>+ </DialogContent>+ <DialogFooter>+ {refused ? (+ <Button.Secondary type="button" onClick={onCancel}>+ Close+ </Button.Secondary>+ ) : (+ <>+ <Button.Secondary type="button" disabled={busy} onClick={onCancel}>+ Cancel+ </Button.Secondary>+ <Button.Destructive type="button" disabled={busy} onClick={onConfirm}>+ {confirmLabel}+ </Button.Destructive>+ </>+ )}+ </DialogFooter>+ </Dialog>+ );+};++export default ConfirmDeleteDialog;diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsxindex 1ba58db91..fc2830109 100644--- a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsx+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorDetails.tsx@@ -17,6 +17,7 @@ type ConnectorDetailsProps = {onConnectorRefreshed: (connector: ConnectorBase) => void;onEdit: () => void;onDisconnect: () => void;+ onRemove?: () => void;busy?: boolean;};@@ -101,6 +102,7 @@ const ConnectorDetails = ({onConnectorRefreshed,onEdit,onDisconnect,+ onRemove,busy = false,}: ConnectorDetailsProps) => {const { connectorCatalog } = useCatalogServer();@@ -220,6 +222,18 @@ const ConnectorDetails = ({Disconnect</Button.Secondary>) : null}+ {onRemove ? (+ <Button.Secondary+ size="small"+ className="transition-colors hover:bg-failure-bg/10 hover:text-failure-bg"+ type="button"+ disabled={busy}+ aria-label={`Remove ${connector.name}`}+ onClick={onRemove}+ >+ Remove+ </Button.Secondary>+ ) : null}</div></header>diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsxindex b65cfca2e..00df6a50b 100644--- a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsx+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsx@@ -8,6 +8,7 @@ import { Button } from '@/atoms/primitives/Button.js';import { CatalogLogo } from '@/atoms/primitives/CatalogLogo.js';import { CenteredModal } from '@/atoms/primitives/CenteredModal.js';import SearchInput from '@/atoms/primitives/SearchInput.js';+import { useMCPAuth } from '@/hooks/useMcpAuth.js';import { Icon } from '@/icons/Icon.js';import { useCatalogServer } from '@/server/ServerContext.js';import type { ConnectorAuth, ConnectorBase, ConnectorCatalogEntry } from '@/server/types.js';@@ -15,6 +16,7 @@ import { getErrorMessage } from '@/utils/getErrorMessage.js';import { useToasterOptional } from '../ToasterContainer.js';import AddMcpServerForm, { type AddMcpServerDraft } from './AddMcpServerForm.js';import { AUTH_TYPE_LABELS } from './authTypeLabels.js';+import ConfirmDeleteDialog from './ConfirmDeleteDialog.js';import ConnectorDetails from './ConnectorDetails.js';type ConnectorListItem =@@ -28,6 +30,7 @@ type ConnectorsState = {const ConnectorSettings = () => {const { connectorCatalog } = useCatalogServer();const toaster = useToasterOptional();+ const { handleAuthorize, isOAuthLoading } = useMCPAuth();const [query, setQuery] = useState('');const [connectors, setConnectors] = useState<ConnectorsState>({@@ -44,6 +47,9 @@ const ConnectorSettings = () => {const [editingConnector, setEditingConnector] = useState<ConnectorBase | null>(null);const [connectorAwaitingKey, setConnectorAwaitingKey] = useState<ConnectorCatalogEntry | null>(null);const [selectedConnector, setSelectedConnector] = useState<ConnectorBase | null>(null);+ const [authorizingId, setAuthorizingId] = useState<string | null>(null);+ const [pendingRemoval, setPendingRemoval] = useState<ConnectorBase | null>(null);+ const [removeError, setRemoveError] = useState<string | null>(null);const [apiKey, setApiKey] = useState('');const connectorIconMap = useMemo(() => {@@ -220,6 +226,23 @@ const ConnectorSettings = () => {}).catch(() => {});};+ const closeRemoveDialog = () => {+ if (busy) return;+ setPendingRemoval(null);+ setRemoveError(null);+ };++ const handleRemove = (connector: ConnectorBase) => {+ const deleteConnector = connectorCatalog.deleteConnector;+ if (!deleteConnector) return;+ setRemoveError(null);+ void runMutation(async () => {+ await deleteConnector({ id: connector.id });+ setPendingRemoval(null);+ setSelectedConnector(null);+ }, setRemoveError).catch(() => {});+ };+const handleConnectorRefreshed = (refreshedConnector: ConnectorBase) => {setSelectedConnector(current => (current?.id === refreshedConnector.id ? refreshedConnector : current));setConnectors(current => {@@ -278,6 +301,9 @@ const ConnectorSettings = () => {);const rowClassName = 'flex min-h-16 w-full items-center gap-3 border-b border-border p-3 text-left last:border-b-0';+ // OAuth servers land here unauthenticated, so the list offers the same Connect as the detail view.+ const needsAuthorization = connector.auth.type === 'dcr' && !connector.authenticated;+ const connecting = isOAuthLoading && authorizingId === connector.id;if (isConnected) {return (@@ -291,6 +317,23 @@ const ConnectorSettings = () => {<div className="flex min-w-0 flex-1 items-center gap-3">{content}</div><div className="flex items-center gap-2">+ {needsAuthorization ? (+ <Button.Secondary+ size="small"+ type="button"+ disabled={busy || connecting}+ onClick={event => {+ event.stopPropagation();+ setAuthorizingId(connector.id);+ void handleAuthorize(connector.id, isSuccess => {+ setAuthorizingId(null);+ if (isSuccess) void refresh();+ });+ }}+ >+ {connecting ? 'Connecting…' : 'Connect'}+ </Button.Secondary>+ ) : null}<Button.Secondarysize="small"type="button"@@ -305,6 +348,22 @@ const ConnectorSettings = () => {<Icon name="pencil" className="size-3" />Edit</Button.Secondary>+ {connectorCatalog.deleteConnector ? (+ <Button.Secondary+ size="small"+ className="transition-colors hover:bg-failure-bg/10 hover:text-failure-bg"+ type="button"+ disabled={busy}+ aria-label={`Remove ${connector.name}`}+ onClick={event => {+ event.stopPropagation();+ setRemoveError(null);+ setPendingRemoval(connector);+ }}+ >+ Remove+ </Button.Secondary>+ ) : null}<Icon name="chevron-right" className="size-4" /></div></article>@@ -362,6 +421,19 @@ const ConnectorSettings = () => {);};+ const confirmDeleteDialog = pendingRemoval ? (+ <ConfirmDeleteDialog+ title="Remove connector?"+ description={`“${pendingRemoval.name}” will no longer be available to your agents.`}+ busy={busy}+ error={removeError}+ onCancel={closeRemoveDialog}+ onConfirm={() => {+ handleRemove(pendingRemoval);+ }}+ />+ ) : null;+if (selectedConnector) {return (<>@@ -380,6 +452,14 @@ const ConnectorSettings = () => {onDisconnect={() => {handleDisconnect(selectedConnector);}}+ onRemove={+ connectorCatalog.deleteConnector+ ? () => {+ setRemoveError(null);+ setPendingRemoval(selectedConnector);+ }+ : undefined+ }/><AddMcpServerFormopen={addMcpServerFormOpen}@@ -395,6 +475,7 @@ const ConnectorSettings = () => {busy={busy}error={formError}/>+ {confirmDeleteDialog}</>);}@@ -542,6 +623,7 @@ const ConnectorSettings = () => {busy={busy}error={formError}/>+ {confirmDeleteDialog}</div></div></>diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsxindex 404964a3d..d4edd65d3 100644--- a/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsx+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/ModelSettings.tsx@@ -8,6 +8,7 @@ import SearchInput from '@/atoms/primitives/SearchInput.js';import ConfigureModelProviderForm, {type ModelProviderKeyDraft,} from '@/containers/SettingsBuilder/ConfigureModelProviderForm.js';+import ConfirmDeleteDialog from '@/containers/SettingsBuilder/ConfirmDeleteDialog.js';import CustomModelProviderForm, {type CustomProviderDraft,} from '@/containers/SettingsBuilder/CustomModelProviderForm.js';@@ -17,6 +18,25 @@ import { useCatalogServer } from '@/server/ServerContext.js';import type { ModelEntry, ModelProviderBase, ModelProviderCatalogEntry } from '@/server/types.js';import { getErrorMessage } from '@/utils/getErrorMessage.js';+/** A provider drops every model it declares; a single model leaves the rest of the provider intact. */+type PendingRemoval =+ { kind: 'provider'; provider: ModelProviderBase } | { kind: 'model'; provider: ModelProviderBase; model: ModelEntry };++/** A provider must keep at least one model, so dropping the last one removes the provider itself. */+function removesLastModel(pending: PendingRemoval): boolean {+ return pending.kind === 'model' && pending.provider.models.length === 1;+}++function removalDescription(pending: PendingRemoval): string {+ if (pending.kind === 'provider') {+ return `“${pending.provider.name}” and all of its models will no longer be available to your agents.`;+ }+ if (removesLastModel(pending)) {+ return `“${pending.model.name}” is the only model left in ${pending.provider.name}, so the whole provider will be removed.`;+ }+ return `“${pending.model.name}” will no longer be available to your agents. The rest of ${pending.provider.name} stays configured.`;+}+function catalogBaseUrl(provider: ModelProviderCatalogEntry): string {if ('baseUrl' in provider && typeof provider.baseUrl === 'string') {return provider.baseUrl;@@ -41,6 +61,8 @@ const ModelSettings = () => {const [keyError, setKeyError] = useState<string | null>(null);const [customProviderOpen, setCustomProviderOpen] = useState(false);const [customProviderToEdit, setCustomProviderToEdit] = useState<ModelProviderBase | null>(null);+ const [pendingRemoval, setPendingRemoval] = useState<PendingRemoval | null>(null);+ const [removeError, setRemoveError] = useState<string | null>(null);const modelProviderIconMap = useMemo(() => {return (catalog ?? []).reduce(@@ -181,16 +203,17 @@ const ModelSettings = () => {toaster?.showSuccess({ title: `${provider.name} updated` });};- const handleRemoveProvider = (provider: ModelProviderBase) => {- if (!modelCatalog.deleteModelProvider) return;-- void runMutation(async () => {- await modelCatalog.deleteModelProvider!({ id: provider.id });- }).catch(() => {});+ const closeRemoveDialog = () => {+ if (busy) return;+ setPendingRemoval(null);+ setRemoveError(null);};- const handleUpdateModels = (provider: ModelProviderBase, models: ModelEntry[]) => {- void runMutation(async () => {+ const updateModels = (+ { provider, models }: { provider: ModelProviderBase; models: ModelEntry[] },+ onError?: (error: unknown) => void,+ ) =>+ runMutation(async () => {// apiKey required on update; empty means "keep existing" for hosts that support it.await modelCatalog.updateModelProvider({id: provider.id,@@ -200,7 +223,32 @@ const ModelSettings = () => {apiKey: '',models,});- }).catch(() => {});+ }, onError);++ const handleConfirmRemoval = (pending: PendingRemoval) => {+ setRemoveError(null);+ const reportError = (err: unknown) => setRemoveError(getErrorMessage(err, 'Request failed'));++ let removal: Promise<void> | undefined;+ if (pending.kind === 'model' && !removesLastModel(pending)) {+ removal = updateModels(+ {+ provider: pending.provider,+ models: pending.provider.models.filter(item => item.id !== pending.model.id),+ },+ reportError,+ );+ } else {+ const deleteModelProvider = modelCatalog.deleteModelProvider;+ if (deleteModelProvider !== undefined) {+ removal = runMutation(async () => {+ await deleteModelProvider({ id: pending.provider.id });+ }, reportError);+ }+ }++ // Rejections keep the dialog open so it can show why the removal was refused.+ void removal?.then(() => setPendingRemoval(null)).catch(() => {});};const handleAddCustomProvider = async (draft: CustomProviderDraft) => {@@ -364,7 +412,8 @@ const ModelSettings = () => {type="button"disabled={busy}onClick={() => {- handleRemoveProvider(provider);+ setRemoveError(null);+ setPendingRemoval({ kind: 'provider', provider });}}>Remove@@ -380,20 +429,21 @@ const ModelSettings = () => {className="flex min-h-10 items-center gap-3 border-b border-border px-3 py-2 text-sm text-text-primary last:border-b-0"><span className="min-w-0 flex-1 truncate">{model.name}</span>- <button- type="button"- aria-label={`Remove ${model.name}`}- disabled={busy}- className="inline-flex size-7 shrink-0 items-center justify-center rounded-md text-text-secondary hover:bg-ghost-button-hover hover:text-ghost-button-text focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-focus-ring disabled:opacity-50"- onClick={() => {- handleUpdateModels(- provider,- provider.models.filter(item => item.id !== model.id),- );- }}- >- <Icon name="trash" className="size-3.5" />- </button>+ {/* The last model can only go by removing the provider with it. */}+ {provider.models.length > 1 || modelCatalog.deleteModelProvider ? (+ <button+ type="button"+ aria-label={`Remove ${model.name}`}+ disabled={busy}+ className="inline-flex size-7 shrink-0 items-center justify-center rounded-md text-text-secondary hover:bg-ghost-button-hover hover:text-ghost-button-text focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-focus-ring disabled:opacity-50"+ onClick={() => {+ setRemoveError(null);+ setPendingRemoval({ kind: 'model', provider, model });+ }}+ >+ <Icon name="trash" className="size-3.5" />+ </button>+ ) : null}</div>))}@@ -413,7 +463,9 @@ const ModelSettings = () => {type="button"disabled={busy}onClick={() => {- handleUpdateModels(provider, [...provider.models, model]);+ void updateModels({ provider, models: [...provider.models, model] }).catch(+ () => {},+ );}}>Add@@ -490,6 +542,23 @@ const ModelSettings = () => {) : null}</div>+ {pendingRemoval ? (+ <ConfirmDeleteDialog+ title={+ pendingRemoval.kind === 'model' && !removesLastModel(pendingRemoval)+ ? 'Remove model?'+ : 'Remove provider?'+ }+ description={removalDescription(pendingRemoval)}+ busy={busy}+ error={removeError}+ onCancel={closeRemoveDialog}+ onConfirm={() => {+ handleConfirmRemoval(pendingRemoval);+ }}+ />+ ) : null}+<ConfigureModelProviderFormopen={keyModalOpen}onOpenChange={open => {diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/SandboxSettings.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/SandboxSettings.tsxindex 495f8a60e..c9959b9c2 100644--- a/packages/trueforge-ui/src/containers/SettingsBuilder/SandboxSettings.tsx+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/SandboxSettings.tsx@@ -13,6 +13,7 @@ import type { SandboxProviderBase, SandboxProviderCatalogEntry } from '../../serimport { getErrorMessage } from '../../utils/getErrorMessage.js';import { useToasterOptional } from '../ToasterContainer.js';import ConfigureSandboxForm, { type SandboxConfigDraft } from './ConfigureSandboxForm.js';+import ConfirmDeleteDialog from './ConfirmDeleteDialog.js';const configFrom = ({execTimeoutMs,@@ -39,6 +40,8 @@ const SandboxSettings = () => {const [createEntry, setCreateEntry] = useState<SandboxProviderCatalogEntry | null>(null);const [updateProvider, setUpdateProvider] = useState<SandboxProviderBase | null>(null);+ const [pendingRemoval, setPendingRemoval] = useState<SandboxProviderBase | null>(null);+ const [removeError, setRemoveError] = useState<string | null>(null);const refresh = useCallback(async ({ quiet = false }: { quiet?: boolean } = {}) => {@@ -131,12 +134,20 @@ const SandboxSettings = () => {}, 0);};+ const closeRemoveDialog = () => {+ if (busy) return;+ setPendingRemoval(null);+ setRemoveError(null);+ };+const handleRemove = (provider: SandboxProviderBase) => {const deleteSandboxProvider = sandboxCatalog.deleteSandboxProvider;if (!deleteSandboxProvider) return;+ setRemoveError(null);void runMutation(async () => {await deleteSandboxProvider({ id: provider.id });- }).catch(() => {});+ setPendingRemoval(null);+ }, setRemoveError).catch(() => {});};const formOpen = createEntry != null || updateProvider != null;@@ -213,7 +224,8 @@ const SandboxSettings = () => {type="button"disabled={busy}onClick={() => {- handleRemove(provider);+ setRemoveError(null);+ setPendingRemoval(provider);}}>Remove@@ -221,7 +233,7 @@ const SandboxSettings = () => {) : null}</div></article>- ))}+ ))}{' '}</div></section>) : null}@@ -277,6 +289,19 @@ const SandboxSettings = () => {)}</div>+ {pendingRemoval ? (+ <ConfirmDeleteDialog+ title="Remove sandbox provider?"+ description={`“${pendingRemoval.name}” will stop running sandboxes for code, files and shell commands.`}+ busy={busy}+ error={removeError}+ onCancel={closeRemoveDialog}+ onConfirm={() => {+ handleRemove(pendingRemoval);+ }}+ />+ ) : null}+<ConfigureSandboxFormopen={formOpen}onOpenChange={open => {diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/SkillSettings.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/SkillSettings.tsxindex 62b74d00d..7551f749c 100644--- a/packages/trueforge-ui/src/containers/SettingsBuilder/SkillSettings.tsx+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/SkillSettings.tsx@@ -9,6 +9,7 @@ import { useCatalogServer } from '../../server/ServerContext.js';import type { RegistrySkill, SkillBase, SkillCatalogEntry, SkillConfigBase } from '../../server/types.js';import { getErrorMessage } from '../../utils/getErrorMessage.js';import { useToasterOptional } from '../ToasterContainer.js';+import ConfirmDeleteDialog from './ConfirmDeleteDialog.js';import ImportGithubSkillForm from './ImportGithubSkillForm.js';const matchesQuery = (query: string, name: string, description: string) =>@@ -33,6 +34,8 @@ const SkillSettings = () => {const [busy, setBusy] = useState(false);const [managedExternally, setManagedExternally] = useState(false);const [importOpen, setImportOpen] = useState(false);+ const [pendingRemoval, setPendingRemoval] = useState<SkillBase | null>(null);+ const [removeError, setRemoveError] = useState<string | null>(null);const refresh = useCallback(async () => {if (!skillCatalog) return;@@ -99,12 +102,20 @@ const SkillSettings = () => {}).catch(() => {});};+ const closeRemoveDialog = () => {+ if (busy) return;+ setPendingRemoval(null);+ setRemoveError(null);+ };+const handleRemove = (skill: SkillBase) => {const deleteSkill = skillCatalog.deleteSkill;if (!deleteSkill) return;+ setRemoveError(null);void runMutation(async () => {await deleteSkill({ id: skill.id });- }).catch(() => {});+ setPendingRemoval(null);+ }, setRemoveError).catch(() => {});};const handleImport = async (draft: SkillConfigBase) => {@@ -201,7 +212,8 @@ const SkillSettings = () => {disabled={busy || managedExternally}aria-label={`Remove ${skill.name}`}onClick={() => {- handleRemove(skill);+ setRemoveError(null);+ setPendingRemoval(skill);}}>Remove@@ -254,6 +266,19 @@ const SkillSettings = () => {</div></div>+ {pendingRemoval ? (+ <ConfirmDeleteDialog+ title="Remove skill?"+ description={`“${pendingRemoval.name}” will no longer be available to your agents.`}+ busy={busy}+ error={removeError}+ onCancel={closeRemoveDialog}+ onConfirm={() => {+ handleRemove(pendingRemoval);+ }}+ />+ ) : null}+<ImportGithubSkillFormopen={importOpen}onOpenChange={open => {diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.tsindex 8e35f2c10..863a81021 100644--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.ts+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.ts@@ -144,7 +144,7 @@ export function toHarnessManifest(req: {};}-/** Settings connector port for `createTrueForgeServer`. Delete omitted; disconnect unsupported. */+/** Settings connector port for `createTrueForgeServer`. */export function createConnectorCatalog(client: TrueForge,): ConnectorCatalogServer<@@ -259,5 +259,8 @@ export function createConnectorCatalog(const body = await client.mcpServers.deleteAuthorization(req.id);return toUiConnector(body.data);},+ deleteConnector: async ({ id }) => {+ await client.settings.mcpServers.delete(id);+ },};}diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.tsindex 7e2db7ccc..4d0ca8e47 100644--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.ts+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.ts@@ -108,7 +108,7 @@ export function toHarnessModelProvider(req: {return { type: req.type, auth, models };}-/** Settings model-catalog port for `createTrueForgeServer`. Delete is omitted (no BE route). */+/** Settings model-catalog port for `createTrueForgeServer`. */export function createModelProviderCatalog(client: TrueForge,): ModelCatalogServer<@@ -175,5 +175,8 @@ export function createModelProviderCatalog(});return toUiModelProvider(body.data);},+ deleteModelProvider: async ({ id }) => {+ await client.settings.modelProviders.delete(id);+ },};}diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/skillCatalog.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/skillCatalog.tsindex 0991e0a7e..af31e7f44 100644--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/skillCatalog.ts+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/skillCatalog.ts@@ -50,7 +50,7 @@ export function toUiSkill(skill: TrueForgeApi.ConfiguredSkill, catalogNames: Reareturn base;}-/** Settings skill-catalog port for `createTrueForgeServer`. Delete omitted (no BE route). */+/** Settings skill-catalog port for `createTrueForgeServer`. */export function createSkillCatalog(client: TrueForge): SkillCatalogServer<UiSkill> {return {getSkillCatalog: async () => {@@ -86,5 +86,8 @@ export function createSkillCatalog(client: TrueForge): SkillCatalogServer<UiSkildescription: body.data.manifest.description,};},+ deleteSkill: async ({ id }) => {+ await client.settings.skills.delete(id);+ },};}diff --git a/packages/trueforge-ui/test/containers/SettingsBuilder/ConnectorSettings.test.tsx b/packages/trueforge-ui/test/containers/SettingsBuilder/ConnectorSettings.test.tsxindex 5bbed7e3e..a71e76baf 100644--- a/packages/trueforge-ui/test/containers/SettingsBuilder/ConnectorSettings.test.tsx+++ b/packages/trueforge-ui/test/containers/SettingsBuilder/ConnectorSettings.test.tsx@@ -1,5 +1,5 @@// @vitest-environment jsdom-import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';import { beforeAll, describe, expect, it, vi } from 'vitest';import ConnectorSettings from '@/containers/SettingsBuilder/ConnectorSettings.js';@@ -68,4 +68,44 @@ describe('ConnectorSettings edit flow', () => {});});});++ it('asks for confirmation before deleting a configured connector', async () => {+ const connector: ConnectorBase = {+ id: 'custom-mcp',+ name: 'Custom MCP',+ description: 'Custom tools',+ url: 'https://mcp.example.com/mcp',+ authenticated: true,+ requiresAuth: false,+ auth: { type: 'none' },+ };+ const deleteConnector = vi.fn(async () => {});+ const server = createMockAgentUIServer({+ catalog: createMockCatalog({+ connectorCatalog: {+ getConnectorCatalog: async () => [],+ listConnectors: async () => [connector],+ getConnector: async () => connector,+ getToolsByConnectorId: async () => [],+ createConnector: async () => connector,+ updateConnector: async () => connector,+ authenticateConnector: async () => ({ authorization_endpoint: '' }),+ disconnectConnector: async () => connector,+ deleteConnector,+ },+ }),+ });++ render(+ <ServerProvider server={server}>+ <ConnectorSettings />+ </ServerProvider>,+ );++ fireEvent.click(await screen.findByRole('button', { name: 'Remove Custom MCP' }));+ expect(await screen.findByText('Remove connector?')).toBeInTheDocument();+ fireEvent.click(within(screen.getByRole('dialog')).getByRole('button', { name: 'Remove' }));++ await waitFor(() => expect(deleteConnector).toHaveBeenCalledWith({ id: connector.id }));+ });});diff --git a/packages/trueforge-ui/test/containers/SettingsBuilder/ModelSettings.test.tsx b/packages/trueforge-ui/test/containers/SettingsBuilder/ModelSettings.test.tsxindex a7086ad6e..4658ec1af 100644--- a/packages/trueforge-ui/test/containers/SettingsBuilder/ModelSettings.test.tsx+++ b/packages/trueforge-ui/test/containers/SettingsBuilder/ModelSettings.test.tsx@@ -1,5 +1,5 @@// @vitest-environment jsdom-import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';import { beforeAll, describe, expect, it, vi } from 'vitest';import type { CustomProviderDraft } from '@/containers/SettingsBuilder/CustomModelProviderForm.js';@@ -101,3 +101,57 @@ describe('ModelSettings custom provider editing', () => {});});});++describe('ModelSettings removal', () => {+ const renderWithCatalog = ({+ deleteModelProvider,+ updateModelProvider = vi.fn(),+ }: {+ deleteModelProvider?: (req: { id: string }) => Promise<void>;+ updateModelProvider?: (request: UpdateModelProviderRequest) => Promise<ModelProviderBase>;+ }) => {+ const server = createMockAgentUIServer({+ catalog: createMockCatalog({+ modelCatalog: {+ getModelProviderCatalog: async () => [],+ listModelProviders: async () => [builtInProvider],+ createModelProvider: vi.fn(),+ updateModelProvider,+ ...(deleteModelProvider ? { deleteModelProvider } : {}),+ },+ }),+ });++ render(+ <ServerProvider server={server}>+ <ModelSettings />+ </ServerProvider>,+ );++ return { updateModelProvider };+ };++ it('removes the provider when its last model is removed', async () => {+ const deleteModelProvider = vi.fn(async () => {});+ const { updateModelProvider } = renderWithCatalog({ deleteModelProvider });++ fireEvent.click(await screen.findByRole('button', { name: 'Remove gpt-4-1' }));++ expect(await screen.findByText('Remove provider?')).toBeInTheDocument();+ expect(+ screen.getByText('“gpt-4-1” is the only model left in OpenAI, so the whole provider will be removed.'),+ ).toBeInTheDocument();++ fireEvent.click(within(screen.getByRole('dialog')).getByRole('button', { name: 'Remove' }));++ await waitFor(() => expect(deleteModelProvider).toHaveBeenCalledWith({ id: 'openai' }));+ expect(updateModelProvider).not.toHaveBeenCalled();+ });++ it('hides the last model’s remove button when the host cannot delete providers', async () => {+ renderWithCatalog({});++ await screen.findByText('gpt-4-1');+ expect(screen.queryByRole('button', { name: 'Remove gpt-4-1' })).toBeNull();+ });+});diff --git a/packages/trueforge-ui/test/containers/SettingsBuilder/SkillSettings.test.tsx b/packages/trueforge-ui/test/containers/SettingsBuilder/SkillSettings.test.tsxindex 27686a4ce..47e14a931 100644--- a/packages/trueforge-ui/test/containers/SettingsBuilder/SkillSettings.test.tsx+++ b/packages/trueforge-ui/test/containers/SettingsBuilder/SkillSettings.test.tsx@@ -1,5 +1,5 @@// @vitest-environment jsdom-import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';import type { ReactNode } from 'react';import { beforeAll, describe, expect, it, vi } from 'vitest';@@ -114,12 +114,82 @@ describe('SkillSettings', () => {);fireEvent.click(await screen.findByRole('button', { name: 'Remove Code Review' }));+ fireEvent.click(await screen.findByRole('button', { name: 'Remove' }));await waitFor(() => {expect(screen.getByRole('button', { name: 'Enable Code Review' })).toBeTruthy();});});+ it('keeps the skill when the confirmation is cancelled', async () => {+ const host = createFakeHost([+ {+ id: 'db-house-style',+ name: 'House Style',+ description: 'Writing rules and tone-of-voice for external copy.',+ },+ ]);+ const { wrapper: Wrapper } = host;++ render(+ <Wrapper>+ <SkillSettings />+ </Wrapper>,+ );++ fireEvent.click(await screen.findByRole('button', { name: 'Remove House Style' }));+ expect(await screen.findByText('Remove skill?')).toBeTruthy();++ fireEvent.click(screen.getByRole('button', { name: 'Cancel' }));++ await waitFor(() => {+ expect(screen.queryByText('Remove skill?')).toBeNull();+ });+ expect(host.getDefined()).toHaveLength(1);+ });++ it('keeps the dialog open and shows why a refused removal failed', async () => {+ const server = createMockAgentUIServer({+ catalog: createMockCatalog({+ skillCatalog: {+ getSkillCatalog: async () => [],+ listSkills: async () => [{ id: 'db-house-style', name: 'House Style', description: 'Writing rules.' }],+ createSkill: async () => {+ throw new Error('not used');+ },+ deleteSkill: async () => {+ throw Object.assign(new Error('Conflict'), {+ statusCode: 409,+ body: {+ error: {+ message:+ 'Still in use — skill "house-style" is used by agent support-bot. Update or delete those agents first.',+ },+ },+ });+ },+ },+ }),+ });++ render(+ <ServerProvider server={server}>+ <SkillSettings />+ </ServerProvider>,+ );++ fireEvent.click(await screen.findByRole('button', { name: 'Remove House Style' }));+ fireEvent.click(await screen.findByRole('button', { name: 'Remove' }));++ expect(await screen.findByRole('alert')).toHaveTextContent(+ 'Still in use — skill "house-style" is used by agent support-bot. Update or delete those agents first.',+ );+ const dialog = screen.getByRole('dialog');+ expect(within(dialog).getByText("Can't remove skill")).toBeTruthy();+ expect(within(dialog).queryByRole('button', { name: 'Remove' })).toBeNull();+ expect(within(dialog).getByRole('button', { name: 'Close' })).toBeTruthy();+ });+it('removes an imported github skill entirely', async () => {const host = createFakeHost([{@@ -137,6 +207,7 @@ describe('SkillSettings', () => {);fireEvent.click(await screen.findByRole('button', { name: 'Remove House Style' }));+ fireEvent.click(await screen.findByRole('button', { name: 'Remove' }));await waitFor(() => {expect(screen.queryByText('House Style')).toBeNull();diff --git a/packages/trueforge/src/apis/mcpServers.ts b/packages/trueforge/src/apis/mcpServers.tsindex e1026d0db..75b407c54 100644--- a/packages/trueforge/src/apis/mcpServers.ts+++ b/packages/trueforge/src/apis/mcpServers.ts@@ -12,6 +12,7 @@ import type { Logger } from 'winston';import type { ResolveRequestContext } from '../auth/identity';import { safeReturnTo } from '../auth/safeReturnTo';import configuration from '../config';+import type { IAgentStore } from '../db/agentStore';import {McpServerNameConflictError,McpServerNotFoundError,@@ -26,6 +27,7 @@ import {authorizeMcpServerRoute,createMcpServerRoute,deleteAuthorizationMcpServerRoute,+ deleteMcpServerRoute,getAvailableMcpServerRoute,getMcpServerRoute,listAvailableMcpServersRoute,@@ -33,6 +35,7 @@ import {listMcpServerToolsRoute,putMcpServerRoute,} from '../routes/mcpServerRoutes';+import { findCatalogUsageConflict } from '../runtime/catalogUsage';import { getMcpConnection } from '../runtime/sessionResources';import type {AvailableMcpServer,@@ -52,6 +55,10 @@ export interface McpServersRouterDeps<TTransaction> {resolveRequestContext: ResolveRequestContext;}+export interface SettingsMcpServersRouterDeps<TTransaction> extends McpServersRouterDeps<TTransaction> {+ resolveAgentStore: (c: Context) => IAgentStore<TTransaction>;+}+/** Omits keys whose value is `undefined` so wire objects satisfy JSONValue index signatures. */function omitUndefinedEntries(obj: Record<string, unknown>): Record<string, unknown> {const out: Record<string, unknown> = {};@@ -149,7 +156,7 @@ async function resolveAvailableMcpServer<TTransaction>(params: {}/** Admin/settings MCP CRUD. */-export function createSettingsMcpServersRouter<TTransaction>(deps: McpServersRouterDeps<TTransaction>) {+export function createSettingsMcpServersRouter<TTransaction>(deps: SettingsMcpServersRouterDeps<TTransaction>) {const listHandler: RouteHandler<typeof listMcpServersRoute> = async c => {const requestContext = deps.resolveRequestContext(c);const userRef = requestContext.subject.id;@@ -364,11 +371,49 @@ export function createSettingsMcpServersRouter<TTransaction>(deps: McpServersRou}};+ const deleteHandler: RouteHandler<typeof deleteMcpServerRoute> = async c => {+ const { name } = c.req.valid('param');+ const requestContext = deps.resolveRequestContext(c);+ const store = deps.resolveMcpServerStore(c);+ const outcome = await deps.withTransaction(async transaction => {+ const existing = await store.getServerForUpdate({ tenant_id: requestContext.tenant_id, name }, transaction);+ if (existing === undefined) {+ return { deleted: false, conflict: undefined };+ }+ const conflict = await findCatalogUsageConflict(+ {+ agentStore: deps.resolveAgentStore(c),+ tenant_id: requestContext.tenant_id,+ entity: 'mcp_server',+ names: [name],+ },+ transaction,+ );+ if (conflict !== undefined) {+ return { deleted: false, conflict };+ }+ // Every user's grant for this server dies with it; a later server of the same name+ // is a different OAuth resource and must re-consent.+ await deps.tokenStore.deleteTokensForServer({ id: existing.id }, transaction);+ await deps.tokenStore.deletePendingAuthorizationsForServer({ id: existing.id }, transaction);+ const deleted = await store.deleteServer({ tenant_id: requestContext.tenant_id, name }, transaction);+ return { deleted, conflict: undefined };+ });+ if (outcome.conflict !== undefined) {+ return c.json({ error: { message: outcome.conflict } }, 409);+ }+ if (!outcome.deleted) {+ return c.json({ error: { message: `MCP server not found: ${name}` } }, 404);+ }+ return c.json({}, 200);+ };+const router = new OpenAPIHono();router.openapi(listMcpServersRoute, listHandler);router.openapi(createMcpServerRoute, createHandler);router.openapi(putMcpServerRoute, putHandler);router.openapi(getMcpServerRoute, getHandler);+ router.openapi(deleteMcpServerRoute, deleteHandler);return router;}diff --git a/packages/trueforge/src/apis/modelProviders.ts b/packages/trueforge/src/apis/modelProviders.tsindex 619921645..5bc006501 100644--- a/packages/trueforge/src/apis/modelProviders.ts+++ b/packages/trueforge/src/apis/modelProviders.ts@@ -2,6 +2,7 @@ import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';import { assertSafeOutboundUrl } from '@truefoundry/trueforge-core/core';import type { Context } from 'hono';import type { ResolveRequestContext } from '../auth/identity';+import type { IAgentStore } from '../db/agentStore';import {ModelProviderNameConflictError,type IModelProviderStore,@@ -10,9 +11,11 @@ import {import type { WithTransaction } from '../db/transaction';import {createModelProviderRoute,+ deleteModelProviderRoute,listModelProvidersRoute,putModelProviderRoute,} from '../routes/modelProviderRoutes';+import { findCatalogUsageConflict } from '../runtime/catalogUsage';import {modelProviderName,type ConfiguredModelProvider,@@ -24,10 +27,28 @@ import { MissingStoredSecretError, resolveStoredSecretValue, toRedactedSecretValexport interface ModelProvidersRouterDeps<TTransaction> {resolveModelProviderStore: (c: Context) => IModelProviderStore<TTransaction>;+ resolveAgentStore: (c: Context) => IAgentStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;resolveRequestContext: ResolveRequestContext;}+/** Fully-qualified names an upsert would drop, so agents pointing at them can be caught first. */+function droppedModelNames({+ provider_name,+ existing,+ incoming,+}: {+ provider_name: string;+ existing: ModelProviderManifest | undefined;+ incoming: ModelProviderManifest;+}): string[] {+ if (existing === undefined) {+ return [];+ }+ const kept = new Set(incoming.models.map(model => model.name));+ return existing.models.filter(model => !kept.has(model.name)).map(model => `${provider_name}/${model.name}`);+}+function redactModelProvider(manifest: ModelProviderManifest): ModelProviderManifest {if (manifest.auth === undefined) {return manifest;@@ -120,15 +141,35 @@ export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRoutry {// Lock → resolve secret from that snapshot → upsert, all in one txn so concurrent keep// cannot re-write a secret over a rotate that committed in between.- const record = await deps.withTransaction(async transaction => {- const existing = await store.getProviderForUpdate({ tenant_id: requestContext.tenant_id, name }, transaction);- const manifest = resolveModelProviderManifestForWrite({- incoming: provider,- existing: existing?.manifest,- });- return store.upsertProvider({ tenant_id: requestContext.tenant_id, name, manifest }, transaction);- });- return c.json({ data: toWireProvider(record) }, 200);+ const outcome = await deps.withTransaction(+ async (transaction): Promise<{ conflict: string } | { conflict: undefined; record: ModelProviderRecord }> => {+ const existing = await store.getProviderForUpdate({ tenant_id: requestContext.tenant_id, name }, transaction);+ const manifest = resolveModelProviderManifestForWrite({+ incoming: provider,+ existing: existing?.manifest,+ });+ const conflict = await findCatalogUsageConflict(+ {+ agentStore: deps.resolveAgentStore(c),+ tenant_id: requestContext.tenant_id,+ entity: 'model',+ names: droppedModelNames({ provider_name: name, existing: existing?.manifest, incoming: manifest }),+ },+ transaction,+ );+ if (conflict !== undefined) {+ return { conflict };+ }+ return {+ conflict: undefined,+ record: await store.upsertProvider({ tenant_id: requestContext.tenant_id, name, manifest }, transaction),+ };+ },+ );+ if (outcome.conflict !== undefined) {+ return c.json({ error: { message: outcome.conflict } }, 409);+ }+ return c.json({ data: toWireProvider(outcome.record) }, 200);} catch (error) {if (error instanceof MissingStoredSecretError) {return c.json({ error: { message: 'API key is required' } }, 400);@@ -137,9 +178,44 @@ export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRou}};+ const deleteHandler: RouteHandler<typeof deleteModelProviderRoute> = async c => {+ const store = deps.resolveModelProviderStore(c);+ const { name } = c.req.valid('param');+ const requestContext = deps.resolveRequestContext(c);+ const outcome = await deps.withTransaction(async transaction => {+ const existing = await store.getProviderForUpdate({ tenant_id: requestContext.tenant_id, name }, transaction);+ if (existing === undefined) {+ return { deleted: false, conflict: undefined };+ }+ // Agents name a model, not a provider, so the provider itself is the reference to check.+ const conflict = await findCatalogUsageConflict(+ {+ agentStore: deps.resolveAgentStore(c),+ tenant_id: requestContext.tenant_id,+ entity: 'model_provider',+ names: [name],+ },+ transaction,+ );+ if (conflict !== undefined) {+ return { deleted: false, conflict };+ }+ const deleted = await store.deleteProvider({ tenant_id: requestContext.tenant_id, name }, transaction);+ return { deleted, conflict: undefined };+ });+ if (outcome.conflict !== undefined) {+ return c.json({ error: { message: outcome.conflict } }, 409);+ }+ if (!outcome.deleted) {+ return c.json({ error: { message: `Model provider not found: ${name}` } }, 404);+ }+ return c.json({}, 200);+ };+const router = new OpenAPIHono();router.openapi(listModelProvidersRoute, listHandler);router.openapi(createModelProviderRoute, createHandler);router.openapi(putModelProviderRoute, putHandler);+ router.openapi(deleteModelProviderRoute, deleteHandler);return router;}diff --git a/packages/trueforge/src/apis/settings.ts b/packages/trueforge/src/apis/settings.tsindex 2fa3e87e3..1b612f9e8 100644--- a/packages/trueforge/src/apis/settings.ts+++ b/packages/trueforge/src/apis/settings.ts@@ -7,6 +7,7 @@ import { OpenAPIHono } from '@hono/zod-openapi';import type { Context } from 'hono';import type { Logger } from 'winston';import type { ResolveRequestContext } from '../auth/identity';+import type { IAgentStore } from '../db/agentStore';import type { IMcpServerWithAuthStore } from '../db/mcpServerStore';import type { IModelProviderStore } from '../db/modelProviderStore';import type { ISandboxEnvironmentStore } from '../db/sandboxEnvironmentStore';@@ -28,6 +29,8 @@ export interface SettingsRouterDeps<TTransaction> {resolveSandboxProviderStore: (c: Context) => ISandboxProviderStore<TTransaction>;sandboxEnvironmentStore: ISandboxEnvironmentStore<TTransaction>;resolveWebSearchProviderStore: (c: Context) => IWebSearchProviderStore<TTransaction>;+ /** Delete routes refuse to remove a catalog entry an agent still references. */+ resolveAgentStore: (c: Context) => IAgentStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;logger: Logger;resolveRequestContext: ResolveRequestContext;@@ -39,6 +42,7 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTra'/model-providers',createModelProvidersRouter({resolveModelProviderStore: deps.resolveModelProviderStore,+ resolveAgentStore: deps.resolveAgentStore,withTransaction: deps.withTransaction,resolveRequestContext: deps.resolveRequestContext,}),@@ -47,6 +51,7 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTra'/mcp-servers',createSettingsMcpServersRouter({resolveMcpServerStore: deps.resolveMcpServerStore,+ resolveAgentStore: deps.resolveAgentStore,tokenStore: deps.tokenStore,withTransaction: deps.withTransaction,logger: deps.logger,@@ -57,6 +62,7 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTra'/skills',createSkillsRouter({resolveSkillStore: deps.resolveSkillStore,+ resolveAgentStore: deps.resolveAgentStore,withTransaction: deps.withTransaction,resolveRequestContext: deps.resolveRequestContext,}),diff --git a/packages/trueforge/src/apis/skills.ts b/packages/trueforge/src/apis/skills.tsindex 85947d564..e3e669c29 100644--- a/packages/trueforge/src/apis/skills.ts+++ b/packages/trueforge/src/apis/skills.ts@@ -1,15 +1,18 @@import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';import type { Context } from 'hono';import type { ResolveRequestContext } from '../auth/identity';+import type { IAgentStore } from '../db/agentStore';import { SkillNameConflictError, type ISkillStore, type SkillRecord } from '../db/skillStore';import type { WithTransaction } from '../db/transaction';import {createSkillRoute,+ deleteSkillRoute,listAvailableSkillsRoute,listConfiguredSkillsRoute,listSkillVersionsRoute,putSkillRoute,} from '../routes/skillRoutes';+import { findCatalogUsageConflict } from '../runtime/catalogUsage';import type { AvailableSkill, ConfiguredSkill, CreateSkillRequest, UpdateSkillRequest } from '../schemas/skill';import { parseTrueFoundryRegistrySkill } from '../schemas/skill';@@ -21,6 +24,10 @@ export interface SkillsRouterDeps<TTransaction> {resolveRequestContext: ResolveRequestContext;}+export interface SettingsSkillsRouterDeps<TTransaction> extends SkillsRouterDeps<TTransaction> {+ resolveAgentStore: (c: Context) => IAgentStore<TTransaction>;+}+function toConfiguredSkill(record: SkillRecord): ConfiguredSkill {return {name: record.name,@@ -46,7 +53,7 @@ function toAvailableSkill(record: SkillRecord): AvailableSkill {}/** Admin/settings skills CRUD (mounted at /api/v1/settings/skills). */-export function createSkillsRouter<TTransaction>(deps: SkillsRouterDeps<TTransaction>) {+export function createSkillsRouter<TTransaction>(deps: SettingsSkillsRouterDeps<TTransaction>) {const listConfiguredHandler: RouteHandler<typeof listConfiguredSkillsRoute> = async c => {const requestContext = deps.resolveRequestContext(c);const records = await deps.resolveSkillStore(c).listSkills({@@ -87,10 +94,41 @@ export function createSkillsRouter<TTransaction>(deps: SkillsRouterDeps<TTransacreturn c.json({ data: toConfiguredSkill(record) }, 200);};+ const deleteHandler: RouteHandler<typeof deleteSkillRoute> = async c => {+ const { name } = c.req.valid('param');+ const requestContext = deps.resolveRequestContext(c);+ const outcome = await deps.withTransaction(async transaction => {+ const conflict = await findCatalogUsageConflict(+ {+ agentStore: deps.resolveAgentStore(c),+ tenant_id: requestContext.tenant_id,+ entity: 'skill',+ names: [name],+ },+ transaction,+ );+ if (conflict !== undefined) {+ return { deleted: false, conflict };+ }+ const deleted = await deps+ .resolveSkillStore(c)+ .deleteSkill({ tenant_id: requestContext.tenant_id, name }, transaction);+ return { deleted, conflict: undefined };+ });+ if (outcome.conflict !== undefined) {+ return c.json({ error: { message: outcome.conflict } }, 409);+ }+ if (!outcome.deleted) {+ return c.json({ error: { message: `Skill not found: ${name}` } }, 404);+ }+ return c.json({}, 200);+ };+const router = new OpenAPIHono();router.openapi(listConfiguredSkillsRoute, listConfiguredHandler);router.openapi(createSkillRoute, createHandler);router.openapi(putSkillRoute, putHandler);+ router.openapi(deleteSkillRoute, deleteHandler);return router;}diff --git a/packages/trueforge/src/app.ts b/packages/trueforge/src/app.tsindex c1bbdef16..0f26084dc 100644--- a/packages/trueforge/src/app.ts+++ b/packages/trueforge/src/app.ts@@ -415,6 +415,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {resolveSandboxProviderStore: deps.resolveSandboxProviderStore,sandboxEnvironmentStore: deps.sandboxEnvironmentStore,resolveWebSearchProviderStore: deps.resolveWebSearchProviderStore,+ resolveAgentStore: deps.resolveAgentStore,withTransaction: deps.withTransaction,logger: deps.logger,resolveRequestContext,diff --git a/packages/trueforge/src/db/McpServerWithAuthStore.ts b/packages/trueforge/src/db/McpServerWithAuthStore.tsindex 5810232bd..792fc9e2f 100644--- a/packages/trueforge/src/db/McpServerWithAuthStore.ts+++ b/packages/trueforge/src/db/McpServerWithAuthStore.ts@@ -7,6 +7,7 @@ import {type AuthorizeMcpServerInput,type CreateMcpServerInput,type DeleteMcpAuthorizationInput,+ type DeleteMcpServerInput,type GetMcpServerInput,type IMcpServerStore,type IMcpServerWithAuthStore,@@ -52,6 +53,10 @@ export class McpServerWithAuthStore<TTransaction = never> implements IMcpServerWreturn this.#store.upsertServer(input, transaction);}+ deleteServer(input: DeleteMcpServerInput, transaction?: TTransaction): Promise<boolean> {+ return this.#store.deleteServer(input, transaction);+ }+resolveInvokeHeaders(input: {record: McpServerRecord;userRef: string;diff --git a/packages/trueforge/src/db/agentStore.ts b/packages/trueforge/src/db/agentStore.tsindex 69fa60ffa..ee7935c73 100644--- a/packages/trueforge/src/db/agentStore.ts+++ b/packages/trueforge/src/db/agentStore.ts@@ -91,6 +91,23 @@ export interface DeleteAgentInput {id: string;}+/** Catalog entity kind an AgentSpec references by name. */+export type AgentCatalogEntity = 'model_provider' | 'model' | 'mcp_server' | 'skill';++export interface ListAgentCatalogUsageInput {+ tenant_id: string;+ entity: AgentCatalogEntity;+ /** Fully-qualified `provider/model` names for `model`; the provider, server, or skill name otherwise. */+ names: readonly string[];+}++/** One agent paired with one name it references; an agent repeats per matched name. */+export interface AgentCatalogUsageRow {+ agent_name: string;+ /** The matched entry from the requested `names`. */+ reference_name: string;+}+export interface ListAgentNamesUsingSandboxEnvironmentInput {tenant_id: string;environment_name: string;@@ -141,6 +158,11 @@ export interface IAgentStore<TTransaction = never> {updateAgent(input: UpdateAgentInput, transaction?: TTransaction): Promise<AgentRecord | undefined>;/** Deletes by immutable id. Idempotent if already missing. */deleteAgent(input: DeleteAgentInput, transaction?: TTransaction): Promise<void>;+ /** Which agents reference the named catalog entries — the pre-check for deleting one. */+ listAgentCatalogUsage(+ input: ListAgentCatalogUsageInput,+ transaction?: TTransaction,+ ): Promise<readonly AgentCatalogUsageRow[]>;/** Agent names whose manifest references the given sandbox environment name. */listAgentNamesUsingSandboxEnvironment(input: ListAgentNamesUsingSandboxEnvironmentInput,diff --git a/packages/trueforge/src/db/mcpServerStore.ts b/packages/trueforge/src/db/mcpServerStore.tsindex 44f4865f8..2c847fc5b 100644--- a/packages/trueforge/src/db/mcpServerStore.ts+++ b/packages/trueforge/src/db/mcpServerStore.ts@@ -40,6 +40,11 @@ export interface CreateMcpServerInput {/** Same shape as create for now; kept as a distinct name for the upsert path. */export type UpsertMcpServerInput = CreateMcpServerInput;+export interface DeleteMcpServerInput {+ tenant_id: string;+ name: string;+}+/** Unique `(tenant_id, name)` violation on create. */export class McpServerNameConflictError extends Error {readonly tenant_id: string;@@ -100,6 +105,11 @@ export interface IMcpServerStore<TTransaction = never> extends IOAuthClientStore* Never overwrites `id`, `oauth_server`, or `oauth_client`.*/upsertServer(input: UpsertMcpServerInput, transaction?: TTransaction): Promise<McpServerRecord>;+ /**+ * Removes one server row. Resolves `false` when no row matched.+ * Stored OAuth tokens and pending authorizations are the caller's to clear first.+ */+ deleteServer(input: DeleteMcpServerInput, transaction?: TTransaction): Promise<boolean>;}/** Persistence plus authorize / status / revoke and invoke headers. */diff --git a/packages/trueforge/src/db/modelProviderStore.ts b/packages/trueforge/src/db/modelProviderStore.tsindex 2396f9751..3190b09f1 100644--- a/packages/trueforge/src/db/modelProviderStore.ts+++ b/packages/trueforge/src/db/modelProviderStore.ts@@ -42,6 +42,11 @@ export interface CreateModelProviderInput {/** Same shape as create for now; kept as a distinct name for the upsert path. */export type UpsertModelProviderInput = CreateModelProviderInput;+export interface DeleteModelProviderInput {+ tenant_id: string;+ name: string;+}+/** Unique `(tenant_id, name)` violation on create. */export class ModelProviderNameConflictError extends Error {readonly tenant_id: string;@@ -71,6 +76,8 @@ export interface IModelProviderStore<TTransaction = never> {createProvider(input: CreateModelProviderInput, transaction?: TTransaction): Promise<ModelProviderRecord>;/** Single-row write: creates the provider or replaces the whole manifest (models included). */upsertProvider(input: UpsertModelProviderInput, transaction?: TTransaction): Promise<ModelProviderRecord>;+ /** Removes one provider and every model it declares. Resolves `false` when no row matched. */+ deleteProvider(input: DeleteModelProviderInput, transaction?: TTransaction): Promise<boolean>;/** Flattens manifests into the FQN read view for GET /models. */listModels(input: ListModelProvidersInput, transaction?: TTransaction): Promise<AvailableModel[]>;/** Extra headers for a model invoke. */diff --git a/packages/trueforge/src/db/postgres/agent-store/PostgresAgentStore.ts b/packages/trueforge/src/db/postgres/agent-store/PostgresAgentStore.tsindex 4ef901f1e..561f2bf10 100644--- a/packages/trueforge/src/db/postgres/agent-store/PostgresAgentStore.ts+++ b/packages/trueforge/src/db/postgres/agent-store/PostgresAgentStore.ts@@ -3,12 +3,14 @@ import {decodeOffsetPageToken,paginateOffsetRows,} from '@truefoundry/trueforge-core/agent-session/store/OffsetPageToken';-import { sql, type Kysely, type Selectable, type Transaction } from 'kysely';+import { sql, type Kysely, type RawBuilder, type Selectable, type Transaction } from 'kysely';import { newId } from '../../../utils/id';import {AgentExternalIdConflictError,AgentNameConflictError,parseStoredAgentSpec,+ type AgentCatalogEntity,+ type AgentCatalogUsageRow,type AgentExternalIdRow,type AgentRecord,type CreateAgentInput,@@ -17,6 +19,7 @@ import {type GetExternalIdsByIdsInput,type GetOwnedIdsInput,type IAgentStore,+ type ListAgentCatalogUsageInput,type ListAgentNamesUsingSandboxEnvironmentInput,type ListAgentsInput,type UpdateAgentInput,@@ -58,6 +61,40 @@ function throwAgentUniqueViolation({throw new AgentNameConflictError({ tenant_id, name }, { cause: error });}+/** `jsonb_array_elements` rejects anything but an array, so absent/null keys read as empty. */+function jsonArray(path: RawBuilder<unknown>) {+ return sql`CASE WHEN jsonb_typeof(${path}) = 'array' THEN ${path} ELSE '[]'::jsonb END`;+}++/**+ * Every `(agent, referenced name)` pair a manifest exposes for one entity kind.+ * A provider is referenced through the segment of `model.name` before the first `/`.+ */+function catalogUsagePairs({ entity, tenant_id }: { entity: AgentCatalogEntity; tenant_id: string }) {+ switch (entity) {+ case 'model_provider':+ return sql`+ SELECT name AS agent_name, split_part(manifest->'model'->>'name', '/', 1) AS reference_name+ FROM agent WHERE tenant_id = ${tenant_id}`;+ case 'model':+ return sql`+ SELECT name AS agent_name, manifest->'model'->>'name' AS reference_name+ FROM agent WHERE tenant_id = ${tenant_id}`;+ case 'mcp_server':+ return sql`+ SELECT agent.name AS agent_name, entry.value->>'name' AS reference_name+ FROM agent+ CROSS JOIN LATERAL jsonb_array_elements(${jsonArray(sql`manifest->'mcp_servers'`)}) AS entry(value)+ WHERE tenant_id = ${tenant_id}`;+ case 'skill':+ return sql`+ SELECT agent.name AS agent_name, entry.value->>'name' AS reference_name+ FROM agent+ CROSS JOIN LATERAL jsonb_array_elements(${jsonArray(sql`manifest->'skills'`)}) AS entry(value)+ WHERE tenant_id = ${tenant_id}`;+ }+}+export class PostgresAgentStore implements IAgentStore<Transaction<Database>> {readonly #db: Kysely<Database>;@@ -207,6 +244,23 @@ export class PostgresAgentStore implements IAgentStore<Transaction<Database>> {await db.deleteFrom('agent').where('tenant_id', '=', input.tenant_id).where('id', '=', input.id).execute();}+ async listAgentCatalogUsage(+ input: ListAgentCatalogUsageInput,+ transaction?: Transaction<Database>,+ ): Promise<readonly AgentCatalogUsageRow[]> {+ if (input.names.length === 0) {+ return [];+ }+ const db = transaction ?? this.#db;+ const wanted = sql.join(input.names.map(name => sql`${name}`));+ const { rows } = await sql<AgentCatalogUsageRow>`+ SELECT agent_name, reference_name+ FROM (${catalogUsagePairs({ entity: input.entity, tenant_id: input.tenant_id })}) AS agent_usage+ WHERE reference_name IN (${wanted})+ ORDER BY agent_name`.execute(db);+ return rows;+ }+async listAgentNamesUsingSandboxEnvironment(input: ListAgentNamesUsingSandboxEnvironmentInput,transaction?: Transaction<Database>,diff --git a/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.ts b/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.tsindex 148531257..c6f76ea8f 100644--- a/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.ts+++ b/packages/trueforge/src/db/postgres/mcp-server-store/PostgresMcpServerStore.ts@@ -6,6 +6,7 @@ import {McpServerNameConflictError,toStoredOAuthClientRecord,type CreateMcpServerInput,+ type DeleteMcpServerInput,type GetMcpServerInput,type IMcpServerStore,type ListMcpServersInput,@@ -123,6 +124,16 @@ export class PostgresMcpServerStore implements IMcpServerStore<Transaction<Databreturn toRecord(row);}+ async deleteServer(input: DeleteMcpServerInput, transaction?: Transaction<Database>): Promise<boolean> {+ const db = transaction ?? this.#db;+ const result = await db+ .deleteFrom('mcp_server')+ .where('tenant_id', '=', input.tenant_id)+ .where('name', '=', input.name)+ .executeTakeFirst();+ return result.numDeletedRows > 0n;+ }+async getClient(params: { id: string }, transaction?: Transaction<Database>): Promise<OAuthClientRecord | undefined> {const db = transaction ?? this.#db;const row = await dbdiff --git a/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts b/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.tsindex e787b477b..e722f6f80 100644--- a/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts+++ b/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts@@ -4,6 +4,7 @@ import {flattenProviderModels,ModelProviderNameConflictError,type CreateModelProviderInput,+ type DeleteModelProviderInput,type GetModelProviderForUpdateInput,type GetModelProviderInput,type IModelProviderStore,@@ -126,6 +127,16 @@ export class PostgresModelProviderStore implements IModelProviderStore<Transactireturn toRecord(row);}+ async deleteProvider(input: DeleteModelProviderInput, transaction?: Transaction<Database>): Promise<boolean> {+ const db = transaction ?? this.#db;+ const result = await db+ .deleteFrom('model_provider')+ .where('tenant_id', '=', input.tenant_id)+ .where('name', '=', input.name)+ .executeTakeFirst();+ return result.numDeletedRows > 0n;+ }+resolveInvokeHeaders(): Promise<Record<string, string>> {return Promise.resolve({});}diff --git a/packages/trueforge/src/db/postgres/skill-store/PostgresSkillStore.ts b/packages/trueforge/src/db/postgres/skill-store/PostgresSkillStore.tsindex b05b72f7c..ebce23a6a 100644--- a/packages/trueforge/src/db/postgres/skill-store/PostgresSkillStore.ts+++ b/packages/trueforge/src/db/postgres/skill-store/PostgresSkillStore.ts@@ -6,6 +6,7 @@ import {SkillNameConflictError,type AgentSkillsInput,type CreateSkillInput,+ type DeleteSkillInput,type ISkillStore,type ListSkillsInput,type SkillRecord,@@ -90,6 +91,16 @@ export class PostgresSkillStore implements ISkillStore<Transaction<Database>> {return toRecord(row);}+ async deleteSkill(input: DeleteSkillInput, transaction?: Transaction<Database>): Promise<boolean> {+ const db = transaction ?? this.#db;+ const result = await db+ .deleteFrom('skill')+ .where('tenant_id', '=', input.tenant_id)+ .where('name', '=', input.name)+ .executeTakeFirst();+ return result.numDeletedRows > 0n;+ }+listSkillVersions(input: { name: string }): Promise<SkillVersion[]> {void input;return Promise.resolve([]);diff --git a/packages/trueforge/src/db/skillStore.ts b/packages/trueforge/src/db/skillStore.tsindex d236bc57d..e010d580c 100644--- a/packages/trueforge/src/db/skillStore.ts+++ b/packages/trueforge/src/db/skillStore.ts@@ -36,6 +36,11 @@ export interface CreateSkillInput {/** Same shape as create for now; kept as a distinct name for the upsert path. */export type UpsertSkillInput = CreateSkillInput;+export interface DeleteSkillInput {+ tenant_id: string;+ name: string;+}+/** AgentSpec `skills` refs for validate and resolve. */export interface AgentSkillsInput {tenant_id: string;@@ -61,6 +66,8 @@ export interface ISkillStore<TTransaction = never> {createSkill(input: CreateSkillInput, transaction?: TTransaction): Promise<SkillRecord>;/** Single-row write: creates the skill or replaces the whole manifest. */upsertSkill(input: UpsertSkillInput, transaction?: TTransaction): Promise<SkillRecord>;+ /** Removes one skill. Resolves `false` when no row matched. */+ deleteSkill(input: DeleteSkillInput, transaction?: TTransaction): Promise<boolean>;listSkillVersions(input: { name: string }): Promise<SkillVersion[]>;/** Admit AgentSpec skill refs (git store or TrueFoundry SFY resolve with caller token). */validateAgentSkills(input: AgentSkillsInput, transaction?: TTransaction): Promise<void>;diff --git a/packages/trueforge/src/db/sqlite/agent-store/SqliteAgentStore.ts b/packages/trueforge/src/db/sqlite/agent-store/SqliteAgentStore.tsindex 535295865..5f24241b1 100644--- a/packages/trueforge/src/db/sqlite/agent-store/SqliteAgentStore.ts+++ b/packages/trueforge/src/db/sqlite/agent-store/SqliteAgentStore.ts@@ -14,6 +14,8 @@ import {AgentExternalIdConflictError,AgentNameConflictError,parseStoredAgentSpec,+ type AgentCatalogEntity,+ type AgentCatalogUsageRow,type AgentExternalIdRow,type AgentRecord,type CreateAgentInput,@@ -22,6 +24,7 @@ import {type GetExternalIdsByIdsInput,type GetOwnedIdsInput,type IAgentStore,+ type ListAgentCatalogUsageInput,type ListAgentNamesUsingSandboxEnvironmentInput,type ListAgentsInput,type UpdateAgentInput,@@ -63,6 +66,39 @@ function toRecord(row: {};}+/**+ * Every `(agent, referenced name)` pair a manifest exposes for one entity kind.+ * A provider is referenced through the segment of `model.name` before the first `/`; the+ * appended separator keeps `instr` from returning 0 when a stored name has no `/`.+ */+function catalogUsagePairs({ entity, tenant_id }: { entity: AgentCatalogEntity; tenant_id: string }) {+ switch (entity) {+ case 'model_provider':+ return sql`+ SELECT name AS agent_name,+ substr(+ json_extract(manifest, '$.model.name'),+ 1,+ instr(json_extract(manifest, '$.model.name') || '/', '/') - 1+ ) AS reference_name+ FROM agent WHERE tenant_id = ${tenant_id}`;+ case 'model':+ return sql`+ SELECT name AS agent_name, json_extract(manifest, '$.model.name') AS reference_name+ FROM agent WHERE tenant_id = ${tenant_id}`;+ case 'mcp_server':+ return sql`+ SELECT agent.name AS agent_name, json_extract(entry.value, '$.name') AS reference_name+ FROM agent, json_each(agent.manifest, '$.mcp_servers') AS entry+ WHERE tenant_id = ${tenant_id}`;+ case 'skill':+ return sql`+ SELECT agent.name AS agent_name, json_extract(entry.value, '$.name') AS reference_name+ FROM agent, json_each(agent.manifest, '$.skills') AS entry+ WHERE tenant_id = ${tenant_id}`;+ }+}+export class SqliteAgentStore implements IAgentStore<Transaction<Database>> {readonly #db: Kysely<Database>;@@ -214,6 +250,23 @@ export class SqliteAgentStore implements IAgentStore<Transaction<Database>> {await db.deleteFrom('agent').where('tenant_id', '=', input.tenant_id).where('id', '=', input.id).execute();}+ async listAgentCatalogUsage(+ input: ListAgentCatalogUsageInput,+ transaction?: Transaction<Database>,+ ): Promise<readonly AgentCatalogUsageRow[]> {+ if (input.names.length === 0) {+ return [];+ }+ const db = transaction ?? this.#db;+ const wanted = sql.join(input.names.map(name => sql`${name}`));+ const { rows } = await sql<AgentCatalogUsageRow>`+ SELECT agent_name, reference_name+ FROM (${catalogUsagePairs({ entity: input.entity, tenant_id: input.tenant_id })})+ WHERE reference_name IN (${wanted})+ ORDER BY agent_name`.execute(db);+ return rows;+ }+async listAgentNamesUsingSandboxEnvironment(input: ListAgentNamesUsingSandboxEnvironmentInput,transaction?: Transaction<Database>,diff --git a/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.ts b/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.tsindex a4e13824c..4144d09a9 100644--- a/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.ts+++ b/packages/trueforge/src/db/sqlite/mcp-server-store/SqliteMcpServerStore.ts@@ -7,6 +7,7 @@ import {McpServerNameConflictError,toStoredOAuthClientRecord,type CreateMcpServerInput,+ type DeleteMcpServerInput,type GetMcpServerInput,type IMcpServerStore,type ListMcpServersInput,@@ -127,6 +128,16 @@ export class SqliteMcpServerStore implements IMcpServerStore<Transaction<Databas.executeTakeFirstOrThrow();}+ async deleteServer(input: DeleteMcpServerInput, transaction?: Transaction<Database>): Promise<boolean> {+ const db = transaction ?? this.#db;+ const result = await db+ .deleteFrom('mcp_server')+ .where('tenant_id', '=', input.tenant_id)+ .where('name', '=', input.name)+ .executeTakeFirst();+ return result.numDeletedRows > 0n;+ }+async getClient(params: { id: string }, transaction?: Transaction<Database>): Promise<OAuthClientRecord | undefined> {const db = transaction ?? this.#db;const row = await dbdiff --git a/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts b/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.tsindex 312d55bc2..4820de879 100644--- a/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts+++ b/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts@@ -4,6 +4,7 @@ import {flattenProviderModels,ModelProviderNameConflictError,type CreateModelProviderInput,+ type DeleteModelProviderInput,type GetModelProviderForUpdateInput,type GetModelProviderInput,type IModelProviderStore,@@ -127,6 +128,16 @@ export class SqliteModelProviderStore implements IModelProviderStore<Transaction.executeTakeFirstOrThrow();}+ async deleteProvider(input: DeleteModelProviderInput, transaction?: Transaction<Database>): Promise<boolean> {+ const db = transaction ?? this.#db;+ const result = await db+ .deleteFrom('model_provider')+ .where('tenant_id', '=', input.tenant_id)+ .where('name', '=', input.name)+ .executeTakeFirst();+ return result.numDeletedRows > 0n;+ }+resolveInvokeHeaders(): Promise<Record<string, string>> {return Promise.resolve({});}diff --git a/packages/trueforge/src/db/sqlite/skill-store/SqliteSkillStore.ts b/packages/trueforge/src/db/sqlite/skill-store/SqliteSkillStore.tsindex dd1d6935a..a52abb8dd 100644--- a/packages/trueforge/src/db/sqlite/skill-store/SqliteSkillStore.ts+++ b/packages/trueforge/src/db/sqlite/skill-store/SqliteSkillStore.ts@@ -6,6 +6,7 @@ import {SkillNameConflictError,type AgentSkillsInput,type CreateSkillInput,+ type DeleteSkillInput,type ISkillStore,type ListSkillsInput,type SkillRecord,@@ -90,6 +91,16 @@ export class SqliteSkillStore implements ISkillStore<Transaction<Database>> {.executeTakeFirstOrThrow();}+ async deleteSkill(input: DeleteSkillInput, transaction?: Transaction<Database>): Promise<boolean> {+ const db = transaction ?? this.#db;+ const result = await db+ .deleteFrom('skill')+ .where('tenant_id', '=', input.tenant_id)+ .where('name', '=', input.name)+ .executeTakeFirst();+ return result.numDeletedRows > 0n;+ }+listSkillVersions(input: { name: string }): Promise<SkillVersion[]> {void input;return Promise.resolve([]);diff --git a/packages/trueforge/src/routes/mcpServerRoutes.ts b/packages/trueforge/src/routes/mcpServerRoutes.tsindex 534e4b5a3..dcec8de39 100644--- a/packages/trueforge/src/routes/mcpServerRoutes.ts+++ b/packages/trueforge/src/routes/mcpServerRoutes.ts@@ -2,6 +2,7 @@ import { createRoute, z } from '@hono/zod-openapi';import { RequestErrorResponseSchema } from '../schemas/errors';import {CreateMcpServerRequestSchema,+ DeleteMcpServerResponseSchema,GetAvailableMcpServerResponseSchema,GetMcpServerResponseSchema,ListAvailableMcpServersResponseSchema,@@ -187,6 +188,39 @@ export const putMcpServerRoute = createRoute({},});+export const deleteMcpServerRoute = createRoute({+ method: 'delete',+ path: '/{name}',+ tags: [OpenApiTag.MCP_SERVERS],+ summary: 'Delete an MCP server',+ description:+ 'Deletes an MCP server by `name`, along with every stored OAuth token for it. ' ++ 'Rejected while any agent still lists the server.',+ 'x-fern-sdk-group-name': ['settings', 'mcpServers'],+ 'x-fern-sdk-method-name': 'delete',+ request: {+ params: McpServerNameParamsSchema,+ },+ responses: {+ 200: {+ content: { 'application/json': { schema: DeleteMcpServerResponseSchema } },+ description: 'MCP server deleted.',+ },+ 404: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'MCP server not found.',+ },+ 409: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'One or more agents still use this MCP server.',+ },+ 424: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Unsupported operation because the MCP servers are managed by external system',+ },+ },+});+const ListMcpServerToolsResponseSchema = z.object({// TODO: Type tools/list entries to the MCP tool shape (name, description, inputSchema, …) for OpenAPI quality.diff --git a/packages/trueforge/src/routes/modelProviderRoutes.ts b/packages/trueforge/src/routes/modelProviderRoutes.tsindex c0b8058a4..fad354d07 100644--- a/packages/trueforge/src/routes/modelProviderRoutes.ts+++ b/packages/trueforge/src/routes/modelProviderRoutes.ts@@ -3,16 +3,21 @@* Discovery catalog lives at GET /api/v1/catalogs/model-providers.* Handlers are registered in apis/modelProviders.ts.*/-import { createRoute } from '@hono/zod-openapi';+import { createRoute, z } from '@hono/zod-openapi';import { RequestErrorResponseSchema } from '../schemas/errors';import {CreateModelProviderRequestSchema,+ DeleteModelProviderResponseSchema,GetModelProviderResponseSchema,ListModelProvidersResponseSchema,UpdateModelProviderRequestSchema,} from '../schemas/modelProvider';import { OpenApiTag } from './openapiTags';+const ModelProviderNameParamsSchema = z.object({+ name: z.string().min(1).describe('Model provider name.'),+});+export const listModelProvidersRoute = createRoute({method: 'get',path: '/',@@ -98,6 +103,41 @@ export const putModelProviderRoute = createRoute({content: { 'application/json': { schema: RequestErrorResponseSchema } },description: 'Invalid request body, or redacted API key with no stored secret to keep.',},+ 409: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'The update drops a model that one or more agents still use.',+ },+ 424: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Unsupported operation because the model providers are managed by external system',+ },+ },+});++export const deleteModelProviderRoute = createRoute({+ method: 'delete',+ path: '/{name}',+ tags: [OpenApiTag.MODELS],+ summary: 'Delete a model provider',+ description: 'Deletes a provider and every model it declares. Rejected while any agent still uses one of them.',+ 'x-fern-sdk-group-name': ['settings', 'modelProviders'],+ 'x-fern-sdk-method-name': 'delete',+ request: {+ params: ModelProviderNameParamsSchema,+ },+ responses: {+ 200: {+ content: { 'application/json': { schema: DeleteModelProviderResponseSchema } },+ description: 'Model provider deleted.',+ },+ 404: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Model provider not found.',+ },+ 409: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'One or more agents still use a model from this provider.',+ },424: {content: { 'application/json': { schema: RequestErrorResponseSchema } },description: 'Unsupported operation because the model providers are managed by external system',diff --git a/packages/trueforge/src/routes/skillRoutes.ts b/packages/trueforge/src/routes/skillRoutes.tsindex 4bb887b15..6aa862ee7 100644--- a/packages/trueforge/src/routes/skillRoutes.ts+++ b/packages/trueforge/src/routes/skillRoutes.ts@@ -4,10 +4,11 @@* /api/v1/skills.* Discovery catalog lives at GET /api/v1/catalogs/skills.*/-import { createRoute } from '@hono/zod-openapi';+import { createRoute, z } from '@hono/zod-openapi';import { RequestErrorResponseSchema } from '../schemas/errors';import {CreateSkillRequestSchema,+ DeleteSkillResponseSchema,GetSkillResponseSchema,ListAvailableSkillsResponseSchema,ListSkillVersionsRequestQuerySchema,@@ -17,6 +18,10 @@ import {} from '../schemas/skill';import { OpenApiTag } from './openapiTags';+const SkillNameParamsSchema = z.object({+ name: z.string().min(1).describe('Skill name.'),+});+/** Chat/composer read view — mounted at /api/v1/skills (not under settings). */export const listAvailableSkillsRoute = createRoute({method: 'get',@@ -149,3 +154,34 @@ export const putSkillRoute = createRoute({},},});++export const deleteSkillRoute = createRoute({+ method: 'delete',+ path: '/{name}',+ tags: [OpenApiTag.SKILLS],+ summary: 'Delete a skill',+ description: 'Deletes a skill by `name`. Rejected while any agent still lists the skill.',+ 'x-fern-sdk-group-name': ['settings', 'skills'],+ 'x-fern-sdk-method-name': 'delete',+ request: {+ params: SkillNameParamsSchema,+ },+ responses: {+ 200: {+ content: { 'application/json': { schema: DeleteSkillResponseSchema } },+ description: 'Skill deleted.',+ },+ 404: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Skill not found.',+ },+ 409: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'One or more agents still use this skill.',+ },+ 424: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Unsupported because skills are managed by an external system.',+ },+ },+});diff --git a/packages/trueforge/src/runtime/catalogUsage.ts b/packages/trueforge/src/runtime/catalogUsage.tsnew file mode 100644index 000000000..094060b96--- /dev/null+++ b/packages/trueforge/src/runtime/catalogUsage.ts@@ -0,0 +1,65 @@+import type { AgentCatalogEntity, AgentCatalogUsageRow, IAgentStore } from '../db/agentStore';++/** How many agent names a conflict message spells out before summarising the rest. */+const NAMED_AGENTS_LIMIT = 3;++const ENTITY_LABELS: Record<AgentCatalogEntity, string> = {+ model_provider: 'model provider',+ model: 'model',+ mcp_server: 'MCP server',+ skill: 'skill',+};++function groupAgentsByReference(usage: readonly AgentCatalogUsageRow[]): Map<string, string[]> {+ const byReference = new Map<string, string[]>();+ for (const row of usage) {+ const agents = byReference.get(row.reference_name);+ if (agents === undefined) {+ byReference.set(row.reference_name, [row.agent_name]);+ } else if (!agents.includes(row.agent_name)) {+ agents.push(row.agent_name);+ }+ }+ return byReference;+}++/** Worded to fit both a delete and an update that drops an entry. */+function conflictMessage({+ entity,+ usage,+}: {+ entity: AgentCatalogEntity;+ usage: readonly AgentCatalogUsageRow[];+}): string {+ const label = ENTITY_LABELS[entity];+ const clauses = [...groupAgentsByReference(usage)].map(([reference, agents]) => {+ const named = agents.slice(0, NAMED_AGENTS_LIMIT).join(', ');+ const remaining = agents.length - NAMED_AGENTS_LIMIT;+ const overflow = remaining > 0 ? `, and ${String(remaining)} more` : '';+ return `${label} "${reference}" is used by ${agents.length === 1 ? 'agent' : 'agents'} ${named}${overflow}`;+ });+ return `Still in use — ${clauses.join('; ')}. Update or delete those agents first.`;+}++/**+ * Returns the 409 message when an agent still references one of `names`, else undefined.+ * Removing a referenced entry would leave that agent unrunnable.+ */+export async function findCatalogUsageConflict<TTransaction>(+ input: {+ agentStore: IAgentStore<TTransaction>;+ tenant_id: string;+ entity: AgentCatalogEntity;+ names: readonly string[];+ },+ transaction?: TTransaction,+): Promise<string | undefined> {+ const usage = await input.agentStore.listAgentCatalogUsage(+ { tenant_id: input.tenant_id, entity: input.entity, names: input.names },+ transaction,+ );+ if (usage.length === 0) {+ return undefined;+ }+ return conflictMessage({ entity: input.entity, usage });+}diff --git a/packages/trueforge/src/schemas/mcpServer.ts b/packages/trueforge/src/schemas/mcpServer.tsindex 349fcdcc1..2cd65bfe5 100644--- a/packages/trueforge/src/schemas/mcpServer.ts+++ b/packages/trueforge/src/schemas/mcpServer.ts@@ -129,6 +129,8 @@ export const ListMcpServersResponseSchema = z}).openapi('ListMCPServersResponse');+export const DeleteMcpServerResponseSchema = z.object({}).openapi('DeleteMCPServerResponse');+/** Public auth mechanism for chat/composer (no secrets). */export const McpServerAuthPublicSchema = z.discriminatedUnion('type', [diff --git a/packages/trueforge/src/schemas/modelProvider.ts b/packages/trueforge/src/schemas/modelProvider.tsindex c6bed6176..a2e8d77b2 100644--- a/packages/trueforge/src/schemas/modelProvider.ts+++ b/packages/trueforge/src/schemas/modelProvider.ts@@ -225,6 +225,8 @@ export const ListModelProvidersResponseSchema = z}).openapi('ListModelProvidersResponse');+export const DeleteModelProviderResponseSchema = z.object({}).openapi('DeleteModelProviderResponse');+/** Provider identity on the models list read view. */export const AvailableModelProviderSchema = z.object({diff --git a/packages/trueforge/src/schemas/skill.ts b/packages/trueforge/src/schemas/skill.tsindex dc71d2461..4f3c690db 100644--- a/packages/trueforge/src/schemas/skill.ts+++ b/packages/trueforge/src/schemas/skill.ts@@ -143,6 +143,8 @@ export const ListAvailableSkillsResponseSchema = z.object({ data: z.array(AvailableSkillSchema) }).openapi('ListAvailableSkillsResponse');+export const DeleteSkillResponseSchema = z.object({}).openapi('DeleteSkillResponse');+/** Versions list query — skill name (or registry FQN). */export const ListSkillVersionsRequestQuerySchema = z.object({diff --git a/packages/trueforge/src/truefoundry/InlineMcpServerStore.ts b/packages/trueforge/src/truefoundry/InlineMcpServerStore.tsindex 1ae552fc1..514549523 100644--- a/packages/trueforge/src/truefoundry/InlineMcpServerStore.ts+++ b/packages/trueforge/src/truefoundry/InlineMcpServerStore.ts@@ -3,6 +3,7 @@ import type {AuthorizeMcpServerInput,CreateMcpServerInput,DeleteMcpAuthorizationInput,+ DeleteMcpServerInput,GetMcpServerInput,IMcpServerWithAuthStore,ListMcpServersInput,@@ -102,6 +103,10 @@ export class InlineMcpServerStore<TTransaction = never> implements IMcpServerWitreturn this.#inner.upsertServer(input, transaction);}+ deleteServer(input: DeleteMcpServerInput, transaction?: TTransaction): Promise<boolean> {+ return this.#inner.deleteServer(input, transaction);+ }+authorize(input: AuthorizeMcpServerInput): Promise<McpAuthStatus> {return this.#inner.authorize(input);}diff --git a/packages/trueforge/src/truefoundry/InlineModelProviderStore.ts b/packages/trueforge/src/truefoundry/InlineModelProviderStore.tsindex d36c6e33d..f3d1181ac 100644--- a/packages/trueforge/src/truefoundry/InlineModelProviderStore.ts+++ b/packages/trueforge/src/truefoundry/InlineModelProviderStore.ts@@ -1,5 +1,6 @@import type {CreateModelProviderInput,+ DeleteModelProviderInput,GetModelProviderForUpdateInput,GetModelProviderInput,IModelProviderStore,@@ -55,6 +56,10 @@ export class InlineModelProviderStore<TTransaction = never> implements IModelProreturn this.#inner.upsertProvider(input, transaction);}+ deleteProvider(input: DeleteModelProviderInput, transaction?: TTransaction): Promise<boolean> {+ return this.#inner.deleteProvider(input, transaction);+ }+listModels(input: ListModelProvidersInput, transaction?: TTransaction): Promise<AvailableModel[]> {return this.#inner.listModels(input, transaction);}diff --git a/packages/trueforge/src/truefoundry/InlineSkillStore.ts b/packages/trueforge/src/truefoundry/InlineSkillStore.tsindex 69a468eed..f37aaca53 100644--- a/packages/trueforge/src/truefoundry/InlineSkillStore.ts+++ b/packages/trueforge/src/truefoundry/InlineSkillStore.ts@@ -4,6 +4,7 @@ import { resolveGitTurnSkills, validateGitAgentSkills } from '../db/gitSkillMounimport type {AgentSkillsInput,CreateSkillInput,+ DeleteSkillInput,ISkillStore,ListSkillsInput,SkillRecord,@@ -54,6 +55,10 @@ export class InlineSkillStore<TTransaction = never> implements ISkillStore<TTranreturn this.#inner.upsertSkill(input, transaction);}+ deleteSkill(input: DeleteSkillInput, transaction?: TTransaction): Promise<boolean> {+ return this.#inner.deleteSkill(input, transaction);+ }+listSkillVersions(input: { name: string }): Promise<SkillVersion[]> {if (this.#inline[input.name] !== undefined) {return Promise.resolve([]);diff --git a/packages/trueforge/src/truefoundry/TrueFoundryAgentStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryAgentStore.tsindex e4b904315..c7882a006 100644--- a/packages/trueforge/src/truefoundry/TrueFoundryAgentStore.ts+++ b/packages/trueforge/src/truefoundry/TrueFoundryAgentStore.ts@@ -2,6 +2,7 @@ import type { AgentSpec, TokenPagination } from '@truefoundry/trueforge-core/ageimport { sql, type Kysely, type Transaction } from 'kysely';import type { RequestContext } from '../auth/identity';import {+ type AgentCatalogUsageRow,type AgentExternalIdRow,type AgentRecord,type CreateAgentInput,@@ -10,6 +11,7 @@ import {type GetExternalIdsByIdsInput,type GetOwnedIdsInput,type IAgentStore,+ type ListAgentCatalogUsageInput,type ListAgentNamesUsingSandboxEnvironmentInput,type ListAgentsInput,type UpdateAgentInput,@@ -116,6 +118,13 @@ export class TrueFoundryAgentStore implements IAgentStore<Transaction<Database>>return this.#inner.getAgent(input, transaction);}+ listAgentCatalogUsage(+ input: ListAgentCatalogUsageInput,+ transaction?: Transaction<Database>,+ ): Promise<readonly AgentCatalogUsageRow[]> {+ return this.#inner.listAgentCatalogUsage(input, transaction);+ }+listAgentNamesUsingSandboxEnvironment(input: ListAgentNamesUsingSandboxEnvironmentInput,transaction?: Transaction<Database>,diff --git a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.tsindex 26d189cd2..5ecc4da10 100644--- a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts+++ b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts@@ -10,6 +10,7 @@ import {type AuthorizeMcpServerInput,type CreateMcpServerInput,type DeleteMcpAuthorizationInput,+ type DeleteMcpServerInput,type GetMcpServerInput,type IMcpServerWithAuthStore,type ListMcpServersInput,@@ -193,6 +194,12 @@ export class TrueFoundryMcpServerStore<TTransaction = never> implements IMcpServreturn trueFoundryManaged();}+ deleteServer(input: DeleteMcpServerInput, transaction?: TTransaction): Promise<boolean> {+ void input;+ void transaction;+ return trueFoundryManaged();+ }+saveClient(params: { id: string; record: OAuthClientRecord }, transaction?: TTransaction): Promise<void> {void params;void transaction;diff --git a/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.tsindex 89536eb9c..a7c18abe5 100644--- a/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts+++ b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts@@ -4,6 +4,7 @@ import type { AgentRecord } from '../db/agentStore';import {flattenProviderModels,type CreateModelProviderInput,+ type DeleteModelProviderInput,type GetModelProviderForUpdateInput,type GetModelProviderInput,type IModelProviderStore,@@ -90,6 +91,12 @@ export class TrueFoundryModelProviderStore<TTransaction = never> implements IModreturn trueFoundryManaged();}+ deleteProvider(input: DeleteModelProviderInput, transaction?: TTransaction): Promise<boolean> {+ void input;+ void transaction;+ return trueFoundryManaged();+ }+async listModels(input: ListModelProvidersInput, transaction?: TTransaction): Promise<AvailableModel[]> {return flattenProviderModels(await this.listProviders(input, transaction));}diff --git a/packages/trueforge/src/truefoundry/TrueFoundrySkillStore.ts b/packages/trueforge/src/truefoundry/TrueFoundrySkillStore.tsindex 471b6b1b4..fc19eb641 100644--- a/packages/trueforge/src/truefoundry/TrueFoundrySkillStore.ts+++ b/packages/trueforge/src/truefoundry/TrueFoundrySkillStore.ts@@ -4,6 +4,7 @@ import type { RequestContext } from '../auth/identity';import type {AgentSkillsInput,CreateSkillInput,+ DeleteSkillInput,ISkillStore,ListSkillsInput,SkillRecord,@@ -143,6 +144,12 @@ export class TrueFoundrySkillStore<TTransaction = never>return trueFoundryManaged();}+ deleteSkill(input: DeleteSkillInput, transaction?: TTransaction): Promise<boolean> {+ void input;+ void transaction;+ return trueFoundryManaged();+ }+async listSkillVersions(input: { name: string }): Promise<SkillVersion[]> {const accessToken = await this.#resolveAccessToken();// `?fqn=` returns one version; use its agent_skill_id to list every version.diff --git a/packages/trueforge/tests/db/agentStoreContractSuite.ts b/packages/trueforge/tests/db/agentStoreContractSuite.tsindex 7393fdc1e..b4fec78e0 100644--- a/packages/trueforge/tests/db/agentStoreContractSuite.ts+++ b/packages/trueforge/tests/db/agentStoreContractSuite.ts@@ -3,6 +3,7 @@* Runs under jest against a fresh store per test (see backend test files).*/import { AgentSpecSchema, type AgentSpec, type CreatedBySubject } from '@truefoundry/trueforge-core/agent-session';+import type { z } from 'zod';import { AgentExternalIdConflictError, AgentNameConflictError, type IAgentStore } from '../../src/db/agentStore';const TENANT = 'default';@@ -13,7 +14,8 @@ const CREATED_BY_SUBJECT: CreatedBySubject = {subject_display_name: 'tester',};-function manifest(overrides: Partial<AgentSpec> = {}): AgentSpec {+/** Overrides are schema input, so callers may omit fields that carry defaults. */+function manifest(overrides: Partial<z.input<typeof AgentSpecSchema>> = {}): AgentSpec {return AgentSpecSchema.parse({model: { name: 'anthropic/claude-sonnet-4-6' },instructions: 'Be helpful.',@@ -423,6 +425,100 @@ export function runAgentStoreContractSuite(getStore: () => IAgentStore): void {expect(cleared?.external_id).toBeNull();});+ describe('listAgentCatalogUsage', () => {+ async function seedReferencingAgents(store: IAgentStore): Promise<void> {+ await store.createAgent({+ tenant_id: TENANT,+ created_by_subject: CREATED_BY_SUBJECT,+ name: 'support',+ description: 'Test agent.',+ manifest: manifest({+ model: { name: 'openai/gpt-5' },+ mcp_servers: [{ name: 'github' }],+ skills: [{ name: 'pdf-extract' }],+ }),+ external_id: null,+ });+ await store.createAgent({+ tenant_id: TENANT,+ created_by_subject: CREATED_BY_SUBJECT,+ name: 'triage',+ description: 'Test agent.',+ manifest: manifest({+ model: { name: 'openai/gpt-5-mini' },+ mcp_servers: [{ name: 'github' }, { name: 'linear' }],+ }),+ external_id: null,+ });+ await store.createAgent({+ tenant_id: 'other-tenant',+ created_by_subject: CREATED_BY_SUBJECT,+ name: 'stranger',+ description: 'Test agent.',+ manifest: manifest({ model: { name: 'openai/gpt-5' }, mcp_servers: [{ name: 'github' }] }),+ external_id: null,+ });+ }++ it('matches a provider through the prefix of every model name it owns', async () => {+ const store = getStore();+ await seedReferencingAgents(store);++ expect(+ await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'model_provider', names: ['openai'] }),+ ).toEqual([+ { agent_name: 'support', reference_name: 'openai' },+ { agent_name: 'triage', reference_name: 'openai' },+ ]);+ expect(+ await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'model_provider', names: ['anthropic'] }),+ ).toEqual([]);+ });++ it('matches a single model by its fully qualified name', async () => {+ const store = getStore();+ await seedReferencingAgents(store);++ expect(+ await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'model', names: ['openai/gpt-5'] }),+ ).toEqual([{ agent_name: 'support', reference_name: 'openai/gpt-5' }]);+ });++ it('matches MCP servers and skills nested in manifest arrays', async () => {+ const store = getStore();+ await seedReferencingAgents(store);++ expect(+ await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'mcp_server', names: ['github', 'linear'] }),+ ).toEqual([+ { agent_name: 'support', reference_name: 'github' },+ { agent_name: 'triage', reference_name: 'github' },+ { agent_name: 'triage', reference_name: 'linear' },+ ]);+ expect(await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'skill', names: ['pdf-extract'] })).toEqual(+ [{ agent_name: 'support', reference_name: 'pdf-extract' }],+ );+ expect(await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'skill', names: ['unused'] })).toEqual([]);+ });++ it('ignores agents without the array and returns nothing for an empty name list', async () => {+ const store = getStore();+ await store.createAgent({+ tenant_id: TENANT,+ created_by_subject: CREATED_BY_SUBJECT,+ name: 'bare',+ description: 'Test agent.',+ manifest: manifest(),+ external_id: null,+ });++ expect(await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'mcp_server', names: ['github'] })).toEqual(+ [],+ );+ expect(await store.listAgentCatalogUsage({ tenant_id: TENANT, entity: 'skill', names: [] })).toEqual([]);+ });+ });+it('updateAgent throws AgentExternalIdConflictError when external_id is taken', async () => {const store = getStore();await store.createAgent({diff --git a/packages/trueforge/tests/db/mcpServerStoreContractSuite.ts b/packages/trueforge/tests/db/mcpServerStoreContractSuite.tsindex 4954a3142..c5d1eef26 100644--- a/packages/trueforge/tests/db/mcpServerStoreContractSuite.ts+++ b/packages/trueforge/tests/db/mcpServerStoreContractSuite.ts@@ -181,4 +181,18 @@ export function runMcpServerStoreContractSuite(getStore: () => IMcpServerStore):const store = getStore();expect(await store.getClient({ id: 'missing-id' })).toBeUndefined();});++ it('deleteServer removes only the tenant row and reports whether one matched', async () => {+ const store = getStore();+ await store.upsertServer({ tenant_id: TENANT, name: 'linear', manifest: manifest() });+ await store.upsertServer({ tenant_id: 'other-tenant', name: 'linear', manifest: manifest() });++ await expect(store.deleteServer({ tenant_id: TENANT, name: 'linear' })).resolves.toBe(true);+ await expect(store.listServers({ tenant_id: TENANT, names: undefined })).resolves.toEqual([]);+ expect(+ (await store.listServers({ tenant_id: 'other-tenant', names: undefined })).map(server => server.name),+ ).toEqual(['linear']);++ await expect(store.deleteServer({ tenant_id: TENANT, name: 'linear' })).resolves.toBe(false);+ });}diff --git a/packages/trueforge/tests/db/modelProviderStoreContractSuite.ts b/packages/trueforge/tests/db/modelProviderStoreContractSuite.tsindex 6c64082d6..7e0f266cc 100644--- a/packages/trueforge/tests/db/modelProviderStoreContractSuite.ts+++ b/packages/trueforge/tests/db/modelProviderStoreContractSuite.ts@@ -120,6 +120,18 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideexpect(manifest.base_url).toBe('https://llm.internal.example.com/v1');});+ it('deleteProvider removes only the tenant row and reports whether one matched', async () => {+ const store = getStore();+ await store.upsertProvider({ tenant_id: TENANT, name: 'openai', manifest: openai });+ await store.upsertProvider({ tenant_id: 'other-tenant', name: 'openai', manifest: openai });++ await expect(store.deleteProvider({ tenant_id: TENANT, name: 'openai' })).resolves.toBe(true);+ await expect(store.listProviders({ tenant_id: TENANT })).resolves.toEqual([]);+ expect((await store.listProviders({ tenant_id: 'other-tenant' })).map(record => record.name)).toEqual(['openai']);++ await expect(store.deleteProvider({ tenant_id: TENANT, name: 'openai' })).resolves.toBe(false);+ });+it('listModels flattens documents into fully qualified names', async () => {const store = getStore();await store.upsertProvider({ tenant_id: TENANT, name: 'anthropic', manifest: anthropic });diff --git a/packages/trueforge/tests/db/skillStoreContractSuite.ts b/packages/trueforge/tests/db/skillStoreContractSuite.tsindex 88a15bce6..c1d720bbc 100644--- a/packages/trueforge/tests/db/skillStoreContractSuite.ts+++ b/packages/trueforge/tests/db/skillStoreContractSuite.ts@@ -167,6 +167,20 @@ export function runSkillStoreContractSuite(getStore: () => ISkillStore): void {await expect(store.listSkills({ tenant_id: TENANT, names: [] })).resolves.toEqual([]);});+ it('deleteSkill removes only the tenant row and reports whether one matched', async () => {+ const store = getStore();+ await store.upsertSkill({ tenant_id: TENANT, name: 'algorithmic-art', manifest: manifest() });+ await store.upsertSkill({ tenant_id: 'other-tenant', name: 'algorithmic-art', manifest: manifest() });++ await expect(store.deleteSkill({ tenant_id: TENANT, name: 'algorithmic-art' })).resolves.toBe(true);+ await expect(store.listSkills({ tenant_id: TENANT, names: undefined })).resolves.toEqual([]);+ expect((await store.listSkills({ tenant_id: 'other-tenant', names: undefined })).map(skill => skill.name)).toEqual([+ 'algorithmic-art',+ ]);++ await expect(store.deleteSkill({ tenant_id: TENANT, name: 'algorithmic-art' })).resolves.toBe(false);+ });+it('listSkillVersions returns [] in standalone (no registry versions)', async () => {const store = getStore();await store.upsertSkill({ tenant_id: TENANT, name: 'algorithmic-art', manifest: manifest() });diff --git a/packages/trueforge/tests/unit/apis/mcpOAuth.test.ts b/packages/trueforge/tests/unit/apis/mcpOAuth.test.tsindex 2a9bdfafd..0a41d4b34 100644--- a/packages/trueforge/tests/unit/apis/mcpOAuth.test.ts+++ b/packages/trueforge/tests/unit/apis/mcpOAuth.test.ts@@ -12,6 +12,7 @@ import configuration from '../../../src/config';import { McpServerWithAuthStore } from '../../../src/db/McpServerWithAuthStore';import type { IMcpServerWithAuthStore } from '../../../src/db/mcpServerStore';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';+import { SqliteAgentStore } from '../../../src/db/sqlite/agent-store/SqliteAgentStore';import { createSqliteDb } from '../../../src/db/sqlite/client';import { SqliteMcpServerStore } from '../../../src/db/sqlite/mcp-server-store/SqliteMcpServerStore';import { SqliteOAuthTokenStore } from '../../../src/db/sqlite/token-store/SqliteOAuthTokenStore';@@ -114,6 +115,7 @@ describe('MCP OAuth authorize + callback', () => {logger = winston.createLogger({ silent: true });settingsRouter = createSettingsMcpServersRouter({resolveMcpServerStore: () => mcpServerStore,+ resolveAgentStore: () => new SqliteAgentStore(db),tokenStore,withTransaction,logger,diff --git a/packages/trueforge/tests/unit/apis/mcpServers.test.ts b/packages/trueforge/tests/unit/apis/mcpServers.test.tsindex 9c4f5dd33..4e60bf573 100644--- a/packages/trueforge/tests/unit/apis/mcpServers.test.ts+++ b/packages/trueforge/tests/unit/apis/mcpServers.test.ts@@ -1,8 +1,9 @@+import { AgentSpecSchema } from '@truefoundry/trueforge-core/agent-session';import { configureOutboundUrlGuard } from '@truefoundry/trueforge-core/core';import winston from 'winston';import { createCatalogRouter } from '../../../src/apis/catalog';import { createMcpServersRouter, createSettingsMcpServersRouter } from '../../../src/apis/mcpServers';-import { STANDALONE_REQUEST_CONTEXT } from '../../../src/auth/identity';+import { createdBySubjectFromRequestContext, STANDALONE_REQUEST_CONTEXT } from '../../../src/auth/identity';import { McpCatalog } from '../../../src/catalog/McpCatalog';import { ModelCatalog } from '../../../src/catalog/ModelCatalog';import { SandboxCatalog } from '../../../src/catalog/SandboxCatalog';@@ -12,6 +13,7 @@ import configuration from '../../../src/config';import { McpServerWithAuthStore } from '../../../src/db/McpServerWithAuthStore';import type { IMcpServerWithAuthStore } from '../../../src/db/mcpServerStore';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';+import { SqliteAgentStore } from '../../../src/db/sqlite/agent-store/SqliteAgentStore';import { createSqliteDb } from '../../../src/db/sqlite/client';import { SqliteMcpServerStore } from '../../../src/db/sqlite/mcp-server-store/SqliteMcpServerStore';import { SqliteOAuthTokenStore } from '../../../src/db/sqlite/token-store/SqliteOAuthTokenStore';@@ -99,6 +101,7 @@ describe('mcp-servers routers', () => {let catalogRouter: ReturnType<typeof createCatalogRouter>;let mcpServersRouter: ReturnType<typeof createMcpServersRouter>;let mcpServerStore: IMcpServerWithAuthStore;+ let agentStore: SqliteAgentStore;let tokenStore: SqliteOAuthTokenStore;let withTransaction: <T>(callback: (transaction: unknown) => Promise<T>) => Promise<T>;let logger: ReturnType<typeof winston.createLogger>;@@ -132,8 +135,10 @@ describe('mcp-servers routers', () => {});withTransaction = callback => db.transaction().execute(callback);logger = winston.createLogger({ silent: true });+ agentStore = new SqliteAgentStore(db);settingsRouter = createSettingsMcpServersRouter({resolveMcpServerStore: () => mcpServerStore,+ resolveAgentStore: () => agentStore,tokenStore,withTransaction,logger,@@ -974,4 +979,65 @@ describe('mcp-servers routers', () => {const missing = await mcpServersRouter.request('/missing/authorize', { method: 'DELETE' });expect(missing.status).toBe(404);});++ describe('DELETE /{name}', () => {+ const disposable = { ...putBody, name: 'disposable', description: 'Disposable MCP server.' };++ beforeEach(async () => {+ await settingsRouter.request('/', putInit(wrapManifest(disposable)));+ });++ it('removes the server along with every user grant for it', async () => {+ const record = await mcpServerStore.getServer({ tenant_id: 'default', name: disposable.name });+ if (record === undefined) {+ throw new Error('expected the disposable server to exist');+ }+ await tokenStore.saveToken({+ id: record.id,+ userRef: 'other-user',+ token: {+ accessToken: 'access-1',+ refreshToken: null,+ expiresAt: '2099-01-01T00:00:00.000Z',+ scope: null,+ },+ });++ const response = await settingsRouter.request(`/${disposable.name}`, { method: 'DELETE' });+ expect(response.status).toBe(200);+ expect(await response.json()).toEqual({});+ expect(await mcpServerStore.getServer({ tenant_id: 'default', name: disposable.name })).toBeUndefined();+ expect(await tokenStore.getToken({ id: record.id, userRef: 'other-user' })).toBeUndefined();+ });++ it('returns 404 for an unknown server', async () => {+ const missing = await settingsRouter.request('/missing', { method: 'DELETE' });+ expect(missing.status).toBe(404);+ expect(await missing.json()).toEqual({ error: { message: 'MCP server not found: missing' } });+ });++ it('returns 409 naming the agents that still list the server', async () => {+ await agentStore.createAgent({+ tenant_id: 'default',+ created_by_subject: createdBySubjectFromRequestContext(STANDALONE_REQUEST_CONTEXT),+ name: 'connector-user',+ description: 'Test agent.',+ manifest: AgentSpecSchema.parse({+ model: { name: 'anthropic/claude-sonnet-4-6' },+ mcp_servers: [{ name: disposable.name }],+ }),+ external_id: null,+ });++ const blocked = await settingsRouter.request(`/${disposable.name}`, { method: 'DELETE' });+ expect(blocked.status).toBe(409);+ expect(await blocked.json()).toEqual({+ error: {+ message:+ 'Still in use — MCP server "disposable" is used by agent connector-user. Update or delete those agents first.',+ },+ });+ expect(await mcpServerStore.getServer({ tenant_id: 'default', name: disposable.name })).toBeDefined();+ });+ });});diff --git a/packages/trueforge/tests/unit/apis/modelProviders.test.ts b/packages/trueforge/tests/unit/apis/modelProviders.test.tsindex bddd3dedb..dc77724c0 100644--- a/packages/trueforge/tests/unit/apis/modelProviders.test.ts+++ b/packages/trueforge/tests/unit/apis/modelProviders.test.ts@@ -1,9 +1,10 @@+import { AgentSpecSchema } from '@truefoundry/trueforge-core/agent-session';import { configureOutboundUrlGuard } from '@truefoundry/trueforge-core/core';import winston from 'winston';import { createCatalogRouter } from '../../../src/apis/catalog';import { createModelsRouter } from '../../../src/apis/models';import { createSettingsRouter } from '../../../src/apis/settings';-import { STANDALONE_REQUEST_CONTEXT } from '../../../src/auth/identity';+import { createdBySubjectFromRequestContext, STANDALONE_REQUEST_CONTEXT } from '../../../src/auth/identity';import { McpCatalog } from '../../../src/catalog/McpCatalog';import { ModelCatalog } from '../../../src/catalog/ModelCatalog';import { SandboxCatalog } from '../../../src/catalog/SandboxCatalog';@@ -13,6 +14,7 @@ import configuration from '../../../src/config';import { McpServerWithAuthStore } from '../../../src/db/McpServerWithAuthStore';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';import type { IModelProviderStore } from '../../../src/db/modelProviderStore';+import { SqliteAgentStore } from '../../../src/db/sqlite/agent-store/SqliteAgentStore';import { createSqliteDb } from '../../../src/db/sqlite/client';import { SqliteMcpServerStore } from '../../../src/db/sqlite/mcp-server-store/SqliteMcpServerStore';import { SqliteModelProviderStore } from '../../../src/db/sqlite/model-provider-store/SqliteModelProviderStore';@@ -116,11 +118,13 @@ async function createRouters(): Promise<{catalogRouter: ReturnType<typeof createCatalogRouter>;modelsRouter: ReturnType<typeof createModelsRouter>;modelProviderStore: IModelProviderStore;+ agentStore: SqliteAgentStore;}> {const db = createSqliteDb(':memory:');await migrateSqliteToLatest(db);const modelProviderStore = new SqliteModelProviderStore(db);const tokenStore = new SqliteOAuthTokenStore(db);+ const agentStore = new SqliteAgentStore(db);return {settingsRouter: createSettingsRouter({resolveModelProviderStore: () => modelProviderStore,@@ -135,6 +139,7 @@ async function createRouters(): Promise<{resolveSandboxProviderStore: () => new SqliteSandboxProviderStore(db),sandboxEnvironmentStore: new SqliteSandboxEnvironmentStore(db),resolveWebSearchProviderStore: () => new SqliteWebSearchProviderStore(db),+ resolveAgentStore: () => agentStore,withTransaction: callback => db.transaction().execute(callback),logger: winston.createLogger({ silent: true }),resolveRequestContext: () => STANDALONE_REQUEST_CONTEXT,@@ -152,6 +157,7 @@ async function createRouters(): Promise<{resolveRequestContext: () => STANDALONE_REQUEST_CONTEXT,}),modelProviderStore,+ agentStore,};}@@ -188,6 +194,81 @@ describe('settings model-providers and models routers', () => {expect(await list.json()).toEqual({ data: [configured('anthropic', anthropicProviderWire)] });});+ describe('delete and in-use guards', () => {+ const secondModel = { model_id: 'claude-haiku-4-6', name: 'claude-haiku-4-6', properties: {} };++ async function setup(modelName: string) {+ const routers = await createRouters();+ await routers.settingsRouter.request(+ '/model-providers',+ putInit({ ...anthropicBody, models: [model, secondModel] }),+ );+ await routers.agentStore.createAgent({+ tenant_id: 'default',+ created_by_subject: createdBySubjectFromRequestContext(STANDALONE_REQUEST_CONTEXT),+ name: 'support',+ description: 'Test agent.',+ manifest: AgentSpecSchema.parse({ model: { name: modelName } }),+ external_id: null,+ });+ return routers;+ }++ it('DELETE removes an unused provider', async () => {+ const { settingsRouter: fresh } = await createRouters();+ await fresh.request('/model-providers', putInit(anthropicBody));++ const deleted = await fresh.request('/model-providers/anthropic', { method: 'DELETE' });+ expect(deleted.status).toBe(200);+ expect(await deleted.json()).toEqual({});+ expect(await (await fresh.request('/model-providers')).json()).toEqual({ data: [] });+ });++ it('DELETE returns 404 for an unknown provider', async () => {+ const { settingsRouter: fresh } = await createRouters();+ const missing = await fresh.request('/model-providers/anthropic', { method: 'DELETE' });+ expect(missing.status).toBe(404);+ expect(await missing.json()).toEqual({ error: { message: 'Model provider not found: anthropic' } });+ });++ it('DELETE returns 409 naming the agents that still use one of its models', async () => {+ const { settingsRouter: fresh } = await setup('anthropic/claude-sonnet-4-6');++ const blocked = await fresh.request('/model-providers/anthropic', { method: 'DELETE' });+ expect(blocked.status).toBe(409);+ expect(await blocked.json()).toEqual({+ error: {+ message:+ 'Still in use — model provider "anthropic" is used by agent support. Update or delete those agents first.',+ },+ });+ expect(await (await fresh.request('/model-providers')).json()).toEqual({+ data: [configured('anthropic', { ...anthropicProviderWire, models: [model, secondModel] })],+ });+ });++ it('PUT returns 409 when it would drop a model an agent still uses', async () => {+ const { settingsRouter: fresh } = await setup('anthropic/claude-haiku-4-6');++ const blocked = await fresh.request('/model-providers', putInit(anthropicBody));+ expect(blocked.status).toBe(409);+ expect(await blocked.json()).toEqual({+ error: {+ message:+ 'Still in use — model "anthropic/claude-haiku-4-6" is used by agent support. Update or delete those agents first.',+ },+ });+ });++ it('PUT still drops a model no agent references', async () => {+ const { settingsRouter: fresh } = await setup('anthropic/claude-sonnet-4-6');++ const shrunk = await fresh.request('/model-providers', putInit(anthropicBody));+ expect(shrunk.status).toBe(200);+ expect(await shrunk.json()).toEqual({ data: configured('anthropic', anthropicProviderWire) });+ });+ });+it('POST creates a provider and returns 409 on name clash', async () => {const { settingsRouter: fresh } = await createRouters();const created = await fresh.request('/model-providers', postInit(anthropicBody));diff --git a/packages/trueforge/tests/unit/apis/skills.test.ts b/packages/trueforge/tests/unit/apis/skills.test.tsindex 8f637b472..3f129876a 100644--- a/packages/trueforge/tests/unit/apis/skills.test.ts+++ b/packages/trueforge/tests/unit/apis/skills.test.ts@@ -1,16 +1,34 @@+import { AgentSpecSchema } from '@truefoundry/trueforge-core/agent-session';import { createCatalogRouter } from '../../../src/apis/catalog';import { createAvailableSkillsRouter, createSkillsRouter } from '../../../src/apis/skills';-import { STANDALONE_REQUEST_CONTEXT } from '../../../src/auth/identity';+import { createdBySubjectFromRequestContext, STANDALONE_REQUEST_CONTEXT } from '../../../src/auth/identity';import { McpCatalog } from '../../../src/catalog/McpCatalog';import { ModelCatalog } from '../../../src/catalog/ModelCatalog';import { SandboxCatalog } from '../../../src/catalog/SandboxCatalog';import { SkillCatalog } from '../../../src/catalog/SkillCatalog';import { WebSearchCatalog } from '../../../src/catalog/WebSearchCatalog';+import type { IAgentStore } from '../../../src/db/agentStore';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';+import { SqliteAgentStore } from '../../../src/db/sqlite/agent-store/SqliteAgentStore';import { createSqliteDb } from '../../../src/db/sqlite/client';import { SqliteSkillStore } from '../../../src/db/sqlite/skill-store/SqliteSkillStore';import { TRUEFOUNDRY_MANAGED_MESSAGE, trueFoundryManaged } from '../../../src/truefoundry/errors';+/** Stand-in for the delete pre-check in tests that are not exercising agent usage. */+function noAgentsUsingCatalog(): IAgentStore {+ return {+ listAgents: jest.fn(),+ getOwnedIds: jest.fn(),+ getExternalIdsByIds: jest.fn(),+ getAgent: jest.fn(),+ createAgent: jest.fn(),+ updateAgent: jest.fn(),+ deleteAgent: jest.fn(),+ listAgentCatalogUsage: jest.fn().mockResolvedValue([]),+ listAgentNamesUsingSandboxEnvironment: jest.fn().mockResolvedValue([]),+ };+}+const putBody = {type: 'git' as const,name: 'algorithmic-art',@@ -48,13 +66,16 @@ describe('skills routers', () => {let settingsRouter: ReturnType<typeof createSkillsRouter>;let catalogRouter: ReturnType<typeof createCatalogRouter>;let availableRouter: ReturnType<typeof createAvailableSkillsRouter>;+ let agentStore: SqliteAgentStore;beforeAll(async () => {const db = createSqliteDb(':memory:');await migrateSqliteToLatest(db);const skillStore = new SqliteSkillStore(db);+ agentStore = new SqliteAgentStore(db);settingsRouter = createSkillsRouter({resolveSkillStore: () => skillStore,+ resolveAgentStore: () => agentStore,withTransaction: callback => db.transaction().execute(callback),resolveRequestContext: () => STANDALONE_REQUEST_CONTEXT,});@@ -143,6 +164,7 @@ describe('skills routers', () => {]),createSkill: jest.fn(),upsertSkill: jest.fn(),+ deleteSkill: jest.fn(),listSkillVersions: jest.fn(),validateAgentSkills: jest.fn(),resolveTurnSkills: jest.fn(),@@ -190,12 +212,14 @@ describe('skills routers', () => {listSkills: jest.fn(),createSkill: jest.fn().mockResolvedValue(record),upsertSkill: jest.fn().mockResolvedValue(record),+ deleteSkill: jest.fn(),listSkillVersions: jest.fn(),validateAgentSkills: jest.fn(),resolveTurnSkills: jest.fn(),};const router = createSkillsRouter({resolveSkillStore: () => managedStore,+ resolveAgentStore: noAgentsUsingCatalog,withTransaction: async callback => callback(undefined as never),resolveRequestContext: () => STANDALONE_REQUEST_CONTEXT,});@@ -229,12 +253,14 @@ describe('skills routers', () => {listSkills: jest.fn(),createSkill: jest.fn(() => trueFoundryManaged()),upsertSkill: jest.fn(() => trueFoundryManaged()),+ deleteSkill: jest.fn(() => trueFoundryManaged()),listSkillVersions: jest.fn(),validateAgentSkills: jest.fn(),resolveTurnSkills: jest.fn(),};const router = createSkillsRouter({resolveSkillStore: () => managedStore,+ resolveAgentStore: noAgentsUsingCatalog,withTransaction: async callback => callback(undefined as never),resolveRequestContext: () => STANDALONE_REQUEST_CONTEXT,});@@ -246,6 +272,56 @@ describe('skills routers', () => {const put = await router.request('/', putInit(wrapManifest(registryManifest)));expect(put.status).toBe(424);expect(await put.text()).toBe(TRUEFOUNDRY_MANAGED_MESSAGE);++ const removed = await router.request('/echo', { method: 'DELETE' });+ expect(removed.status).toBe(424);+ expect(await removed.text()).toBe(TRUEFOUNDRY_MANAGED_MESSAGE);+ });++ describe('DELETE /{name}', () => {+ const disposable = { ...putBody, name: 'disposable-skill', path: 'skills/disposable' };++ beforeEach(async () => {+ await settingsRouter.request('/', putInit(wrapManifest(disposable)));+ });++ it('removes an unused skill', async () => {+ const response = await settingsRouter.request(`/${disposable.name}`, { method: 'DELETE' });+ expect(response.status).toBe(200);+ expect(await response.json()).toEqual({});++ const list = (await (await settingsRouter.request('/')).json()) as { data: { name: string }[] };+ expect(list.data.map(skill => skill.name)).not.toContain(disposable.name);+ });++ it('returns 404 for an unknown skill', async () => {+ const missing = await settingsRouter.request('/missing', { method: 'DELETE' });+ expect(missing.status).toBe(404);+ expect(await missing.json()).toEqual({ error: { message: 'Skill not found: missing' } });+ });++ it('returns 409 naming the agents that still list the skill', async () => {+ await agentStore.createAgent({+ tenant_id: 'default',+ created_by_subject: createdBySubjectFromRequestContext(STANDALONE_REQUEST_CONTEXT),+ name: 'skill-user',+ description: 'Test agent.',+ manifest: AgentSpecSchema.parse({+ model: { name: 'anthropic/claude-sonnet-4-6' },+ skills: [{ name: disposable.name }],+ }),+ external_id: null,+ });++ const blocked = await settingsRouter.request(`/${disposable.name}`, { method: 'DELETE' });+ expect(blocked.status).toBe(409);+ expect(await blocked.json()).toEqual({+ error: {+ message:+ 'Still in use — skill "disposable-skill" is used by agent skill-user. Update or delete those agents first.',+ },+ });+ });});it('PUT rejects invalid bodies at the Zod layer', async () => {diff --git a/packages/trueforge/tests/unit/runtime/sessionResources.test.ts b/packages/trueforge/tests/unit/runtime/sessionResources.test.tsindex 3d7e3c429..4739ab751 100644--- a/packages/trueforge/tests/unit/runtime/sessionResources.test.ts+++ b/packages/trueforge/tests/unit/runtime/sessionResources.test.ts@@ -373,6 +373,9 @@ describe('validateAgentSpec', () => {upsertSkill: async () => {throw new Error('unused');},+ deleteSkill: async () => {+ throw new Error('unused');+ },listSkillVersions: async () => [],async validateAgentSkills(input) {return validateGitAgentSkills(this, input);diff --git a/python/trueforge_sdk/reference.md b/python/trueforge_sdk/reference.mdindex c50ff942f..8d6fc7d1e 100644--- a/python/trueforge_sdk/reference.md+++ b/python/trueforge_sdk/reference.md@@ -4689,6 +4689,78 @@ client.settings.mcp_servers.get(</dl>+</dd>+</dl>+</details>++<details><summary><code>client.settings.mcp_servers.<a href="src/trueforge_sdk/settings/mcp_servers/client.py">delete</a>(...) -> DeleteMcpServerResponse</code></summary>+<dl>+<dd>++#### 📝 Description++<dl>+<dd>++<dl>+<dd>++Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.+</dd>+</dl>+</dd>+</dl>++#### 🔌 Usage++<dl>+<dd>++<dl>+<dd>++```python+from trueforge_sdk import TrueForge++client = TrueForge(+ token="<token>",+ base_url="https://yourhost.com/path/to/api",+)++client.settings.mcp_servers.delete(+ name="name",+)++```+</dd>+</dl>+</dd>+</dl>++#### ⚙️ Parameters++<dl>+<dd>++<dl>+<dd>++**name:** `str` — MCP server name.++</dd>+</dl>++<dl>+<dd>++**request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.++</dd>+</dl>+</dd>+</dl>++</dd></dl></details>@@ -4920,6 +4992,78 @@ client.settings.model_providers.create_or_update(</dl>+</dd>+</dl>+</details>++<details><summary><code>client.settings.model_providers.<a href="src/trueforge_sdk/settings/model_providers/client.py">delete</a>(...) -> DeleteModelProviderResponse</code></summary>+<dl>+<dd>++#### 📝 Description++<dl>+<dd>++<dl>+<dd>++Deletes a provider and every model it declares. Rejected while any agent still uses one of them.+</dd>+</dl>+</dd>+</dl>++#### 🔌 Usage++<dl>+<dd>++<dl>+<dd>++```python+from trueforge_sdk import TrueForge++client = TrueForge(+ token="<token>",+ base_url="https://yourhost.com/path/to/api",+)++client.settings.model_providers.delete(+ name="name",+)++```+</dd>+</dl>+</dd>+</dl>++#### ⚙️ Parameters++<dl>+<dd>++<dl>+<dd>++**name:** `str` — Model provider name.++</dd>+</dl>++<dl>+<dd>++**request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.++</dd>+</dl>+</dd>+</dl>++</dd></dl></details>@@ -5283,6 +5427,78 @@ client.settings.skills.create_or_update(</dl>+</dd>+</dl>+</details>++<details><summary><code>client.settings.skills.<a href="src/trueforge_sdk/settings/skills/client.py">delete</a>(...) -> DeleteSkillResponse</code></summary>+<dl>+<dd>++#### 📝 Description++<dl>+<dd>++<dl>+<dd>++Deletes a skill by `name`. Rejected while any agent still lists the skill.+</dd>+</dl>+</dd>+</dl>++#### 🔌 Usage++<dl>+<dd>++<dl>+<dd>++```python+from trueforge_sdk import TrueForge++client = TrueForge(+ token="<token>",+ base_url="https://yourhost.com/path/to/api",+)++client.settings.skills.delete(+ name="name",+)++```+</dd>+</dl>+</dd>+</dl>++#### ⚙️ Parameters++<dl>+<dd>++<dl>+<dd>++**name:** `str` — Skill name.++</dd>+</dl>++<dl>+<dd>++**request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.++</dd>+</dl>+</dd>+</dl>++</dd></dl></details>diff --git a/python/trueforge_sdk/src/trueforge_sdk/__init__.py b/python/trueforge_sdk/src/trueforge_sdk/__init__.pyindex bfc2c7f25..c4ccacf02 100644--- a/python/trueforge_sdk/src/trueforge_sdk/__init__.py+++ b/python/trueforge_sdk/src/trueforge_sdk/__init__.py@@ -64,8 +64,11 @@ if typing.TYPE_CHECKING:CustomModelProvider,DaytonaSandboxProviderAuth,DeleteAgentResponse,+ DeleteMcpServerResponse,+ DeleteModelProviderResponse,DeleteSandboxEnvironmentResponse,DeleteScheduleResponse,+ DeleteSkillResponse,DynamicSubAgentsConfig,ExtendedChunkDeltaToolCall,FileContent,@@ -370,8 +373,11 @@ _dynamic_imports: typing.Dict[str, str] = {"DefaultAioHttpClient": "._default_clients","DefaultAsyncHttpxClient": "._default_clients","DeleteAgentResponse": ".types",+ "DeleteMcpServerResponse": ".types",+ "DeleteModelProviderResponse": ".types","DeleteSandboxEnvironmentResponse": ".types","DeleteScheduleResponse": ".types",+ "DeleteSkillResponse": ".types","DynamicSubAgentsConfig": ".types","ExtendedChunkDeltaToolCall": ".types","FailedDependencyError": ".errors",@@ -690,8 +696,11 @@ __all__ = ["DefaultAioHttpClient","DefaultAsyncHttpxClient","DeleteAgentResponse",+ "DeleteMcpServerResponse",+ "DeleteModelProviderResponse","DeleteSandboxEnvironmentResponse","DeleteScheduleResponse",+ "DeleteSkillResponse","DynamicSubAgentsConfig","ExtendedChunkDeltaToolCall","FailedDependencyError",diff --git a/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/client.py b/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/client.pyindex 4f362251d..fcff93135 100644--- a/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/client.py+++ b/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/client.py@@ -4,6 +4,7 @@ import typingfrom ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapperfrom ...core.request_options import RequestOptions+from ...types.delete_mcp_server_response import DeleteMcpServerResponsefrom ...types.get_mcp_server_response import GetMcpServerResponsefrom ...types.list_mcp_servers_response import ListMcpServersResponsefrom ...types.mcp_server_manifest import McpServerManifest@@ -161,6 +162,38 @@ class McpServersClient:_response = self._raw_client.get(name=name, request_options=request_options)return _response.data+ def delete(self, *, name: str, request_options: typing.Optional[RequestOptions] = None) -> DeleteMcpServerResponse:+ """+ Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.++ Parameters+ ----------+ name : str+ MCP server name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ DeleteMcpServerResponse+ MCP server deleted.++ Examples+ --------+ from trueforge_sdk import TrueForge++ client = TrueForge(+ token="YOUR_TOKEN",+ base_url="https://yourhost.com/path/to/api",+ )+ client.settings.mcp_servers.delete(+ name="name",+ )+ """+ _response = self._raw_client.delete(name=name, request_options=request_options)+ return _response.data+class AsyncMcpServersClient:def __init__(self, *, client_wrapper: AsyncClientWrapper):@@ -341,3 +374,45 @@ class AsyncMcpServersClient:"""_response = await self._raw_client.get(name=name, request_options=request_options)return _response.data++ async def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> DeleteMcpServerResponse:+ """+ Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.++ Parameters+ ----------+ name : str+ MCP server name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ DeleteMcpServerResponse+ MCP server deleted.++ Examples+ --------+ import asyncio++ from trueforge_sdk import AsyncTrueForge++ client = AsyncTrueForge(+ token="YOUR_TOKEN",+ base_url="https://yourhost.com/path/to/api",+ )+++ async def main() -> None:+ await client.settings.mcp_servers.delete(+ name="name",+ )+++ asyncio.run(main())+ """+ _response = await self._raw_client.delete(name=name, request_options=request_options)+ return _response.datadiff --git a/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/raw_client.py b/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/raw_client.pyindex 7debcbada..b0b287d8e 100644--- a/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/raw_client.py+++ b/python/trueforge_sdk/src/trueforge_sdk/settings/mcp_servers/raw_client.py@@ -18,6 +18,7 @@ from ...errors.forbidden_error import ForbiddenErrorfrom ...errors.not_found_error import NotFoundErrorfrom ...errors.unauthorized_error import UnauthorizedErrorfrom ...errors.unprocessable_entity_error import UnprocessableEntityError+from ...types.delete_mcp_server_response import DeleteMcpServerResponsefrom ...types.get_mcp_server_response import GetMcpServerResponsefrom ...types.list_mcp_servers_response import ListMcpServersResponsefrom ...types.mcp_server_manifest import McpServerManifest@@ -325,6 +326,82 @@ class RawMcpServersClient:)raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)+ def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> HttpResponse[DeleteMcpServerResponse]:+ """+ Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.++ Parameters+ ----------+ name : str+ MCP server name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ HttpResponse[DeleteMcpServerResponse]+ MCP server deleted.+ """+ _response = self._client_wrapper.httpx_client.request(+ f"api/v1/settings/mcp-servers/{encode_path_param(name)}",+ method="DELETE",+ request_options=request_options,+ )+ try:+ if 200 <= _response.status_code < 300:+ _data = typing.cast(+ DeleteMcpServerResponse,+ construct_type(+ type_=DeleteMcpServerResponse, # type: ignore+ object_=_response.json(),+ ),+ )+ return HttpResponse(response=_response, data=_data)+ if _response.status_code == 404:+ raise NotFoundError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 424:+ raise FailedDependencyError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ _response_json = _response.json()+ except JSONDecodeError:+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)+ except ValidationError as e:+ raise ParsingError(+ status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e+ )+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)+class AsyncRawMcpServersClient:def __init__(self, *, client_wrapper: AsyncClientWrapper):@@ -624,3 +701,79 @@ class AsyncRawMcpServersClient:status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e)raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)++ async def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> AsyncHttpResponse[DeleteMcpServerResponse]:+ """+ Deletes an MCP server by `name`, along with every stored OAuth token for it. Rejected while any agent still lists the server.++ Parameters+ ----------+ name : str+ MCP server name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ AsyncHttpResponse[DeleteMcpServerResponse]+ MCP server deleted.+ """+ _response = await self._client_wrapper.httpx_client.request(+ f"api/v1/settings/mcp-servers/{encode_path_param(name)}",+ method="DELETE",+ request_options=request_options,+ )+ try:+ if 200 <= _response.status_code < 300:+ _data = typing.cast(+ DeleteMcpServerResponse,+ construct_type(+ type_=DeleteMcpServerResponse, # type: ignore+ object_=_response.json(),+ ),+ )+ return AsyncHttpResponse(response=_response, data=_data)+ if _response.status_code == 404:+ raise NotFoundError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 424:+ raise FailedDependencyError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ _response_json = _response.json()+ except JSONDecodeError:+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)+ except ValidationError as e:+ raise ParsingError(+ status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e+ )+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)diff --git a/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/client.py b/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/client.pyindex 9a39bca0e..d9965fffb 100644--- a/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/client.py+++ b/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/client.py@@ -4,6 +4,7 @@ import typingfrom ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapperfrom ...core.request_options import RequestOptions+from ...types.delete_model_provider_response import DeleteModelProviderResponsefrom ...types.get_model_provider_response import GetModelProviderResponsefrom ...types.list_model_providers_response import ListModelProvidersResponsefrom ...types.model_provider_manifest import ModelProviderManifest@@ -155,6 +156,40 @@ class ModelProvidersClient:_response = self._raw_client.create_or_update(manifest=manifest, request_options=request_options)return _response.data+ def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> DeleteModelProviderResponse:+ """+ Deletes a provider and every model it declares. Rejected while any agent still uses one of them.++ Parameters+ ----------+ name : str+ Model provider name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ DeleteModelProviderResponse+ Model provider deleted.++ Examples+ --------+ from trueforge_sdk import TrueForge++ client = TrueForge(+ token="YOUR_TOKEN",+ base_url="https://yourhost.com/path/to/api",+ )+ client.settings.model_providers.delete(+ name="name",+ )+ """+ _response = self._raw_client.delete(name=name, request_options=request_options)+ return _response.data+class AsyncModelProvidersClient:def __init__(self, *, client_wrapper: AsyncClientWrapper):@@ -321,3 +356,45 @@ class AsyncModelProvidersClient:"""_response = await self._raw_client.create_or_update(manifest=manifest, request_options=request_options)return _response.data++ async def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> DeleteModelProviderResponse:+ """+ Deletes a provider and every model it declares. Rejected while any agent still uses one of them.++ Parameters+ ----------+ name : str+ Model provider name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ DeleteModelProviderResponse+ Model provider deleted.++ Examples+ --------+ import asyncio++ from trueforge_sdk import AsyncTrueForge++ client = AsyncTrueForge(+ token="YOUR_TOKEN",+ base_url="https://yourhost.com/path/to/api",+ )+++ async def main() -> None:+ await client.settings.model_providers.delete(+ name="name",+ )+++ asyncio.run(main())+ """+ _response = await self._raw_client.delete(name=name, request_options=request_options)+ return _response.datadiff --git a/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/raw_client.py b/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/raw_client.pyindex a05073e05..2e26fe7af 100644--- a/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/raw_client.py+++ b/python/trueforge_sdk/src/trueforge_sdk/settings/model_providers/raw_client.py@@ -6,6 +6,7 @@ from json.decoder import JSONDecodeErrorfrom ...core.api_error import ApiErrorfrom ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapperfrom ...core.http_response import AsyncHttpResponse, HttpResponse+from ...core.jsonable_encoder import encode_path_paramfrom ...core.parse_error import ParsingErrorfrom ...core.request_options import RequestOptionsfrom ...core.serialization import convert_and_respect_annotation_metadata@@ -14,7 +15,9 @@ from ...errors.bad_request_error import BadRequestErrorfrom ...errors.conflict_error import ConflictErrorfrom ...errors.failed_dependency_error import FailedDependencyErrorfrom ...errors.forbidden_error import ForbiddenError+from ...errors.not_found_error import NotFoundErrorfrom ...errors.unauthorized_error import UnauthorizedError+from ...types.delete_model_provider_response import DeleteModelProviderResponsefrom ...types.get_model_provider_response import GetModelProviderResponsefrom ...types.list_model_providers_response import ListModelProvidersResponsefrom ...types.model_provider_manifest import ModelProviderManifest@@ -228,6 +231,93 @@ class RawModelProvidersClient:),),)+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 424:+ raise FailedDependencyError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ _response_json = _response.json()+ except JSONDecodeError:+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)+ except ValidationError as e:+ raise ParsingError(+ status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e+ )+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)++ def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> HttpResponse[DeleteModelProviderResponse]:+ """+ Deletes a provider and every model it declares. Rejected while any agent still uses one of them.++ Parameters+ ----------+ name : str+ Model provider name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ HttpResponse[DeleteModelProviderResponse]+ Model provider deleted.+ """+ _response = self._client_wrapper.httpx_client.request(+ f"api/v1/settings/model-providers/{encode_path_param(name)}",+ method="DELETE",+ request_options=request_options,+ )+ try:+ if 200 <= _response.status_code < 300:+ _data = typing.cast(+ DeleteModelProviderResponse,+ construct_type(+ type_=DeleteModelProviderResponse, # type: ignore+ object_=_response.json(),+ ),+ )+ return HttpResponse(response=_response, data=_data)+ if _response.status_code == 404:+ raise NotFoundError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )if _response.status_code == 424:raise FailedDependencyError(headers=dict(_response.headers),@@ -452,6 +542,93 @@ class AsyncRawModelProvidersClient:),),)+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 424:+ raise FailedDependencyError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ _response_json = _response.json()+ except JSONDecodeError:+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)+ except ValidationError as e:+ raise ParsingError(+ status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e+ )+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)++ async def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> AsyncHttpResponse[DeleteModelProviderResponse]:+ """+ Deletes a provider and every model it declares. Rejected while any agent still uses one of them.++ Parameters+ ----------+ name : str+ Model provider name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ AsyncHttpResponse[DeleteModelProviderResponse]+ Model provider deleted.+ """+ _response = await self._client_wrapper.httpx_client.request(+ f"api/v1/settings/model-providers/{encode_path_param(name)}",+ method="DELETE",+ request_options=request_options,+ )+ try:+ if 200 <= _response.status_code < 300:+ _data = typing.cast(+ DeleteModelProviderResponse,+ construct_type(+ type_=DeleteModelProviderResponse, # type: ignore+ object_=_response.json(),+ ),+ )+ return AsyncHttpResponse(response=_response, data=_data)+ if _response.status_code == 404:+ raise NotFoundError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )if _response.status_code == 424:raise FailedDependencyError(headers=dict(_response.headers),diff --git a/python/trueforge_sdk/src/trueforge_sdk/settings/skills/client.py b/python/trueforge_sdk/src/trueforge_sdk/settings/skills/client.pyindex c5a7a19c8..f1c0c7a22 100644--- a/python/trueforge_sdk/src/trueforge_sdk/settings/skills/client.py+++ b/python/trueforge_sdk/src/trueforge_sdk/settings/skills/client.py@@ -4,6 +4,7 @@ import typingfrom ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapperfrom ...core.request_options import RequestOptions+from ...types.delete_skill_response import DeleteSkillResponsefrom ...types.get_skill_response import GetSkillResponsefrom ...types.list_skills_response import ListSkillsResponsefrom ...types.skill_manifest import SkillManifest@@ -131,6 +132,38 @@ class SkillsClient:_response = self._raw_client.create_or_update(manifest=manifest, request_options=request_options)return _response.data+ def delete(self, *, name: str, request_options: typing.Optional[RequestOptions] = None) -> DeleteSkillResponse:+ """+ Deletes a skill by `name`. Rejected while any agent still lists the skill.++ Parameters+ ----------+ name : str+ Skill name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ DeleteSkillResponse+ Skill deleted.++ Examples+ --------+ from trueforge_sdk import TrueForge++ client = TrueForge(+ token="YOUR_TOKEN",+ base_url="https://yourhost.com/path/to/api",+ )+ client.settings.skills.delete(+ name="name",+ )+ """+ _response = self._raw_client.delete(name=name, request_options=request_options)+ return _response.data+class AsyncSkillsClient:def __init__(self, *, client_wrapper: AsyncClientWrapper):@@ -273,3 +306,45 @@ class AsyncSkillsClient:"""_response = await self._raw_client.create_or_update(manifest=manifest, request_options=request_options)return _response.data++ async def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> DeleteSkillResponse:+ """+ Deletes a skill by `name`. Rejected while any agent still lists the skill.++ Parameters+ ----------+ name : str+ Skill name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ DeleteSkillResponse+ Skill deleted.++ Examples+ --------+ import asyncio++ from trueforge_sdk import AsyncTrueForge++ client = AsyncTrueForge(+ token="YOUR_TOKEN",+ base_url="https://yourhost.com/path/to/api",+ )+++ async def main() -> None:+ await client.settings.skills.delete(+ name="name",+ )+++ asyncio.run(main())+ """+ _response = await self._raw_client.delete(name=name, request_options=request_options)+ return _response.datadiff --git a/python/trueforge_sdk/src/trueforge_sdk/settings/skills/raw_client.py b/python/trueforge_sdk/src/trueforge_sdk/settings/skills/raw_client.pyindex beac8859c..7d4c227ad 100644--- a/python/trueforge_sdk/src/trueforge_sdk/settings/skills/raw_client.py+++ b/python/trueforge_sdk/src/trueforge_sdk/settings/skills/raw_client.py@@ -6,6 +6,7 @@ from json.decoder import JSONDecodeErrorfrom ...core.api_error import ApiErrorfrom ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapperfrom ...core.http_response import AsyncHttpResponse, HttpResponse+from ...core.jsonable_encoder import encode_path_paramfrom ...core.parse_error import ParsingErrorfrom ...core.request_options import RequestOptionsfrom ...core.serialization import convert_and_respect_annotation_metadata@@ -14,7 +15,9 @@ from ...errors.bad_request_error import BadRequestErrorfrom ...errors.conflict_error import ConflictErrorfrom ...errors.failed_dependency_error import FailedDependencyErrorfrom ...errors.forbidden_error import ForbiddenError+from ...errors.not_found_error import NotFoundErrorfrom ...errors.unauthorized_error import UnauthorizedError+from ...types.delete_skill_response import DeleteSkillResponsefrom ...types.get_skill_response import GetSkillResponsefrom ...types.list_skills_response import ListSkillsResponsefrom ...types.request_error_response import RequestErrorResponse@@ -246,6 +249,82 @@ class RawSkillsClient:)raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)+ def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> HttpResponse[DeleteSkillResponse]:+ """+ Deletes a skill by `name`. Rejected while any agent still lists the skill.++ Parameters+ ----------+ name : str+ Skill name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ HttpResponse[DeleteSkillResponse]+ Skill deleted.+ """+ _response = self._client_wrapper.httpx_client.request(+ f"api/v1/settings/skills/{encode_path_param(name)}",+ method="DELETE",+ request_options=request_options,+ )+ try:+ if 200 <= _response.status_code < 300:+ _data = typing.cast(+ DeleteSkillResponse,+ construct_type(+ type_=DeleteSkillResponse, # type: ignore+ object_=_response.json(),+ ),+ )+ return HttpResponse(response=_response, data=_data)+ if _response.status_code == 404:+ raise NotFoundError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 424:+ raise FailedDependencyError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ _response_json = _response.json()+ except JSONDecodeError:+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)+ except ValidationError as e:+ raise ParsingError(+ status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e+ )+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)+class AsyncRawSkillsClient:def __init__(self, *, client_wrapper: AsyncClientWrapper):@@ -469,3 +548,79 @@ class AsyncRawSkillsClient:status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e)raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)++ async def delete(+ self, *, name: str, request_options: typing.Optional[RequestOptions] = None+ ) -> AsyncHttpResponse[DeleteSkillResponse]:+ """+ Deletes a skill by `name`. Rejected while any agent still lists the skill.++ Parameters+ ----------+ name : str+ Skill name.++ request_options : typing.Optional[RequestOptions]+ Request-specific configuration.++ Returns+ -------+ AsyncHttpResponse[DeleteSkillResponse]+ Skill deleted.+ """+ _response = await self._client_wrapper.httpx_client.request(+ f"api/v1/settings/skills/{encode_path_param(name)}",+ method="DELETE",+ request_options=request_options,+ )+ try:+ if 200 <= _response.status_code < 300:+ _data = typing.cast(+ DeleteSkillResponse,+ construct_type(+ type_=DeleteSkillResponse, # type: ignore+ object_=_response.json(),+ ),+ )+ return AsyncHttpResponse(response=_response, data=_data)+ if _response.status_code == 404:+ raise NotFoundError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 409:+ raise ConflictError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ if _response.status_code == 424:+ raise FailedDependencyError(+ headers=dict(_response.headers),+ body=typing.cast(+ RequestErrorResponse,+ construct_type(+ type_=RequestErrorResponse, # type: ignore+ object_=_response.json(),+ ),+ ),+ )+ _response_json = _response.json()+ except JSONDecodeError:+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)+ except ValidationError as e:+ raise ParsingError(+ status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e+ )+ raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)diff --git a/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py b/python/trueforge_sdk/src/trueforge_sdk/types/__init__.pyindex 3a36bafeb..6a92da596 100644--- a/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py+++ b/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py@@ -63,8 +63,11 @@ if typing.TYPE_CHECKING:from .custom_model_provider import CustomModelProviderfrom .daytona_sandbox_provider_auth import DaytonaSandboxProviderAuthfrom .delete_agent_response import DeleteAgentResponse+ from .delete_mcp_server_response import DeleteMcpServerResponse+ from .delete_model_provider_response import DeleteModelProviderResponsefrom .delete_sandbox_environment_response import DeleteSandboxEnvironmentResponsefrom .delete_schedule_response import DeleteScheduleResponse+ from .delete_skill_response import DeleteSkillResponsefrom .dynamic_sub_agents_config import DynamicSubAgentsConfigfrom .extended_chunk_delta_tool_call import ExtendedChunkDeltaToolCallfrom .file_content import FileContent@@ -330,8 +333,11 @@ _dynamic_imports: typing.Dict[str, str] = {"CustomModelProvider": ".custom_model_provider","DaytonaSandboxProviderAuth": ".daytona_sandbox_provider_auth","DeleteAgentResponse": ".delete_agent_response",+ "DeleteMcpServerResponse": ".delete_mcp_server_response",+ "DeleteModelProviderResponse": ".delete_model_provider_response","DeleteSandboxEnvironmentResponse": ".delete_sandbox_environment_response","DeleteScheduleResponse": ".delete_schedule_response",+ "DeleteSkillResponse": ".delete_skill_response","DynamicSubAgentsConfig": ".dynamic_sub_agents_config","ExtendedChunkDeltaToolCall": ".extended_chunk_delta_tool_call","FileContent": ".file_content",@@ -621,8 +627,11 @@ __all__ = ["CustomModelProvider","DaytonaSandboxProviderAuth","DeleteAgentResponse",+ "DeleteMcpServerResponse",+ "DeleteModelProviderResponse","DeleteSandboxEnvironmentResponse","DeleteScheduleResponse",+ "DeleteSkillResponse","DynamicSubAgentsConfig","ExtendedChunkDeltaToolCall","FileContent",diff --git a/python/trueforge_sdk/src/trueforge_sdk/types/delete_mcp_server_response.py b/python/trueforge_sdk/src/trueforge_sdk/types/delete_mcp_server_response.pynew file mode 100644index 000000000..7bbaea3db--- /dev/null+++ b/python/trueforge_sdk/src/trueforge_sdk/types/delete_mcp_server_response.py@@ -0,0 +1,17 @@+# This file was auto-generated by Fern from our API Definition.++import typing++import pydantic+from ..core.pydantic_utilities import IS_PYDANTIC_V2+from ..core.unchecked_base_model import UncheckedBaseModel+++class DeleteMcpServerResponse(UncheckedBaseModel):+ if IS_PYDANTIC_V2:+ model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow") # type: ignore # Pydantic v2+ else:++ class Config:+ smart_union = True+ extra = pydantic.Extra.allowdiff --git a/python/trueforge_sdk/src/trueforge_sdk/types/delete_model_provider_response.py b/python/trueforge_sdk/src/trueforge_sdk/types/delete_model_provider_response.pynew file mode 100644index 000000000..bda869713--- /dev/null+++ b/python/trueforge_sdk/src/trueforge_sdk/types/delete_model_provider_response.py@@ -0,0 +1,17 @@+# This file was auto-generated by Fern from our API Definition.++import typing++import pydantic+from ..core.pydantic_utilities import IS_PYDANTIC_V2+from ..core.unchecked_base_model import UncheckedBaseModel+++class DeleteModelProviderResponse(UncheckedBaseModel):+ if IS_PYDANTIC_V2:+ model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow") # type: ignore # Pydantic v2+ else:++ class Config:+ smart_union = True+ extra = pydantic.Extra.allowdiff --git a/python/trueforge_sdk/src/trueforge_sdk/types/delete_skill_response.py b/python/trueforge_sdk/src/trueforge_sdk/types/delete_skill_response.pynew file mode 100644index 000000000..347d99389--- /dev/null+++ b/python/trueforge_sdk/src/trueforge_sdk/types/delete_skill_response.py@@ -0,0 +1,17 @@+# This file was auto-generated by Fern from our API Definition.++import typing++import pydantic+from ..core.pydantic_utilities import IS_PYDANTIC_V2+from ..core.unchecked_base_model import UncheckedBaseModel+++class DeleteSkillResponse(UncheckedBaseModel):+ if IS_PYDANTIC_V2:+ model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow") # type: ignore # Pydantic v2+ else:++ class Config:+ smart_union = True+ extra = pydantic.Extra.allow