diff --git a/apps/mobile/src/i18n/translations/de.json b/apps/mobile/src/i18n/translations/de.json index c9d43d96b3eb8..5f38827bdded9 100644 --- a/apps/mobile/src/i18n/translations/de.json +++ b/apps/mobile/src/i18n/translations/de.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Installiere die Origin CLI mit {install} und führe dann {login} aus.", "eb0f60ef4f92ab7d": "Installiere {fj} 0.6 oder neuer von {fjUrl} und führe {fjLogin} aus, oder installiere {tea} 0.16 oder neuer von {teaUrl} und führe {teaLogin} für jeden Forgejo- oder Gitea-Server aus.", "d026a85e2e50e675": "Installiere die GitCafe CLI mit {install} und führe dann {login} aus, speichere ein Token in den Einstellungen oder setze {variable} auf dem Server.", + "121a63b1bdcfc04c": "{organization} legt fest, welche ACP-Agenten hier ausgeführt werden. Lokale Befehle und ausführbare Überschreibungen sind daher deaktiviert.", + "2362e53ee237a5d2": "Die Richtlinie von {organization} erlaubt den ACP-Agenten {agentId} nicht.", "79d776428f4d0650": "Die Datei konnte nicht geladen werden. Verbinde dich erneut und versuch es noch einmal.", "3ea34cbb1ca5ba9b": "Vorschau abgebrochen.", "7c0af279ecb3da3a": "Streamende Dateivorschauen sind in dieser Laufzeitumgebung nicht verfügbar.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "Die Richtlinie von {organization} erlaubt den Anbieter {label} nicht.", "2c850e594aa60ad5": "Anbieter nicht erlaubt", "bada142dca0fa1d1": "{message} Wähle ein anderes Modell.", + "051646934614705c": "Anbieter nicht verfügbar", + "ca6f7bf7c667115d": "Wähle ein anderes Modell.", "d2b4bc575d7d99d8": "Modell für dieses Projekt ausgeschaltet", "be1bc7fa9d199f70": "Schalte es im Web oder auf dem Desktop wieder ein oder wähle ein anderes Modell.", "b994adb6050417c2": "{provider}-Modell nicht verfügbar", diff --git a/apps/mobile/src/i18n/translations/en.json b/apps/mobile/src/i18n/translations/en.json index 7a89a1cf37c22..ecd73550ed99e 100644 --- a/apps/mobile/src/i18n/translations/en.json +++ b/apps/mobile/src/i18n/translations/en.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Install the Origin CLI with {install}, then run {login}.", "eb0f60ef4f92ab7d": "Install {fj} 0.6 or later from {fjUrl} and run {fjLogin}, or install {tea} 0.16 or later from {teaUrl} and run {teaLogin} for each Forgejo or Gitea server.", "d026a85e2e50e675": "Install the GitCafe CLI with {install}, then run {login}, save a token in Settings, or set {variable} on the server.", + "121a63b1bdcfc04c": "{organization} chooses which ACP agents run here, so local commands and executable overrides are turned off.", + "2362e53ee237a5d2": "{organization}'s policy does not allow the ACP agent {agentId}.", "79d776428f4d0650": "The file could not be loaded. Reconnect and try again.", "3ea34cbb1ca5ba9b": "Preview cancelled.", "7c0af279ecb3da3a": "Streaming file previews are unavailable in this runtime.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "{organization}''s policy does not allow the {label} provider.", "2c850e594aa60ad5": "Provider not allowed", "bada142dca0fa1d1": "{message} Choose another model.", + "051646934614705c": "Provider unavailable", + "ca6f7bf7c667115d": "Choose another model.", "d2b4bc575d7d99d8": "Model turned off for this project", "be1bc7fa9d199f70": "Turn it back on from web or desktop, or choose another model.", "b994adb6050417c2": "{provider} model unavailable", diff --git a/apps/mobile/src/i18n/translations/es.json b/apps/mobile/src/i18n/translations/es.json index 288dbfc7da2cf..cadddddbc278a 100644 --- a/apps/mobile/src/i18n/translations/es.json +++ b/apps/mobile/src/i18n/translations/es.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Instala la CLI de Origin con {install} y ejecuta {login}.", "eb0f60ef4f92ab7d": "Instala {fj} 0.6 o posterior desde {fjUrl} y ejecuta {fjLogin}, o instala {tea} 0.16 o posterior desde {teaUrl} y ejecuta {teaLogin} para cada servidor de Forgejo o Gitea.", "d026a85e2e50e675": "Instala la CLI de GitCafe con {install} y ejecuta {login}, guarda un token en Ajustes o define {variable} en el servidor.", + "121a63b1bdcfc04c": "{organization} elige qué agentes ACP se ejecutan aquí, por lo que los comandos locales y las sustituciones del ejecutable están desactivados.", + "2362e53ee237a5d2": "La política de {organization} no permite el agente ACP {agentId}.", "79d776428f4d0650": "No se pudo cargar el archivo. Vuelve a conectarte e inténtalo de nuevo.", "3ea34cbb1ca5ba9b": "Vista previa cancelada.", "7c0af279ecb3da3a": "Las vistas previas de archivos en streaming no están disponibles en este entorno de ejecución.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "La política de {organization} no permite el proveedor {label}.", "2c850e594aa60ad5": "Proveedor no permitido", "bada142dca0fa1d1": "{message} Elige otro modelo.", + "051646934614705c": "Proveedor no disponible", + "ca6f7bf7c667115d": "Elige otro modelo.", "d2b4bc575d7d99d8": "Modelo desactivado para este proyecto", "be1bc7fa9d199f70": "Vuelve a activarlo desde la web o el escritorio, o elige otro modelo.", "b994adb6050417c2": "Modelo de {provider} no disponible", diff --git a/apps/mobile/src/i18n/translations/fr.json b/apps/mobile/src/i18n/translations/fr.json index 28ec2284fca74..702ed3f122459 100644 --- a/apps/mobile/src/i18n/translations/fr.json +++ b/apps/mobile/src/i18n/translations/fr.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Installez la CLI Origin avec {install}, puis exécutez {login}.", "eb0f60ef4f92ab7d": "Installez {fj} 0.6 ou version ultérieure depuis {fjUrl} et exécutez {fjLogin}, ou installez {tea} 0.16 ou version ultérieure depuis {teaUrl} et exécutez {teaLogin} pour chaque serveur Forgejo ou Gitea.", "d026a85e2e50e675": "Installez la CLI GitCafe avec {install}, puis exécutez {login}, enregistrez un jeton dans Paramètres ou définissez {variable} sur le serveur.", + "121a63b1bdcfc04c": "{organization} choisit les agents ACP exécutés ici. Les commandes locales et les remplacements d’exécutable sont donc désactivés.", + "2362e53ee237a5d2": "La politique de {organization} n’autorise pas l’agent ACP {agentId}.", "79d776428f4d0650": "Le fichier n’a pas pu être chargé. Reconnectez-vous et réessayez.", "3ea34cbb1ca5ba9b": "Aperçu annulé.", "7c0af279ecb3da3a": "Les aperçus de fichiers en streaming ne sont pas disponibles dans cet environnement d’exécution.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "La politique de {organization} n’autorise pas le fournisseur {label}.", "2c850e594aa60ad5": "Fournisseur non autorisé", "bada142dca0fa1d1": "{message} Choisissez un autre modèle.", + "051646934614705c": "Fournisseur indisponible", + "ca6f7bf7c667115d": "Choisissez un autre modèle.", "d2b4bc575d7d99d8": "Modèle désactivé pour ce projet", "be1bc7fa9d199f70": "Réactivez-le depuis le web ou le bureau, ou choisissez un autre modèle.", "b994adb6050417c2": "Modèle {provider} indisponible", diff --git a/apps/mobile/src/i18n/translations/ja.json b/apps/mobile/src/i18n/translations/ja.json index f6741fdb8b775..f1d65a27976c8 100644 --- a/apps/mobile/src/i18n/translations/ja.json +++ b/apps/mobile/src/i18n/translations/ja.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "{install} で Origin CLI をインストールしてから、{login} を実行してください。", "eb0f60ef4f92ab7d": "Forgejo または Gitea のサーバーごとに、{fjUrl} から {fj} 0.6 以降をインストールして {fjLogin} を実行するか、{teaUrl} から {tea} 0.16 以降をインストールして {teaLogin} を実行してください。", "d026a85e2e50e675": "{install} で GitCafe CLI をインストールしてから、{login} を実行するか、設定にトークンを保存するか、サーバーで {variable} を設定してください。", + "121a63b1bdcfc04c": "{organization} がここで実行する ACP エージェントを指定するため、ローカルコマンドと実行ファイルの上書きは無効です。", + "2362e53ee237a5d2": "{organization} のポリシーでは ACP エージェント {agentId} は許可されていません。", "79d776428f4d0650": "ファイルを読み込めませんでした。再接続してもう一度お試しください。", "3ea34cbb1ca5ba9b": "プレビューをキャンセルしました。", "7c0af279ecb3da3a": "このランタイムではファイルのストリーミングプレビューを利用できません。", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "{organization} のポリシーでは、{label} プロバイダーは許可されていません。", "2c850e594aa60ad5": "プロバイダーは許可されていません", "bada142dca0fa1d1": "{message} 別のモデルを選んでください。", + "051646934614705c": "プロバイダーを利用できません", + "ca6f7bf7c667115d": "別のモデルを選択してください。", "d2b4bc575d7d99d8": "このプロジェクトではモデルがオフになっています", "be1bc7fa9d199f70": "Web またはデスクトップでオンに戻すか、別のモデルを選んでください。", "b994adb6050417c2": "{provider} のモデルを利用できません", diff --git a/apps/mobile/src/i18n/translations/ko.json b/apps/mobile/src/i18n/translations/ko.json index b1ef20ba0f347..38c5f0d9e0eea 100644 --- a/apps/mobile/src/i18n/translations/ko.json +++ b/apps/mobile/src/i18n/translations/ko.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "{install}로 Origin CLI를 설치한 후 {login}을(를) 실행하세요.", "eb0f60ef4f92ab7d": "{fjUrl}에서 {fj} 0.6 이상을 설치하고 {fjLogin}을(를) 실행하거나, {teaUrl}에서 {tea} 0.16 이상을 설치하고 Forgejo 또는 Gitea 서버마다 {teaLogin}을(를) 실행하세요.", "d026a85e2e50e675": "{install}로 GitCafe CLI를 설치한 후 {login}을(를) 실행하거나, 설정에 토큰을 저장하거나, 서버에서 {variable}을(를) 설정하세요.", + "121a63b1bdcfc04c": "{organization}에서 여기서 실행할 ACP 에이전트를 지정하므로 로컬 명령과 실행 파일 재정의가 꺼져 있습니다.", + "2362e53ee237a5d2": "{organization}의 정책은 ACP 에이전트 {agentId}을(를) 허용하지 않습니다.", "79d776428f4d0650": "파일을 불러올 수 없습니다. 다시 연결한 뒤 시도하세요.", "3ea34cbb1ca5ba9b": "미리 보기가 취소되었습니다.", "7c0af279ecb3da3a": "이 런타임에서는 스트리밍 파일 미리 보기를 사용할 수 없습니다.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "{organization}의 정책상 {label} 제공자를 사용할 수 없습니다.", "2c850e594aa60ad5": "허용되지 않는 제공자", "bada142dca0fa1d1": "{message} 다른 모델을 선택하세요.", + "051646934614705c": "공급자를 사용할 수 없음", + "ca6f7bf7c667115d": "다른 모델을 선택하세요.", "d2b4bc575d7d99d8": "이 프로젝트에서 꺼진 모델", "be1bc7fa9d199f70": "웹이나 데스크톱에서 다시 켜거나 다른 모델을 선택하세요.", "b994adb6050417c2": "{provider} 모델을 사용할 수 없음", diff --git a/apps/mobile/src/i18n/translations/pt-BR.json b/apps/mobile/src/i18n/translations/pt-BR.json index b40494fca3885..8c57b9e0655d9 100644 --- a/apps/mobile/src/i18n/translations/pt-BR.json +++ b/apps/mobile/src/i18n/translations/pt-BR.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Instale a CLI do Origin com {install} e execute {login}.", "eb0f60ef4f92ab7d": "Instale o {fj} 0.6 ou posterior em {fjUrl} e execute {fjLogin}, ou instale o {tea} 0.16 ou posterior em {teaUrl} e execute {teaLogin} para cada servidor Forgejo ou Gitea.", "d026a85e2e50e675": "Instale a CLI do GitCafe com {install} e execute {login}, salve um token nas Configurações ou defina {variable} no servidor.", + "121a63b1bdcfc04c": "{organization} escolhe quais agentes ACP são executados aqui, por isso os comandos locais e as substituições de executáveis estão desativados.", + "2362e53ee237a5d2": "A política de {organization} não permite o agente ACP {agentId}.", "79d776428f4d0650": "Não foi possível carregar o arquivo. Reconecte e tente novamente.", "3ea34cbb1ca5ba9b": "Pré-visualização cancelada.", "7c0af279ecb3da3a": "As pré-visualizações de arquivos por streaming não estão disponíveis neste runtime.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "A política de {organization} não permite o provedor {label}.", "2c850e594aa60ad5": "Provedor não permitido", "bada142dca0fa1d1": "{message} Escolha outro modelo.", + "051646934614705c": "Provedor indisponível", + "ca6f7bf7c667115d": "Escolha outro modelo.", "d2b4bc575d7d99d8": "Modelo desativado neste projeto", "be1bc7fa9d199f70": "Ative-o novamente pela web ou pelo desktop, ou escolha outro modelo.", "b994adb6050417c2": "Modelo do {provider} indisponível", diff --git a/apps/mobile/src/i18n/translations/ru.json b/apps/mobile/src/i18n/translations/ru.json index cadf07e57eda9..68534229b97fb 100644 --- a/apps/mobile/src/i18n/translations/ru.json +++ b/apps/mobile/src/i18n/translations/ru.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Установите Origin CLI командой {install}, затем выполните {login}.", "eb0f60ef4f92ab7d": "Установите {fj} 0.6 или новее с {fjUrl} и выполните {fjLogin} либо установите {tea} 0.16 или новее с {teaUrl} и выполните {teaLogin} для каждого сервера Forgejo или Gitea.", "d026a85e2e50e675": "Установите GitCafe CLI командой {install}, затем выполните {login}, сохраните токен в настройках или задайте {variable} на сервере.", + "121a63b1bdcfc04c": "{organization} выбирает, какие агенты ACP могут работать здесь, поэтому локальные команды и переопределения исполняемых файлов отключены.", + "2362e53ee237a5d2": "Политика {organization} не разрешает агент ACP {agentId}.", "79d776428f4d0650": "Не удалось загрузить файл. Переподключитесь и попробуйте ещё раз.", "3ea34cbb1ca5ba9b": "Предпросмотр отменён.", "7c0af279ecb3da3a": "Потоковый предпросмотр файлов недоступен в этой среде выполнения.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "Политика {organization} запрещает провайдер {label}.", "2c850e594aa60ad5": "Провайдер не разрешён", "bada142dca0fa1d1": "{message} Выберите другую модель.", + "051646934614705c": "Провайдер недоступен", + "ca6f7bf7c667115d": "Выберите другую модель.", "d2b4bc575d7d99d8": "Модель отключена для этого проекта", "be1bc7fa9d199f70": "Включите её снова в веб- или десктопной версии либо выберите другую модель.", "b994adb6050417c2": "Модель {provider} недоступна", diff --git a/apps/mobile/src/i18n/translations/sv.json b/apps/mobile/src/i18n/translations/sv.json index 3a0273aef36fd..2c8ebed0981c4 100644 --- a/apps/mobile/src/i18n/translations/sv.json +++ b/apps/mobile/src/i18n/translations/sv.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Installera Origin CLI med {install} och kör sedan {login}.", "eb0f60ef4f92ab7d": "Installera {fj} 0.6 eller senare från {fjUrl} och kör {fjLogin}, eller installera {tea} 0.16 eller senare från {teaUrl} och kör {teaLogin} för varje Forgejo- eller Gitea-server.", "d026a85e2e50e675": "Installera GitCafe CLI med {install} och kör sedan {login}, spara en token i Inställningar eller ange {variable} på servern.", + "121a63b1bdcfc04c": "{organization} väljer vilka ACP-agenter som körs här, så lokala kommandon och åsidosättningar av körbara filer är avstängda.", + "2362e53ee237a5d2": "Policyn för {organization} tillåter inte ACP-agenten {agentId}.", "79d776428f4d0650": "Filen kunde inte läsas in. Återanslut och försök igen.", "3ea34cbb1ca5ba9b": "Förhandsvisningen avbröts.", "7c0af279ecb3da3a": "Strömmande förhandsvisning av filer är inte tillgänglig i den här körmiljön.", @@ -1390,6 +1392,8 @@ "90548f7a4d620371": "Policyn för {organization} tillåter inte leverantören {label}.", "2c850e594aa60ad5": "Leverantören är inte tillåten", "bada142dca0fa1d1": "{message} Välj en annan modell.", + "051646934614705c": "Leverantören är inte tillgänglig", + "ca6f7bf7c667115d": "Välj en annan modell.", "d2b4bc575d7d99d8": "Modellen är avstängd för det här projektet", "be1bc7fa9d199f70": "Slå på den igen från webben eller skrivbordet, eller välj en annan modell.", "b994adb6050417c2": "Modellen för {provider} är inte tillgänglig", diff --git a/apps/mobile/src/i18n/translations/zh.json b/apps/mobile/src/i18n/translations/zh.json index f1c394c60c606..295a748b41cd9 100644 --- a/apps/mobile/src/i18n/translations/zh.json +++ b/apps/mobile/src/i18n/translations/zh.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "请使用 {install} 安装 Origin CLI,然后运行 {login}。", "eb0f60ef4f92ab7d": "请从 {fjUrl} 安装 {fj} 0.6 或更高版本并运行 {fjLogin},或从 {teaUrl} 安装 {tea} 0.16 或更高版本,并为每个 Forgejo 或 Gitea 服务器运行 {teaLogin}。", "d026a85e2e50e675": "请使用 {install} 安装 GitCafe CLI,然后运行 {login}、在设置中保存 token,或在服务器上设置 {variable}。", + "121a63b1bdcfc04c": "{organization} 决定此处运行哪些 ACP 代理,因此本地命令和可执行文件覆盖已关闭。", + "2362e53ee237a5d2": "{organization} 的策略不允许 ACP 代理 {agentId}。", "79d776428f4d0650": "无法加载文件。请重新连接后重试。", "3ea34cbb1ca5ba9b": "预览已取消。", "7c0af279ecb3da3a": "此运行时不支持流式文件预览。", @@ -1391,6 +1393,8 @@ "90548f7a4d620371": "{organization} 的策略不允许使用 {label} 提供方。", "2c850e594aa60ad5": "不允许使用此提供方", "bada142dca0fa1d1": "{message} 请选择其他模型。", + "051646934614705c": "提供商不可用", + "ca6f7bf7c667115d": "请选择其他模型。", "d2b4bc575d7d99d8": "此项目已关闭该模型", "be1bc7fa9d199f70": "请在网页端或桌面端重新开启,或选择其他模型。", "b994adb6050417c2": "{provider} 模型不可用", diff --git a/apps/mobile/src/lib/modelOptions.test.ts b/apps/mobile/src/lib/modelOptions.test.ts index 73ce33f99dbf1..b9083c7a8a8a6 100644 --- a/apps/mobile/src/lib/modelOptions.test.ts +++ b/apps/mobile/src/lib/modelOptions.test.ts @@ -875,6 +875,29 @@ describe("synchronized mobile model visibility", () => { title: "Provider not allowed", detail: "Example Corp's policy does not allow the Claude provider. Choose another model.", }); + const deniedAcp = { + instanceId: ProviderInstanceId.make("acpRegistry_work"), + model: "default", + }; + const reason = "Example Corp's policy does not allow the ACP agent cline."; + const acpConfig = { + providers: [ + { + ...config.providers[0], + instanceId: deniedAcp.instanceId, + driver: "acpRegistry", + availability: "unavailable", + unavailableReason: reason, + }, + ], + } as unknown as ServerConfig; + expect(isModelSelectionUnavailable(acpConfig, deniedAcp, null)).toBe(true); + expect(buildModelOptions(acpConfig, null, undefined, null)).toEqual([]); + expect(buildModelOptions(acpConfig, deniedAcp, undefined, null)[0]?.isUnavailable).toBe(true); + expect(describeUnavailableModelSelection(acpConfig, deniedAcp, null)).toEqual({ + title: "Provider unavailable", + detail: reason, + }); }); }); }); diff --git a/apps/mobile/src/lib/modelOptions.ts b/apps/mobile/src/lib/modelOptions.ts index b1cb2e5b6ce5d..b086087a40c14 100644 --- a/apps/mobile/src/lib/modelOptions.ts +++ b/apps/mobile/src/lib/modelOptions.ts @@ -202,6 +202,7 @@ export function isModelSelectionUnavailable( if (isDriverDisallowed(config, driver)) { return true; } + if (driver === "acpRegistry" && provider?.availability === "unavailable") return true; return ( driver === "antigravity" && (!provider || @@ -238,6 +239,12 @@ export function describeUnavailableModelSelection( ), }; } + if (driver === "acpRegistry" && provider?.availability === "unavailable") { + return { + title: m(msg("Provider unavailable")), + detail: provider.unavailableReason ?? m(msg("Choose another model.")), + }; + } return isDisabledForProject(config, provider, selection.instanceId, projectId) ? { title: m(msg("Model turned off for this project")), @@ -390,7 +397,8 @@ export function buildModelOptions( !isProviderEnabledForProject(config, provider, projectId) || !provider.installed || provider.auth.status === "unauthenticated" || - (provider.driver === "antigravity" && provider.availability === "unavailable") + ((provider.driver === "antigravity" || provider.driver === "acpRegistry") && + provider.availability === "unavailable") ) { continue; } diff --git a/apps/server/src/policy/ManagedPolicy.test.ts b/apps/server/src/policy/ManagedPolicy.test.ts index a91cdec613095..cb588dba2431a 100644 --- a/apps/server/src/policy/ManagedPolicy.test.ts +++ b/apps/server/src/policy/ManagedPolicy.test.ts @@ -6,6 +6,7 @@ import * as Path from "effect/Path"; import { DEFAULT_SERVER_SETTINGS, + managedAcpAgentDenial, ProviderDriverKind, ProviderInstanceId, } from "@t3tools/contracts"; @@ -409,6 +410,41 @@ it.layer(NodeServices.layer)("ManagedPolicy.load", (it) => { }), ); + it.effect("takes the launch command from users when it limits ACP agents", () => + Effect.gen(function* () { + const policy = yield* loadFrom( + JSON.stringify({ + schemaVersion: 1, + organization: "Example Corp", + limits: { providers: { allowedAcpAgents: ["devin"] } }, + }), + ); + const acpRegistry = ProviderDriverKind.make("acpRegistry"); + assert.deepEqual(policy.summary?.limits?.providers, { + allowedAcpAgents: ["devin"], + lockedInstanceFields: { acpRegistry: ["config.commandPath", "config.commandArgs"] }, + }); + assert.isUndefined(managedAcpAgentDenial(policy.summary, "devin")); + assert.strictEqual( + managedAcpAgentDenial(policy.summary, "other"), + "Example Corp's policy does not allow the ACP agent other.", + ); + assert.isUndefined(managedAcpAgentDenial(undefined, "other")); + + const instanceId = ProviderInstanceId.make("acp_local"); + const shown = policy.providers.applyLimits({ + ...DEFAULT_SERVER_SETTINGS, + providerInstances: { + [instanceId]: { + driver: acpRegistry, + config: { source: "local", commandPath: "/bin/sh", commandArgs: ["-c", "x"] }, + }, + }, + }); + assert.deepEqual(shown.providerInstances[instanceId]?.config, { source: "local" }); + }), + ); + it.effect("refuses provider limits it cannot enforce", () => Effect.gen(function* () { const withProviders = (providers: unknown) => diff --git a/apps/server/src/policy/ManagedPolicy.ts b/apps/server/src/policy/ManagedPolicy.ts index 01651051893c0..cf3830ae2b325 100644 --- a/apps/server/src/policy/ManagedPolicy.ts +++ b/apps/server/src/policy/ManagedPolicy.ts @@ -146,13 +146,18 @@ function summarizeLimits( ...(webhookTasks === undefined ? {} : { webhookTasks }), ...(telemetry === undefined ? {} : { telemetry }), ...(browserCookieImport === undefined ? {} : { browserCookieImport }), - ...(providers?.allowedDrivers === undefined && Object.keys(lockedInstanceFields).length === 0 + ...(providers?.allowedDrivers === undefined && + providers?.allowedAcpAgents === undefined && + Object.keys(lockedInstanceFields).length === 0 ? {} : { providers: { ...(providers?.allowedDrivers === undefined ? {} : { allowedDrivers: providers.allowedDrivers }), + ...(providers?.allowedAcpAgents === undefined + ? {} + : { allowedAcpAgents: providers.allowedAcpAgents }), ...(Object.keys(lockedInstanceFields).length === 0 ? {} : { lockedInstanceFields }), }, }), diff --git a/apps/server/src/policy/managedProviders.ts b/apps/server/src/policy/managedProviders.ts index 1996aa2e11646..9a6236a86be99 100644 --- a/apps/server/src/policy/managedProviders.ts +++ b/apps/server/src/policy/managedProviders.ts @@ -370,6 +370,18 @@ export function makeManagedProviders( } } + // A launch command runs instead of the registry agent, so an allow list owns it. + if (limits.allowedAcpAgents !== undefined) { + const driver = ProviderDriverKind.make("acpRegistry"); + const rule = rules.get(driver); + rules.set(driver, { + pin: rule?.pin, + config: [...new Set([...(rule?.config ?? []), "commandPath", "commandArgs"])], + fill: rule?.fill ?? [], + environment: rule?.environment ?? "fill", + }); + } + const allowed = limits.allowedDrivers === undefined ? undefined : new Set(limits.allowedDrivers); const isDriverAllowed = (driver: ProviderDriverKind) => allowed?.has(driver) ?? true; diff --git a/apps/server/src/policy/policyTemplates.ts b/apps/server/src/policy/policyTemplates.ts index 55c15fb94f56c..9c9a883cb1971 100644 --- a/apps/server/src/policy/policyTemplates.ts +++ b/apps/server/src/policy/policyTemplates.ts @@ -175,6 +175,14 @@ const policies = (): ReadonlyArray => [ { kind: "text", name: "ProviderInstances", label: "Provider settings JSON", json: true }, ], }, + { + id: "AllowedAcpAgents", + title: "Allowed ACP agents (JSON)", + help: 'ACP Registry agents that may run, as a JSON list of IDs such as ["devin"]. Users cannot set their own launch command for an ACP agent.', + elements: [ + { kind: "text", name: "AllowedAcpAgents", label: "Allowed ACP agents JSON", json: true }, + ], + }, ]; const escapeXml = (text: string) => diff --git a/apps/server/src/provider/ProviderHostLive.ts b/apps/server/src/provider/ProviderHostLive.ts index fed07efc035ee..6de5024035d73 100644 --- a/apps/server/src/provider/ProviderHostLive.ts +++ b/apps/server/src/provider/ProviderHostLive.ts @@ -29,6 +29,7 @@ export const layer = Layer.effect( ServerLifecycleEvents.ServerLifecycleEvents, ); return ProviderHost.ProviderHost.of({ + managedPolicy: serverSettings.managedPolicy, paths: { cwd: config.cwd, baseDir: config.baseDir, diff --git a/apps/web/src/components/settings/AcpRegistrySearchStep.tsx b/apps/web/src/components/settings/AcpRegistrySearchStep.tsx index b65a0ebffd0b9..6fbe761b2b5c4 100644 --- a/apps/web/src/components/settings/AcpRegistrySearchStep.tsx +++ b/apps/web/src/components/settings/AcpRegistrySearchStep.tsx @@ -3,6 +3,7 @@ import { ACP_REGISTRY_MAX_AGENTS, ACP_REGISTRY_SEARCH_QUERY_MAX_LENGTH, AuthProvidersManageScope, + managedAcpAgentsNotice, } from "@t3tools/contracts"; import { readEnvironmentScope, useEnvironmentScope } from "../../state/session"; import { @@ -23,6 +24,7 @@ import { useDeadlinePassed } from "../../hooks/useDeadline"; import { m } from "../../i18n/messages"; import { serverEnvironment } from "../../state/server"; import { useEnvironmentQuery } from "../../state/query"; +import { useManagedPolicy } from "../../state/managedPolicy"; import { useAtomCommand } from "../../state/use-atom-command"; import { Alert, AlertDescription } from "../ui/alert"; import { Button } from "../ui/button"; @@ -137,7 +139,7 @@ interface AcpRegistrySearchStepProps { readonly providerInstances: Readonly>; readonly onPrepared: (agent: AcpRegistrySearchAgent) => void; readonly onManualConfiguration: () => void; - readonly onLocalConfiguration?: () => void; + readonly onLocalConfiguration?: (() => void) | undefined; } export function AcpRegistrySearchStep({ @@ -150,6 +152,7 @@ export function AcpRegistrySearchStep({ }: AcpRegistrySearchStepProps) { const gt = useGT(); const canManageProviders = useEnvironmentScope(environmentId, AuthProvidersManageScope); + const agentsLimited = managedAcpAgentsNotice(useManagedPolicy(environmentId)) !== undefined; const { query, search, preparingId, prepareError } = registry; const handleSearch = (event: FormEvent) => { @@ -243,7 +246,11 @@ export function AcpRegistrySearchStep({ No compatible agents found

