feat: agent-server improvements

Author: tatoalo

apps/code/src/renderer/features/environments/components/EnvironmentSelector.tsx

@@ -43,7 +43,7 @@ export function EnvironmentSelector({
     setOpen(false);
     useSettingsDialogStore
       .getState()
-      .open("cloud-environments", { repoPath: repoPath ?? undefined });
+      .open("environments", { repoPath: repoPath ?? undefined });
   };
 
   const triggerContent = (

apps/code/src/renderer/features/settings/components/SettingsDialog.tsx

@@ -10,6 +10,7 @@ import {
   Code,
   Folder,
   GearSix,
+  HardDrives,
   Keyboard,
   Palette,
   Plugs,
@@ -25,6 +26,7 @@ import { AccountSettings } from "./sections/AccountSettings";
 import { AdvancedSettings } from "./sections/AdvancedSettings";
 import { ClaudeCodeSettings } from "./sections/ClaudeCodeSettings";
 import { CloudEnvironmentsSettings } from "./sections/CloudEnvironmentsSettings";
+import { EnvironmentsSettings } from "./sections/environments/EnvironmentsSettings";
 import { GeneralSettings } from "./sections/GeneralSettings";
 import { McpServersSettings } from "./sections/McpServersSettings";
 import { PersonalizationSettings } from "./sections/PersonalizationSettings";
@@ -46,6 +48,11 @@ const SIDEBAR_ITEMS: SidebarItem[] = [
   { id: "account", label: "Account", icon: <User size={16} /> },
   { id: "workspaces", label: "Workspaces", icon: <Folder size={16} /> },
   { id: "worktrees", label: "Worktrees", icon: <TreeStructure size={16} /> },
+  {
+    id: "environments",
+    label: "Environments",
+    icon: <HardDrives size={16} />,
+  },
   {
     id: "cloud-environments",
     label: "Cloud environments",
@@ -74,6 +81,7 @@ const CATEGORY_TITLES: Record<SettingsCategory, string> = {
   account: "Account",
   workspaces: "Workspaces",
   worktrees: "Worktrees",
+  environments: "Environments",
   "cloud-environments": "Cloud environments",
   personalization: "Personalization",
   "claude-code": "Claude Code",
@@ -90,6 +98,7 @@ const CATEGORY_COMPONENTS: Record<SettingsCategory, React.ComponentType> = {
   account: AccountSettings,
   workspaces: WorkspacesSettings,
   worktrees: WorktreesSettings,
+  environments: EnvironmentsSettings,
   "cloud-environments": CloudEnvironmentsSettings,
   personalization: PersonalizationSettings,
   "claude-code": ClaudeCodeSettings,

apps/code/src/renderer/features/settings/stores/settingsDialogStore.ts

@@ -5,6 +5,7 @@ export type SettingsCategory =
   | "account"
   | "workspaces"
   | "worktrees"
+  | "environments"
   | "cloud-environments"
   | "personalization"
   | "claude-code"

packages/agent/src/adapters/claude/claude-agent.ts

@@ -817,7 +817,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
       cwd,
       mcpServers,
       permissionMode,
-      canUseTool: this.createCanUseTool(sessionId),
+      canUseTool: this.createCanUseTool(sessionId, meta?.allowedDomains),
       logger: this.logger,
       systemPrompt,
       userProvidedOptions: meta?.claudeCode?.options,
@@ -978,7 +978,10 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
     return { sessionId, modes, models, configOptions };
   }
 
-  private createCanUseTool(sessionId: string): CanUseTool {
+  private createCanUseTool(
+    sessionId: string,
+    allowedDomains?: string[],
+  ): CanUseTool {
     return async (toolName, toolInput, { suggestions, toolUseID, signal }) =>
       canUseTool({
         session: this.session,
@@ -993,6 +996,7 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
         logger: this.logger,
         updateConfigOption: (configId: string, value: string) =>
           this.updateConfigOption(configId, value),
+        allowedDomains,
       });
   }
 

packages/agent/src/adapters/claude/permissions/permission-handlers.ts

@@ -49,6 +49,7 @@ interface ToolHandlerContext {
   fileContentCache: { [key: string]: string };
   logger: Logger;
   updateConfigOption: (configId: string, value: string) => Promise<void>;
+  allowedDomains?: string[];
 }
 
 async function emitToolDenial(
@@ -422,10 +423,43 @@ function handlePlanFileException(
   };
 }
 
+function extractDomainFromUrl(url: string): string | null {
+  try {
+    return new URL(url).hostname;
+  } catch {
+    return null;
+  }
+}
+
+function isDomainAllowed(hostname: string, allowedDomains: string[]): boolean {
+  return allowedDomains.some((pattern) => {
+    if (pattern.startsWith("*.")) {
+      const suffix = pattern.slice(1); // ".example.com"
+      return hostname === pattern.slice(2) || hostname.endsWith(suffix);
+    }
+    return hostname === pattern;
+  });
+}
+
 export async function canUseTool(
   context: ToolHandlerContext,
 ): Promise<ToolPermissionResult> {
-  const { toolName, toolInput, session } = context;
+  const { toolName, toolInput, session, allowedDomains } = context;
+
+  // Enforce domain allowlist for web tools
+  if (allowedDomains && allowedDomains.length > 0) {
+    if (toolName === "WebFetch" || toolName === "WebSearch") {
+      const url = toolInput.url as string | undefined;
+      if (url) {
+        const hostname = extractDomainFromUrl(url);
+        if (hostname && !isDomainAllowed(hostname, allowedDomains)) {
+          const message = `Domain "${hostname}" is not in the allowed list: ${allowedDomains.join(", ")}`;
+          await emitToolDenial(context, message);
+          return { behavior: "deny", message, interrupt: false };
+        }
+      }
+    }
+  }
 
   if (isToolAllowedForMode(toolName, session.permissionMode)) {
     return {

packages/agent/src/adapters/claude/types.ts

@@ -107,6 +107,7 @@ export type NewSessionMeta = {
   permissionMode?: string;
   persistence?: { taskId?: string; runId?: string; logUrl?: string };
   additionalRoots?: string[];
+  allowedDomains?: string[];
   claudeCode?: {
     options?: Options;
   };

packages/agent/src/server/agent-server.ts

@@ -707,6 +707,7 @@ export class AgentServer {
         sessionId: payload.run_id,
         taskRunId: payload.run_id,
         systemPrompt: this.buildSessionSystemPrompt(prUrl),
+        allowedDomains: this.config.allowedDomains,
         ...(this.config.claudeCode?.plugins?.length && {
           claudeCode: {
             options: {

packages/agent/src/server/bin.ts

@@ -79,6 +79,10 @@ program
     "--claudeCodeConfig <json>",
     "Claude Code config as JSON (systemPrompt, systemPromptAppend, plugins)",
   )
+  .option(
+    "--allowedDomains <domains>",
+    "Comma-separated list of domains allowed for web tools (WebFetch, WebSearch)",
+  )
   .action(async (options) => {
     const envResult = envSchema.safeParse(process.env);
 
@@ -105,6 +109,13 @@ program
       "--claudeCodeConfig",
     );
 
+    const allowedDomains = options.allowedDomains
+      ? options.allowedDomains
+          .split(",")
+          .map((d: string) => d.trim())
+          .filter(Boolean)
+      : undefined;
+
     const server = new AgentServer({
       port: parseInt(options.port, 10),
       jwtPublicKey: env.JWT_PUBLIC_KEY,
@@ -118,6 +129,7 @@ program
       mcpServers,
       baseBranch: options.baseBranch,
       claudeCode,
+      allowedDomains,
     });
 
     process.on("SIGINT", async () => {

packages/agent/src/server/types.ts

@@ -22,4 +22,5 @@ export interface AgentServerConfig {
   mcpServers?: RemoteMcpServer[];
   baseBranch?: string;
   claudeCode?: ClaudeCodeConfig;
+  allowedDomains?: string[];
 }