- Try a broader search. + {agentsLimited ? ( + Only agents your organization allows appear here. + ) : ( + Try a broader search. + )}

) : ( diff --git a/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx b/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx index 568c6a953ffc7..1251da39af887 100644 --- a/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx +++ b/apps/web/src/components/settings/AddProviderInstanceDialog.environment.browser.test.tsx @@ -1,4 +1,9 @@ -import { EnvironmentId, ProviderDriverKind, type AcpRegistrySearchAgent } from "@t3tools/contracts"; +import { + EnvironmentId, + ProviderDriverKind, + type AcpRegistrySearchAgent, + type ManagedPolicySummary, +} from "@t3tools/contracts"; import { userEvent } from "vite-plus/test/browser"; import { describe, expect, it, vi } from "vite-plus/test"; @@ -9,6 +14,9 @@ const actions = vi.hoisted(() => ({ onOpenChange: vi.fn(), canManageProviders: true, })); +const managed = vi.hoisted(() => ({ + policy: undefined as ManagedPolicySummary | undefined, +})); const settingsHooks = vi.hoisted(() => ({ read: vi.fn(() => ({ providerInstances: {} })), mutate: vi.fn(), @@ -46,6 +54,10 @@ vi.mock(import("../../state/session"), async (original) => { readEnvironmentScope: hasScope as never, }; }); +vi.mock(import("../../state/managedPolicy"), async (original) => ({ + ...(await original()), + useManagedPolicy: () => managed.policy, +})); vi.mock(import("../ui/toast"), async (original) => { const actual = await original(); return { ...actual, toastManager: { ...actual.toastManager, add: actions.toast } }; @@ -140,6 +152,7 @@ async function prepareCodexInstance() { } function setup() { + managed.policy = undefined; actions.canManageProviders = true; actions.toast.mockReset(); actions.onOpenChange.mockReset(); @@ -291,6 +304,23 @@ describe("AddProviderInstanceDialog environment routing", () => { expect(signInStep()).toBeNull(); }); + it("refuses a manually entered agent the policy leaves out", async () => { + setup(); + managed.policy = { + organization: "Example Corp", + lockedSettings: [], + limits: { providers: { allowedAcpAgents: ["devin"] } }, + }; + await using _screen = await render(dialog()); + await click("Show more"); + await click("Enter registry agent"); + await type("#add-provider-acpRegistry-manual-agentId", "cline"); + await click("Next"); + expect(document.body.textContent).toContain( + "Example Corp's policy does not allow the ACP agent cline.", + ); + }); + it("rejects a queued save after the provider grant is revoked", async () => { setup(); await using screen = await prepareCodexInstance(); diff --git a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx index cd2edf604458a..e714017c93d1e 100644 --- a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx +++ b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx @@ -1,3 +1,7 @@ +import { + managedAcpAgentsNotice, + managedAcpAgentDenial, +} from "@t3tools/client-runtime/contract-labels"; import { thrownErrorMessage } from "@t3tools/client-runtime/errors"; import { m as resolveMessage } from "~/i18n/messages"; import { ProviderInstanceIcon } from "../chat/ProviderInstanceIcon"; @@ -32,6 +36,7 @@ import { import { cn } from "../../lib/utils"; import { normalizeProviderAccentColor } from "../../providerInstances"; import { managedInstanceLocks, useManagedPolicy } from "../../state/managedPolicy"; +import { ManagedNotice } from "../ManagedPolicy"; import { readEnvironmentScope, useEnvironmentScope } from "../../state/session"; import { Button } from "../ui/button"; import { ChatGptConnectionButton } from "./ChatGptConnectionButton"; @@ -251,9 +256,11 @@ export function AddProviderInstanceDialog({ ? localCommandPath.length > 0 ? null : gt("Executable is required.") - : selectedAcp !== null || (isManualAcpConfiguration && manualAgentId.length > 0) + : selectedAcp !== null ? null - : gt("Select an ACP or configure one manually."); + : isManualAcpConfiguration && manualAgentId.length > 0 + ? (managedAcpAgentDenial(managedPolicy, manualAgentId, m) ?? null) + : gt("Select an ACP or configure one manually."); const wizardStepSummaries = isAcpRegistry ? ([ isLocalAcp ? gt("Local ACP command") : (selectedAcp?.name ?? (manualAgentId || null)), @@ -381,6 +388,8 @@ export function AddProviderInstanceDialog({ // A policy that owns this driver's launch settings also rules out ChatGPT's own runtime. const driverLocks = managedInstanceLocks(managedPolicy, driver, m); + const acpLocks = managedInstanceLocks(managedPolicy, ACP_REGISTRY_DRIVER_KIND, m); + const acpAgentsNotice = managedAcpAgentsNotice(managedPolicy, m); const handleSave = async () => { if (!readEnvironmentScope(environmentId, AuthProvidersManageScope)) return; @@ -538,6 +547,9 @@ export function AddProviderInstanceDialog({
)} + {acpRegistryAllowed && acpAgentsNotice ? ( + {acpAgentsNotice} + ) : null} {!acpRegistryAllowed ? null : isAcpRegistry && isManualAcpConfiguration ? (
@@ -573,6 +585,9 @@ export function AddProviderInstanceDialog({ idPrefix="add-provider-acpRegistry-manual" variant="settings" onChange={setConfigDraft} + managed={ + acpLocks && { keys: acpLocks.configKeys, reason: acpLocks.reason } + } environmentId={environmentId} /> {isLocalAcp ? ( @@ -596,7 +611,9 @@ export function AddProviderInstanceDialog({ providerInstances={settings.providerInstances} onPrepared={handleAcpPrepared} onManualConfiguration={handleManualAcpConfiguration} - onLocalConfiguration={handleLocalAcpConfiguration} + onLocalConfiguration={ + acpAgentsNotice ? undefined : handleLocalAcpConfiguration + } /> {isAcpRegistry && hasAttemptedSubmit && acpSelectionError ? (

{acpSelectionError}

diff --git a/apps/web/src/components/settings/ProviderInstanceCard.tsx b/apps/web/src/components/settings/ProviderInstanceCard.tsx index cd5455cc19556..f0b581e492ccc 100644 --- a/apps/web/src/components/settings/ProviderInstanceCard.tsx +++ b/apps/web/src/components/settings/ProviderInstanceCard.tsx @@ -1,3 +1,4 @@ +import { managedAcpAgentsNotice } from "@t3tools/client-runtime/contract-labels"; import { Spinner } from "~/components/ui/spinner"; import { @@ -860,6 +861,8 @@ export function ProviderInstanceCard({ const accentColor = normalizeProviderAccentColor(instance.accentColor); const managedPolicy = useManagedPolicy(environmentId); const instanceLocks = managedInstanceLocks(managedPolicy, instance.driver, m); + const acpAgentsNotice = + instance.driver === "acpRegistry" ? managedAcpAgentsNotice(managedPolicy, m) : undefined; const managedDriverReason = isManagedDriverAllowed(managedPolicy, instance.driver) ? undefined : disallowedProviderMessage( @@ -1446,6 +1449,11 @@ export function ProviderInstanceCard({ aria-disabled={readOnly || undefined} className={readOnly ? "opacity-50 select-none" : undefined} > + {acpAgentsNotice ? ( +
+ {acpAgentsNotice} +
+ ) : null} {runtimeFields} ) : null} diff --git a/apps/web/src/components/settings/providerStatus.test.ts b/apps/web/src/components/settings/providerStatus.test.ts index bc4b9674b674f..6bf078a7d4cc0 100644 --- a/apps/web/src/components/settings/providerStatus.test.ts +++ b/apps/web/src/components/settings/providerStatus.test.ts @@ -98,6 +98,12 @@ describe("Antigravity with unchecked sign-in", () => { headline: "Not found", status: "warning", }, + { + name: "refused by policy", + change: { installed: false, status: "error", availability: "unavailable" }, + headline: "Unavailable", + status: "error", + }, { name: "API key authentication", change: { auth: { status: "unknown", type: "gemini-api-key" } }, diff --git a/apps/web/src/components/settings/providerStatus.ts b/apps/web/src/components/settings/providerStatus.ts index 36a31b0fccb04..b94a677139b37 100644 --- a/apps/web/src/components/settings/providerStatus.ts +++ b/apps/web/src/components/settings/providerStatus.ts @@ -76,6 +76,12 @@ export function getProviderSummary( resolve(msg("This provider is installed but disabled for new sessions in T3 Code.")), }; } + if (provider.availability === "unavailable") { + return { + headline: resolve(msg("Unavailable", { $context: "provider status" })), + detail: provider.unavailableReason ?? provider.message ?? null, + }; + } if (!provider.installed) { return { headline: resolve(msg("Not found", { $context: "provider status, CLI is missing" })), diff --git a/apps/web/src/i18n/translations/de.json b/apps/web/src/i18n/translations/de.json index 4c9f0f6d27e4f..24ebbdf6b9c50 100644 --- a/apps/web/src/i18n/translations/de.json +++ b/apps/web/src/i18n/translations/de.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Installiere die Origin CLI mit {install} und führe dann {login} aus.", "eb0f60ef4f92ab7d": "Installiere {fj} 0.6 oder neuer von {fjUrl} und führe {fjLogin} aus, oder installiere {tea} 0.16 oder neuer von {teaUrl} und führe {teaLogin} für jeden Forgejo- oder Gitea-Server aus.", "d026a85e2e50e675": "Installiere die GitCafe CLI mit {install} und führe dann {login} aus, speichere ein Token in den Einstellungen oder setze {variable} auf dem Server.", + "121a63b1bdcfc04c": "{organization} legt fest, welche ACP-Agenten hier ausgeführt werden. Lokale Befehle und ausführbare Überschreibungen sind daher deaktiviert.", + "2362e53ee237a5d2": "Die Richtlinie von {organization} erlaubt den ACP-Agenten {agentId} nicht.", "79d776428f4d0650": "Die Datei konnte nicht geladen werden. Verbinde dich erneut und versuch es noch einmal.", "3ea34cbb1ca5ba9b": "Vorschau abgebrochen.", "7c0af279ecb3da3a": "Streamende Dateivorschauen sind in dieser Laufzeitumgebung nicht verfügbar.", @@ -7117,6 +7119,7 @@ "75eb4fd9db07ee00": "Lokaler ACP-Befehl", "0dc3b4628cc4ee7e": "Die Registry wird durchsucht...", "8069bbfda001437c": "Keine kompatiblen Agenten gefunden", + "69c301cb19f51357": "Hier erscheinen nur Agenten, die deine Organisation erlaubt.", "5c143e386f171670": "Versuche eine breitere Suche.", "9852e524f053c372": [ "Über ", @@ -11283,13 +11286,13 @@ "49c009661b1e91d6": "Anbieterstatus wird geprüft", "9c52dc73cc75980f": "Warte darauf, dass der Server Installations- und Authentifizierungsdetails meldet.", "7b4990ffdca7c727": "Dieser Anbieter ist installiert, aber in T3 Code für neue Sitzungen deaktiviert.", + "ddfe1e8ed243b44c": "Nicht verfügbar", "a887d07963e1f028": "Nicht gefunden", "d49898dcd40e6332": "CLI nicht im PATH gefunden.", "b2768aa900b19198": "Nicht authentifiziert · {method}", "24a4bbee246a576f": "Installiert · Anmeldung nicht geprüft", "0e56ea6a22e303ca": "Erfordert Aufmerksamkeit", "9469080828cdc899": "Der Anbieter ist installiert, aber der Server konnte ihn nicht vollständig verifizieren.", - "ddfe1e8ed243b44c": "Nicht verfügbar", "c7b59de5cc633b03": "Der Anbieter hat seine Startprüfungen nicht bestanden.", "170d8586394fb04b": "Authentifiziert · {method}", "de74cbba53de71b1": "Verfügbar", diff --git a/apps/web/src/i18n/translations/en.json b/apps/web/src/i18n/translations/en.json index c40470b46e6ae..b40387707598c 100644 --- a/apps/web/src/i18n/translations/en.json +++ b/apps/web/src/i18n/translations/en.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Install the Origin CLI with {install}, then run {login}.", "eb0f60ef4f92ab7d": "Install {fj} 0.6 or later from {fjUrl} and run {fjLogin}, or install {tea} 0.16 or later from {teaUrl} and run {teaLogin} for each Forgejo or Gitea server.", "d026a85e2e50e675": "Install the GitCafe CLI with {install}, then run {login}, save a token in Settings, or set {variable} on the server.", + "121a63b1bdcfc04c": "{organization} chooses which ACP agents run here, so local commands and executable overrides are turned off.", + "2362e53ee237a5d2": "{organization}'s policy does not allow the ACP agent {agentId}.", "79d776428f4d0650": "The file could not be loaded. Reconnect and try again.", "3ea34cbb1ca5ba9b": "Preview cancelled.", "7c0af279ecb3da3a": "Streaming file previews are unavailable in this runtime.", @@ -7125,6 +7127,7 @@ "75eb4fd9db07ee00": "Local ACP command", "0dc3b4628cc4ee7e": "Searching the registry...", "8069bbfda001437c": "No compatible agents found", + "69c301cb19f51357": "Only agents your organization allows appear here.", "5c143e386f171670": "Try a broader search.", "9852e524f053c372": [ "About ", @@ -11291,13 +11294,13 @@ "49c009661b1e91d6": "Checking provider status", "9c52dc73cc75980f": "Waiting for the server to report installation and authentication details.", "7b4990ffdca7c727": "This provider is installed but disabled for new sessions in T3 Code.", + "ddfe1e8ed243b44c": "Unavailable", "a887d07963e1f028": "Not found", "d49898dcd40e6332": "CLI not detected on PATH.", "b2768aa900b19198": "Not authenticated · {method}", "24a4bbee246a576f": "Installed · Sign-in not checked", "0e56ea6a22e303ca": "Needs attention", "9469080828cdc899": "The provider is installed, but the server could not fully verify it.", - "ddfe1e8ed243b44c": "Unavailable", "c7b59de5cc633b03": "The provider failed its startup checks.", "170d8586394fb04b": "Authenticated · {method}", "de74cbba53de71b1": "Available", diff --git a/apps/web/src/i18n/translations/es.json b/apps/web/src/i18n/translations/es.json index 68f63f589f51e..9069d7d3b8f28 100644 --- a/apps/web/src/i18n/translations/es.json +++ b/apps/web/src/i18n/translations/es.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Instala la CLI de Origin con {install} y ejecuta {login}.", "eb0f60ef4f92ab7d": "Instala {fj} 0.6 o posterior desde {fjUrl} y ejecuta {fjLogin}, o instala {tea} 0.16 o posterior desde {teaUrl} y ejecuta {teaLogin} para cada servidor de Forgejo o Gitea.", "d026a85e2e50e675": "Instala la CLI de GitCafe con {install} y ejecuta {login}, guarda un token en Ajustes o define {variable} en el servidor.", + "121a63b1bdcfc04c": "{organization} elige qué agentes ACP se ejecutan aquí, por lo que los comandos locales y las sustituciones del ejecutable están desactivados.", + "2362e53ee237a5d2": "La política de {organization} no permite el agente ACP {agentId}.", "79d776428f4d0650": "No se pudo cargar el archivo. Vuelve a conectarte e inténtalo de nuevo.", "3ea34cbb1ca5ba9b": "Vista previa cancelada.", "7c0af279ecb3da3a": "Las vistas previas de archivos en streaming no están disponibles en este entorno de ejecución.", @@ -7118,6 +7120,7 @@ "75eb4fd9db07ee00": "Comando ACP local", "0dc3b4628cc4ee7e": "Buscando en el registro...", "8069bbfda001437c": "No se encontraron agentes compatibles", + "69c301cb19f51357": "Aquí solo aparecen los agentes que permite tu organización.", "5c143e386f171670": "Prueba una búsqueda más amplia.", "9852e524f053c372": [ "Acerca de ", @@ -11276,13 +11279,13 @@ "49c009661b1e91d6": "Comprobando el estado del proveedor", "9c52dc73cc75980f": "Esperando a que el servidor informe de los detalles de instalación y autenticación.", "7b4990ffdca7c727": "Este proveedor está instalado, pero desactivado para las nuevas sesiones de T3 Code.", + "ddfe1e8ed243b44c": "No disponible", "a887d07963e1f028": "No encontrado", "d49898dcd40e6332": "No se detectó la CLI en el PATH.", "b2768aa900b19198": "No autenticado · {method}", "24a4bbee246a576f": "Instalado · Inicio de sesión sin comprobar", "0e56ea6a22e303ca": "Requiere atención", "9469080828cdc899": "El proveedor está instalado, pero el servidor no pudo verificarlo por completo.", - "ddfe1e8ed243b44c": "No disponible", "c7b59de5cc633b03": "El proveedor no superó sus comprobaciones de inicio.", "170d8586394fb04b": "Autenticado · {method}", "de74cbba53de71b1": "Disponible", diff --git a/apps/web/src/i18n/translations/fr.json b/apps/web/src/i18n/translations/fr.json index 442c22ed3a2d7..4fd904c6a2fdc 100644 --- a/apps/web/src/i18n/translations/fr.json +++ b/apps/web/src/i18n/translations/fr.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Installez la CLI Origin avec {install}, puis exécutez {login}.", "eb0f60ef4f92ab7d": "Installez {fj} 0.6 ou version ultérieure depuis {fjUrl} et exécutez {fjLogin}, ou installez {tea} 0.16 ou version ultérieure depuis {teaUrl} et exécutez {teaLogin} pour chaque serveur Forgejo ou Gitea.", "d026a85e2e50e675": "Installez la CLI GitCafe avec {install}, puis exécutez {login}, enregistrez un jeton dans Paramètres ou définissez {variable} sur le serveur.", + "121a63b1bdcfc04c": "{organization} choisit les agents ACP exécutés ici. Les commandes locales et les remplacements d’exécutable sont donc désactivés.", + "2362e53ee237a5d2": "La politique de {organization} n’autorise pas l’agent ACP {agentId}.", "79d776428f4d0650": "Le fichier n’a pas pu être chargé. Reconnectez-vous et réessayez.", "3ea34cbb1ca5ba9b": "Aperçu annulé.", "7c0af279ecb3da3a": "Les aperçus de fichiers en streaming ne sont pas disponibles dans cet environnement d’exécution.", @@ -7119,6 +7121,7 @@ "75eb4fd9db07ee00": "Commande ACP locale", "0dc3b4628cc4ee7e": "Recherche dans le registre...", "8069bbfda001437c": "Aucun agent compatible trouvé", + "69c301cb19f51357": "Seuls les agents autorisés par votre organisation apparaissent ici.", "5c143e386f171670": "Essayez une recherche plus large.", "9852e524f053c372": [ "À propos de ", @@ -11281,13 +11284,13 @@ "49c009661b1e91d6": "Vérification du statut du fournisseur", "9c52dc73cc75980f": "En attente des détails d’installation et d’authentification du serveur.", "7b4990ffdca7c727": "Ce fournisseur est installé mais désactivé pour les nouvelles sessions dans T3 Code.", + "ddfe1e8ed243b44c": "Indisponible", "a887d07963e1f028": "Introuvable", "d49898dcd40e6332": "CLI non détectée dans le PATH.", "b2768aa900b19198": "Non authentifié · {method}", "24a4bbee246a576f": "Installé · Connexion non vérifiée", "0e56ea6a22e303ca": "Requiert votre attention", "9469080828cdc899": "Le fournisseur est installé, mais le serveur n’a pas pu le vérifier entièrement.", - "ddfe1e8ed243b44c": "Indisponible", "c7b59de5cc633b03": "Le fournisseur a échoué à ses vérifications de démarrage.", "170d8586394fb04b": "Authentifié · {method}", "de74cbba53de71b1": "Disponible", diff --git a/apps/web/src/i18n/translations/ja.json b/apps/web/src/i18n/translations/ja.json index c9417551b208c..4c0a193e23f93 100644 --- a/apps/web/src/i18n/translations/ja.json +++ b/apps/web/src/i18n/translations/ja.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "{install} で Origin CLI をインストールしてから、{login} を実行してください。", "eb0f60ef4f92ab7d": "Forgejo または Gitea のサーバーごとに、{fjUrl} から {fj} 0.6 以降をインストールして {fjLogin} を実行するか、{teaUrl} から {tea} 0.16 以降をインストールして {teaLogin} を実行してください。", "d026a85e2e50e675": "{install} で GitCafe CLI をインストールしてから、{login} を実行するか、設定にトークンを保存するか、サーバーで {variable} を設定してください。", + "121a63b1bdcfc04c": "{organization} がここで実行する ACP エージェントを指定するため、ローカルコマンドと実行ファイルの上書きは無効です。", + "2362e53ee237a5d2": "{organization} のポリシーでは ACP エージェント {agentId} は許可されていません。", "79d776428f4d0650": "ファイルを読み込めませんでした。再接続してもう一度お試しください。", "3ea34cbb1ca5ba9b": "プレビューをキャンセルしました。", "7c0af279ecb3da3a": "このランタイムではファイルのストリーミングプレビューを利用できません。", @@ -7085,6 +7087,7 @@ "75eb4fd9db07ee00": "ローカルの ACP コマンド", "0dc3b4628cc4ee7e": "レジストリを検索しています...", "8069bbfda001437c": "互換性のあるエージェントが見つかりません", + "69c301cb19f51357": "組織が許可したエージェントのみが表示されます。", "5c143e386f171670": "検索条件を広げてください。", "9852e524f053c372": [ { @@ -11231,13 +11234,13 @@ "49c009661b1e91d6": "プロバイダーのステータスを確認しています", "9c52dc73cc75980f": "サーバーからインストールと認証の詳細が報告されるのを待っています。", "7b4990ffdca7c727": "このプロバイダーはインストールされていますが、T3 Code の新しいセッションでは無効になっています。", + "ddfe1e8ed243b44c": "利用不可", "a887d07963e1f028": "見つかりません", "d49898dcd40e6332": "PATH に CLI が見つかりません。", "b2768aa900b19198": "未認証 · {method}", "24a4bbee246a576f": "インストール済み · サインインは未確認", "0e56ea6a22e303ca": "対応が必要", "9469080828cdc899": "プロバイダーはインストールされていますが、サーバーで完全に検証できませんでした。", - "ddfe1e8ed243b44c": "利用不可", "c7b59de5cc633b03": "プロバイダーは起動時のチェックに失敗しました。", "170d8586394fb04b": "認証済み · {method}", "de74cbba53de71b1": "利用可能", diff --git a/apps/web/src/i18n/translations/ko.json b/apps/web/src/i18n/translations/ko.json index 362d29d071a87..e1381cb00196d 100644 --- a/apps/web/src/i18n/translations/ko.json +++ b/apps/web/src/i18n/translations/ko.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "{install}로 Origin CLI를 설치한 후 {login}을(를) 실행하세요.", "eb0f60ef4f92ab7d": "{fjUrl}에서 {fj} 0.6 이상을 설치하고 {fjLogin}을(를) 실행하거나, {teaUrl}에서 {tea} 0.16 이상을 설치하고 Forgejo 또는 Gitea 서버마다 {teaLogin}을(를) 실행하세요.", "d026a85e2e50e675": "{install}로 GitCafe CLI를 설치한 후 {login}을(를) 실행하거나, 설정에 토큰을 저장하거나, 서버에서 {variable}을(를) 설정하세요.", + "121a63b1bdcfc04c": "{organization}에서 여기서 실행할 ACP 에이전트를 지정하므로 로컬 명령과 실행 파일 재정의가 꺼져 있습니다.", + "2362e53ee237a5d2": "{organization}의 정책은 ACP 에이전트 {agentId}을(를) 허용하지 않습니다.", "79d776428f4d0650": "파일을 불러올 수 없습니다. 다시 연결한 뒤 시도하세요.", "3ea34cbb1ca5ba9b": "미리 보기가 취소되었습니다.", "7c0af279ecb3da3a": "이 런타임에서는 스트리밍 파일 미리 보기를 사용할 수 없습니다.", @@ -7088,6 +7090,7 @@ "75eb4fd9db07ee00": "로컬 ACP 명령", "0dc3b4628cc4ee7e": "레지스트리를 검색하는 중...", "8069bbfda001437c": "호환되는 에이전트를 찾을 수 없음", + "69c301cb19f51357": "조직에서 허용한 에이전트만 여기에 표시됩니다.", "5c143e386f171670": "더 넓은 범위로 검색해 보세요.", "9852e524f053c372": [ { @@ -11228,13 +11231,13 @@ "49c009661b1e91d6": "제공자 상태 확인 중", "9c52dc73cc75980f": "서버가 설치 및 인증 정보를 보고하기를 기다리는 중입니다.", "7b4990ffdca7c727": "이 제공자는 설치되어 있지만 T3 Code의 새 세션에서는 사용 안 함으로 설정되어 있습니다.", + "ddfe1e8ed243b44c": "사용할 수 없음", "a887d07963e1f028": "찾을 수 없음", "d49898dcd40e6332": "PATH에서 CLI를 찾을 수 없습니다.", "b2768aa900b19198": "인증되지 않음 · {method}", "24a4bbee246a576f": "설치됨 · 로그인 확인 안 됨", "0e56ea6a22e303ca": "확인 필요", "9469080828cdc899": "제공자가 설치되어 있지만 서버에서 완전히 확인하지 못했습니다.", - "ddfe1e8ed243b44c": "사용할 수 없음", "c7b59de5cc633b03": "제공자가 시작 검사에 실패했습니다.", "170d8586394fb04b": "인증됨 · {method}", "de74cbba53de71b1": "사용 가능", diff --git a/apps/web/src/i18n/translations/pt-BR.json b/apps/web/src/i18n/translations/pt-BR.json index b598943e92383..1fbc32325bad2 100644 --- a/apps/web/src/i18n/translations/pt-BR.json +++ b/apps/web/src/i18n/translations/pt-BR.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Instale a CLI do Origin com {install} e execute {login}.", "eb0f60ef4f92ab7d": "Instale o {fj} 0.6 ou posterior em {fjUrl} e execute {fjLogin}, ou instale o {tea} 0.16 ou posterior em {teaUrl} e execute {teaLogin} para cada servidor Forgejo ou Gitea.", "d026a85e2e50e675": "Instale a CLI do GitCafe com {install} e execute {login}, salve um token nas Configurações ou defina {variable} no servidor.", + "121a63b1bdcfc04c": "{organization} escolhe quais agentes ACP são executados aqui, por isso os comandos locais e as substituições de executáveis estão desativados.", + "2362e53ee237a5d2": "A política de {organization} não permite o agente ACP {agentId}.", "79d776428f4d0650": "Não foi possível carregar o arquivo. Reconecte e tente novamente.", "3ea34cbb1ca5ba9b": "Pré-visualização cancelada.", "7c0af279ecb3da3a": "As pré-visualizações de arquivos por streaming não estão disponíveis neste runtime.", @@ -7118,6 +7120,7 @@ "75eb4fd9db07ee00": "Comando ACP local", "0dc3b4628cc4ee7e": "Pesquisando no registro...", "8069bbfda001437c": "Nenhum agente compatível encontrado", + "69c301cb19f51357": "Apenas os agentes permitidos pela sua organização aparecem aqui.", "5c143e386f171670": "Tente uma pesquisa mais ampla.", "9852e524f053c372": [ "Sobre ", @@ -11280,13 +11283,13 @@ "49c009661b1e91d6": "Verificando o status do provedor", "9c52dc73cc75980f": "Aguardando o servidor informar os detalhes de instalação e autenticação.", "7b4990ffdca7c727": "Este provedor está instalado, mas desativado para novas sessões no T3 Code.", + "ddfe1e8ed243b44c": "Indisponível", "a887d07963e1f028": "Não encontrado", "d49898dcd40e6332": "CLI não detectado no PATH.", "b2768aa900b19198": "Não autenticado · {method}", "24a4bbee246a576f": "Instalado · Login não verificado", "0e56ea6a22e303ca": "Precisa de atenção", "9469080828cdc899": "O provedor está instalado, mas o servidor não conseguiu verificá-lo completamente.", - "ddfe1e8ed243b44c": "Indisponível", "c7b59de5cc633b03": "O provedor falhou nas verificações de inicialização.", "170d8586394fb04b": "Autenticado · {method}", "de74cbba53de71b1": "Disponível", diff --git a/apps/web/src/i18n/translations/ru.json b/apps/web/src/i18n/translations/ru.json index a8a54a6500e59..6489185fe4c51 100644 --- a/apps/web/src/i18n/translations/ru.json +++ b/apps/web/src/i18n/translations/ru.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Установите Origin CLI командой {install}, затем выполните {login}.", "eb0f60ef4f92ab7d": "Установите {fj} 0.6 или новее с {fjUrl} и выполните {fjLogin} либо установите {tea} 0.16 или новее с {teaUrl} и выполните {teaLogin} для каждого сервера Forgejo или Gitea.", "d026a85e2e50e675": "Установите GitCafe CLI командой {install}, затем выполните {login}, сохраните токен в настройках или задайте {variable} на сервере.", + "121a63b1bdcfc04c": "{organization} выбирает, какие агенты ACP могут работать здесь, поэтому локальные команды и переопределения исполняемых файлов отключены.", + "2362e53ee237a5d2": "Политика {organization} не разрешает агент ACP {agentId}.", "79d776428f4d0650": "Не удалось загрузить файл. Переподключитесь и попробуйте ещё раз.", "3ea34cbb1ca5ba9b": "Предпросмотр отменён.", "7c0af279ecb3da3a": "Потоковый предпросмотр файлов недоступен в этой среде выполнения.", @@ -7118,6 +7120,7 @@ "75eb4fd9db07ee00": "Локальная команда ACP", "0dc3b4628cc4ee7e": "Поиск в реестре...", "8069bbfda001437c": "Совместимые агенты не найдены", + "69c301cb19f51357": "Здесь показаны только агенты, разрешённые вашей организацией.", "5c143e386f171670": "Попробуйте расширить поиск.", "9852e524f053c372": [ "О ", @@ -11281,13 +11284,13 @@ "49c009661b1e91d6": "Проверка статуса провайдера", "9c52dc73cc75980f": "Ожидание сведений об установке и аутентификации от сервера.", "7b4990ffdca7c727": "Этот провайдер установлен, но отключён для новых сеансов в T3 Code.", + "ddfe1e8ed243b44c": "Недоступен", "a887d07963e1f028": "Не найден", "d49898dcd40e6332": "CLI не найден в PATH.", "b2768aa900b19198": "Не аутентифицирован · {method}", "24a4bbee246a576f": "Установлен · Вход не проверен", "0e56ea6a22e303ca": "Требует внимания", "9469080828cdc899": "Провайдер установлен, но сервер не смог полностью его проверить.", - "ddfe1e8ed243b44c": "Недоступен", "c7b59de5cc633b03": "Провайдер не прошёл проверки при запуске.", "170d8586394fb04b": "Аутентифицирован · {method}", "de74cbba53de71b1": "Доступен", diff --git a/apps/web/src/i18n/translations/sv.json b/apps/web/src/i18n/translations/sv.json index adaf8566b6411..3a1aae5ccf021 100644 --- a/apps/web/src/i18n/translations/sv.json +++ b/apps/web/src/i18n/translations/sv.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "Installera Origin CLI med {install} och kör sedan {login}.", "eb0f60ef4f92ab7d": "Installera {fj} 0.6 eller senare från {fjUrl} och kör {fjLogin}, eller installera {tea} 0.16 eller senare från {teaUrl} och kör {teaLogin} för varje Forgejo- eller Gitea-server.", "d026a85e2e50e675": "Installera GitCafe CLI med {install} och kör sedan {login}, spara en token i Inställningar eller ange {variable} på servern.", + "121a63b1bdcfc04c": "{organization} väljer vilka ACP-agenter som körs här, så lokala kommandon och åsidosättningar av körbara filer är avstängda.", + "2362e53ee237a5d2": "Policyn för {organization} tillåter inte ACP-agenten {agentId}.", "79d776428f4d0650": "Filen kunde inte läsas in. Återanslut och försök igen.", "3ea34cbb1ca5ba9b": "Förhandsvisningen avbröts.", "7c0af279ecb3da3a": "Strömmande förhandsvisning av filer är inte tillgänglig i den här körmiljön.", @@ -7124,6 +7126,7 @@ "75eb4fd9db07ee00": "Lokalt ACP-kommando", "0dc3b4628cc4ee7e": "Söker i registret...", "8069bbfda001437c": "Inga kompatibla agenter hittades", + "69c301cb19f51357": "Här visas bara agenter som din organisation tillåter.", "5c143e386f171670": "Prova en bredare sökning.", "9852e524f053c372": [ "Om ", @@ -11289,13 +11292,13 @@ "49c009661b1e91d6": "Kontrollerar leverantörsstatus", "9c52dc73cc75980f": "Väntar på att servern rapporterar detaljer om installation och autentisering.", "7b4990ffdca7c727": "Leverantören är installerad men inaktiverad för nya sessioner i T3 Code.", + "ddfe1e8ed243b44c": "Inte tillgänglig", "a887d07963e1f028": "Hittades inte", "d49898dcd40e6332": "CLI:t hittades inte i PATH.", "b2768aa900b19198": "Inte autentiserad · {method}", "24a4bbee246a576f": "Installerad · Inloggning inte kontrollerad", "0e56ea6a22e303ca": "Behöver åtgärdas", "9469080828cdc899": "Leverantören är installerad, men servern kunde inte verifiera den helt.", - "ddfe1e8ed243b44c": "Inte tillgänglig", "c7b59de5cc633b03": "Leverantören klarade inte sina startkontroller.", "170d8586394fb04b": "Autentiserad · {method}", "de74cbba53de71b1": "Tillgänglig", diff --git a/apps/web/src/i18n/translations/zh.json b/apps/web/src/i18n/translations/zh.json index f386e717a0614..a15e48670f755 100644 --- a/apps/web/src/i18n/translations/zh.json +++ b/apps/web/src/i18n/translations/zh.json @@ -49,6 +49,8 @@ "d810ecd91e8cf9d0": "请使用 {install} 安装 Origin CLI,然后运行 {login}。", "eb0f60ef4f92ab7d": "请从 {fjUrl} 安装 {fj} 0.6 或更高版本并运行 {fjLogin},或从 {teaUrl} 安装 {tea} 0.16 或更高版本,并为每个 Forgejo 或 Gitea 服务器运行 {teaLogin}。", "d026a85e2e50e675": "请使用 {install} 安装 GitCafe CLI,然后运行 {login}、在设置中保存 token,或在服务器上设置 {variable}。", + "121a63b1bdcfc04c": "{organization} 决定此处运行哪些 ACP 代理,因此本地命令和可执行文件覆盖已关闭。", + "2362e53ee237a5d2": "{organization} 的策略不允许 ACP 代理 {agentId}。", "79d776428f4d0650": "无法加载文件。请重新连接后重试。", "3ea34cbb1ca5ba9b": "预览已取消。", "7c0af279ecb3da3a": "此运行时不支持流式文件预览。", @@ -7133,6 +7135,7 @@ "75eb4fd9db07ee00": "本地 ACP 命令", "0dc3b4628cc4ee7e": "正在搜索注册表…", "8069bbfda001437c": "未找到兼容的智能体", + "69c301cb19f51357": "此处仅显示组织允许的代理。", "5c143e386f171670": "试试更宽泛的搜索词。", "9852e524f053c372": [ "关于 ", @@ -11305,13 +11308,13 @@ "49c009661b1e91d6": "正在检查提供方状态", "9c52dc73cc75980f": "正在等待服务器返回安装和认证信息。", "7b4990ffdca7c727": "此提供方已安装,但已停用,无法用于 T3 Code 的新会话。", + "ddfe1e8ed243b44c": "不可用", "a887d07963e1f028": "未找到", "d49898dcd40e6332": "未在 PATH 中找到 CLI。", "b2768aa900b19198": "未认证 · {method}", "24a4bbee246a576f": "已安装 · 未检查登录状态", "0e56ea6a22e303ca": "需要处理", "9469080828cdc899": "提供方已安装,但服务器无法完成验证。", - "ddfe1e8ed243b44c": "不可用", "c7b59de5cc633b03": "提供方未通过启动检查。", "170d8586394fb04b": "已认证 · {method}", "de74cbba53de71b1": "可用", diff --git a/docs/user/managed-policy.md b/docs/user/managed-policy.md index ab8d7133c5dbd..159b1349ba33f 100644 --- a/docs/user/managed-policy.md +++ b/docs/user/managed-policy.md @@ -206,8 +206,8 @@ own `claude` earlier on their `PATH`. Pin an absolute `binaryPath` in `providers provider you allow. ACP agents' own mode menus have no effect under `maxRuntimeMode`, except Antigravity's, whose modes -T3 Code can place under the limit. Users still choose which ACP Registry agent runs; leave -`acpRegistry` out of `allowedDrivers` to stop that. +T3 Code can place under the limit. Users still choose which ACP Registry agent runs; list the ones +they may use in `providers.allowedAcpAgents`, or leave `acpRegistry` out of `allowedDrivers`. The limit decides which modes T3 Code asks the provider for. It is not a sandbox; see [What a policy does not cover](#what-a-policy-does-not-cover). @@ -272,6 +272,17 @@ empty. A `codex` entry that is locked, or any `codex` entry under `maxRuntimeMod your fields. In the same way, an `opencode` entry like that rules out a server URL, so OpenCode starts the binary you set. +`providers.allowedAcpAgents` lists the ACP Registry agents that may run, by registry ID, such as +`["devin"]`. Other agents disappear from the add dialog, and instances already using them show as +unavailable with the policy as the reason. Users also cannot run a local command or override an +agent's executable, since either would run something other than the listed agent, so instances +that use a local command stop too. T3 Code does not check the IDs against the registry, so a +misspelled ID matches nothing. + +This limit picks the agent, not everything around it. A user can still set variables on the +provider, and `PATH` decides which `npm` or `uv` installs an agent. `maxRuntimeMode` locks those +variables too. + ### Updates - `mode`: `auto` keeps the normal update flow. `off` stops T3 Code from checking for updates, for diff --git a/packages/client-runtime/src/contractLabels.ts b/packages/client-runtime/src/contractLabels.ts index 2ff6d7f994c34..0f131aebe1359 100644 --- a/packages/client-runtime/src/contractLabels.ts +++ b/packages/client-runtime/src/contractLabels.ts @@ -6,6 +6,7 @@ import { type BrowserImportFailureReason, isRuntimeModeAbove, managedCapabilityDenial as contractsManagedCapabilityDenial, + managedAcpAgentDenial as contractsManagedAcpAgentDenial, managedUpdatesDenial as contractsManagedUpdatesDenial, type ManagedPolicySummary, type ProjectCloneSnapshot, @@ -285,3 +286,32 @@ export function sourceControlInstallHintText( const known = INSTALL_HINTS.find((entry) => mFallback(entry) === hint); return known === undefined ? hint : resolve(known); } + +export function managedAcpAgentsNotice( + summary: ManagedPolicySummary | undefined, + resolve: MFunctionType = mFallback, +): string | undefined { + return summary?.limits?.providers?.allowedAcpAgents === undefined + ? undefined + : resolve( + msg( + "{organization} chooses which ACP agents run here, so local commands and executable overrides are turned off.", + { organization: summary.organization }, + ), + ); +} + +export function managedAcpAgentDenial( + summary: ManagedPolicySummary | undefined, + agentId: string, + resolve: MFunctionType = mFallback, +): string | undefined { + return summary !== undefined && contractsManagedAcpAgentDenial(summary, agentId) !== undefined + ? resolve( + msg("{organization}'s policy does not allow the ACP agent {agentId}.", { + organization: summary.organization, + agentId, + }), + ) + : undefined; +} diff --git a/packages/contracts/src/managedPolicy.ts b/packages/contracts/src/managedPolicy.ts index 7d1c7ed8b8aae..6e156a89fca01 100644 --- a/packages/contracts/src/managedPolicy.ts +++ b/packages/contracts/src/managedPolicy.ts @@ -37,6 +37,8 @@ export const ManagedProviderLimits = Schema.Struct({ /** Only these drivers run; instances of any other driver show as unavailable. */ allowedDrivers: Schema.optionalKey(Schema.NonEmptyArray(ProviderDriverKind)), instances: Schema.optionalKey(Schema.Record(ProviderDriverKind, ManagedProviderInstance)), + /** Only these ACP Registry agents run, and users cannot set their own launch command. */ + allowedAcpAgents: Schema.optionalKey(Schema.NonEmptyArray(TrimmedNonEmptyString)), }); export type ManagedProviderLimits = typeof ManagedProviderLimits.Type; @@ -99,6 +101,8 @@ export const ManagedPolicySummaryLimits = Schema.Struct({ Schema.Struct({ /** Absent means every driver is allowed. */ allowedDrivers: Schema.optionalKey(Schema.NonEmptyArray(ProviderDriverKind)), + /** Absent means every ACP Registry agent is allowed. */ + allowedAcpAgents: Schema.optionalKey(Schema.NonEmptyArray(TrimmedNonEmptyString)), /** * Per driver, the instance fields users cannot change, as dot paths into the instance * envelope: `config.binaryPath`, `config.launchArgs`, `environment.`. A bare @@ -236,6 +240,28 @@ export function isManagedDriverAllowed( return allowed === undefined || allowed.includes(driver); } +/** Why `agentId` may not run from the ACP Registry on an environment, or undefined when it may. */ +export function managedAcpAgentDenial(summary: ManagedPolicySummary | undefined, agentId: string) { + const allowed = summary?.limits?.providers?.allowedAcpAgents; + return summary === undefined || allowed === undefined || allowed.includes(agentId) + ? undefined + : managedPolicyDeniedMessage(summary.organization, `the ACP agent ${agentId}`); +} + +/** Why local ACP commands may not run on an environment, or undefined when they may. */ +export function managedLocalAcpCommandDenial(summary: ManagedPolicySummary | undefined) { + return summary?.limits?.providers?.allowedAcpAgents === undefined + ? undefined + : managedPolicyDeniedMessage(summary.organization, "local ACP commands"); +} + +/** What ACP settings show while the policy limits agents, or undefined when it does not. */ +export function managedAcpAgentsNotice(summary: ManagedPolicySummary | undefined) { + return summary?.limits?.providers?.allowedAcpAgents === undefined + ? undefined + : `${summary.organization} chooses which ACP agents run here, so local commands and executable overrides are turned off.`; +} + /** Why updates are unavailable on an environment with `summary`, or undefined when allowed. */ export function managedUpdatesDenial(summary: ManagedPolicySummary | undefined) { return summary?.limits?.updates?.mode === "off" diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts index 453855e58b662..e143d5ea243ea 100644 --- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts +++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts @@ -1125,6 +1125,76 @@ describe("AcpRegistrySupport", () => { ); }); + it.effect("hides and refuses agents the policy leaves out", () => { + const allowed = makeAgent({ npx: { package: "@example/acp@V1.2.3" } }); + const refused = { ...allowed, id: "refused-agent", name: "Refused Agent" }; + const denial = "Example Corp's policy does not allow the ACP agent refused-agent."; + const localDenial = "Example Corp's policy does not allow local ACP commands."; + return Effect.gen(function* () { + const fileSystem = yield* FileSystem.FileSystem; + const cacheDir = yield* fileSystem.makeTempDirectoryScoped({ + prefix: "t3-acp-registry-allowed-agents-", + }); + const toolchain = yield* makeFakeNpmToolchain(cacheDir); + const catalog = yield* AcpRegistrySupport.makeAcpRegistryCatalog({ + cacheDir, + toolsDir: `${cacheDir}/tools`, + registryUrl, + agentDenial: (agentId) => (agentId === allowed.id ? undefined : denial), + localCommandDenial: localDenial, + }).pipe(Effect.provideService(HostProcess.Environment, toolchain.environment)); + + const found = yield* catalog.search({ query: "agent" }); + expect(found.agents.map((agent) => agent.id)).toEqual([allowed.id]); + + const blocked = settings({ agentId: refused.id }); + const errors = [ + yield* Effect.flip(catalog.prepare({ agentId: refused.id })), + yield* Effect.flip(catalog.resolve(blocked, "/workspace", toolchain.environment)), + ]; + expect(errors.map((error) => error.detail)).toEqual([denial, denial]); + expect(yield* catalog.inspect(blocked, toolchain.environment)).toEqual({ + status: "denied", + message: denial, + }); + for (const decoded of [ + decodeAcpRegistrySettings({ source: "local" }), + decodeAcpRegistrySettings({ source: "local", commandPath: toolchain.executablePath }), + settings({ commandPath: toolchain.executablePath }), + ]) { + expect(yield* catalog.inspect(decoded, toolchain.environment)).toEqual({ + status: "denied", + message: localDenial, + }); + const error = yield* Effect.flip( + catalog.resolve(decoded, "/workspace", toolchain.environment), + ); + expect(error.detail).toBe(localDenial); + } + const commands = yield* fileSystem + .readFileString(toolchain.logPath) + .pipe(Effect.orElseSucceed(() => "")); + expect(commands).not.toContain("install --global"); + + const prepared = yield* catalog.prepare({ agentId: allowed.id }); + expect(prepared.agentId).toBe(allowed.id); + const launched = yield* catalog.resolve(settings(), "/workspace", toolchain.environment); + expect(launched.spawn.command).toBe(toolchain.executablePath); + }).pipe( + Effect.scoped, + Effect.provide( + layerResolver((request) => + Effect.succeed( + HttpClientResponse.fromWeb( + request, + new Response(JSON.stringify({ version: "1.0.0", agents: [allowed, refused] })), + ), + ), + ), + ), + ); + }); + it.effect("searches reuse an index fetched in the last five minutes", () => { const agent = makeAgent({ npx: { package: "@example/acp@1.2.3" } }); let requests = 0; diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts index 051334750a49c..d7b8602105e44 100644 --- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts +++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.ts @@ -2,6 +2,8 @@ import { ACP_REGISTRY_MAX_AGENTS, AcpRegistryOperationError, AcpRegistryOperationErrorReason, + managedAcpAgentDenial, + managedLocalAcpCommandDenial, TrimmedNonEmptyString, type AcpRegistryManagedBinaryUninstallInput, type AcpRegistryManagedBinaryUninstallResult, @@ -471,6 +473,7 @@ export interface ResolvedAcpRegistryAgent { export type AcpRegistryInspection = | { readonly status: "unconfigured" } + | { readonly status: "denied"; readonly message: string } | { readonly status: "not_found"; readonly agentId: string } | { readonly status: "unsupported"; @@ -533,11 +536,13 @@ const layer = (options: AcpRegistryCatalogOptions) => export const layerFromHost = Layer.merge( Layer.unwrap( Effect.gen(function* () { - const { paths } = yield* ProviderHost.ProviderHost; + const { paths, managedPolicy } = yield* ProviderHost.ProviderHost; const path = yield* Path.Path; return layer({ cacheDir: paths.providerStatusCacheDir, toolsDir: path.join(paths.baseDir, "tools"), + agentDenial: (agentId) => managedAcpAgentDenial(managedPolicy, agentId), + localCommandDenial: managedLocalAcpCommandDenial(managedPolicy), }); }), ), @@ -548,6 +553,10 @@ export interface AcpRegistryCatalogOptions { readonly cacheDir: string; readonly toolsDir: string; readonly registryUrl?: string; + /** Why policy keeps an agent from running, or undefined when it may. */ + readonly agentDenial?: (agentId: string) => string | undefined; + /** Why policy keeps a local command from running, or undefined when it may. */ + readonly localCommandDenial?: string | undefined; } const INSTALL_LOCK_RETRY_COUNT = 300; @@ -656,6 +665,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct const resolveExecutable = yield* SpawnExecutableResolution; const platformTarget = resolveAcpRegistryPlatformTarget(platform, architecture); const registryUrl = input.registryUrl ?? ACP_REGISTRY_URL; + const { agentDenial, localCommandDenial } = input; const registryDirectory = path.join(input.cacheDir, "acp-registry"); const registryCachePath = path.join(registryDirectory, "registry.json"); const installsDirectory = input.toolsDir; @@ -1618,6 +1628,18 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct ); }); + const refuseUnderPolicy = (agentId: string) => { + const detail = agentDenial?.(agentId); + return detail === undefined + ? Effect.void + : Effect.fail(new AcpRegistryError({ reason: "agent_not_found", detail })); + }; + + const commandDenial = (settings: AcpRegistrySettings) => + settings.source === "local" || settings.commandPath.trim().length > 0 + ? localCommandDenial + : undefined; + const findAgent = Effect.fn("AcpRegistryCatalog.findAgent")(function* ( registry: AcpRegistryIndex, agentId: string, @@ -1665,7 +1687,10 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct const packageManagerAvailable = packageManager === undefined || resolveExecutable(packageManager, platform, hostEnvironment) !== undefined; - return distribution === undefined || rank === undefined || !packageManagerAvailable + return distribution === undefined || + rank === undefined || + !packageManagerAvailable || + agentDenial?.(agent.id) !== undefined ? [] : [{ agent, distribution, rank }]; }); @@ -1699,6 +1724,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct const prepare: AcpRegistryCatalog["Service"]["prepare"] = Effect.fn("AcpRegistryCatalog.prepare")( function* (input) { + yield* refuseUnderPolicy(input.agentId.trim()); const registry = yield* refreshRegistry(); const agent = yield* findAgent(registry, input.agentId); const distribution = yield* compatibleDistribution(agent, "auto"); @@ -1736,6 +1762,8 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct const inspect: AcpRegistryCatalog["Service"]["inspect"] = Effect.fn("AcpRegistryCatalog.inspect")( function* (settings, environment) { + const refusal = commandDenial(settings); + if (refusal !== undefined) return { status: "denied", message: refusal } as const; if (settings.source === "local") { const command = settings.commandPath.trim(); if (!command) return { status: "unconfigured" } as const; @@ -1751,6 +1779,8 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct } const agentId = settings.agentId.trim(); if (agentId.length === 0) return { status: "unconfigured" } as const; + const denial = agentDenial?.(agentId); + if (denial !== undefined) return { status: "denied", message: denial } as const; const registry = yield* loadRegistry(); const agent = registry.agents.find((candidate) => candidate.id === agentId); if (agent === undefined) return { status: "not_found", agentId } as const; @@ -1853,6 +1883,10 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct const resolve: AcpRegistryCatalog["Service"]["resolve"] = Effect.fn("AcpRegistryCatalog.resolve")( function* (settings, cwd, environment) { + const refusal = commandDenial(settings); + if (refusal !== undefined) { + return yield* new AcpRegistryError({ reason: "agent_not_found", detail: refusal }); + } if (settings.source === "local") { const executable = settings.commandPath.trim(); if (!executable) { @@ -1882,6 +1916,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct detail: "ACP Registry provider requires a registry agent ID.", }); } + yield* refuseUnderPolicy(agentId); const registry = yield* loadRegistry(); const agent = yield* findAgent(registry, agentId); const distribution = yield* compatibleDistribution(agent, settings.distribution); diff --git a/packages/provider-acp-registry/src/server/auth.ts b/packages/provider-acp-registry/src/server/auth.ts index 0a503c09fa2f5..878f9949a32c4 100644 --- a/packages/provider-acp-registry/src/server/auth.ts +++ b/packages/provider-acp-registry/src/server/auth.ts @@ -129,6 +129,7 @@ export const makeAcpRegistryAuth = Effect.fn("makeAcpRegistryAuth")(function* (o failure("methods", "Could not inspect the selected ACP agent.", cause), ), ); + if (inspected.status === "denied") return yield* failure("methods", inspected.message); if (inspected.status !== "ready") return yield* failure("methods", "Prepare this ACP agent before signing in."); // Path overrides can change in place; cache discovery only for registry versions. diff --git a/packages/provider-acp-registry/src/server/driver.test.ts b/packages/provider-acp-registry/src/server/driver.test.ts index 684eb21d7456b..22b79686b0d67 100644 --- a/packages/provider-acp-registry/src/server/driver.test.ts +++ b/packages/provider-acp-registry/src/server/driver.test.ts @@ -103,6 +103,23 @@ function providerWithModels( } describe("acpRegistrySnapshotReadiness", () => { + it("reports a policy refusal as unavailable, not as a missing agent", () => { + const message = "Example Corp's policy does not allow the ACP agent test-agent."; + const provider = buildCheckedAcpRegistrySnapshot({ + ...identity, + settings: decodeSettings({ agentId: "test-agent" }), + checkedAt: "2026-08-13T10:00:00.000Z", + inspection: { status: "denied", message }, + }); + expect(provider).toMatchObject({ + installed: false, + status: "error", + message, + availability: "unavailable", + unavailableReason: message, + }); + }); + it("keeps the custom model display name and options saved by the Settings editor", () => { const fastMode = { id: "fast", label: "Fast mode", type: "boolean" } as const; const snapshot = buildCheckedAcpRegistrySnapshot({ diff --git a/packages/provider-acp-registry/src/server/driver.ts b/packages/provider-acp-registry/src/server/driver.ts index 2346a9c782c76..37c15e38f1d2f 100644 --- a/packages/provider-acp-registry/src/server/driver.ts +++ b/packages/provider-acp-registry/src/server/driver.ts @@ -227,6 +227,8 @@ function acpRegistrySnapshotReadiness( message: "Select an ACP Registry agent or configure a local ACP executable before starting a thread.", }; + case "denied": + return { installed: false, version: null, status: "error", message: inspection.message }; case "not_found": return { installed: false, @@ -473,7 +475,7 @@ export function buildCheckedAcpRegistrySnapshot( ? `Set ${advertisedAuthMethod.envVarNames!.join(", ")} under this instance's environment variables in provider settings. T3 Code will detect it on the next provider refresh.` : `Sign in in provider settings using "${advertisedAuthMethod.name}".` : undefined; - return baseSnapshot({ + const snapshot = baseSnapshot({ ...input, ...(input.inspection.status === "ready" && input.inspection.documentationUrl ? { documentationUrl: input.inspection.documentationUrl } @@ -508,6 +510,9 @@ export function buildCheckedAcpRegistrySnapshot( ? { message: readiness.message } : {}), }); + return input.inspection.status === "denied" + ? { ...snapshot, availability: "unavailable", unavailableReason: input.inspection.message } + : snapshot; } export const checkAcpRegistryProviderStatus = Effect.fn("AcpRegistryDriver.checkProviderStatus")( diff --git a/packages/provider-core/src/server/ProviderHost.ts b/packages/provider-core/src/server/ProviderHost.ts index 804e8ff4cdda7..fa2794d720205 100644 --- a/packages/provider-core/src/server/ProviderHost.ts +++ b/packages/provider-core/src/server/ProviderHost.ts @@ -1,6 +1,7 @@ import type { BackgroundScope, ChatAttachment, + ManagedPolicySummary, ServerSettings, ServerSettingsError, } from "@t3tools/contracts"; @@ -33,6 +34,7 @@ export class ProviderHost extends Context.Service< ProviderHost, { readonly paths: ProviderHostPaths; + readonly managedPolicy?: ManagedPolicySummary | undefined; readonly settings: { readonly get: Effect.Effect; /** Runs `use` on a settings snapshot that no settings write can change until it finishes. */ diff --git a/packages/shared/src/managedPolicyFile.ts b/packages/shared/src/managedPolicyFile.ts index 2f775abb8a02a..b4f268661ab06 100644 --- a/packages/shared/src/managedPolicyFile.ts +++ b/packages/shared/src/managedPolicyFile.ts @@ -115,6 +115,7 @@ export const WINDOWS_POLICY_VALUES = { Telemetry: { type: "boolean", path: ["limits", "telemetry"] }, BrowserCookieImport: { type: "boolean", path: ["limits", "browserCookieImport"] }, ProviderInstances: { type: "json", path: ["limits", "providers", "instances"] }, + AllowedAcpAgents: { type: "json", path: ["limits", "providers", "allowedAcpAgents"] }, UpdatesMode: { type: "string", path: ["limits", "updates", "mode"] }, UpdatesFeedUrl: { type: "string", path: ["limits", "updates", "feedUrl"] }, AllowNightly: { type: "boolean", path: ["limits", "updates", "allowNightly"] },