From e65ab0dbc054c44ad7a6cc0db328982e1aa09fd3 Mon Sep 17 00:00:00 2001
From: Paul Lizer <paullizer@microsoft.com>
Date: Tue, 6 Oct 2026 16:29:15 -0400
Subject: [PATCH 1/5] Add V2 admin global agents and actions; reset scroll on
 category change

- Choosing an Admin Settings category, in the rail or the phone select, now
  opens it at its top and restarts the On this page index.
- Global Agents and Global Actions sections list, create, edit, enable,
  disable and delete the organisation's agents and actions, and choose the
  default agent, using the same V2 editors workspaces use. Thirteen new
  admin-only routes under /api/v2/admin serve them through the shared editor
  engine, now with a global scope: masked secrets, global Key Vault names,
  conditional writes and case-insensitive name checks.
- Templates start and publish global agents; Agent Template Approvals links
  to the approvals queue in a new tab.
- Remove the Global agent delegation card. Call agent is an ordinary global
  action whose targets are global agents; the target picker now follows the
  editor's scope instead of always reading personal targets.
- Admin Settings asks before opening a global editor would drop unsaved
  settings.
- The classic global agent delete reads stored Key Vault references, so it
  removes credentials the V2 editor saved instead of failing.
- Version 0.261.260.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../single_app/admin_settings_fields.py       |  48 ++
 application/single_app/admin_settings_nav.py  |   4 +
 application/single_app/app.py                 |   2 +
 application/single_app/config.py              |   2 +-
 .../single_app/functions_global_agents.py     |   7 +-
 .../functions_global_editor_access.py         | 228 +++++++
 .../functions_workspace_authoring.py          | 409 +++++++++++-
 .../single_app/route_backend_agents.py        |  48 ++
 .../single_app/route_backend_plugins.py       |  76 +++
 .../route_backend_v2_admin_agents_actions.py  | 212 ++++++
 .../templates/admin/_panes/agents.html        |   2 +-
 application/v2_ui/src/App.tsx                 |   6 +
 .../admin/AgentTemplateApprovalsLink.tsx      |  27 +
 .../components/admin/GlobalActionsManager.tsx | 178 +++++
 .../components/admin/GlobalAgentsManager.tsx  | 226 +++++++
 .../ActionConfigurationFields.tsx             |   4 +-
 .../CallAgentActionConfiguration.tsx          |  14 +-
 .../McpActionConfiguration.tsx                |  10 +-
 .../OpenApiActionConfiguration.tsx            |   6 +-
 .../workspaceAgents/AgentActionPicker.tsx     |  12 +-
 .../workspaceAgents/AgentKnowledgeFields.tsx  |   4 +-
 .../workspaceAgents/AgentTemplatesPanel.tsx   |  18 +-
 application/v2_ui/src/lib/actionWorkbench.ts  | 134 +++-
 application/v2_ui/src/lib/agentWorkbench.ts   | 131 +++-
 .../src/lib/workspaceActionConnectors.ts      |  40 +-
 .../v2_ui/src/lib/workspaceActionServices.ts  |  24 +-
 .../v2_ui/src/lib/workspaceActionTypes.ts     |  36 ++
 .../v2_ui/src/lib/workspaceAgentCommands.ts   |   6 +-
 .../v2_ui/src/lib/workspaceAgentKnowledge.ts  |  10 +
 .../v2_ui/src/lib/workspaceAgentTemplates.ts  |  10 +-
 .../v2_ui/src/lib/workspaceAuthoring.ts       |  45 +-
 .../v2_ui/src/lib/workspaceEditorDrafts.ts    |  20 +-
 .../src/pages/AdminGlobalEditorPages.tsx      |  57 ++
 .../v2_ui/src/pages/AdminSettingsPage.tsx     | 144 +++--
 .../src/pages/workspace/ActionEditorPage.tsx  |  19 +-
 .../src/pages/workspace/AgentEditorPage.tsx   |   5 +-
 docs/_data/app_surface.yml                    |   6 +-
 docs/admin/agents-actions.md                  |  87 ++-
 .../features/AGENT_DELEGATION_ACTION.md       |   8 +-
 .../features/V2_ADMIN_AGENTS_ACTIONS.md       |  28 +-
 .../V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md         | 192 ++++++
 .../V2_ADMIN_CATEGORY_SCROLL_RESET_FIX.md     |  65 ++
 docs/guides/call-another-agent.md             |  10 +-
 .../test_route_blueprint_policy_inventory.py  |  16 +
 .../test_v2_admin_actions_parity.py           |  28 +-
 .../test_v2_admin_agents_parity.py            |  11 +-
 .../test_v2_admin_global_editor_backend.py    | 489 ++++++++++++++
 .../test_v2_admin_global_editor_logic.mjs     | 243 +++++++
 ...pace_authoring_credential_compatibility.py |  68 +-
 ui_tests/fixtures/agent_delegation/.gitignore |   6 -
 .../fixtures/agent_delegation/harness.html    |  13 -
 .../agent_delegation/harness_build.py         |  45 --
 .../agent_delegation/harness_entry.tsx        |  32 -
 ui_tests/fixtures/v2_admin_global_editors.py  | 610 ++++++++++++++++++
 ui_tests/test_agent_delegation_v2.py          | 261 --------
 .../test_v2_admin_global_agents_actions.py    | 470 ++++++++++++++
 ui_tests/test_v2_workspace_authoring.py       |   5 +-
 57 files changed, 4346 insertions(+), 571 deletions(-)
 create mode 100644 application/single_app/functions_global_editor_access.py
 create mode 100644 application/single_app/route_backend_v2_admin_agents_actions.py
 create mode 100644 application/v2_ui/src/components/admin/AgentTemplateApprovalsLink.tsx
 create mode 100644 application/v2_ui/src/components/admin/GlobalActionsManager.tsx
 create mode 100644 application/v2_ui/src/components/admin/GlobalAgentsManager.tsx
 create mode 100644 application/v2_ui/src/pages/AdminGlobalEditorPages.tsx
 create mode 100644 docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
 create mode 100644 docs/explanation/fixes/V2_ADMIN_CATEGORY_SCROLL_RESET_FIX.md
 create mode 100644 functional_tests/test_v2_admin_global_editor_backend.py
 create mode 100644 functional_tests/test_v2_admin_global_editor_logic.mjs
 delete mode 100644 ui_tests/fixtures/agent_delegation/.gitignore
 delete mode 100644 ui_tests/fixtures/agent_delegation/harness.html
 delete mode 100644 ui_tests/fixtures/agent_delegation/harness_build.py
 delete mode 100644 ui_tests/fixtures/agent_delegation/harness_entry.tsx
 create mode 100644 ui_tests/fixtures/v2_admin_global_editors.py
 delete mode 100644 ui_tests/test_agent_delegation_v2.py
 create mode 100644 ui_tests/test_v2_admin_global_agents_actions.py

diff --git a/application/single_app/admin_settings_fields.py b/application/single_app/admin_settings_fields.py
index 374c9632f..0c4abba27 100644
--- a/application/single_app/admin_settings_fields.py
+++ b/application/single_app/admin_settings_fields.py
@@ -4352,6 +4352,25 @@
             "depends_on": {"key": "enable_semantic_kernel", "equals": True},
         },
     ],
+    # The organisation's agents themselves, rather than settings about them. The
+    # component reads and writes through the global editor routes
+    # (/api/v2/admin/agents) and the classic enable and default-agent routes, never
+    # the settings draft, so each change saves on its own.
+    "organization-agents-section": [
+        {
+            "type": "component",
+            "component": "global-agents-manager",
+            "label": "Global Agents",
+            "help": (
+                "Agents the organisation provides. Everyone uses the default agent while "
+                "Workspace Mode is off; with it on, these appear beside people's own agents "
+                "only when global agents are added to workspaces. Create one from scratch "
+                "or from an approved template, and disable one to keep it without offering "
+                "it."
+            ),
+            "depends_on": {"key": "enable_semantic_kernel", "equals": True},
+        },
+    ],
     # Rendered by V1 only while Workspace Mode is on, which ``ADMIN_NAV`` now
     # states as a section condition, so V2 hides the section on the same terms.
     "agent-toggles-card": [
@@ -4580,6 +4599,17 @@
             "default": True,
             "depends_on": {"key": "agent_templates_allow_user_submission", "equals": True},
         },
+        {
+            # Reviewing submissions happens in the shared approvals queue, which
+            # the classic Approvals page serves; this only points there.
+            "type": "component",
+            "component": "agent-template-approvals-link",
+            "label": "Approvals queue",
+            "help": (
+                "Review, approve and remove submitted templates in the approvals queue, "
+                "beside the other requests an administrator handles."
+            ),
+        },
     ],
     # --- Actions ----------------------------------------------------------
     #
@@ -4933,6 +4963,24 @@
             "group": "Managed elsewhere",
         },
     ],
+    # The organisation's actions themselves. The built-in toggles that used to sit
+    # here live in core-plugin-toggles, so this section holds no setting at all:
+    # the component reads and writes through the global editor routes
+    # (/api/v2/admin/actions) and the classic enable route, never the settings draft.
+    "actions-config": [
+        {
+            "type": "component",
+            "component": "global-actions-manager",
+            "label": "Global Actions",
+            "help": (
+                "Connections to APIs, databases, MCP servers and other services that "
+                "global agents can call. Workspaces see them too when global agents and "
+                "actions are added to workspaces. Disable one to keep its configuration "
+                "without loading it."
+            ),
+            "depends_on": {"key": "enable_semantic_kernel", "equals": True},
+        },
+    ],
     # --- Inbound MCP ------------------------------------------------------
     #
     # The whole card is gated by ENABLE_MCP_UI, an App Service application
diff --git a/application/single_app/admin_settings_nav.py b/application/single_app/admin_settings_nav.py
index f63b48806..aa07db31c 100644
--- a/application/single_app/admin_settings_nav.py
+++ b/application/single_app/admin_settings_nav.py
@@ -151,6 +151,10 @@
                 "icon": "bi-robot",
                 "sections": [
                     {"id": "agents-config", "label": "Agent Runtime", "icon": "bi-robot"},
+                    # The organisation's own agents: created, edited and chosen as the
+                    # default here. V1 draws this as the Global Agents table inside the
+                    # Agent Runtime card; V2 gives it a section of its own.
+                    {"id": "organization-agents-section", "label": "Global Agents", "icon": "bi-stars"},
                     {"id": "agent-toggles-card", "label": "Workspace Agent Permissions", "icon": "bi-person-gear", "condition": "per_user_semantic_kernel"},
                     {"id": "agents-page-customization-card", "label": "Agents Page", "icon": "bi-palette"},
                     {"id": "agent-template-approvals-section", "label": "Agent Template Approvals", "icon": "bi-layers", "condition": "enable_agent_template_gallery"},
diff --git a/application/single_app/app.py b/application/single_app/app.py
index 10e4b599f..80dde76cf 100644
--- a/application/single_app/app.py
+++ b/application/single_app/app.py
@@ -87,6 +87,7 @@
 from route_backend_group_prompts_scoped import *
 from route_backend_group_actions_scoped import *
 from route_backend_group_agents_scoped import *
+from route_backend_v2_admin_agents_actions import register_route_backend_v2_admin_agents_actions
 from route_backend_group_identities_scoped import *
 from route_backend_group_endpoints_scoped import *
 from route_backend_group_file_sources_scoped import *
@@ -1411,6 +1412,7 @@ def list_semantic_kernel_plugins():
 # ------------------- API V2 UI Routes -------------------
 register_route_blueprint('backend_v2', register_route_backend_v2, user_required_blueprint)
 register_route_blueprint('backend_v2_admin', register_route_backend_v2_admin, admin_required_blueprint)
+register_route_blueprint('backend_v2_admin_agents_actions', register_route_backend_v2_admin_agents_actions, admin_required_blueprint)
 
 # ------------------- API Orchestration Routes ----------
 register_route_blueprint('backend_orchestration', register_route_backend_orchestration, user_required_blueprint)
diff --git a/application/single_app/config.py b/application/single_app/config.py
index 670ab4808..3a890675e 100644
--- a/application/single_app/config.py
+++ b/application/single_app/config.py
@@ -101,7 +101,7 @@
 EXECUTOR_TYPE = 'thread'
 EXECUTOR_MAX_WORKERS = 30
 SESSION_TYPE = 'filesystem'
-VERSION = "0.261.259"
+VERSION = "0.261.260"
 IS_DEVELOPMENT = is_development_env_enabled()
 
 # Opt-out for deployments where App Service Easy Auth is active but the platform
diff --git a/application/single_app/functions_global_agents.py b/application/single_app/functions_global_agents.py
index 08502c652..be446f08b 100644
--- a/application/single_app/functions_global_agents.py
+++ b/application/single_app/functions_global_agents.py
@@ -291,7 +291,12 @@ def delete_global_agent(agent_id):
     try:
         user_id = get_current_user_id()
         print(f"Deleting global agent: {agent_id}")
-        agent_dict = get_global_agent(agent_id)
+        # Read the stored references, not the UI placeholders: a masked read rebuilds the
+        # classic secret name, which misses the fresh names the V2 editor saves under.
+        agent_dict = cosmos_global_agents_container.read_item(
+            item=agent_id,
+            partition_key=agent_id
+        )
         keyvault_agent_delete_helper(agent_dict, agent_id, scope="global")
         cosmos_global_agents_container.delete_item(
             item=agent_id,
diff --git a/application/single_app/functions_global_editor_access.py b/application/single_app/functions_global_editor_access.py
new file mode 100644
index 000000000..c14b12ace
--- /dev/null
+++ b/application/single_app/functions_global_editor_access.py
@@ -0,0 +1,228 @@
+# functions_global_editor_access.py
+"""Orchestration for the V2 Admin Settings global agent and action editors.
+
+The classic ``/api/admin/agents`` and ``/api/admin/plugins`` routes save whole
+documents addressed by name, with no revision. These routes serve the V2 agent and
+action editors instead, so global records get the contract personal and group
+records already have: reads answer with ``{record, revision, secret_paths,
+read_only}``, writes accept ``{updates, expected_revision, clear_secret_paths,
+removed_paths}``, and a write made against a stale revision is refused with nothing
+written. Persistence, secret handling and the conditional writes are the shared
+engine in ``functions_workspace_authoring``; the routes enforce the Admin role.
+
+Enabling, disabling and choosing the default agent stay on the classic routes, which
+already update those fields without rewriting stored secret references.
+"""
+
+import json
+import logging
+import re
+from importlib import import_module
+
+from flask import jsonify, request
+from werkzeug.exceptions import HTTPException
+
+from functions_appinsights import log_event
+from functions_settings import get_settings, update_settings
+from functions_workspace_authoring import (
+    apply_global_action_write,
+    apply_global_agent_write,
+    build_global_agent_editor_options,
+    build_secret_reminder_defaults,
+    delete_global_editor_record,
+    editor_error_response,
+    editor_resource,
+    list_global_editor_records,
+    log_committed_global_editor_change,
+    project_editor_record,
+    read_global_editor_record,
+)
+
+
+INVALID_GLOBAL_RESOURCE_ID = re.compile(r"[/\\?#,\x00-\x1f\x7f]")
+
+
+class GlobalEditorError(HTTPException):
+    """A stable, non-sensitive failure at the global editor boundary."""
+
+    def __init__(self, message, status_code):
+        super().__init__(description=message)
+        self.code = status_code
+
+
+def _validate_identifier(value, label):
+    if (
+        not isinstance(value, str) or not value or len(value) > 512
+        or value != value.strip() or value in (".", "..")
+        or INVALID_GLOBAL_RESOURCE_ID.search(value)
+    ):
+        raise GlobalEditorError(f"Invalid {label}.", 400)
+
+
+def global_editor_error_response(exc):
+    """Map boundary errors and shared editor-engine errors to HTTP responses."""
+    if isinstance(exc, GlobalEditorError):
+        response = jsonify({"error": exc.description})
+        response.headers["Cache-Control"] = "no-store"
+        return response, exc.code
+    return editor_error_response(exc)
+
+
+def reject_query_parameters():
+    """These routes take no query parameters; a stray one is refused, not ignored."""
+    if request.args:
+        raise GlobalEditorError("This request does not accept query parameters.", 400)
+
+
+def reject_request_body():
+    if request.get_data():
+        raise GlobalEditorError("This read does not accept a request body.", 400)
+
+
+def read_json_body():
+    """Parse a JSON object body, rejecting duplicate keys so a smuggled second value
+    cannot shadow a validated one."""
+    def unique_fields(pairs):
+        payload = {}
+        for key, value in pairs:
+            if key in payload:
+                raise GlobalEditorError("Duplicate fields are not supported.", 400)
+            payload[key] = value
+        return payload
+
+    if not request.is_json:
+        raise GlobalEditorError("A JSON object is required for this action.", 400)
+    try:
+        body = json.loads(request.get_data(), object_pairs_hook=unique_fields)
+    except (ValueError, UnicodeDecodeError) as error:
+        raise GlobalEditorError("Provide valid JSON with no duplicate fields.", 400) from error
+    if not isinstance(body, dict):
+        raise GlobalEditorError("A JSON object is required for this action.", 400)
+    return body
+
+
+def _resource(record, kind):
+    # Global records are read-only everywhere else; here they are the administrator's own.
+    return editor_resource(record, kind, global_scope=True, read_only=False)
+
+
+def selected_agent_name(settings):
+    """The default global agent, which settings store by name."""
+    selected = settings.get("global_selected_agent")
+    if isinstance(selected, dict):
+        return str(selected.get("name") or "")
+    return selected if isinstance(selected, str) else ""
+
+
+def _follow_default_agent_rename(existing, saved, settings):
+    """Keep the default agent selected when it is renamed.
+
+    The selection is stored by name, so a rename would otherwise leave it naming an
+    agent that no longer exists. The agent is already saved when this runs; a failure
+    here is logged rather than reported as a failed save.
+    """
+    old_name = existing.get("name")
+    new_name = saved.get("name")
+    selected = settings.get("global_selected_agent")
+    if old_name == new_name or not isinstance(selected, dict) or selected.get("name") != old_name:
+        return
+    try:
+        if not update_settings({"global_selected_agent": {**selected, "name": new_name}}):
+            raise RuntimeError("The settings update was not saved.")
+    except Exception as exc:
+        log_event(
+            "[GLOBAL_AGENTS] The renamed default agent could not be reselected.",
+            level=logging.WARNING,
+            extra={"agent_id": saved.get("id", ""), "error_type": type(exc).__name__},
+        )
+
+
+def list_global_agents():
+    settings = get_settings()
+    agents = [
+        project_editor_record(record, "agents", global_scope=True)
+        for record in list_global_editor_records("agents")
+    ]
+    return {"agents": agents, "selected_agent_name": selected_agent_name(settings)}, 200
+
+
+def get_global_agent(agent_id):
+    _validate_identifier(agent_id, "agent identifier")
+    return _resource(read_global_editor_record("agents", agent_id), "agents"), 200
+
+
+def get_global_agent_options():
+    settings = get_settings()
+    # Bound lazily so this module does not import the agent route blueprint at load.
+    route_agents = import_module("route_backend_agents")
+    endpoints = route_agents.build_combined_model_endpoints(settings)
+    return build_global_agent_editor_options(settings, endpoints), 200
+
+
+def create_global_agent(user_id, body, prepare):
+    settings = get_settings()
+    saved = apply_global_agent_write(user_id, None, body, prepare, settings)
+    log_committed_global_editor_change("agents", user_id, saved, "creation")
+    return _resource(saved, "agents"), 201
+
+
+def update_global_agent(user_id, agent_id, body, prepare):
+    _validate_identifier(agent_id, "agent identifier")
+    settings = get_settings()
+    existing = read_global_editor_record("agents", agent_id)
+    saved = apply_global_agent_write(user_id, existing, body, prepare, settings)
+    _follow_default_agent_rename(existing, saved, settings)
+    log_committed_global_editor_change("agents", user_id, saved, "update")
+    return _resource(saved, "agents"), 200
+
+
+def delete_global_agent_record(user_id, agent_id):
+    _validate_identifier(agent_id, "agent identifier")
+    settings = get_settings()
+    existing = read_global_editor_record("agents", agent_id)
+    delete_global_editor_record("agents", user_id, existing, settings)
+    log_committed_global_editor_change("agents", user_id, existing, "deletion")
+    return {"success": True}, 200
+
+
+def list_global_actions():
+    actions = [
+        project_editor_record(record, "actions", global_scope=True)
+        for record in list_global_editor_records("actions")
+    ]
+    return {"actions": actions}, 200
+
+
+def get_global_action(action_id):
+    _validate_identifier(action_id, "action identifier")
+    return _resource(read_global_editor_record("actions", action_id), "actions"), 200
+
+
+def get_global_action_options():
+    """The tenant-level Key Vault reminder defaults the action editor shows."""
+    return {"secret_reminders": build_secret_reminder_defaults(get_settings())}, 200
+
+
+def create_global_action(user_id, body, prepare):
+    settings = get_settings()
+    saved = apply_global_action_write(user_id, None, body, prepare, settings)
+    log_committed_global_editor_change("actions", user_id, saved, "creation")
+    return _resource(saved, "actions"), 201
+
+
+def update_global_action(user_id, action_id, body, prepare):
+    _validate_identifier(action_id, "action identifier")
+    settings = get_settings()
+    existing = read_global_editor_record("actions", action_id)
+    saved = apply_global_action_write(user_id, existing, body, prepare, settings)
+    log_committed_global_editor_change("actions", user_id, saved, "update")
+    return _resource(saved, "actions"), 200
+
+
+def delete_global_action_record(user_id, action_id):
+    _validate_identifier(action_id, "action identifier")
+    settings = get_settings()
+    existing = read_global_editor_record("actions", action_id)
+    delete_global_editor_record("actions", user_id, existing, settings)
+    log_committed_global_editor_change("actions", user_id, existing, "deletion")
+    return {"success": True}, 200
diff --git a/application/single_app/functions_workspace_authoring.py b/application/single_app/functions_workspace_authoring.py
index a16fabfe2..62db0aa74 100644
--- a/application/single_app/functions_workspace_authoring.py
+++ b/application/single_app/functions_workspace_authoring.py
@@ -54,6 +54,16 @@
     ("new_foundry", "New Foundry", "allow_group_new_foundry_agents"),
     ("foundry_workflow", "Foundry Workflow", "allow_group_new_foundry_agents"),
 )
+# Global agents may be any type. The classic admin agent editor offers all four, and
+# the tenant-wide ``allow_*foundry_agents`` defaults have no administrator control,
+# so gating on them would take Foundry agents away from the one surface that has
+# always been able to create them.
+_GLOBAL_AGENT_TYPES = (
+    ("local", "Local agent", None),
+    ("aifoundry", "Azure AI Foundry", None),
+    ("new_foundry", "New Foundry", None),
+    ("foundry_workflow", "Foundry Workflow", None),
+)
 _BUILTIN_ACTIONS = (
     ("time", "Time", "enable_time_plugin"),
     ("fact_memory", "Fact memory", "enable_fact_memory_plugin"),
@@ -107,6 +117,23 @@
     "enable_url_access": False,
     **{flag: False for _, _, flag in _BUILTIN_ACTIONS},
 }
+# The global agent editor options: the same shape again, with no workspace
+# permission in it, because a global agent is the organisation's and is authored
+# only by an administrator.
+_GLOBAL_OPTION_DEFAULTS = {
+    "enable_semantic_kernel": False,
+    "per_user_semantic_kernel": False,
+    "merge_global_semantic_kernel_with_workspace": False,
+    "enable_multi_model_endpoints": False,
+    "default_model_selection": {},
+    "gpt_model": {},
+    "enable_gpt_apim": False,
+    "azure_apim_gpt_deployment": "",
+    "enable_agent_template_gallery": False,
+    "enable_web_search": False,
+    "enable_url_access": False,
+    **{flag: False for _, _, flag in _BUILTIN_ACTIONS},
+}
 
 
 class WorkspaceAuthoringConflict(ValueError):
@@ -471,7 +498,7 @@ def merge(before, changes, path=(), *, replace_objects=False):
     return result
 
 
-def _secret_scope(kind, user_id, record, path, group_id=None):
+def _secret_scope(kind, user_id, record, path, group_id=None, *, global_scope=False):
     """Resolve the Key Vault (scope_value, source, scope) for one credential path.
 
     Group resources store their credentials in the group's Key Vault namespace so a
@@ -484,7 +511,15 @@ def _secret_scope(kind, user_id, record, path, group_id=None):
     so ``{agent_id}--agent--group--{name}`` names written by the legacy group route
     resolve, and so a group agent never mints a ``--user--`` secret the legacy
     ``scope="group"`` delete would leave behind (M4C §2.1).
+
+    Global agents and actions are keyed by their own id in the ``global`` namespace,
+    which is how ``save_global_agent`` and ``save_global_action`` name them, so a
+    record saved by the classic admin editor can be edited here and the reverse.
     """
+    if global_scope:
+        if kind == "agents":
+            return (record["id"], "agent", "global")
+        return (record["id"], "action" if path[0] == "auth" else "action-addset", "global")
     if kind == "agents":
         return (record["id"], "agent", "group" if group_id else "user")
     source = "action" if path[0] == "auth" else "action-addset"
@@ -493,7 +528,7 @@ def _secret_scope(kind, user_id, record, path, group_id=None):
     return (user_id, source, "user")
 
 
-def _legacy_editor_secret_reference(record, path, kind, user_id, settings, group_id=None):
+def _legacy_editor_secret_reference(record, path, kind, user_id, settings, group_id=None, *, global_scope=False):
     """Recover a legacy stored trigger only from its owned, conventional Key Vault name."""
     unavailable = "A stored secret is unavailable. Re-enter its value."
     if not settings.get("enable_key_vault_secret_storage") or not settings.get("key_vault_name"):
@@ -518,7 +553,9 @@ def _legacy_editor_secret_reference(record, path, kind, user_id, settings, group
             secret_name = keyvault._build_plugin_additional_field_secret_name(name, f"mcp-custom-header-{path[2]}")
     if not secret_name:
         raise WorkspaceAuthoringValidation(unavailable)
-    scope_value, source, kv_scope = _secret_scope(kind, user_id, record, path, group_id)
+    scope_value, source, kv_scope = _secret_scope(
+        kind, user_id, record, path, group_id, global_scope=global_scope,
+    )
     try:
         reference = keyvault.build_full_secret_name(secret_name, scope_value, source, kv_scope)
         value = keyvault.resolve_secret_reference_for_context(
@@ -545,12 +582,14 @@ def _supported_storage_paths(record, kind):
     }
 
 
-def _check_stored_references(record, kind, user_id, group_id=None):
+def _check_stored_references(record, kind, user_id, group_id=None, *, global_scope=False):
     keyvault = import_module("functions_keyvault")
     for path in editor_secret_paths(record, kind):
         value = _get(record, path)
         if _is_reference(value):
-            scope_value, source, kv_scope = _secret_scope(kind, user_id, record, path, group_id)
+            scope_value, source, kv_scope = _secret_scope(
+                kind, user_id, record, path, group_id, global_scope=global_scope,
+            )
             if not keyvault.secret_reference_matches_context(
                 value, scope_value=scope_value, scope=kv_scope, allowed_sources={source},
             ):
@@ -576,10 +615,10 @@ def _cleanup_staged_secrets(references):
         )
 
 
-def _stage_editor_secrets(record, kind, user_id, settings, staged, group_id=None):
+def _stage_editor_secrets(record, kind, user_id, settings, staged, group_id=None, *, global_scope=False):
     """Fresh names isolate failed CAS writes from every credential in a stored manifest."""
     keyvault = import_module("functions_keyvault")
-    _check_stored_references(record, kind, user_id, group_id)
+    _check_stored_references(record, kind, user_id, group_id, global_scope=global_scope)
     if not settings.get("enable_key_vault_secret_storage", False):
         return
     if not settings.get("key_vault_name"):
@@ -590,7 +629,9 @@ def _stage_editor_secrets(record, kind, user_id, settings, staged, group_id=None
             continue
         if not isinstance(value, str):
             raise WorkspaceAuthoringValidation("Credentials must be text values.")
-        scope_value, source, kv_scope = _secret_scope(kind, user_id, record, path, group_id)
+        scope_value, source, kv_scope = _secret_scope(
+            kind, user_id, record, path, group_id, global_scope=global_scope,
+        )
         secret_name = f"editor-{uuid.uuid4().hex}"
         reference = keyvault.store_secret_in_key_vault(
             secret_name, value, scope_value, source=source, scope=kv_scope,
@@ -603,14 +644,16 @@ def _stage_editor_secrets(record, kind, user_id, settings, staged, group_id=None
         _set(record, path, reference)
 
 
-def _cleanup_replaced_secrets(record, kind, user_id, settings, group_id=None):
+def _cleanup_replaced_secrets(record, kind, user_id, settings, group_id=None, *, global_scope=False):
     if not record or not settings.get("enable_key_vault_secret_storage") or not settings.get("key_vault_name"):
         return
     keyvault = import_module("functions_keyvault")
     references = set()
     for path in _supported_storage_paths(record, kind):
         value = _get(record, path, None)
-        scope_value, source, kv_scope = _secret_scope(kind, user_id, record, path, group_id)
+        scope_value, source, kv_scope = _secret_scope(
+            kind, user_id, record, path, group_id, global_scope=global_scope,
+        )
         if isinstance(value, str) and keyvault.secret_reference_matches_context(
             value, scope_value=scope_value, scope=kv_scope, allowed_sources={source},
         ):
@@ -620,7 +663,11 @@ def _cleanup_replaced_secrets(record, kind, user_id, settings, group_id=None):
     try:
         # Legacy names may be shared after a classic rename. Never delete a reference
         # still used by another owned manifest (including the just-committed one).
-        if group_id:
+        if global_scope:
+            still_used = _container(kind, "global").query_items(
+                query="SELECT * FROM c", enable_cross_partition_query=True,
+            )
+        elif group_id:
             still_used = _container(kind, "group").query_items(
                 query="SELECT * FROM c WHERE c.group_id = @group_id",
                 parameters=[{"name": "@group_id", "value": group_id}], partition_key=group_id,
@@ -644,7 +691,7 @@ def _cleanup_replaced_secrets(record, kind, user_id, settings, group_id=None):
         )
 
 
-def _sync_editor_reminders(saved, kind, user_id, settings, group_id=None):
+def _sync_editor_reminders(saved, kind, user_id, settings, group_id=None, *, global_scope=False):
     if kind != "actions" or not settings.get("enable_key_vault_secret_storage"):
         return saved
     metadata = saved.get("metadata") or {}
@@ -652,15 +699,21 @@ def _sync_editor_reminders(saved, kind, user_id, settings, group_id=None):
         return saved
     keyvault = import_module("functions_keyvault")
     updated = deepcopy(saved)
-    partition = group_id or user_id
-    scope = "group" if group_id else "personal"
+    if global_scope:
+        # Global records are partitioned by their own id.
+        partition, scope = saved["id"], "global"
+    else:
+        partition = group_id or user_id
+        scope = "group" if group_id else "personal"
     try:
         # The main CAS already succeeded. In particular, a stale request cannot
         # update expiration on a previously stored credential or reminder inventory.
         for path in _supported_storage_paths(updated, kind):
             reference = _get(updated, path, None)
             if isinstance(reference, str) and keyvault.validate_secret_name_dynamic(reference):
-                scope_value, source, kv_scope = _secret_scope(kind, user_id, updated, path, group_id)
+                scope_value, source, kv_scope = _secret_scope(
+                    kind, user_id, updated, path, group_id, global_scope=global_scope,
+                )
                 keyvault._sync_plugin_secret_reminder(updated, path, reference, scope_value, source, kv_scope)
         sync_status = (updated.get("metadata") or {}).get("key_vault_secret_reminder_sync")
         if sync_status is not None and sync_status != metadata.get("key_vault_secret_reminder_sync"):
@@ -679,11 +732,17 @@ def _sync_editor_reminders(saved, kind, user_id, settings, group_id=None):
     return saved
 
 
-def _invalidate_editor_catalog(kind, user_id, operation, group_id=None):
+def _invalidate_editor_catalog(kind, user_id, operation, group_id=None, *, global_scope=False):
     builtins.kernel_reload_needed = True
     try:
         cache = import_module("functions_chat_bootstrap_cache")
-        if group_id:
+        if global_scope:
+            # A global agent or action reaches every user, exactly as the classic
+            # global saves invalidate it.
+            cache.bump_chat_bootstrap_global_cache_version(
+                reason=f"global_{'agent' if kind == 'agents' else 'action'}_{operation}",
+            )
+        elif group_id:
             # Group resource changes affect every member, so invalidate globally,
             # exactly as the classic group action and agent saves do (M4C §2.2).
             cache.bump_chat_bootstrap_global_cache_version(
@@ -1072,9 +1131,242 @@ def apply_group_agent_write(user_id, group_id, existing, body, prepare, settings
     return save_group_editor_record("agents", user_id, group_id, prepared, existing, settings)
 
 
+# === Global (administrator) agent and action editor ===
+# Global agents and actions reuse the same engine once more. The administrator
+# boundary is enforced by the routes; these helpers bind the global containers
+# (partitioned by id), the global Key Vault namespace (keyed by the record id, as the
+# classic global saves name it), the global catalogue invalidation, and the two
+# rules the classic admin routes apply: a name is unique among global records of
+# its kind ignoring case, and the selected default agent cannot be deleted.
+
+def _assert_global_record_access(record):
+    """A stored global record must not claim a group or personal owner."""
+    if (
+        record.get("is_group")
+        or record.get("group_id")
+        or record.get("scope") not in (None, "", "global")
+    ):
+        raise LookupError("This resource is unavailable.")
+
+
+def read_global_editor_record(kind, record_id):
+    """Read one raw global record for the editor."""
+    if not isinstance(record_id, str) or not record_id or any(char in record_id for char in "/\\?#"):
+        raise LookupError("This resource is unavailable.")
+    exceptions = import_module("azure.cosmos.exceptions")
+    try:
+        record = _container(kind, "global").read_item(item=record_id, partition_key=record_id)
+    except exceptions.CosmosResourceNotFoundError as exc:
+        raise LookupError("This resource is unavailable.") from exc
+    if record.get("id") != record_id:
+        raise LookupError("This resource is unavailable.")
+    _assert_global_record_access(record)
+    return deepcopy(record)
+
+
+def list_global_editor_records(kind):
+    """Return every raw global record of a kind, enabled or not, for the admin list."""
+    records = []
+    for record in _container(kind, "global").query_items(
+        query="SELECT * FROM c", enable_cross_partition_query=True,
+    ):
+        try:
+            _assert_global_record_access(record)
+        except LookupError:
+            continue
+        records.append(record)
+    return records
+
+
+def _assert_global_available_name(kind, record, existing):
+    """Refuse a name another global record of the kind already holds, ignoring case.
+
+    The classic admin routes apply the same rule. An unchanged name is accepted even
+    when a legacy duplicate exists, so an edit is never blocked by data it did not
+    create.
+    """
+    name = record.get("name")
+    if not isinstance(name, str) or not name.strip():
+        raise WorkspaceAuthoringValidation("A name is required.")
+    if existing and name == existing.get("name"):
+        return
+    matches = _container(kind, "global").query_items(
+        query="SELECT c.id FROM c WHERE STRINGEQUALS(c.name, @name, true)",
+        parameters=[{"name": "@name", "value": name}], enable_cross_partition_query=True,
+    )
+    if any(match.get("id") != (existing or {}).get("id") for match in matches):
+        label = "agent" if kind == "agents" else "action"
+        raise WorkspaceAuthoringValidation(f"A global {label} with this name already exists.")
+
+
+def save_global_editor_record(kind, user_id, record, existing, settings):
+    """Save one prepared global manifest with a mandatory conditional write."""
+    if existing:
+        try:
+            current = read_global_editor_record(kind, existing["id"])
+        except LookupError as exc:
+            raise WorkspaceAuthoringConflict("This resource changed. Reload it before saving.") from exc
+        if not existing.get("_etag") or existing["_etag"] != current.get("_etag"):
+            raise WorkspaceAuthoringConflict("This resource changed. Reload it before saving.")
+    delegation = import_module("functions_agent_delegation")
+    if kind == "agents":
+        delegation.validate_agent_delegation_bindings(
+            record, user_id=user_id, scope_type="global", scope_id="global",
+            settings=settings, existing_agent=existing,
+        )
+    else:
+        record = delegation.validate_agent_action_for_scope(
+            record, user_id=user_id, scope_type="global", scope_id="global", settings=settings,
+        )
+        identities = import_module("functions_workspace_identities")
+        identities.validate_action_identity_reference(
+            record, identities.WORKSPACE_IDENTITY_SCOPE_GLOBAL, identities.WORKSPACE_IDENTITY_SCOPE_GLOBAL,
+        )
+    result = {
+        key: deepcopy(value) for key, value in record.items()
+        if not key.startswith("_") and key not in _MANAGED_FIELDS
+    }
+    now = datetime.now(timezone.utc).isoformat()
+    result.update({
+        "id": existing["id"] if existing else record["id"],
+        "created_at": (existing or {}).get("created_at", now),
+        "created_by": (existing or {}).get("created_by", user_id),
+        "modified_at": now, "modified_by": user_id, "updated_at": now,
+        # The stored shape the classic global saves write, which the runtime and the
+        # chat catalogue branch on.
+        "is_global": True, "is_group": False,
+    })
+    if kind == "actions":
+        result.update({"scope": "global", "scope_id": "global"})
+    result["is_enabled"] = bool(result.get("is_enabled", (existing or {}).get("is_enabled", True)))
+    staged = []
+    write_started = False
+    exceptions = import_module("azure.cosmos.exceptions")
+    try:
+        _stage_editor_secrets(result, kind, user_id, settings, staged, global_scope=True)
+        container = _container(kind, "global")
+        write_started = True
+        if existing:
+            saved = container.replace_item(
+                item=existing["id"], body=result, etag=existing["_etag"],
+                match_condition=import_module("azure.core").MatchConditions.IfNotModified,
+            )
+        else:
+            saved = container.create_item(body=result)
+    except Exception as exc:
+        conflict_response = isinstance(exc, exceptions.CosmosHttpResponseError) and (
+            exc.status_code in (409, 412) or (existing is not None and exc.status_code == 404)
+        )
+        if not write_started:
+            _cleanup_staged_secrets(staged)
+        if conflict_response:
+            raise WorkspaceAuthoringConflict("This resource changed. Reload it before saving.") from exc
+        raise
+    saved = _sync_editor_reminders(saved, kind, user_id, settings, global_scope=True)
+    _cleanup_replaced_secrets(existing, kind, user_id, settings, global_scope=True)
+    _invalidate_editor_catalog(kind, user_id, "saved", global_scope=True)
+    return saved
+
+
+def delete_global_editor_record(kind, user_id, record, settings):
+    """Delete one global record with a mandatory conditional write."""
+    _assert_global_record_access(record)
+    if not record.get("_etag"):
+        raise WorkspaceAuthoringConflict("Reload this resource before deleting it.")
+    if kind == "agents":
+        selected = settings.get("global_selected_agent")
+        if isinstance(selected, dict) and selected.get("name") == record.get("name"):
+            raise WorkspaceAuthoringValidation("Choose another default agent before deleting this agent.")
+    exceptions = import_module("azure.cosmos.exceptions")
+    try:
+        _container(kind, "global").delete_item(
+            item=record["id"], partition_key=record["id"], etag=record["_etag"],
+            match_condition=import_module("azure.core").MatchConditions.IfNotModified,
+        )
+    except exceptions.CosmosHttpResponseError as exc:
+        if exc.status_code in (404, 412):
+            raise WorkspaceAuthoringConflict("This resource changed. Reload it before deleting.") from exc
+        raise
+    _cleanup_replaced_secrets(record, kind, user_id, settings, global_scope=True)
+    _invalidate_editor_catalog(kind, user_id, "deleted", global_scope=True)
+
+
+def _prepared_or_error(prepared, error, kind):
+    if error:
+        status = error[1] if isinstance(error, tuple) else 400
+        if status == 403:
+            raise PermissionError("This configuration is unavailable.")
+        raise WorkspaceAuthoringValidation(
+            "Invalid agent configuration." if kind == "agents" else "Invalid action configuration."
+        )
+    return prepared
+
+
+def apply_global_action_write(user_id, existing, body, prepare, settings):
+    """Merge editor intent, validate through ``prepare``, and persist one global action.
+
+    Mirrors :func:`apply_group_action_write`: the server allocates a new action's id,
+    and stored secret placeholders resolve against the global Key Vault namespace.
+    ``prepare`` takes ``(user_id, plugin, settings, existing)``.
+    """
+    merged = merge_editor_write(
+        existing or {}, body, "actions", creating=existing is None,
+        resolve_stored_placeholder=lambda record, path: _legacy_editor_secret_reference(
+            record, path, "actions", user_id, settings, global_scope=True,
+        ),
+    )
+    if not existing:
+        merged["id"] = str(uuid.uuid4())
+        merged.setdefault("displayName", merged.get("name", ""))
+        merged.setdefault("description", "")
+    proposed = deepcopy(merged)
+    prepared, error = prepare(
+        user_id, _editor_validation_input("actions", merged, existing), settings, existing,
+    )
+    prepared = _prepared_or_error(prepared, error, "actions")
+    if existing:
+        prepared = _preserve_unedited_values(existing, proposed, prepared)
+    _assert_global_available_name("actions", prepared, existing)
+    return save_global_editor_record("actions", user_id, prepared, existing, settings)
+
+
+def apply_global_agent_write(user_id, existing, body, prepare, settings):
+    """Merge editor intent, validate through ``prepare``, and persist one global agent.
+
+    Mirrors :func:`apply_group_agent_write`: the id is a client-allocated UUID, and the
+    agent-type gate runs against the tenant-wide Foundry flags the classic admin editor
+    reads. ``prepare`` takes ``(user_id, agent, settings, existing)``.
+    """
+    merged = merge_editor_write(
+        existing or {}, body, "agents", creating=existing is None,
+        resolve_stored_placeholder=lambda record, path: _legacy_editor_secret_reference(
+            record, path, "agents", user_id, settings, global_scope=True,
+        ),
+    )
+    if not existing:
+        try:
+            merged["id"] = str(uuid.UUID(merged.get("id", "")))
+        except (ValueError, TypeError, AttributeError) as exc:
+            raise WorkspaceAuthoringValidation("Allocate an agent ID before saving.") from exc
+        merged.setdefault("display_name", merged.get("name", ""))
+        merged.setdefault("description", "")
+        merged.setdefault("instructions", "")
+    _validate_agent_editor_changes(merged, existing, settings, user_id, scope="global")
+    proposed = deepcopy(merged)
+    prepared, error = prepare(
+        user_id, _editor_validation_input("agents", merged, existing), settings, existing,
+    )
+    prepared = _prepared_or_error(prepared, error, "agents")
+    if existing:
+        prepared = _preserve_unedited_values(existing, proposed, prepared)
+    _assert_global_available_name("agents", prepared, existing)
+    return save_global_editor_record("agents", user_id, prepared, existing, settings)
+
+
 def _validate_agent_editor_changes(record, existing, settings, user_id, *, scope="personal"):
     is_group = scope == "group"
-    type_table = _GROUP_AGENT_TYPES if is_group else _AGENT_TYPES
+    is_global = scope == "global"
+    type_table = _GROUP_AGENT_TYPES if is_group else _GLOBAL_AGENT_TYPES if is_global else _AGENT_TYPES
     endpoint_flag = "allow_group_custom_endpoints" if is_group else "allow_user_custom_endpoints"
     endpoint_governance = "governance_group_endpoints" if is_group else "governance_user_endpoints"
     surface = "group" if is_group else "personal"
@@ -1086,6 +1378,11 @@ def _validate_agent_editor_changes(record, existing, settings, user_id, *, scope
         raise PermissionError(f"This agent type is disabled for {surface} workspaces.")
     if kind != "local" and record.get("actions_to_load"):
         raise WorkspaceAuthoringValidation("Remove local actions explicitly before selecting a Foundry agent type.")
+    if is_global:
+        # An administrator may give a global agent its own model connection, as the
+        # classic admin editor always allowed; the workspace custom-endpoint
+        # permissions govern people's own agents, not the organisation's.
+        return
     if kind == "local":
         configured_connection = any(
             record.get(field) not in (None, "")
@@ -1315,6 +1612,30 @@ def log_committed_group_editor_change(kind, user_id, group_id, stored, operation
         )
 
 
+def log_committed_global_editor_change(kind, user_id, stored, operation):
+    """Record a committed global editor write, mirroring the group logger.
+
+    Called only after the conditional write has committed, so a refused write is never
+    logged, and a logging failure never fails the write. ``scope`` is ``"global"``,
+    the scope the classic admin routes record.
+    """
+    activity = import_module("functions_activity_logging")
+    prefix = "agent" if kind == "agents" else "action"
+    event = getattr(activity, f"log_{prefix}_{operation}")
+    try:
+        event(
+            user_id=user_id, scope="global",
+            **{f"{prefix}_id": stored.get("id", ""), f"{prefix}_name": stored.get("name", "")},
+            **({"agent_display_name": stored.get("display_name", "")} if prefix == "agent" and operation != "deletion" else {}),
+            **({"action_type": stored.get("type", "")} if prefix == "action" and operation != "deletion" else {}),
+        )
+    except Exception as exc:
+        import_module("functions_appinsights").log_event(
+            "[WORKSPACE_ACTIVITY] Unable to record a committed editor change.",
+            level=logging.WARNING, extra={"error_type": type(exc).__name__},
+        )
+
+
 def build_secret_reminder_defaults(settings):
     """The tenant-level Key Vault reminder defaults both editor option builders share.
 
@@ -1501,6 +1822,58 @@ def build_group_agent_editor_options(user_id, group_id, settings, model_endpoint
     }
 
 
+def build_global_agent_editor_options(settings, model_endpoints):
+    """The global agent editor options, for an administrator.
+
+    The personal and group shape, with what a global agent needs: every agent type is
+    offered, as the classic admin editor offers them all, every global model connection
+    is offered (an administrator manages them, so no per-user governance filter
+    applies), and template submission follows the gate the submit route applies to an
+    administrator. Secrets are masked and reminder defaults are shared with the other
+    builders.
+    """
+    settings_module = import_module("functions_settings")
+    sanitized = settings_module.sanitize_settings_for_user({
+        key: deepcopy(settings.get(key, default)) for key, default in _GLOBAL_OPTION_DEFAULTS.items()
+    })
+    safe = {key: sanitized[key] for key in _GLOBAL_OPTION_DEFAULTS if key in sanitized}
+    model_endpoints = settings_module.sanitize_settings_for_user(
+        {"model_endpoints": filter_model_endpoints_by_capability(model_endpoints, preserve_empty=True)},
+    ).get("model_endpoints", [])
+    # These names contain "key"/"secret", but their values are strictly UI flags/defaults.
+    reminder_options = build_secret_reminder_defaults(settings)
+    safe.update({
+        "enable_key_vault_secret_storage": reminder_options["storage_enabled"],
+        "enable_key_vault_secret_expiration_reminders": reminder_options["reminders_enabled"],
+        "key_vault_secret_expiration_default_lead_days": reminder_options["lead_days"],
+        "key_vault_secret_expiration_default_contact_email": reminder_options["contact_email"],
+        "key_vault_secret_expiration_require_expiration": reminder_options["require_expiration"],
+    })
+    templates_module = import_module("functions_agent_templates")
+    safe["agent_template_submission_allowed"] = templates_module.agent_template_submission_decision(
+        settings, True,
+    )[0]
+    endpoints = [deepcopy(endpoint) for endpoint in model_endpoints if endpoint.get("scope") == "global"]
+    for endpoint in endpoints:
+        for path in editor_secret_paths(endpoint, "agents"):
+            _set(endpoint, path, EDITOR_SECRET_MASK)
+    safe["enable_multi_model_endpoints"] = bool(
+        safe.get("enable_multi_model_endpoints") or any(endpoint.get("models") for endpoint in endpoints)
+    )
+    return {
+        "agent_types": [
+            {"value": value, "label": label, "enabled": True}
+            for value, label, _flag in _GLOBAL_AGENT_TYPES
+        ],
+        "settings": safe,
+        "model_endpoints": endpoints,
+        "builtin_actions": [
+            {"id": value, "label": label}
+            for value, label, flag in _BUILTIN_ACTIONS if safe.get(flag)
+        ],
+    }
+
+
 def build_action_editor_types(discovered_types):
     """Enrich governed discovery with canonical local schemas, without example defaults."""
     validation = import_module("json_schema_validation")
diff --git a/application/single_app/route_backend_agents.py b/application/single_app/route_backend_agents.py
index 5ec735f7e..da2823d88 100644
--- a/application/single_app/route_backend_agents.py
+++ b/application/single_app/route_backend_agents.py
@@ -1344,6 +1344,54 @@ def _prepare_group_agent_payload(user_id, group_id, agent, settings, existing):
     return cleaned_agent, None
 
 
+def _prepare_global_agent_payload(user_id, agent, settings, existing):
+    """Clean, enrich and validate one global agent for the V2 admin editor routes.
+
+    Applies the rules the classic ``/api/admin/agents`` routes apply: the payload is
+    sanitized and marked global, assigned knowledge resolves in global scope with the
+    administrator's access, the schema validates, and Call agent attachments validate
+    against the global scope. Returns ``(cleaned_agent, error_response)`` with exactly
+    one set; the signature matches ``apply_global_agent_write``.
+    """
+    try:
+        cleaned_agent = sanitize_agent_payload(agent)
+    except AgentPayloadError as exc:
+        return None, (jsonify({'error': str(exc)}), 400)
+
+    cleaned_agent['is_global'] = True
+    cleaned_agent['is_group'] = False
+
+    try:
+        if existing is None or (
+            cleaned_agent.get('other_settings', {}).get('assigned_knowledge')
+            != (existing.get('other_settings') or {}).get('assigned_knowledge')
+        ):
+            cleaned_agent = apply_assigned_knowledge_to_agent_payload(
+                cleaned_agent,
+                user_id=user_id,
+                agent_scope='global',
+                is_admin=True,
+            )
+    except AssignedKnowledgeError as exc:
+        return None, (jsonify({'error': str(exc)}), 400)
+
+    validation_error = validate_agent(cleaned_agent)
+    if validation_error:
+        return None, (jsonify({'error': f'Agent validation failed: {validation_error}'}), 400)
+
+    try:
+        validate_agent_delegation_bindings(
+            cleaned_agent, user_id=user_id, scope_type='global', scope_id='global',
+            settings=settings, existing_agent=existing,
+        )
+    except PermissionError:
+        return None, (jsonify({'error': 'You are not authorized to attach these agent actions.'}), 403)
+    except (ValueError, LookupError):
+        return None, (jsonify({'error': 'Invalid or unavailable Call agent action selection.'}), 400)
+
+    return cleaned_agent, None
+
+
 def _create_personal_agent(user_id, payload):
     """Create one personal agent from an object body."""
     try:
diff --git a/application/single_app/route_backend_plugins.py b/application/single_app/route_backend_plugins.py
index ee806d00a..c2681bf6d 100644
--- a/application/single_app/route_backend_plugins.py
+++ b/application/single_app/route_backend_plugins.py
@@ -1495,6 +1495,82 @@ def _prepare_group_action_payload(user_id, group_id, plugin, settings, existing)
     return plugin_to_save, None
 
 
+def _prepare_global_action_payload(user_id, plugin, settings, existing):
+    """Clean, default and validate one global action for the V2 admin editor routes.
+
+    Mirrors ``_prepare_group_action_payload`` with the checks the classic
+    ``/api/admin/plugins`` routes apply to a global action: the type must be one the
+    deployment provides (a legacy type only when editing a record that already has
+    it), the identity and the MCP destination policy resolve against the global
+    scope, and per-type workspace governance does not apply, because an administrator
+    authors the organisation's actions. Returns ``(plugin_to_save, error_response)``
+    with exactly one set; the signature matches ``apply_global_action_write``.
+    """
+    validate_legacy_action_update(plugin, existing)
+    plugin_to_save = dict(plugin)
+    if 'is_global' in plugin_to_save:
+        del plugin_to_save['is_global']
+    if 'is_group' in plugin_to_save:
+        del plugin_to_save['is_group']
+
+    plugin_to_save.setdefault('name', '')
+    plugin_to_save.setdefault('displayName', plugin_to_save.get('name', ''))
+    plugin_to_save.setdefault('description', '')
+    plugin_to_save.setdefault('metadata', {})
+    plugin_to_save.setdefault('additionalFields', {})
+
+    for field in PLUGIN_STORAGE_MANAGED_FIELDS:
+        if field == 'id':
+            continue
+        plugin_to_save.pop(field, None)
+    for field in ('execution_status', 'is_legacy', 'legacy_source', 'legacy_locator', 'runtime_user_id'):
+        plugin_to_save.pop(field, None)
+
+    plugin_to_save.setdefault('endpoint', '')
+    _apply_plugin_runtime_defaults(plugin_to_save)
+    plugin_type = plugin_to_save['type']
+    allowed_types = discover_plugin_types(include_legacy=existing is not None)
+    if allowed_types is not None and plugin_type not in allowed_types:
+        return None, (jsonify({'error': 'This action type is not available.'}), 400)
+    try:
+        _validate_action_identity_for_scope(
+            plugin_to_save,
+            WORKSPACE_IDENTITY_SCOPE_GLOBAL,
+            WORKSPACE_IDENTITY_SCOPE_GLOBAL,
+        )
+    except (ValueError, LookupError, PermissionError):
+        return None, (jsonify({'error': 'Action identity configuration is invalid.'}), 400)
+
+    if 'auth' not in plugin_to_save:
+        plugin_to_save['auth'] = {'type': 'identity'}
+    elif not isinstance(plugin_to_save['auth'], dict):
+        plugin_to_save['auth'] = {'type': 'identity'}
+    elif 'type' not in plugin_to_save['auth']:
+        plugin_to_save['auth']['type'] = 'identity'
+
+    validation_error = validate_editor_action_manifest(plugin_to_save)
+    if validation_error:
+        return None, (jsonify({'error': f'Plugin validation failed: {validation_error}'}), 400)
+    is_valid, validation_errors = PluginHealthChecker.validate_plugin_manifest(plugin_to_save, plugin_type)
+    if not is_valid:
+        return None, (jsonify({'error': f'Plugin validation failed: {"; ".join(validation_errors)}'}), 400)
+
+    try:
+        _enforce_mcp_destination_policy(
+            plugin_to_save,
+            WORKSPACE_IDENTITY_SCOPE_GLOBAL,
+            WORKSPACE_IDENTITY_SCOPE_GLOBAL,
+            operation='global_action_save',
+            user_id=user_id,
+        )
+    except PermissionError:
+        return None, (jsonify({'error': 'MCP destination is not allowed by governance policy.'}), 403)
+    except ValueError:
+        return None, (jsonify({'error': 'MCP destination configuration is invalid.'}), 400)
+
+    return plugin_to_save, None
+
+
 def _save_personal_action_or_error(user_id, plugin_to_save, legacy_locator=None):
     """Persist one personal action, mapping the storage failures onto HTTP responses."""
     try:
diff --git a/application/single_app/route_backend_v2_admin_agents_actions.py b/application/single_app/route_backend_v2_admin_agents_actions.py
new file mode 100644
index 000000000..036b15318
--- /dev/null
+++ b/application/single_app/route_backend_v2_admin_agents_actions.py
@@ -0,0 +1,212 @@
+# route_backend_v2_admin_agents_actions.py
+"""V2 Admin Settings routes for the global agent and action editors.
+
+These serve the same V2 agent and action editors personal and group workspaces use,
+for the organisation's global agents and actions. Every route requires the Admin
+role; the shared editor contract, conditional writes and secret handling are
+described in ``functions_global_editor_access``.
+"""
+
+from functools import wraps
+
+from flask import jsonify
+
+from functions_authentication import admin_required, get_current_user_id, login_required
+from functions_global_editor_access import (
+    create_global_action,
+    create_global_agent,
+    delete_global_action_record,
+    delete_global_agent_record,
+    get_global_action,
+    get_global_action_options,
+    get_global_agent,
+    get_global_agent_options,
+    global_editor_error_response,
+    list_global_actions,
+    list_global_agents,
+    read_json_body,
+    reject_query_parameters,
+    reject_request_body,
+    update_global_action,
+    update_global_agent,
+)
+from functions_workspace_authoring import build_action_editor_types
+from route_backend_agents import _prepare_global_agent_payload
+from route_backend_plugins import _prepare_global_action_payload, get_plugin_types
+from swagger_wrapper import swagger_route, get_auth_security
+
+
+def _global_editor_boundary(function):
+    @wraps(function)
+    def guarded(*args, **kwargs):
+        try:
+            return function(*args, **kwargs)
+        except Exception as error:  # noqa: BLE001 - all mapped to stable HTTP responses
+            return global_editor_error_response(error)
+    return guarded
+
+
+def _no_store(payload, status):
+    # Editor reads carry configuration, so they stay out of shared caches.
+    response = jsonify(payload)
+    response.headers['Cache-Control'] = 'no-store'
+    return response, status
+
+
+def register_route_backend_v2_admin_agents_actions(bp):
+    """Register the global agent and action editor routes.
+
+    - GET    /api/v2/admin/agents
+    - POST   /api/v2/admin/agents
+    - GET    /api/v2/admin/agent-options
+    - GET    /api/v2/admin/agents/<agent_id>
+    - PATCH  /api/v2/admin/agents/<agent_id>
+    - DELETE /api/v2/admin/agents/<agent_id>
+    - GET    /api/v2/admin/actions
+    - POST   /api/v2/admin/actions
+    - GET    /api/v2/admin/actions/types
+    - GET    /api/v2/admin/action-options
+    - GET    /api/v2/admin/actions/<action_id>
+    - PATCH  /api/v2/admin/actions/<action_id>
+    - DELETE /api/v2/admin/actions/<action_id>
+    """
+
+    @bp.route('/api/v2/admin/agents', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_agents_list():
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*list_global_agents())
+
+    @bp.route('/api/v2/admin/agents', methods=['POST'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_agents_create():
+        reject_query_parameters()
+        return _no_store(*create_global_agent(
+            get_current_user_id(), read_json_body(), _prepare_global_agent_payload,
+        ))
+
+    @bp.route('/api/v2/admin/agent-options', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_agent_options():
+        # Its own path segment so it can never collide with /agents/<agent_id>.
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*get_global_agent_options())
+
+    @bp.route('/api/v2/admin/agents/<agent_id>', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_agent_read(agent_id):
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*get_global_agent(agent_id))
+
+    @bp.route('/api/v2/admin/agents/<agent_id>', methods=['PATCH'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_agent_update(agent_id):
+        reject_query_parameters()
+        return _no_store(*update_global_agent(
+            get_current_user_id(), agent_id, read_json_body(), _prepare_global_agent_payload,
+        ))
+
+    @bp.route('/api/v2/admin/agents/<agent_id>', methods=['DELETE'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_agent_delete(agent_id):
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*delete_global_agent_record(get_current_user_id(), agent_id))
+
+    @bp.route('/api/v2/admin/actions', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_actions_list():
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*list_global_actions())
+
+    @bp.route('/api/v2/admin/actions', methods=['POST'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_actions_create():
+        reject_query_parameters()
+        return _no_store(*create_global_action(
+            get_current_user_id(), read_json_body(), _prepare_global_action_payload,
+        ))
+
+    @bp.route('/api/v2/admin/actions/types', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_action_types():
+        # Every type the deployment provides, as the classic admin catalogue offers:
+        # per-type workspace governance applies to people's own actions, not to the
+        # organisation's.
+        reject_query_parameters()
+        reject_request_body()
+        discovered = get_plugin_types()
+        return _no_store({'types': build_action_editor_types(discovered.get_json())}, 200)
+
+    @bp.route('/api/v2/admin/action-options', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_action_options():
+        # Its own path segment so it can never collide with /actions/<action_id>.
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*get_global_action_options())
+
+    @bp.route('/api/v2/admin/actions/<action_id>', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_action_read(action_id):
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*get_global_action(action_id))
+
+    @bp.route('/api/v2/admin/actions/<action_id>', methods=['PATCH'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_action_update(action_id):
+        reject_query_parameters()
+        return _no_store(*update_global_action(
+            get_current_user_id(), action_id, read_json_body(), _prepare_global_action_payload,
+        ))
+
+    @bp.route('/api/v2/admin/actions/<action_id>', methods=['DELETE'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @admin_required
+    @_global_editor_boundary
+    def v2_admin_global_action_delete(action_id):
+        reject_query_parameters()
+        reject_request_body()
+        return _no_store(*delete_global_action_record(get_current_user_id(), action_id))
diff --git a/application/single_app/templates/admin/_panes/agents.html b/application/single_app/templates/admin/_panes/agents.html
index 86164afba..a9f814e19 100644
--- a/application/single_app/templates/admin/_panes/agents.html
+++ b/application/single_app/templates/admin/_panes/agents.html
@@ -207,7 +207,7 @@ <h4>Agent Orchestration Settings</h4>
                             </div>
                             <button type="button" class="btn btn-primary" id="save-orchestration-settings-btn">Save Orchestration Settings</button>
                         </div>
-                        <div class="d-flex justify-content-between align-items-center mb-3">
+                        <div class="d-flex justify-content-between align-items-center mb-3" id="organization-agents-section">
                             <h4>Global  Agents</h4>
                             <div class="d-flex align-items-center gap-2">
                                 <button type="button" class="btn btn-outline-info btn-sm agent-examples-trigger" data-bs-toggle="modal" data-bs-target="#agentExamplesModal" data-trigger-button="#add-agent-btn">
diff --git a/application/v2_ui/src/App.tsx b/application/v2_ui/src/App.tsx
index 5c3ac4e54..af8e156e4 100644
--- a/application/v2_ui/src/App.tsx
+++ b/application/v2_ui/src/App.tsx
@@ -19,6 +19,7 @@ import { restorePersistedRuns } from './stores/orchestrationStore';
 import { ChatPage } from './pages/ChatPage';
 import { HomePage } from './pages/HomePage';
 import { AdminSettingsPage } from './pages/AdminSettingsPage';
+import { AdminActionEditorPage, AdminAgentEditorPage } from './pages/AdminGlobalEditorPages';
 import { SettingsPage } from './pages/SettingsPage';
 import { WorkspacePage } from './pages/workspace/WorkspacePage';
 import { PlaceholderPage } from './pages/PlaceholderPage';
@@ -211,6 +212,11 @@ export function App() {
                 <Route path="/workspace/:section/:resourceId" element={<WorkspacePage />} />
                 <Route path="/settings" element={<SettingsPage />} />
                 <Route path="/admin" element={<AdminSettingsPage />} />
+                {/* The global editors return here, with their section in view. */}
+                <Route path="/admin/agents" element={<AdminSettingsPage focusSection="organization-agents-section" />} />
+                <Route path="/admin/actions" element={<AdminSettingsPage focusSection="actions-config" />} />
+                <Route path="/admin/agents/:resourceId" element={<AdminAgentEditorPage />} />
+                <Route path="/admin/actions/:resourceId" element={<AdminActionEditorPage />} />
                 <Route path="/content-review" element={<ContentReviewPage />} />
                 <Route
                     path="/agents"
diff --git a/application/v2_ui/src/components/admin/AgentTemplateApprovalsLink.tsx b/application/v2_ui/src/components/admin/AgentTemplateApprovalsLink.tsx
new file mode 100644
index 000000000..d1936c811
--- /dev/null
+++ b/application/v2_ui/src/components/admin/AgentTemplateApprovalsLink.tsx
@@ -0,0 +1,27 @@
+// AgentTemplateApprovalsLink.tsx
+// Where submitted agent templates are reviewed.
+//
+// Template review happens in the shared approvals queue, which the classic Approvals page
+// serves beside the other requests an administrator handles. This points there rather than
+// keeping a second copy of the queue. It opens in a new tab, so leaving for the queue never
+// drops settings that have not been saved yet.
+
+import { ExternalLink } from 'lucide-react';
+
+export function AgentTemplateApprovalsLink({ help }: { help?: string }) {
+    return (
+        <div className="py-3">
+            {help ? <p className="mb-2 text-xs leading-relaxed text-text-3">{help}</p> : null}
+            <a
+                href="/approvals#agent-template-approvals"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="inline-flex items-center gap-1.5 text-sm font-medium text-accent hover:underline"
+            >
+                Open the approvals queue
+                <span className="sr-only"> (opens in a new tab)</span>
+                <ExternalLink size={13} aria-hidden="true" />
+            </a>
+        </div>
+    );
+}
diff --git a/application/v2_ui/src/components/admin/GlobalActionsManager.tsx b/application/v2_ui/src/components/admin/GlobalActionsManager.tsx
new file mode 100644
index 000000000..7c15e6c1e
--- /dev/null
+++ b/application/v2_ui/src/components/admin/GlobalActionsManager.tsx
@@ -0,0 +1,178 @@
+// GlobalActionsManager.tsx
+// The organisation's global actions, listed and managed from Admin Settings.
+//
+// Actions are edited in the same V2 action editor workspaces use, at /admin/actions/<id>,
+// which carries the connector catalogue, MCP preconfigurations and presets, connection
+// tests and Key Vault handling. This list adds what the classic admin table offered around
+// it: creating one, enabling or disabling one, and deleting one. Each change saves on its
+// own rather than through the settings save bar, because these are records, not settings.
+
+import { useEffect, useMemo, useState } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+import { AlertCircle, Loader2, Plug, Plus, RefreshCw, Trash2 } from 'lucide-react';
+import { api } from '../../lib/apiClient';
+import { fetchGlobalActions, GLOBAL_ACTION_WORKBENCH } from '../../lib/actionWorkbench';
+import { actionTypeLabel } from '../../lib/workspaceActionLogic';
+import { GLOBAL_ACTIONS_BASE_PATH, type ActionConfiguration } from '../../lib/workspaceAuthoring';
+import { toast } from '../../stores/toastStore';
+import { GlassButton } from '../ui/primitives';
+import { ConfirmAction, Pill, SectionSearch } from '../workspace/primitives';
+
+/** Search appears once a list is long enough to need it. */
+const SEARCH_THRESHOLD = 6;
+
+function actionLabel(action: ActionConfiguration): string {
+    return action.displayName || action.name || 'Untitled action';
+}
+
+function failure(cause: unknown, fallback: string): string {
+    return cause instanceof Error && cause.message ? cause.message : fallback;
+}
+
+export function GlobalActionsManager({ help }: { help?: string }) {
+    const navigate = useNavigate();
+    const [actions, setActions] = useState<ActionConfiguration[] | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
+    const [busy, setBusy] = useState<string | null>(null);
+    const [query, setQuery] = useState('');
+    const [revision, setRevision] = useState(0);
+
+    useEffect(() => {
+        const controller = new AbortController();
+        setLoading(true);
+        setError(null);
+        void fetchGlobalActions(controller.signal).then((items) => {
+            if (!controller.signal.aborted) setActions(items);
+        }).catch((cause: unknown) => {
+            if (!controller.signal.aborted) setError(failure(cause, 'Could not load the global actions.'));
+        }).finally(() => {
+            if (!controller.signal.aborted) setLoading(false);
+        });
+        return () => controller.abort();
+    }, [revision]);
+
+    const reload = () => setRevision((value) => value + 1);
+
+    const visible = useMemo(() => {
+        const needle = query.trim().toLowerCase();
+        return [...(actions ?? [])]
+            .filter((action) => !needle || `${actionLabel(action)} ${action.name} ${action.description} ${actionTypeLabel(action.type)}`
+                .toLowerCase().includes(needle))
+            .sort((left, right) => actionLabel(left).localeCompare(actionLabel(right)));
+    }, [actions, query]);
+
+    /** Run one change, report it, and re-read the list so every row shows the stored state. */
+    const change = async (key: string, work: () => Promise<string>) => {
+        setBusy(key);
+        setError(null);
+        try {
+            toast.success(await work());
+            reload();
+        } catch (cause) {
+            setError(failure(cause, 'The change could not be saved.'));
+        } finally {
+            setBusy(null);
+        }
+    };
+
+    const toggleEnabled = (action: ActionConfiguration) => change(`enabled:${action.id}`, async () => {
+        const enable = action.is_enabled === false;
+        await api.patch(`/api/admin/plugins/${encodeURIComponent(action.name)}/enabled`, { is_enabled: enable });
+        return `${actionLabel(action)} ${enable ? 'enabled' : 'disabled'}.`;
+    });
+
+    const remove = (action: ActionConfiguration) => change(`delete:${action.id}`, async () => {
+        await GLOBAL_ACTION_WORKBENCH.deleteAction(action);
+        return `${actionLabel(action)} deleted.`;
+    });
+
+    return (
+        <div className="min-w-0 space-y-3 py-3" data-testid="global-actions-manager">
+            {help ? <p className="text-xs leading-relaxed text-text-3">{help}</p> : null}
+
+            <div className="flex flex-wrap items-center gap-2">
+                <GlassButton type="button" variant="primary" size="sm"
+                    onClick={() => navigate(`${GLOBAL_ACTIONS_BASE_PATH}/new`)}>
+                    <Plus size={14} aria-hidden="true" />New action
+                </GlassButton>
+                <GlassButton type="button" size="sm" disabled={loading} onClick={reload}>
+                    <RefreshCw size={14} aria-hidden="true" />Refresh
+                </GlassButton>
+            </div>
+
+            {(actions?.length ?? 0) >= SEARCH_THRESHOLD ? (
+                <SectionSearch value={query} onChange={setQuery} placeholder="Search global actions" />
+            ) : null}
+
+            {error ? (
+                <p role="alert" className="flex items-start gap-1.5 rounded-lg bg-danger-soft px-3 py-2 text-xs text-danger">
+                    <AlertCircle size={13} className="mt-0.5 shrink-0" aria-hidden="true" />
+                    {error}
+                </p>
+            ) : null}
+
+            {loading && actions === null ? (
+                <p role="status" className="flex items-center gap-2 py-4 text-sm text-text-3">
+                    <Loader2 size={15} className="animate-spin" aria-hidden="true" />
+                    Loading global actions…
+                </p>
+            ) : null}
+
+            {actions !== null && actions.length === 0 ? (
+                <p className="py-4 text-sm text-text-3">
+                    No global actions yet. Create one to connect global agents to an API, a database, an
+                    MCP server or another agent.
+                </p>
+            ) : null}
+            {actions !== null && actions.length > 0 && visible.length === 0 ? (
+                <p role="status" className="py-2 text-sm text-text-3">No global actions match “{query}”.</p>
+            ) : null}
+
+            {visible.length ? (
+                <ul className="space-y-2" aria-label="Global actions">
+                    {visible.map((action) => {
+                        const label = actionLabel(action);
+                        const enabled = action.is_enabled !== false;
+                        const editorPath = `${GLOBAL_ACTIONS_BASE_PATH}/${encodeURIComponent(action.id)}`;
+                        return (
+                            <li key={action.id} data-testid="global-action-row"
+                                className="flex flex-wrap items-start gap-3 rounded-xl border border-edge bg-surface-1 p-3">
+                                <div className="flex min-w-0 flex-[1_1_16rem] items-start gap-3">
+                                    <Plug size={20} aria-hidden="true" className="mt-0.5 shrink-0 text-accent" />
+                                    <div className="min-w-0 flex-1">
+                                        <h3 className="break-words text-sm font-semibold text-text-1">
+                                            <Link to={editorPath} className="hover:text-accent hover:underline">{label}</Link>
+                                        </h3>
+                                        {action.description ? (
+                                            <p className="mt-0.5 break-words text-xs text-text-3">{action.description}</p>
+                                        ) : null}
+                                        <div className="mt-2 flex flex-wrap items-center gap-1.5">
+                                            <Pill>{actionTypeLabel(action.type)}</Pill>
+                                            {!enabled ? <Pill tone="warn">Disabled</Pill> : null}
+                                        </div>
+                                        <p className="mt-1.5 break-all text-[11px] text-text-3">{action.name}</p>
+                                    </div>
+                                </div>
+                                <div className="flex flex-wrap items-center gap-1.5">
+                                    <GlassButton type="button" size="sm" variant="subtle" onClick={() => navigate(editorPath)}>
+                                        Edit
+                                    </GlassButton>
+                                    <GlassButton type="button" size="sm" disabled={busy !== null}
+                                        aria-label={`${enabled ? 'Disable' : 'Enable'} ${label}`}
+                                        onClick={() => void toggleEnabled(action)}>
+                                        {busy === `enabled:${action.id}` ? <Loader2 size={14} className="animate-spin" aria-hidden="true" /> : null}
+                                        {enabled ? 'Disable' : 'Enable'}
+                                    </GlassButton>
+                                    <ConfirmAction icon={<Trash2 size={15} />} label={`Delete ${label}`} confirmLabel="Delete action"
+                                        busy={busy === `delete:${action.id}`} disabled={busy !== null}
+                                        onConfirm={() => void remove(action)} />
+                                </div>
+                            </li>
+                        );
+                    })}
+                </ul>
+            ) : null}
+        </div>
+    );
+}
diff --git a/application/v2_ui/src/components/admin/GlobalAgentsManager.tsx b/application/v2_ui/src/components/admin/GlobalAgentsManager.tsx
new file mode 100644
index 000000000..43340eb7b
--- /dev/null
+++ b/application/v2_ui/src/components/admin/GlobalAgentsManager.tsx
@@ -0,0 +1,226 @@
+// GlobalAgentsManager.tsx
+// The organisation's global agents, listed and managed from Admin Settings.
+//
+// The agents themselves are edited in the same V2 agent editor workspaces use, at
+// /admin/agents/<id>. This list carries what the classic admin table offered around it:
+// creating one (from scratch or an approved template), enabling or disabling one, making
+// one the default, and deleting one. Each change saves on its own rather than through the
+// settings save bar, because these are records, not settings.
+
+import { useEffect, useMemo, useState } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+import { AlertCircle, Loader2, Plus, RefreshCw, Sparkles, Trash2 } from 'lucide-react';
+import { api } from '../../lib/apiClient';
+import { fetchGlobalAgentCatalog, GLOBAL_AGENT_WORKBENCH } from '../../lib/agentWorkbench';
+import { AGENT_TYPE_LABELS } from '../../lib/workspaceAgentAuthoring';
+import { GLOBAL_AGENTS_BASE_PATH, type AgentConfiguration } from '../../lib/workspaceAuthoring';
+import { toast } from '../../stores/toastStore';
+import { GlassButton } from '../ui/primitives';
+import { ConfirmAction, Pill, SectionSearch } from '../workspace/primitives';
+import { AgentIcon } from '../workspaceAgents/AgentIdentityFields';
+
+/** Search appears once a list is long enough to need it. */
+const SEARCH_THRESHOLD = 6;
+
+interface EnabledResponse {
+    success?: boolean;
+    fallback_agent_name?: string | null;
+}
+
+function agentLabel(agent: AgentConfiguration): string {
+    return agent.display_name || agent.name || 'Untitled agent';
+}
+
+function failure(cause: unknown, fallback: string): string {
+    return cause instanceof Error && cause.message ? cause.message : fallback;
+}
+
+function modelSummary(agent: AgentConfiguration): string {
+    if (agent.agent_type && agent.agent_type !== 'local') return 'Foundry-managed model';
+    return agent.model_id || agent.azure_openai_gpt_deployment || agent.azure_agent_apim_gpt_deployment
+        || 'Default model';
+}
+
+export function GlobalAgentsManager({ help, templatesEnabled }: { help?: string; templatesEnabled: boolean }) {
+    const navigate = useNavigate();
+    const [agents, setAgents] = useState<AgentConfiguration[] | null>(null);
+    const [defaultName, setDefaultName] = useState('');
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
+    const [busy, setBusy] = useState<string | null>(null);
+    const [query, setQuery] = useState('');
+    const [revision, setRevision] = useState(0);
+
+    useEffect(() => {
+        const controller = new AbortController();
+        setLoading(true);
+        setError(null);
+        void fetchGlobalAgentCatalog(controller.signal).then((catalog) => {
+            if (controller.signal.aborted) return;
+            setAgents(catalog.agents);
+            setDefaultName(catalog.selectedAgentName);
+        }).catch((cause: unknown) => {
+            if (!controller.signal.aborted) setError(failure(cause, 'Could not load the global agents.'));
+        }).finally(() => {
+            if (!controller.signal.aborted) setLoading(false);
+        });
+        return () => controller.abort();
+    }, [revision]);
+
+    const reload = () => setRevision((value) => value + 1);
+
+    const visible = useMemo(() => {
+        const needle = query.trim().toLowerCase();
+        return [...(agents ?? [])]
+            .filter((agent) => !needle || `${agentLabel(agent)} ${agent.name} ${agent.description}`.toLowerCase().includes(needle))
+            .sort((left, right) => agentLabel(left).localeCompare(agentLabel(right)));
+    }, [agents, query]);
+
+    /** Run one change, report it, and re-read the list so every row shows the stored state. */
+    const change = async (key: string, work: () => Promise<string>) => {
+        setBusy(key);
+        setError(null);
+        try {
+            toast.success(await work());
+            reload();
+        } catch (cause) {
+            setError(failure(cause, 'The change could not be saved.'));
+        } finally {
+            setBusy(null);
+        }
+    };
+
+    const toggleEnabled = (agent: AgentConfiguration) => change(`enabled:${agent.id}`, async () => {
+        const enable = agent.is_enabled === false;
+        const result = await api.patch<EnabledResponse>(
+            `/api/admin/agents/${encodeURIComponent(agent.name)}/enabled`, { is_enabled: enable },
+        );
+        const label = agentLabel(agent);
+        if (result.fallback_agent_name) {
+            // The route names the new default by its stored name; show the name people see.
+            const fallback = agents?.find((item) => item.name === result.fallback_agent_name);
+            return `${label} disabled. ${fallback ? agentLabel(fallback) : result.fallback_agent_name} is now the default agent.`;
+        }
+        return `${label} ${enable ? 'enabled' : 'disabled'}.`;
+    });
+
+    const makeDefault = (agent: AgentConfiguration) => change(`default:${agent.id}`, async () => {
+        await api.post('/api/admin/agents/selected_agent', { name: agent.name });
+        return `${agentLabel(agent)} is now the default agent.`;
+    });
+
+    const remove = (agent: AgentConfiguration) => change(`delete:${agent.id}`, async () => {
+        await GLOBAL_AGENT_WORKBENCH.deleteAgent(agent);
+        return `${agentLabel(agent)} deleted.`;
+    });
+
+    return (
+        <div className="min-w-0 space-y-3 py-3" data-testid="global-agents-manager">
+            {help ? <p className="text-xs leading-relaxed text-text-3">{help}</p> : null}
+
+            <div className="flex flex-wrap items-center gap-2">
+                <GlassButton type="button" variant="primary" size="sm"
+                    onClick={() => navigate(`${GLOBAL_AGENTS_BASE_PATH}/new`)}>
+                    <Plus size={14} aria-hidden="true" />New agent
+                </GlassButton>
+                {templatesEnabled ? (
+                    <GlassButton type="button" variant="subtle" size="sm"
+                        onClick={() => navigate(`${GLOBAL_AGENTS_BASE_PATH}/new?templates=1`)}>
+                        <Sparkles size={14} aria-hidden="true" />Start from a template
+                    </GlassButton>
+                ) : null}
+                <GlassButton type="button" size="sm" disabled={loading} onClick={reload}>
+                    <RefreshCw size={14} aria-hidden="true" />Refresh
+                </GlassButton>
+            </div>
+
+            {(agents?.length ?? 0) >= SEARCH_THRESHOLD ? (
+                <SectionSearch value={query} onChange={setQuery} placeholder="Search global agents" />
+            ) : null}
+
+            {error ? (
+                <p role="alert" className="flex items-start gap-1.5 rounded-lg bg-danger-soft px-3 py-2 text-xs text-danger">
+                    <AlertCircle size={13} className="mt-0.5 shrink-0" aria-hidden="true" />
+                    {error}
+                </p>
+            ) : null}
+
+            {loading && agents === null ? (
+                <p role="status" className="flex items-center gap-2 py-4 text-sm text-text-3">
+                    <Loader2 size={15} className="animate-spin" aria-hidden="true" />
+                    Loading global agents…
+                </p>
+            ) : null}
+
+            {agents !== null && agents.length === 0 ? (
+                <p className="py-4 text-sm text-text-3">
+                    No global agents yet. Create one, or start from an approved template, and it becomes
+                    available as soon as it is saved.
+                </p>
+            ) : null}
+            {agents !== null && agents.length > 0 && visible.length === 0 ? (
+                <p role="status" className="py-2 text-sm text-text-3">No global agents match “{query}”.</p>
+            ) : null}
+
+            {visible.length ? (
+                <ul className="space-y-2" aria-label="Global agents">
+                    {visible.map((agent) => {
+                        const label = agentLabel(agent);
+                        const enabled = agent.is_enabled !== false;
+                        const isDefault = Boolean(defaultName) && agent.name === defaultName;
+                        const editorPath = `${GLOBAL_AGENTS_BASE_PATH}/${encodeURIComponent(agent.id)}`;
+                        return (
+                            <li key={agent.id} data-testid="global-agent-row"
+                                className="flex flex-wrap items-start gap-3 rounded-xl border border-edge bg-surface-1 p-3">
+                                <div className="flex min-w-0 flex-[1_1_16rem] items-start gap-3">
+                                    <AgentIcon icon={agent.icon} />
+                                    <div className="min-w-0 flex-1">
+                                        <h3 className="break-words text-sm font-semibold text-text-1">
+                                            <Link to={editorPath} className="hover:text-accent hover:underline">{label}</Link>
+                                        </h3>
+                                        {agent.description ? (
+                                            <p className="mt-0.5 break-words text-xs text-text-3">{agent.description}</p>
+                                        ) : null}
+                                        <div className="mt-2 flex flex-wrap items-center gap-1.5">
+                                            <Pill>{AGENT_TYPE_LABELS[agent.agent_type] ?? agent.agent_type}</Pill>
+                                            {isDefault ? <Pill tone="accent">Default agent</Pill> : null}
+                                            {!enabled ? <Pill tone="warn">Disabled</Pill> : null}
+                                        </div>
+                                        <p className="mt-1.5 break-words text-[11px] text-text-3">
+                                            {modelSummary(agent)}{' · '}{agent.actions_to_load?.length ?? 0} actions{' · '}{agent.name}
+                                        </p>
+                                    </div>
+                                </div>
+                                <div className="flex flex-wrap items-center gap-1.5">
+                                    <GlassButton type="button" size="sm" variant="subtle" onClick={() => navigate(editorPath)}>
+                                        Edit
+                                    </GlassButton>
+                                    {enabled && !isDefault ? (
+                                        <GlassButton type="button" size="sm" disabled={busy !== null}
+                                            aria-label={`Make ${label} the default agent`}
+                                            onClick={() => void makeDefault(agent)}>
+                                            Make default
+                                        </GlassButton>
+                                    ) : null}
+                                    <GlassButton type="button" size="sm" disabled={busy !== null}
+                                        aria-label={`${enabled ? 'Disable' : 'Enable'} ${label}`}
+                                        onClick={() => void toggleEnabled(agent)}>
+                                        {busy === `enabled:${agent.id}` ? <Loader2 size={14} className="animate-spin" aria-hidden="true" /> : null}
+                                        {enabled ? 'Disable' : 'Enable'}
+                                    </GlassButton>
+                                    {isDefault ? (
+                                        <span className="px-1 text-[11px] text-text-3">Choose another default to delete</span>
+                                    ) : (
+                                        <ConfirmAction icon={<Trash2 size={15} />} label={`Delete ${label}`} confirmLabel="Delete agent"
+                                            busy={busy === `delete:${agent.id}`} disabled={busy !== null}
+                                            onConfirm={() => void remove(agent)} />
+                                    )}
+                                </div>
+                            </li>
+                        );
+                    })}
+                </ul>
+            ) : null}
+        </div>
+    );
+}
diff --git a/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx b/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx
index 3e07b6a83..ecdb7c083 100644
--- a/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx
+++ b/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx
@@ -15,7 +15,7 @@ import {
 import { nativeActionDefinition, sqlConnectionMethod, usesDirectBlobConnectionString } from '../../lib/workspaceActionRegistry';
 import { EDITOR_SECRET_MASK, isRecord, type ActionTypeDefinition } from '../../lib/workspaceAuthoring';
 import { testWorkspaceAction } from '../../lib/workspaceActionServices';
-import type { ActionConnectorProps, ActionFieldDescriptor } from '../../lib/workspaceActionTypes';
+import { connectorTestScope, type ActionConnectorProps, type ActionFieldDescriptor } from '../../lib/workspaceActionTypes';
 
 export function ActionDescriptorField({ props, descriptor }: { props: ActionConnectorProps; descriptor: ActionFieldDescriptor }) {
     const id = useId();
@@ -141,7 +141,7 @@ export function ActionConfigurationFields(props: ActionConnectorProps & { defini
                     Saving does not run this test.
                 </p>
                 <GlassButton type="button" size="sm" disabled={readOnly || Boolean(request.busy)}
-                    onClick={() => void request.run('Testing connection…', (signal) => testWorkspaceAction(draft, props.original, definition, signal, props.groupScope))}>
+                    onClick={() => void request.run('Testing connection…', (signal) => testWorkspaceAction(draft, props.original, definition, signal, connectorTestScope(props)))}>
                     <FlaskConical size={15} />{request.busy || 'Test connection'}
                 </GlassButton>
                 <ConnectorFeedbackPanel feedback={request.feedback} stale={request.stale} />
diff --git a/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx b/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx
index 020e949e5..4704c3420 100644
--- a/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx
+++ b/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx
@@ -5,7 +5,8 @@ import { RefreshCw } from 'lucide-react';
 import { GlassButton } from '../ui/primitives';
 import { ActionField, ACTION_INPUT_CLASS } from './ActionFields';
 import {
-    actionTarget, fetchAgentTargets, PERSONAL_DELEGATION_SCOPE, referenceKey, type AgentTargetCatalog,
+    actionTarget, fetchAgentTargets, GLOBAL_DELEGATION_SCOPE, PERSONAL_DELEGATION_SCOPE, referenceKey,
+    type AgentTargetCatalog, type DelegationScope,
 } from '../../lib/agentDelegation';
 import { actionFieldError, withActionValue } from '../../lib/workspaceActionLogic';
 import type { ActionConnectorProps } from '../../lib/workspaceActionTypes';
@@ -20,10 +21,17 @@ export function CallAgentActionConfiguration(props: ActionConnectorProps) {
     const [version, setVersion] = useState(0);
     const callback = useRef(props.onValidityChange);
     callback.current = props.onValidityChange;
+    // Targets come from the action's own workspace, because the server only accepts a target
+    // there (or a permitted global agent): a global action calls global agents, and a group
+    // action calls its group's agents, never the author's personal ones.
+    const scopeType = props.globalScope ? 'global' : props.groupScope ? 'group' : 'personal';
+    const groupId = props.groupScope?.id ?? '';
     useEffect(() => {
         const controller = new AbortController();
+        const scope: DelegationScope = scopeType === 'global' ? GLOBAL_DELEGATION_SCOPE
+            : scopeType === 'group' ? { type: 'group', groupId } : PERSONAL_DELEGATION_SCOPE;
         setLoading(true); setError(null);
-        void fetchAgentTargets(PERSONAL_DELEGATION_SCOPE, controller.signal).then((result) => {
+        void fetchAgentTargets(scope, controller.signal).then((result) => {
             if (controller.signal.aborted) return;
             if (!result || !Array.isArray(result.targets)) throw new Error('The target catalogue returned an invalid response.');
             setCatalogue(result);
@@ -31,7 +39,7 @@ export function CallAgentActionConfiguration(props: ActionConnectorProps) {
             if (!controller.signal.aborted) setError(errorMessage(cause, 'Could not load permitted target agents.'));
         }).finally(() => { if (!controller.signal.aborted) setLoading(false); });
         return () => controller.abort();
-    }, [version]);
+    }, [version, scopeType, groupId]);
     const target = actionTarget(props.draft);
     const selectedKey = target ? referenceKey(target) : '';
     const targets = catalogue?.targets ?? [];
diff --git a/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx b/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx
index d6f8bbf3c..e31a89319 100644
--- a/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx
+++ b/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx
@@ -9,7 +9,7 @@ import {
 } from './OpenApiActionConfiguration';
 import { EDITOR_SECRET_MASK, pointerPart } from '../../lib/workspaceAuthoring';
 import { actionHasStoredArraySecrets } from '../../lib/workspaceActionLogic';
-import type { ActionConnectorProps } from '../../lib/workspaceActionTypes';
+import { connectorTestScope, type ActionConnectorProps } from '../../lib/workspaceActionTypes';
 import {
     allowedMcpAuthMethods, allowedMcpTransports, applyMcpPreconfiguration, applyMcpPreset,
     changeConnectorAuthMethod, connectorAuthMethod, connectorFeedback, connectorLines, connectorObject,
@@ -40,7 +40,7 @@ function useMcpCatalogues(props: ActionConnectorProps, includePreconfigurations:
             if (!controller.signal.aborted) setPresetsError(error instanceof Error ? error.message : 'Could not load MCP presets.');
         });
         const loadPreconfigurations = includePreconfigurations
-            ? fetchMcpPreconfigurations(controller.signal).then((result) => {
+            ? fetchMcpPreconfigurations(controller.signal, props.globalScope ? 'global' : 'personal').then((result) => {
                 if (controller.signal.aborted) return;
                 setPreconfigurations(result);
                 setPreconfigurationsError(null);
@@ -219,7 +219,7 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
         `${name} ${tool?.function_name || ''} ${tool?.description || ''}`.toLowerCase().includes(toolSearch.toLowerCase()));
     const blockedExecution = readOnly || Boolean(busy) || Object.keys(localErrors).length > 0;
     const doDiscovery = async () => {
-        const result = await run('Discovering MCP tools…', (signal) => discoverMcpAction(draft, original, signal, props.groupScope),
+        const result = await run('Discovering MCP tools…', (signal) => discoverMcpAction(draft, original, signal, connectorTestScope(props)),
             (current, response) => updateConnectorFields(current, {
                 mcp_tools: mergeMcpTools(current.additionalFields.mcp_tools, response.tools, connectorStrings(current.additionalFields.allowed_tool_names)),
             }),
@@ -455,9 +455,9 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                 <p className="text-xs text-text-3">The connection test initializes a server session and lists its tools. It does not invoke tools or save discovered metadata. Authentication is configured in the Authentication section.</p>
                 <div className="flex flex-wrap items-center gap-2">
                     <GlassButton type="button" variant="subtle" disabled={blockedExecution}
-                        onClick={() => void run('Validating MCP configuration…', (signal) => validateApiConnector(draft, original, 'mcp', signal, props.groupScope))}>Validate MCP configuration</GlassButton>
+                        onClick={() => void run('Validating MCP configuration…', (signal) => validateApiConnector(draft, original, 'mcp', signal, connectorTestScope(props)))}>Validate MCP configuration</GlassButton>
                     <GlassButton type="button" variant="subtle" disabled={blockedExecution}
-                        onClick={() => void run('Testing MCP connection…', (signal) => testApiConnector(draft, original, 'mcp', signal, props.groupScope))}>Test MCP connection</GlassButton>
+                        onClick={() => void run('Testing MCP connection…', (signal) => testApiConnector(draft, original, 'mcp', signal, connectorTestScope(props)))}>Test MCP connection</GlassButton>
                     {busy ? <p role="status" className="text-sm text-text-3">{busy}</p> : null}
                 </div>
                 {readOnly ? <p className="text-xs text-text-3">Provided actions are read-only. Discovery and connection testing are disabled.</p> : null}
diff --git a/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx b/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx
index 986cfd516..b92fa80ce 100644
--- a/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx
+++ b/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { GlassButton, GlassPanel } from '../ui/primitives';
 import { ActionField, ActionSecretInput, ACTION_INPUT_CLASS } from './ActionFields';
-import type { ActionConnectorProps } from '../../lib/workspaceActionTypes';
+import { connectorTestScope, type ActionConnectorProps } from '../../lib/workspaceActionTypes';
 import { EDITOR_SECRET_MASK, type ActionConfiguration } from '../../lib/workspaceAuthoring';
 import {
     applyOpenApiSpecification, changeConnectorAuthMethod, changeOpenApiBasicCredential,
@@ -327,11 +327,11 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                 <p className="text-xs leading-relaxed text-text-3">Validation checks the manifest without running it. Connection testing parses the specification and probes the authenticated base URL; it does not invoke an individual API operation.</p>
                 <div className="flex flex-wrap items-center gap-2">
                     <GlassButton type="button" variant="subtle" disabled={readOnly || Boolean(busy) || source.pending}
-                        onClick={() => void run('Validating configuration…', (signal) => validateApiConnector(draft, original, 'openapi', signal, props.groupScope))}>
+                        onClick={() => void run('Validating configuration…', (signal) => validateApiConnector(draft, original, 'openapi', signal, connectorTestScope(props)))}>
                         Validate OpenAPI configuration
                     </GlassButton>
                     <GlassButton type="button" variant="subtle" disabled={readOnly || Boolean(busy) || source.pending}
-                        onClick={() => void run('Testing OpenAPI connection…', (signal) => testApiConnector(draft, original, 'openapi', signal, props.groupScope))}>
+                        onClick={() => void run('Testing OpenAPI connection…', (signal) => testApiConnector(draft, original, 'openapi', signal, connectorTestScope(props)))}>
                         Test OpenAPI connection
                     </GlassButton>
                     {busy ? <p role="status" className="text-sm text-text-3">{busy}</p> : null}
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx b/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx
index 1e7417974..7b89a2a23 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx
@@ -15,7 +15,7 @@ import { AgentField, AgentNotice } from './AgentFields';
 
 export function AgentActionPicker({
     draft, setDraft, actions, targets, loading, error, targetError, ownerId, builtinActions,
-    canCreateActions, onRefresh, onNewAction, readOnly,
+    canCreateActions, onRefresh, onNewAction, readOnly, scopeKind = 'personal',
 }: {
     draft: AgentConfiguration;
     setDraft: Dispatch<SetStateAction<AgentConfiguration>>;
@@ -30,7 +30,10 @@ export function AgentActionPicker({
     onRefresh: () => void;
     onNewAction: () => void;
     readOnly: boolean;
+    /** Which kind of agent is being edited. A global agent's actions are all the organisation's own. */
+    scopeKind?: 'personal' | 'group' | 'global';
 }) {
+    const globalScope = scopeKind === 'global';
     const [query, setQuery] = useState('');
     const [typeFilter, setTypeFilter] = useState('');
     const [selectedOnly, setSelectedOnly] = useState(false);
@@ -115,7 +118,8 @@ export function AgentActionPicker({
                                 <span className="min-w-0 flex-1">
                                     <span className="flex flex-wrap items-center gap-2 text-sm font-medium text-text-1">
                                         {label}<Pill>{action.type === 'agent' ? 'Call agent' : action.type}</Pill>
-                                        {action.is_global ? <Pill tone="accent">Provided</Pill> : <Pill>Personal</Pill>}
+                                        {globalScope ? <Pill tone="accent">Global</Pill>
+                                            : action.is_global ? <Pill tone="accent">Provided</Pill> : <Pill>Personal</Pill>}
                                     </span>
                                     <span className="mt-1 block break-words text-xs text-text-3">{action.description}</span>
                                     <span className="mt-1 block break-all text-[11px] text-text-3">ID: {action.id}</span>
@@ -163,7 +167,9 @@ export function AgentActionPicker({
             {builtinActions.length ? (
                 <div className="rounded-xl border border-edge p-3">
                     <h4 className="text-sm font-medium text-text-2">Enabled built-in tools</h4>
-                    <p className="mt-1 text-xs text-text-3">Provided by your administrator; these are not personal settings.</p>
+                    <p className="mt-1 text-xs text-text-3">{globalScope
+                        ? 'Available to every agent; turn them on or off under Built-in Actions in Admin Settings.'
+                        : 'Provided by your administrator; these are not personal settings.'}</p>
                     <ul className="mt-2 space-y-1 text-xs text-text-2">
                         {builtinActions.map((action) => <li key={action.id}>{action.label}{action.description ? ` — ${action.description}` : ''}</li>)}
                     </ul>
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx b/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx
index 80691d104..99b3dfa93 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx
@@ -93,7 +93,9 @@ export function AgentKnowledgeFields({
                     {inputError ? <AgentNotice error>{inputError}</AgentNotice> : null}
                     <fieldset className="space-y-3">
                         <legend className="mb-2 text-sm font-medium text-text-1">Source workspaces</legend>
-                        <p className="text-xs text-text-3">Only your personal workspace and permitted public workspaces can be newly assigned. Removing a source does not silently remove stored document references.</p>
+                        <p className="text-xs text-text-3">{knowledgeScopes.includes('personal') || knowledgeScopes.includes('group')
+                            ? 'Only your personal workspace and permitted public workspaces can be newly assigned.'
+                            : 'Only public workspaces can be assigned, because a global agent answers everyone.'} Removing a source does not silently remove stored document references.</p>
                         <SectionSearch value={sourceQuery} onChange={setSourceQuery} placeholder="Search knowledge workspaces" />
                         <div className="grid gap-2 sm:grid-cols-2">
                             {sources.filter((source) => `${source.label} ${source.id}`.toLowerCase().includes(sourceQuery.toLowerCase())).map((source) => (
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx b/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx
index 79dfc1c68..64d35f515 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx
@@ -20,12 +20,16 @@ function templateSettingsPreview(template: AgentTemplate): string {
 }
 
 export function AgentTemplatesPanel({
-    draft, setDraft, actions, options, isNew, dirty, readOnly, submissionAllowed, groupScope,
+    draft, setDraft, actions, options, isNew, dirty, readOnly, submissionAllowed, scope = 'personal',
 }: {
     draft: AgentConfiguration; setDraft: Dispatch<SetStateAction<AgentConfiguration>>;
     actions: ActionConfiguration[]; options: AgentEditorOptions; isNew: boolean; dirty: boolean; readOnly: boolean;
-    submissionAllowed: boolean; groupScope: boolean;
+    submissionAllowed: boolean;
+    /** Which kind of agent this is. A global agent publishes straight to the gallery. */
+    scope?: 'personal' | 'group' | 'global';
 }) {
+    const groupScope = scope === 'group';
+    const globalScope = scope === 'global';
     const enabled = options.settings.enable_agent_template_gallery === true;
     const submissionsAllowed = enabled && submissionAllowed && !readOnly;
     const [templates, setTemplates] = useState<AgentTemplate[]>([]);
@@ -75,11 +79,11 @@ export function AgentTemplatesPanel({
         setError(null);
         setNotice(null);
         try {
-            const payload = await api.post<{ template: AgentTemplate }>('/api/agent-templates', agentTemplateSubmission(draft), controller.signal);
+            const payload = await api.post<{ template: AgentTemplate }>('/api/agent-templates', agentTemplateSubmission(draft, globalScope ? 'global' : 'personal'), controller.signal);
             if (!payload.template) throw new Error('The template service returned an invalid response.');
             if (!controller.signal.aborted) setNotice(payload.template.status === 'approved'
                 ? 'Template published to the approved gallery.'
-                : groupScope ? 'Template submitted for review.' : 'Personal template submitted for review.');
+                : groupScope || globalScope ? 'Template submitted for review.' : 'Personal template submitted for review.');
         } catch (cause) {
             if (!controller.signal.aborted) setError(cause instanceof Error ? cause.message : 'Could not submit this template.');
         } finally {
@@ -96,7 +100,7 @@ export function AgentTemplatesPanel({
             <div className="flex flex-wrap gap-2">
                 <GlassButton type="button" size="sm" disabled={loading} onClick={() => setRevision((value) => value + 1)}>Refresh templates</GlassButton>
                 {submissionsAllowed ? <GlassButton type="button" size="sm" disabled={submitting} onClick={() => void submit()}>
-                    {submitting ? 'Submitting template…' : groupScope ? 'Submit template' : 'Submit personal template'}
+                    {submitting ? 'Submitting template…' : globalScope ? 'Publish as template' : groupScope ? 'Submit template' : 'Submit personal template'}
                 </GlassButton> : null}
             </div>
             {error ? <AgentNotice error>{error}</AgentNotice> : null}
@@ -130,7 +134,9 @@ export function AgentTemplatesPanel({
             </div>
             {!visible.length && !loading && !error ? <p role="status" className="text-sm text-text-3">No approved templates match.</p> : null}
             {!isNew ? <p className="text-xs text-text-3">Templates start new agents; applying one will not overwrite this saved agent.</p> : null}
-            {submissionsAllowed ? <p className="text-xs text-text-3">Submission publishes a reusable recipe under the current gallery approval policy, not your connection credentials. {Object.keys(safeAgentTemplateSettings(draft.other_settings)).length ? 'Non-secret additional settings are included.' : ''}</p> : null}
+            {submissionsAllowed ? <p className="text-xs text-text-3">{globalScope
+                ? 'Publishing adds a reusable recipe to the approved gallery straight away, not your connection credentials.'
+                : 'Submission publishes a reusable recipe under the current gallery approval policy, not your connection credentials.'} {Object.keys(safeAgentTemplateSettings(draft.other_settings)).length ? 'Non-secret additional settings are included.' : ''}</p> : null}
         </div>
     );
 }
diff --git a/application/v2_ui/src/lib/actionWorkbench.ts b/application/v2_ui/src/lib/actionWorkbench.ts
index 49f696102..d24d1496e 100644
--- a/application/v2_ui/src/lib/actionWorkbench.ts
+++ b/application/v2_ui/src/lib/actionWorkbench.ts
@@ -19,7 +19,7 @@
 
 import { ApiError, api } from './apiClient';
 import {
-    buildEditorWrite, isRecord,
+    buildEditorWrite, GLOBAL_ACTIONS_BASE_PATH, isRecord, withoutServerStampedFields,
     type ActionConfiguration, type ActionTypeDefinition, type AuthoringResource,
 } from './workspaceAuthoring';
 import {
@@ -29,13 +29,15 @@ import {
 import {
     fetchActionEditorHints, fetchActionIdentities, testWorkspaceAction, type ActionEditorHints,
 } from './workspaceActionServices';
-import type { ActionIdentity, ActionTestGroupScope } from './workspaceActionTypes';
+import type { ActionIdentity, ActionTestScope } from './workspaceActionTypes';
+import { GLOBAL_ACTION_TEST_SCOPE, type ActionTestGroupScope } from './workspaceActionTypes';
 import type { EditorWorkspaceScope } from './workspaceEditorDrafts';
 import { requireWorkspaceId, workspaceBasePath } from './workspaceContext';
 
 export type ActionScope =
     | { kind: 'personal' }
-    | { kind: 'group'; id: string; name: string };
+    | { kind: 'group'; id: string; name: string }
+    | { kind: 'global' };
 
 export const ACTION_OPERATIONS = ['create', 'edit', 'delete', 'test'] as const;
 export type ActionOperation = typeof ACTION_OPERATIONS[number];
@@ -59,8 +61,8 @@ export interface ActionWorkbenchAdapter {
     basePath: string;
     /** Draft-cache partition, so a group A draft never restores into group B or personal. */
     draftScope: EditorWorkspaceScope;
-    /** Group test scope threaded into connection tests; undefined for personal. */
-    testScope?: ActionTestGroupScope;
+    /** The scope connector commands run in: a group's, or global; undefined for personal. */
+    testScope?: ActionTestScope;
     supported: ReadonlySet<ActionOperation>;
     allows: (operation: ActionOperation, action?: ActionConfiguration) => boolean;
     listActions: (signal?: AbortSignal) => Promise<ActionConfiguration[]>;
@@ -95,11 +97,13 @@ export function advertisedActionOperations(value: unknown): ReadonlySet<ActionOp
 /**
  * Whether an operation is allowed in a scope.
  *
- * Personal scope allows everything, exactly as the section did before it was scoped. Group scope
- * requires the workspace-level `action_management` hint to offer the operation, and edit, delete
- * and test additionally require the specific action to belong to this group and to carry the
- * operation in its own `action_actions`. Create is workspace-level with no per-action subject.
- * There is deliberately no fallback that enables an action when the hint is empty or absent.
+ * Personal scope allows everything, exactly as the section did before it was scoped. Global scope
+ * does too: it is reachable only from Admin Settings, and every global route requires the Admin
+ * role on the server. Group scope requires the workspace-level `action_management` hint to offer
+ * the operation, and edit, delete and test additionally require the specific action to belong to
+ * this group and to carry the operation in its own `action_actions`. Create is workspace-level with
+ * no per-action subject. There is deliberately no fallback that enables an action when the hint is
+ * empty or absent.
  */
 export function actionOperationAllowed(
     scope: ActionScope,
@@ -107,7 +111,7 @@ export function actionOperationAllowed(
     operation: ActionOperation,
     action?: ActionConfiguration,
 ): boolean {
-    if (scope.kind === 'personal') {
+    if (scope.kind === 'personal' || scope.kind === 'global') {
         return true;
     }
     if (!supported.has(operation)) {
@@ -202,13 +206,13 @@ function withoutActionProjectionFields<T extends ActionConfiguration>(record: T)
 }
 
 /**
- * Map the group `action-options` envelope onto ActionEditorHints. The group editor needs only the
- * five tenant-level Key Vault reminder defaults; unlike the personal `/api/user/agent/settings`
+ * Map an `action-options` envelope onto ActionEditorHints. The group and global editors need only
+ * the five tenant-level Key Vault reminder defaults; unlike the personal `/api/user/agent/settings`
  * read it carries no personal flags and no personal model endpoints. The envelope is validated
  * strictly, so a drifted shape throws rather than silently rendering blank defaults, and `canAuthor`
  * comes from the adapter gate, never from a server flag on this response.
  */
-function groupEditorHints(value: unknown, canAuthor: boolean): ActionEditorHints {
+function actionOptionsHints(value: unknown, canAuthor: boolean): ActionEditorHints {
     if (!isRecord(value) || !isRecord(value.secret_reminders)) {
         throw new Error('The workspace returned invalid action options. Reload before trying again.');
     }
@@ -264,7 +268,7 @@ export function createGroupActionWorkbench(
         fetchEditorHints: async (signal) => {
             const response = await api.get<unknown>(
                 `/api/groups/${encodeURIComponent(groupId)}/action-options`, signal);
-            return groupEditorHints(response, allows('create'));
+            return actionOptionsHints(response, allows('create'));
         },
         fetchEditor: async (id, _providedScope, signal) => {
             const response = await api.get<AuthoringResource<ActionConfiguration>>(groupActionsUrl(groupId, id), signal);
@@ -335,3 +339,103 @@ export function createGroupActionWorkbench(
         test: (draft, original, definition, signal) => testWorkspaceAction(draft, original, definition, signal, testScope),
     };
 }
+
+const GLOBAL_ACTIONS_API = '/api/v2/admin/actions';
+
+function globalActionUrl(actionId?: string): string {
+    return actionId ? `${GLOBAL_ACTIONS_API}/${encodeURIComponent(requireWorkspaceId(actionId))}` : GLOBAL_ACTIONS_API;
+}
+
+/**
+ * Prove a returned action is the organisation's: marked global and claiming no group, as the
+ * server's global projection always is. Anything else is refused rather than rendered.
+ */
+function assertGlobalActionScope(action: ActionConfiguration, id?: string): void {
+    if (!action || typeof action.id !== 'string' || !action.id
+        || (id !== undefined && action.id !== id)
+        || action.is_global !== true || Boolean(action.group_id)) {
+        throw new Error('The action response is not a global action. Refresh and try again.');
+    }
+}
+
+/** The editor contract for a global action, which an administrator always edits. */
+function assertGlobalEditorResource(
+    response: AuthoringResource<ActionConfiguration>, id?: string,
+): AuthoringResource<ActionConfiguration> {
+    if (!isRecord(response) || !isRecord(response.record) || response.read_only !== false
+        || typeof response.revision !== 'string' || !response.revision
+        || !Array.isArray(response.secret_paths)
+        || !response.secret_paths.every((path) => typeof path === 'string' && path.startsWith('/'))) {
+        throw new Error('Admin Settings returned an invalid action editor resource. Reload before trying again.');
+    }
+    assertGlobalActionScope(response.record, id);
+    return response;
+}
+
+/** The global actions, read for the editor and the Admin Settings list. */
+export async function fetchGlobalActions(signal?: AbortSignal): Promise<ActionConfiguration[]> {
+    const actions = actionsFromResponse(await api.get<unknown>(GLOBAL_ACTIONS_API, signal));
+    actions.forEach((action) => assertGlobalActionScope(action));
+    return actions;
+}
+
+/**
+ * The administrator's global actions, edited from Admin Settings with the same editor workspaces
+ * use. Every route it calls requires the Admin role. Identities are the global ones, and connector
+ * commands run in the global scope so stored credentials resolve from the global namespace.
+ */
+export const GLOBAL_ACTION_WORKBENCH: ActionWorkbenchAdapter = {
+    scope: { kind: 'global' },
+    basePath: GLOBAL_ACTIONS_BASE_PATH,
+    draftScope: { kind: 'global' },
+    testScope: GLOBAL_ACTION_TEST_SCOPE,
+    supported: new Set(ACTION_OPERATIONS),
+    allows: () => true,
+    listActions: (signal) => fetchGlobalActions(signal),
+    fetchTypes: async (signal) => {
+        const response = await api.get<unknown>(`${GLOBAL_ACTIONS_API}/types`, signal);
+        if (!isRecord(response) || !Array.isArray(response.types) || !response.types.every(isRecord)) {
+            throw new Error('Admin Settings returned an invalid action type list.');
+        }
+        return response.types as unknown as ActionTypeDefinition[];
+    },
+    fetchEditorHints: async (signal) => actionOptionsHints(await api.get<unknown>('/api/v2/admin/action-options', signal), true),
+    fetchEditor: async (id, _providedScope, signal) =>
+        assertGlobalEditorResource(await api.get<AuthoringResource<ActionConfiguration>>(globalActionUrl(id), signal), id),
+    save: async (draft, original) => {
+        const write = buildEditorWrite(
+            withoutServerStampedFields(draft),
+            original ? { ...original, record: withoutServerStampedFields(original.record) } : null,
+        );
+        if (!original) delete write.updates.id;
+        const response = original
+            ? await api.patch<AuthoringResource<ActionConfiguration>>(globalActionUrl(original.record.id), write)
+            : await api.post<AuthoringResource<ActionConfiguration>>(GLOBAL_ACTIONS_API, write);
+        return assertGlobalEditorResource(response, original?.record.id);
+    },
+    deleteAction: async (action) => {
+        await api.delete<{ success: boolean }>(globalActionUrl(action.id));
+    },
+    listIdentities: async (signal) => {
+        // The global identities an action may bind, exactly as the group reader filters its own:
+        // only identities the server marks usable for actions are offered, with no client default.
+        const response = await api.get<unknown>('/api/admin/workspace-identities/global/identities', signal);
+        if (!isRecord(response) || !Array.isArray(response.identities)) {
+            throw new Error('The identity response was malformed. Refresh and try again.');
+        }
+        return response.identities.filter(isRecord).filter((identity) =>
+            Array.isArray(identity.usage_contexts) && identity.usage_contexts.includes('action'),
+        ).map((identity) => {
+            const credentials = isRecord(identity.credentials) ? identity.credentials : {};
+            return {
+                id: String(identity.id ?? ''),
+                name: String(identity.name ?? ''),
+                auth_type: String(credentials.auth_type ?? ''),
+                description: identity.description ? String(identity.description) : undefined,
+                scope_type: 'global',
+                scope_id: 'global',
+            } satisfies ActionIdentity;
+        });
+    },
+    test: (draft, original, definition, signal) => testWorkspaceAction(draft, original, definition, signal, GLOBAL_ACTION_TEST_SCOPE),
+};
diff --git a/application/v2_ui/src/lib/agentWorkbench.ts b/application/v2_ui/src/lib/agentWorkbench.ts
index 3b912c2ae..dfa3eaec2 100644
--- a/application/v2_ui/src/lib/agentWorkbench.ts
+++ b/application/v2_ui/src/lib/agentWorkbench.ts
@@ -23,7 +23,7 @@
 import { api } from './apiClient';
 import { generateAgentId } from './workspaceApi';
 import {
-    buildEditorWrite, isRecord,
+    buildEditorWrite, GLOBAL_ACTIONS_BASE_PATH, GLOBAL_AGENTS_BASE_PATH, isRecord, withoutServerStampedFields,
     type ActionConfiguration, type AgentConfiguration, type AgentEditorOptions, type AuthoringResource,
     type WorkspaceAgentType,
 } from './workspaceAuthoring';
@@ -34,22 +34,25 @@ import {
     fetchAuthoringAgents, saveAgentConfiguration,
 } from './workspaceAuthoringApi';
 import {
-    fetchAgentKnowledgeCatalog, fetchGroupAgentKnowledgeCatalog, type AgentKnowledgeCatalog,
+    fetchAgentKnowledgeCatalog, fetchGlobalAgentKnowledgeCatalog, fetchGroupAgentKnowledgeCatalog,
+    type AgentKnowledgeCatalog,
 } from './workspaceAgentKnowledge';
 import {
-    discoverAgentFoundryResources, draftAgentInstructions, PERSONAL_INSTRUCTION_SCOPE, type InstructionDraftScope,
+    discoverAgentFoundryResources, draftAgentInstructions, GLOBAL_INSTRUCTION_SCOPE, PERSONAL_INSTRUCTION_SCOPE,
+    type InstructionDraftScope,
 } from './workspaceAgentCommands';
 import {
-    fetchAgentTargets, PERSONAL_DELEGATION_SCOPE, type AgentTargetCatalog, type DelegationScope,
+    fetchAgentTargets, GLOBAL_DELEGATION_SCOPE, PERSONAL_DELEGATION_SCOPE, type AgentTargetCatalog, type DelegationScope,
 } from './agentDelegation';
 import type { AgentLinkScope } from './conversationUrl';
 import type { EditorWorkspaceScope } from './workspaceEditorDrafts';
-import type { ActionWorkbenchAdapter } from './actionWorkbench';
+import { fetchGlobalActions, type ActionWorkbenchAdapter } from './actionWorkbench';
 import { requireWorkspaceId, workspaceBasePath } from './workspaceContext';
 
 export type AgentWorkbenchScope =
     | { kind: 'personal' }
-    | { kind: 'group'; id: string; name: string };
+    | { kind: 'group'; id: string; name: string }
+    | { kind: 'global' };
 
 export const AGENT_OPERATIONS = ['create', 'edit', 'delete'] as const;
 export type AgentOperation = typeof AGENT_OPERATIONS[number];
@@ -126,11 +129,13 @@ export function advertisedAgentOperations(value: unknown): ReadonlySet<AgentOper
 /**
  * Whether an operation is allowed in a scope.
  *
- * Personal scope allows everything, exactly as the section did before it was scoped. Group scope
- * requires the workspace-level `agent_management` hint to offer the operation, and edit and delete
- * additionally require the specific agent to belong to this group and to carry the operation in its
- * own `agent_actions`. Create is workspace-level with no per-agent subject. There is deliberately no
- * fallback that enables an agent when the hint is empty or absent.
+ * Personal scope allows everything, exactly as the section did before it was scoped. Global scope
+ * does too: it is reachable only from Admin Settings, and every global route requires the Admin
+ * role on the server. Group scope requires the workspace-level `agent_management` hint to offer
+ * the operation, and edit and delete additionally require the specific agent to belong to this
+ * group and to carry the operation in its own `agent_actions`. Create is workspace-level with no
+ * per-agent subject. There is deliberately no fallback that enables an agent when the hint is empty
+ * or absent.
  */
 export function agentOperationAllowed(
     scope: AgentWorkbenchScope,
@@ -138,7 +143,7 @@ export function agentOperationAllowed(
     operation: AgentOperation,
     agent?: AgentConfiguration,
 ): boolean {
-    if (scope.kind === 'personal') {
+    if (scope.kind === 'personal' || scope.kind === 'global') {
         return true;
     }
     if (!supported.has(operation)) {
@@ -225,7 +230,7 @@ function agentsFromResponse(value: unknown): AgentConfiguration[] {
     return value.agents as AgentConfiguration[];
 }
 
-function assertGroupAgentOptions(value: unknown): AgentEditorOptions {
+function assertAgentEditorOptions(value: unknown): AgentEditorOptions {
     if (!isRecord(value) || !Array.isArray(value.agent_types) || !Array.isArray(value.model_endpoints)
         || !Array.isArray(value.builtin_actions) || !isRecord(value.settings)) {
         throw new Error('The agent editor options returned an invalid response.');
@@ -289,7 +294,7 @@ export function createGroupAgentWorkbench(
             agents.forEach((agent) => assertGroupAgentScope(agent, groupId));
             return agents;
         },
-        fetchOptions: async (signal) => assertGroupAgentOptions(
+        fetchOptions: async (signal) => assertAgentEditorOptions(
             await api.get<unknown>(`/api/groups/${encodeURIComponent(groupId)}/agent-options`, signal),
         ),
         fetchEditor: async (id, _providedScope, signal) => {
@@ -327,3 +332,101 @@ export function createGroupAgentWorkbench(
             discoverAgentFoundryResources(endpoint, type, signal, groupId),
     };
 }
+
+const GLOBAL_AGENTS_API = '/api/v2/admin/agents';
+
+function globalAgentUrl(agentId?: string): string {
+    return agentId ? `${GLOBAL_AGENTS_API}/${encodeURIComponent(requireWorkspaceId(agentId))}` : GLOBAL_AGENTS_API;
+}
+
+/**
+ * Prove a returned agent is the organisation's: marked global and claiming no group, as the
+ * server's global projection always is. Anything else is refused rather than rendered.
+ */
+function assertGlobalAgentScope(agent: AgentConfiguration, id?: string): void {
+    if (!agent || typeof agent.id !== 'string' || !agent.id
+        || (id !== undefined && agent.id !== id)
+        || agent.is_global !== true || Boolean(agent.group_id)) {
+        throw new Error('The agent response is not a global agent. Refresh and try again.');
+    }
+}
+
+/** The editor contract for a global agent, which an administrator always edits. */
+function assertGlobalAgentEditorResource(
+    response: AuthoringResource<AgentConfiguration>, id?: string,
+): AuthoringResource<AgentConfiguration> {
+    if (!isRecord(response) || !isRecord(response.record) || response.read_only !== false
+        || typeof response.revision !== 'string' || !response.revision
+        || !Array.isArray(response.secret_paths)
+        || !response.secret_paths.every((path) => typeof path === 'string' && path.startsWith('/'))) {
+        throw new Error('Admin Settings returned an invalid agent editor resource. Reload before trying again.');
+    }
+    assertGlobalAgentScope(response.record, id);
+    return response;
+}
+
+export interface GlobalAgentCatalog {
+    agents: AgentConfiguration[];
+    /** The default agent, which settings store by name; empty when none is chosen. */
+    selectedAgentName: string;
+}
+
+/** The global agents and the default among them, for the editor and the Admin Settings list. */
+export async function fetchGlobalAgentCatalog(signal?: AbortSignal): Promise<GlobalAgentCatalog> {
+    const response = await api.get<unknown>(GLOBAL_AGENTS_API, signal);
+    const agents = agentsFromResponse(response);
+    agents.forEach((agent) => assertGlobalAgentScope(agent));
+    const selected = isRecord(response) && typeof response.selected_agent_name === 'string' ? response.selected_agent_name : '';
+    return { agents, selectedAgentName: selected };
+}
+
+/**
+ * The administrator's global agents, edited from Admin Settings with the same editor workspaces
+ * use. Every route it calls requires the Admin role. Knowledge is limited to public workspaces,
+ * which is all a global agent may hold; actions, Call agent targets and instruction drafting all
+ * resolve in the global scope; and a new action created from the editor returns to it.
+ */
+export const GLOBAL_AGENT_WORKBENCH: AgentWorkbenchAdapter = {
+    scope: { kind: 'global' },
+    basePath: GLOBAL_AGENTS_BASE_PATH,
+    draftScope: { kind: 'global' },
+    knowledgeScopes: ['public'],
+    instructionScope: GLOBAL_INSTRUCTION_SCOPE,
+    delegationScope: GLOBAL_DELEGATION_SCOPE,
+    actionsBasePath: GLOBAL_ACTIONS_BASE_PATH,
+    canCreateActions: true,
+    supported: new Set(AGENT_OPERATIONS),
+    allows: () => true,
+    // Whether people can reach a global agent depends on Workspace Mode and the merge setting, so
+    // the editor links nowhere it cannot be sure of.
+    canUseInChat: () => false,
+    chatScope: () => ({ kind: 'global' }),
+    // The classic admin editor has always let a global agent carry its own model connection.
+    allowsCustomEndpoints: () => true,
+    allowsTemplateSubmission: (settings) => settings.agent_template_submission_allowed === true,
+    listAgents: async (signal) => (await fetchGlobalAgentCatalog(signal)).agents,
+    fetchOptions: async (signal) => assertAgentEditorOptions(await api.get<unknown>('/api/v2/admin/agent-options', signal)),
+    fetchEditor: async (id, _providedScope, signal) =>
+        assertGlobalAgentEditorResource(await api.get<AuthoringResource<AgentConfiguration>>(globalAgentUrl(id), signal), id),
+    save: async (draft, original) => {
+        const record = original ? draft : { ...draft, id: await generateAgentId() };
+        if (!record.id) throw new Error('Could not allocate an agent identifier. Try again.');
+        const write = buildEditorWrite(
+            withoutServerStampedFields(record),
+            original ? { ...original, record: withoutServerStampedFields(original.record) } : null,
+        );
+        const response = original
+            ? await api.patch<AuthoringResource<AgentConfiguration>>(globalAgentUrl(original.record.id), write)
+            : await api.post<AuthoringResource<AgentConfiguration>>(GLOBAL_AGENTS_API, write);
+        return assertGlobalAgentEditorResource(response, original?.record.id);
+    },
+    deleteAgent: async (agent) => {
+        await api.delete<{ success: boolean }>(globalAgentUrl(agent.id));
+    },
+    fetchActions: (signal) => fetchGlobalActions(signal),
+    fetchTargets: (signal) => fetchAgentTargets(GLOBAL_DELEGATION_SCOPE, signal),
+    fetchKnowledge: (signal) => fetchGlobalAgentKnowledgeCatalog(signal),
+    draftInstructions: (draft, actions, catalog, signal) =>
+        draftAgentInstructions(draft, actions, catalog, signal, GLOBAL_INSTRUCTION_SCOPE),
+    discoverFoundryResources: (endpoint, type, signal) => discoverAgentFoundryResources(endpoint, type, signal),
+};
diff --git a/application/v2_ui/src/lib/workspaceActionConnectors.ts b/application/v2_ui/src/lib/workspaceActionConnectors.ts
index a8bf07bcc..928d36812 100644
--- a/application/v2_ui/src/lib/workspaceActionConnectors.ts
+++ b/application/v2_ui/src/lib/workspaceActionConnectors.ts
@@ -5,7 +5,10 @@ import {
     buildEditorWrite, EDITOR_SECRET_MASK, isRecord, pointerPart,
     type ActionConfiguration, type AuthoringResource,
 } from './workspaceAuthoring';
-import type { ActionIdentity, ActionTestGroupScope } from './workspaceActionTypes';
+import {
+    actionTestScopeName, isGroupActionTestScope,
+    type ActionIdentity, type ActionTestScope,
+} from './workspaceActionTypes';
 
 export type ApiConnector = 'openapi' | 'mcp';
 export type ConnectorResource = AuthoringResource<ActionConfiguration> | null;
@@ -477,8 +480,12 @@ export async function fetchMcpPresets(signal?: AbortSignal): Promise<McpCatalogE
     return parseMcpCatalogue(await api.get<unknown>('/api/plugins/mcp/presets', signal), 'presets');
 }
 
-export async function fetchMcpPreconfigurations(signal?: AbortSignal): Promise<McpCatalogEntry[]> {
-    return parseMcpCatalogue(await api.get<unknown>('/api/plugins/mcp/preconfigurations?scope=personal', signal), 'preconfigurations');
+/**
+ * The MCP preconfigurations offered to an action. Eligibility depends on the scope the action is
+ * saved in, so a global action reads the global list, which the server opens only to administrators.
+ */
+export async function fetchMcpPreconfigurations(signal?: AbortSignal, scope: 'personal' | 'global' = 'personal'): Promise<McpCatalogEntry[]> {
+    return parseMcpCatalogue(await api.get<unknown>(`/api/plugins/mcp/preconfigurations?scope=${scope}`, signal), 'preconfigurations');
 }
 
 export function allowedMcpTransports(preset?: McpCatalogEntry): ConnectorOption[] {
@@ -876,10 +883,15 @@ export function connectorFeedback(value: unknown): ConnectorFeedback {
 
 export function buildConnectorSupportPayload(
     draft: ActionConfiguration, original: ConnectorResource, kind: ApiConnector,
-    purpose: 'test' | 'discover' | 'validate' = 'test', groupScope?: ActionTestGroupScope,
+    purpose: 'test' | 'discover' | 'validate' = 'test', testScope?: ActionTestScope,
 ): Record<string, unknown> {
-    // A group connector is testable only from its own group workspace, carrying action_scope 'group'.
-    if (original?.read_only || draft.is_global || (draft.is_group && !groupScope)) throw new Error('Provided actions are read-only and cannot be tested.');
+    const scopeName = actionTestScopeName(testScope);
+    const groupScope = isGroupActionTestScope(testScope) ? testScope : undefined;
+    // A connector is testable only from its own scope: a group connector from its group workspace
+    // and a global connector from Admin Settings, each carrying its own action_scope.
+    if (original?.read_only || (draft.is_global && scopeName !== 'global') || (draft.is_group && !groupScope)) {
+        throw new Error('Provided actions are read-only and cannot be tested.');
+    }
     if (original && !connectorText(original.record.id).trim()) throw new Error('Reload this action before testing: its stable owned ID is missing.');
     const errors = {
         ...validateConnectorConfiguration(draft, kind),
@@ -929,21 +941,21 @@ export function buildConnectorSupportPayload(
     return {
         ...manifest,
         ...(purpose !== 'validate' ? {
-            action_scope: groupScope ? 'group' : 'personal',
+            action_scope: scopeName,
             ...(groupScope ? { group_id: groupScope.id } : {}),
-            ...(original ? { plugin_context: { scope: groupScope ? 'group' : 'personal', id: original.record.id, name: original.record.name } } : {}),
+            ...(original ? { plugin_context: { scope: scopeName, id: original.record.id, name: original.record.name } } : {}),
             clear_secret_paths: [...clearPaths],
         } : {}),
     };
 }
 
-export function testApiConnector(draft: ActionConfiguration, original: ConnectorResource, kind: ApiConnector, signal?: AbortSignal, groupScope?: ActionTestGroupScope): Promise<unknown> {
-    const payload = buildConnectorSupportPayload(draft, original, kind, 'test', groupScope);
+export function testApiConnector(draft: ActionConfiguration, original: ConnectorResource, kind: ApiConnector, signal?: AbortSignal, testScope?: ActionTestScope): Promise<unknown> {
+    const payload = buildConnectorSupportPayload(draft, original, kind, 'test', testScope);
     return api.post(`/api/plugins/test-${kind}-connection`, payload, signal);
 }
 
-export function validateApiConnector(draft: ActionConfiguration, original: ConnectorResource, kind: ApiConnector, signal?: AbortSignal, groupScope?: ActionTestGroupScope): Promise<unknown> {
-    return api.post('/api/plugins/validate', buildConnectorSupportPayload(draft, original, kind, 'validate', groupScope), signal);
+export function validateApiConnector(draft: ActionConfiguration, original: ConnectorResource, kind: ApiConnector, signal?: AbortSignal, testScope?: ActionTestScope): Promise<unknown> {
+    return api.post('/api/plugins/validate', buildConnectorSupportPayload(draft, original, kind, 'validate', testScope), signal);
 }
 
 export interface McpDiscoveryResult {
@@ -958,8 +970,8 @@ export interface McpDiscoveryResult {
     mcp_operation_id?: string;
 }
 
-export async function discoverMcpAction(draft: ActionConfiguration, original: ConnectorResource, signal?: AbortSignal, groupScope?: ActionTestGroupScope): Promise<McpDiscoveryResult> {
-    const result = await api.post<McpDiscoveryResult>('/api/plugins/mcp/discover', buildConnectorSupportPayload(draft, original, 'mcp', 'discover', groupScope), signal);
+export async function discoverMcpAction(draft: ActionConfiguration, original: ConnectorResource, signal?: AbortSignal, testScope?: ActionTestScope): Promise<McpDiscoveryResult> {
+    const result = await api.post<McpDiscoveryResult>('/api/plugins/mcp/discover', buildConnectorSupportPayload(draft, original, 'mcp', 'discover', testScope), signal);
     if (!result || (result.success === true && (!Array.isArray(result.tools) ||
         parseMcpTools(result.tools).length !== result.tools.length))) {
         throw new Error('The server returned an invalid MCP tool catalogue.');
diff --git a/application/v2_ui/src/lib/workspaceActionServices.ts b/application/v2_ui/src/lib/workspaceActionServices.ts
index 6c00f9053..160ff48a5 100644
--- a/application/v2_ui/src/lib/workspaceActionServices.ts
+++ b/application/v2_ui/src/lib/workspaceActionServices.ts
@@ -11,9 +11,12 @@ import {
     actionAuthMethod, actionForSave, actionText, actionValueAt, validateActionDraft,
 } from './workspaceActionLogic';
 import { nativeActionDefinition, sqlConnectionMethod } from './workspaceActionRegistry';
-import type { ActionIdentity, ActionTestGroupScope } from './workspaceActionTypes';
+import {
+    actionTestScopeName, isGroupActionTestScope,
+    type ActionIdentity, type ActionTestScope,
+} from './workspaceActionTypes';
 
-export type { ActionTestGroupScope } from './workspaceActionTypes';
+export type { ActionTestGroupScope, ActionTestScope } from './workspaceActionTypes';
 
 export interface ActionEditorHints {
     canAuthor: boolean;
@@ -80,10 +83,13 @@ function translateActionSecrets(
 
 export function buildActionConnectionPayload(
     draft: ActionConfiguration, original: AuthoringResource<ActionConfiguration> | null,
-    groupScope?: ActionTestGroupScope,
+    testScope?: ActionTestScope,
 ): Record<string, unknown> {
-    // A group action is testable only from its own group workspace, carrying action_scope 'group'.
-    if (draft.type === 'agent' || original?.read_only || draft.is_global || (draft.is_group && !groupScope)) {
+    const scopeName = actionTestScopeName(testScope);
+    const groupScope = isGroupActionTestScope(testScope) ? testScope : undefined;
+    // An action is testable only from its own scope: a group action from its group workspace and a
+    // global action from Admin Settings, each carrying its own action_scope.
+    if (draft.type === 'agent' || original?.read_only || (draft.is_global && scopeName !== 'global') || (draft.is_group && !groupScope)) {
         throw new Error('This action cannot be connection-tested from My Workspace.');
     }
     if (original && !actionText(original.record.id).trim()) {
@@ -141,7 +147,7 @@ export function buildActionConnectionPayload(
     manifest.auth = auth;
     manifest.additionalFields = fields;
     const context = original
-        ? { scope: groupScope ? 'group' : 'personal', id: original.record.id, name: original.record.name }
+        ? { scope: scopeName, id: original.record.id, name: original.record.name }
         : undefined;
     const contextKey = ['sql_query', 'sql_schema', 'cosmos_query', 'yamcs', 'rocksdb'].includes(draft.type)
         ? 'existing_plugin' : 'plugin_context';
@@ -156,7 +162,7 @@ export function buildActionConnectionPayload(
         }
     }
     const common = {
-        action_scope: groupScope ? 'group' : 'personal', identity_id: draft.identity_id ?? '', clear_secret_paths: clearPaths,
+        action_scope: scopeName, identity_id: draft.identity_id ?? '', clear_secret_paths: clearPaths,
         ...(groupScope ? { group_id: groupScope.id } : {}),
         ...(context ? { [contextKey]: context } : {}),
     };
@@ -186,14 +192,14 @@ export function buildActionConnectionPayload(
 
 export function testWorkspaceAction(
     draft: ActionConfiguration, original: AuthoringResource<ActionConfiguration> | null,
-    definition: ActionTypeDefinition, signal?: AbortSignal, groupScope?: ActionTestGroupScope,
+    definition: ActionTypeDefinition, signal?: AbortSignal, testScope?: ActionTestScope,
 ): Promise<unknown> {
     const path = nativeActionDefinition(draft.type).testPath;
     if (!path) return Promise.reject(new Error('This connector does not expose a connection-test command.'));
     const errors = validateActionDraft(actionForSave(draft), definition, original);
     for (const field of ['/name', '/displayName', '/type']) delete errors[field];
     if (Object.keys(errors).length) return Promise.reject(new Error(Object.values(errors).join(' ')));
-    return api.post(path, buildActionConnectionPayload(draft, original, groupScope), signal);
+    return api.post(path, buildActionConnectionPayload(draft, original, testScope), signal);
 }
 
 export function validateWorkspaceAction(
diff --git a/application/v2_ui/src/lib/workspaceActionTypes.ts b/application/v2_ui/src/lib/workspaceActionTypes.ts
index 271291a15..787869a88 100644
--- a/application/v2_ui/src/lib/workspaceActionTypes.ts
+++ b/application/v2_ui/src/lib/workspaceActionTypes.ts
@@ -22,6 +22,37 @@ export interface ActionTestGroupScope {
     name?: string;
 }
 
+/**
+ * A global action's test, discovery and validation run in the global scope, which the server opens
+ * only to administrators and resolves stored credentials from the global Key Vault namespace.
+ */
+export interface ActionTestGlobalScope {
+    global: true;
+}
+
+/** The scope a connector command runs in; absent for personal actions. */
+export type ActionTestScope = ActionTestGroupScope | ActionTestGlobalScope;
+
+export const GLOBAL_ACTION_TEST_SCOPE: ActionTestGlobalScope = { global: true };
+
+export function isGlobalActionTestScope(scope?: ActionTestScope): scope is ActionTestGlobalScope {
+    return Boolean(scope && 'global' in scope && scope.global === true);
+}
+
+export function isGroupActionTestScope(scope?: ActionTestScope): scope is ActionTestGroupScope {
+    return Boolean(scope && 'id' in scope && typeof scope.id === 'string');
+}
+
+/** The `action_scope` a connector payload names. */
+export function actionTestScopeName(scope?: ActionTestScope): 'personal' | 'group' | 'global' {
+    return isGlobalActionTestScope(scope) ? 'global' : isGroupActionTestScope(scope) ? 'group' : 'personal';
+}
+
+/** The scope a connector command should run in, from the editor's connector props. */
+export function connectorTestScope(props: Pick<ActionConnectorProps, 'groupScope' | 'globalScope'>): ActionTestScope | undefined {
+    return props.groupScope ?? (props.globalScope ? GLOBAL_ACTION_TEST_SCOPE : undefined);
+}
+
 export interface ActionConnectorProps {
     draft: ActionConfiguration;
     original: AuthoringResource<ActionConfiguration> | null;
@@ -40,6 +71,11 @@ export interface ActionConnectorProps {
     identitiesResolvable: boolean;
     /** Set when the action belongs to a group, so connector tests send the group test payload. */
     groupScope?: ActionTestGroupScope;
+    /**
+     * Set when an administrator edits a global action, so connector commands run in the global
+     * scope and MCP preconfigurations are read for global actions.
+     */
+    globalScope?: boolean;
 }
 
 export interface ActionFieldDescriptor {
diff --git a/application/v2_ui/src/lib/workspaceAgentCommands.ts b/application/v2_ui/src/lib/workspaceAgentCommands.ts
index aa8015582..d56f33eac 100644
--- a/application/v2_ui/src/lib/workspaceAgentCommands.ts
+++ b/application/v2_ui/src/lib/workspaceAgentCommands.ts
@@ -10,15 +10,17 @@ import { agentKnowledgeReference, type AgentKnowledgeCatalog } from './workspace
 /**
  * Which workspace an instruction drafting request speaks for. Personal keeps the historical
  * `agent_scope: 'user'` spelling with no group; a group draft names its group so the server drafts
- * against the group's own actions and knowledge rather than the caller's personal ones. Personal
+ * against the group's own actions and knowledge rather than the caller's personal ones. A global
+ * draft speaks for the organisation, which the server allows only for an administrator. Personal
  * callers pass nothing and their request stays byte-identical.
  */
 export interface InstructionDraftScope {
-    agentScope: 'user' | 'group';
+    agentScope: 'user' | 'group' | 'global';
     groupId?: string;
 }
 
 export const PERSONAL_INSTRUCTION_SCOPE: InstructionDraftScope = { agentScope: 'user' };
+export const GLOBAL_INSTRUCTION_SCOPE: InstructionDraftScope = { agentScope: 'global' };
 
 export function agentInstructionRequest(
     draft: AgentConfiguration, actions: ActionConfiguration[], catalog: AgentKnowledgeCatalog | null,
diff --git a/application/v2_ui/src/lib/workspaceAgentKnowledge.ts b/application/v2_ui/src/lib/workspaceAgentKnowledge.ts
index a78b4380b..8610030b8 100644
--- a/application/v2_ui/src/lib/workspaceAgentKnowledge.ts
+++ b/application/v2_ui/src/lib/workspaceAgentKnowledge.ts
@@ -68,6 +68,16 @@ export async function fetchGroupAgentKnowledgeCatalog(groupId: string, signal?:
     );
 }
 
+/**
+ * The catalogue a global agent may draw on: public workspaces only, since a global agent answers
+ * everyone and can hold no person's or group's documents. The server opens it only to administrators.
+ */
+export async function fetchGlobalAgentKnowledgeCatalog(signal?: AbortSignal): Promise<AgentKnowledgeCatalog> {
+    return validateAgentKnowledgeCatalog(
+        await api.get<AgentKnowledgeCatalog>('/api/agents/assigned-knowledge/catalog?agent_scope=global', signal),
+    );
+}
+
 function validateAgentKnowledgeCatalog(response: AgentKnowledgeCatalog): AgentKnowledgeCatalog {
     if (!response || !Array.isArray(response.sources) || !Array.isArray(response.documents) || !Array.isArray(response.tags)) {
         throw new Error('The assigned knowledge catalogue returned an invalid response.');
diff --git a/application/v2_ui/src/lib/workspaceAgentTemplates.ts b/application/v2_ui/src/lib/workspaceAgentTemplates.ts
index b3336241d..6d4e23fae 100644
--- a/application/v2_ui/src/lib/workspaceAgentTemplates.ts
+++ b/application/v2_ui/src/lib/workspaceAgentTemplates.ts
@@ -67,7 +67,13 @@ export function agentDraftFromTemplate(template: AgentTemplate, actions: ActionC
     };
 }
 
-export function agentTemplateSubmission(draft: AgentConfiguration) {
+/**
+ * The template the gallery stores for a draft. `sourceScope` records where it came from: an
+ * administrator's global agent is a `global` submission, which the template service publishes
+ * straight to the approved gallery; personal and group agents submit as `personal`, as the classic
+ * workspaces do.
+ */
+export function agentTemplateSubmission(draft: AgentConfiguration, sourceScope: 'personal' | 'global' = 'personal') {
     return {
         template: {
             title: draft.display_name.trim(),
@@ -79,7 +85,7 @@ export function agentTemplateSubmission(draft: AgentConfiguration) {
             actions_to_load: draft.actions_to_load,
             tags: draft.tags ?? [],
             ...(draft.id ? { source_agent_id: draft.id } : {}),
-            source_scope: 'personal',
+            source_scope: sourceScope,
         },
     };
 }
diff --git a/application/v2_ui/src/lib/workspaceAuthoring.ts b/application/v2_ui/src/lib/workspaceAuthoring.ts
index 1e181e952..99acb0bc8 100644
--- a/application/v2_ui/src/lib/workspaceAuthoring.ts
+++ b/application/v2_ui/src/lib/workspaceAuthoring.ts
@@ -147,6 +147,19 @@ export function sameEditorValue(left: unknown, right: unknown): boolean {
 
 const MANAGED_FIELDS = new Set(['user_id', 'last_updated', 'modified_at', 'modified_by', 'created_at', 'created_by', 'is_global', 'is_group', 'group_id']);
 
+/**
+ * Fields the server stamps on a stored record and never accepts back, in `updates` or
+ * `removed_paths`. Global records carry the ones the classic global saves write. The global editor
+ * adapters strip them from both sides of the diff, so no editor change can emit them.
+ */
+const SERVER_STAMPED_FIELDS = ['scope', 'scope_id', 'scope_type', 'updated_at', 'updated_by', 'owner_id', 'owner_user_id'];
+
+export function withoutServerStampedFields<T extends object>(record: T): T {
+    const clone = { ...(record as Record<string, unknown>) };
+    for (const field of SERVER_STAMPED_FIELDS) delete clone[field];
+    return clone as T;
+}
+
 /** Array changes replace the array; object changes name only changed leaves. */
 export function buildEditorWrite<T extends Record<string, unknown>>(
     draft: T,
@@ -211,6 +224,16 @@ function validPathIdentifier(segment: string): boolean {
         !/[/\\\u0000-\u001f\u007f]/.test(identifier);
 }
 
+/** The return-path scope for global agents edited from Admin Settings. */
+export const GLOBAL_AGENT_RETURN_SCOPE = { kind: 'global' } as const;
+
+/** A group id, or the global scope; absent means personal. */
+export type AgentEditorReturnScope = string | typeof GLOBAL_AGENT_RETURN_SCOPE;
+
+/** The SPA routes the administrator's global agent and action editors live under. */
+export const GLOBAL_AGENTS_BASE_PATH = '/admin/agents';
+export const GLOBAL_ACTIONS_BASE_PATH = '/admin/actions';
+
 /**
  * Only a known agent editor can receive a just-created action.
  *
@@ -218,16 +241,19 @@ function validPathIdentifier(segment: string): boolean {
  * callers and links are byte-identical. A group caller passes its group id, and only that group's
  * `/groups/<id>/agents/<id>` path is accepted -- an action created for group A can never hand back
  * into group B, and a personal path is refused in group scope and the reverse. The group id is
- * matched by its encoded spelling, the same spelling `workspaceBasePath` writes into the URL.
+ * matched by its encoded spelling, the same spelling `workspaceBasePath` writes into the URL. The
+ * global scope accepts only the Admin Settings agent editor, `/admin/agents/<id>`.
  */
-export function agentEditorReturnPath(value: string | null, groupId?: string): string | null {
+export function agentEditorReturnPath(value: string | null, scope?: AgentEditorReturnScope): string | null {
     if (!value) return null;
     let identifierSegment: string | undefined;
-    if (typeof groupId === 'string') {
-        const prefix = `/groups/${encodeURIComponent(groupId)}/agents/`;
+    if (typeof scope === 'string') {
+        const prefix = `/groups/${encodeURIComponent(scope)}/agents/`;
         if (!value.startsWith(prefix)) return null;
         const rest = value.slice(prefix.length);
         identifierSegment = /^[^/?#]+$/.test(rest) ? rest : undefined;
+    } else if (scope?.kind === 'global') {
+        identifierSegment = value.match(/^\/admin\/agents\/([^/?#]+)$/)?.[1];
     } else {
         identifierSegment = value.match(/^\/workspace\/agents\/([^/?#]+)$/)?.[1];
     }
@@ -235,18 +261,19 @@ export function agentEditorReturnPath(value: string | null, groupId?: string): s
 }
 
 /**
- * Whether a path is any agent editor, personal or group. Used only by the editor frame's
+ * Whether a path is any agent editor, personal, group or global. Used only by the editor frame's
  * navigation blocker, which recognises the agent<->action handoff without knowing the group id --
  * the returnTo linkage the blocker also checks ties the two halves together. Stricter callers pass
- * an explicit group id to `agentEditorReturnPath` instead.
+ * an explicit scope to `agentEditorReturnPath` instead.
  */
 export function isAgentEditorPath(value: string | null): boolean {
-    if (agentEditorReturnPath(value)) return true;
+    if (agentEditorReturnPath(value) || agentEditorReturnPath(value, GLOBAL_AGENT_RETURN_SCOPE)) return true;
     const identifierSegment = value?.match(/^\/groups\/[^/?#]+\/agents\/([^/?#]+)$/)?.[1];
     return Boolean(identifierSegment && validPathIdentifier(identifierSegment));
 }
 
-/** Whether a path is a new-action editor, personal or group. Used by the editor frame blocker. */
+/** Whether a path is a new-action editor, personal, group or global. Used by the editor frame blocker. */
 export function isActionEditorNewPath(value: string): boolean {
-    return value === '/workspace/actions/new' || /^\/groups\/[^/?#]+\/actions\/new$/.test(value);
+    return value === '/workspace/actions/new' || value === `${GLOBAL_ACTIONS_BASE_PATH}/new`
+        || /^\/groups\/[^/?#]+\/actions\/new$/.test(value);
 }
diff --git a/application/v2_ui/src/lib/workspaceEditorDrafts.ts b/application/v2_ui/src/lib/workspaceEditorDrafts.ts
index 182c8501a..8b24aefac 100644
--- a/application/v2_ui/src/lib/workspaceEditorDrafts.ts
+++ b/application/v2_ui/src/lib/workspaceEditorDrafts.ts
@@ -5,9 +5,11 @@ import { useCallback, useState, type Dispatch, type SetStateAction } from 'react
 import { useBootstrapStore } from '../stores/bootstrapStore';
 import {
     agentEditorReturnPath,
+    GLOBAL_AGENT_RETURN_SCOPE,
     sameEditorValue,
     type ActionConfiguration,
     type AgentConfiguration,
+    type AgentEditorReturnScope,
     type AuthoringResource,
 } from './workspaceAuthoring';
 
@@ -18,16 +20,25 @@ type EditorKind = 'agents' | 'actions';
  * Which workspace a draft belongs to. Personal is the default and, to keep personal behaviour
  * byte-identical, contributes nothing to the cache key. A group scope adds its id, so a draft
  * opened in group A can never be restored into group B or into personal scope -- the isolation
- * the created-action handoff needs too.
+ * the created-action handoff needs too. The global scope is the administrator's own partition for
+ * global agents and actions edited from Admin Settings.
  */
 export type EditorWorkspaceScope =
     | { kind: 'personal' }
-    | { kind: 'group'; id: string };
+    | { kind: 'group'; id: string }
+    | { kind: 'global' };
 
 const PERSONAL_EDITOR_SCOPE: EditorWorkspaceScope = { kind: 'personal' };
 
 function editorScopeSegments(scope: EditorWorkspaceScope): string[] {
-    return scope.kind === 'group' ? ['group', scope.id] : [];
+    if (scope.kind === 'group') return ['group', scope.id];
+    return scope.kind === 'global' ? ['global'] : [];
+}
+
+/** The return-path scope `agentEditorReturnPath` checks a handed-off action against. */
+function returnPathScope(scope: EditorWorkspaceScope): AgentEditorReturnScope | undefined {
+    if (scope.kind === 'group') return scope.id;
+    return scope.kind === 'global' ? GLOBAL_AGENT_RETURN_SCOPE : undefined;
 }
 
 interface DraftState<T extends Configuration> {
@@ -138,8 +149,7 @@ export function queueCreatedWorkspaceAction(
     action: ActionConfiguration,
     workspaceScope: EditorWorkspaceScope = PERSONAL_EDITOR_SCOPE,
 ): void {
-    const groupId = workspaceScope.kind === 'group' ? workspaceScope.id : undefined;
-    if (!agentEditorReturnPath(returnPath, groupId)) throw new Error('Invalid agent editor return path.');
+    if (!agentEditorReturnPath(returnPath, returnPathScope(workspaceScope))) throw new Error('Invalid agent editor return path.');
     createdActions.set(JSON.stringify([ownerKey(), ...editorScopeSegments(workspaceScope), returnPath]), action);
     syncDraftUnloadProtection();
 }
diff --git a/application/v2_ui/src/pages/AdminGlobalEditorPages.tsx b/application/v2_ui/src/pages/AdminGlobalEditorPages.tsx
new file mode 100644
index 000000000..66463fe3d
--- /dev/null
+++ b/application/v2_ui/src/pages/AdminGlobalEditorPages.tsx
@@ -0,0 +1,57 @@
+// AdminGlobalEditorPages.tsx
+// The global agent and action editors, opened from Admin Settings.
+//
+// These are the same editors personal and group workspaces use, driven by the global
+// workbench adapters, inside an Admin Settings page frame. Saving or going back returns to
+// Admin Settings with the matching section in view. Only an administrator reaches them;
+// anyone else is told why, and the server refuses every global editor route regardless.
+
+import type { ReactNode } from 'react';
+import { ShieldAlert } from 'lucide-react';
+import { PageHeader } from '../components/layout/PageHeader';
+import { GlassPanel } from '../components/ui/primitives';
+import { GLOBAL_ACTION_WORKBENCH } from '../lib/actionWorkbench';
+import { GLOBAL_AGENT_WORKBENCH } from '../lib/agentWorkbench';
+import { useBootstrapStore } from '../stores/bootstrapStore';
+import { ActionEditorPage } from './workspace/ActionEditorPage';
+import { AgentEditorPage } from './workspace/AgentEditorPage';
+
+function AdminEditorFrame({ description, children }: { description: string; children: ReactNode }) {
+    const isAdmin = useBootstrapStore((state) => Boolean(state.data?.user?.is_admin));
+    return (
+        <>
+            <PageHeader title="Admin settings" description={description} />
+            {isAdmin ? (
+                <div className="flex min-h-0 flex-1 flex-col overflow-hidden p-4 lg:px-6">
+                    <div className="mx-auto flex min-h-0 w-full max-w-6xl flex-1 flex-col">{children}</div>
+                </div>
+            ) : (
+                <div className="flex flex-1 items-center justify-center p-6">
+                    <GlassPanel className="flex max-w-md items-start gap-3 p-5">
+                        <ShieldAlert size={20} className="mt-0.5 shrink-0 text-warn" aria-hidden="true" />
+                        <div>
+                            <p className="font-medium text-text-1">Administrator access required</p>
+                            <p className="mt-1 text-sm text-text-3">Your account does not hold the Admin role.</p>
+                        </div>
+                    </GlassPanel>
+                </div>
+            )}
+        </>
+    );
+}
+
+export function AdminAgentEditorPage() {
+    return (
+        <AdminEditorFrame description="Global agents">
+            <AgentEditorPage adapter={GLOBAL_AGENT_WORKBENCH} />
+        </AdminEditorFrame>
+    );
+}
+
+export function AdminActionEditorPage() {
+    return (
+        <AdminEditorFrame description="Global actions">
+            <ActionEditorPage adapter={GLOBAL_ACTION_WORKBENCH} />
+        </AdminEditorFrame>
+    );
+}
diff --git a/application/v2_ui/src/pages/AdminSettingsPage.tsx b/application/v2_ui/src/pages/AdminSettingsPage.tsx
index f5354af7b..09a218ffd 100644
--- a/application/v2_ui/src/pages/AdminSettingsPage.tsx
+++ b/application/v2_ui/src/pages/AdminSettingsPage.tsx
@@ -25,8 +25,9 @@
 // saving per keystroke would mint a version per character.
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useBlocker } from 'react-router-dom';
 import { clsx } from 'clsx';
-import { Loader2, Network, Search, ShieldAlert, TriangleAlert, type LucideIcon } from 'lucide-react';
+import { Loader2, Search, ShieldAlert, TriangleAlert, type LucideIcon } from 'lucide-react';
 import { ApiError, api } from '../lib/apiClient';
 import { useBootstrapStore } from '../stores/bootstrapStore';
 import { PageHeader } from '../components/layout/PageHeader';
@@ -59,8 +60,9 @@ import { ModelSelectionPicker } from '../components/admin/ModelSelectionPicker';
 import { OrchestrationCard } from '../components/admin/OrchestrationCard';
 import { OrchestrationPlannerModelPicker } from '../components/admin/OrchestrationPlannerModelPicker';
 import { PromotedAgentsEditor } from '../components/admin/PromotedAgentsEditor';
-import { AgentDelegationManager } from '../components/agents/AgentDelegationManager';
-import { GLOBAL_DELEGATION_SCOPE } from '../lib/agentDelegation';
+import { AgentTemplateApprovalsLink } from '../components/admin/AgentTemplateApprovalsLink';
+import { GlobalActionsManager } from '../components/admin/GlobalActionsManager';
+import { GlobalAgentsManager } from '../components/admin/GlobalAgentsManager';
 import { SaveBar } from '../components/admin/SaveBar';
 import { SecretField } from '../components/admin/SecretField';
 import { SettingsSection } from '../components/admin/SettingsSection';
@@ -68,6 +70,7 @@ import { SettingsIndex, type SettingsIndexEntry } from '../components/admin/Sett
 import { agentSectionAppearances } from '../components/admin/agentSectionAppearance';
 import { ALL_SETTINGS_ICON, resolveAdminNavIcon } from '../components/admin/adminSectionIcons';
 import { SettingField } from '../components/admin/fields';
+import { WorkspaceLeavePrompt } from '../components/workspace/WorkspaceEditorFrame';
 import {
     ClassificationBannerPreview,
     UserAgreementPreview,
@@ -131,6 +134,9 @@ interface RenderedSection {
 /** Synthetic field definitions used to read a sibling's current value for a preview. */
 const READ_ONLY_REF = (key: string): AdminField => ({ key, type: 'text', label: '' });
 
+/** The global agent and action editors, which open in place of this page. */
+const GLOBAL_EDITOR_PATH = /^\/admin\/(?:agents|actions)\/[^/]+$/;
+
 /**
  * Associate each undeclared `enable_*` setting with a section.
  *
@@ -212,7 +218,14 @@ function buildCapabilityIndex(
     });
 }
 
-export function AdminSettingsPage() {
+/**
+ * The Admin Settings page.
+ *
+ * `focusSection` opens the page on one section's category with that section in view. The
+ * global agent and action editors return through it, at /admin/agents and /admin/actions,
+ * so finishing an edit lands back on the list it started from.
+ */
+export function AdminSettingsPage({ focusSection }: { focusSection?: string } = {}) {
     const isAdmin = useBootstrapStore((state) => Boolean(state.data?.user?.is_admin));
     const bootstrapVersion = useBootstrapStore((state) => state.data?.version);
 
@@ -234,7 +247,8 @@ export function AdminSettingsPage() {
     const [checkingForUpdates, setCheckingForUpdates] = useState(true);
     const [query, setQuery] = useState('');
     const [activeGroup, setActiveGroup] = useState<string | null>(null);
-    const [delegationDirty, setDelegationDirty] = useState(false);
+    /** Counts category choices, so each one restarts the page index at the top. */
+    const [categoryVisit, setCategoryVisit] = useState(0);
 
     const [draft, setDraft] = useState<Json>({});
     const [saving, setSaving] = useState(false);
@@ -625,6 +639,19 @@ export function AdminSettingsPage() {
         setFieldWarnings({});
     }, []);
 
+    // Opening a global agent or action editor replaces this page, and its unsaved settings
+    // with it. Ask first, as the editors themselves do when they are left with changes.
+    const unsavedSettings = dirtyKeys.length > 0 || saving;
+    const leaveForEditor = useBlocker(
+        ({ nextLocation }) => unsavedSettings && GLOBAL_EDITOR_PATH.test(nextLocation.pathname),
+    );
+    useEffect(() => {
+        // A save that finishes while the question is open leaves nothing to lose.
+        if (leaveForEditor.state === 'blocked' && !unsavedSettings) {
+            leaveForEditor.proceed();
+        }
+    }, [leaveForEditor, unsavedSettings]);
+
     const save = useCallback(async () => {
         if (!Object.keys(draft).length) {
             return;
@@ -706,6 +733,20 @@ export function AdminSettingsPage() {
     const readSibling = (key: string, fallback = '') =>
         asString(readFieldValue(READ_ONLY_REF(key), settings, draft), fallback);
 
+    /**
+     * Show a category from its first section.
+     *
+     * Every category shares one scroll pane, so changing the filter alone kept the offset
+     * the previous category was left at: leaving Knowledge near its end opened Security
+     * near its end too. Choosing a category -- including the one already shown -- now
+     * starts at the top, and the index is restarted so it marks that first section.
+     */
+    const selectCategory = useCallback((groupId: string | null) => {
+        setActiveGroup(groupId);
+        setCategoryVisit((visit) => visit + 1);
+        scrollRef.current?.scrollTo({ top: 0 });
+    }, []);
+
     /**
      * Move the page to a section, from a cross-reference elsewhere on it.
      *
@@ -720,16 +761,27 @@ export function AdminSettingsPage() {
         if (!shown) {
             const target = sections.find((section) => section.sectionId === sectionId);
             const nextGroup = !target ? null : activeGroup && target.groupId !== activeGroup ? target.groupId : activeGroup;
-            if (nextGroup !== activeGroup && delegationDirty) {
-                // Changing category would unmount the delegation manager and its edits.
-                toast.error('Save or cancel Call agent changes before changing settings categories.');
-                return;
-            }
             setQuery('');
             setActiveGroup(nextGroup);
         }
         setPendingScroll(sectionId);
-    }, [visibleSections, sections, activeGroup, delegationDirty]);
+    }, [visibleSections, sections, activeGroup]);
+
+    // Open a deep-linked section once its section exists: its own category, with it in view.
+    // Only once per link, so choosing another category afterwards is not undone.
+    const focusedSectionRef = useRef<string | null>(null);
+    useEffect(() => {
+        if (!focusSection || focusedSectionRef.current === focusSection) {
+            return;
+        }
+        const target = sections.find((section) => section.sectionId === focusSection);
+        if (!target) {
+            return;
+        }
+        focusedSectionRef.current = focusSection;
+        setActiveGroup(target.groupId);
+        setPendingScroll(focusSection);
+    }, [focusSection, sections]);
 
     useEffect(() => {
         if (!pendingScroll) {
@@ -1009,6 +1061,19 @@ export function AdminSettingsPage() {
                     );
                 case 'global-identities-list':
                     return <GlobalIdentitiesList key={key} help={field.help} />;
+                case 'global-agents-manager':
+                    // The editor's template gallery reads the saved setting, so the shortcut does too.
+                    return (
+                        <GlobalAgentsManager
+                            key={key}
+                            help={field.help}
+                            templatesEnabled={asBoolean(settings['enable_agent_template_gallery'])}
+                        />
+                    );
+                case 'global-actions-manager':
+                    return <GlobalActionsManager key={key} help={field.help} />;
+                case 'agent-template-approvals-link':
+                    return <AgentTemplateApprovalsLink key={key} help={field.help} />;
                 case 'promoted-popular-agents':
                     return (
                         <PromotedAgentsEditor
@@ -1158,9 +1223,6 @@ export function AdminSettingsPage() {
         (section) =>
             section.capabilities.length > 0 && (!activeGroup || section.groupId === activeGroup),
     );
-    const showDelegationManager = !loading && Boolean(data) && !error &&
-        (activeGroup === 'agents-actions' ||
-            (activeGroup === null && /call agent|delegation/i.test(query)));
 
     // The index needs at least two sections to be worth the width it takes.
     const showIndex = !loading && !error && indexEntries.length > 1;
@@ -1239,9 +1301,8 @@ export function AdminSettingsPage() {
                                 <button
                                     key={category.id ?? '__all'}
                                     type="button"
-                                    disabled={delegationDirty}
                                     aria-pressed={active}
-                                    onClick={() => setActiveGroup(category.id)}
+                                    onClick={() => selectCategory(category.id)}
                                     className={clsx(
                                         'flex w-full items-center gap-2.5 rounded-lg px-3 py-2.5 text-left text-sm transition-colors',
                                         'disabled:cursor-not-allowed disabled:opacity-60',
@@ -1267,8 +1328,8 @@ export function AdminSettingsPage() {
                         <div className="mx-auto w-full max-w-[112rem]">
                             <div className="mb-3 max-w-md lg:hidden">
                                 <label htmlFor="admin-settings-category" className="mb-1 block text-xs text-text-2">Settings category</label>
-                                <select id="admin-settings-category" value={activeGroup ?? ''} disabled={delegationDirty}
-                                    onChange={(event) => setActiveGroup(event.target.value || null)}
+                                <select id="admin-settings-category" value={activeGroup ?? ''}
+                                    onChange={(event) => selectCategory(event.target.value || null)}
                                     className="w-full rounded-xl border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1">
                                     <option value="">All settings</option>
                                     {(data?.admin_nav ?? []).map((group) => (
@@ -1288,7 +1349,6 @@ export function AdminSettingsPage() {
                                     onChange={(event) => setQuery(event.target.value)}
                                     placeholder="Search every setting…  (press / to focus)"
                                     aria-label="Search settings"
-                                    disabled={delegationDirty}
                                     className={clsx(
                                         'w-full rounded-xl border border-edge bg-surface-1 py-2.5 pr-3 pl-9',
                                         'text-sm text-text-1 placeholder:text-text-3',
@@ -1324,37 +1384,7 @@ export function AdminSettingsPage() {
                                     </div>
                                 )}
 
-                                {showDelegationManager ? (
-                                    <GlassPanel
-                                        edge
-                                        role="region"
-                                        aria-labelledby="global-agent-delegation-title"
-                                        className="admin-settings-distinct border-edge-strong"
-                                    >
-                                        <div className="flex items-start gap-3 rounded-t-2xl border-b border-edge-strong bg-surface-2 p-4 sm:px-5">
-                                            <span
-                                                aria-hidden="true"
-                                                className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-edge-strong bg-surface-solid text-text-2"
-                                            >
-                                                <Network size={20} />
-                                            </span>
-                                            <div className="min-w-0">
-                                                <h2 id="global-agent-delegation-title" className="text-lg leading-snug font-semibold text-text-1">
-                                                    Global agent delegation
-                                                </h2>
-                                                <p className="mt-1 text-xs text-text-3">Agents &amp; Actions · Call agent</p>
-                                            </div>
-                                        </div>
-                                        <div className="space-y-3 p-4 sm:p-5">
-                                            <AgentDelegationManager scope={GLOBAL_DELEGATION_SCOPE}
-                                                allowManage={isAdmin} onDirtyChange={setDelegationDirty} />
-                                            {delegationDirty ? <p className="text-xs text-warn">Save or cancel Call agent changes before changing settings categories.</p> : null}
-                                            <p className="text-xs text-text-3">These resources save separately from settings. Full global agent and other connector management remains on the <a href="/admin/settings" className="text-accent underline">classic admin page</a>.</p>
-                                        </div>
-                                    </GlassPanel>
-                                ) : null}
-
-                                {!loading && !showDelegationManager && visibleSections.length === 0 && (
+                                {!loading && visibleSections.length === 0 && (
                                     <p className="py-12 text-center text-sm text-text-3">
                                         No settings match “{query}”.
                                     </p>
@@ -1436,6 +1466,9 @@ export function AdminSettingsPage() {
 
                             {showIndex ? (
                                 <SettingsIndex
+                                    // A fresh index per category choice, so a section pinned
+                                    // from the index cannot stay marked after the jump to the top.
+                                    key={categoryVisit}
                                     className="hidden @min-[76rem]:block"
                                     entries={indexEntries}
                                     grouped={activeGroup === null || Boolean(query.trim())}
@@ -1448,6 +1481,17 @@ export function AdminSettingsPage() {
                 </div>
             </div>
 
+            {leaveForEditor.state === 'blocked' ? (
+                <WorkspaceLeavePrompt
+                    saving={saving}
+                    onStay={() => leaveForEditor.reset()}
+                    onDiscard={() => {
+                        discard();
+                        leaveForEditor.proceed();
+                    }}
+                />
+            ) : null}
+
             {pendingAck?.requires_acknowledgement ? (
                 <AdminModal
                     title={pendingAck.requires_acknowledgement.title}
diff --git a/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx b/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx
index 2e931c963..6474b26e9 100644
--- a/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx
+++ b/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx
@@ -17,7 +17,7 @@ import {
 import { McpActionAuthentication, McpActionConfiguration } from '../../components/workspaceActions/McpActionConfiguration';
 import { ApiError } from '../../lib/apiClient';
 import {
-    agentEditorReturnPath, type ActionConfiguration, type ActionTypeDefinition,
+    agentEditorReturnPath, GLOBAL_AGENT_RETURN_SCOPE, type ActionConfiguration, type ActionTypeDefinition,
 } from '../../lib/workspaceAuthoring';
 import { queueCreatedWorkspaceAction, useWorkspaceEditorDraft } from '../../lib/workspaceEditorDrafts';
 import {
@@ -32,6 +32,7 @@ import {
     connectorFeedback, validateConnectorAuthentication, validateConnectorConfiguration, type ConnectorFeedback,
 } from '../../lib/workspaceActionConnectors';
 import type { ActionConnectorProps, ActionIdentity } from '../../lib/workspaceActionTypes';
+import { isGroupActionTestScope } from '../../lib/workspaceActionTypes';
 import { useBootstrapStore } from '../../stores/bootstrapStore';
 
 export function ActionEditorPage({ adapter = PERSONAL_ACTION_WORKBENCH }: { adapter?: ActionWorkbenchAdapter }) {
@@ -40,15 +41,18 @@ export function ActionEditorPage({ adapter = PERSONAL_ACTION_WORKBENCH }: { adap
     const location = useLocation();
     const query = new URLSearchParams(location.search);
     const scope = query.get('scope') === 'global' ? 'global' : 'personal';
-    const returnTo = resourceId === 'new'
-        ? agentEditorReturnPath(query.get('returnTo'), adapter.scope.kind === 'group' ? adapter.scope.id : undefined)
-        : null;
+    const returnScope = adapter.scope.kind === 'group' ? adapter.scope.id
+        : adapter.scope.kind === 'global' ? GLOBAL_AGENT_RETURN_SCOPE : undefined;
+    const returnTo = resourceId === 'new' ? agentEditorReturnPath(query.get('returnTo'), returnScope) : null;
     return <ActionEditor key={JSON.stringify([owner, adapter.basePath, resourceId, scope, returnTo])}
         resourceId={resourceId} scope={scope} returnTo={returnTo} adapter={adapter} />;
 }
 
 function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: string; scope: string; returnTo: string | null; adapter: ActionWorkbenchAdapter }) {
     const isGroup = adapter.scope.kind === 'group';
+    // In Admin Settings global actions are the administrator's own; everywhere else a global
+    // ("provided") action is read-only.
+    const isGlobal = adapter.scope.kind === 'global';
     const navigate = useNavigate();
     const location = useLocation();
     const id = useId();
@@ -131,7 +135,7 @@ function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: st
         void adapter.fetchEditor(resourceId, scope, controller.signal).then((resource) => {
             if (controller.signal.aborted) return;
             if (!resource?.record || !hasUsableActionRevision(resource, scope)) throw new Error('The action editor returned an invalid resource.');
-            setLatestReadOnly(resource.read_only || Boolean(resource.record.is_global));
+            setLatestReadOnly(resource.read_only || (!isGlobal && Boolean(resource.record.is_global)));
             // A return from New action must not overwrite a draft or silently rebase its revision.
             if ((!restored && !hasLoadedDraft.current) || replaceDraft.current) {
                 loadRef.current(resource);
@@ -152,7 +156,7 @@ function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: st
         };
     }, []);
 
-    const readOnly = scope === 'global' || latestReadOnly || original?.read_only === true || draft.is_global === true;
+    const readOnly = scope === 'global' || latestReadOnly || original?.read_only === true || (!isGlobal && draft.is_global === true);
     // Personal authoring is the tenant plugin permission; group authoring is the server's per-scope
     // and per-action hint on the adapter, never the personal capability. Creating is workspace-level;
     // editing an existing action additionally needs the loaded record to advertise the edit operation.
@@ -186,7 +190,8 @@ function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: st
         readOnly: readOnly || !canAuthor || saving || catalogueLoading || Boolean(catalogueError) || Boolean(loadError) || !definition,
         errors: expandActionFieldErrors(fieldErrors), onValidityChange, identities, identitiesLoading, identitiesError,
         identitiesResolvable,
-        groupScope: adapter.testScope,
+        groupScope: isGroupActionTestScope(adapter.testScope) ? adapter.testScope : undefined,
+        globalScope: isGlobal,
     };
 
     const validateLocally = () => {
diff --git a/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx b/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx
index 13e69959f..33e945c9a 100644
--- a/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx
+++ b/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx
@@ -35,7 +35,7 @@ function AgentEditorSession({ resourceId, scope, adapter }: { resourceId: string
     const location = useLocation();
     const ownerId = useBootstrapStore((state) => state.data?.user?.id ?? '');
     const personalCanCreateActions = useBootstrapStore((state) => state.data?.workspace?.sections.actions?.enabled === true);
-    const canCreateActions = adapter.scope.kind === 'group' ? adapter.canCreateActions : personalCanCreateActions;
+    const canCreateActions = adapter.scope.kind === 'personal' ? personalCanCreateActions : adapter.canCreateActions;
     const refreshBootstrap = useBootstrapStore((state) => state.refresh);
     const isNew = resourceId === 'new';
     const { draft, setDraft: setStoredDraft, original, load, clear, dirty, restored } =
@@ -235,6 +235,7 @@ function AgentEditorSession({ resourceId, scope, adapter }: { resourceId: string
                 { id: 'actions', label: 'Actions', content: structured(<AgentActionPicker draft={draft} setDraft={setDraft}
                     actions={actions} targets={targets} loading={actionsLoading} error={actionsError} targetError={targetError}
                     builtinActions={options.builtin_actions} ownerId={ownerId} canCreateActions={canCreateActions} readOnly={readOnly}
+                    scopeKind={adapter.scope.kind}
                     onRefresh={() => setActionsRevision((value) => value + 1)}
                     onNewAction={() => navigate(`${adapter.actionsBasePath}/new?returnTo=${encodeURIComponent(location.pathname)}`, { state: { preserveWorkspaceDraft: true, workspaceEditorFrom: location.key } })} />) },
                 { id: 'knowledge', label: 'Assigned knowledge', content: structured(<AgentKnowledgeFields draft={draft} setDraft={setDraft}
@@ -246,7 +247,7 @@ function AgentEditorSession({ resourceId, scope, adapter }: { resourceId: string
                 { id: 'advanced', label: 'Advanced', content: <AgentAdvancedFields draft={draft} setDraft={setDraft} options={options} original={original} /> },
                 { id: 'templates', label: 'Examples & templates', content: structured(<div ref={templatesAnchor} tabIndex={-1}>
                     <AgentTemplatesPanel draft={draft} setDraft={setDraft} options={options} actions={actions} isNew={isNew} dirty={dirty} readOnly={readOnly}
-                        submissionAllowed={adapter.allowsTemplateSubmission(options.settings)} groupScope={adapter.scope.kind === 'group'} />
+                        submissionAllowed={adapter.allowsTemplateSubmission(options.settings)} scope={adapter.scope.kind} />
                 </div>) },
             ]}
         />
diff --git a/docs/_data/app_surface.yml b/docs/_data/app_surface.yml
index 5e81978c6..9d0f12ab7 100644
--- a/docs/_data/app_surface.yml
+++ b/docs/_data/app_surface.yml
@@ -4,7 +4,7 @@ counts:
   capabilities: 126
   admin_groups: 15
   admin_tabs: 49
-  admin_sections: 110
+  admin_sections: 111
   actions: 32
   chat_controls: 47
   sub_elements: 3
@@ -839,6 +839,10 @@ admin_sections:
   label: Images Inside Office Files
   tab: extraction
   group: knowledge
+- id: organization-agents-section
+  label: Global Agents
+  tab: agents
+  group: agents-actions
 - id: permissions-section
   label: Permissions
   tab: access-roles
diff --git a/docs/admin/agents-actions.md b/docs/admin/agents-actions.md
index 9cf4b466f..feb08812f 100644
--- a/docs/admin/agents-actions.md
+++ b/docs/admin/agents-actions.md
@@ -5,7 +5,7 @@ description: "Agents & Actions controls the Semantic Kernel runtime, agent marke
 section: "Administration"
 audience: admin
 admin_tab: agents-actions
-version: "0.261.093"
+version: "0.261.260"
 redirect_from:
   - /admin/agents/
 ---
@@ -93,6 +93,52 @@ with the rest of the page.
 | Multi-Agent Orchestration | Reports whether the runtime coordinates several agents. Follows the orchestration mode rather than being set directly. | Off | `enable_multi_agent_orchestration`; derived |
 | Max Rounds Per Agent | Caps how many turns each agent takes in a multi-agent conversation, which bounds the model calls one message can trigger. | 1 | `max_rounds_per_agent`; forced to 1 outside multi-agent modes |
 
+### Global Agents {#organization-agents-section}
+
+The agents your organisation provides. While Workspace Mode is off they are the
+only agents there are, and everyone chats with the **default agent** you choose
+here. With Workspace Mode on they appear beside people's own agents only when
+**Add Global Agents and Actions to Workspaces** is on.
+
+The list shows each agent's type, model, how many actions it uses, and whether it
+is the default or disabled. Each change on the list saves straight away, because
+these are records rather than settings, so the save bar is not involved. Opening
+an agent replaces this page, so if other settings here are unsaved you are asked
+to keep editing or discard them first:
+
+- **New agent** opens the same full-page agent editor people use in their
+  workspaces: identity, model and connection, actions, assigned knowledge,
+  instructions, advanced settings, and examples and templates. Saving returns you
+  to this list.
+- **Start from a template** opens a new agent with the template gallery in view.
+  Applying a template copies its instructions, tags, and recommended actions into
+  an unsaved draft; connection credentials are never copied. Choose a model, then
+  save. The button appears while **Enable Agent Template Gallery** is on.
+- **Make default** chooses the agent that answers when nobody picks one. A
+  disabled agent cannot be the default.
+- **Disable** keeps an agent's configuration but stops offering it. Disabling the
+  default hands the default to another enabled agent, if there is one, and the
+  confirmation names which.
+- **Delete** removes an agent after you confirm. The default agent cannot be
+  deleted; choose another default first.
+
+A few things differ from a workspace agent, because a global agent answers
+everyone:
+
+- **Assigned knowledge** can draw only on public workspaces, never on a person's
+  or a group's documents.
+- **Model & connection** offers the global model connections, and a global agent
+  may also carry its own connection, as the classic editor allowed.
+- **Actions** lists the global actions. **New action** creates one in Global
+  Actions and attaches it to the agent you came from.
+- **Publish as template** adds the agent's recipe to the approved gallery
+  straight away; an administrator's template needs no review.
+
+Stored credentials stay masked in the editor, and while Key Vault secret storage
+is on they are kept in the global Key Vault namespace. Two administrators editing
+the same agent cannot overwrite each other: the second save is refused until the
+latest version is loaded.
+
 ### Workspace Agent Permissions {#agent-toggles-card}
 
 Shown only in Workspace Mode, because outside it nothing reads these.
@@ -151,7 +197,7 @@ visible to them, so a promotion cannot leak an agent someone has no access to.
 
 Shown only while the Agent Template Gallery is enabled. Submissions are reviewed
 on the shared [approvals queue]({{ '/admin/governance/' | relative_url }}) rather
-than here.
+than here; the section links to it.
 
 #### Settings
 
@@ -190,8 +236,11 @@ agents only. Runtime checks do not trust the permissions held by the person who
 originally configured an action.
 
 Classic and V2 both provide focused authoring and attachment controls for
-personal, group, and global agents. V2 global resource changes use agent/action
-APIs independently of the Admin Settings save bar. See
+personal, group, and global agents. In V2 Admin Settings a global Call agent
+action is an ordinary global action: create it under **Global Actions** with the
+**Call agent** type, which offers only global agents as targets, then attach it in
+a global agent's editor. The separate **Global agent delegation** card was removed
+in **0.261.260**. See
 [Call another agent]({{ '/guides/call-another-agent/' | relative_url }}) for the
 workflow, context-sharing rules, and execution limits.
 
@@ -296,8 +345,24 @@ is set from this page.
 
 ### Global Actions {#actions-config}
 
-The actions published to everyone. Authoring them stays in the classic admin
-interface for now.
+The actions global agents can call: connections to APIs, databases, MCP servers,
+Microsoft services, and other agents. With Workspace Mode on, workspaces see them
+too when **Add Global Agents and Actions to Workspaces** is on.
+
+As with Global Agents, each change saves straight away:
+
+- **New action** opens the full-page action editor workspaces use, with the
+  connector catalogue the deployment provides, MCP presets and the global MCP
+  preconfigurations, connection tests, and Key Vault credential handling. Saving
+  returns you to this list.
+- **Disable** keeps an action's configuration without loading it, and **Delete**
+  removes it after you confirm. Deleting an action does not edit the agents that
+  used it.
+
+Connection tests and MCP tool discovery run in the global scope, so a stored
+credential resolves from the global Key Vault namespace rather than your own. A
+**Call agent** action can target only global agents, because the server refuses
+any other target for a global action.
 
 ## Inbound MCP {#inbound-mcp}
 
@@ -391,8 +456,10 @@ request — and never prompts, document content, bearer tokens or secrets.
 ## Common tasks
 
 1. **Turn on governed agents.** Enable the runtime, choose allowed scopes, and create a test agent. Outcome to verify: Only approved agent scopes are available.
-2. **Limit document actions.** Review analyze and comparison limits, then run a small action. Outcome to verify: Document actions complete within configured caps.
-3. **Prepare inbound MCP.** Set delegated scope, roles, throttles, and sources, then connect a test client. Outcome to verify: Approved clients can reach tools and blocked sources fail cleanly.
+2. **Publish a global agent.** Under **Global Agents**, choose **New agent** or **Start from a template**, pick a model, attach global actions, and save. With Workspace Mode off, choose **Make default** so it answers chats. Outcome to verify: The agent appears in the list with the Default agent tag.
+3. **Let a global agent call a specialist.** Under **Global Actions**, create a **Call agent** action that targets the specialist, then attach it in the calling agent's editor. Outcome to verify: The action lists the target as a global agent, and the caller shows one more action.
+4. **Limit document actions.** Review analyze and comparison limits, then run a small action. Outcome to verify: Document actions complete within configured caps.
+5. **Prepare inbound MCP.** Set delegated scope, roles, throttles, and sources, then connect a test client. Outcome to verify: Approved clients can reach tools and blocked sources fail cleanly.
 
 ## Troubleshooting
 
@@ -401,6 +468,10 @@ request — and never prompts, document content, bearer tokens or secrets.
 | An action is missing from an agent | The built-in action toggle or workspace action permission is disabled. | Enable the action and confirm the agent scope allows it. |
 | The Agents page returns an error instead of the catalog | **Enable Agents** is off. That page is served behind it. | Turn on Enable Agents, or remove the link from navigation. |
 | An agent setting has no effect | Workspace Mode changes where agents come from, so a global agent is unused in Workspace Mode unless the merge setting is on. | Check Workspace Mode first, then the merge setting. |
+| A global agent has no Delete button | It is the default agent, which cannot be deleted. | Make another enabled agent the default, then delete it. |
+| A global agent cannot be saved after another administrator changed it | The editor refuses to overwrite a newer version. | Open the latest version, reapply your change, and save. |
+| A Call agent action lists no personal or group agents | Global actions call global agents only. | Choose a global agent, or create the action in the workspace that owns the target. |
+| The classic page cannot save a new key for a global agent or action whose classic-page key was later replaced in V2 | V2 stores a replaced key under a new Key Vault name and soft-deletes the old one, and Key Vault will not reuse a soft-deleted name. | Enter the new key in V2 Admin Settings, or purge the deleted secret in Key Vault. |
 | A document action ignores the limit you set | The value was outside the supported range and was clamped on save. | Re-open the setting to see the stored value. |
 | An MCP client is refused after the allowlist was updated | Every layer must pass, and a governance policy is still required after the allowlists. | Check the client app id, the tenant, the source, and the governance policy in that order. |
 
diff --git a/docs/explanation/features/AGENT_DELEGATION_ACTION.md b/docs/explanation/features/AGENT_DELEGATION_ACTION.md
index 9708dc239..a9dad4827 100644
--- a/docs/explanation/features/AGENT_DELEGATION_ACTION.md
+++ b/docs/explanation/features/AGENT_DELEGATION_ACTION.md
@@ -88,9 +88,11 @@ Classic configuration extends the shared plugin and agent modal steppers.
 Call agent has a target picker and summary rather than external endpoint or
 credential inputs.
 
-V2 uses focused reusable delegation controls in personal Actions/Agents, group
-delegation management, and the admin Agents & Actions area. These controls do
-not replace unrelated connector, model, or full group-management interfaces.
+V2 uses focused reusable delegation controls in group delegation management.
+Personal workspaces and, since **0.261.260**, V2 Admin Settings author Call agent
+as an ordinary action in the full-page action and agent editors; a global Call
+agent action's target picker lists only global agents. These controls do not
+replace unrelated connector, model, or full group-management interfaces.
 
 See [Call another agent](../../guides/call-another-agent.md) for a workflow and
 [Call agent](../../reference/actions/agent.md) for permissions and troubleshooting.
diff --git a/docs/explanation/features/V2_ADMIN_AGENTS_ACTIONS.md b/docs/explanation/features/V2_ADMIN_AGENTS_ACTIONS.md
index 1321704b5..2b6fe52ad 100644
--- a/docs/explanation/features/V2_ADMIN_AGENTS_ACTIONS.md
+++ b/docs/explanation/features/V2_ADMIN_AGENTS_ACTIONS.md
@@ -14,7 +14,7 @@ the Appearance group never exercised.
 
 **Implemented in version:** 0.261.074
 
-**Current documentation version:** 0.261.095 (`application/single_app/config.py`).
+**Current documentation version:** 0.261.260 (`application/single_app/config.py`).
 
 **Dependencies:** `admin_settings_fields.py`, `admin_settings_nav.py`,
 `route_backend_v2.py`, `application/v2_ui`.
@@ -64,6 +64,7 @@ server-rendered page. Every id below already exists in `templates/admin/_panes/`
 | Tab | Section id | Label | Condition |
 |---|---|---|---|
 | Agents | `agents-config` | Agent Runtime | — |
+| Agents | `organization-agents-section` | Global Agents | — |
 | Agents | `agent-toggles-card` | Workspace Agent Permissions | `per_user_semantic_kernel` |
 | Agents | `agents-page-customization-card` | Agents Page | — |
 | Agents | `agent-template-approvals-section` | Agent Template Approvals | `enable_agent_template_gallery` |
@@ -74,7 +75,11 @@ server-rendered page. Every id below already exists in `templates/admin/_panes/`
 
 `agents-config` and `actions-config` resolve to the V1 card ids
 `agents-configuration` and `actions-configuration` through the existing
-`sectionMap` alias in `admin_sidebar_nav.js`.
+`sectionMap` alias in `admin_sidebar_nav.js`. `organization-agents-section`
+(0.261.260) is the id of the V1 Global Agents heading inside the Agent Runtime
+card. It avoids the word `global`, because the capability fallback matches
+section-id words and would otherwise claim `enable_appinsights_global_logging`.
+See [V2 Admin Global Agents and Actions](V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md).
 
 ### Schema additions
 
@@ -218,6 +223,12 @@ exactly the shape the server keeps — `catalog_key`, `display_name`,
 `scope_label`, `scope_type`, `window` — and never offers an agent that is already
 promoted, because the server drops duplicate catalog keys on save.
 
+**`global-agents-manager`**, **`global-actions-manager`**, and
+**`agent-template-approvals-link`** (0.261.260) list and manage the global agents
+and actions and link to the approvals queue. They save records, not settings, so
+they bypass the settings draft. See
+[V2 Admin Global Agents and Actions](V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md).
+
 ## Usage
 
 Admin Settings → Agents & Actions → Agents in the V2 interface (`/v2`).
@@ -226,6 +237,8 @@ The dependency chain an administrator now sees:
 
 ```
 Enable Agents  (enable_semantic_kernel, default off)
+├─ Global Agents section  (create, edit, default, enable, delete)
+├─ Global Actions section  (create, edit, enable, delete)
 ├─ Workspace Mode  (per_user_semantic_kernel)
 │   ├─ Add Global Agents and Actions to Workspaces
 │   └─ Workspace Agent Permissions section
@@ -247,14 +260,15 @@ Enable Agents  (enable_semantic_kernel, default off)
 | `functional_tests/test_v2_admin_agents_logic.mjs` | Executes group layout, dependency chains, string and flag dependencies, section conditions, nested value reads, field-index ownership, allowlist normalization, orchestration visibility, and promotion normalization |
 | `functional_tests/test_v2_admin_settings_schema.py` | Field shape, defaults matching the application, key ownership, dependency references including string comparisons and runtime flags |
 | `functional_tests/test_v2_admin_field_renderer_coverage.py` | Every field type and every named component has a renderer branch |
+| `ui_tests/test_v2_admin_global_agents_actions.py` | Global Agents and Global Actions in the built SPA, category scroll reset, and non-administrator refusal |
 
 ## Known limitations
 
-- General global agent and connector authoring remains in the classic interface.
-  From version **0.261.093**, focused V2 controls can create/edit **Call agent**
-  actions and attach them to existing global agents. These are resource updates
-  through the agent/action APIs, not fields in the settings draft. See
-  [Agent delegation actions](AGENT_DELEGATION_ACTION.md).
+- Since **0.261.260**, global agents and actions are authored in V2 with the
+  same editors workspaces use, and the separate **Global agent delegation** card
+  is gone: a **Call agent** action is an ordinary global action. Duplicating a
+  global agent or action, which the classic tables offer, is not yet available
+  in V2.
 - `functions_document_actions` reaches `config.py` and a live Cosmos client, so
   its normalizer is imported lazily and cannot be exercised in a test process.
   The tests read its bounds from source and pin the delegation instead.
diff --git a/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
new file mode 100644
index 000000000..2c81f5336
--- /dev/null
+++ b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
@@ -0,0 +1,192 @@
+# V2 Admin Global Agents and Actions
+
+## Overview
+
+V2 Admin Settings can now list, create, edit, enable, disable, delete, and choose
+the default among the organisation's global agents, and list, create, edit,
+enable, disable, and delete global actions. Both use the full-page agent and
+action editors that personal and group workspaces already use, so a global agent
+gets the same model, action, knowledge, instruction, advanced, and template
+sections, and a global action gets the same connector catalogue, MCP presets,
+connection tests, and credential handling.
+
+Before this change the Agents & Actions group had no way to see or author global
+agents and actions in V2. The only global control was a **Global agent
+delegation** card that created **Call agent** actions on its own. That card is
+removed: a Call agent action is an ordinary global action with the **Call agent**
+type, and a global agent attaches it in its editor like any other action.
+
+**Implemented in version:** 0.261.260 (`application/single_app/config.py`)
+
+**Dependencies:** `functions_workspace_authoring.py` (the shared editor engine),
+`functions_global_editor_access.py`, `route_backend_v2_admin_agents_actions.py`,
+`route_backend_agents.py`, `route_backend_plugins.py`, `admin_settings_nav.py`,
+`admin_settings_fields.py`, and `application/v2_ui`.
+
+## Technical specifications
+
+### Architecture
+
+```mermaid
+flowchart LR
+    A[Admin Settings<br/>Global Agents / Global Actions] -->|list, enable, default, delete| B[/api/v2/admin/agents<br/>/api/v2/admin/actions/]
+    A -->|New / Edit| C[/admin/agents/:id<br/>/admin/actions/:id/]
+    C -->|GLOBAL_AGENT_WORKBENCH<br/>GLOBAL_ACTION_WORKBENCH| B
+    B --> D[functions_global_editor_access]
+    D --> E[functions_workspace_authoring<br/>global scope]
+    E --> F[(Global agents and<br/>actions containers)]
+    E --> G[(Key Vault<br/>global namespace)]
+```
+
+The editors are driven by workbench adapters. `GLOBAL_AGENT_WORKBENCH`
+(`lib/agentWorkbench.ts`) and `GLOBAL_ACTION_WORKBENCH` (`lib/actionWorkbench.ts`)
+sit beside the personal and group adapters and point the unchanged editors at the
+admin routes. `AdminAgentEditorPage` and `AdminActionEditorPage`
+(`pages/AdminGlobalEditorPages.tsx`) frame them; a non-administrator gets an
+access notice and the editors never mount.
+
+On the server, `functions_workspace_authoring.py` gained a global scope. It reads
+and writes the global containers with a mandatory conditional write (`_etag`),
+masks stored secrets, stores credentials under the global Key Vault name
+`{record id}--agent|action|action-addset--global--{name}`, refuses a duplicate name
+case-insensitively, stamps the stored shape the classic saves write
+(`is_global`, `is_group`, and for actions `scope`/`scope_id` of `global`),
+validates Call agent targets and agent bindings for the global scope, and bumps
+the agent catalogue. `functions_global_editor_access.py` orchestrates each route
+and follows a renamed default agent so the default survives a rename.
+
+### API endpoints
+
+Every route requires an administrator (`@admin_required`, registered on an
+admin-only blueprint), refuses a query string, and answers with `no-store`.
+
+| Method | Route | Purpose |
+|---|---|---|
+| GET | `/api/v2/admin/agents` | Global agents (secrets masked) and `selected_agent_name` |
+| POST | `/api/v2/admin/agents` | Create a global agent with the editor-allocated id |
+| GET, PATCH, DELETE | `/api/v2/admin/agents/<agent_id>` | Read, update, or delete one; the default agent cannot be deleted |
+| GET | `/api/v2/admin/agent-options` | Agent types, global model connections, and template submission permission |
+| GET | `/api/v2/admin/actions` | Global actions (secrets masked) |
+| POST | `/api/v2/admin/actions` | Create a global action; the server allocates the id |
+| GET, PATCH, DELETE | `/api/v2/admin/actions/<action_id>` | Read, update, or delete one |
+| GET | `/api/v2/admin/actions/types` | The action types the deployment provides, with their schemas |
+| GET | `/api/v2/admin/action-options` | Key Vault reminder defaults |
+
+Reads return `{record, revision, secret_paths, read_only}`. Writes send
+`{updates, expected_revision, clear_secret_paths, removed_paths}`, the same
+editor contract the personal and group routes use; a stale revision is a 409.
+
+The lists reuse the classic routes for state changes the editor contract does not
+model: `PATCH /api/admin/agents/<name>/enabled` (which hands the default to another
+enabled agent when the default is disabled), `POST /api/admin/agents/selected_agent`,
+and `PATCH /api/admin/plugins/<name>/enabled`.
+
+### Scope rules the editors apply
+
+| Area | Global behaviour |
+|---|---|
+| Assigned knowledge | `GET /api/agents/assigned-knowledge/catalog?agent_scope=global`: public workspaces only |
+| Model & connection | Global model connections; a global agent may carry its own connection |
+| Call agent targets | `GET /api/plugins/agent-targets?scope=global`: global agents only, matching the server's save-time check |
+| Connection tests, MCP discovery | `action_scope: 'global'`, so stored credentials resolve from the global namespace |
+| MCP preconfigurations | The global set |
+| Identities | `/api/admin/workspace-identities/global/identities` |
+| Instruction drafting | `agent_scope: 'global'` |
+| Templates | Publishing sends `source_scope: 'global'`, which an administrator's submission approves at once |
+
+`CallAgentActionConfiguration` now derives its target scope from the editor
+(global, group, or personal) instead of always reading personal targets.
+
+### Configuration and navigation
+
+`ADMIN_NAV` adds `organization-agents-section` (**Global Agents**) after Agent
+Runtime. The id avoids the word `global` because the V2 capability fallback
+matches section-id words, and `global` would claim
+`enable_appinsights_global_logging`. The V1 Global Agents heading carries the same
+id so the navigation map stays valid.
+
+`admin_settings_fields.py` declares three components:
+
+| Section | Component | Depends on |
+|---|---|---|
+| `organization-agents-section` | `global-agents-manager` | `enable_semantic_kernel` |
+| `actions-config` | `global-actions-manager` | `enable_semantic_kernel` |
+| `agent-template-approvals-section` | `agent-template-approvals-link` | section condition `enable_agent_template_gallery` |
+
+The components save records directly, so nothing reaches the settings draft or
+the save bar. Because opening an editor replaces the Admin Settings page, the page
+asks before leaving for a global editor while settings are unsaved (the same
+**Discard unsaved changes?** prompt the editors use), and the approvals link opens
+in a new tab.
+
+### Classic interoperability
+
+The classic Admin Settings tables and the V2 editors work on the same records, so
+either can edit what the other saved. The V2 editor stores a new credential under a
+fresh Key Vault name (`{id}--agent--global--editor-…`), while the classic editor
+reuses a name built from the record's name. A classic edit that keeps a credential
+keeps whichever reference is stored. `delete_global_agent` now reads the stored
+document rather than the masked one, so the classic delete removes the credential
+the agent actually holds; it used to rebuild the classic name from the
+`Stored_In_KeyVault` placeholder, fail when that secret did not exist, and leave the
+agent undeletable. Global actions and group agents already read the stored
+document.
+
+### Frontend routes
+
+| Route | Page |
+|---|---|
+| `/v2/admin/agents` | Admin Settings, opened on Global Agents |
+| `/v2/admin/actions` | Admin Settings, opened on Global Actions |
+| `/v2/admin/agents/<id or new>` | Global agent editor (`?templates=1` opens the gallery) |
+| `/v2/admin/actions/<id or new>` | Global action editor (`?returnTo=` an agent editor attaches the new action there) |
+
+### File structure
+
+- `application/single_app/functions_global_editor_access.py` (new)
+- `application/single_app/route_backend_v2_admin_agents_actions.py` (new)
+- `application/v2_ui/src/components/admin/GlobalAgentsManager.tsx` (new)
+- `application/v2_ui/src/components/admin/GlobalActionsManager.tsx` (new)
+- `application/v2_ui/src/components/admin/AgentTemplateApprovalsLink.tsx` (new)
+- `application/v2_ui/src/pages/AdminGlobalEditorPages.tsx` (new)
+
+## Usage instructions
+
+1. Turn on **Enable Agents** under Admin Settings › Agents & Actions.
+2. Under **Global Agents**, choose **New agent** or **Start from a template**. Pick
+   a model, attach actions, assign public knowledge if it should be grounded,
+   write instructions, and save. The editor returns you to the list.
+3. With Workspace Mode off, choose **Make default** on the agent that should answer
+   chats.
+4. Under **Global Actions**, choose **New action** and pick a connector type. For a
+   Call agent action, pick the **Call agent** type and a global target agent.
+5. Disable an agent or action to keep its configuration without offering it, or
+   delete it after confirming. The default agent cannot be deleted.
+
+See [Agents & Actions settings](../../admin/agents-actions.md) for the
+administrator reference.
+
+## Testing and validation
+
+| Test | Covers |
+|---|---|
+| `functional_tests/test_v2_admin_global_editor_backend.py` | Global scope in the authoring engine: secret masking and Key Vault naming, conditional writes, duplicate names, stamped fields, default-agent rename and delete rules, route access and boundaries |
+| `functional_tests/test_workspace_authoring_credential_compatibility.py` | The classic global delete removes a credential the V2 editor stored, using the real Key Vault helpers |
+| `functional_tests/test_v2_admin_global_editor_logic.mjs` | The global adapters, return paths, stripped server fields, connector and template scopes, and admin routes, against the real TypeScript |
+| `functional_tests/test_v2_admin_agents_parity.py`, `test_v2_admin_actions_parity.py` | Section and component declarations |
+| `functional_tests/route_tests/` | Blueprint policy and admin-only access for all 13 routes |
+| `ui_tests/test_v2_admin_global_agents_actions.py` | The built SPA: lists, default, enable/disable, delete, agent creation from scratch and from a template, template publishing, a global Call agent action attached to a global agent, credential-preserving edits, load failures and revision conflicts, the unsaved-settings prompt, and non-administrator refusal |
+
+### Known limitations
+
+- Duplicating a global agent or action, which the classic tables offer, is not
+  yet available in V2.
+- Global agent types are not gated by the Foundry tenant flags, matching the
+  classic admin editor, which offers every type to administrators.
+- Mixing editors on one credential has two Key Vault side effects, the same ones
+  personal and group records already have. When the V2 editor replaces a
+  credential, it soft-deletes the name it replaced. If that was the classic name,
+  a later classic edit that enters a new value for the same credential fails until
+  the deleted secret is purged or its retention period ends; entering it in V2
+  works. A classic edit that enters a new value also leaves the V2-named secret it
+  replaced in the vault.
diff --git a/docs/explanation/fixes/V2_ADMIN_CATEGORY_SCROLL_RESET_FIX.md b/docs/explanation/fixes/V2_ADMIN_CATEGORY_SCROLL_RESET_FIX.md
new file mode 100644
index 000000000..32b9f8ca3
--- /dev/null
+++ b/docs/explanation/fixes/V2_ADMIN_CATEGORY_SCROLL_RESET_FIX.md
@@ -0,0 +1,65 @@
+# V2 Admin Category Scroll Reset Fix
+
+Fixed/Implemented in version: **0.261.260**
+
+## Issue
+
+In V2 Admin Settings, choosing a category in the left rail kept the scroll offset
+the previous category was left at. An administrator who scrolled near the end of
+**Knowledge** and then chose **Security** landed near the end of Security, not at
+its first section. Choosing the category already shown did nothing, so it could
+not be used to get back to the top either.
+
+## Root cause
+
+Every category renders into one shared scroll pane,
+`data-testid="admin-settings-scroll"` in `AdminSettingsPage.tsx`. Choosing a
+category only changed the `activeGroup` filter. The pane kept its `scrollTop`,
+and the browser clamped it to the new content's height, so a long category opened
+part-way down.
+
+Scrolling to the top alone would leave one gap: `SettingsIndex` keeps a section
+chosen from the **On this page** index pinned as current until the administrator
+scrolls by hand. Its listeners are rebuilt only when the listed sections change,
+so after choosing the category already shown it would still mark the pinned
+section while the page sat at the top.
+
+## Technical changes
+
+### Files modified
+
+| File | Change |
+| --- | --- |
+| `application/v2_ui/src/pages/AdminSettingsPage.tsx` | `selectCategory` sets the category, scrolls the pane to the top, and counts the visit. The rail buttons and the phone category select both use it, including when the category already shown is chosen again. `SettingsIndex` is keyed by the visit count, so it restarts and marks the category's first section. |
+| `application/single_app/config.py` | Version `0.261.259` -> `0.261.260`. |
+
+Cross-references that jump to a section, such as going from the Model Catalog to
+AI Connections, still use `goToSection`, which switches category only when the
+target is hidden and then scrolls to that section rather than to the top.
+
+### Testing approach
+
+`ui_tests/test_v2_admin_global_agents_actions.py` loads the built SPA with the
+real field schema:
+
+- `test_choosing_a_category_starts_at_its_top` scrolls a long category to its
+  end, then checks that choosing another category, returning to the first, choosing
+  the category already shown, and choosing **All settings** each open at
+  `scrollTop` 0, and that the index marks the first section again.
+- `test_choosing_a_category_on_a_phone_starts_at_its_top` checks the same through
+  the phone's category select.
+
+### Impact
+
+Only rail and category-select choices are affected. Search, index jumps, and
+cross-section links behave as before.
+
+## Validation
+
+Both browser tests fail when the scroll reset is removed from `selectCategory`,
+timing out while waiting for `scrollTop` 0, and pass with it.
+
+| Before | After |
+| --- | --- |
+| Choosing a category kept the previous category's offset. | Choosing a category always opens it at its first section. |
+| Choosing the category already shown did nothing. | It returns to the category's top, and the index marks the first section. |
diff --git a/docs/guides/call-another-agent.md b/docs/guides/call-another-agent.md
index dd977c8e2..8f7a59edc 100644
--- a/docs/guides/call-another-agent.md
+++ b/docs/guides/call-another-agent.md
@@ -54,15 +54,17 @@ implemented in **0.261.096**, recorded in `application/single_app/config.py`;
 see the [workspace guide]({{ '/guides/workspace-agents-and-actions/' | relative_url }}).
 
 The Groups page still provides focused delegation management without switching
-the active workspace. The admin Agents & Actions area retains the equivalent
-controls for global agents. Broader group/global authoring is unchanged.
+the active workspace. For global agents, V2 Admin Settings now works like My
+Workspace: create the Call agent action under **Global Actions** with **New
+action**, then attach it in the global agent's editor. The focused **Global agent
+delegation** card was removed in **0.261.260**.
 
 Owned Call agent actions can also be deleted in V2 after confirmation. Deleting
 an action stops future calls through that action; it does not rewrite agents or
 roll back work the target already performed.
 
-The personal editor saves the configuration you changed and preserves unedited
-settings and references. The focused group/global binding controls change only
+The personal and global editors save the configuration you changed and preserve
+unedited settings and references. The focused group binding controls change only
 the selected Call agent actions. If someone changes the agent while it is open,
 review the current configuration before saving again.
 
diff --git a/functional_tests/route_tests/test_route_blueprint_policy_inventory.py b/functional_tests/route_tests/test_route_blueprint_policy_inventory.py
index ecebdc2e1..c4d7ac2a7 100644
--- a/functional_tests/route_tests/test_route_blueprint_policy_inventory.py
+++ b/functional_tests/route_tests/test_route_blueprint_policy_inventory.py
@@ -14,6 +14,7 @@
 Workflow result context policy coverage: 0.261.214
 Workflow run status policy coverage: 0.261.227
 Workflow hand-off policy coverage: 0.261.250
+Global agent and action editor policy coverage: 0.261.260
 
 This test ensures every SimpleChat route is assigned to a Blueprint-based
 security policy or an explicit reviewed route exemption.
@@ -97,6 +98,7 @@
     "backend_users": ("login_required", "user_required"),
     "backend_v2": ("login_required", "user_required"),
     "backend_v2_admin": ("login_required", "admin_required"),
+    "backend_v2_admin_agents_actions": ("login_required", "admin_required"),
     "backend_workflows": ("login_required", "user_required"),
     "backend_workspace_identities": ("login_required",),
     "custom_pages": ("login_required",),
@@ -268,6 +270,20 @@
     ("route_backend_retention_policy.py", "update_group_retention_settings"): ("login_required", "user_required", "enabled_required"),
     ("route_backend_v2.py", "v2_group_workspace_context"): ("login_required", "user_required", "enabled_required"),
     ("route_backend_v2.py", "v2_public_workspace_context"): ("login_required", "user_required", "enabled_required"),
+    # Global agent and action editors: the organisation's records, Admin role only.
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_agents_list"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_agents_create"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_agent_options"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_agent_read"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_agent_update"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_agent_delete"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_actions_list"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_actions_create"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_action_types"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_action_options"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_action_read"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_action_update"): ("login_required", "admin_required"),
+    ("route_backend_v2_admin_agents_actions.py", "v2_admin_global_action_delete"): ("login_required", "admin_required"),
     ("route_backend_public_document_reads.py", "api_get_public_workspace_documents"): ("login_required", "user_required", "enabled_required"),
     ("route_backend_public_document_reads.py", "api_get_public_workspace_document_facets"): ("login_required", "user_required", "enabled_required"),
     ("route_backend_public_document_reads.py", "api_get_public_workspace_document_tags"): ("login_required", "user_required", "enabled_required"),
diff --git a/functional_tests/test_v2_admin_actions_parity.py b/functional_tests/test_v2_admin_actions_parity.py
index 34ad01094..163ca50e7 100644
--- a/functional_tests/test_v2_admin_actions_parity.py
+++ b/functional_tests/test_v2_admin_actions_parity.py
@@ -2,8 +2,9 @@
 #!/usr/bin/env python3
 """
 Functional test pinning V1/V2 parity for the Admin Settings Actions tab.
-Version: 0.261.074
+Version: 0.261.260
 Implemented in: 0.261.074
+Global actions list in actions-config: 0.261.260
 
 Two things in this tab are not ordinary settings, and both fail silently.
 
@@ -49,8 +50,8 @@
 
 # Built-in action toggles that used to be declared under `actions-config` and now
 # live with the rest of them in `core-plugin-toggles`. `actions-config` therefore
-# declares no fields at all, which is deliberate -- what belongs there is the
-# global actions table, still authored in the classic interface.
+# declares no setting at all, which is deliberate -- what belongs there is the
+# global actions list, a component that saves through its own routes.
 #
 # The pairing matters during a merge. `enable_text_plugin` moved in 0.261.061 and
 # `enable_default_embedding_model_plugin` was moved into `actions-config` by the
@@ -155,10 +156,11 @@ def test_removing_a_section_did_not_orphan_its_settings():
     """A section can be emptied, but not at the cost of losing a setting.
 
     `actions-config` is declared by ``ADMIN_NAV`` and by the V1 pane, but the
-    schema deliberately gives it no fields. That is only safe while everything it
-    used to hold is declared somewhere else, and "everything it used to hold" is
-    not fixed: the Chat work moved a second toggle into it after this branch had
-    already emptied it.
+    schema deliberately gives it no setting: since 0.261.260 it holds only the
+    global actions list, a component with no key. That is only safe while
+    everything it used to hold is declared somewhere else, and "everything it used
+    to hold" is not fixed: the Chat work moved a second toggle into it after this
+    branch had already emptied it.
 
     So the invariant is checked rather than remembered. If a later merge restores
     the section, the registry integrity test catches the resulting duplicate; if
@@ -166,11 +168,17 @@ def test_removing_a_section_did_not_orphan_its_settings():
     """
     print("\nTesting that the emptied section orphaned nothing...")
 
+    assert_app_version_at_least("0.261.260")
     schema = fields_module.get_admin_settings_fields()
-    assert not schema.get("actions-config"), (
-        "actions-config declares fields again. If that is intended, the built-in "
+    section_fields = schema.get("actions-config") or []
+    declared_settings = [field["key"] for field in section_fields if field.get("key")]
+    assert not declared_settings, (
+        "actions-config declares settings again. If that is intended, the built-in "
         "action toggles must not also be declared in core-plugin-toggles, or the "
-        "same key ends up with two controls."
+        f"same key ends up with two controls: {declared_settings}"
+    )
+    assert [field.get("component") for field in section_fields] == ["global-actions-manager"], (
+        "actions-config should hold exactly the global actions list."
     )
 
     declared = fields_module.get_declared_setting_keys()
diff --git a/functional_tests/test_v2_admin_agents_parity.py b/functional_tests/test_v2_admin_agents_parity.py
index 15a0a8595..64494f044 100644
--- a/functional_tests/test_v2_admin_agents_parity.py
+++ b/functional_tests/test_v2_admin_agents_parity.py
@@ -2,8 +2,9 @@
 # test_v2_admin_agents_parity.py
 """
 Functional test pinning V1/V2 parity for the Admin Settings Agents & Actions group.
-Version: 0.261.122
+Version: 0.261.260
 Implemented in: 0.261.074
+Global Agents and Global Actions sections: 0.261.260
 
 The V2 React admin surface renders from ``admin_settings_fields.py``. A setting
 present in a V1 pane but absent from that schema does not fail anything: it
@@ -45,6 +46,7 @@
 DECLARED_PANES = {
     "agents": (
         "agents-config",
+        "organization-agents-section",
         "agent-toggles-card",
         "agents-page-customization-card",
         "agent-template-approvals-section",
@@ -66,10 +68,9 @@
 # Declared sections that hold no settings, because what belongs in them is a
 # table rather than a field. The V2 surface skips a section with nothing in it,
 # so this is not a broken heading; the entry records why and is checked for
-# staleness once the section is filled.
-SECTIONS_AWAITING_A_COMPONENT = {
-    "actions-config": "Phase 5 -- the global actions table",
-}
+# staleness once the section is filled. The global agents and actions lists now
+# fill the two that were waiting, so none remain.
+SECTIONS_AWAITING_A_COMPONENT = {}
 
 FIELD_NAME_RE = re.compile(r'\sname="([^"]+)"')
 JINJA_RE = re.compile(r"\{\{|\{%")
diff --git a/functional_tests/test_v2_admin_global_editor_backend.py b/functional_tests/test_v2_admin_global_editor_backend.py
new file mode 100644
index 000000000..2ba7872ae
--- /dev/null
+++ b/functional_tests/test_v2_admin_global_editor_backend.py
@@ -0,0 +1,489 @@
+#!/usr/bin/env python3
+# test_v2_admin_global_editor_backend.py
+"""
+Functional test for the V2 Admin Settings global agent and action editor backend.
+Version: 0.261.260
+Implemented in: 0.261.260
+
+Global agents and actions used to be authored only through the classic
+``/api/admin/agents`` and ``/api/admin/plugins`` routes, which save whole documents
+by name with no revision. The V2 editors now serve them through the same editor
+engine personal and group records use. This test loads the real engine and the real
+orchestration module with the Cosmos, Key Vault and logging boundaries replaced by
+in-memory stand-ins, and pins what the global scope adds:
+
+- credentials resolve in the ``global`` Key Vault namespace keyed by the record id,
+  the naming the classic global saves use, while personal and group scoping is
+  unchanged;
+- every write is conditional on the revision the editor opened, and a stale one is
+  refused with nothing written;
+- names are unique among global records ignoring case, and the default agent
+  cannot be deleted;
+- the stored shape is the one the classic global saves write;
+- the agent editor options offer every agent type and only global connections, with
+  secrets masked; and
+- renaming the default agent keeps it selected.
+"""
+
+import importlib.util
+import sys
+import uuid
+from copy import deepcopy
+from pathlib import Path
+from types import ModuleType, SimpleNamespace
+from unittest.mock import MagicMock
+
+import pytest
+
+sys.path.append(str(Path(__file__).resolve().parent))
+
+from test_support.versioning import assert_app_version_at_least
+
+
+APP_ROOT = Path(__file__).resolve().parents[1] / "application" / "single_app"
+
+
+class CosmosHttpResponseError(Exception):
+    def __init__(self, status_code=500):
+        super().__init__(f"status {status_code}")
+        self.status_code = status_code
+
+
+class CosmosResourceNotFoundError(CosmosHttpResponseError):
+    def __init__(self):
+        super().__init__(404)
+
+
+class FakeContainer:
+    """A global container: partitioned by id, every write stamped with a new etag."""
+
+    def __init__(self):
+        self.items = {}
+        self.writes = []
+        self._revision = 0
+
+    def seed(self, record):
+        return self._stamp(record)
+
+    def _stamp(self, body):
+        self._revision += 1
+        stored = deepcopy(body)
+        stored["_etag"] = f"etag-{self._revision}"
+        self.items[stored["id"]] = stored
+        return deepcopy(stored)
+
+    def read_item(self, item, partition_key):
+        assert partition_key == item, "Global records are partitioned by their own id."
+        if item not in self.items:
+            raise CosmosResourceNotFoundError()
+        return deepcopy(self.items[item])
+
+    def query_items(self, query, parameters=None, enable_cross_partition_query=False, partition_key=None):
+        assert enable_cross_partition_query, "Global queries span every partition."
+        if "STRINGEQUALS" in query:
+            name = parameters[0]["value"].lower()
+            return [{"id": item["id"]} for item in self.items.values() if str(item.get("name", "")).lower() == name]
+        return [deepcopy(item) for item in self.items.values()]
+
+    def create_item(self, body):
+        if body["id"] in self.items:
+            raise CosmosHttpResponseError(409)
+        self.writes.append(("create", body["id"]))
+        return self._stamp(body)
+
+    def replace_item(self, item, body, etag, match_condition):
+        assert match_condition == "IfNotModified"
+        current = self.items.get(item)
+        if current is None or current["_etag"] != etag:
+            raise CosmosHttpResponseError(412)
+        self.writes.append(("replace", item, etag))
+        return self._stamp(body)
+
+    def delete_item(self, item, partition_key, etag, match_condition):
+        assert partition_key == item and match_condition == "IfNotModified"
+        current = self.items.get(item)
+        if current is None or current["_etag"] != etag:
+            raise CosmosHttpResponseError(412)
+        self.writes.append(("delete", item))
+        del self.items[item]
+
+
+def _module(name, **attributes):
+    module = ModuleType(name)
+    for key, value in attributes.items():
+        setattr(module, key, value)
+    return module
+
+
+@pytest.fixture
+def engine(monkeypatch):
+    """Load the real engine and access module with in-memory service boundaries."""
+    monkeypatch.syspath_prepend(str(APP_ROOT))
+    agents_container, actions_container = FakeContainer(), FakeContainer()
+    calls = SimpleNamespace(cache=[], delegation=[], identities=[], activity=[], settings_updates=[])
+    settings = {
+        "enable_semantic_kernel": True,
+        "global_selected_agent": {"name": "default_agent", "is_global": True, "is_group": False},
+        "enable_key_vault_secret_storage": False,
+        "enable_agent_template_gallery": True,
+        "enable_time_plugin": True,
+    }
+
+    def redact(record):
+        result = deepcopy(record)
+        if isinstance(result.get("auth"), dict) and result["auth"].get("key"):
+            result["auth"]["key"] = "***REDACTED***"
+        return result
+
+    def activity(name):
+        return lambda **kwargs: calls.activity.append((name, kwargs))
+
+    stubs = {
+        "functions_ai_connections": _module(
+            "functions_ai_connections",
+            filter_model_endpoints_by_capability=lambda endpoints, preserve_empty=True: list(endpoints),
+        ),
+        "config": _module(
+            "config",
+            cosmos_global_agents_container=agents_container,
+            cosmos_global_actions_container=actions_container,
+        ),
+        "azure.cosmos.exceptions": _module(
+            "azure.cosmos.exceptions",
+            CosmosHttpResponseError=CosmosHttpResponseError,
+            CosmosResourceNotFoundError=CosmosResourceNotFoundError,
+        ),
+        "azure.core": _module("azure.core", MatchConditions=SimpleNamespace(IfNotModified="IfNotModified")),
+        "functions_keyvault": _module(
+            "functions_keyvault",
+            validate_secret_name_dynamic=lambda value: False,
+            redact_plugin_secret_values=redact,
+            AGENT_SENSITIVE_SECRET_FIELDS=[],
+            SQL_PLUGIN_SENSITIVE_AUTH_FIELDS=set(),
+        ),
+        "functions_agent_delegation": _module(
+            "functions_agent_delegation",
+            validate_agent_delegation_bindings=lambda record, **kwargs: calls.delegation.append(("agent", kwargs)),
+            validate_agent_action_for_scope=lambda record, **kwargs: calls.delegation.append(("action", kwargs)) or record,
+        ),
+        "functions_workspace_identities": _module(
+            "functions_workspace_identities",
+            WORKSPACE_IDENTITY_SCOPE_GLOBAL="global",
+            validate_action_identity_reference=lambda record, scope_type, scope_id: calls.identities.append((scope_type, scope_id)),
+        ),
+        "functions_chat_bootstrap_cache": _module(
+            "functions_chat_bootstrap_cache",
+            bump_chat_bootstrap_global_cache_version=lambda reason: calls.cache.append(("global", reason)),
+            bump_chat_bootstrap_user_cache_version=lambda user_id, reason: calls.cache.append(("user", reason)),
+        ),
+        "functions_appinsights": _module("functions_appinsights", log_event=lambda *args, **kwargs: None),
+        "functions_activity_logging": _module(
+            "functions_activity_logging",
+            log_agent_creation=activity("agent_creation"),
+            log_agent_update=activity("agent_update"),
+            log_agent_deletion=activity("agent_deletion"),
+            log_action_creation=activity("action_creation"),
+            log_action_update=activity("action_update"),
+            log_action_deletion=activity("action_deletion"),
+        ),
+        "json_schema_validation": _module("json_schema_validation", load_schema=lambda name: {}),
+        "functions_settings": _module(
+            "functions_settings",
+            get_settings=lambda: deepcopy(settings),
+            update_settings=lambda updates, **kwargs: calls.settings_updates.append(updates) or True,
+            sanitize_settings_for_user=lambda values: deepcopy(values),
+        ),
+        "functions_agent_templates": _module(
+            "functions_agent_templates",
+            agent_template_submission_decision=lambda current, is_admin: (bool(is_admin), None),
+        ),
+    }
+    for name, module in stubs.items():
+        monkeypatch.setitem(sys.modules, name, module)
+
+    loaded = {}
+    for name in ("functions_workspace_authoring", "functions_global_editor_access"):
+        monkeypatch.delitem(sys.modules, name, raising=False)
+        spec = importlib.util.spec_from_file_location(name, APP_ROOT / f"{name}.py")
+        module = importlib.util.module_from_spec(spec)
+        monkeypatch.setitem(sys.modules, name, module)
+        spec.loader.exec_module(module)
+        loaded[name] = module
+
+    return SimpleNamespace(
+        authoring=loaded["functions_workspace_authoring"],
+        access=loaded["functions_global_editor_access"],
+        agents=agents_container,
+        actions=actions_container,
+        settings=settings,
+        calls=calls,
+    )
+
+
+def passthrough(user_id, record, settings, existing):
+    """A prepare step that accepts the merged record, as the route's would."""
+    return deepcopy(record), None
+
+
+def agent_body(**updates):
+    return {"updates": {"id": str(uuid.uuid4()), "name": "research", "display_name": "Research",
+                        "instructions": "Help.", "agent_type": "local", **updates}}
+
+
+def test_version_at_least_implementation():
+    assert_app_version_at_least("0.261.260")
+
+
+def test_global_secrets_use_the_classic_global_namespace(engine):
+    secret_scope = engine.authoring._secret_scope
+    record = {"id": "record-1", "name": "connector"}
+    assert secret_scope("agents", "admin-1", record, ("azure_openai_gpt_key",), global_scope=True) == (
+        "record-1", "agent", "global",
+    )
+    assert secret_scope("actions", "admin-1", record, ("auth", "key"), global_scope=True) == (
+        "record-1", "action", "global",
+    )
+    assert secret_scope("actions", "admin-1", record, ("additionalFields", "token__Secret"), global_scope=True) == (
+        "record-1", "action-addset", "global",
+    )
+    # Personal and group scoping are unchanged.
+    assert secret_scope("actions", "admin-1", record, ("auth", "key")) == ("admin-1", "action", "user")
+    assert secret_scope("actions", "admin-1", record, ("auth", "key"), group_id="g-1") == ("g-1", "action", "group")
+
+
+def test_creating_a_global_agent_stores_the_classic_global_shape(engine):
+    saved = engine.authoring.apply_global_agent_write("admin-1", None, agent_body(), passthrough, engine.settings)
+
+    stored = engine.agents.items[saved["id"]]
+    assert stored["is_global"] is True and stored["is_group"] is False
+    assert stored["created_by"] == stored["modified_by"] == "admin-1"
+    assert stored["is_enabled"] is True
+    assert "user_id" not in stored and "group_id" not in stored
+    assert engine.agents.writes == [("create", saved["id"])]
+    assert ("global", "global_agent_saved") in engine.calls.cache
+    assert engine.calls.delegation[-1][1]["scope_type"] == "global"
+
+
+def test_a_global_agent_needs_a_client_allocated_id(engine):
+    body = agent_body()
+    body["updates"]["id"] = "not-a-uuid"
+    with pytest.raises(engine.authoring.WorkspaceAuthoringValidation):
+        engine.authoring.apply_global_agent_write("admin-1", None, body, passthrough, engine.settings)
+    assert engine.agents.writes == []
+
+
+def test_a_stale_revision_is_refused_with_nothing_written(engine):
+    seeded = engine.agents.seed({"id": "a-1", "name": "research", "display_name": "Research",
+                                 "instructions": "Help.", "agent_type": "local", "is_global": True})
+    existing = engine.authoring.read_global_editor_record("agents", "a-1")
+    engine.agents.seed({**seeded, "description": "Changed elsewhere."})
+
+    with pytest.raises(engine.authoring.WorkspaceAuthoringConflict):
+        engine.authoring.apply_global_agent_write(
+            "admin-1", existing, {"updates": {"description": "Mine."}, "expected_revision": existing["_etag"]},
+            passthrough, engine.settings,
+        )
+    assert engine.agents.writes == []
+
+
+def test_an_update_is_conditional_on_the_opened_revision(engine):
+    engine.agents.seed({"id": "a-1", "name": "research", "display_name": "Research",
+                        "instructions": "Help.", "agent_type": "local", "is_global": True,
+                        "created_by": "someone", "created_at": "2026-01-01T00:00:00"})
+    existing = engine.authoring.read_global_editor_record("agents", "a-1")
+
+    saved = engine.authoring.apply_global_agent_write(
+        "admin-1", existing, {"updates": {"description": "Updated."}, "expected_revision": existing["_etag"]},
+        passthrough, engine.settings,
+    )
+
+    assert engine.agents.writes == [("replace", "a-1", existing["_etag"])]
+    assert saved["description"] == "Updated."
+    assert saved["created_by"] == "someone", "The original author is kept."
+    assert saved["modified_by"] == "admin-1"
+
+
+def test_global_names_are_unique_ignoring_case(engine):
+    engine.agents.seed({"id": "a-1", "name": "Research", "is_global": True})
+    with pytest.raises(engine.authoring.WorkspaceAuthoringValidation, match="already exists"):
+        engine.authoring.apply_global_agent_write("admin-1", None, agent_body(name="research"), passthrough, engine.settings)
+    assert engine.agents.writes == []
+
+
+def test_the_default_agent_cannot_be_deleted(engine):
+    engine.agents.seed({"id": "a-1", "name": "default_agent", "is_global": True})
+    engine.agents.seed({"id": "a-2", "name": "other", "is_global": True})
+
+    default = engine.authoring.read_global_editor_record("agents", "a-1")
+    with pytest.raises(engine.authoring.WorkspaceAuthoringValidation, match="default agent"):
+        engine.authoring.delete_global_editor_record("agents", "admin-1", default, engine.settings)
+
+    other = engine.authoring.read_global_editor_record("agents", "a-2")
+    engine.authoring.delete_global_editor_record("agents", "admin-1", other, engine.settings)
+    assert engine.agents.writes == [("delete", "a-2")]
+    assert ("global", "global_agent_deleted") in engine.calls.cache
+
+
+def test_a_record_claiming_a_group_is_not_served_as_global(engine):
+    engine.agents.seed({"id": "a-1", "name": "stray", "group_id": "g-1", "is_group": True})
+    with pytest.raises(LookupError):
+        engine.authoring.read_global_editor_record("agents", "a-1")
+    assert engine.authoring.list_global_editor_records("agents") == []
+
+
+def test_creating_a_global_action_stores_the_global_scope(engine):
+    body = {"updates": {"name": "weather", "displayName": "Weather", "type": "openapi",
+                        "endpoint": "https://example.test", "auth": {"type": "NoAuth"},
+                        "additionalFields": {}, "metadata": {}}}
+
+    saved = engine.authoring.apply_global_action_write("admin-1", None, body, passthrough, engine.settings)
+
+    stored = engine.actions.items[saved["id"]]
+    uuid.UUID(saved["id"])  # The server allocates the id.
+    assert stored["scope"] == "global" and stored["scope_id"] == "global"
+    assert stored["is_global"] is True and stored["is_group"] is False
+    assert engine.calls.identities == [("global", "global")]
+    assert engine.calls.delegation[-1][1]["scope_type"] == "global"
+    assert ("global", "global_action_saved") in engine.calls.cache
+
+
+def test_a_refused_prepare_maps_to_stable_errors(engine):
+    def forbidden(user_id, record, settings, existing):
+        return None, ("ignored", 403)
+
+    def invalid(user_id, record, settings, existing):
+        return None, ("ignored", 400)
+
+    with pytest.raises(PermissionError):
+        engine.authoring.apply_global_agent_write("admin-1", None, agent_body(), forbidden, engine.settings)
+    with pytest.raises(engine.authoring.WorkspaceAuthoringValidation):
+        engine.authoring.apply_global_agent_write("admin-1", None, agent_body(name="other"), invalid, engine.settings)
+    assert engine.agents.writes == []
+
+
+def test_global_agents_may_be_any_type_and_carry_their_own_connection(engine):
+    validate = engine.authoring._validate_agent_editor_changes
+    for agent_type in ("local", "aifoundry", "new_foundry", "foundry_workflow"):
+        validate({"agent_type": agent_type}, None, {}, "admin-1", scope="global")
+    # A custom model connection needs no workspace permission on a global agent.
+    validate({"agent_type": "local", "azure_openai_gpt_endpoint": "https://x.test"}, None, {}, "admin-1", scope="global")
+    # Personal agents still need the permission.
+    with pytest.raises(PermissionError):
+        validate({"agent_type": "local", "azure_openai_gpt_endpoint": "https://x.test"}, None, {}, "user-1")
+
+
+def test_global_agent_options_offer_global_connections_with_secrets_masked(engine):
+    endpoints = [
+        {"id": "e-1", "scope": "global", "models": [{"id": "m-1"}], "auth": {"api_key": "plain-secret"}},
+        {"id": "e-2", "scope": "user", "models": [{"id": "m-2"}]},
+    ]
+    options = engine.authoring.build_global_agent_editor_options(engine.settings, endpoints)
+
+    assert [item["value"] for item in options["agent_types"]] == ["local", "aifoundry", "new_foundry", "foundry_workflow"]
+    assert all(item["enabled"] for item in options["agent_types"])
+    assert [endpoint["id"] for endpoint in options["model_endpoints"]] == ["e-1"]
+    assert options["model_endpoints"][0]["auth"]["api_key"] == engine.authoring.EDITOR_SECRET_MASK
+    assert options["settings"]["agent_template_submission_allowed"] is True
+    assert options["settings"]["enable_multi_model_endpoints"] is True
+    assert [action["id"] for action in options["builtin_actions"]] == ["time"]
+
+
+def test_editor_resources_are_editable_for_the_administrator(engine):
+    resource = engine.access._resource({"id": "a-1", "name": "x", "_etag": "etag-1"}, "agents")
+    assert resource["read_only"] is False and resource["revision"] == "etag-1"
+    assert resource["record"]["is_global"] is True
+
+
+def test_renaming_the_default_agent_keeps_it_selected(engine):
+    engine.access._follow_default_agent_rename(
+        {"name": "default_agent"}, {"id": "a-1", "name": "renamed_agent"}, engine.settings,
+    )
+    assert engine.calls.settings_updates == [{
+        "global_selected_agent": {"name": "renamed_agent", "is_global": True, "is_group": False},
+    }]
+
+    engine.calls.settings_updates.clear()
+    engine.access._follow_default_agent_rename({"name": "other"}, {"id": "a-2", "name": "other_renamed"}, engine.settings)
+    assert engine.calls.settings_updates == [], "Renaming another agent leaves the default alone."
+
+
+def test_the_agent_list_names_the_default(engine):
+    engine.agents.seed({"id": "a-1", "name": "default_agent", "is_global": True})
+    payload, status = engine.access.list_global_agents()
+    assert status == 200
+    assert payload["selected_agent_name"] == "default_agent"
+    assert [agent["id"] for agent in payload["agents"]] == ["a-1"]
+    assert all("_etag" not in agent for agent in payload["agents"])
+
+
+def test_routes_register_every_editor_endpoint_and_guard_their_inputs(engine, monkeypatch):
+    """Build the real URL map and drive two views in a request context.
+
+    The Admin role is enforced by the decorators, which the route policy inventory
+    pins; here they are pass-throughs so the routes themselves can be exercised.
+    """
+    flask = pytest.importorskip("flask")
+
+    def passthrough_decorator(function):
+        return function
+
+    monkeypatch.setitem(sys.modules, "functions_authentication", _module(
+        "functions_authentication", admin_required=passthrough_decorator,
+        login_required=passthrough_decorator, get_current_user_id=lambda: "admin-1",
+    ))
+    monkeypatch.setitem(sys.modules, "swagger_wrapper", _module(
+        "swagger_wrapper", swagger_route=lambda **kwargs: passthrough_decorator, get_auth_security=lambda: [],
+    ))
+    monkeypatch.setitem(sys.modules, "route_backend_agents", _module(
+        "route_backend_agents", _prepare_global_agent_payload=passthrough,
+    ))
+    monkeypatch.setitem(sys.modules, "route_backend_plugins", _module(
+        "route_backend_plugins", _prepare_global_action_payload=passthrough, get_plugin_types=lambda: None,
+    ))
+    name = "route_backend_v2_admin_agents_actions"
+    monkeypatch.delitem(sys.modules, name, raising=False)
+    spec = importlib.util.spec_from_file_location(name, APP_ROOT / f"{name}.py")
+    routes = importlib.util.module_from_spec(spec)
+    monkeypatch.setitem(sys.modules, name, routes)
+    spec.loader.exec_module(routes)
+
+    app = flask.Flask(__name__)
+    blueprint = flask.Blueprint("global_editor", __name__)
+    routes.register_route_backend_v2_admin_agents_actions(blueprint)
+    app.register_blueprint(blueprint)
+
+    registered = {
+        (rule.rule, method)
+        for rule in app.url_map.iter_rules() if rule.endpoint.startswith("global_editor.")
+        for method in rule.methods - {"HEAD", "OPTIONS"}
+    }
+    assert registered == {
+        ("/api/v2/admin/agents", "GET"), ("/api/v2/admin/agents", "POST"),
+        ("/api/v2/admin/agent-options", "GET"),
+        ("/api/v2/admin/agents/<agent_id>", "GET"), ("/api/v2/admin/agents/<agent_id>", "PATCH"),
+        ("/api/v2/admin/agents/<agent_id>", "DELETE"),
+        ("/api/v2/admin/actions", "GET"), ("/api/v2/admin/actions", "POST"),
+        ("/api/v2/admin/actions/types", "GET"), ("/api/v2/admin/action-options", "GET"),
+        ("/api/v2/admin/actions/<action_id>", "GET"), ("/api/v2/admin/actions/<action_id>", "PATCH"),
+        ("/api/v2/admin/actions/<action_id>", "DELETE"),
+    }
+
+    engine.agents.seed({"id": "a-1", "name": "default_agent", "is_global": True})
+    views = app.view_functions
+    with app.test_request_context("/api/v2/admin/agents", method="GET"):
+        response, status = views["global_editor.v2_admin_global_agents_list"]()
+        assert status == 200
+        assert response.headers["Cache-Control"] == "no-store"
+        assert response.get_json()["selected_agent_name"] == "default_agent"
+    with app.test_request_context("/api/v2/admin/agents?expected_revision=x", method="GET"):
+        response, status = views["global_editor.v2_admin_global_agents_list"]()
+        assert status == 400, "A stray query parameter is refused, not ignored."
+    with app.test_request_context("/api/v2/admin/agents/a-1", method="DELETE"):
+        response, status = views["global_editor.v2_admin_global_agent_delete"]("a-1")
+        assert status == 400, "The default agent cannot be deleted."
+        assert "default agent" in response.get_json()["error"]
+    assert "a-1" in engine.agents.items
+
+
+if __name__ == "__main__":
+    raise SystemExit(pytest.main([__file__, "-q"]))
diff --git a/functional_tests/test_v2_admin_global_editor_logic.mjs b/functional_tests/test_v2_admin_global_editor_logic.mjs
new file mode 100644
index 000000000..c9be00762
--- /dev/null
+++ b/functional_tests/test_v2_admin_global_editor_logic.mjs
@@ -0,0 +1,243 @@
+// test_v2_admin_global_editor_logic.mjs
+// Version: 0.261.260
+// Implemented in: 0.261.260
+// Executes the real global agent and action adapters, return-path rules and connector payloads
+// that let Admin Settings author global agents and actions in the V2 editors.
+
+import assert from 'node:assert/strict';
+import './test_support/tsResolve.mjs';
+
+const {
+    agentEditorReturnPath, buildEditorWrite, EDITOR_SECRET_MASK, GLOBAL_AGENT_RETURN_SCOPE,
+    isActionEditorNewPath, isAgentEditorPath, withoutServerStampedFields,
+} = await import('../application/v2_ui/src/lib/workspaceAuthoring.ts');
+const {
+    actionTestScopeName, connectorTestScope, GLOBAL_ACTION_TEST_SCOPE,
+} = await import('../application/v2_ui/src/lib/workspaceActionTypes.ts');
+const { buildConnectorSupportPayload, fetchMcpPreconfigurations } =
+    await import('../application/v2_ui/src/lib/workspaceActionConnectors.ts');
+const { buildActionConnectionPayload } = await import('../application/v2_ui/src/lib/workspaceActionServices.ts');
+const { GLOBAL_ACTION_WORKBENCH, fetchGlobalActions } = await import('../application/v2_ui/src/lib/actionWorkbench.ts');
+const { GLOBAL_AGENT_WORKBENCH, fetchGlobalAgentCatalog } = await import('../application/v2_ui/src/lib/agentWorkbench.ts');
+const { agentTemplateSubmission } = await import('../application/v2_ui/src/lib/workspaceAgentTemplates.ts');
+const { agentInstructionRequest, GLOBAL_INSTRUCTION_SCOPE } =
+    await import('../application/v2_ui/src/lib/workspaceAgentCommands.ts');
+const { newAgentDraft } = await import('../application/v2_ui/src/lib/workspaceAgentAuthoring.ts');
+
+let checks = 0;
+function check(label, run) {
+    run();
+    checks += 1;
+    console.log(`ok ${label}`);
+}
+async function asyncCheck(label, run) {
+    await run();
+    checks += 1;
+    console.log(`ok ${label}`);
+}
+
+function globalAction(overrides = {}) {
+    return {
+        id: 'action-1', name: 'weather', displayName: 'Weather', description: '', type: 'openapi',
+        endpoint: 'https://api.example.test', auth: { type: 'key', key: EDITOR_SECRET_MASK },
+        additionalFields: { base_url: 'https://api.example.test' }, metadata: {},
+        is_global: true, is_group: false, scope: 'global', scope_id: 'global', ...overrides,
+    };
+}
+
+function resource(record, secretPaths = []) {
+    return { record: structuredClone(record), revision: 'etag-1', secret_paths: secretPaths, read_only: false };
+}
+
+check('the global return path accepts only the Admin Settings agent editor', () => {
+    assert.equal(agentEditorReturnPath('/admin/agents/new', GLOBAL_AGENT_RETURN_SCOPE), '/admin/agents/new');
+    assert.equal(agentEditorReturnPath('/admin/agents/agent%201', GLOBAL_AGENT_RETURN_SCOPE), '/admin/agents/agent%201');
+    for (const refused of ['/workspace/agents/a', '/groups/g/agents/a', '/admin/agents/a/b', '/admin/agents/..', '/admin/agents/']) {
+        assert.equal(agentEditorReturnPath(refused, GLOBAL_AGENT_RETURN_SCOPE), null, refused);
+    }
+    // Neither personal nor group scope accepts an Admin Settings path.
+    assert.equal(agentEditorReturnPath('/admin/agents/a'), null);
+    assert.equal(agentEditorReturnPath('/admin/agents/a', 'g'), null);
+    assert.equal(agentEditorReturnPath('/workspace/agents/a'), '/workspace/agents/a');
+});
+
+check('the editor frame recognises the global agent and new-action editors', () => {
+    assert.equal(isAgentEditorPath('/admin/agents/new'), true);
+    assert.equal(isAgentEditorPath('/admin/actions/new'), false);
+    assert.equal(isActionEditorNewPath('/admin/actions/new'), true);
+    assert.equal(isActionEditorNewPath('/admin/actions/action-1'), false);
+    assert.equal(isActionEditorNewPath('/workspace/actions/new'), true);
+});
+
+check('connector commands run in the global scope only for a global action', () => {
+    assert.equal(actionTestScopeName(GLOBAL_ACTION_TEST_SCOPE), 'global');
+    assert.equal(actionTestScopeName({ id: 'g-1' }), 'group');
+    assert.equal(actionTestScopeName(undefined), 'personal');
+    assert.equal(connectorTestScope({ globalScope: true }), GLOBAL_ACTION_TEST_SCOPE);
+    assert.deepEqual(connectorTestScope({ groupScope: { id: 'g-1' } }), { id: 'g-1' });
+    assert.equal(connectorTestScope({}), undefined);
+
+    const original = resource(globalAction({
+        type: 'mcp', auth: { type: 'NoAuth' },
+        additionalFields: {
+            server_profile: 'generic', transport: 'streamable_http', auth_method: 'none',
+            request_timeout: 30, connect_timeout: 10, sse_read_timeout: 300, retry_count: 0,
+            retry_backoff_seconds: 1, load_tools: true, load_prompts: false, custom_headers: {},
+            allowed_tool_names: [], mcp_tools: [],
+        },
+    }));
+    const payload = buildConnectorSupportPayload(structuredClone(original.record), original, 'mcp', 'test', GLOBAL_ACTION_TEST_SCOPE);
+    assert.equal(payload.action_scope, 'global');
+    assert.deepEqual(payload.plugin_context, { scope: 'global', id: 'action-1', name: 'weather' });
+    assert.equal('group_id' in payload, false);
+    // A personal editor still refuses to test a global action.
+    assert.throws(() => buildConnectorSupportPayload(structuredClone(original.record), original, 'mcp', 'test'), /read-only/);
+});
+
+check('native connection tests carry the global scope for a global action', () => {
+    const record = globalAction({ type: 'databricks', auth: { type: 'NoAuth' }, additionalFields: {} });
+    const original = resource(record);
+    const payload = buildActionConnectionPayload(structuredClone(record), original, GLOBAL_ACTION_TEST_SCOPE);
+    assert.equal(payload.action_scope, 'global');
+    assert.deepEqual(payload.plugin_context, { scope: 'global', id: 'action-1', name: 'weather' });
+    assert.throws(() => buildActionConnectionPayload(structuredClone(record), original), /cannot be connection-tested/);
+});
+
+check('stamped global fields can never be emitted as edits or removals', () => {
+    const original = resource(globalAction({ updated_at: '2026-01-01' }));
+    const edited = { ...structuredClone(original.record), description: 'Updated.' };
+    delete edited.scope;
+    delete edited.scope_id;
+    delete edited.updated_at;
+    const unguarded = buildEditorWrite(edited, original);
+    assert.ok(unguarded.removed_paths.includes('/scope'), 'Without the guard the server would refuse this write.');
+    const guarded = buildEditorWrite(
+        withoutServerStampedFields(edited),
+        { ...original, record: withoutServerStampedFields(original.record) },
+    );
+    assert.deepEqual(guarded.updates, { description: 'Updated.' });
+    assert.deepEqual(guarded.removed_paths, []);
+});
+
+check('the global adapters describe the administrator scope', () => {
+    assert.equal(GLOBAL_ACTION_WORKBENCH.basePath, '/admin/actions');
+    assert.deepEqual(GLOBAL_ACTION_WORKBENCH.draftScope, { kind: 'global' });
+    assert.equal(GLOBAL_ACTION_WORKBENCH.testScope, GLOBAL_ACTION_TEST_SCOPE);
+    for (const operation of ['create', 'edit', 'delete', 'test']) assert.equal(GLOBAL_ACTION_WORKBENCH.allows(operation), true);
+
+    assert.equal(GLOBAL_AGENT_WORKBENCH.basePath, '/admin/agents');
+    assert.equal(GLOBAL_AGENT_WORKBENCH.actionsBasePath, '/admin/actions');
+    assert.deepEqual(GLOBAL_AGENT_WORKBENCH.draftScope, { kind: 'global' });
+    assert.deepEqual([...GLOBAL_AGENT_WORKBENCH.knowledgeScopes], ['public']);
+    assert.equal(GLOBAL_AGENT_WORKBENCH.canCreateActions, true);
+    assert.equal(GLOBAL_AGENT_WORKBENCH.canUseInChat({ is_enabled: true }), false);
+    assert.equal(GLOBAL_AGENT_WORKBENCH.allowsCustomEndpoints({}), true);
+    assert.equal(GLOBAL_AGENT_WORKBENCH.allowsTemplateSubmission({ agent_template_submission_allowed: true }), true);
+    assert.equal(GLOBAL_AGENT_WORKBENCH.allowsTemplateSubmission({}), false);
+});
+
+check('global template submissions and instruction drafts speak for the organisation', () => {
+    const draft = { ...newAgentDraft(), display_name: 'Research', description: 'Finds things.', instructions: 'Help.' };
+    assert.equal(agentTemplateSubmission(draft, 'global').template.source_scope, 'global');
+    assert.equal(agentTemplateSubmission(draft).template.source_scope, 'personal');
+    const request = agentInstructionRequest(draft, [], null, GLOBAL_INSTRUCTION_SCOPE);
+    assert.equal(request.agent_scope, 'global');
+    assert.equal('group_id' in request, false);
+});
+
+const actualFetch = globalThis.fetch;
+const requests = [];
+const responses = new Map();
+globalThis.fetch = async (url, init = {}) => {
+    const method = init.method ?? 'GET';
+    requests.push({ url, method, body: typeof init.body === 'string' ? JSON.parse(init.body) : init.body });
+    const key = `${method} ${url}`;
+    const body = responses.has(key) ? responses.get(key) : { success: true };
+    return new Response(JSON.stringify(body), { status: 200, headers: { 'Content-Type': 'application/json' } });
+};
+const last = () => requests.at(-1);
+
+try {
+    await asyncCheck('global actions are read from the admin route and must be global', async () => {
+        responses.set('GET /api/v2/admin/actions', { actions: [globalAction()] });
+        const actions = await fetchGlobalActions();
+        assert.equal(actions.length, 1);
+        assert.equal(last().url, '/api/v2/admin/actions');
+        responses.set('GET /api/v2/admin/actions', { actions: [globalAction({ is_global: false, group_id: 'g-1' })] });
+        await assert.rejects(fetchGlobalActions(), /not a global action/);
+    });
+
+    await asyncCheck('global action types, options and identities come from admin routes', async () => {
+        responses.set('GET /api/v2/admin/actions/types', { types: [{ type: 'openapi' }] });
+        assert.equal((await GLOBAL_ACTION_WORKBENCH.fetchTypes()).length, 1);
+        responses.set('GET /api/v2/admin/action-options', { secret_reminders: {
+            storage_enabled: true, reminders_enabled: false, require_expiration: false, lead_days: 45, contact_email: 'ops@example.test',
+        } });
+        const hints = await GLOBAL_ACTION_WORKBENCH.fetchEditorHints();
+        assert.equal(hints.canAuthor, true);
+        assert.equal(hints.reminderLeadDays, 45);
+        responses.set('GET /api/admin/workspace-identities/global/identities', { identities: [
+            { id: 'i-1', name: 'Service principal', usage_contexts: ['action'], credentials: { auth_type: 'service_principal' } },
+            { id: 'i-2', name: 'File share', usage_contexts: ['file_sync'], credentials: { auth_type: 'username_password' } },
+        ] });
+        const identities = await GLOBAL_ACTION_WORKBENCH.listIdentities();
+        assert.deepEqual(identities.map((identity) => [identity.id, identity.scope_type, identity.scope_id]), [['i-1', 'global', 'global']]);
+    });
+
+    await asyncCheck('saving a global action creates and patches through the admin route', async () => {
+        const created = resource(globalAction({ id: 'action-9' }));
+        responses.set('POST /api/v2/admin/actions', created);
+        const draft = { ...globalAction(), id: '' };
+        delete draft.scope;
+        delete draft.scope_id;
+        await GLOBAL_ACTION_WORKBENCH.save(draft, null);
+        assert.equal(last().method, 'POST');
+        assert.equal('id' in last().body.updates, false, 'The server allocates a global action id.');
+
+        const original = resource(globalAction(), ['/auth/key']);
+        responses.set('PATCH /api/v2/admin/actions/action-1', resource(globalAction({ description: 'Updated.' }), ['/auth/key']));
+        await GLOBAL_ACTION_WORKBENCH.save({ ...structuredClone(original.record), description: 'Updated.' }, original);
+        assert.equal(last().url, '/api/v2/admin/actions/action-1');
+        assert.equal(last().body.expected_revision, 'etag-1');
+        assert.deepEqual(last().body.updates, { description: 'Updated.' });
+
+        responses.set('PATCH /api/v2/admin/actions/action-1', { ...resource(globalAction()), read_only: true });
+        await assert.rejects(GLOBAL_ACTION_WORKBENCH.save(structuredClone(original.record), original), /invalid action editor resource/);
+    });
+
+    await asyncCheck('global agents are listed with the default and saved through the admin route', async () => {
+        const agent = { ...newAgentDraft(), id: 'agent-1', name: 'research', display_name: 'Research', is_global: true };
+        responses.set('GET /api/v2/admin/agents', { agents: [agent], selected_agent_name: 'research' });
+        const catalog = await fetchGlobalAgentCatalog();
+        assert.equal(catalog.selectedAgentName, 'research');
+        assert.equal(catalog.agents.length, 1);
+
+        responses.set('GET /api/agents/generate_id', { id: '6f1c8c1e-0000-4000-8000-000000000001' });
+        responses.set('POST /api/v2/admin/agents', resource({ ...agent, id: '6f1c8c1e-0000-4000-8000-000000000001' }));
+        await GLOBAL_AGENT_WORKBENCH.save({ ...newAgentDraft(), name: 'new', display_name: 'New' }, null);
+        assert.equal(last().url, '/api/v2/admin/agents');
+        assert.equal(last().body.updates.id, '6f1c8c1e-0000-4000-8000-000000000001');
+
+        await GLOBAL_AGENT_WORKBENCH.deleteAgent(agent);
+        assert.deepEqual([last().method, last().url], ['DELETE', '/api/v2/admin/agents/agent-1']);
+    });
+
+    await asyncCheck('the global agent editor reads global options, knowledge, targets and MCP catalogues', async () => {
+        responses.set('GET /api/v2/admin/agent-options', { agent_types: [], model_endpoints: [], builtin_actions: [], settings: {} });
+        await GLOBAL_AGENT_WORKBENCH.fetchOptions();
+        assert.equal(last().url, '/api/v2/admin/agent-options');
+        responses.set('GET /api/agents/assigned-knowledge/catalog?agent_scope=global', { sources: [], documents: [], tags: [] });
+        await GLOBAL_AGENT_WORKBENCH.fetchKnowledge();
+        assert.equal(last().url, '/api/agents/assigned-knowledge/catalog?agent_scope=global');
+        responses.set('GET /api/plugins/agent-targets?scope=global', { targets: [], can_manage: true, scope_type: 'global', scope_id: 'global' });
+        await GLOBAL_AGENT_WORKBENCH.fetchTargets();
+        assert.equal(last().url, '/api/plugins/agent-targets?scope=global');
+        responses.set('GET /api/plugins/mcp/preconfigurations?scope=global', { scope: 'global', preconfigurations: [] });
+        await fetchMcpPreconfigurations(undefined, 'global');
+        assert.equal(last().url, '/api/plugins/mcp/preconfigurations?scope=global');
+    });
+} finally {
+    globalThis.fetch = actualFetch;
+}
+
+console.log(`${checks} global editor logic checks passed.`);
diff --git a/functional_tests/test_workspace_authoring_credential_compatibility.py b/functional_tests/test_workspace_authoring_credential_compatibility.py
index 47208cd30..c764bb739 100644
--- a/functional_tests/test_workspace_authoring_credential_compatibility.py
+++ b/functional_tests/test_workspace_authoring_credential_compatibility.py
@@ -1,15 +1,19 @@
 # test_workspace_authoring_credential_compatibility.py
 """Regression coverage for conditional editor writes and classic credential cleanup.
 
-Version: 0.261.096
+Version: 0.261.260
 Implemented in: 0.261.096
+Classic global agent delete of an editor-keyed credential: 0.261.260
 
 The real editor and classic functions share isolated Cosmos/Key Vault services.
 Lost write responses must not delete committed credentials, and classic operations
 must use the actual stored references created by the V2 staging path.
 """
 
+import logging
 import sys
+import traceback
+import uuid
 from copy import deepcopy
 from datetime import datetime
 from types import SimpleNamespace
@@ -206,3 +210,65 @@ def strict_delete(_client, name):
     assert ("actor", agent_id) not in records
     assert stored_reference in env.services.secret_deletes
     assert stored_reference not in env.services.vault
+
+
+def test_classic_global_delete_removes_the_editor_reference_it_holds(environment):
+    """The classic admin route deletes a global agent whose key the V2 editor stored.
+
+    The V2 global editor names a credential afresh (``{id}--agent--global--editor-...``).
+    The classic delete used to read the agent masked and rebuild the classic name from
+    the placeholder, so on a vault without that name it failed: the agent could not be
+    deleted, and its real credential would have been left behind.
+    """
+    env = environment
+    env.services.settings["enable_key_vault_secret_storage"] = True
+    agent_id = str(uuid.uuid4())
+    record = {
+        **agent_payload(), "id": agent_id, "is_global": True, "is_group": False,
+        "azure_openai_gpt_key": "global-test-credential",
+    }
+    staged = []
+    env.helper._stage_editor_secrets(record, "agents", "admin", env.services.settings, staged, global_scope=True)
+    reference = record["azure_openai_gpt_key"]
+    assert staged == [reference]
+    assert reference.startswith(f"{agent_id}--agent--global--editor-")
+    assert env.services.vault[reference] == "global-test-credential"
+
+    records = env.services.records["agents", "global"]
+    records[agent_id, agent_id] = {**deepcopy(record), "_etag": '"stored"'}
+    container = env.services.containers["agents", "global"]
+    deleted = []
+
+    def delete_item(*, item, partition_key):
+        assert partition_key == item, "Global agents are partitioned by their own id."
+        deleted.append(item)
+        del records[partition_key, item]
+
+    container.delete_item.side_effect = delete_item
+    namespace = {
+        "cosmos_global_agents_container": container,
+        "keyvault_agent_get_helper": env.keyvault.keyvault_agent_get_helper,
+        "keyvault_agent_delete_helper": env.keyvault.keyvault_agent_delete_helper,
+        "get_current_user_id": lambda: "admin",
+        "bump_chat_bootstrap_global_cache_version": Mock(),
+        "log_event": Mock(),
+        "logging": logging,
+        "traceback": traceback,
+    }
+    execute_functions("functions_global_agents.py", {"get_global_agent", "delete_global_agent"}, namespace)
+    # The classic list and editor still see only the placeholder.
+    assert namespace["get_global_agent"](agent_id)["azure_openai_gpt_key"] == "Stored_In_KeyVault"
+
+    def strict_delete(_client, name):
+        if name not in env.services.vault:
+            error = LookupError("The requested test secret does not exist.")
+            error.status_code = 404
+            raise error
+        env.services.secret_deletes.append(name)
+        del env.services.vault[name]
+
+    with patch.object(env.keyvault.SecretClient, "begin_delete_secret", strict_delete):
+        assert namespace["delete_global_agent"](agent_id) is True
+    assert deleted == [agent_id]
+    assert env.services.secret_deletes == [reference]
+    assert reference not in env.services.vault
diff --git a/ui_tests/fixtures/agent_delegation/.gitignore b/ui_tests/fixtures/agent_delegation/.gitignore
deleted file mode 100644
index 4dc0b5e8b..000000000
--- a/ui_tests/fixtures/agent_delegation/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# Generated by harness_build from harness_entry.tsx and application/v2_ui/src; rebuilt on demand,
-# machine-specific, and never tracked. Mirrors ui_tests/fixtures/orchestration/.gitignore.
-harness.bundle.js
-harness.bundle.js.map
-harness.bundle.css
-harness.bundle.css.map
diff --git a/ui_tests/fixtures/agent_delegation/harness.html b/ui_tests/fixtures/agent_delegation/harness.html
deleted file mode 100644
index 5f7c84a76..000000000
--- a/ui_tests/fixtures/agent_delegation/harness.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- harness.html -->
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>Call agent component tests</title>
-    </head>
-    <body>
-        <div id="root" class="flex h-screen min-w-0 flex-col"></div>
-        <script src="harness.bundle.js"></script>
-    </body>
-</html>
diff --git a/ui_tests/fixtures/agent_delegation/harness_build.py b/ui_tests/fixtures/agent_delegation/harness_build.py
deleted file mode 100644
index 9dd4f845a..000000000
--- a/ui_tests/fixtures/agent_delegation/harness_build.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# harness_build.py
-"""
-Build the real Call agent V2 components for deterministic local Playwright tests.
-Version: 0.261.093
-Implemented in: 0.261.093
-
-Uses the existing V2 esbuild dependency, matching fixtures/orchestration/harness_build.py.
-Only HTTP APIs are mocked; React components, state, API helpers and built CSS are real.
-"""
-
-import os
-import json
-import subprocess
-from pathlib import Path
-
-
-HERE = Path(__file__).resolve().parent
-ROOT = HERE.parents[2]
-V2 = ROOT / "application" / "v2_ui"
-BUNDLE = HERE / "harness.bundle.js"
-
-
-def ensure_bundle(*, entry=None, bundle=None, api_base=None):
-    """Bundle the fixture with the application's existing dependency installation."""
-    entry = entry or HERE / "harness_entry.tsx"
-    bundle = bundle or BUNDLE
-    esbuild = V2 / "node_modules" / "esbuild" / "bin" / "esbuild"
-    if not esbuild.exists():
-        raise RuntimeError("Run npm ci in application/v2_ui before the V2 browser tests.")
-    env = dict(os.environ, NODE_PATH=str(V2 / "node_modules"))
-    subprocess.run(
-        [
-            "node", str(esbuild), str(entry),
-            "--bundle", "--format=iife", "--platform=browser", "--jsx=automatic",
-            f"--define:import.meta.env={json.dumps({'VITE_API_BASE': api_base} if api_base is not None else {})}",
-            '--define:process.env.NODE_ENV="development"',
-            f"--outfile={bundle}", "--log-level=warning",
-        ],
-        cwd=V2,
-        env=env,
-        check=True,
-        capture_output=True,
-        text=True,
-    )
-    return bundle
diff --git a/ui_tests/fixtures/agent_delegation/harness_entry.tsx b/ui_tests/fixtures/agent_delegation/harness_entry.tsx
deleted file mode 100644
index bb111bc63..000000000
--- a/ui_tests/fixtures/agent_delegation/harness_entry.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-// harness_entry.tsx
-// Version: 0.261.127. Admin wrapper; workspace surfaces use their real-SPA suites.
-
-import { createRoot } from 'react-dom/client';
-import { MemoryRouter } from 'react-router-dom';
-import { AdminSettingsPage } from '../../../application/v2_ui/src/pages/AdminSettingsPage';
-import { useBootstrapStore } from '../../../application/v2_ui/src/stores/bootstrapStore';
-import type { BootstrapPayload } from '../../../application/v2_ui/src/lib/types';
-
-type View = 'admin';
-
-declare global {
-    interface Window {
-        AgentDelegationHarness: { mount: (view: View, admin?: boolean) => void };
-    }
-}
-
-const container = document.getElementById('root');
-if (!container) {
-    throw new Error('Missing harness root');
-}
-const root = createRoot(container);
-window.AgentDelegationHarness = {
-    mount(view, admin = true) {
-        // Only identity is read by the pages under test; all resource data crosses the real API client.
-        useBootstrapStore.setState({ data: { user: { is_admin: admin } } as BootstrapPayload, loading: false });
-        const pages = {
-            admin: <AdminSettingsPage />,
-        };
-        root.render(<MemoryRouter>{pages[view]}</MemoryRouter>);
-    },
-};
diff --git a/ui_tests/fixtures/v2_admin_global_editors.py b/ui_tests/fixtures/v2_admin_global_editors.py
new file mode 100644
index 000000000..7d880141b
--- /dev/null
+++ b/ui_tests/fixtures/v2_admin_global_editors.py
@@ -0,0 +1,610 @@
+# v2_admin_global_editors.py
+"""
+Closed API fixtures for the V2 Admin Settings global agents and actions.
+Version: 0.261.260
+Implemented in: 0.261.260
+
+Extend the schema-backed Admin Settings fixture with an in-memory store for the
+organisation's global agents and actions. It answers the admin-only V2 editor
+routes (/api/v2/admin/agents and /api/v2/admin/actions, with their options and
+types) with the server's editor contract -- masked credentials, opaque revisions,
+and writes made of updates, removed paths and explicit secret intent -- and the
+classic enable, default-agent, knowledge and template routes the Admin Settings
+lists and the shared editors reuse. The real built SPA runs unchanged. No
+application server, signed-in account, or live write is involved, and any
+request the fixture does not expect fails the test.
+"""
+
+import copy
+import json
+import re
+from urllib.parse import parse_qs, unquote, urlsplit
+
+from playwright.sync_api import Route
+
+from v2_admin_settings import ORIGIN, REPO_ROOT, SPA_INDEX, AdminSettingsFixture, connect_options  # noqa: F401
+
+
+SCHEMA_ROOT = REPO_ROOT / "application" / "single_app" / "static" / "json" / "schemas"
+SECRET_MASK = "***REDACTED***"
+STORED_KEY = "fixture-only-global-credential"
+RESEARCH_AGENT_ID = "20000000-0000-4000-8000-000000000001"
+POLICY_AGENT_ID = "20000000-0000-4000-8000-000000000002"
+ARCHIVE_AGENT_ID = "20000000-0000-4000-8000-000000000003"
+CREATED_AGENT_ID = "20000000-0000-4000-8000-000000000101"
+TICKET_ACTION_ID = "30000000-0000-4000-8000-000000000001"
+FORECAST_ACTION_ID = "30000000-0000-4000-8000-000000000002"
+CREATED_ACTION_ID = "30000000-0000-4000-8000-000000000101"
+MODEL_LABEL = "Organization GPT · Organization models"
+
+# The Agents & Actions sections that carry the global lists, the template gallery
+# switch the agent list reads, and the approvals link -- in navigation order.
+GLOBAL_SECTIONS = {
+    "agents-actions": (
+        "agents-config",
+        "organization-agents-section",
+        "agent-toggles-card",
+        "agent-template-approvals-section",
+        "core-plugin-toggles",
+        "actions-config",
+    ),
+}
+# Fields the server stamps or owns. The editors never send them as an update or a
+# removal; the client strips the first set and the global adapters strip the second.
+_SERVER_FIELDS = {
+    "user_id", "last_updated", "modified_at", "modified_by", "created_at", "created_by",
+    "is_global", "is_group", "group_id", "revision", "secret_paths",
+    "scope", "scope_id", "scope_type", "updated_at", "updated_by", "owner_id", "owner_user_id",
+}
+
+
+def global_agent(identifier, name, display_name, **overrides):
+    """A stored global agent, as the global agents container holds one."""
+    record = {
+        "id": identifier,
+        "name": name,
+        "display_name": display_name,
+        "description": f"{display_name} for everyone in the organisation.",
+        "instructions": "Answer with the organisation's approved guidance.",
+        "agent_type": "local",
+        "actions_to_load": [],
+        "other_settings": {},
+        "max_completion_tokens": -1,
+        "model_endpoint_id": "org-model-endpoint",
+        "model_id": "org-model",
+        "model_provider": "aoai",
+        "azure_openai_gpt_deployment": "org-gpt",
+        "tags": [],
+        "is_global": True,
+        "is_group": False,
+        "is_enabled": True,
+        "created_by": "previous-admin",
+    }
+    record.update(copy.deepcopy(overrides))
+    return record
+
+
+def global_action(identifier, name, display_name, **overrides):
+    """A stored global action, stamped with the global scope as the server saves one."""
+    record = {
+        "id": identifier,
+        "name": name,
+        "displayName": display_name,
+        "description": f"{display_name} for global agents.",
+        "type": "fixture_custom",
+        "endpoint": "https://tickets.example.test/api",
+        "auth": {"type": "key", "key": STORED_KEY},
+        "additionalFields": {"region": "east", "limit": 5, "enabled": False},
+        "metadata": {},
+        "is_global": True,
+        "is_group": False,
+        "scope": "global",
+        "scope_id": "global",
+        "is_enabled": True,
+        "created_by": "previous-admin",
+    }
+    record.update(copy.deepcopy(overrides))
+    return record
+
+
+def global_agent_options():
+    """What /api/v2/admin/agent-options answers: every agent type and the global models."""
+    return {
+        "agent_types": [
+            {"value": value, "label": label, "enabled": True}
+            for value, label in (
+                ("local", "Local agent"),
+                ("aifoundry", "Azure AI Foundry"),
+                ("new_foundry", "New Foundry"),
+                ("foundry_workflow", "Foundry Workflow"),
+            )
+        ],
+        "settings": {
+            "enable_semantic_kernel": True,
+            "per_user_semantic_kernel": True,
+            "merge_global_semantic_kernel_with_workspace": False,
+            "enable_multi_model_endpoints": True,
+            "default_model_selection": {},
+            "gpt_model": {},
+            "enable_gpt_apim": False,
+            "azure_apim_gpt_deployment": "",
+            "enable_agent_template_gallery": True,
+            "enable_web_search": False,
+            "enable_url_access": False,
+            "enable_key_vault_secret_storage": False,
+            "enable_key_vault_secret_expiration_reminders": False,
+            "key_vault_secret_expiration_default_lead_days": 30,
+            "key_vault_secret_expiration_default_contact_email": "",
+            "key_vault_secret_expiration_require_expiration": False,
+            "agent_template_submission_allowed": True,
+        },
+        "model_endpoints": [{
+            "id": "org-model-endpoint",
+            "name": "Organization models",
+            "provider": "aoai",
+            "scope": "global",
+            "enabled": True,
+            "models": [{
+                "id": "org-model",
+                "deploymentName": "org-gpt",
+                "modelName": "gpt-4o",
+                "displayName": "Organization GPT",
+                "enabled": True,
+            }],
+        }],
+        "builtin_actions": [],
+    }
+
+
+def global_action_types():
+    """What /api/v2/admin/actions/types answers, narrowed to a connector and Call agent."""
+    return [{
+        "type": "fixture_custom",
+        "display": "Ticket connector",
+        "description": "A server-discovered connector to the ticket service.",
+        "allowed_auth_types": ["NoAuth", "key"],
+        "additional_fields_schema": {
+            "type": "object",
+            "properties": {
+                "region": {"type": "string", "title": "Region", "enum": ["east", "west"]},
+                "limit": {"type": "integer", "title": "Result limit", "default": 0, "minimum": 0},
+                "enabled": {"type": "boolean", "title": "Include archived", "default": False},
+            },
+            "additionalProperties": True,
+        },
+        "metadata_schema": {"type": "object", "properties": {}, "additionalProperties": True},
+    }, {
+        # Call agent is an ordinary action type, described as the real type builder does.
+        "type": "agent",
+        "display": "Call agent",
+        "description": "Call another agent with a task.",
+        "allowed_auth_types": json.loads((SCHEMA_ROOT / "agent.definition.json").read_text(encoding="utf-8"))["allowedAuthTypes"],
+        "additional_fields_schema": json.loads(
+            (SCHEMA_ROOT / "agent_plugin.additional_settings.schema.json").read_text(encoding="utf-8")
+        ),
+        "metadata_schema": {"type": "object", "properties": {}, "additionalProperties": True},
+    }]
+
+
+def _pointer_parts(pointer):
+    assert pointer.startswith("/"), f"Expected a JSON pointer, received {pointer!r}"
+    return [part.replace("~1", "/").replace("~0", "~") for part in pointer[1:].split("/")]
+
+
+def _get_pointer(record, pointer):
+    current = record
+    for key in _pointer_parts(pointer):
+        if not isinstance(current, dict) or key not in current:
+            return None
+        current = current[key]
+    return current
+
+
+def _set_pointer(record, pointer, value):
+    parts = _pointer_parts(pointer)
+    parent = record
+    for key in parts[:-1]:
+        parent = parent.setdefault(key, {})
+    parent[parts[-1]] = value
+
+
+def _remove_pointer(record, pointer):
+    parts = _pointer_parts(pointer)
+    parent = record
+    for key in parts[:-1]:
+        if not isinstance(parent, dict) or key not in parent:
+            return
+        parent = parent[key]
+    if isinstance(parent, dict):
+        parent.pop(parts[-1], None)
+
+
+def _merge_updates(record, updates):
+    for key, value in updates.items():
+        if isinstance(value, dict) and isinstance(record.get(key), dict):
+            _merge_updates(record[key], value)
+        else:
+            record[key] = copy.deepcopy(value)
+
+
+class GlobalEditorsFixture(AdminSettingsFixture):
+    """Admin Settings plus a scripted global agents and actions boundary."""
+
+    def __init__(self, page, *, sections=None, admin=True, **kwargs):
+        super().__init__(page, sections=sections or GLOBAL_SECTIONS, **kwargs)
+        self.is_admin = admin
+        self.settings["enable_agent_template_gallery"] = True
+        self.agents = {
+            RESEARCH_AGENT_ID: global_agent(RESEARCH_AGENT_ID, "research-assistant", "Research assistant"),
+            POLICY_AGENT_ID: global_agent(POLICY_AGENT_ID, "policy-advisor", "Policy advisor"),
+            ARCHIVE_AGENT_ID: global_agent(
+                ARCHIVE_AGENT_ID, "archive-summarizer", "Archive summarizer", is_enabled=False,
+            ),
+        }
+        self.selected_agent_name = "research-assistant"
+        self.actions = {
+            TICKET_ACTION_ID: global_action(TICKET_ACTION_ID, "ticket_search", "Ticket search"),
+            FORECAST_ACTION_ID: global_action(
+                FORECAST_ACTION_ID, "forecast_lookup", "Forecast lookup",
+                auth={"type": "NoAuth"}, is_enabled=False,
+            ),
+        }
+        self.secret_paths = {TICKET_ACTION_ID: ["/auth/key"]}
+        self.revisions = {identifier: 1 for identifier in (*self.agents, *self.actions)}
+        self.knowledge_catalog = {
+            "sources": [{"scope": "public", "id": "public-handbook", "label": "Published handbook"}],
+            "documents": [{
+                "id": "public-guide", "title": "Public review guide", "file_name": "review-guide.pdf",
+                "scope": "public", "source_id": "public-handbook", "source_name": "Published handbook",
+                "tags": ["Operations"],
+            }],
+            "tags": [{"name": "Operations", "count": 1}],
+        }
+        self.templates = [{
+            "id": "approved-onboarding", "title": "Onboarding guide", "display_name": "Onboarding guide",
+            "description": "Answer questions from people who have just joined.",
+            "instructions": "Help new colleagues find onboarding answers in the approved handbook.",
+            "actions_to_load": [], "tags": ["onboarding"], "additional_settings": {},
+        }]
+        # Every request the page made, and those the global boundary answered and wrote.
+        self.requests_seen = []
+        self.global_requests = []
+        self.global_writes = []
+        self.global_responses = []
+        # Failures a test scripts on purpose, and the browser console errors they cause.
+        self.pending_failures = []
+        self.expected_failure_statuses = []
+
+    # --- Server-side helpers -------------------------------------------------
+
+    def _bootstrap(self):
+        payload = super()._bootstrap()
+        if not self.is_admin:
+            payload["user"] = {**payload["user"], "is_admin": False, "roles": ["User"]}
+        return payload
+
+    def admin_reads(self):
+        """Requests for administrator data, which a non-administrator's page must never make."""
+        return [
+            (method, path) for method, path in self.requests_seen
+            if path.startswith(("/api/v2/admin/", "/api/admin/")) or path == "/api/plugins/agent-targets"
+        ]
+
+    def global_targets(self):
+        """The global agents a global Call agent action may target: enabled local ones."""
+        return [
+            {
+                "id": agent["id"], "name": agent["name"], "display_name": agent["display_name"],
+                "description": agent["description"], "agent_type": agent["agent_type"],
+                "scope_type": "global", "scope_id": "global",
+            }
+            for agent in self.agents.values()
+            if agent.get("is_enabled", True) and agent.get("agent_type", "local") == "local"
+        ]
+
+    def revision(self, identifier):
+        return f"global-revision:{identifier}:{self.revisions[identifier]}"
+
+    def projected(self, record):
+        result = copy.deepcopy(record)
+        for pointer in self.secret_paths.get(record["id"], []):
+            _set_pointer(result, pointer, SECRET_MASK)
+        return result
+
+    def envelope(self, record):
+        return {
+            "record": self.projected(record),
+            "revision": self.revision(record["id"]),
+            "secret_paths": list(self.secret_paths.get(record["id"], [])),
+            "read_only": False,
+        }
+
+    def writes_to(self, method, path):
+        return [write for write in self.global_writes if (write[0], write[1]) == (method, path)]
+
+    def fail_next(self, method, path, status=503, error="The service is unavailable."):
+        """Answer the next matching request with an error, as a failing server would."""
+        self.pending_failures.append((method, path, status, error))
+
+    def _json(self, route, payload, status=200):
+        self.global_responses.append(copy.deepcopy(payload))
+        if status >= 400:
+            self.expected_failure_statuses.append(status)
+        route.fulfill(status=status, json=payload)
+
+    def _fail(self, route, reason):
+        self.unexpected_requests.append(reason)
+        route.fulfill(status=400, json={"error": "Unexpected global editor request."})
+
+    # --- Routing -------------------------------------------------------------
+
+    def _route(self, route: Route):
+        request = route.request
+        parsed = urlsplit(request.url)
+        if f"{parsed.scheme}://{parsed.netloc}" == ORIGIN:
+            self.requests_seen.append((request.method, parsed.path))
+        if f"{parsed.scheme}://{parsed.netloc}" == ORIGIN and self._global_route(
+            route, request.method, parsed.path, parse_qs(parsed.query),
+        ):
+            return
+        super()._route(route)
+
+    def _global_route(self, route, method, path, query):
+        """Answer one request on the global boundary, or return False to defer to the base."""
+        if method == "GET" and re.fullmatch(r"/v2/admin/(agents|actions)(/[^/]+)?", path):
+            route.fulfill(path=str(SPA_INDEX), content_type="text/html")
+            return True
+        failure = next((item for item in self.pending_failures if item[:2] == (method, path)), None)
+        if failure:
+            self.pending_failures.remove(failure)
+            self._record(method, path, query, None)
+            self._json(route, {"error": failure[3]}, failure[2])
+            return True
+        body = None
+        if method in ("POST", "PATCH", "PUT"):
+            body = route.request.post_data_json
+        elif route.request.post_data:
+            self._fail(route, f"{method} {path} carried a body")
+            return True
+
+        agent_match = re.fullmatch(r"/api/v2/admin/agents(?:/([^/]+))?", path)
+        action_match = re.fullmatch(r"/api/v2/admin/actions(?:/([^/]+))?", path)
+        if path == "/api/v2/admin/agent-options" and method == "GET":
+            self._record(method, path, query, body)
+            self._json(route, global_agent_options())
+        elif path == "/api/v2/admin/action-options" and method == "GET":
+            self._record(method, path, query, body)
+            self._json(route, {"secret_reminders": {
+                "storage_enabled": False, "reminders_enabled": False, "require_expiration": False,
+                "lead_days": 30, "contact_email": "",
+            }})
+        elif path == "/api/v2/admin/actions/types" and method == "GET":
+            self._record(method, path, query, body)
+            self._json(route, {"types": global_action_types()})
+        elif agent_match:
+            self._record(method, path, query, body)
+            self._resource(route, "agents", method, path, unquote(agent_match.group(1) or ""), query, body)
+        elif action_match:
+            self._record(method, path, query, body)
+            self._resource(route, "actions", method, path, unquote(action_match.group(1) or ""), query, body)
+        elif path == "/api/agents/generate_id" and method == "GET":
+            self._record(method, path, query, body)
+            self._json(route, {"id": CREATED_AGENT_ID})
+        elif path == "/api/agents/assigned-knowledge/catalog" and method == "GET":
+            self._record(method, path, query, body)
+            if query != {"agent_scope": ["global"]}:
+                self._fail(route, f"A global agent read knowledge outside the global scope: {query}")
+            else:
+                self._json(route, self.knowledge_catalog)
+        elif path == "/api/agent-templates" and method == "GET":
+            self._record(method, path, query, body)
+            self._json(route, {"templates": copy.deepcopy(self.templates)})
+        elif path == "/api/agent-templates" and method == "POST":
+            self._record(method, path, query, body)
+            template = body.get("template") if isinstance(body, dict) else None
+            if not isinstance(template, dict) or template.get("source_scope") != "global":
+                self._fail(route, f"A global agent offered a template outside the global scope: {body!r}")
+            else:
+                # An administrator's global submission is approved as it is published.
+                self._json(route, {"template": {**template, "id": "published-template", "status": "approved"}})
+        elif path == "/api/admin/workspace-identities/global/identities" and method == "GET":
+            self._record(method, path, query, body)
+            self._json(route, {"identities": []})
+        elif path == "/api/plugins/agent-targets" and method == "GET":
+            self._record(method, path, query, body)
+            if query != {"scope": ["global"]}:
+                self._fail(route, f"A global editor read Call agent targets outside the global scope: {query}")
+            else:
+                self._json(route, {
+                    "targets": self.global_targets(), "can_manage": True,
+                    "scope_type": "global", "scope_id": "global",
+                })
+        elif (match := re.fullmatch(r"/api/admin/agents/([^/]+)/enabled", path)) and method == "PATCH":
+            self._record(method, path, query, body)
+            self._set_agent_enabled(route, unquote(match.group(1)), body)
+        elif path == "/api/admin/agents/selected_agent" and method == "POST":
+            self._record(method, path, query, body)
+            self._select_agent(route, body)
+        elif (match := re.fullmatch(r"/api/admin/plugins/([^/]+)/enabled", path)) and method == "PATCH":
+            self._record(method, path, query, body)
+            self._set_action_enabled(route, unquote(match.group(1)), body)
+        else:
+            return False
+        return True
+
+    def _record(self, method, path, query, body):
+        self.global_requests.append((method, path, query, copy.deepcopy(body)))
+        if method != "GET":
+            self.global_writes.append((method, path, copy.deepcopy(body)))
+
+    # --- Classic routes the Admin Settings lists reuse ------------------------
+
+    def _agent_named(self, name):
+        return next((agent for agent in self.agents.values() if agent["name"] == name), None)
+
+    def _set_agent_enabled(self, route, name, body):
+        agent = self._agent_named(name)
+        if not isinstance(body, dict) or set(body) != {"is_enabled"} or type(body["is_enabled"]) is not bool:
+            self._fail(route, f"Invalid enable request: {body!r}")
+            return
+        if agent is None:
+            self._json(route, {"error": "Agent not found."}, 404)
+            return
+        agent["is_enabled"] = body["is_enabled"]
+        self.revisions[agent["id"]] += 1
+        fallback = None
+        if not body["is_enabled"] and self.selected_agent_name == name:
+            enabled = [item for item in self.agents.values() if item.get("is_enabled", True)]
+            fallback = enabled[0]["name"] if enabled else None
+            self.selected_agent_name = fallback or ""
+        self._json(route, {"success": True, "fallback_agent_name": fallback})
+
+    def _select_agent(self, route, body):
+        if not isinstance(body, dict) or set(body) != {"name"}:
+            self._fail(route, f"Invalid default-agent request: {body!r}")
+            return
+        if self._agent_named(body["name"]) is None:
+            self._json(route, {"error": "Agent not found."}, 404)
+            return
+        self.selected_agent_name = body["name"]
+        self._json(route, {"success": True})
+
+    def _set_action_enabled(self, route, name, body):
+        action = next((item for item in self.actions.values() if item["name"] == name), None)
+        if not isinstance(body, dict) or set(body) != {"is_enabled"} or type(body["is_enabled"]) is not bool:
+            self._fail(route, f"Invalid enable request: {body!r}")
+            return
+        if action is None:
+            self._json(route, {"error": "Plugin not found."}, 404)
+            return
+        action["is_enabled"] = body["is_enabled"]
+        self.revisions[action["id"]] += 1
+        self._json(route, {"success": True})
+
+    # --- The V2 global editor routes ------------------------------------------
+
+    def _resource(self, route, kind, method, path, identifier, query, body):
+        store = self.agents if kind == "agents" else self.actions
+        if query:
+            # The real routes refuse any query string rather than ignoring it.
+            self._fail(route, f"{method} {path} carried a query: {query}")
+            return
+        if method == "GET" and not identifier:
+            items = [self.projected(item) for item in store.values()]
+            payload = {"agents": items, "selected_agent_name": self.selected_agent_name} if kind == "agents" else {"actions": items}
+            self._json(route, payload)
+            return
+        record = store.get(identifier) if identifier else None
+        if identifier and record is None:
+            self._json(route, {"error": "Not found."}, 404)
+            return
+        if method == "GET":
+            self._json(route, self.envelope(record))
+        elif method == "DELETE":
+            if kind == "agents" and record["name"] == self.selected_agent_name:
+                self._json(route, {"error": "Choose another default agent before deleting this agent."}, 400)
+                return
+            del store[identifier]
+            self.secret_paths.pop(identifier, None)
+            self._json(route, {"success": True})
+        elif method in ("POST", "PATCH") and bool(identifier) == (method == "PATCH"):
+            self._write(route, kind, store, method, record, body)
+        else:
+            self._fail(route, f"Unsupported {method} {path}")
+
+    def _write(self, route, kind, store, method, record, body):
+        expected = {"updates", "clear_secret_paths", "removed_paths"}
+        if method == "PATCH":
+            expected.add("expected_revision")
+        if not isinstance(body, dict) or set(body) != expected or not isinstance(body["updates"], dict):
+            self._fail(route, f"Malformed editor write: {body!r}")
+            return
+        updates = body["updates"]
+        stamped = (_SERVER_FIELDS & set(updates)) | {
+            pointer for pointer in body["removed_paths"] if _pointer_parts(pointer)[0] in _SERVER_FIELDS
+        }
+        if stamped or any(key.startswith("_") for key in updates):
+            self._fail(route, f"An editor write named server fields: {sorted(stamped) or list(updates)}")
+            return
+        if method == "PATCH":
+            if "id" in updates:
+                self._fail(route, "An edit tried to replace the record identifier.")
+                return
+            if body["expected_revision"] != self.revision(record["id"]):
+                self._json(route, {"error": "This item changed in another session. Reload before saving."}, 409)
+                return
+            identifier = record["id"]
+        elif kind == "agents":
+            # A new global agent arrives with the identifier the editor allocated.
+            identifier = updates.get("id")
+            if identifier != CREATED_AGENT_ID or identifier in store:
+                self._fail(route, f"A new agent must carry the allocated identifier, not {identifier!r}")
+                return
+            record = {"id": identifier}
+        else:
+            # The server allocates a new action's identifier.
+            if "id" in updates:
+                self._fail(route, "A new action must not choose its own identifier.")
+                return
+            identifier = CREATED_ACTION_ID
+            record = {"id": identifier, "is_enabled": True}
+
+        known = set(self.secret_paths.get(identifier, []))
+        cleared = set(body["clear_secret_paths"])
+        if cleared - known:
+            self._fail(route, f"Cleared an unknown credential: {sorted(cleared - known)}")
+            return
+        candidate = copy.deepcopy(record)
+        _merge_updates(candidate, updates)
+        for pointer in known:
+            if _get_pointer(candidate, pointer) == SECRET_MASK:
+                # A kept credential is restored from the server's copy, never from the mask.
+                _set_pointer(candidate, pointer, copy.deepcopy(_get_pointer(record, pointer)))
+        if SECRET_MASK in json.dumps(candidate):
+            self._fail(route, "A credential mask would have been stored.")
+            return
+        for pointer in [*body["removed_paths"], *cleared]:
+            _remove_pointer(candidate, pointer)
+
+        noun = "agent" if kind == "agents" else "action"
+        taken = {
+            str(item.get("name", "")).lower() for key, item in store.items() if key != identifier
+        }
+        if str(candidate.get("name", "")).lower() in taken:
+            self._json(route, {"error": f"A global {noun} with this name already exists."}, 400)
+            return
+        target = (candidate.get("additionalFields") or {}).get("target_agent")
+        if kind == "actions" and candidate.get("type") == "agent" and (
+            not isinstance(target, dict)
+            or (target.get("scope_type"), target.get("scope_id")) != ("global", "global")
+            or target.get("id") not in {item["id"] for item in self.global_targets()}
+        ):
+            # The server keeps a global action's calls among global agents.
+            self._json(route, {
+                "error": "Agent calls must stay in the same workspace or use a permitted global agent.",
+            }, 403)
+            return
+        candidate.update({"is_global": True, "is_group": False})
+        if kind == "actions":
+            candidate.update({"scope": "global", "scope_id": "global"})
+        if kind == "agents" and method == "PATCH" and record["name"] == self.selected_agent_name:
+            # A renamed default agent stays the default, as the server follows the rename.
+            self.selected_agent_name = candidate["name"]
+        store[identifier] = candidate
+        self.secret_paths[identifier] = sorted(
+            (known - cleared) | ({"/auth/key"} if candidate.get("auth", {}).get("key") else set())
+        )
+        self.revisions[identifier] = self.revisions.get(identifier, 0) + 1
+        self._json(route, self.envelope(candidate), 201 if method == "POST" else 200)
+
+    def assert_clean(self):
+        assert not self.pending_failures, f"A scripted failure was never requested: {self.pending_failures}"
+        # Each error the boundary answered on purpose logs one resource failure in the console.
+        for status in self.expected_failure_statuses:
+            prefix = f"Failed to load resource: the server responded with a status of {status}"
+            match = next((error for error in self.errors if error.startswith(prefix)), None)
+            if match is not None:
+                self.errors.remove(match)
+        super().assert_clean()
+        for payload in self.global_responses:
+            assert STORED_KEY not in json.dumps(payload), "A stored credential crossed the fixture API boundary."
diff --git a/ui_tests/test_agent_delegation_v2.py b/ui_tests/test_agent_delegation_v2.py
deleted file mode 100644
index 990460690..000000000
--- a/ui_tests/test_agent_delegation_v2.py
+++ /dev/null
@@ -1,261 +0,0 @@
-# test_agent_delegation_v2.py
-"""
-Real V2 Call agent create/edit/attach workflows for global scope.
-Version: 0.261.158
-Implemented in: 0.261.093
-
-Deterministic local Playwright coverage using the existing orchestration harness pattern.
-No deployed service, model calls, credentials or remote browser workspace is needed.
-The real components and API client run against scoped response fixtures. Browser errors
-fail tests, and desktop/mobile runs load the real production V2 CSS. Personal
-create/edit/delete, mixed bindings, conflicts, unavailable targets, keyboard
-selection, and target-type coverage now live in test_v2_workspace_authoring.py,
-which loads the production SPA and its data router rather than MemoryRouter.
-Group wrapper coverage is now in test_v2_group_workspace_shell.py using the
-production SPA and its scoped navigation/activation behavior.
-"""
-
-import copy
-import importlib.util
-import json
-from pathlib import Path
-from urllib.parse import parse_qs, unquote, urlparse
-
-import pytest
-from playwright.sync_api import expect
-
-from ui_tests.fixtures.orchestration.harness_build import start_static_server
-
-
-HERE = Path(__file__).resolve().parent
-FIXTURE = HERE / "fixtures" / "agent_delegation"
-ROOT = HERE.parent
-SPEC = importlib.util.spec_from_file_location("delegation_harness", FIXTURE / "harness_build.py")
-HARNESS = importlib.util.module_from_spec(SPEC)
-SPEC.loader.exec_module(HARNESS)
-
-
-def target(agent_id="target", scope="personal", scope_id="user-1", agent_type="local"):
-    return {
-        "id": agent_id, "scope_type": scope, "scope_id": scope_id,
-        "name": f"{scope}-{agent_id}", "display_name": f"{scope} {agent_id}",
-        "description": "Delegation target", "agent_type": agent_type,
-    }
-
-
-def action(action_id="call-1", target_ref=None):
-    reference = target_ref or target()
-    return {
-        "id": action_id, "name": action_id, "displayName": f"Call {action_id}",
-        "type": "agent", "description": "Delegate a task", "endpoint": "internal://agent",
-        "auth": {"type": "user"}, "metadata": {"keep": "metadata"},
-        "additionalFields": {"target_agent": {
-            key: reference[key] for key in ("id", "scope_type", "scope_id")
-        }},
-    }
-
-
-class ApiFixture:
-    """Scoped endpoint fixture that records exact writes without simulating UI behavior."""
-
-    def __init__(self, page):
-        self.writes = []
-        self.reads = []
-        self.manage = True
-        self.denied = False
-        self.conflict = False
-        self.actions = {
-            "personal": [action(), action("self", target("caller"))],
-            "group": [action("group-call", target(scope="group", scope_id="group-1"))],
-            "global": [action("global-call", target(scope="global", scope_id="global"))],
-        }
-        self.agents = {}
-        self.targets = {}
-        for scope, scope_id in (("personal", "user-1"), ("group", "group-1"), ("global", "global")):
-            self.targets[scope] = [
-                target("target", scope, scope_id),
-                target("caller", scope, scope_id),
-                target("remote", scope, scope_id, "new_foundry"),
-            ]
-            if scope != "global":
-                self.targets[scope].append(target("shared", "global", "global", "foundry_workflow"))
-            self.agents[scope] = [
-                {
-                    "id": "caller", "name": "caller", "display_name": "Local caller",
-                    "agent_type": "local", "actions_to_load": ["legacy-name", "unknown-id"],
-                    "other_settings": {"action_capabilities": {"legacy-name": ["read"]}},
-                    "model_connection": "keep-model", "assigned_knowledge": ["keep-document"],
-                    "is_global": scope == "global", "is_group": scope == "group",
-                },
-                {"id": "remote", "display_name": "Remote target", "agent_type": "new_foundry",
-                 "is_global": scope == "global", "is_group": scope == "group"},
-            ]
-        page.route("**/api/**", self.handle)
-
-    def handle(self, route):
-        request = route.request
-        parsed = urlparse(request.url)
-        query = parse_qs(parsed.query)
-        path = unquote(parsed.path)
-
-        def respond(payload, status=200):
-            route.fulfill(status=status, content_type="application/json", body=json.dumps(payload))
-
-        if request.method != "GET":
-            payload = request.post_data_json if request.post_data else None
-            self.writes.append((request.method, path, query, payload))
-            scope = "group" if "/group/" in path else "global" if "/admin/" in path else "personal"
-            if request.method == "DELETE" and "/plugins/" in path:
-                identifier = path.rsplit("/", 1)[-1]
-                field = "name" if scope == "global" else "id"
-                self.actions[scope] = [item for item in self.actions[scope] if item.get(field) != identifier]
-                respond({"success": True})
-                return
-            if path.endswith("/agent-actions"):
-                if self.conflict:
-                    respond({"error": "Changed by another editor"}, 409)
-                    return
-                self.agents[scope][0]["actions_to_load"] = ["legacy-name", "unknown-id", *payload["action_ids"]]
-            elif "/plugins" in path:
-                updated = {**payload, "id": payload.get("id", "new-action")}
-                if scope == "global":
-                    updated["is_global"] = True
-                if scope == "group":
-                    updated["is_group"] = True
-                self.actions[scope] = [item for item in self.actions[scope] if item["id"] != updated["id"]] + [updated]
-            elif path == "/api/user/agents":
-                self.agents["personal"].append(payload)
-            respond({"success": True})
-            return
-
-        self.reads.append((path, query))
-        if path == "/api/plugins/agent-targets":
-            if self.denied:
-                respond({"error": "Unavailable scope"}, 403)
-                return
-            scope = query["scope"][0]
-            respond({
-                "targets": self.targets[scope], "can_manage": self.manage,
-                "scope_type": scope, "scope_id": query.get("group_id", ["global" if scope == "global" else "user-1"])[0],
-            })
-        elif path == "/api/groups":
-            respond({"groups": [
-                {"id": "group-1", "name": "Research group", "userRole": "Owner"},
-                {"id": "group-2", "name": "Read-only group", "userRole": "User"},
-            ], "total_count": 2})
-        elif path == "/api/v2/admin/settings":
-            respond({
-                "settings": {}, "field_schema": {}, "admin_nav": [
-                    {"id": "general", "label": "General", "tabs": []},
-                    {"id": "agents-actions", "label": "Agents & Actions", "tabs": []},
-                ],
-            })
-        elif path == "/api/v2/admin/update-status":
-            respond({"version": "0.261.133", "update_status": {
-                "latest_version": "0.261.133", "update_available": False, "status": "checked",
-                "checked_at": None, "attempted_at": None, "error": None,
-            }})
-        elif path == "/api/agents/generate_id":
-            respond({"id": "new-agent"})
-        elif path.endswith("/plugins") or path.endswith("/agents"):
-            scope = "group" if "/group/" in path else "global" if "/admin/" in path else "personal"
-            resources = self.actions[scope] if path.endswith("/plugins") else self.agents[scope]
-            if scope == "group":
-                respond({"actions" if path.endswith("/plugins") else "agents": resources})
-            else:
-                respond(resources)
-        else:
-            respond({"error": f"Unexpected test endpoint {path}"}, 500)
-
-
-@pytest.fixture(scope="module")
-def harness_url():
-    HARNESS.ensure_bundle()
-    with start_static_server() as origin:
-        yield origin
-    HARNESS.BUNDLE.unlink(missing_ok=True)
-
-
-@pytest.fixture
-def ui(page, harness_url):
-    errors = []
-    page.on("pageerror", lambda error: errors.append(str(error)))
-    api = ApiFixture(page)
-    page.goto(f"{harness_url}/ui_tests/fixtures/agent_delegation/harness.html")
-    css_files = sorted((ROOT / "application" / "single_app" / "static" / "v2" / "assets").glob("*.css"))
-    assert css_files, "Run npm run build in application/v2_ui before UI tests."
-    page.add_style_tag(url=f"{harness_url}/{css_files[0].relative_to(ROOT).as_posix()}")
-    yield page, api
-    assert not errors, errors
-
-
-def mount(page, view, admin=True):
-    page.evaluate("([view, admin]) => window.AgentDelegationHarness.mount(view, admin)", [view, admin])
-
-
-def create_call(page, name, label):
-    page.get_by_role("button", name="New Call agent action", exact=True).click()
-    page.get_by_label("Action name", exact=True).fill(name)
-    page.get_by_label("Search target agents").fill(label.split(" · ")[0])
-    page.get_by_label("Target agent", exact=True).select_option(label=label)
-    page.get_by_role("button", name="Save Call agent action", exact=True).click()
-    expect(page.get_by_role("status").filter(has_text="Call agent action saved.")).to_be_visible()
-
-
-@pytest.mark.parametrize("scope,view,action_id", [
-    ("global", "admin", "global-call"),
-])
-def test_native_call_action_deletion_requires_confirmation_and_preserves_callers(ui, scope, view, action_id):
-    page, api = ui
-    original_agents = copy.deepcopy(api.agents)
-    mount(page, view)
-    if scope == "group":
-        page.get_by_label("Group workspace", exact=True).select_option("group-1")
-    elif scope == "global":
-        page.get_by_role("button", name="Agents & Actions", exact=True).click()
-    page.get_by_role("button", name=f"Delete Call agent action Call {action_id}", exact=True).click()
-    assert not api.writes
-    page.get_by_role("button", name="Confirm delete", exact=True).click()
-    expect(page.get_by_role("status").filter(has_text="Call agent action deleted.")).to_be_visible()
-    expect(page.get_by_role("button", name=f"Edit Call agent action Call {action_id}", exact=True)).to_have_count(0)
-    owner = "user" if scope == "personal" else "admin" if scope == "global" else "group"
-    assert api.writes[-1][:2] == ("DELETE", f"/api/{owner}/plugins/{action_id}")
-    assert api.writes[-1][2] == ({"group_id": ["group-1"]} if scope == "group" else {})
-    assert api.agents == original_agents
-
-
-@pytest.mark.parametrize("mobile", [False, True])
-def test_admin_fetches_only_visible_group_and_uses_resource_apis(ui, mobile):
-    page, api = ui
-    page.set_viewport_size({"width": 390, "height": 844} if mobile else {"width": 1440, "height": 900})
-    mount(page, "admin")
-    if mobile:
-        expect(page.get_by_label("Settings category", exact=True)).to_be_visible()
-    else:
-        expect(page.get_by_role("button", name="Agents & Actions", exact=True)).to_be_visible()
-    assert not any(path in ("/api/admin/agents", "/api/admin/plugins", "/api/plugins/agent-targets") for path, _ in api.reads)
-    if mobile:
-        page.get_by_label("Settings category", exact=True).select_option("agents-actions")
-    else:
-        page.get_by_role("button", name="Agents & Actions", exact=True).click()
-    create_call(page, "Global delegate", "global remote · global · new_foundry")
-    page.get_by_role("button", name="Edit Call agent action Global delegate").click()
-    page.get_by_label("Action name", exact=True).fill("Global renamed")
-    page.get_by_role("button", name="Save Call agent action", exact=True).click()
-    expect(page.get_by_text("Global renamed", exact=True)).to_be_visible()
-    assert api.writes[-1][:2] == ("PUT", "/api/admin/plugins/Global-delegate")
-    assert api.writes[-1][3]["id"] == "new-action"
-    page.get_by_role("button", name="Attach Call agent actions to Local caller").click()
-    page.get_by_role("checkbox", name="Global renamed").check()
-    page.get_by_role("button", name="Save bindings", exact=True).click()
-    expect(page.get_by_role("status").filter(has_text="bindings saved")).to_be_visible()
-    assert api.writes[-1][:2] == ("PATCH", "/api/admin/agents/caller/agent-actions")
-    assert not any("/v2/admin/settings" in path for _, path, _, _ in api.writes)
-    assert page.evaluate("document.documentElement.scrollWidth <= window.innerWidth")
-
-
-def test_non_admin_does_not_fetch_global_resources(ui):
-    page, api = ui
-    mount(page, "admin", admin=False)
-    expect(page.get_by_text("Administrator access required")).to_be_visible()
-    assert not api.reads
diff --git a/ui_tests/test_v2_admin_global_agents_actions.py b/ui_tests/test_v2_admin_global_agents_actions.py
new file mode 100644
index 000000000..28682d0e6
--- /dev/null
+++ b/ui_tests/test_v2_admin_global_agents_actions.py
@@ -0,0 +1,470 @@
+# test_v2_admin_global_agents_actions.py
+"""
+Browser coverage for V2 Admin Settings categories and the global agents and actions.
+Version: 0.261.260
+Implemented in: 0.261.260
+
+Run against the real built SPA with the real Admin Settings field schema and a
+closed in-memory API (fixtures/v2_admin_global_editors.py). Check that choosing a
+settings category always opens it at its top; that the Global Agents and Global
+Actions sections list, enable, disable, delete and choose the default agent, and
+create and edit through the same editors workspaces use, on the admin-only routes;
+that a Call agent action is an ordinary global action whose targets are global
+agents and which a global agent attaches in its editor; that the template gallery
+starts and publishes a global agent; that a failed load can be retried and a stale
+save keeps the draft; that opening an editor asks before dropping unsaved
+settings; and that a non-administrator reaches none of it. This replaces the
+MemoryRouter harness coverage of the removed "Global agent delegation" card
+(formerly test_agent_delegation_v2.py).
+"""
+
+import re
+import sys
+from pathlib import Path
+from urllib.parse import urlsplit
+
+import pytest
+from playwright.sync_api import expect
+
+sys.path.insert(0, str(Path(__file__).resolve().parent / "fixtures"))
+
+from v2_admin_global_editors import (  # noqa: E402
+    ARCHIVE_AGENT_ID,
+    CREATED_ACTION_ID,
+    CREATED_AGENT_ID,
+    FORECAST_ACTION_ID,
+    GLOBAL_SECTIONS,
+    MODEL_LABEL,
+    ORIGIN,
+    POLICY_AGENT_ID,
+    RESEARCH_AGENT_ID,
+    STORED_KEY,
+    TICKET_ACTION_ID,
+    GlobalEditorsFixture,
+    connect_options,  # noqa: F401
+)
+
+
+pytestmark = pytest.mark.ui
+ARTIFACTS = "v2_admin_global_agents_actions"
+SCROLL_SECTIONS = {
+    "appearance": ("classification-banner-section", "ai-notice-section"),
+    **GLOBAL_SECTIONS,
+    "knowledge": ("web-search-section",),
+}
+
+
+@pytest.fixture
+def global_ui(page):
+    fixture = GlobalEditorsFixture(page)
+    yield fixture
+    fixture.assert_clean()
+
+
+def _scroll_area(page):
+    return page.get_by_test_id("admin-settings-scroll")
+
+
+def _scroll_to_end(page):
+    top = _scroll_area(page).evaluate(
+        "element => { element.scrollTop = element.scrollHeight; return element.scrollTop; }"
+    )
+    assert top > 0, "The category is too short to scroll, so the check would prove nothing."
+
+
+def _expect_at_top(page):
+    page.wait_for_function(
+        "() => document.querySelector('[data-testid=\"admin-settings-scroll\"]').scrollTop === 0"
+    )
+
+
+def _category(page, label):
+    return page.get_by_role("complementary", name="Settings categories").get_by_role(
+        "button", name=label, exact=True
+    )
+
+
+def _editor_section(page, label):
+    page.get_by_role("navigation", name="Editor sections", exact=True).get_by_role(
+        "button", name=label, exact=True
+    ).click()
+
+
+def _action_field(page, label):
+    return page.get_by_label(re.compile(rf"^{re.escape(label)}(?:\s*\*)?\s*$"))
+
+
+def _save(ui, button, method, path):
+    with ui.page.expect_response(
+        lambda response: response.request.method == method and urlsplit(response.url).path == path
+    ) as response:
+        ui.page.get_by_role("button", name=button, exact=True).click()
+    return response.value
+
+
+def _personal_requests(ui):
+    return [
+        (method, path) for method, path in ui.requests_seen
+        if path.startswith(("/api/user/agents", "/api/user/plugins", "/api/group"))
+    ]
+
+
+def test_choosing_a_category_starts_at_its_top(page):
+    """Leaving one category scrolled down must not open the next one part-way down."""
+    ui = GlobalEditorsFixture(page, sections=SCROLL_SECTIONS)
+    ui.settings["classification_banner_enabled"] = True
+    page.emulate_media(reduced_motion="reduce")
+    ui.open(width=1920, height=700, ready_region="Classification Banner")
+    index = page.get_by_role("navigation", name="On this page")
+
+    _category(page, "Agents & Actions").click()
+    expect(_category(page, "Agents & Actions")).to_have_attribute("aria-pressed", "true")
+    _scroll_to_end(page)
+    expect(index.get_by_role("link", name=re.compile("^Agent Runtime"))).not_to_have_attribute(
+        "aria-current", "location"
+    )
+
+    _category(page, "Knowledge").click()
+    _expect_at_top(page)
+    expect(page.get_by_role("region", name="Web Search", exact=True)).to_be_in_viewport()
+
+    # Back to a long category: it opens at its first section, which the index marks.
+    _category(page, "Agents & Actions").click()
+    _expect_at_top(page)
+    expect(page.get_by_role("region", name="Agent Runtime", exact=True)).to_be_in_viewport()
+    expect(index.get_by_role("link", name=re.compile("^Agent Runtime"))).to_have_attribute(
+        "aria-current", "location"
+    )
+
+    # Choosing the category already shown returns to its top as well.
+    _scroll_to_end(page)
+    _category(page, "Agents & Actions").click()
+    _expect_at_top(page)
+
+    _scroll_to_end(page)
+    _category(page, "All settings").click()
+    _expect_at_top(page)
+    expect(page.get_by_role("region", name="Classification Banner", exact=True)).to_be_in_viewport()
+    ui.assert_clean()
+
+
+def test_choosing_a_category_on_a_phone_starts_at_its_top(page):
+    ui = GlobalEditorsFixture(page, sections=SCROLL_SECTIONS)
+    ui.settings["classification_banner_enabled"] = True
+    ui.open(width=390, height=844, ready_region="Classification Banner")
+    categories = page.get_by_label("Settings category", exact=True)
+
+    categories.select_option("agents-actions")
+    _scroll_to_end(page)
+    categories.select_option("knowledge")
+    _expect_at_top(page)
+    expect(page.get_by_role("region", name="Web Search", exact=True)).to_be_in_viewport()
+
+    categories.select_option("agents-actions")
+    _expect_at_top(page)
+    _scroll_to_end(page)
+    categories.select_option("")
+    _expect_at_top(page)
+    ui.assert_clean()
+
+
+def test_global_agents_are_listed_and_managed_in_place(global_ui):
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Agents")
+    section = page.get_by_role("region", name="Global Agents", exact=True)
+    rows = section.get_by_test_id("global-agent-row")
+    expect(rows).to_have_count(3)
+    expect(rows.nth(0)).to_contain_text("Archive summarizer")
+    expect(rows.nth(2)).to_contain_text("Research assistant")
+    # The delegation card is gone: a Call agent action is an ordinary global action now.
+    expect(page.get_by_text("Global agent delegation")).to_have_count(0)
+    expect(page.get_by_role("button", name="New Call agent action")).to_have_count(0)
+    expect(section.get_by_role("button", name="Start from a template", exact=True)).to_be_visible()
+
+    research = rows.filter(has_text="Research assistant")
+    expect(research.get_by_text("Default agent", exact=True)).to_be_visible()
+    expect(research.get_by_text("Choose another default to delete", exact=True)).to_be_visible()
+    expect(page.get_by_role("button", name="Delete Research assistant", exact=True)).to_have_count(0)
+    archive = rows.filter(has_text="Archive summarizer")
+    expect(archive.get_by_text("Disabled", exact=True)).to_be_visible()
+    expect(page.get_by_role("button", name="Make Archive summarizer the default agent")).to_have_count(0)
+
+    page.get_by_role("button", name="Make Policy advisor the default agent", exact=True).click()
+    expect(rows.filter(has_text="Policy advisor").get_by_text("Default agent", exact=True)).to_be_visible()
+    expect(research.get_by_text("Default agent", exact=True)).to_have_count(0)
+    assert ui.writes_to("POST", "/api/admin/agents/selected_agent")[-1][2] == {"name": "policy-advisor"}
+
+    page.get_by_role("button", name="Delete Research assistant", exact=True).click()
+    assert not ui.writes_to("DELETE", f"/api/v2/admin/agents/{RESEARCH_AGENT_ID}")
+    page.get_by_role("button", name="Delete agent", exact=True).click()
+    expect(rows).to_have_count(2)
+    assert RESEARCH_AGENT_ID not in ui.agents
+    assert len(ui.writes_to("DELETE", f"/api/v2/admin/agents/{RESEARCH_AGENT_ID}")) == 1
+
+    page.get_by_role("button", name="Enable Archive summarizer", exact=True).click()
+    expect(archive.get_by_text("Disabled", exact=True)).to_have_count(0)
+    assert ui.writes_to("PATCH", "/api/admin/agents/archive-summarizer/enabled")[-1][2] == {"is_enabled": True}
+
+    # Disabling the default hands it to an enabled agent, as the classic route does.
+    page.get_by_role("button", name="Disable Policy advisor", exact=True).click()
+    expect(page.get_by_text(
+        "Policy advisor disabled. Archive summarizer is now the default agent.", exact=True,
+    )).to_be_visible()
+    expect(archive.get_by_text("Default agent", exact=True)).to_be_visible()
+    expect(rows.filter(has_text="Policy advisor").get_by_text("Disabled", exact=True)).to_be_visible()
+    assert ui.selected_agent_name == "archive-summarizer"
+    assert not _personal_requests(ui)
+    ui.capture("global-agents", ARTIFACTS)
+
+
+def test_global_actions_are_listed_and_managed_in_place(global_ui):
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Actions")
+    section = page.get_by_role("region", name="Global Actions", exact=True)
+    rows = section.get_by_test_id("global-action-row")
+    expect(rows).to_have_count(2)
+    forecast = rows.filter(has_text="Forecast lookup")
+    tickets = rows.filter(has_text="Ticket search")
+    expect(forecast.get_by_text("Disabled", exact=True)).to_be_visible()
+
+    page.get_by_role("button", name="Enable Forecast lookup", exact=True).click()
+    expect(forecast.get_by_text("Disabled", exact=True)).to_have_count(0)
+    assert ui.writes_to("PATCH", "/api/admin/plugins/forecast_lookup/enabled")[-1][2] == {"is_enabled": True}
+
+    page.get_by_role("button", name="Disable Ticket search", exact=True).click()
+    expect(tickets.get_by_text("Disabled", exact=True)).to_be_visible()
+    assert ui.writes_to("PATCH", "/api/admin/plugins/ticket_search/enabled")[-1][2] == {"is_enabled": False}
+
+    agents_before = {key: dict(value) for key, value in ui.agents.items()}
+    page.get_by_role("button", name="Delete Forecast lookup", exact=True).click()
+    page.get_by_role("button", name="Delete action", exact=True).click()
+    expect(rows).to_have_count(1)
+    assert FORECAST_ACTION_ID not in ui.actions
+    assert ui.agents == agents_before
+    assert not _personal_requests(ui)
+    ui.capture("global-actions", ARTIFACTS)
+
+
+def test_a_new_global_agent_is_created_in_the_shared_editor(global_ui):
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Agents")
+    page.get_by_role("region", name="Global Agents", exact=True).get_by_role(
+        "button", name="New agent", exact=True
+    ).click()
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/agents/new")
+    expect(page.get_by_text("Global agents", exact=True)).to_be_visible()
+
+    page.get_by_label("Display name", exact=True).fill("Benefits guide")
+    page.get_by_label("Description", exact=True).fill("Answers benefits questions for everyone.")
+    _editor_section(page, "Model & connection")
+    page.get_by_label("Model", exact=True).select_option(label=MODEL_LABEL)
+
+    _editor_section(page, "Actions")
+    expect(page.get_by_role("checkbox", name="Assign Ticket search", exact=True)).to_be_visible()
+    page.get_by_role("checkbox", name="Assign Ticket search", exact=True).check()
+
+    # A global agent answers everyone, so only public workspaces can ground it.
+    _editor_section(page, "Assigned knowledge")
+    restrict = page.get_by_role("checkbox", name=re.compile("^Restrict to assigned knowledge"))
+    restrict.focus()
+    page.keyboard.press("Space")
+    expect(restrict).to_be_checked()
+    expect(page.get_by_text(
+        "Only public workspaces can be assigned, because a global agent answers everyone.", exact=False,
+    )).to_be_visible()
+    page.get_by_role("checkbox", name=re.compile("^Published handbook")).check()
+
+    _editor_section(page, "Instructions")
+    page.get_by_role("textbox", name="Instructions", exact=True).fill("Answer from the approved benefits handbook.")
+    assert not ui.writes_to("POST", "/api/v2/admin/agents")
+    assert _save(ui, "Save agent", "POST", "/api/v2/admin/agents").status == 201
+
+    write = ui.writes_to("POST", "/api/v2/admin/agents")[-1][2]
+    assert write["clear_secret_paths"] == [] and write["removed_paths"] == []
+    assert "expected_revision" not in write
+    created = ui.agents[CREATED_AGENT_ID]
+    assert created["display_name"] == "Benefits guide"
+    assert re.fullmatch(r"[A-Za-z0-9_-]+", created["name"])
+    assert created["actions_to_load"] == [TICKET_ACTION_ID]
+    assert created["model_endpoint_id"] == "org-model-endpoint" and created["model_id"] == "org-model"
+    assert created["other_settings"]["assigned_knowledge"]["scopes"]["public_workspace_ids"] == ["public-handbook"]
+    assert created["is_global"] is True
+
+    # Saving returns to the list it started from, scrolled to and focused on it.
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/agents")
+    expect(page.get_by_role("heading", name="Global Agents", level=2)).to_be_focused()
+    expect(page.get_by_role("link", name="Benefits guide", exact=True)).to_be_visible()
+    assert not _personal_requests(ui)
+
+
+def test_a_template_starts_and_publishes_a_global_agent(global_ui):
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Agents")
+    page.get_by_role("button", name="Start from a template", exact=True).click()
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/agents/new?templates=1")
+    template = page.get_by_role("heading", name="Onboarding guide", exact=True)
+    expect(template).to_be_in_viewport()
+    page.get_by_role("button", name="Use template", exact=True).click()
+    expect(page.get_by_label("Display name", exact=True)).to_have_value("Onboarding guide")
+
+    # An administrator publishes straight to the approved gallery, as the organisation.
+    page.get_by_role("button", name="Publish as template", exact=True).click()
+    expect(page.get_by_text("Template published to the approved gallery.", exact=True)).to_be_visible()
+    published = ui.writes_to("POST", "/api/agent-templates")[-1][2]["template"]
+    assert published["source_scope"] == "global"
+    assert published["display_name"] == "Onboarding guide"
+
+    _editor_section(page, "Model & connection")
+    page.get_by_label("Model", exact=True).select_option(label=MODEL_LABEL)
+    assert _save(ui, "Save agent", "POST", "/api/v2/admin/agents").status == 201
+    created = ui.agents[CREATED_AGENT_ID]
+    assert created["display_name"] == "Onboarding guide"
+    assert created["instructions"] == "Help new colleagues find onboarding answers in the approved handbook."
+    assert created["tags"] == ["onboarding"]
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/agents")
+
+
+def test_a_call_agent_action_is_an_ordinary_global_action(global_ui):
+    """Create a Call agent action in Global Actions, then attach it in a global agent's editor."""
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Actions")
+    page.get_by_role("region", name="Global Actions", exact=True).get_by_role(
+        "button", name="New action", exact=True
+    ).click()
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/actions/new")
+    _action_field(page, "Action type").select_option("agent")
+    _action_field(page, "Action name").fill("Ask the policy advisor")
+    page.get_by_label("Description", exact=True).fill("Hand policy questions to the policy advisor.")
+    _editor_section(page, "Configuration")
+    page.get_by_label("Search target agents", exact=True).fill("Policy")
+    target = _action_field(page, "Target agent")
+    option = target.get_by_role("option").filter(has_text="Policy advisor")
+    expect(option).to_have_count(1)
+    expect(option).to_contain_text("global")
+    target.select_option(option.get_attribute("value"))
+    assert _save(ui, "Save action", "POST", "/api/v2/admin/actions").status == 201
+
+    targets_read = [query for method, path, query, _ in ui.global_requests if path == "/api/plugins/agent-targets"]
+    assert targets_read and all(query == {"scope": ["global"]} for query in targets_read)
+    created = ui.actions[CREATED_ACTION_ID]
+    assert created["type"] == "agent"
+    assert created["endpoint"] == "internal://agent"
+    assert created["auth"] == {"type": "user"}
+    assert created["additionalFields"]["target_agent"] == {
+        "id": POLICY_AGENT_ID, "scope_type": "global", "scope_id": "global",
+    }
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/actions")
+    expect(page.get_by_role("heading", name="Global Actions", level=2)).to_be_focused()
+    expect(page.get_by_role("link", name="Ask the policy advisor", exact=True)).to_be_visible()
+
+    # A global agent attaches it like any other action, through its own editor.
+    _category(page, "Agents & Actions").click()
+    page.get_by_role("link", name="Research assistant", exact=True).click()
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/agents/{RESEARCH_AGENT_ID}")
+    _editor_section(page, "Actions")
+    attach = page.get_by_role("checkbox", name="Assign Ask the policy advisor", exact=True)
+    attach.check()
+    revision = ui.revision(RESEARCH_AGENT_ID)
+    path = f"/api/v2/admin/agents/{RESEARCH_AGENT_ID}"
+    assert _save(ui, "Save agent", "PATCH", path).status == 200
+    write = ui.writes_to("PATCH", path)[-1][2]
+    assert write["expected_revision"] == revision
+    assert write["updates"] == {"actions_to_load": [CREATED_ACTION_ID]}
+    assert ui.agents[RESEARCH_AGENT_ID]["actions_to_load"] == [CREATED_ACTION_ID]
+    assert not _personal_requests(ui)
+
+
+def test_editing_a_global_action_keeps_its_stored_credential(global_ui):
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Actions")
+    page.get_by_role("link", name="Ticket search", exact=True).click()
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/actions/{TICKET_ACTION_ID}")
+    name = _action_field(page, "Action name")
+    expect(name).to_have_value("Ticket search")
+    expect(name).to_be_editable()
+    revision = ui.revision(TICKET_ACTION_ID)
+    name.fill("Service desk search")
+    path = f"/api/v2/admin/actions/{TICKET_ACTION_ID}"
+    assert _save(ui, "Save action", "PATCH", path).status == 200
+    assert ui.writes_to("PATCH", path)[-1][2] == {
+        "updates": {"displayName": "Service desk search"},
+        "expected_revision": revision,
+        "clear_secret_paths": [],
+        "removed_paths": [],
+    }
+    saved = ui.actions[TICKET_ACTION_ID]
+    assert saved["displayName"] == "Service desk search"
+    assert saved["auth"] == {"type": "key", "key": STORED_KEY}
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/actions")
+    expect(page.get_by_role("link", name="Service desk search", exact=True)).to_be_visible()
+
+
+def test_failures_are_shown_and_a_conflicting_draft_is_kept(global_ui):
+    """A failed list load can be retried, and a stale save keeps the draft instead of overwriting."""
+    ui, page = global_ui, global_ui.page
+    ui.fail_next("GET", "/api/v2/admin/actions", error="Global actions are unavailable right now.")
+    ui.open(ready_region="Global Actions")
+    section = page.get_by_role("region", name="Global Actions", exact=True)
+    expect(section.get_by_role("alert")).to_have_text("Global actions are unavailable right now.")
+    expect(section.get_by_test_id("global-action-row")).to_have_count(0)
+    section.get_by_role("button", name="Refresh", exact=True).click()
+    expect(section.get_by_role("alert")).to_have_count(0)
+    expect(section.get_by_test_id("global-action-row")).to_have_count(2)
+
+    page.get_by_role("link", name="Policy advisor", exact=True).click()
+    description = page.get_by_label("Description", exact=True)
+    expect(description).to_have_value("Policy advisor for everyone in the organisation.")
+    # Another administrator saves first.
+    ui.agents[POLICY_AGENT_ID]["description"] = "Changed by another administrator."
+    ui.revisions[POLICY_AGENT_ID] += 1
+    description.fill("My edit to the policy advisor.")
+    path = f"/api/v2/admin/agents/{POLICY_AGENT_ID}"
+    assert _save(ui, "Save agent", "PATCH", path).status == 409
+    expect(page.get_by_text("This agent changed in another session.", exact=False)).to_be_visible()
+    expect(page.get_by_role("link", name="Open latest in a new tab", exact=True)).to_be_visible()
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/agents/{POLICY_AGENT_ID}")
+    expect(description).to_have_value("My edit to the policy advisor.")
+    assert ui.agents[POLICY_AGENT_ID]["description"] == "Changed by another administrator."
+
+
+def test_unsaved_settings_are_kept_unless_discarded_before_opening_an_editor(global_ui):
+    """Opening a global editor replaces the page, so it asks before dropping unsaved settings."""
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Agents")
+    page.get_by_text("Allow Group Agents", exact=True).click()
+    expect(page.get_by_text("1 unsaved change", exact=True)).to_be_visible()
+    dialog = page.get_by_role("dialog", name="Discard unsaved changes?", exact=True)
+
+    page.get_by_role("region", name="Global Agents", exact=True).get_by_role(
+        "button", name="New agent", exact=True
+    ).click()
+    expect(dialog).to_be_visible()
+    dialog.get_by_role("button", name="Keep editing", exact=True).click()
+    expect(dialog).to_have_count(0)
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin")
+    expect(page.get_by_text("1 unsaved change", exact=True)).to_be_visible()
+
+    # The approvals queue opens in a new tab, so it never takes the draft with it.
+    approvals = page.get_by_role("link", name=re.compile("^Open the approvals queue"))
+    expect(approvals).to_have_attribute("target", "_blank")
+    expect(approvals).to_have_attribute("rel", "noopener noreferrer")
+
+    # An editor link asks as well, and discarding leaves without saving anything.
+    page.get_by_role("link", name="Policy advisor", exact=True).click()
+    expect(dialog).to_be_visible()
+    dialog.get_by_role("button", name="Discard changes", exact=True).click()
+    expect(page).to_have_url(f"{ORIGIN}/v2/admin/agents/{POLICY_AGENT_ID}")
+    expect(page.get_by_label("Display name", exact=True)).to_have_value("Policy advisor")
+    assert not ui.patches
+
+
+@pytest.mark.parametrize("path", ["/admin", "/admin/agents/new", f"/admin/actions/{TICKET_ACTION_ID}"])
+def test_a_non_administrator_reaches_no_global_agent_or_action(page, path):
+    ui = GlobalEditorsFixture(page, admin=False)
+    page.set_viewport_size({"width": 1440, "height": 900})
+    page.goto(f"{ORIGIN}/v2{path}", wait_until="networkidle")
+    expect(page.get_by_text("Administrator access required", exact=True)).to_be_visible()
+    expect(page.get_by_role("textbox", name="Display name")).to_have_count(0)
+    assert not ui.admin_reads(), ui.admin_reads()
+    assert ARCHIVE_AGENT_ID in ui.agents and not ui.global_writes
+    ui.assert_clean()
diff --git a/ui_tests/test_v2_workspace_authoring.py b/ui_tests/test_v2_workspace_authoring.py
index 4f23fad02..cb670b1a6 100644
--- a/ui_tests/test_v2_workspace_authoring.py
+++ b/ui_tests/test_v2_workspace_authoring.py
@@ -12,8 +12,9 @@
 unexpected requests fail the test.
 
 Personal delegation regressions formerly in test_agent_delegation_v2.py are
-covered here through the unified collection and full-page editors. The original
-group/admin wrapper coverage remains in that suite.
+covered here through the unified collection and full-page editors. Group wrapper
+coverage is in test_v2_group_workspace_shell.py, and global Call agent actions are
+ordinary global actions covered by test_v2_admin_global_agents_actions.py.
 """
 
 import copy

From 210d67d8eeb3dcfb31ea58b469e00c5afc20de13 Mon Sep 17 00:00:00 2001
From: Paul Lizer <paullizer@microsoft.com>
Date: Tue, 6 Oct 2026 16:38:32 -0400
Subject: [PATCH 2/5] Add release notes for V2 admin global agents and actions

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 docs/explanation/release_notes.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/explanation/release_notes.md b/docs/explanation/release_notes.md
index ebc32df8c..d2a6155c6 100644
--- a/docs/explanation/release_notes.md
+++ b/docs/explanation/release_notes.md
@@ -2,6 +2,28 @@
 
 For feature-focused and fix-focused drill-downs by version, see [Features by Version](https://github.com/microsoft/simplechat/tree/main/docs/explanation/features) and [Fixes by Version](https://github.com/microsoft/simplechat/tree/main/docs/explanation/fixes).
 
+### **(v0.261.260)**
+
+#### New Features
+
+*   **Global Agents and Global Actions in V2 Admin Settings**
+    *   Admin Settings › Agents & Actions now lists the organisation's global agents and actions. From the lists you can create, edit, enable, disable and delete them, and choose the default agent. Each change saves on its own rather than through the settings save bar, and Admin Settings asks before opening an editor would drop settings you have not saved.
+    *   Agents and actions open in the same full-page editors My Workspace uses. A global agent's assigned knowledge is limited to public workspaces, its actions are the global actions, and **New action** creates one and attaches it to the agent you came from. Action connection tests and MCP tool discovery run in the global scope.
+    *   **Start from a template** opens a new agent with the approved gallery in view, and **Publish as template** adds a global agent's recipe to the gallery straight away. Agent Template Approvals now links to the approvals queue.
+    *   The separate **Global agent delegation** card is gone. A Call agent action is now an ordinary global action: create it under Global Actions with the **Call agent** type, which lists only global agents as targets, then attach it in a global agent's editor.
+    *   Thirteen admin-only routes under `/api/v2/admin/agents` and `/api/v2/admin/actions` serve the editors through the shared authoring engine, with masked credentials, global Key Vault names, case-insensitive name checks, and revision checks that refuse to overwrite another administrator's save. The classic page can still edit and delete agents and actions saved in V2.
+    *   (Ref: `route_backend_v2_admin_agents_actions.py`, `functions_global_editor_access.py`, `functions_workspace_authoring.py`, `functions_global_agents.py`, `GlobalAgentsManager.tsx`, `GlobalActionsManager.tsx`, `AdminGlobalEditorPages.tsx`, `agentWorkbench.ts`, `actionWorkbench.ts`, `test_v2_admin_global_agents_actions.py`, [V2 Admin Global Agents and Actions](features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md))
+
+#### Bug Fixes
+
+*   **Choosing a Settings Category Starts at Its Top**
+    *   Choosing a category in the V2 Admin Settings rail, or in the category list on a phone, kept the scroll position of the category you left, so leaving Knowledge near its end opened Security near its end. A category now always opens at its first section, including when you choose the one already shown, and the **On this page** list marks that section.
+    *   (Ref: `AdminSettingsPage.tsx` `selectCategory`, `test_v2_admin_global_agents_actions.py`, [V2 Admin Category Scroll Reset Fix](fixes/V2_ADMIN_CATEGORY_SCROLL_RESET_FIX.md))
+
+*   **Call Agent Targets Come From the Action's Workspace**
+    *   The V2 Call agent target picker always listed the signed-in person's personal targets. It now asks for the targets of the workspace the action belongs to: global agents for a global action, and for a group action the group's agents plus any permitted global ones, which matches what the server accepts when the action is saved.
+    *   (Ref: `CallAgentActionConfiguration.tsx`, `/api/plugins/agent-targets`)
+
 ### **(v0.261.259)**
 
 #### Bug Fixes

From d1ad53899beeef0cfaf4c3291ca69311d515cbe6 Mon Sep 17 00:00:00 2001
From: Paul Lizer <paullizer@microsoft.com>
Date: Tue, 6 Oct 2026 19:34:17 -0400
Subject: [PATCH 3/5] Align the agent and action editors with the Admin
 Settings design

The full-page agent and action editors, shared by My Workspace, group
workspaces and Admin Settings, now use the Admin Settings card system.

- EditorLayout primitives: setting rows with the label and help beside the
  control on a wide row, fieldsets, switch rows with a lead switch and
  indented dependents, collapsible groups, titled panels and fieldset panels.
- WorkspaceEditorFrame: section rail with icons that marks the section in
  view, section cards with an icon, title and description, a save status
  chip, and a pinned jump (initialSection) that keeps the chosen section in
  place while lists above it load; ?templates=1 now uses it.
- Every agent and action section, including the MCP, OpenAPI and Call agent
  connectors, converted to rows, switches, groups and panels with the same
  accessible names.
- Global Agents and Global Actions lists use the AI Connections row pattern
  with Enabled/Disabled and Default agent badges and icon actions.
- Editor rows measure their own width instead of being CSS size containers:
  in Chromium 145 a size container could keep a stale, collapsed layout when
  React added a section after it, hiding the Action type row once a new
  action's type was chosen. A UI test now guards this.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../src/components/admin/AdminListPill.tsx    |  22 ++
 .../components/admin/GlobalActionsManager.tsx |  79 +++--
 .../components/admin/GlobalAgentsManager.tsx  | 110 ++++---
 .../src/components/workspace/EditorLayout.tsx | 285 ++++++++++++++++++
 .../workspace/WorkspaceEditorFrame.tsx        | 255 ++++++++++++----
 .../workspaceActions/ActionAdvancedFields.tsx |  47 ++-
 .../workspaceActions/ActionAuthentication.tsx |  20 +-
 .../ActionConfigurationFields.tsx             |  53 ++--
 .../workspaceActions/ActionFields.tsx         |  18 +-
 .../workspaceActions/ActionSchemaFields.tsx   |  57 ++--
 .../CallAgentActionConfiguration.tsx          |   8 +-
 .../McpActionConfiguration.tsx                | 113 +++----
 .../OpenApiActionConfiguration.tsx            |  69 ++---
 .../workspaceAgents/AgentActionPicker.tsx     |  81 ++---
 .../workspaceAgents/AgentAdvancedFields.tsx   |  14 +-
 .../workspaceAgents/AgentFields.tsx           |  29 +-
 .../workspaceAgents/AgentIdentityFields.tsx   |  68 ++---
 .../AgentInstructionsFields.tsx               |  12 +-
 .../workspaceAgents/AgentKnowledgeFields.tsx  |  59 ++--
 .../workspaceAgents/AgentModelFields.tsx      |  48 +--
 .../workspaceAgents/AgentTemplatesPanel.tsx   |  48 +--
 .../src/pages/AdminGlobalEditorPages.tsx      |   2 +-
 .../src/pages/workspace/ActionEditorPage.tsx  |  22 +-
 .../src/pages/workspace/AgentEditorPage.tsx   |  35 +--
 application/v2_ui/src/styles/theme.css        |  88 ++++++
 docs/admin/agents-actions.md                  |  32 +-
 .../V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md         |  42 +++
 docs/explanation/release_notes.md             |   8 +
 .../test_v2_admin_global_agents_actions.py    |   3 +
 29 files changed, 1143 insertions(+), 584 deletions(-)
 create mode 100644 application/v2_ui/src/components/admin/AdminListPill.tsx
 create mode 100644 application/v2_ui/src/components/workspace/EditorLayout.tsx

diff --git a/application/v2_ui/src/components/admin/AdminListPill.tsx b/application/v2_ui/src/components/admin/AdminListPill.tsx
new file mode 100644
index 000000000..b0239a6c2
--- /dev/null
+++ b/application/v2_ui/src/components/admin/AdminListPill.tsx
@@ -0,0 +1,22 @@
+// AdminListPill.tsx
+// The small status pill an Admin Settings list shows beside a record's name, drawn the way
+// the AI Connections list draws "Enabled" and "Disabled".
+
+import type { ReactNode } from 'react';
+import { clsx } from 'clsx';
+
+export function AdminListPill({ tone, children }: { tone: 'ok' | 'muted' | 'warn' | 'accent'; children: ReactNode }) {
+    return (
+        <span
+            className={clsx(
+                'rounded-full px-1.5 py-0.5 text-[10px] font-semibold tracking-wide whitespace-nowrap uppercase',
+                tone === 'ok' && 'bg-ok-soft text-ok',
+                tone === 'warn' && 'bg-warn-soft text-warn',
+                tone === 'muted' && 'bg-surface-2 text-text-3',
+                tone === 'accent' && 'bg-accent-soft text-accent',
+            )}
+        >
+            {children}
+        </span>
+    );
+}
diff --git a/application/v2_ui/src/components/admin/GlobalActionsManager.tsx b/application/v2_ui/src/components/admin/GlobalActionsManager.tsx
index 7c15e6c1e..69462542e 100644
--- a/application/v2_ui/src/components/admin/GlobalActionsManager.tsx
+++ b/application/v2_ui/src/components/admin/GlobalActionsManager.tsx
@@ -9,17 +9,18 @@
 
 import { useEffect, useMemo, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
-import { AlertCircle, Loader2, Plug, Plus, RefreshCw, Trash2 } from 'lucide-react';
+import { AlertCircle, Loader2, Pencil, Plug, Plus, Power, RefreshCw, Trash2 } from 'lucide-react';
 import { api } from '../../lib/apiClient';
 import { fetchGlobalActions, GLOBAL_ACTION_WORKBENCH } from '../../lib/actionWorkbench';
 import { actionTypeLabel } from '../../lib/workspaceActionLogic';
 import { GLOBAL_ACTIONS_BASE_PATH, type ActionConfiguration } from '../../lib/workspaceAuthoring';
 import { toast } from '../../stores/toastStore';
 import { GlassButton } from '../ui/primitives';
-import { ConfirmAction, Pill, SectionSearch } from '../workspace/primitives';
+import { ConfirmAction, RowAction, SectionSearch } from '../workspace/primitives';
+import { AdminListPill } from './AdminListPill';
 
-/** Search appears once a list is long enough to need it. */
-const SEARCH_THRESHOLD = 6;
+/** Search appears once a list is long enough to need it, as it does for AI Connections. */
+const SEARCH_THRESHOLD = 4;
 
 function actionLabel(action: ActionConfiguration): string {
     return action.displayName || action.name || 'Untitled action';
@@ -89,16 +90,17 @@ export function GlobalActionsManager({ help }: { help?: string }) {
 
     return (
         <div className="min-w-0 space-y-3 py-3" data-testid="global-actions-manager">
-            {help ? <p className="text-xs leading-relaxed text-text-3">{help}</p> : null}
-
-            <div className="flex flex-wrap items-center gap-2">
-                <GlassButton type="button" variant="primary" size="sm"
-                    onClick={() => navigate(`${GLOBAL_ACTIONS_BASE_PATH}/new`)}>
-                    <Plus size={14} aria-hidden="true" />New action
-                </GlassButton>
-                <GlassButton type="button" size="sm" disabled={loading} onClick={reload}>
-                    <RefreshCw size={14} aria-hidden="true" />Refresh
-                </GlassButton>
+            <div className="flex flex-wrap items-start justify-between gap-3">
+                {help ? <p className="min-w-0 flex-[1_1_18rem] text-xs leading-relaxed text-text-3">{help}</p> : null}
+                <div className="flex flex-wrap items-center gap-2">
+                    <GlassButton type="button" variant="ghost" size="sm" disabled={loading} onClick={reload}>
+                        <RefreshCw size={14} aria-hidden="true" />Refresh
+                    </GlassButton>
+                    <GlassButton type="button" variant="subtle" size="sm"
+                        onClick={() => navigate(`${GLOBAL_ACTIONS_BASE_PATH}/new`)}>
+                        <Plus size={14} aria-hidden="true" />New action
+                    </GlassButton>
+                </div>
             </div>
 
             {(actions?.length ?? 0) >= SEARCH_THRESHOLD ? (
@@ -113,20 +115,20 @@ export function GlobalActionsManager({ help }: { help?: string }) {
             ) : null}
 
             {loading && actions === null ? (
-                <p role="status" className="flex items-center gap-2 py-4 text-sm text-text-3">
-                    <Loader2 size={15} className="animate-spin" aria-hidden="true" />
+                <p role="status" className="flex items-center gap-2 py-4 text-xs text-text-3">
+                    <Loader2 size={14} className="animate-spin" aria-hidden="true" />
                     Loading global actions…
                 </p>
             ) : null}
 
             {actions !== null && actions.length === 0 ? (
-                <p className="py-4 text-sm text-text-3">
+                <p className="rounded-lg border border-edge bg-surface-1 p-4 text-xs text-text-3">
                     No global actions yet. Create one to connect global agents to an API, a database, an
                     MCP server or another agent.
                 </p>
             ) : null}
             {actions !== null && actions.length > 0 && visible.length === 0 ? (
-                <p role="status" className="py-2 text-sm text-text-3">No global actions match “{query}”.</p>
+                <p role="status" className="rounded-lg border border-edge bg-surface-1 p-4 text-xs text-text-3">No global actions match “{query}”.</p>
             ) : null}
 
             {visible.length ? (
@@ -137,33 +139,28 @@ export function GlobalActionsManager({ help }: { help?: string }) {
                         const editorPath = `${GLOBAL_ACTIONS_BASE_PATH}/${encodeURIComponent(action.id)}`;
                         return (
                             <li key={action.id} data-testid="global-action-row"
-                                className="flex flex-wrap items-start gap-3 rounded-xl border border-edge bg-surface-1 p-3">
-                                <div className="flex min-w-0 flex-[1_1_16rem] items-start gap-3">
-                                    <Plug size={20} aria-hidden="true" className="mt-0.5 shrink-0 text-accent" />
-                                    <div className="min-w-0 flex-1">
-                                        <h3 className="break-words text-sm font-semibold text-text-1">
+                                className="flex items-start gap-3 rounded-lg border border-edge bg-surface-1 p-3">
+                                <span className="mt-0.5 shrink-0 text-text-3">
+                                    <Plug size={17} aria-hidden="true" />
+                                </span>
+                                <div className="min-w-0 flex-1">
+                                    <div className="flex flex-wrap items-center gap-2">
+                                        <h3 className="min-w-0 break-words text-sm font-medium text-text-1">
                                             <Link to={editorPath} className="hover:text-accent hover:underline">{label}</Link>
                                         </h3>
-                                        {action.description ? (
-                                            <p className="mt-0.5 break-words text-xs text-text-3">{action.description}</p>
-                                        ) : null}
-                                        <div className="mt-2 flex flex-wrap items-center gap-1.5">
-                                            <Pill>{actionTypeLabel(action.type)}</Pill>
-                                            {!enabled ? <Pill tone="warn">Disabled</Pill> : null}
-                                        </div>
-                                        <p className="mt-1.5 break-all text-[11px] text-text-3">{action.name}</p>
+                                        <AdminListPill tone={enabled ? 'ok' : 'muted'}>{enabled ? 'Enabled' : 'Disabled'}</AdminListPill>
                                     </div>
+                                    <p className="mt-0.5 break-words text-xs text-text-3">{actionTypeLabel(action.type)}</p>
+                                    {action.description ? (
+                                        <p className="mt-1 break-words text-xs text-text-3">{action.description}</p>
+                                    ) : null}
+                                    <p className="truncate font-mono text-[11px] text-text-3">{action.name}</p>
                                 </div>
-                                <div className="flex flex-wrap items-center gap-1.5">
-                                    <GlassButton type="button" size="sm" variant="subtle" onClick={() => navigate(editorPath)}>
-                                        Edit
-                                    </GlassButton>
-                                    <GlassButton type="button" size="sm" disabled={busy !== null}
-                                        aria-label={`${enabled ? 'Disable' : 'Enable'} ${label}`}
-                                        onClick={() => void toggleEnabled(action)}>
-                                        {busy === `enabled:${action.id}` ? <Loader2 size={14} className="animate-spin" aria-hidden="true" /> : null}
-                                        {enabled ? 'Disable' : 'Enable'}
-                                    </GlassButton>
+                                <div className="flex shrink-0 items-center gap-1">
+                                    <RowAction icon={<Power size={15} />} label={`${enabled ? 'Disable' : 'Enable'} ${label}`}
+                                        busy={busy === `enabled:${action.id}`} disabled={busy !== null}
+                                        onClick={() => void toggleEnabled(action)} />
+                                    <RowAction icon={<Pencil size={15} />} label={`Edit ${label}`} onClick={() => navigate(editorPath)} />
                                     <ConfirmAction icon={<Trash2 size={15} />} label={`Delete ${label}`} confirmLabel="Delete action"
                                         busy={busy === `delete:${action.id}`} disabled={busy !== null}
                                         onConfirm={() => void remove(action)} />
diff --git a/application/v2_ui/src/components/admin/GlobalAgentsManager.tsx b/application/v2_ui/src/components/admin/GlobalAgentsManager.tsx
index 43340eb7b..659a35ff1 100644
--- a/application/v2_ui/src/components/admin/GlobalAgentsManager.tsx
+++ b/application/v2_ui/src/components/admin/GlobalAgentsManager.tsx
@@ -9,18 +9,19 @@
 
 import { useEffect, useMemo, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
-import { AlertCircle, Loader2, Plus, RefreshCw, Sparkles, Trash2 } from 'lucide-react';
+import { AlertCircle, Loader2, Pencil, Plus, Power, RefreshCw, Sparkles, Star, Trash2 } from 'lucide-react';
 import { api } from '../../lib/apiClient';
 import { fetchGlobalAgentCatalog, GLOBAL_AGENT_WORKBENCH } from '../../lib/agentWorkbench';
 import { AGENT_TYPE_LABELS } from '../../lib/workspaceAgentAuthoring';
 import { GLOBAL_AGENTS_BASE_PATH, type AgentConfiguration } from '../../lib/workspaceAuthoring';
 import { toast } from '../../stores/toastStore';
 import { GlassButton } from '../ui/primitives';
-import { ConfirmAction, Pill, SectionSearch } from '../workspace/primitives';
+import { ConfirmAction, RowAction, SectionSearch } from '../workspace/primitives';
 import { AgentIcon } from '../workspaceAgents/AgentIdentityFields';
+import { AdminListPill } from './AdminListPill';
 
-/** Search appears once a list is long enough to need it. */
-const SEARCH_THRESHOLD = 6;
+/** Search appears once a list is long enough to need it, as it does for AI Connections. */
+const SEARCH_THRESHOLD = 4;
 
 interface EnabledResponse {
     success?: boolean;
@@ -116,22 +117,23 @@ export function GlobalAgentsManager({ help, templatesEnabled }: { help?: string;
 
     return (
         <div className="min-w-0 space-y-3 py-3" data-testid="global-agents-manager">
-            {help ? <p className="text-xs leading-relaxed text-text-3">{help}</p> : null}
-
-            <div className="flex flex-wrap items-center gap-2">
-                <GlassButton type="button" variant="primary" size="sm"
-                    onClick={() => navigate(`${GLOBAL_AGENTS_BASE_PATH}/new`)}>
-                    <Plus size={14} aria-hidden="true" />New agent
-                </GlassButton>
-                {templatesEnabled ? (
+            <div className="flex flex-wrap items-start justify-between gap-3">
+                {help ? <p className="min-w-0 flex-[1_1_18rem] text-xs leading-relaxed text-text-3">{help}</p> : null}
+                <div className="flex flex-wrap items-center gap-2">
+                    <GlassButton type="button" variant="ghost" size="sm" disabled={loading} onClick={reload}>
+                        <RefreshCw size={14} aria-hidden="true" />Refresh
+                    </GlassButton>
+                    {templatesEnabled ? (
+                        <GlassButton type="button" variant="ghost" size="sm"
+                            onClick={() => navigate(`${GLOBAL_AGENTS_BASE_PATH}/new?templates=1`)}>
+                            <Sparkles size={14} aria-hidden="true" />Start from a template
+                        </GlassButton>
+                    ) : null}
                     <GlassButton type="button" variant="subtle" size="sm"
-                        onClick={() => navigate(`${GLOBAL_AGENTS_BASE_PATH}/new?templates=1`)}>
-                        <Sparkles size={14} aria-hidden="true" />Start from a template
+                        onClick={() => navigate(`${GLOBAL_AGENTS_BASE_PATH}/new`)}>
+                        <Plus size={14} aria-hidden="true" />New agent
                     </GlassButton>
-                ) : null}
-                <GlassButton type="button" size="sm" disabled={loading} onClick={reload}>
-                    <RefreshCw size={14} aria-hidden="true" />Refresh
-                </GlassButton>
+                </div>
             </div>
 
             {(agents?.length ?? 0) >= SEARCH_THRESHOLD ? (
@@ -146,20 +148,20 @@ export function GlobalAgentsManager({ help, templatesEnabled }: { help?: string;
             ) : null}
 
             {loading && agents === null ? (
-                <p role="status" className="flex items-center gap-2 py-4 text-sm text-text-3">
-                    <Loader2 size={15} className="animate-spin" aria-hidden="true" />
+                <p role="status" className="flex items-center gap-2 py-4 text-xs text-text-3">
+                    <Loader2 size={14} className="animate-spin" aria-hidden="true" />
                     Loading global agents…
                 </p>
             ) : null}
 
             {agents !== null && agents.length === 0 ? (
-                <p className="py-4 text-sm text-text-3">
+                <p className="rounded-lg border border-edge bg-surface-1 p-4 text-xs text-text-3">
                     No global agents yet. Create one, or start from an approved template, and it becomes
                     available as soon as it is saved.
                 </p>
             ) : null}
             {agents !== null && agents.length > 0 && visible.length === 0 ? (
-                <p role="status" className="py-2 text-sm text-text-3">No global agents match “{query}”.</p>
+                <p role="status" className="rounded-lg border border-edge bg-surface-1 p-4 text-xs text-text-3">No global agents match “{query}”.</p>
             ) : null}
 
             {visible.length ? (
@@ -169,52 +171,46 @@ export function GlobalAgentsManager({ help, templatesEnabled }: { help?: string;
                         const enabled = agent.is_enabled !== false;
                         const isDefault = Boolean(defaultName) && agent.name === defaultName;
                         const editorPath = `${GLOBAL_AGENTS_BASE_PATH}/${encodeURIComponent(agent.id)}`;
+                        const actionCount = agent.actions_to_load?.length ?? 0;
                         return (
                             <li key={agent.id} data-testid="global-agent-row"
-                                className="flex flex-wrap items-start gap-3 rounded-xl border border-edge bg-surface-1 p-3">
-                                <div className="flex min-w-0 flex-[1_1_16rem] items-start gap-3">
-                                    <AgentIcon icon={agent.icon} />
-                                    <div className="min-w-0 flex-1">
-                                        <h3 className="break-words text-sm font-semibold text-text-1">
+                                className="flex items-start gap-3 rounded-lg border border-edge bg-surface-1 p-3">
+                                <AgentIcon icon={agent.icon} />
+                                <div className="min-w-0 flex-1">
+                                    <div className="flex flex-wrap items-center gap-2">
+                                        <h3 className="min-w-0 break-words text-sm font-medium text-text-1">
                                             <Link to={editorPath} className="hover:text-accent hover:underline">{label}</Link>
                                         </h3>
-                                        {agent.description ? (
-                                            <p className="mt-0.5 break-words text-xs text-text-3">{agent.description}</p>
-                                        ) : null}
-                                        <div className="mt-2 flex flex-wrap items-center gap-1.5">
-                                            <Pill>{AGENT_TYPE_LABELS[agent.agent_type] ?? agent.agent_type}</Pill>
-                                            {isDefault ? <Pill tone="accent">Default agent</Pill> : null}
-                                            {!enabled ? <Pill tone="warn">Disabled</Pill> : null}
-                                        </div>
-                                        <p className="mt-1.5 break-words text-[11px] text-text-3">
-                                            {modelSummary(agent)}{' · '}{agent.actions_to_load?.length ?? 0} actions{' · '}{agent.name}
-                                        </p>
+                                        <AdminListPill tone={enabled ? 'ok' : 'muted'}>{enabled ? 'Enabled' : 'Disabled'}</AdminListPill>
+                                        {isDefault ? <AdminListPill tone="accent">Default agent</AdminListPill> : null}
                                     </div>
+                                    <p className="mt-0.5 break-words text-xs text-text-3">
+                                        {AGENT_TYPE_LABELS[agent.agent_type] ?? agent.agent_type}{' · '}{modelSummary(agent)}
+                                        {' · '}{actionCount} action{actionCount === 1 ? '' : 's'}
+                                    </p>
+                                    {agent.description ? (
+                                        <p className="mt-1 break-words text-xs text-text-3">{agent.description}</p>
+                                    ) : null}
+                                    <p className="truncate font-mono text-[11px] text-text-3">{agent.name}</p>
+                                    {isDefault ? (
+                                        <p className="mt-1 text-[11px] text-text-3">Choose another default to delete</p>
+                                    ) : null}
                                 </div>
-                                <div className="flex flex-wrap items-center gap-1.5">
-                                    <GlassButton type="button" size="sm" variant="subtle" onClick={() => navigate(editorPath)}>
-                                        Edit
-                                    </GlassButton>
+                                <div className="flex shrink-0 items-center gap-1">
                                     {enabled && !isDefault ? (
-                                        <GlassButton type="button" size="sm" disabled={busy !== null}
-                                            aria-label={`Make ${label} the default agent`}
-                                            onClick={() => void makeDefault(agent)}>
-                                            Make default
-                                        </GlassButton>
+                                        <RowAction icon={<Star size={15} />} label={`Make ${label} the default agent`}
+                                            busy={busy === `default:${agent.id}`} disabled={busy !== null}
+                                            onClick={() => void makeDefault(agent)} />
                                     ) : null}
-                                    <GlassButton type="button" size="sm" disabled={busy !== null}
-                                        aria-label={`${enabled ? 'Disable' : 'Enable'} ${label}`}
-                                        onClick={() => void toggleEnabled(agent)}>
-                                        {busy === `enabled:${agent.id}` ? <Loader2 size={14} className="animate-spin" aria-hidden="true" /> : null}
-                                        {enabled ? 'Disable' : 'Enable'}
-                                    </GlassButton>
-                                    {isDefault ? (
-                                        <span className="px-1 text-[11px] text-text-3">Choose another default to delete</span>
-                                    ) : (
+                                    <RowAction icon={<Power size={15} />} label={`${enabled ? 'Disable' : 'Enable'} ${label}`}
+                                        busy={busy === `enabled:${agent.id}`} disabled={busy !== null}
+                                        onClick={() => void toggleEnabled(agent)} />
+                                    <RowAction icon={<Pencil size={15} />} label={`Edit ${label}`} onClick={() => navigate(editorPath)} />
+                                    {!isDefault ? (
                                         <ConfirmAction icon={<Trash2 size={15} />} label={`Delete ${label}`} confirmLabel="Delete agent"
                                             busy={busy === `delete:${agent.id}`} disabled={busy !== null}
                                             onConfirm={() => void remove(agent)} />
-                                    )}
+                                    ) : null}
                                 </div>
                             </li>
                         );
diff --git a/application/v2_ui/src/components/workspace/EditorLayout.tsx b/application/v2_ui/src/components/workspace/EditorLayout.tsx
new file mode 100644
index 000000000..aef84fa15
--- /dev/null
+++ b/application/v2_ui/src/components/workspace/EditorLayout.tsx
@@ -0,0 +1,285 @@
+// EditorLayout.tsx
+// The building blocks every agent and action editor is drawn with, so an editor reads the
+// way an Admin Settings card does.
+//
+// The same editors open from My Workspace, from a group workspace, and from Admin Settings
+// for the organisation's global agents and actions. Each piece here reuses the Admin
+// Settings row (`.admin-field` in theme.css): the label and its help sit in a left column
+// with the control on the right once there is room, and stack otherwise.
+//
+// One difference from an Admin Settings card: an editor nests fields inside panels, groups
+// and fieldsets, so a row cannot judge its layout by the card's width. Every row measures
+// its own width and takes the two-column layout once it is wide enough (`data-wide`).
+// Rows are not CSS size containers: in Chromium a size container can be left with a
+// stale, collapsed layout when React adds an editor section after it.
+
+import { useId, useLayoutEffect, useRef, type ComponentProps, type ReactNode } from 'react';
+import { clsx } from 'clsx';
+import { ChevronRight } from 'lucide-react';
+import { Toggle } from '../ui/primitives';
+
+/** How much of the control column a control may take on a wide row; see `.admin-field`. */
+export type EditorFieldWidth = 'compact' | 'standard' | 'wide' | 'full';
+
+const HELP_CLASS = 'admin-field-help break-words text-[0.8125rem] leading-relaxed text-text-3';
+
+/** The row width, in rem, at which Admin Settings puts the label beside the control. */
+const WIDE_ROW_REM = 50;
+
+let rowObserver: ResizeObserver | null = null;
+
+function markRowWidth(row: Element, width: number) {
+    const rem = parseFloat(getComputedStyle(document.documentElement).fontSize) || 16;
+    row.toggleAttribute('data-wide', width >= WIDE_ROW_REM * rem);
+}
+
+/**
+ * Keeps a row's `data-wide` in step with its width. One observer serves every row, and
+ * its callbacks run before paint, so a row never shows the wrong layout; the first
+ * measurement happens before the row is first painted.
+ */
+function useRowWidth<T extends HTMLElement>() {
+    const row = useRef<T>(null);
+    useLayoutEffect(() => {
+        const element = row.current;
+        if (!element || typeof ResizeObserver === 'undefined') return undefined;
+        rowObserver ??= new ResizeObserver((entries) => {
+            for (const entry of entries) markRowWidth(entry.target, entry.contentRect.width);
+        });
+        markRowWidth(element, element.getBoundingClientRect().width);
+        rowObserver.observe(element);
+        return () => rowObserver?.unobserve(element);
+    }, []);
+    return row;
+}
+
+/**
+ * One labelled setting: label and help beside the control on a wide row, stacked on a
+ * narrow one. `helpId` and `errorId` keep the ids controls already point `aria-describedby`
+ * at, so describing a control does not change with the layout.
+ */
+export function EditorFieldRow({
+    htmlFor, label, required = false, help, helpId, error, errorId, trailing, width = 'wide', children,
+}: {
+    htmlFor: string;
+    label: ReactNode;
+    required?: boolean;
+    help?: ReactNode;
+    helpId?: string;
+    error?: ReactNode;
+    errorId?: string;
+    /** Shown at the end of the label line, such as a character count. */
+    trailing?: ReactNode;
+    width?: EditorFieldWidth;
+    children: ReactNode;
+}) {
+    const row = useRowWidth<HTMLDivElement>();
+    return (
+        <div ref={row} className="editor-field">
+            <div className="admin-field py-3" data-field-width={width}>
+                <div className="admin-field-heading flex items-baseline justify-between gap-3">
+                    <label htmlFor={htmlFor} className="min-w-0 break-words text-sm font-semibold text-text-1">
+                        {label}{required ? <span aria-hidden="true" className="ml-1 text-danger">*</span> : null}
+                    </label>
+                    {trailing}
+                </div>
+                {help ? <p id={helpId} className={HELP_CLASS}>{help}</p> : null}
+                <div className="admin-field-control min-w-0 space-y-1.5">
+                    {children}
+                    {error ? <p id={errorId} role="alert" className="break-words text-sm text-danger">{error}</p> : null}
+                </div>
+            </div>
+        </div>
+    );
+}
+
+/**
+ * A row headed by plain text rather than a form label, for a readout or a set of commands
+ * that belongs in the settings list without being one control.
+ */
+export function EditorRow({
+    heading, help, width = 'wide', children,
+}: {
+    heading: ReactNode;
+    help?: ReactNode;
+    width?: EditorFieldWidth;
+    children: ReactNode;
+}) {
+    const row = useRowWidth<HTMLDivElement>();
+    return (
+        <div ref={row} className="editor-field">
+            <div className="admin-field py-3" data-field-width={width}>
+                <div className="admin-field-heading">
+                    <span className="block break-words text-sm font-semibold text-text-1">{heading}</span>
+                </div>
+                {help ? <p className={HELP_CLASS}>{help}</p> : null}
+                <div className="admin-field-control min-w-0 space-y-2">{children}</div>
+            </div>
+        </div>
+    );
+}
+
+/**
+ * A group of related choices -- radio cards, a checkbox list, an icon picker -- laid out as
+ * one row. The legend stays the group's accessible name; the visible heading repeats it in
+ * the label column, which a rendered legend cannot occupy.
+ */
+export function EditorFieldset({
+    legend, help, width = 'full', disabled, children,
+}: {
+    legend: string;
+    help?: ReactNode;
+    width?: EditorFieldWidth;
+    disabled?: boolean;
+    children: ReactNode;
+}) {
+    const helpId = useId();
+    const row = useRowWidth<HTMLFieldSetElement>();
+    return (
+        <fieldset ref={row} className="editor-field min-w-0" disabled={disabled} aria-describedby={help ? helpId : undefined}>
+            <legend className="sr-only">{legend}</legend>
+            <div className="admin-field py-3" data-field-width={width}>
+                <div className="admin-field-heading" aria-hidden="true">
+                    <span className="block break-words text-sm font-semibold text-text-1">{legend}</span>
+                </div>
+                {help ? <p id={helpId} className={HELP_CLASS}>{help}</p> : null}
+                <div className="admin-field-control min-w-0 space-y-3">{children}</div>
+            </div>
+        </fieldset>
+    );
+}
+
+/**
+ * A switch drawn as an Admin Settings switch row. A `lead` switch is the one the settings
+ * after it depend on; it is highlighted the way a section's leading switch is, and those
+ * settings go inside `EditorDependents` beneath it.
+ */
+export function EditorSwitch({
+    lead = false, error, ...toggle
+}: ComponentProps<typeof Toggle> & { lead?: boolean; error?: ReactNode }) {
+    return (
+        <div
+            className={clsx(lead
+                ? 'editor-lead mb-1 rounded-xl border border-accent/40 bg-accent-soft px-3 py-1'
+                : 'editor-field')}
+            data-setting-emphasis={lead ? 'primary' : undefined}
+        >
+            <div className="admin-switch-row py-1">
+                <Toggle {...toggle} labelClassName="font-semibold" descriptionClassName="max-w-[72ch] text-[0.8125rem]" />
+            </div>
+            {error ? <p role="alert" className="pb-2 text-sm text-danger">{error}</p> : null}
+        </div>
+    );
+}
+
+/** The settings that only apply while a lead switch is on, indented beneath it. */
+export function EditorDependents({ children }: { children: ReactNode }) {
+    return (
+        <div className="editor-dependents ms-3 min-w-0 space-y-3 border-s-2 border-edge-strong ps-3" data-setting-emphasis="dependent">
+            {children}
+        </div>
+    );
+}
+
+/**
+ * A collapsible group of settings, drawn as Admin Settings draws one. Built on `details`,
+ * so find-in-page and the editor's invalid-field handling still open it. Pass `open` and
+ * `onToggle` to control it; otherwise `defaultOpen` sets how it starts.
+ */
+export function EditorGroup({
+    summary, hint, open, defaultOpen = false, onToggle, tone = 'default', children,
+}: {
+    summary: string;
+    /** Shown at the end of the header, such as a count. */
+    hint?: ReactNode;
+    open?: boolean;
+    defaultOpen?: boolean;
+    onToggle?: (open: boolean) => void;
+    tone?: 'default' | 'warn';
+    children: ReactNode;
+}) {
+    return (
+        <details
+            className={clsx(
+                'editor-group group/editor-group min-w-0 rounded-xl border bg-surface-solid',
+                tone === 'warn' ? 'border-warn/40' : 'border-edge-strong',
+            )}
+            open={open ?? defaultOpen}
+            onToggle={onToggle ? (event) => onToggle(event.currentTarget.open) : undefined}
+        >
+            <summary
+                className={clsx(
+                    'flex min-h-11 cursor-pointer list-none items-center gap-2 rounded-xl px-3 py-2 text-left',
+                    'hover:bg-surface-sunken group-open/editor-group:rounded-b-none group-open/editor-group:bg-surface-sunken',
+                    '[&::-webkit-details-marker]:hidden',
+                )}
+            >
+                <ChevronRight size={14} aria-hidden="true"
+                    className="shrink-0 text-text-2 transition-transform group-open/editor-group:rotate-90" />
+                <span className="min-w-0 break-words text-sm font-semibold text-text-1">{summary}</span>
+                {hint ? <span className="ml-auto shrink-0 text-xs text-text-3">{hint}</span> : null}
+            </summary>
+            <div className="min-w-0 space-y-3 border-t border-edge-strong px-3 pt-1 pb-3 sm:px-4">{children}</div>
+        </details>
+    );
+}
+
+/** A titled panel that stays open, for tools that sit beside the settings. */
+export function EditorPanel({
+    title, description, tone = 'default', children,
+}: {
+    title?: string;
+    description?: ReactNode;
+    tone?: 'default' | 'warn';
+    children: ReactNode;
+}) {
+    return (
+        <div className={clsx(
+            'editor-panel min-w-0 rounded-xl border bg-surface-solid',
+            tone === 'warn' ? 'border-warn/40' : 'border-edge-strong',
+        )}>
+            {title ? (
+                <div className="rounded-t-xl border-b border-edge-strong bg-surface-sunken px-3 py-2.5 sm:px-4">
+                    <h4 className="break-words text-sm font-semibold text-text-1">{title}</h4>
+                    {description ? <p className="mt-0.5 text-[0.8125rem] leading-relaxed text-text-3">{description}</p> : null}
+                </div>
+            ) : null}
+            <div className="min-w-0 space-y-3 px-3 py-3 sm:px-4">{children}</div>
+        </div>
+    );
+}
+
+/**
+ * An `EditorPanel` that is also a fieldset, for a group of settings that share one name.
+ * The legend is floated so it renders as the panel's header band instead of sitting on the
+ * border, while staying the group's accessible name.
+ */
+export function EditorPanelFieldset({
+    legend, description, tone = 'default', disabled, children,
+}: {
+    legend: string;
+    description?: ReactNode;
+    tone?: 'default' | 'warn';
+    disabled?: boolean;
+    children: ReactNode;
+}) {
+    const descriptionId = useId();
+    return (
+        <fieldset
+            className={clsx(
+                'editor-panel min-w-0 rounded-xl border bg-surface-solid',
+                tone === 'warn' ? 'border-warn/40' : 'border-edge-strong',
+            )}
+            disabled={disabled}
+            aria-describedby={description ? descriptionId : undefined}
+        >
+            <legend className="float-left w-full rounded-t-xl border-b border-edge-strong bg-surface-sunken px-3 py-2.5 sm:px-4">
+                <span className="block break-words text-sm font-semibold text-text-1">{legend}</span>
+            </legend>
+            <div className="clear-both min-w-0 space-y-3 px-3 py-3 sm:px-4">
+                {description ? <p id={descriptionId} className="text-[0.8125rem] leading-relaxed text-text-3">{description}</p> : null}
+                {children}
+            </div>
+        </fieldset>
+    );
+}
diff --git a/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx b/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx
index efdf9f0fb..7f9242629 100644
--- a/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx
+++ b/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx
@@ -1,15 +1,21 @@
 // WorkspaceEditorFrame.tsx
 
-import { useEffect, useId, useRef, type ReactNode } from 'react';
+import { useEffect, useId, useRef, useState, type ReactNode } from 'react';
 import { useBlocker, useNavigate } from 'react-router-dom';
-import { ArrowLeft, Loader2, Lock, Save } from 'lucide-react';
+import { clsx } from 'clsx';
+import {
+    ArrowLeft, ChevronRight, CircleCheck, CircleDashed, FileText, Loader2, Lock, Save, TriangleAlert, type LucideIcon,
+} from 'lucide-react';
 import { GlassButton, GlassPanel } from '../ui/primitives';
 import { isActionEditorNewPath, isAgentEditorPath, isRecord } from '../../lib/workspaceAuthoring';
 
 export interface WorkspaceEditorSection {
     id: string;
     label: string;
+    /** What the section holds, shown under its title. */
     description?: string;
+    /** Shown in the section rail and on the card, as Admin Settings sections are. */
+    icon?: LucideIcon;
     content: ReactNode;
 }
 
@@ -43,12 +49,33 @@ export function WorkspaceLeavePrompt({
     );
 }
 
+/** The icon tile at the head of a section card, as an Admin Settings card has. */
+function SectionIcon({ icon: Icon = FileText }: { icon?: LucideIcon }) {
+    return (
+        <span aria-hidden="true"
+            className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl border border-edge-strong bg-surface-solid text-text-2">
+            <Icon size={20} />
+        </span>
+    );
+}
+
+/**
+ * The full-page editor an agent or action opens in, for personal, group and global ones
+ * alike, laid out the way Admin Settings is.
+ *
+ * The rail on the left lists the editor's sections and marks the one in view. Each section
+ * is a card with an icon, a title and what it holds, and the fields inside are Admin
+ * Settings rows (see EditorLayout.tsx). Saving stays in the header beside the save status,
+ * because an editor saves one record as a whole.
+ */
 export function WorkspaceEditorFrame({
-    title, description, backTo, sections, dirty, saving, readOnly = false, error,
-    onSave, onDiscard, saveLabel = 'Save changes', actions, saveDisabled = false,
+    title, description, icon: TitleIcon, backTo, sections, dirty, saving, readOnly = false, error,
+    onSave, onDiscard, saveLabel = 'Save changes', actions, saveDisabled = false, initialSection,
 }: {
     title: string;
     description?: string;
+    /** The kind of record being edited, shown beside the title. */
+    icon?: LucideIcon;
     backTo: string;
     sections: WorkspaceEditorSection[];
     dirty: boolean;
@@ -60,11 +87,20 @@ export function WorkspaceEditorFrame({
     saveLabel?: string;
     actions?: ReactNode;
     saveDisabled?: boolean;
+    /** A section to open at, such as the templates a "Start from a template" link leads to. */
+    initialSection?: string;
 }) {
     const navigate = useNavigate();
     const form = useRef<HTMLFormElement>(null);
     const errorSummary = useRef<HTMLDivElement>(null);
+    const scrollRoot = useRef<HTMLDivElement>(null);
     const prefix = useId();
+    const [current, setCurrent] = useState<string | null>(sections[0]?.id ?? null);
+    // A section chosen in the rail stays marked while the pane scrolls to it, and until the
+    // person scrolls themselves; one near the end could never rise far enough to be marked.
+    // Until then it also stays in place while lists above or inside it finish loading.
+    const pinned = useRef<string | null>(null);
+    const sectionIds = sections.map((section) => section.id).join('|');
     const blocker = useBlocker(({ currentLocation, nextLocation, historyAction }) => {
         if (readOnly || (!dirty && !saving)) return false;
         const state = isRecord(nextLocation.state) ? nextLocation.state : {};
@@ -101,13 +137,79 @@ export function WorkspaceEditorFrame({
         if (error) errorSummary.current?.focus();
     }, [error]);
 
-    const goToSection = (id: string) => {
+    // Mark the section in view, as the Admin Settings index does: the last one whose top has
+    // passed a line near the top of the pane, or at the very bottom the last one showing.
+    useEffect(() => {
+        const root = scrollRoot.current;
+        const order = sectionIds ? sectionIds.split('|') : [];
+        pinned.current = null;
+        if (!root || !order.length) return;
+        let frame = 0;
+        const update = () => {
+            frame = 0;
+            if (pinned.current) return;
+            const bounds = root.getBoundingClientRect();
+            const line = bounds.top + Math.min(bounds.height * 0.3, 160);
+            const atBottom = root.scrollTop + root.clientHeight >= root.scrollHeight - 2;
+            let next: string | null = null;
+            for (const id of order) {
+                const top = document.getElementById(`${prefix}-${id}`)?.getBoundingClientRect().top;
+                if (top === undefined) continue;
+                if (top <= line || (atBottom && top < bounds.bottom)) next = id;
+            }
+            setCurrent(next ?? order[0]);
+        };
+        const onScroll = () => {
+            if (!frame) frame = requestAnimationFrame(update);
+        };
+        const release = () => {
+            pinned.current = null;
+        };
+        const content = root.firstElementChild;
+        const realign = typeof ResizeObserver === 'undefined' ? null : new ResizeObserver(() => {
+            if (pinned.current) document.getElementById(`${prefix}-${pinned.current}`)?.scrollIntoView({ block: 'start' });
+        });
+        if (content) realign?.observe(content);
+        update();
+        root.addEventListener('scroll', onScroll, { passive: true });
+        root.addEventListener('wheel', release, { passive: true });
+        root.addEventListener('touchstart', release, { passive: true });
+        root.addEventListener('pointerdown', release);
+        root.addEventListener('keydown', release);
+        return () => {
+            cancelAnimationFrame(frame);
+            realign?.disconnect();
+            root.removeEventListener('scroll', onScroll);
+            root.removeEventListener('wheel', release);
+            root.removeEventListener('touchstart', release);
+            root.removeEventListener('pointerdown', release);
+            root.removeEventListener('keydown', release);
+        };
+    }, [sectionIds, prefix]);
+
+    const goToSection = (id: string, instant = false) => {
         const target = document.getElementById(`${prefix}-${id}`);
         if (target instanceof HTMLDetailsElement) target.open = true;
-        target?.scrollIntoView({ block: 'start', behavior: 'smooth' });
+        pinned.current = id;
+        setCurrent(id);
+        const reduceMotion = window.matchMedia?.('(prefers-reduced-motion: reduce)').matches;
+        target?.scrollIntoView({ block: 'start', behavior: instant || reduceMotion ? 'auto' : 'smooth' });
         target?.focus({ preventScroll: true });
     };
 
+    // After the scroll-marking effect above, which clears any pin when the sections change.
+    useEffect(() => {
+        if (initialSection && sectionIds.split('|').includes(initialSection)) goToSection(initialSection, true);
+        // Opening at a section happens once; later edits to the sections must not jump back.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [initialSection]);
+
+    const status = saving
+        ? { label: 'Saving your changes.', Icon: Loader2, className: 'border-edge-strong text-text-2' }
+        : dirty
+            ? { label: 'Unsaved changes', Icon: CircleDashed, className: 'border-warn/40 bg-warn/5 text-warn' }
+            : { label: 'No unsaved changes', Icon: CircleCheck, className: 'border-edge-strong text-text-3' };
+
     return (
         <form ref={form} className="flex h-full min-h-0 flex-col"
             onSubmit={(event) => { event.preventDefault(); if (!readOnly && !saving && !saveDisabled) onSave(); }}
@@ -124,14 +226,31 @@ export function WorkspaceEditorFrame({
                     form.current?.requestSubmit();
                 }
             }}>
-            <header className="shrink-0 space-y-3 border-b border-edge pb-3">
-                <GlassButton type="button" size="sm" onClick={() => navigate(backTo)}>
+            <header className="shrink-0 border-b border-edge pb-4">
+                <GlassButton type="button" size="sm" variant="ghost" className="-ml-2" onClick={() => navigate(backTo)}>
                     <ArrowLeft size={15} /> Back
                 </GlassButton>
-                <div className="flex flex-wrap items-start justify-between gap-3">
-                    <div className="min-w-0">
-                        <h2 className="break-words text-xl font-semibold text-text-1">{title}</h2>
-                        {description ? <p className="mt-1 max-w-2xl text-sm text-text-3">{description}</p> : null}
+                <div className="mt-2 flex flex-wrap items-start justify-between gap-3">
+                    <div className="flex min-w-0 flex-[1_1_20rem] items-start gap-3">
+                        {TitleIcon ? (
+                            <span aria-hidden="true"
+                                className="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl border border-edge-strong bg-surface-solid text-text-2">
+                                <TitleIcon size={20} />
+                            </span>
+                        ) : null}
+                        <div className="min-w-0 flex-1">
+                            <h2 className="break-words text-xl leading-snug font-semibold text-text-1">{title}</h2>
+                            {description ? <p className="mt-1 max-w-3xl break-words text-sm text-text-3">{description}</p> : null}
+                            {!readOnly ? (
+                                <p role="status" className={clsx(
+                                    'mt-2 inline-flex max-w-full items-center gap-1 rounded-full border px-2 py-0.5 text-xs',
+                                    status.className,
+                                )}>
+                                    <status.Icon size={11} aria-hidden="true" className={clsx('shrink-0', saving && 'animate-spin')} />
+                                    {status.label}
+                                </p>
+                            ) : null}
+                        </div>
                     </div>
                     <div className="flex flex-wrap items-center gap-2">
                         {actions}
@@ -148,48 +267,82 @@ export function WorkspaceEditorFrame({
                         )}
                     </div>
                 </div>
-                {!readOnly ? <p role="status" className="text-xs text-text-3">{saving ? 'Saving your changes.' : dirty ? 'Unsaved changes' : 'No unsaved changes'}</p> : null}
             </header>
 
-            <div className="flex min-h-0 flex-1 flex-col gap-3 pt-3 lg:flex-row lg:gap-5">
-                <nav aria-label="Editor sections" className="hidden w-40 shrink-0 space-y-1 overflow-y-auto lg:block">
-                    {sections.map((section) => (
-                        <button key={section.id} type="button" onClick={() => goToSection(section.id)}
-                            className="block w-full rounded-lg px-3 py-2 text-left text-sm text-text-2 hover:bg-surface-2 hover:text-text-1">
-                            {section.label}
-                        </button>
-                    ))}
+            <div className="flex min-h-0 flex-1 flex-col lg:flex-row">
+                <nav aria-label="Editor sections" className="hidden w-56 shrink-0 overflow-y-auto border-r border-edge py-3 pr-3 lg:block">
+                    <div className="space-y-0.5">
+                        {sections.map((section) => {
+                            const active = current === section.id;
+                            const Icon = section.icon ?? FileText;
+                            return (
+                                <button key={section.id} type="button" aria-current={active ? 'location' : undefined}
+                                    onClick={() => goToSection(section.id)}
+                                    className={clsx(
+                                        'flex w-full items-center gap-2.5 rounded-lg px-3 py-2.5 text-left text-sm transition-colors',
+                                        active ? 'bg-accent-soft font-semibold text-accent' : 'text-text-2 hover:bg-surface-2 hover:text-text-1',
+                                    )}>
+                                    <Icon size={16} aria-hidden="true" className={clsx('shrink-0', active ? 'text-accent' : 'text-text-3')} />
+                                    <span className="min-w-0 flex-1 break-words">{section.label}</span>
+                                </button>
+                            );
+                        })}
+                    </div>
                 </nav>
-                <label className="shrink-0 text-xs text-text-3 lg:hidden">
-                    Jump to section
-                    <select aria-label="Jump to section" defaultValue="" onChange={(event) => { if (event.target.value) goToSection(event.target.value); }}
-                        className="mt-1 block w-full rounded-lg border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1">
-                        <option value="">Choose a section</option>
-                        {sections.map((section) => <option key={section.id} value={section.id}>{section.label}</option>)}
-                    </select>
-                </label>
-                <div className="min-h-0 min-w-0 flex-1 space-y-4 overflow-y-auto pb-6 pr-1">
-                    {error ? <GlassPanel elevation="flat" className="border border-danger/30 p-4">
-                        <div ref={errorSummary} role="alert" tabIndex={-1} className="text-sm text-danger">{error}</div>
-                    </GlassPanel> : null}
-                    <fieldset disabled={readOnly || saving} className="min-w-0 space-y-4">
-                        <legend className="sr-only">{readOnly ? 'Configuration details' : 'Configuration'}</legend>
-                        {sections.map((section) => section.id === 'advanced' ? (
-                            <details key={section.id} id={`${prefix}-${section.id}`} tabIndex={-1}
-                                className="glass-flat scroll-mt-2 rounded-2xl p-4">
-                                <summary className="cursor-pointer text-base font-semibold text-text-1">{section.label}</summary>
-                                {section.description ? <p className="mt-1 text-sm text-text-3">{section.description}</p> : null}
-                                <div className="mt-4 space-y-4">{section.content}</div>
-                            </details>
-                        ) : (
-                            <section key={section.id} id={`${prefix}-${section.id}`} tabIndex={-1}
-                                aria-labelledby={`${prefix}-${section.id}-title`} className="glass-flat scroll-mt-2 rounded-2xl p-4">
-                                <h3 id={`${prefix}-${section.id}-title`} className="text-base font-semibold text-text-1">{section.label}</h3>
-                                {section.description ? <p className="mt-1 text-sm text-text-3">{section.description}</p> : null}
-                                <div className="mt-4 space-y-4">{section.content}</div>
-                            </section>
-                        ))}
-                    </fieldset>
+                <div className="shrink-0 pt-3 lg:hidden">
+                    <label className="block max-w-md text-xs text-text-2">
+                        Jump to section
+                        <select aria-label="Jump to section" defaultValue="" onChange={(event) => { if (event.target.value) goToSection(event.target.value); }}
+                            className="mt-1 block w-full rounded-xl border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1">
+                            <option value="">Choose a section</option>
+                            {sections.map((section) => <option key={section.id} value={section.id}>{section.label}</option>)}
+                        </select>
+                    </label>
+                </div>
+                <div ref={scrollRoot} className="min-h-0 min-w-0 flex-1 overflow-y-auto pt-3 pr-1 pb-6 lg:pl-5">
+                    <div className="mx-auto w-full max-w-[112rem] space-y-4">
+                        {error ? (
+                            <GlassPanel elevation="flat" className="flex items-start gap-2 border border-danger/30 p-3 text-sm text-danger">
+                                <TriangleAlert size={16} aria-hidden="true" className="mt-0.5 shrink-0" />
+                                <div ref={errorSummary} role="alert" tabIndex={-1} className="min-w-0 flex-1 break-words">{error}</div>
+                            </GlassPanel>
+                        ) : null}
+                        <fieldset disabled={readOnly || saving} className="min-w-0 space-y-4">
+                            <legend className="sr-only">{readOnly ? 'Configuration details' : 'Configuration'}</legend>
+                            {sections.map((section) => section.id === 'advanced' ? (
+                                <details key={section.id} id={`${prefix}-${section.id}`} tabIndex={-1}
+                                    className="glass glass-edge group/editor-section admin-settings-distinct editor-section scroll-mt-2 rounded-2xl border-edge-strong">
+                                    <summary className={clsx(
+                                        'flex cursor-pointer list-none items-start gap-3 rounded-2xl bg-surface-2 p-4 sm:px-5',
+                                        'group-open/editor-section:rounded-b-none group-open/editor-section:border-b group-open/editor-section:border-edge-strong',
+                                        '[&::-webkit-details-marker]:hidden',
+                                    )}>
+                                        <SectionIcon icon={section.icon} />
+                                        <span className="min-w-0 flex-1">
+                                            <span id={`${prefix}-${section.id}-title`} className="block text-lg leading-snug font-semibold text-text-1">{section.label}</span>
+                                            {section.description ? <span className="mt-1 block text-xs text-text-3">{section.description}</span> : null}
+                                        </span>
+                                        <ChevronRight size={18} aria-hidden="true"
+                                            className="mt-2 shrink-0 text-text-2 transition-transform group-open/editor-section:rotate-90" />
+                                    </summary>
+                                    <div className="admin-section-body min-w-0 space-y-4 p-4 sm:p-5">{section.content}</div>
+                                </details>
+                            ) : (
+                                <GlassPanel key={section.id} id={`${prefix}-${section.id}`} tabIndex={-1} edge role="region"
+                                    aria-labelledby={`${prefix}-${section.id}-title`}
+                                    className="admin-settings-distinct editor-section scroll-mt-2 border-edge-strong">
+                                    <div className="flex items-start gap-3 rounded-t-2xl border-b border-edge-strong bg-surface-2 p-4 sm:px-5">
+                                        <SectionIcon icon={section.icon} />
+                                        <div className="min-w-0 flex-1">
+                                            <h3 id={`${prefix}-${section.id}-title`} className="text-lg leading-snug font-semibold text-text-1">{section.label}</h3>
+                                            {section.description ? <p className="mt-1 text-xs text-text-3">{section.description}</p> : null}
+                                        </div>
+                                    </div>
+                                    <div className="admin-section-body min-w-0 space-y-4 p-4 sm:p-5">{section.content}</div>
+                                </GlassPanel>
+                            ))}
+                        </fieldset>
+                    </div>
                 </div>
             </div>
             {blocker.state === 'blocked' ? (
diff --git a/application/v2_ui/src/components/workspaceActions/ActionAdvancedFields.tsx b/application/v2_ui/src/components/workspaceActions/ActionAdvancedFields.tsx
index 370fb9a28..a81757e0a 100644
--- a/application/v2_ui/src/components/workspaceActions/ActionAdvancedFields.tsx
+++ b/application/v2_ui/src/components/workspaceActions/ActionAdvancedFields.tsx
@@ -1,7 +1,7 @@
 // ActionAdvancedFields.tsx
 
 import { useId } from 'react';
-import { Toggle } from '../ui/primitives';
+import { EditorDependents, EditorPanelFieldset, EditorRow, EditorSwitch } from '../workspace/EditorLayout';
 import { ActionField, ActionJsonInput, ACTION_INPUT_CLASS } from './ActionFields';
 import { ActionSchemaFields } from './ActionSchemaFields';
 import { isRecord, type ActionTypeDefinition } from '../../lib/workspaceAuthoring';
@@ -26,30 +26,25 @@ export function ActionAdvancedFields(props: ActionConnectorProps & {
     const syncStates = isRecord(sync) ? Object.entries(sync) : [];
     return (
         <div className="min-w-0 space-y-6">
-            <div className="grid min-w-0 gap-4 sm:grid-cols-2">
-                <ActionField id={`${id}-machine-name`} label="Machine name" required
+            <div className="min-w-0">
+                <ActionField id={`${id}-machine-name`} label="Machine name" required width="standard"
                     help="Letters, numbers, underscores, and dashes only. Renaming does not change the action ID."
                     error={actionFieldError(props.errors, '/name')}>
                     <input id={`${id}-machine-name`} className={ACTION_INPUT_CLASS} value={draft.name} required
                         pattern="[A-Za-z0-9_\-]+" disabled={readOnly}
                         onChange={(event) => onChange((current) => ({ ...current, name: event.target.value }))} />
                 </ActionField>
-                <div className="min-w-0 space-y-1.5 text-xs text-text-3">
-                    <p className="text-sm font-medium text-text-1">Action ID</p>
-                    <p className="break-all">{draft.id || 'Assigned when the action is saved.'}</p>
-                    <p>The ID, not the display name, identifies this action in agent assignments.</p>
-                </div>
+                <EditorRow heading="Action ID" help="The ID, not the display name, identifies this action in agent assignments.">
+                    <p className="break-all font-mono text-xs text-text-2">{draft.id || 'Assigned when the action is saved.'}</p>
+                </EditorRow>
             </div>
             <ActionSchemaFields props={props} schema={definition.metadata_schema} path="/metadata"
                 coveredPaths={['/metadata/key_vault_secret_reminders', '/metadata/key_vault_secret_reminder_sync',
                     ...(draft.type === 'log_analytics' ? ['/metadata/name'] : [])]}
                 allowCustom={false} />
             {draft.type !== 'agent' ? (
-                <fieldset className="min-w-0 space-y-4 rounded-xl border border-edge p-4">
-                    <legend className="px-1 text-sm font-medium text-text-1">Secret expiration and reminders</legend>
-                    <p className="text-xs leading-relaxed text-text-3">
-                        Track expiration and send a rotation reminder for this action’s stored secrets. Tracking does not rotate credentials automatically.
-                    </p>
+                <EditorPanelFieldset legend="Secret expiration and reminders"
+                    description="Track expiration and send a rotation reminder for this action’s stored secrets. Tracking does not rotate credentials automatically.">
                     {hints ? <p className="text-xs text-text-3">
                         Key Vault storage is {hints.storageEnabled ? 'enabled' : 'disabled'}; reminder delivery is {hints.remindersEnabled ? 'enabled' : 'disabled'}.
                         {hints.requireExpiration ? ' Your administrator requires expiration dates for tracked secrets.' : ''}
@@ -57,7 +52,7 @@ export function ActionAdvancedFields(props: ActionConnectorProps & {
                     {!hints?.storageEnabled && hints ? <p className="rounded-lg bg-warn-soft p-2 text-xs text-warn">
                         This configuration is retained, but reminders for Key Vault secrets require enabled Key Vault storage and reminder delivery.
                     </p> : null}
-                    <Toggle checked={enabled} disabled={readOnly} label="Track secret expiration"
+                    <EditorSwitch lead checked={enabled} disabled={readOnly} label="Track secret expiration"
                         description="Apply these defaults to all secret fields on this action. Existing field-specific settings are kept."
                         onChange={(value) => onChange((current) => {
                             const existing = actionValueAt(current, reminderPath);
@@ -71,43 +66,41 @@ export function ActionAdvancedFields(props: ActionConnectorProps & {
                                 } : {}),
                             });
                         })} />
-                    {enabled ? <div className="grid min-w-0 gap-4 sm:grid-cols-2">
-                        <ActionField id={`${id}-expiration`} label="Secret expiration date" required
+                    {enabled ? <EditorDependents>
+                        <ActionField id={`${id}-expiration`} label="Secret expiration date" required width="compact"
                             error={actionFieldError(props.errors, `${reminderPath}/expires_on`)}>
                             <input id={`${id}-expiration`} type="date" className={ACTION_INPUT_CLASS} required disabled={readOnly}
                                 value={actionText(reminder.expires_on ?? reminder.expiration_date).slice(0, 10)}
                                 onChange={(event) => updateReminder('expires_on', event.target.value)} />
                         </ActionField>
-                        <ActionField id={`${id}-reminder-email`} label="Reminder email" required
+                        <ActionField id={`${id}-reminder-email`} label="Reminder email" required width="standard"
                             error={actionFieldError(props.errors, `${reminderPath}/contact_email`)}>
                             <input id={`${id}-reminder-email`} type="email" className={ACTION_INPUT_CLASS} required disabled={readOnly}
                                 value={actionText(reminder.contact_email ?? reminder.reminder_email)}
                                 onChange={(event) => updateReminder('contact_email', event.target.value)} />
                         </ActionField>
-                        <ActionField id={`${id}-reminder-days`} label="Reminder lead days" required
+                        <ActionField id={`${id}-reminder-days`} label="Reminder lead days" required width="compact"
                             error={actionFieldError(props.errors, `${reminderPath}/lead_days`)}>
                             <input id={`${id}-reminder-days`} type="number" min={1} max={3650} step={1} className={ACTION_INPUT_CLASS} required disabled={readOnly}
                                 value={typeof reminder.lead_days === 'number' ? reminder.lead_days : ''}
                                 onChange={(event) => updateReminder('lead_days', event.target.value === '' ? undefined : event.target.valueAsNumber)} />
                         </ActionField>
-                        <ActionField id={`${id}-reminder-label`} label="Reminder label">
+                        <ActionField id={`${id}-reminder-label`} label="Reminder label" width="standard">
                             <input id={`${id}-reminder-label`} className={ACTION_INPUT_CLASS} disabled={readOnly}
                                 value={actionText(reminder.label ?? reminder.friendly_label)} onChange={(event) => updateReminder('label', event.target.value)} />
                         </ActionField>
-                        <div className="sm:col-span-2">
-                            <ActionField id={`${id}-reminder-notes`} label="Rotation notes">
-                                <textarea id={`${id}-reminder-notes`} rows={3} className={ACTION_INPUT_CLASS} disabled={readOnly}
-                                    value={actionText(reminder.notes ?? reminder.rotation_notes)} onChange={(event) => updateReminder('notes', event.target.value)} />
-                            </ActionField>
-                        </div>
-                    </div> : null}
+                        <ActionField id={`${id}-reminder-notes`} label="Rotation notes">
+                            <textarea id={`${id}-reminder-notes`} rows={3} className={ACTION_INPUT_CLASS} disabled={readOnly}
+                                value={actionText(reminder.notes ?? reminder.rotation_notes)} onChange={(event) => updateReminder('notes', event.target.value)} />
+                        </ActionField>
+                    </EditorDependents> : null}
                     {syncStates.length ? <div className="space-y-1 text-xs text-text-3">
                         <p className="font-medium text-text-2">Last reminder synchronization</p>
                         {syncStates.map(([path, state]) => <p key={path} className="break-words">
                             {path}: {isRecord(state) ? actionText(state.status) || (state.success === true ? 'Synced' : 'Review required') : String(state)}
                         </p>)}
                     </div> : null}
-                </fieldset>
+                </EditorPanelFieldset>
             ) : null}
             <div className="min-w-0 space-y-4">
                 <p className="text-xs leading-relaxed text-text-3">
diff --git a/application/v2_ui/src/components/workspaceActions/ActionAuthentication.tsx b/application/v2_ui/src/components/workspaceActions/ActionAuthentication.tsx
index 69cfeb494..5296ddc2e 100644
--- a/application/v2_ui/src/components/workspaceActions/ActionAuthentication.tsx
+++ b/application/v2_ui/src/components/workspaceActions/ActionAuthentication.tsx
@@ -95,7 +95,7 @@ export function ActionAuthentication(props: ActionConnectorProps & { definition:
                 </div>
             ) : null}
             {!draft.identity_id ? <>
-                <ActionField id={`${id}-auth`} label="Authentication method" error={actionFieldError(props.errors, '/auth/type')}>
+                <ActionField id={`${id}-auth`} label="Authentication method" width="standard" error={actionFieldError(props.errors, '/auth/type')}>
                     <select id={`${id}-auth`} className={ACTION_INPUT_CLASS} value={selected ? method : 'existing'}
                         disabled={readOnly || modes.length === 0}
                         onChange={(event) => {
@@ -113,17 +113,13 @@ export function ActionAuthentication(props: ActionConnectorProps & { definition:
                 {sql && sqlConnectionMethod(draft) === 'connection_string' ? <p className="text-xs text-text-3">
                     Connection-string mode uses the authentication specified in the connection string, not separate database credentials.
                 </p> : null}
-                {sql && method === 'username_password' && sqlConnectionMethod(draft) === 'parameters' && draft.additionalFields.database_type !== 'sqlite' ? (
-                    <div className="grid gap-4 sm:grid-cols-2">
-                        {textField('/additionalFields/username', 'Database username', undefined, true)}
-                        {secretField('/additionalFields/password', 'Database password')}
-                    </div>
-                ) : null}
+                {sql && method === 'username_password' && sqlConnectionMethod(draft) === 'parameters' && draft.additionalFields.database_type !== 'sqlite' ? <>
+                    {textField('/additionalFields/username', 'Database username', undefined, true)}
+                    {secretField('/additionalFields/password', 'Database password')}
+                </> : null}
                 {draft.auth.type === 'servicePrincipal' ? <>
-                    <div className="grid gap-4 sm:grid-cols-2">
-                        {textField('/auth/identity', 'Client ID', undefined, true)}
-                        {textField('/auth/tenantId', 'Tenant ID', undefined, true)}
-                    </div>
+                    {textField('/auth/identity', 'Client ID', undefined, true)}
+                    {textField('/auth/tenantId', 'Tenant ID', undefined, true)}
                     {secretField('/auth/key', keyLabel)}
                 </> : null}
                 {['username_password', 'basic'].includes(draft.auth.type) && draft.type !== 'snowflake'
@@ -155,7 +151,7 @@ export function ActionAuthentication(props: ActionConnectorProps & { definition:
                 ? textField('/additionalFields/pat_name', 'Personal access token name', 'The reusable identity contains the PAT secret; its token name is configured on this action.', true) : null}
             {draft.identity_id && draft.type === 'snowflake' && method === 'key_pair'
                 ? secretField('/additionalFields/private_key_passphrase', 'Private key passphrase', 'Only needed for an encrypted private key.') : null}
-            <p className="text-xs leading-relaxed text-text-3">
+            <p className="border-t border-edge pt-3 text-xs leading-relaxed text-text-3">
                 Stored secrets are never returned to this form. Keep their masked state, enter a replacement, or choose Clear.
                 Changing another field does not replace credentials or erase hidden configuration.
             </p>
diff --git a/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx b/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx
index ecdb7c083..f1681145c 100644
--- a/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx
+++ b/application/v2_ui/src/components/workspaceActions/ActionConfigurationFields.tsx
@@ -2,8 +2,9 @@
 
 import { useId, useState } from 'react';
 import { FlaskConical } from 'lucide-react';
-import { GlassButton, Toggle } from '../ui/primitives';
+import { GlassButton } from '../ui/primitives';
 import { ConfirmDialog } from '../ui/ConfirmDialog';
+import { EditorFieldset, EditorPanel, EditorSwitch, type EditorFieldWidth } from '../workspace/EditorLayout';
 import { ActionField, ActionJsonInput, ActionLinesInput, ActionSecretInput, ACTION_INPUT_CLASS } from './ActionFields';
 import { ActionSchemaFields } from './ActionSchemaFields';
 import { CallAgentActionConfiguration } from './CallAgentActionConfiguration';
@@ -30,11 +31,8 @@ export function ActionDescriptorField({ props, descriptor }: { props: ActionConn
     if (descriptor.kind === 'boolean') {
         const defaults = actionValueAt(nativeActionDefinition(props.draft.type).defaults, descriptor.path);
         return (
-            <div className="space-y-1">
-                <Toggle checked={typeof value === 'boolean' ? value : defaults === true} onChange={change}
-                    disabled={disabled} label={descriptor.label} description={descriptor.help} />
-                {error ? <p role="alert" className="text-sm text-danger">{error}</p> : null}
-            </div>
+            <EditorSwitch checked={typeof value === 'boolean' ? value : defaults === true} onChange={change}
+                disabled={disabled} label={descriptor.label} description={descriptor.help} error={error} />
         );
     }
     if (descriptor.kind === 'json') return <ActionJsonInput id={id} label={descriptor.label} value={value}
@@ -46,8 +44,9 @@ export function ActionDescriptorField({ props, descriptor }: { props: ActionConn
         id, className: ACTION_INPUT_CLASS, disabled, required: descriptor.required,
         'aria-invalid': Boolean(error), 'aria-describedby': `${id}-help ${id}-error`,
     };
+    const width: EditorFieldWidth = descriptor.kind === 'number' ? 'compact' : descriptor.kind === 'select' ? 'standard' : 'wide';
     return (
-        <ActionField id={id} label={descriptor.label} help={descriptor.help} error={error} required={descriptor.required}>
+        <ActionField id={id} label={descriptor.label} help={descriptor.help} error={error} required={descriptor.required} width={width}>
             {descriptor.kind === 'select' ? <select {...attributes} value={actionText(value)} onChange={(event) => change(event.target.value || undefined)}>
                 <option value="">Select a value</option>
                 {value !== undefined && value !== '' && !descriptor.options?.some((option) => option.value === value)
@@ -92,8 +91,8 @@ export function ActionConfigurationFields(props: ActionConnectorProps & { defini
 
     return (
         <div className="min-w-0 space-y-5" data-testid="action-configuration" data-action-type={draft.type}>
-            {native.help ? <p className="text-sm leading-relaxed text-text-2">{native.help}</p> : null}
-            {sql ? <ActionField id={`${id}-connection-method`} label="Connection mode"
+            {native.help ? <p className="text-[0.8125rem] leading-relaxed text-text-2">{native.help}</p> : null}
+            {sql ? <ActionField id={`${id}-connection-method`} label="Connection mode" width="standard"
                 help="A connection string takes precedence over individual parameters. Switching to parameters explicitly clears that stored connection string. Other settings are retained.">
                 <select id={`${id}-connection-method`} className={ACTION_INPUT_CLASS} value={sqlConnectionMethod(draft)}
                     disabled={readOnly || draft.additionalFields.identity_uses_connection_string === true}
@@ -105,47 +104,41 @@ export function ActionConfigurationFields(props: ActionConnectorProps & { defini
                     <option value="parameters">Individual parameters</option><option value="connection_string">Connection string</option>
                 </select>
             </ActionField> : null}
-            <div className="grid min-w-0 gap-4 sm:grid-cols-2">
-                {native.fields.map((descriptor) => <div key={descriptor.path}
-                    className={['textarea', 'lines', 'secret', 'json'].includes(descriptor.kind ?? '') ? 'min-w-0 sm:col-span-2' : 'min-w-0'}>
-                    <ActionDescriptorField props={props} descriptor={descriptor} />
-                </div>)}
-            </div>
+            {native.fields.map((descriptor) => <ActionDescriptorField key={descriptor.path} props={props} descriptor={descriptor} />)}
             {usesDirectBlobConnectionString(draft) ? (
-                <div className="space-y-2 text-xs text-text-3">
+                <div className="space-y-2 rounded-lg border border-edge bg-surface-1 px-3 py-2 text-xs text-text-3">
                     <p>The blob service endpoint is derived automatically when saving or testing. A stored connection string keeps the saved endpoint.</p>
                     <p className="break-all" data-testid="blob-derived-endpoint">
                         Blob service endpoint: {derivedEndpoint || draft.endpoint || 'Enter the connection string in Authentication.'}
                     </p>
                 </div>
             ) : null}
-            {capabilities ? <fieldset className="min-w-0 space-y-2">
-                <legend className="mb-2 text-sm font-medium text-text-1">Allowed capabilities</legend>
+            {capabilities ? <EditorFieldset legend="Allowed capabilities"
+                help="Choose what an agent can do through this action.">
                 {capabilities.options.map((capability) => {
                     const legacyUpload = draft.type === 'simplechat' &&
                         ['upload_word_document', 'upload_powerpoint_document'].includes(capability.key) &&
                         typeof capabilityValues.upload_markdown_document === 'boolean'
                         ? capabilityValues.upload_markdown_document : capability.defaultEnabled !== false;
-                    return <Toggle key={capability.key} label={capability.label} description={capability.description}
+                    return <EditorSwitch key={capability.key} label={capability.label} description={capability.description}
                         checked={typeof capabilityValues[capability.key] === 'boolean' ? capabilityValues[capability.key] === true : legacyUpload}
                         disabled={readOnly}
                         onChange={(value) => onChange((current) => changeActionField(current, `${capabilities.path}/${capability.key}`, value))} />;
                 })}
                 {actionFieldError(props.errors, capabilities.path) ? <p role="alert" className="text-sm text-danger">{actionFieldError(props.errors, capabilities.path)}</p> : null}
-            </fieldset> : null}
+            </EditorFieldset> : null}
             <ActionSchemaFields props={props} schema={definition.additional_fields_schema} coveredPaths={coveredPaths}
                 allowCustom={definition.additional_fields_schema.additionalProperties !== false} />
-            {native.testPath ? <div className="space-y-3 border-t border-edge pt-4">
-                <p className="text-xs leading-relaxed text-text-3">
-                    Test connection makes a small request using this draft. An edited action uses its owned stored credentials when their masked values are unchanged.
-                    Saving does not run this test.
-                </p>
-                <GlassButton type="button" size="sm" disabled={readOnly || Boolean(request.busy)}
-                    onClick={() => void request.run('Testing connection…', (signal) => testWorkspaceAction(draft, props.original, definition, signal, connectorTestScope(props)))}>
-                    <FlaskConical size={15} />{request.busy || 'Test connection'}
-                </GlassButton>
+            {native.testPath ? <EditorPanel title="Connection check"
+                description="Test connection makes a small request using this draft. An edited action uses its owned stored credentials when their masked values are unchanged. Saving does not run this test.">
+                <div>
+                    <GlassButton type="button" size="sm" variant="subtle" disabled={readOnly || Boolean(request.busy)}
+                        onClick={() => void request.run('Testing connection…', (signal) => testWorkspaceAction(draft, props.original, definition, signal, connectorTestScope(props)))}>
+                        <FlaskConical size={15} />{request.busy || 'Test connection'}
+                    </GlassButton>
+                </div>
                 <ConnectorFeedbackPanel feedback={request.feedback} stale={request.stale} />
-            </div> : null}
+            </EditorPanel> : null}
             {confirmParameters ? <ConfirmDialog title="Use individual connection parameters?" tone="primary"
                 description="The saved connection string will be explicitly cleared when you save. Server, database, and authentication fields are kept for you to review."
                 confirmLabel="Use parameters" onClose={() => setConfirmParameters(false)}
diff --git a/application/v2_ui/src/components/workspaceActions/ActionFields.tsx b/application/v2_ui/src/components/workspaceActions/ActionFields.tsx
index 28828e688..83670cbf0 100644
--- a/application/v2_ui/src/components/workspaceActions/ActionFields.tsx
+++ b/application/v2_ui/src/components/workspaceActions/ActionFields.tsx
@@ -3,12 +3,13 @@
 import { useEffect, useRef, useState, type ReactNode } from 'react';
 import { GlassButton } from '../ui/primitives';
 import { EDITOR_SECRET_MASK, isRecord } from '../../lib/workspaceAuthoring';
+import { EditorFieldRow, type EditorFieldWidth } from '../workspace/EditorLayout';
 
 export const ACTION_INPUT_CLASS =
     'w-full min-w-0 rounded-xl border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1 placeholder:text-text-3 focus:border-accent focus:outline-none focus-visible:ring-2 focus-visible:ring-accent/30 disabled:opacity-60';
 
 export function ActionField({
-    id, label, help, error, children, required,
+    id, label, help, error, children, required, width,
 }: {
     id: string;
     label: string;
@@ -16,16 +17,13 @@ export function ActionField({
     error?: string;
     children: ReactNode;
     required?: boolean;
+    width?: EditorFieldWidth;
 }) {
     return (
-        <div className="min-w-0 space-y-1.5">
-            <label htmlFor={id} className="block text-sm font-medium text-text-1">
-                {label}{required ? <span aria-hidden="true" className="ml-1 text-danger">*</span> : null}
-            </label>
+        <EditorFieldRow htmlFor={id} label={label} required={required} help={help} helpId={`${id}-help`}
+            error={error} errorId={`${id}-error`} width={width}>
             {children}
-            {help ? <p id={`${id}-help`} className="break-words text-xs leading-relaxed text-text-3">{help}</p> : null}
-            {error ? <p id={`${id}-error`} role="alert" className="break-words text-sm text-danger">{error}</p> : null}
-        </div>
+        </EditorFieldRow>
     );
 }
 
@@ -45,7 +43,7 @@ export function ActionSecretInput({
     const configured = value === EDITOR_SECRET_MASK;
     const hadSecret = storedValue === EDITOR_SECRET_MASK;
     return (
-        <ActionField id={id} label={label} error={error} help={help}>
+        <ActionField id={id} label={label} error={error} help={help} width={multiline ? 'full' : 'wide'}>
             {multiline ? <textarea id={id} rows={7} autoComplete="off" spellCheck={false}
                 value={configured ? '' : typeof value === 'string' ? value : ''}
                 placeholder={configured ? 'Stored securely — paste a replacement' : 'Paste the complete value, including line breaks'}
@@ -123,7 +121,7 @@ export function ActionJsonInput({
 
     };
     return (
-        <ActionField id={id} label={label} error={parseError || error}
+        <ActionField id={id} label={label} error={parseError || error} width="full"
             help={[help, protectArraySecrets
                 ? 'Stored array credentials are tied to their saved positions, not entry names or IDs. Use structured fields, or replace/clear those credentials before editing this JSON.'
                 : ''].filter(Boolean).join(' ')}>
diff --git a/application/v2_ui/src/components/workspaceActions/ActionSchemaFields.tsx b/application/v2_ui/src/components/workspaceActions/ActionSchemaFields.tsx
index e6d902044..caaa1952e 100644
--- a/application/v2_ui/src/components/workspaceActions/ActionSchemaFields.tsx
+++ b/application/v2_ui/src/components/workspaceActions/ActionSchemaFields.tsx
@@ -4,6 +4,7 @@ import { useId, useState } from 'react';
 import { Plus, Trash2 } from 'lucide-react';
 import { GlassButton } from '../ui/primitives';
 import { ActionField, ActionJsonInput, ActionSecretInput, ACTION_INPUT_CLASS } from './ActionFields';
+import { EditorPanel, EditorPanelFieldset, EditorRow } from '../workspace/EditorLayout';
 import { EDITOR_SECRET_MASK, isRecord, pointerPart, type EditorSchema } from '../../lib/workspaceAuthoring';
 import {
     actionArrayRemovalError, actionFieldError, actionHasStoredArraySecrets, actionSchemaDefaults,
@@ -56,35 +57,29 @@ export function ActionSchemaValue({
             help="Deeply nested configuration can be edited here without replacing sibling properties." />
     );
     if (fieldType === 'object' && value === undefined && !required) return (
-        <div className="space-y-2">
-            <p className="text-sm font-medium text-text-1">{label} <span className="text-xs font-normal text-text-3">(optional)</span></p>
-            {resolved.description ? <p className="text-xs text-text-3">{resolved.description}</p> : null}
+        <EditorRow heading={<>{label} <span className="text-xs font-normal text-text-3">(optional)</span></>} help={resolved.description}>
             {props.readOnly ? <p className="text-xs text-text-3">Not configured.</p> :
-                <GlassButton type="button" size="sm" onClick={() => change(actionSchemaDefaults(resolved, root) ?? {})}>
+                <div><GlassButton type="button" size="sm" variant="subtle" onClick={() => change(actionSchemaDefaults(resolved, root) ?? {})}>
                     <Plus size={13} /> Configure {label.toLowerCase()}
-                </GlassButton>}
-        </div>
+                </GlassButton></div>}
+        </EditorRow>
     );
     if (depth < 12 && fieldType === 'object') return (
-        <fieldset className="min-w-0 space-y-3 rounded-xl border border-edge p-3">
-            <legend className="px-1 text-sm font-medium text-text-1">{label}</legend>
-            {resolved.description ? <p className="text-xs text-text-3">{resolved.description}</p> : null}
+        <EditorPanelFieldset legend={label} description={resolved.description}>
             <ActionSchemaFields props={props} schema={resolved} path={path} root={root} depth={depth + 1}
                 allowCustom={resolved.additionalProperties !== false} />
-            {!required && !props.readOnly ? <GlassButton type="button" size="sm" onClick={() => change(undefined)}>Remove {label.toLowerCase()} configuration</GlassButton> : null}
+            {!required && !props.readOnly ? <div><GlassButton type="button" size="sm" variant="ghost" onClick={() => change(undefined)}>Remove {label.toLowerCase()} configuration</GlassButton></div> : null}
             {error ? <p role="alert" className="text-sm text-danger">{error}</p> : null}
-        </fieldset>
+        </EditorPanelFieldset>
     );
     if (depth < 12 && fieldType === 'array') {
         const items = Array.isArray(value) ? value : [];
         const itemSchema = resolved.items ?? {};
         return (
-            <fieldset className="min-w-0 space-y-3 rounded-xl border border-edge p-3">
-                <legend className="px-1 text-sm font-medium text-text-1">{label}</legend>
-                {resolved.description ? <p className="text-xs text-text-3">{resolved.description}</p> : null}
+            <EditorPanelFieldset legend={label} description={resolved.description}>
                 {items.map((_, index) => {
                     const removalError = actionArrayRemovalError(props.draft, props.original, path, index);
-                    return <div key={index} className="min-w-0 space-y-2 rounded-lg bg-surface-2 p-3">
+                    return <div key={index} className="min-w-0 space-y-2 rounded-lg border border-edge bg-surface-1 p-3">
                         <ActionSchemaValue props={props} path={`${path}/${index}`} schema={itemSchema} root={root}
                             label={`${label} ${index + 1}`} depth={depth + 1} />
                         {!props.readOnly ? <GlassButton type="button" size="sm" disabled={Boolean(removalError)}
@@ -103,11 +98,11 @@ export function ActionSchemaValue({
                         change([...items, initial ?? (itemType === 'object' ? {} : itemType === 'array' ? [] : itemType === 'boolean' ? false : itemType === 'number' || itemType === 'integer' ? 0 : '')]);
                     }}><Plus size={13} /> Add {label.toLowerCase()} entry</GlassButton> : null}
                 {error ? <p role="alert" className="text-sm text-danger">{error}</p> : null}
-            </fieldset>
+            </EditorPanelFieldset>
         );
     }
     if (fieldType === 'boolean') return (
-        <ActionField id={id} label={label} help={resolved.description} error={error}>
+        <ActionField id={id} label={label} help={resolved.description} error={error} width="standard">
             <select id={id} value={value === undefined ? '' : String(value)} disabled={props.readOnly}
                 className={ACTION_INPUT_CLASS} aria-invalid={Boolean(error)}
                 onChange={(event) => change(event.target.value === '' ? undefined : event.target.value === 'true')}>
@@ -120,7 +115,7 @@ export function ActionSchemaValue({
     if (values) {
         const selected = values.findIndex((item) => JSON.stringify(item) === JSON.stringify(value));
         return (
-            <ActionField id={id} label={label} help={resolved.description} error={error} required={required}>
+            <ActionField id={id} label={label} help={resolved.description} error={error} required={required} width="standard">
                 <select id={id} value={selected < 0 ? (value === undefined ? '' : 'unavailable') : String(selected)}
                     required={required} disabled={props.readOnly || Object.hasOwn(resolved, 'const')} className={ACTION_INPUT_CLASS}
                     onChange={(event) => change(event.target.value === '' ? undefined : values[Number(event.target.value)])}>
@@ -137,7 +132,7 @@ export function ActionSchemaValue({
         'aria-invalid': Boolean(error), 'aria-describedby': `${id}-help ${id}-error`,
     };
     return (
-        <ActionField id={id} label={label} help={resolved.description} error={error} required={required}>
+        <ActionField id={id} label={label} help={resolved.description} error={error} required={required} width={numeric ? 'compact' : 'wide'}>
             {numeric ? <input {...shared} type="number" step={fieldType === 'integer' ? 1 : 'any'}
                 min={resolved.minimum} max={resolved.maximum} value={typeof value === 'number' ? value : ''}
                 onChange={(event) => change(event.target.value === '' ? undefined : event.target.valueAsNumber)} />
@@ -191,22 +186,22 @@ function ActionAddCustomField({ props, path, existing }: { props: ActionConnecto
     const [type, setType] = useState('text');
     const [error, setError] = useState('');
     return (
-        <div className="rounded-xl border border-edge p-3">
-            <p className="mb-3 text-xs text-text-3">Add an installed connector’s custom property. Names ending in __Secret are treated as credentials.</p>
-            <div className="flex flex-wrap items-end gap-2">
-                <div className="min-w-36 flex-1">
-                    <ActionField id={`${id}-name`} label="Custom field name" error={error}>
-                        <input id={`${id}-name`} value={name} className={ACTION_INPUT_CLASS}
-                            onChange={(event) => { setName(event.target.value); setError(''); }} />
-                    </ActionField>
-                </div>
-                <ActionField id={`${id}-type`} label="Value type">
+        <EditorPanel title="Add a custom field"
+            description="Add an installed connector’s custom property. Names ending in __Secret are treated as credentials.">
+            <div className="min-w-0">
+                <ActionField id={`${id}-name`} label="Custom field name" error={error} width="standard">
+                    <input id={`${id}-name`} value={name} className={ACTION_INPUT_CLASS}
+                        onChange={(event) => { setName(event.target.value); setError(''); }} />
+                </ActionField>
+                <ActionField id={`${id}-type`} label="Value type" width="compact">
                     <select id={`${id}-type`} value={type} className={ACTION_INPUT_CLASS} onChange={(event) => setType(event.target.value)}>
                         <option value="text">Text</option><option value="number">Number</option><option value="boolean">Boolean</option>
                         <option value="object">Object</option><option value="array">List</option><option value="secret">Secret</option>
                     </select>
                 </ActionField>
-                <GlassButton type="button" size="sm" onClick={() => {
+            </div>
+            <div className="flex justify-end">
+                <GlassButton type="button" size="sm" variant="subtle" onClick={() => {
                     const raw = name.trim();
                     const key = type === 'secret' && !raw.endsWith('__Secret') ? `${raw}__Secret` : raw;
                     if (!raw || existing.includes(key)) { setError(raw ? 'That property already exists.' : 'Enter a property name.'); return; }
@@ -215,6 +210,6 @@ function ActionAddCustomField({ props, path, existing }: { props: ActionConnecto
                     setName(''); setError('');
                 }}><Plus size={14} /> Add field</GlassButton>
             </div>
-        </div>
+        </EditorPanel>
     );
 }
diff --git a/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx b/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx
index 4704c3420..855a4d218 100644
--- a/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx
+++ b/application/v2_ui/src/components/workspaceActions/CallAgentActionConfiguration.tsx
@@ -57,8 +57,8 @@ export function CallAgentActionConfiguration(props: ActionConnectorProps) {
     }, [props.readOnly, validation]);
     return (
         <div className="space-y-4" data-testid="call-agent-configuration">
-            <p className="text-sm text-text-2">This action calls one explicitly selected agent using your current permissions.</p>
-            <ActionField id={`${id}-search`} label="Search target agents">
+            <p className="text-[0.8125rem] leading-relaxed text-text-2">This action calls one explicitly selected agent using your current permissions.</p>
+            <ActionField id={`${id}-search`} label="Search target agents" width="standard">
                 <input id={`${id}-search`} type="search" className={ACTION_INPUT_CLASS} value={query}
                     onChange={(event) => setQuery(event.target.value)} />
             </ActionField>
@@ -90,11 +90,11 @@ export function CallAgentActionConfiguration(props: ActionConnectorProps) {
                 The saved target is unavailable or access was revoked. Its scope and ID are retained; no same-name agent will be selected automatically.
             </p> : null}
             {selected ? <p className="break-words text-sm text-text-2">{selected.description || 'Only this selected agent can be called by the action.'}</p> : null}
-            {target ? <dl className="grid gap-1 break-all text-xs text-text-3">
+            {target ? <dl className="grid gap-1 break-all rounded-lg border border-edge bg-surface-1 px-3 py-2 text-xs text-text-3">
                 <div><dt className="inline font-medium">Scope: </dt><dd className="inline">{target.scope_type} · {target.scope_id}</dd></div>
                 <div><dt className="inline font-medium">Agent ID: </dt><dd className="inline">{target.id}</dd></div>
             </dl> : null}
-            <p className="text-xs leading-relaxed text-text-3">
+            <p className="border-t border-edge pt-3 text-xs leading-relaxed text-text-3">
                 Only the task and explicit context are passed, not the full conversation. Self-calls and cycles are blocked by the server.
                 Limits are 3 levels, 10 calls per turn, and 120 seconds per call. No endpoint, credential, or connection test is needed.
             </p>
diff --git a/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx b/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx
index e31a89319..bdf8a29f6 100644
--- a/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx
+++ b/application/v2_ui/src/components/workspaceActions/McpActionConfiguration.tsx
@@ -1,7 +1,8 @@
 // McpActionConfiguration.tsx
 
 import { useEffect, useRef, useState } from 'react';
-import { GlassButton, GlassPanel, Toggle } from '../ui/primitives';
+import { GlassButton } from '../ui/primitives';
+import { EditorFieldset, EditorGroup, EditorPanel, EditorSwitch } from '../workspace/EditorLayout';
 import { ACTION_INPUT_CLASS, ActionField, ActionJsonInput, ActionSecretInput } from './ActionFields';
 import { ActionSchemaValue } from './ActionSchemaFields';
 import {
@@ -120,20 +121,15 @@ function McpImplementationConfiguration(props: ActionConnectorProps) {
     const updateSetting = (key: string, value: unknown) => onChange((current) => updateConnectorFields(current, {
         additionalSettings: { ...connectorObject(current.additionalFields.additionalSettings), [key]: value },
     }));
-    return <GlassPanel elevation="flat" className="space-y-4 p-4">
-        <div>
-            <h3 className="text-sm font-semibold text-text-1">Implementation settings</h3>
-            <p className="mt-1 break-words text-xs text-text-3">
-                {implementationId || 'Custom implementation'}{implementation.schemaVersion ? ` · schema ${connectorText(implementation.schemaVersion)}` : ''}
-            </p>
-            <p className="mt-1 text-xs text-text-3">These settings come from the applied server catalogue entry. Fixed safety requirements are not editable; provider-specific selections remain explicit.</p>
-        </div>
+    return <EditorPanel title="Implementation settings"
+        description={`${implementationId || 'Custom implementation'}${implementation.schemaVersion ? ` · schema ${connectorText(implementation.schemaVersion)}` : ''}`}>
+        <p className="text-xs text-text-3">These settings come from the applied server catalogue entry. Fixed safety requirements are not editable; provider-specific selections remain explicit.</p>
         {fields.map((field) => {
             const id = `mcp-implementation-${field.key}`;
             const value = settings[field.key];
             const errorKey = `additionalFields.additionalSettings.${field.key}`;
             const error = errors[errorKey] || localErrors[errorKey];
-            if (field.kind === 'fixed') return <ActionField key={field.key} id={id} label={field.label} help={field.help} error={error}>
+            if (field.kind === 'fixed') return <ActionField key={field.key} id={id} label={field.label} help={field.help} error={error} width="standard">
                 <input id={id} readOnly className={ACTION_INPUT_CLASS}
                     value={value === undefined ? 'Not configured' : typeof value === 'boolean' ? value ? 'Yes' : 'No' : connectorText(value)} />
                 {!readOnly && value !== field.expected ? <GlassButton type="button" size="sm" variant="subtle"
@@ -141,7 +137,7 @@ function McpImplementationConfiguration(props: ActionConnectorProps) {
                     Use {field.optional ? 'recommended' : 'required'} value: {String(field.expected)}
                 </GlassButton> : null}
             </ActionField>;
-            if (field.kind === 'select') return <ActionField key={field.key} id={id} label={field.label} help={field.help} error={error}>
+            if (field.kind === 'select') return <ActionField key={field.key} id={id} label={field.label} help={field.help} error={error} width="standard">
                 <select id={id} className={ACTION_INPUT_CLASS} value={connectorText(value)} disabled={readOnly}
                     onChange={(event) => updateSetting(field.key, event.target.value)}>
                     {!field.options?.some((option) => option.value === value) ? <option value={connectorText(value)} disabled>{value ? `Unavailable — ${connectorText(value)}` : 'Choose a value'}</option> : null}
@@ -152,8 +148,7 @@ function McpImplementationConfiguration(props: ActionConnectorProps) {
                 help={field.help} error={error} readOnly={readOnly} onChange={(next) => updateSetting(field.key, next)} />;
             const selected = connectorStrings(value);
             const unavailable = selected.filter((item) => !field.options?.some((option) => option.value === item));
-            return <fieldset key={field.key} className="space-y-2" disabled={readOnly}>
-                <legend className="text-sm font-medium text-text-1">{field.label}</legend>
+            return <EditorFieldset key={field.key} legend={field.label} disabled={readOnly}>
                 {[...(field.options ?? []), ...unavailable.map((item) => ({ value: item, label: `${item} (unavailable — retained)` }))].map((option) =>
                     <label key={option.value} className="flex items-start gap-2 text-sm text-text-2">
                         <input type="checkbox" className="mt-1 accent-accent" checked={selected.includes(option.value)}
@@ -162,7 +157,7 @@ function McpImplementationConfiguration(props: ActionConnectorProps) {
                         <span className="break-words">{option.label}</span>
                     </label>)}
                 {error ? <p role="alert" className="text-xs text-danger">{error}</p> : null}
-            </fieldset>;
+            </EditorFieldset>;
         })}
         {extraSettings.length ? <div className="space-y-4 border-t border-edge pt-4">
             <p className="text-xs text-text-3">Additional implementation properties are retained. The server remains authoritative for custom implementation validation.</p>
@@ -171,7 +166,7 @@ function McpImplementationConfiguration(props: ActionConnectorProps) {
                 if (value === EDITOR_SECRET_MASK || originalSettings[key] === EDITOR_SECRET_MASK) return <ActionSecretInput key={key}
                     id={id} label={key} value={value} storedValue={originalSettings[key]} disabled={readOnly}
                     onChange={(next) => updateSetting(key, next)} />;
-                if (typeof value === 'boolean') return <Toggle key={key} label={key} checked={value} disabled={readOnly}
+                if (typeof value === 'boolean') return <EditorSwitch key={key} label={key} checked={value} disabled={readOnly}
                     onChange={(next) => updateSetting(key, next)} />;
                 if (typeof value === 'string' || typeof value === 'number') return <ActionField key={key} id={id} label={key}>
                     <input id={id} className={ACTION_INPUT_CLASS} type={typeof value === 'number' ? 'number' : 'text'}
@@ -182,7 +177,7 @@ function McpImplementationConfiguration(props: ActionConnectorProps) {
                     path={`/additionalFields/additionalSettings/${pointerPart(key)}`} label={key} />;
             })}
         </div> : null}
-    </GlassPanel>;
+    </EditorPanel>;
 }
 
 export function McpActionConfiguration(props: ActionConnectorProps) {
@@ -236,10 +231,9 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
 
     return (
         <div className="min-w-0 space-y-6" data-testid="mcp-configuration">
-            <p className="text-sm leading-relaxed text-text-2">Connect to a Model Context Protocol server and expose its tools or prompts to agents. Server discovery and connection testing are explicit commands; selecting a template or saving an action never runs either.</p>
-            <GlassPanel elevation="flat" className="space-y-4 p-4">
-                <h3 className="text-sm font-semibold text-text-1">Server starting points</h3>
-                <p className="text-xs text-text-3">Choose a preconfiguration or compatibility preset, review it, then apply its defaults. Existing custom fields, secret state, identity references, and selected tools are retained.</p>
+            <p className="text-[0.8125rem] leading-relaxed text-text-2">Connect to a Model Context Protocol server and expose its tools or prompts to agents. Server discovery and connection testing are explicit commands; selecting a template or saving an action never runs either.</p>
+            <EditorPanel title="Server starting points"
+                description="Choose a preconfiguration or compatibility preset, review it, then apply its defaults. Existing custom fields, secret state, identity references, and selected tools are retained.">
                 {catalogue.loading ? <p role="status" className="text-xs text-text-3">Loading MCP catalogues…</p> : null}
                 {catalogue.presetsError || catalogue.preconfigurationsError ? <div role="alert" className="alert alert-warning space-y-2 rounded-xl bg-warn-soft p-3 text-sm text-warn">
                     {catalogue.presetsError ? <p>{catalogue.presetsError} The built-in generic preset remains available.</p> : null}
@@ -262,7 +256,7 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                 <McpCatalogueDetails entry={chosenPreconfiguration} />
                 {chosenPreconfiguration ? <p className="break-all text-xs text-text-3">Endpoint to apply: {chosenPreconfiguration.endpoint || 'No endpoint default'}</p> : null}
                 {preconfigurationId && !catalogue.preconfigurations.some(({ id }) => id === preconfigurationId) ? <p className="text-xs text-warn">Saved preconfiguration {preconfigurationId} is unavailable. Its implementation settings remain intact.</p> : null}
-                <GlassButton type="button" variant="subtle"
+                <div><GlassButton type="button" variant="subtle"
                     disabled={readOnly || Boolean(busy) || catalogue.loading || Boolean(preconfigurationChoice && !chosenPreconfiguration)}
                     onClick={() => {
                         if (!chosenPreconfiguration) {
@@ -281,9 +275,9 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                         }
                     }}>
                     {preconfigurationChoice ? 'Apply server preconfiguration' : 'Use custom configuration'}
-                </GlassButton>
+                </GlassButton></div>
                 </>)}
-                <div className="space-y-3 border-t border-edge pt-4">
+                <div className="space-y-3 border-t border-edge pt-3">
                     <ActionField id="mcp-preset" label="Compatibility preset">
                         <select id="mcp-preset" className={ACTION_INPUT_CLASS} value={presetChoice} disabled={readOnly || catalogue.loading}
                             onChange={(event) => setPresetChoice(event.target.value)}>
@@ -293,7 +287,7 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                     </ActionField>
                     <McpCatalogueDetails entry={chosenPreset} />
                     {!preset ? <p className="text-xs text-warn">Saved preset {profile} is unavailable. It has not been replaced.</p> : null}
-                    <GlassButton type="button" variant="subtle" disabled={readOnly || Boolean(busy) || !chosenPreset || catalogue.loading}
+                    <div><GlassButton type="button" variant="subtle" disabled={readOnly || Boolean(busy) || !chosenPreset || catalogue.loading}
                         onClick={() => {
                             if (!chosenPreset) return;
                             try {
@@ -303,12 +297,12 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                             } catch (error) {
                                 setApplyError(error instanceof Error ? error.message : 'Could not apply the preset.');
                             }
-                        }}>Apply preset defaults</GlassButton>
+                        }}>Apply preset defaults</GlassButton></div>
                 </div>
                 {applyError ? <p role="alert" className="text-sm text-danger">{applyError}</p> : null}
-            </GlassPanel>
-            <div className="grid gap-4 sm:grid-cols-2">
-                <ActionField id="mcp-transport" label="Transport" required error={fieldError('transport')}
+            </EditorPanel>
+            <div className="min-w-0">
+                <ActionField id="mcp-transport" label="Transport" required width="standard" error={fieldError('transport')}
                     help="MCP actions support remote transports only. Local commands and stdio are no longer supported, including administrator-managed actions.">
                     <select id="mcp-transport" className={ACTION_INPUT_CLASS} value={transport} disabled={readOnly}
                         onChange={(event) => {
@@ -343,15 +337,14 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
             </div> : null}
             {transport === 'websocket' ? <p className="alert alert-warning rounded-xl bg-warn-soft p-3 text-sm text-warn">The current WebSocket connector supports neither authentication headers nor custom headers. Existing credentials and headers are retained until you explicitly change them.</p> : null}
             <McpImplementationConfiguration {...props} />
-            <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-text-1">Tools and prompts</h3>
-                <Toggle label="Load tools" description="Expose tools from this MCP server to agents using this action."
+            <EditorPanel title="Tools and prompts">
+                <EditorSwitch label="Load tools" description="Expose tools from this MCP server to agents using this action."
                     checked={(fields.load_tools ?? true) === true} disabled={readOnly} onChange={(value) => updateField('load_tools', value)} />
-                <Toggle label="Load prompts" description="Load MCP server prompts in addition to any enabled tools."
+                <EditorSwitch label="Load prompts" description="Load MCP server prompts in addition to any enabled tools."
                     checked={(fields.load_prompts ?? false) === true} disabled={readOnly} onChange={(value) => updateField('load_prompts', value)} />
-                <Toggle label="Validate tool arguments" description="Check arguments against cached tool input schemas before invocation. Discover tools to populate the schema cache."
+                <EditorSwitch label="Validate tool arguments" description="Check arguments against cached tool input schemas before invocation. Discover tools to populate the schema cache."
                     checked={(fields.validate_tool_arguments ?? false) === true} disabled={readOnly} onChange={(value) => updateField('validate_tool_arguments', value)} />
-                <ActionField id="mcp-result-policy" label="Large-result policy" error={fieldError('tool_result_policy')}>
+                <ActionField id="mcp-result-policy" label="Large-result policy" width="standard" error={fieldError('tool_result_policy')}>
                     <select id="mcp-result-policy" className={ACTION_INPUT_CLASS} value={connectorText(fields.tool_result_policy ?? 'truncate')} disabled={readOnly}
                         onChange={(event) => updateField('tool_result_policy', event.target.value)}>
                         {!['truncate', 'error_on_limit'].includes(connectorText(fields.tool_result_policy ?? 'truncate')) ? <option value={connectorText(fields.tool_result_policy)} disabled>Unavailable — {connectorText(fields.tool_result_policy)}</option> : null}
@@ -368,8 +361,7 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                     <GlassButton type="button" variant="subtle" disabled={blockedExecution} onClick={() => void doDiscovery()}>Discover MCP tools</GlassButton>
                     <p className="text-xs text-text-3">Discovery connects and lists tools; it does not invoke them.</p>
                 </div>
-                {discovery ? <GlassPanel elevation="flat" className="space-y-2 p-3">
-                    <h4 className="text-sm font-medium text-text-1">Last discovery capabilities</h4>
+                {discovery ? <EditorPanel title="Last discovery capabilities">
                     {!lastDiscoveryMatches ? <p className="text-xs text-warn">The endpoint or transport changed after this discovery. Run discovery again to verify the current server.</p> : null}
                     <dl className="grid gap-2 text-xs text-text-2 sm:grid-cols-2">
                         {Object.entries(connectorObject(discovery.result.capabilities)).map(([key, value]) =>
@@ -381,9 +373,9 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                     {discovery.result.warnings?.length ? <ul className="list-disc space-y-1 pl-5 text-xs text-warn">
                         {discovery.result.warnings.map((warning, index) => <li key={index} className="break-words">{warning}</li>)}
                     </ul> : null}
-                </GlassPanel> : null}
+                </EditorPanel> : null}
                 {choices.length ? <div className="space-y-3">
-                    <ActionField id="mcp-tool-search" label="Find a tool">
+                    <ActionField id="mcp-tool-search" label="Find a tool" width="standard">
                         <input id="mcp-tool-search" type="search" className={ACTION_INPUT_CLASS} value={toolSearch}
                             placeholder="Tool name or description" onChange={(event) => { setToolSearch(event.target.value); setToolLimit(30); }} />
                     </ActionField>
@@ -392,7 +384,7 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                         const id = `mcp-tool-${index}`;
                         const schema = connectorObject(tool?.input_schema);
                         const required = connectorStrings(schema.required);
-                        return <GlassPanel key={name} elevation="flat" className="space-y-2 p-3">
+                        return <div key={name} className="min-w-0 space-y-2 rounded-lg border border-edge bg-surface-1 p-3">
                             <label htmlFor={id} className="flex items-start gap-3">
                                 <input id={id} type="checkbox" className="mt-1 accent-accent" checked={selected} disabled={readOnly}
                                     onChange={(event) => {
@@ -425,34 +417,32 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                                     }, null, 2)}</pre>
                                 </div>
                             </details> : null}
-                        </GlassPanel>;
+                        </div>;
                     })}
                     {!filteredTools.length ? <p className="text-sm text-text-3">No tools match this search.</p> : null}
                     {filteredTools.length > toolLimit ? <GlassButton type="button" variant="subtle" onClick={() => setToolLimit((value) => value + 30)}>Show more tools</GlassButton> : null}
                 </div> : <p className="text-sm text-text-3">No tool metadata is cached. Discover tools when ready, or enter known tool names above.</p>}
-                <details className="space-y-3">
-                    <summary className="cursor-pointer text-sm text-text-2">Advanced cached tool metadata</summary>
+                <EditorGroup summary="Advanced cached tool metadata">
                     <ActionJsonInput id="mcp-tool-metadata" label="Discovered tool metadata JSON" value={fields.mcp_tools ?? []}
                         objectOnly={false} readOnly={readOnly} onValidityChange={props.onValidityChange}
                         protectArraySecrets={actionHasStoredArraySecrets(draft, original, '/additionalFields/mcp_tools')}
                         error={fieldError('mcp_tools')} rows={10}
                         help="Preserve original_name and function_name. Editing cached metadata does not discover or run tools."
                         onChange={(value) => updateField('mcp_tools', value)} />
-                </details>
-            </div>
-            <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-text-1">Timeouts and retry policy</h3>
-                <div className="grid gap-4 sm:grid-cols-2">
-                    {MCP_NUMBER_FIELDS.map((field) => <ActionField key={field.key} id={`mcp-${field.key}`} label={field.label} error={fieldError(field.key)}>
+                </EditorGroup>
+            </EditorPanel>
+            <EditorPanel title="Timeouts and retry policy">
+                <div className="min-w-0">
+                    {MCP_NUMBER_FIELDS.map((field) => <ActionField key={field.key} id={`mcp-${field.key}`} label={field.label} width="compact" error={fieldError(field.key)}>
                         <input id={`mcp-${field.key}`} type="number" inputMode="numeric" step={1} min={field.min} max={field.max}
                             className={ACTION_INPUT_CLASS} disabled={readOnly}
                             value={typeof fields[field.key] === 'number' || typeof fields[field.key] === 'string' ? fields[field.key] as number | string : field.defaultValue}
                             onChange={(event) => updateField(field.key, event.target.value === '' ? '' : Number(event.target.value))} />
                     </ActionField>)}
                 </div>
-            </div>
-            <div className="space-y-3 border-t border-edge pt-4">
-                <p className="text-xs text-text-3">The connection test initializes a server session and lists its tools. It does not invoke tools or save discovered metadata. Authentication is configured in the Authentication section.</p>
+            </EditorPanel>
+            <EditorPanel title="Validate and test"
+                description="The connection test initializes a server session and lists its tools. It does not invoke tools or save discovered metadata. Authentication is configured in the Authentication section.">
                 <div className="flex flex-wrap items-center gap-2">
                     <GlassButton type="button" variant="subtle" disabled={blockedExecution}
                         onClick={() => void run('Validating MCP configuration…', (signal) => validateApiConnector(draft, original, 'mcp', signal, connectorTestScope(props)))}>Validate MCP configuration</GlassButton>
@@ -463,7 +453,7 @@ export function McpActionConfiguration(props: ActionConnectorProps) {
                 {readOnly ? <p className="text-xs text-text-3">Provided actions are read-only. Discovery and connection testing are disabled.</p> : null}
                 {!readOnly && Object.keys(localErrors).length ? <p className="text-xs text-text-3">Resolve the highlighted configuration errors before validating or connecting.</p> : null}
                 <ConnectorFeedbackPanel feedback={feedback} stale={stale} />
-            </div>
+            </EditorPanel>
         </div>
     );
 }
@@ -501,7 +491,7 @@ export function McpActionAuthentication(props: ActionConnectorProps) {
         <div className="space-y-5" data-testid="mcp-authentication">
             <ConnectorIdentitySelect {...props} identities={transport === 'websocket' ? [] : props.identities} kind="mcp" />
             {catalogue.presetsError ? <p role="alert" className="text-xs text-warn">{catalogue.presetsError} Saved authentication and header values have not been changed.</p> : null}
-            <ActionField id="mcp-auth-method" label="Authentication method" error={fieldError('additionalFields.auth_method')}
+            <ActionField id="mcp-auth-method" label="Authentication method" width="standard" error={fieldError('additionalFields.auth_method')}
                 help={draft.identity_id ? 'The selected identity is resolved on the server; no credentials are copied into the action.' : 'A method change only edits this draft. Inactive credentials are retained until explicitly cleared.'}>
                 <select id="mcp-auth-method" className={ACTION_INPUT_CLASS} value={method} disabled={readOnly || Boolean(draft.identity_id)}
                     onChange={(event) => {
@@ -514,7 +504,7 @@ export function McpActionAuthentication(props: ActionConnectorProps) {
                     {allowedMethods.map((option) => <option key={option.value} value={option.value}>{option.label}</option>)}
                 </select>
             </ActionField>
-            {(method === 'api_key' || apiKeyIdentity) ? <ActionField id="mcp-api-key-header" label="API key header name" required error={fieldError('additionalFields.api_key_header_name')}>
+            {(method === 'api_key' || apiKeyIdentity) ? <ActionField id="mcp-api-key-header" label="API key header name" required width="standard" error={fieldError('additionalFields.api_key_header_name')}>
                 <input id="mcp-api-key-header" className={ACTION_INPUT_CLASS} disabled={readOnly}
                     value={connectorText(fields.api_key_header_name ?? 'X-API-Key')}
                     onChange={(event) => {
@@ -536,22 +526,19 @@ export function McpActionAuthentication(props: ActionConnectorProps) {
                 value={draft.auth.key} storedValue={original?.record.auth.key} disabled={readOnly}
                 error={fieldError('auth.key')} onChange={(value) => updateAuth('key', value)} /> : null}
             {method === 'identity' && !draft.identity_id ? <p role="alert" className="text-sm text-danger">Choose a compatible reusable identity above before testing or saving.</p> : null}
-            <div className="space-y-4 border-t border-edge pt-4">
-                <div>
-                    <h3 className="text-sm font-semibold text-text-1">Custom HTTP headers</h3>
-                    <p className="mt-1 text-xs leading-relaxed text-text-3">All header values are treated as secrets. Authentication headers override matching custom headers. To rename a stored header, remove it and add the new name with a replacement value.</p>
-                </div>
+            <EditorPanel title="Custom HTTP headers"
+                description="All header values are treated as secrets. Authentication headers override matching custom headers. To rename a stored header, remove it and add the new name with a replacement value.">
                 {!canAddHeaders ? <p className="alert alert-warning rounded-lg bg-warn-soft p-2 text-xs text-warn">This transport or preset does not support custom headers. Existing values are preserved for review; remove them explicitly before connecting, or select a compatible transport/preset.</p> : null}
                 {fieldError('additionalFields.custom_headers') ? <p role="alert" className="text-sm text-danger">{fieldError('additionalFields.custom_headers')}</p> : null}
-                {Object.entries(headers).map(([name, value], index) => <GlassPanel key={name} elevation="flat" className="space-y-2 p-3">
+                {Object.entries(headers).map(([name, value], index) => <div key={name} className="min-w-0 space-y-2 rounded-lg border border-edge bg-surface-1 p-3">
                     <ActionSecretInput id={`mcp-header-value-${index}`} label={name} value={value} storedValue={originalHeaders[name]}
                         disabled={readOnly} error={fieldError(`additionalFields.custom_headers.${name}`)}
                         onChange={(next) => updateHeader(name, next)} />
                     {!readOnly ? <GlassButton type="button" size="sm" variant="danger" onClick={() => removeHeader(name)}>Remove header {name}</GlassButton> : null}
-                </GlassPanel>)}
+                </div>)}
                 {!Object.keys(headers).length ? <p className="text-sm text-text-3">No custom headers configured.</p> : null}
                 {!readOnly ? <div className="space-y-2">
-                    <ActionField id="mcp-new-header-name" label="New header name" error={headerError ?? undefined}>
+                    <ActionField id="mcp-new-header-name" label="New header name" width="standard" error={headerError ?? undefined}>
                         <input id="mcp-new-header-name" className={ACTION_INPUT_CLASS} value={newHeaderName}
                             placeholder="X-Request-Source" disabled={!canAddHeaders || Object.keys(headers).length >= 20}
                             onChange={(event) => { setNewHeaderName(event.target.value); setHeaderError(null); }} />
@@ -567,7 +554,7 @@ export function McpActionAuthentication(props: ActionConnectorProps) {
                         }}>Add custom header</GlassButton>
                     <p className="text-xs text-text-3">{Object.keys(headers).length}/20 headers. Values may contain up to 4096 characters and must not contain line breaks.</p>
                 </div> : null}
-            </div>
+            </EditorPanel>
         </div>
     );
 }
diff --git a/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx b/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx
index b92fa80ce..0eea2934e 100644
--- a/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx
+++ b/application/v2_ui/src/components/workspaceActions/OpenApiActionConfiguration.tsx
@@ -1,7 +1,8 @@
 // OpenApiActionConfiguration.tsx
 
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { GlassButton, GlassPanel } from '../ui/primitives';
+import { GlassButton } from '../ui/primitives';
+import { EditorGroup, EditorPanel, EditorRow } from '../workspace/EditorLayout';
 import { ActionField, ActionSecretInput, ACTION_INPUT_CLASS } from './ActionFields';
 import { connectorTestScope, type ActionConnectorProps } from '../../lib/workspaceActionTypes';
 import { EDITOR_SECRET_MASK, type ActionConfiguration } from '../../lib/workspaceAuthoring';
@@ -188,10 +189,10 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
 
     return (
         <div className="min-w-0 space-y-6" data-testid="openapi-configuration">
-            <p className="text-sm leading-relaxed text-text-2">
+            <p className="text-[0.8125rem] leading-relaxed text-text-2">
                 Import an OpenAPI specification to expose its operations to an agent. Importing or validating a specification does not call those operations.
             </p>
-            <ActionField id="openapi-source-mode" label="Specification source">
+            <ActionField id="openapi-source-mode" label="Specification source" width="standard">
                 <select id="openapi-source-mode" className={ACTION_INPUT_CLASS} value={source.mode} disabled={readOnly || Boolean(busy)}
                     onChange={(event) => {
                         const mode = event.target.value === 'manual' ? 'manual' : 'file';
@@ -219,7 +220,7 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                 </ActionField>
             ) : (
                 <div className="space-y-3">
-                    <ActionField id="openapi-source-format" label="Source format">
+                    <ActionField id="openapi-source-format" label="Source format" width="compact">
                         <select id="openapi-source-format" className={ACTION_INPUT_CLASS} value={source.format} disabled={readOnly || Boolean(busy)}
                             onChange={(event) => {
                                 const format = event.target.value === 'yaml' ? 'yaml' : 'json';
@@ -228,7 +229,7 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                             <option value="json">JSON</option><option value="yaml">YAML</option>
                         </select>
                     </ActionField>
-                    <ActionField id="openapi-source-text" label="Specification source"
+                    <ActionField id="openapi-source-text" label="Specification source" width="full"
                         help="Source text stays in this tab. Process the text to parse and validate it before saving. YAML is parsed on the server, not by a browser-loaded library."
                         error={localErrors['openapi-source'] || errors['additionalFields.openapi_spec_content']}>
                         <textarea id="openapi-source-text" rows={16} spellCheck={false} readOnly={readOnly}
@@ -262,10 +263,9 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                         onChange((current) => ({ ...current, endpoint, additionalFields: { ...current.additionalFields, base_url: endpoint } }));
                     }} />
             </ActionField>
-            {information.servers.length ? <div className="space-y-2">
-                <p className="text-sm font-medium text-text-1">Servers declared in the specification</p>
+            {information.servers.length ? <EditorRow heading="Servers declared in the specification">
                 <ul className="space-y-2">
-                    {information.servers.map((server, index) => <li key={`${server.url}-${index}`} className="flex flex-wrap items-center justify-between gap-2 rounded-xl border border-edge p-3">
+                    {information.servers.map((server, index) => <li key={`${server.url}-${index}`} className="flex flex-wrap items-center justify-between gap-2 rounded-lg border border-edge bg-surface-1 p-3">
                         <div className="min-w-0">
                             <p className="break-all font-mono text-xs text-text-1">{server.url}</p>
                             {server.description ? <p className="mt-1 break-words text-xs text-text-3">{server.description}</p> : null}
@@ -276,16 +276,11 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                             }))}>Use this base URL</GlassButton> : null}
                     </li>)}
                 </ul>
-            </div> : null}
-            {information.title || information.operations.length ? <GlassPanel elevation="flat" className="space-y-4 p-4">
-                <div>
-                    <h3 className="break-words font-semibold text-text-1">{information.title || 'API information'}</h3>
-                    <p className="mt-1 text-xs text-text-3">
-                        API version {information.version || 'not specified'} · OpenAPI {information.specificationVersion || 'not specified'} · {information.pathsCount} paths · {information.operations.length} operations
-                    </p>
-                    {information.description ? <p className="mt-2 whitespace-pre-wrap break-words text-sm text-text-2">{information.description}</p> : null}
-                </div>
-                <ActionField id="openapi-operation-search" label="Find an operation">
+            </EditorRow> : null}
+            {information.title || information.operations.length ? <EditorPanel title={information.title || 'API information'}
+                description={`API version ${information.version || 'not specified'} · OpenAPI ${information.specificationVersion || 'not specified'} · ${information.pathsCount} paths · ${information.operations.length} operations`}>
+                {information.description ? <p className="whitespace-pre-wrap break-words text-sm text-text-2">{information.description}</p> : null}
+                <ActionField id="openapi-operation-search" label="Find an operation" width="standard">
                     <input id="openapi-operation-search" type="search" className={ACTION_INPUT_CLASS} value={operationSearch}
                         placeholder="Method, path, operation ID, or tag" onChange={(event) => {
                             setOperationSearch(event.target.value); setOperationLimit(30);
@@ -293,7 +288,7 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                 </ActionField>
                 <p className="text-xs text-text-3">{filteredOperations.length} matching operations. This is a read-only description, not an operation runner.</p>
                 <div className="space-y-2">
-                    {filteredOperations.slice(0, operationLimit).map((operation) => <details key={`${operation.method}:${operation.path}`} className="rounded-xl border border-edge p-3">
+                    {filteredOperations.slice(0, operationLimit).map((operation) => <details key={`${operation.method}:${operation.path}`} className="rounded-lg border border-edge bg-surface-1 p-3">
                         <summary className="cursor-pointer break-words text-sm text-text-1">
                             <span className="mr-2 font-mono font-semibold">{operation.method}</span>
                             <span className="break-all font-mono text-xs">{operation.path}</span>
@@ -318,13 +313,12 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                     {!filteredOperations.length ? <p className="text-sm text-text-3">No operations match this search.</p> : null}
                     {filteredOperations.length > operationLimit ? <GlassButton type="button" variant="subtle" onClick={() => setOperationLimit((current) => current + 30)}>Show more operations</GlassButton> : null}
                 </div>
-                <details className="text-xs text-text-3">
-                    <summary className="cursor-pointer">Validated specification JSON</summary>
-                    <pre className="mt-2 max-h-96 overflow-auto whitespace-pre-wrap break-all rounded-lg bg-surface-1 p-3">{specJson}</pre>
-                </details>
-            </GlassPanel> : null}
-            <div className="space-y-3 border-t border-edge pt-4">
-                <p className="text-xs leading-relaxed text-text-3">Validation checks the manifest without running it. Connection testing parses the specification and probes the authenticated base URL; it does not invoke an individual API operation.</p>
+                <EditorGroup summary="Validated specification JSON">
+                    <pre className="max-h-96 overflow-auto whitespace-pre-wrap break-all rounded-lg bg-surface-1 p-3 text-xs text-text-3">{specJson}</pre>
+                </EditorGroup>
+            </EditorPanel> : null}
+            <EditorPanel title="Validate and test"
+                description="Validation checks the manifest without running it. Connection testing parses the specification and probes the authenticated base URL; it does not invoke an individual API operation.">
                 <div className="flex flex-wrap items-center gap-2">
                     <GlassButton type="button" variant="subtle" disabled={readOnly || Boolean(busy) || source.pending}
                         onClick={() => void run('Validating configuration…', (signal) => validateApiConnector(draft, original, 'openapi', signal, connectorTestScope(props)))}>
@@ -338,7 +332,7 @@ export function OpenApiActionConfiguration(props: ActionConnectorProps) {
                 </div>
                 {readOnly ? <p className="text-xs text-text-3">Provided actions are read-only. Import, validation, and connection testing are disabled.</p> : null}
                 <ConnectorFeedbackPanel feedback={feedback} stale={stale} />
-            </div>
+            </EditorPanel>
         </div>
     );
 }
@@ -361,7 +355,7 @@ export function OpenApiActionAuthentication(props: ActionConnectorProps) {
     return (
         <div className="space-y-5" data-testid="openapi-authentication">
             <ConnectorIdentitySelect {...props} kind="openapi" />
-            <ActionField id="openapi-auth-method" label="Authentication method" error={authError('additionalFields.auth_method')}
+            <ActionField id="openapi-auth-method" label="Authentication method" width="standard" error={authError('additionalFields.auth_method')}
                 help={draft.identity_id ? 'The selected reusable identity controls authentication.' : 'Changing a method does not test or run the action. Choosing no authentication clears action-specific credentials, including their legacy aliases.'}>
                 <select id="openapi-auth-method" className={ACTION_INPUT_CLASS} value={method} disabled={readOnly || Boolean(draft.identity_id)}
                     onChange={(event) => {
@@ -373,8 +367,8 @@ export function OpenApiActionAuthentication(props: ActionConnectorProps) {
                     {OPENAPI_AUTH_OPTIONS.map((option) => <option key={option.value} value={option.value}>{option.label}</option>)}
                 </select>
             </ActionField>
-            {(method === 'api_key' && !draft.identity_id) || apiKeyIdentity ? <div className="grid gap-4 sm:grid-cols-2">
-                <ActionField id="openapi-key-location" label="API key location" error={authError('additionalFields.api_key_location')}>
+            {(method === 'api_key' && !draft.identity_id) || apiKeyIdentity ? <div className="min-w-0">
+                <ActionField id="openapi-key-location" label="API key location" width="standard" error={authError('additionalFields.api_key_location')}>
                     <select id="openapi-key-location" value={location} disabled={readOnly} className={ACTION_INPUT_CLASS}
                         onChange={(event) => {
                             const api_key_location = event.target.value;
@@ -384,7 +378,7 @@ export function OpenApiActionAuthentication(props: ActionConnectorProps) {
                         <option value="header">HTTP header</option><option value="query">Query parameter</option>
                     </select>
                 </ActionField>
-                <ActionField id="openapi-key-name" label={location === 'query' ? 'Query parameter name' : 'Header name'} required error={authError('additionalFields.api_key_name')}>
+                <ActionField id="openapi-key-name" label={location === 'query' ? 'Query parameter name' : 'Header name'} required width="standard" error={authError('additionalFields.api_key_name')}>
                     <input id="openapi-key-name" className={ACTION_INPUT_CLASS} disabled={readOnly}
                         value={connectorText(draft.additionalFields.api_key_name ?? draft.auth.name ?? 'X-API-Key')}
                         onChange={(event) => {
@@ -393,7 +387,7 @@ export function OpenApiActionAuthentication(props: ActionConnectorProps) {
                         }} />
                 </ActionField>
             </div> : null}
-            {method === 'basic' && !draft.identity_id ? <div className="space-y-4">
+            {method === 'basic' && !draft.identity_id ? <div className="min-w-0 space-y-4">
                 {basic.stored && credentialField === 'key' ? <p className="rounded-xl bg-surface-2 p-3 text-sm text-text-2">
                     A stored username/password pair is configured. Its username is also hidden. Keep the stored pair unchanged, or enter both values to replace it.
                 </p> : null}
@@ -421,10 +415,9 @@ export function OpenApiActionAuthentication(props: ActionConnectorProps) {
                 disabled={readOnly} error={authError(`auth.${credentialField}`)}
                 help={method === 'oauth2' ? 'Supply an access token obtained from your provider. This connector does not perform an interactive OAuth sign-in or refresh-token flow.' : undefined}
                 onChange={(value) => setAuthField(credentialField, value)} /> : null}
-            {information.securitySchemes.length ? <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-text-1">Authentication declared by the API</h3>
-                <p className="text-xs text-text-3">Selecting a scheme only configures its method and key location. Credentials and reusable identity references are never imported from a specification.</p>
-                {information.securitySchemes.map((scheme) => <GlassPanel key={scheme.id} elevation="flat" className="space-y-2 p-3">
+            {information.securitySchemes.length ? <EditorPanel title="Authentication declared by the API"
+                description="Selecting a scheme only configures its method and key location. Credentials and reusable identity references are never imported from a specification.">
+                {information.securitySchemes.map((scheme) => <div key={scheme.id} className="min-w-0 space-y-2 rounded-lg border border-edge bg-surface-1 p-3">
                     <p className="break-words text-sm font-medium text-text-1">{scheme.id} · {scheme.method || 'Unspecified scheme'}</p>
                     {scheme.description ? <p className="whitespace-pre-wrap break-words text-xs text-text-2">{scheme.description}</p> : null}
                     {scheme.method === 'api_key' ? <p className="break-words text-xs text-text-3">{scheme.location}: {scheme.name}</p> : null}
@@ -435,8 +428,8 @@ export function OpenApiActionAuthentication(props: ActionConnectorProps) {
                             return scheme.method === 'api_key' ? updateConnectorFields(next, { api_key_location: scheme.location, api_key_name: scheme.name }) : next;
                         })}>Use this authentication scheme</GlassButton> :
                         <p className="text-xs text-warn">This scheme or location is not supported by the current OpenAPI connector. Choose one of the supported methods above.</p>}
-                </GlassPanel>)}
-            </div> : null}
+                </div>)}
+            </EditorPanel> : null}
             {Object.keys(connectorObject(draft.additionalFields.openapi_authentication)).length ? <p className="text-xs text-text-3">Legacy authentication analysis is retained in additional fields.</p> : null}
         </div>
     );
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx b/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx
index 7b89a2a23..1679a68ac 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentActionPicker.tsx
@@ -8,10 +8,10 @@ import {
     AGENT_ACTION_CAPABILITIES, agentActionCapabilities, agentActionLabel, agentActionUnavailableReason,
     agentHasAction, resolveAgentAction, toggleAgentAction, updateAgentCapability,
 } from '../../lib/workspaceAgentActions';
-import { AGENT_INPUT_CLASS } from '../../lib/workspaceAgentAuthoring';
-import { GlassButton, GlassPanel } from '../ui/primitives';
+import { GlassButton } from '../ui/primitives';
+import { EditorGroup, EditorPanel } from '../workspace/EditorLayout';
 import { Pill, SectionSearch } from '../workspace/primitives';
-import { AgentField, AgentNotice } from './AgentFields';
+import { AgentNotice } from './AgentFields';
 
 export function AgentActionPicker({
     draft, setDraft, actions, targets, loading, error, targetError, ownerId, builtinActions,
@@ -51,7 +51,7 @@ export function AgentActionPicker({
                 {error ? <AgentNotice error>{error} Existing references remain in the draft.</AgentNotice> : null}
                 {targetError ? <AgentNotice error>{targetError}</AgentNotice> : null}
                 {draft.actions_to_load.length ? (
-                    <div className="space-y-3 rounded-xl border border-warn/40 p-3">
+                    <EditorPanel tone="warn" title="Local actions still attached">
                         <p className="text-sm text-text-2">These local actions are still in the draft. Detach them explicitly to save a Foundry agent, or switch back to Local.</p>
                         <ul className="list-inside list-disc text-sm text-text-3">
                             {draft.actions_to_load.map((reference) => {
@@ -71,36 +71,40 @@ export function AgentActionPicker({
                                 </div>
                             </div>
                         ) : <GlassButton type="button" size="sm" onClick={() => setConfirmDetach(true)}>Detach local actions</GlassButton> : null}
-                    </div>
+                    </EditorPanel>
                 ) : null}
             </div>
         );
     }
     return (
         <div className="space-y-4">
-            <p className="text-sm text-text-3">Select actions for this agent. Capability choices apply only to this assignment. Call agent appears here like any other action; its target remains configured on the action.</p>
-            <div className="flex flex-wrap gap-2">
-                {!readOnly && canCreateActions ? <GlassButton type="button" size="sm" onClick={onNewAction}><Plus size={14} />New action</GlassButton> : null}
-                <GlassButton type="button" size="sm" disabled={loading} onClick={onRefresh}><RefreshCw size={14} />Refresh actions</GlassButton>
-                <label className="flex items-center gap-2 text-xs text-text-2">
-                    <input type="checkbox" checked={selectedOnly} onChange={(event) => setSelectedOnly(event.target.checked)} className="accent-accent" />
-                    Selected only
-                </label>
+            <div className="flex flex-wrap items-start justify-between gap-3">
+                <p className="min-w-0 flex-[1_1_20rem] text-[0.8125rem] leading-relaxed text-text-3">Select actions for this agent. Capability choices apply only to this assignment. Call agent appears here like any other action; its target remains configured on the action.</p>
+                <div className="flex flex-wrap items-center gap-2">
+                    {!readOnly && canCreateActions ? <GlassButton type="button" variant="subtle" size="sm" onClick={onNewAction}><Plus size={14} />New action</GlassButton> : null}
+                    <GlassButton type="button" size="sm" variant="ghost" disabled={loading} onClick={onRefresh}><RefreshCw size={14} />Refresh actions</GlassButton>
+                </div>
             </div>
             {!canCreateActions && !readOnly ? <AgentNotice>Creating actions is unavailable in this workspace. You can still assign permitted existing actions from the authorized catalogue.</AgentNotice> : null}
             {error ? <AgentNotice error>{error} Existing references have not been removed.</AgentNotice> : null}
             {targetError ? <AgentNotice error>{targetError} Call agent targets could not be checked; existing assignments are preserved.</AgentNotice> : null}
             {loading ? <p role="status" className="text-sm text-text-3">Loading available actions…</p> : null}
-            <div className="grid gap-3 sm:grid-cols-[minmax(0,1fr)_12rem]">
-                <SectionSearch value={query} onChange={setQuery} placeholder="Search actions by name, description or type" />
-                <AgentField id="agent-action-type-filter" label="Action type">
-                    <select id="agent-action-type-filter" value={typeFilter} onChange={(event) => setTypeFilter(event.target.value)} className={AGENT_INPUT_CLASS}>
-                        <option value="">All action types</option>
-                        {types.map((type) => <option key={type} value={type}>{type === 'agent' ? 'Call agent' : type}</option>)}
-                    </select>
-                </AgentField>
+            <div className="flex flex-wrap items-center gap-3">
+                <div className="min-w-0 flex-[1_1_16rem]">
+                    <SectionSearch value={query} onChange={setQuery} placeholder="Search actions by name, description or type" />
+                </div>
+                <label htmlFor="agent-action-type-filter" className="sr-only">Action type</label>
+                <select id="agent-action-type-filter" value={typeFilter} onChange={(event) => setTypeFilter(event.target.value)}
+                    className="min-w-[11rem] flex-none rounded-xl border border-edge bg-surface-1 px-3 py-2 text-sm text-text-1 focus:border-accent focus:outline-none disabled:opacity-60">
+                    <option value="">All action types</option>
+                    {types.map((type) => <option key={type} value={type}>{type === 'agent' ? 'Call agent' : type}</option>)}
+                </select>
+                <label className="flex items-center gap-2 text-sm text-text-2">
+                    <input type="checkbox" checked={selectedOnly} onChange={(event) => setSelectedOnly(event.target.checked)} className="accent-accent" />
+                    Selected only
+                </label>
             </div>
-            <div className="space-y-2">
+            <ul className="space-y-2" aria-label="Available actions">
                 {visible.map((action) => {
                     const checked = agentHasAction(draft, action, actions);
                     const reason = agentActionUnavailableReason(draft, action, targets, ownerId);
@@ -110,7 +114,8 @@ export function AgentActionPicker({
                     const definitions = AGENT_ACTION_CAPABILITIES[action.type] ?? [];
                     const label = agentActionLabel(action);
                     return (
-                        <GlassPanel key={`${action.is_global ? 'global' : 'personal'}:${action.id}`} elevation="flat" className="space-y-3 border border-edge p-3">
+                        <li key={`${action.is_global ? 'global' : 'personal'}:${action.id}`}
+                            className={`space-y-3 rounded-lg border bg-surface-1 p-3 ${checked ? 'border-accent/50' : 'border-edge'}`}>
                             <label className="flex items-start gap-3">
                                 <input type="checkbox" className="mt-1 accent-accent" checked={checked} aria-label={`Assign ${label}`}
                                     disabled={readOnly || (!checked && (loading || Boolean(error) || Boolean(reason)))}
@@ -130,9 +135,8 @@ export function AgentActionPicker({
                                 </span>
                             </label>
                             {checked && definitions.length ? (
-                                <details className="rounded-lg border border-edge p-3" open>
-                                    <summary className="cursor-pointer text-xs font-medium text-text-2">Capabilities for {label}</summary>
-                                    <div className="mt-3 grid gap-2 sm:grid-cols-2">
+                                <EditorGroup summary={`Capabilities for ${label}`} defaultOpen>
+                                    <div className="grid gap-2 pt-2 sm:grid-cols-2">
                                         {definitions.map((capability) => (
                                             <label key={capability.key} className="flex items-start gap-2 text-xs text-text-2">
                                                 <input type="checkbox" className="mt-0.5 accent-accent" checked={Boolean(capabilities[capability.key])}
@@ -142,17 +146,16 @@ export function AgentActionPicker({
                                             </label>
                                         ))}
                                     </div>
-                                </details>
+                                </EditorGroup>
                             ) : null}
-                        </GlassPanel>
+                        </li>
                     );
                 })}
-            </div>
+            </ul>
             {!visible.length && !loading && !error ? <p role="status" className="text-sm text-text-3">No actions match. Adjust the filters or refresh the authorized catalogue.</p> : null}
             {unresolved.length ? (
-                <div className="space-y-2 rounded-xl border border-warn/30 p-3">
-                    <h4 className="text-sm font-medium text-text-1">Saved references to review</h4>
-                    <p className="text-xs text-text-3">Unlisted, ambiguous, and legacy references are kept during unrelated edits. Remove one only when you no longer want it assigned.</p>
+                <EditorPanel tone="warn" title="Saved references to review"
+                    description="Unlisted, ambiguous, and legacy references are kept during unrelated edits. Remove one only when you no longer want it assigned.">
                     {unresolved.map((reference) => (
                         <div key={reference} className="flex flex-wrap items-center justify-between gap-2 text-sm text-text-2">
                             <code className="min-w-0 break-all">{reference}</code>
@@ -162,18 +165,16 @@ export function AgentActionPicker({
                             </GlassButton> : null}
                         </div>
                     ))}
-                </div>
+                </EditorPanel>
             ) : null}
             {builtinActions.length ? (
-                <div className="rounded-xl border border-edge p-3">
-                    <h4 className="text-sm font-medium text-text-2">Enabled built-in tools</h4>
-                    <p className="mt-1 text-xs text-text-3">{globalScope
-                        ? 'Available to every agent; turn them on or off under Built-in Actions in Admin Settings.'
-                        : 'Provided by your administrator; these are not personal settings.'}</p>
-                    <ul className="mt-2 space-y-1 text-xs text-text-2">
+                <EditorPanel title="Enabled built-in tools" description={globalScope
+                    ? 'Available to every agent; turn them on or off under Built-in Actions in Admin Settings.'
+                    : 'Provided by your administrator; these are not personal settings.'}>
+                    <ul className="space-y-1 text-xs text-text-2">
                         {builtinActions.map((action) => <li key={action.id}>{action.label}{action.description ? ` — ${action.description}` : ''}</li>)}
                     </ul>
-                </div>
+                </EditorPanel>
             ) : null}
         </div>
     );
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentAdvancedFields.tsx b/application/v2_ui/src/components/workspaceAgents/AgentAdvancedFields.tsx
index 3d38c531c..af0350eb4 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentAdvancedFields.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentAdvancedFields.tsx
@@ -10,6 +10,7 @@ import {
     secretValueAt, selectedAgentModel, setAgentSecret,
 } from '../../lib/workspaceAgentAuthoring';
 import { GlassButton } from '../ui/primitives';
+import { EditorGroup } from '../workspace/EditorLayout';
 import { AgentField, AgentNotice, AgentSecretField } from './AgentFields';
 
 export function agentAdvancedError(
@@ -46,7 +47,7 @@ export function AgentAdvancedFields({
     return (
         <div className="space-y-4">
             {draft.agent_type === 'local' ? (
-                <div className="grid gap-4 sm:grid-cols-2">
+                <div className="min-w-0">
                     <AgentField id="agent-completion-tokens" label="Completion token limit" help="-1 uses the model default. Zero is retained as an explicit value. Maximum: 512000.">
                         <input id="agent-completion-tokens" type="number" min={-1} max={512000} step={1} required
                             value={typeof draft._editor_completion_text === 'string' ? draft._editor_completion_text : draft.max_completion_tokens}
@@ -70,8 +71,8 @@ export function AgentAdvancedFields({
                         </select>
                     </AgentField>
                 </div>
-            ) : <p className="text-sm text-text-3">Token and reasoning behavior are managed by the selected Foundry resource. Saved local values remain intact.</p>}
-            <AgentField id="agent-additional-settings" label="Additional settings JSON"
+            ) : <p className="text-[0.8125rem] text-text-3">Token and reasoning behavior are managed by the selected Foundry resource. Saved local values remain intact.</p>}
+            <AgentField id="agent-additional-settings" label="Additional settings JSON" width="full"
                 help="This is the same draft used by the structured controls. Managed action, knowledge and provider siblings are preserved when omitted from a pasted object. Explicit values, including false, zero and empty arrays, are retained.">
                 <textarea id="agent-additional-settings" rows={16} value={rawSettings} spellCheck={false}
                     aria-invalid={Boolean(error)} className={`${AGENT_INPUT_CLASS} font-mono text-xs`}
@@ -100,15 +101,14 @@ export function AgentAdvancedFields({
                 </AgentNotice>
             ) : null}
             {original?.secret_paths.length ? (
-                <details className="rounded-xl border border-edge p-3">
-                    <summary className="cursor-pointer text-sm font-medium text-text-2">Stored credentials and custom secret fields</summary>
-                    <fieldset disabled={Boolean(error)} className="mt-3 space-y-4">
+                <EditorGroup summary="Stored credentials and custom secret fields">
+                    <fieldset disabled={Boolean(error)} className="min-w-0">
                         <legend className="sr-only">Secret field changes</legend>
                         {original.secret_paths.map((path) => <AgentSecretField key={path} label={path}
                             value={secretValueAt(draft, path)} original={secretValueAt(original.record, path)}
                             onChange={(value) => setDraft((current) => setAgentSecret(current, path, value))} />)}
                     </fieldset>
-                </details>
+                </EditorGroup>
             ) : null}
             <p className="text-xs text-text-3">Ownership and the stable ID are not editable JSON settings. {agentText(draft.id) ? `Agent ID: ${draft.id}` : 'A stable ID is allocated on save.'}</p>
         </div>
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentFields.tsx b/application/v2_ui/src/components/workspaceAgents/AgentFields.tsx
index c641682be..232771131 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentFields.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentFields.tsx
@@ -3,28 +3,27 @@
 import { useId, useState, type InputHTMLAttributes, type ReactNode } from 'react';
 import { EDITOR_SECRET_MASK } from '../../lib/workspaceAuthoring';
 import { AGENT_INPUT_CLASS, agentText, secretIntent } from '../../lib/workspaceAgentAuthoring';
+import { EditorFieldRow, type EditorFieldWidth } from '../workspace/EditorLayout';
 
 export function AgentField({
-    label, help, children, id,
-}: { label: string; help?: string; children: ReactNode; id: string }) {
+    label, help, children, id, width,
+}: { label: string; help?: string; children: ReactNode; id: string; width?: EditorFieldWidth }) {
     return (
-        <div className="min-w-0">
-            <label htmlFor={id} className="mb-1 block break-words text-sm font-medium text-text-2">{label}</label>
+        <EditorFieldRow htmlFor={id} label={label} help={help} helpId={`${id}-help`} width={width}>
             {children}
-            {help ? <p id={`${id}-help`} className="mt-1 text-xs leading-relaxed text-text-3">{help}</p> : null}
-        </div>
+        </EditorFieldRow>
     );
 }
 
 export function AgentTextField({
-    label, value, onChange, help, ...props
-}: Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value'> & {
-    label: string; value: unknown; onChange: (value: string) => void; help?: string;
+    label, value, onChange, help, width, ...props
+}: Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value' | 'width'> & {
+    label: string; value: unknown; onChange: (value: string) => void; help?: string; width?: EditorFieldWidth;
 }) {
     const generatedId = useId();
     const id = props.id || generatedId;
     return (
-        <AgentField id={id} label={label} help={help}>
+        <AgentField id={id} label={label} help={help} width={width}>
             <input {...props} id={id} value={agentText(value)} onChange={(event) => onChange(event.target.value)}
                 aria-describedby={help ? `${id}-help` : undefined} className={AGENT_INPUT_CLASS} />
         </AgentField>
@@ -38,8 +37,10 @@ export function AgentSecretField({
     const stored = original === EDITOR_SECRET_MASK;
     const [replacing, setReplacing] = useState(() => stored && secretIntent(value, original) === 'replace');
     const intent = replacing ? 'replace' : secretIntent(value, original);
+    // A fragment, so the keep/replace choice and the replacement sit in the row list as
+    // ordinary rows rather than as one box among them.
     return (
-        <div className="min-w-0 space-y-2">
+        <>
             {stored ? (
                 <AgentField id={`${id}-intent`} label={label} help="The stored value is never sent to this page. Keep it, replace it, or explicitly clear it on save.">
                     <select id={`${id}-intent`} value={intent} className={AGENT_INPUT_CLASS}
@@ -62,15 +63,15 @@ export function AgentSecretField({
                     onChange={(next) => onChange(stored && !next ? EDITOR_SECRET_MASK : next)}
                     help={stored ? 'Enter a replacement. An empty replacement keeps the saved value; use Clear saved value to delete it.' : 'Optional. Never included in template submissions.'} />
             ) : null}
-            {stored && intent === 'clear' ? <p role="status" className="text-xs text-warn">The saved value will be cleared when you save.</p> : null}
-        </div>
+            {stored && intent === 'clear' ? <p role="status" className="pb-2 text-xs text-warn">The saved value will be cleared when you save.</p> : null}
+        </>
     );
 }
 
 export function AgentNotice({ children, error = false }: { children: ReactNode; error?: boolean }) {
     return (
         <div role={error ? 'alert' : 'status'}
-            className={`rounded-xl border p-3 text-sm ${error ? 'border-danger/30 bg-danger-soft text-danger' : 'border-edge bg-surface-2 text-text-2'}`}>
+            className={`rounded-lg border px-3 py-2 text-[0.8125rem] leading-relaxed ${error ? 'border-danger/30 bg-danger-soft text-danger' : 'border-edge bg-surface-2 text-text-2'}`}>
             {children}
         </div>
     );
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentIdentityFields.tsx b/application/v2_ui/src/components/workspaceAgents/AgentIdentityFields.tsx
index 76767f5e3..e4defdd4a 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentIdentityFields.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentIdentityFields.tsx
@@ -8,6 +8,7 @@ import {
     AGENT_INPUT_CLASS, AGENT_TYPE_LABELS, changeAgentType, clearAgentDraftFields, isAgentIconImage, renameAgentDraft,
 } from '../../lib/workspaceAgentAuthoring';
 import { GlassButton } from '../ui/primitives';
+import { EditorFieldset, EditorGroup } from '../workspace/EditorLayout';
 import { AgentField, AgentNotice, AgentTextField } from './AgentFields';
 
 const ICON_FALLBACKS = [
@@ -96,7 +97,7 @@ export function AgentIdentityFields({
             <link rel="stylesheet" href="/static/css/bootstrap-icons.css" />
             <AgentTextField id="agent-display-name" label="Display name" value={draft.display_name} required
                 onChange={(value) => setDraft((current) => renameAgentDraft(current, value, isNew))} />
-            <AgentField id="agent-description" label="Description" help="Explain what this agent does and when someone should choose it.">
+            <AgentField id="agent-description" label="Description" width="full" help="Explain what this agent does and when someone should choose it.">
                 <textarea id="agent-description" rows={3} value={draft.description} required className={AGENT_INPUT_CLASS}
                     onChange={(event) => setDraft((current) => ({ ...current, description: event.target.value }))} />
             </AgentField>
@@ -105,8 +106,8 @@ export function AgentIdentityFields({
                 onChange={(value) => setDraft((current) => ({
                     ...current, tags: [...new Set(value.split(',').map((tag) => tag.trim()).filter(Boolean))], _editor_tags_text: value,
                 }))} onBlur={() => setDraft((current) => clearAgentDraftFields(current, '_editor_tags_text'))} />
-            <fieldset className="space-y-2">
-                <legend className="mb-2 text-sm font-medium text-text-2">Agent type</legend>
+            <EditorFieldset legend="Agent type"
+                help="Changing type preserves existing settings. Foundry owns prompts and tools; any local action removal must be confirmed before saving.">
                 <div className="grid gap-2 sm:grid-cols-2">
                     {(Object.keys(AGENT_TYPE_LABELS) as WorkspaceAgentType[]).map((type) => {
                         const option = options.agent_types.find((item) => item.value === type);
@@ -122,37 +123,33 @@ export function AgentIdentityFields({
                         );
                     })}
                 </div>
-                <p className="text-xs text-text-3">Changing type preserves existing settings. Foundry owns prompts and tools; any local action removal must be confirmed before saving.</p>
-            </fieldset>
-            <fieldset className="space-y-3">
-                <legend className="mb-2 text-sm font-medium text-text-2">Agent icon</legend>
+            </EditorFieldset>
+            <EditorFieldset legend="Agent icon" help="Shown beside the agent wherever people choose it. Pick a Bootstrap icon or upload an image.">
                 <div className="flex flex-wrap items-center gap-3">
                     <AgentIcon icon={draft.icon} />
-                    <GlassButton type="button" size="sm" onClick={() => {
+                    <GlassButton type="button" size="sm" variant="subtle" onClick={() => {
                         uploadSequence.current += 1;
                         setImageBusy(false);
                         onIconBusyChange?.(false);
                         setDraft((current) => ({ ...current, icon: { kind: 'bootstrap', value: 'bi-robot' } }));
                     }}>Use default icon</GlassButton>
                 </div>
-                <div className="grid gap-3 sm:grid-cols-2">
-                    <div className="space-y-2">
-                        <AgentTextField label="Search Bootstrap icons" type="search" value={iconSearch} onChange={setIconSearch} />
-                        <AgentField id="agent-bootstrap-icon" label="Bootstrap icon">
-                            <select id="agent-bootstrap-icon" className={AGENT_INPUT_CLASS} value={currentIcon}
-                                onChange={(event) => {
-                                    uploadSequence.current += 1;
-                                    setImageBusy(false);
-                                    onIconBusyChange?.(false);
-                                    setDraft((current) => ({ ...current, icon: { kind: 'bootstrap', value: event.target.value } }));
-                                }}>
-                                {!currentIcon ? <option value="">Choose an icon</option> : null}
-                                {currentIcon && !visibleIcons.includes(currentIcon) ? <option value={currentIcon}>{currentIcon}</option> : null}
-                                {visibleIcons.map((icon) => <option key={icon} value={icon}>{icon}</option>)}
-                            </select>
-                        </AgentField>
-                        <GlassButton type="button" size="sm" onClick={() => void loadIcons()}>Load all local icons</GlassButton>
-                    </div>
+                <div className="min-w-0">
+                    <AgentTextField label="Search Bootstrap icons" type="search" value={iconSearch} onChange={setIconSearch} />
+                    <AgentField id="agent-bootstrap-icon" label="Bootstrap icon">
+                        <select id="agent-bootstrap-icon" className={AGENT_INPUT_CLASS} value={currentIcon}
+                            onChange={(event) => {
+                                uploadSequence.current += 1;
+                                setImageBusy(false);
+                                onIconBusyChange?.(false);
+                                setDraft((current) => ({ ...current, icon: { kind: 'bootstrap', value: event.target.value } }));
+                            }}>
+                            {!currentIcon ? <option value="">Choose an icon</option> : null}
+                            {currentIcon && !visibleIcons.includes(currentIcon) ? <option value={currentIcon}>{currentIcon}</option> : null}
+                            {visibleIcons.map((icon) => <option key={icon} value={icon}>{icon}</option>)}
+                        </select>
+                        <div><GlassButton type="button" size="sm" variant="subtle" onClick={() => void loadIcons()}>Load all local icons</GlassButton></div>
+                    </AgentField>
                     <AgentField id="agent-icon-upload" label="Upload icon" help="PNG or JPEG, resized to at most 128 × 128 pixels. The stored PNG must fit the existing 350000-character limit.">
                         <input id="agent-icon-upload" type="file" accept="image/png,image/jpeg" disabled={imageBusy}
                             className={`${AGENT_INPUT_CLASS} file:mr-3 file:rounded-lg file:border-0 file:bg-surface-2 file:px-2 file:py-1 file:text-text-1`}
@@ -161,20 +158,17 @@ export function AgentIdentityFields({
                                 if (file) void uploadIcon(file);
                                 event.target.value = '';
                             }} />
-                        {imageBusy ? <p role="status" className="mt-2 text-xs text-text-3">Resizing icon…</p> : null}
+                        {imageBusy ? <p role="status" className="text-xs text-text-3">Resizing icon…</p> : null}
                     </AgentField>
                 </div>
                 {iconError ? <AgentNotice error>{iconError}</AgentNotice> : null}
-            </fieldset>
-            <details className="rounded-xl border border-edge p-3">
-                <summary className="cursor-pointer text-sm font-medium text-text-2">Internal identity</summary>
-                <div className="mt-3 space-y-3">
-                    <AgentTextField label="Internal name" value={draft.name} pattern="[A-Za-z0-9_\-]+" required
-                        help="Derived from the display name only for a new agent. Changing a saved display name does not rename this value or change its stable ID."
-                        onChange={(value) => setDraft((current) => ({ ...current, name: value }))} />
-                    <p className="break-all text-xs text-text-3">Stable ID: {draft.id || 'Allocated when this agent is first saved.'}</p>
-                </div>
-            </details>
+            </EditorFieldset>
+            <EditorGroup summary="Internal identity">
+                <AgentTextField label="Internal name" value={draft.name} pattern="[A-Za-z0-9_\-]+" required
+                    help="Derived from the display name only for a new agent. Changing a saved display name does not rename this value or change its stable ID."
+                    onChange={(value) => setDraft((current) => ({ ...current, name: value }))} />
+                <p className="break-all pb-1 text-xs text-text-3">Stable ID: {draft.id || 'Allocated when this agent is first saved.'}</p>
+            </EditorGroup>
         </div>
     );
 }
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentInstructionsFields.tsx b/application/v2_ui/src/components/workspaceAgents/AgentInstructionsFields.tsx
index b3adffae6..a365efe21 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentInstructionsFields.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentInstructionsFields.tsx
@@ -8,6 +8,7 @@ import { readAgentKnowledge, type AgentKnowledgeCatalog } from '../../lib/worksp
 import { agentMentions, agentMentionTrigger, filterAgentMentions, type AgentMention } from '../../lib/workspaceAgentReferences';
 import { draftAgentInstructions, withAgentInstructionProposal } from '../../lib/workspaceAgentCommands';
 import { GlassButton } from '../ui/primitives';
+import { EditorPanel } from '../workspace/EditorLayout';
 import { AgentField, AgentNotice } from './AgentFields';
 
 export function AgentInstructionsFields({
@@ -96,7 +97,7 @@ export function AgentInstructionsFields({
     }
     return (
         <div className="space-y-4">
-            <AgentField id="agent-instructions" label="Instructions" help={'Type # to reference selected actions, enabled capabilities, or assigned knowledge. Values with spaces or colons are quoted, for example #knowledge:doc:"Employee Handbook.pdf".'}>
+            <AgentField id="agent-instructions" label="Instructions" width="full" help={'Type # to reference selected actions, enabled capabilities, or assigned knowledge. Values with spaces or colons are quoted, for example #knowledge:doc:"Employee Handbook.pdf".'}>
                 <textarea id="agent-instructions" ref={textarea} value={draft.instructions} rows={18} required spellCheck
                     className={`${AGENT_INPUT_CLASS} resize-y leading-relaxed`}
                     aria-autocomplete="list" aria-controls={suggestions.length ? menuId : undefined}
@@ -137,8 +138,9 @@ export function AgentInstructionsFields({
                 </ul>
             ) : null}
             {!readOnly ? (
-                <div className="space-y-3 rounded-xl border border-edge p-3">
-                    <AgentField id="agent-instruction-brief" label="Instruction brief" help="Describe the task, audience, guardrails, and desired output. Drafting runs only when requested and includes the selected action and knowledge context.">
+                <EditorPanel title="Draft instructions"
+                    description="Describe the task and let the assistant draft instructions for you to review. Nothing changes until you apply a draft.">
+                    <AgentField id="agent-instruction-brief" label="Instruction brief" width="full" help="Describe the task, audience, guardrails, and desired output. Drafting runs only when requested and includes the selected action and knowledge context.">
                         <textarea id="agent-instruction-brief" rows={3} value={brief} className={AGENT_INPUT_CLASS}
                             onChange={(event) => setDraft((current) => ({ ...current, _editor_instruction_brief: event.target.value }))} />
                     </AgentField>
@@ -149,7 +151,7 @@ export function AgentInstructionsFields({
                     {error ? <AgentNotice error>{error}</AgentNotice> : null}
                     {proposal ? (
                         <div className="space-y-3">
-                            <AgentField id="agent-generated-instructions" label="Generated instructions — not yet applied">
+                            <AgentField id="agent-generated-instructions" label="Generated instructions — not yet applied" width="full">
                                 <textarea id="agent-generated-instructions" rows={12} value={proposal} readOnly className={AGENT_INPUT_CLASS} />
                             </AgentField>
                             {draft.instructions !== baseline ? <AgentNotice>Your instructions changed while this draft was generated. They have not been overwritten.</AgentNotice> : null}
@@ -165,7 +167,7 @@ export function AgentInstructionsFields({
                             </div>
                         </div>
                     ) : null}
-                </div>
+                </EditorPanel>
             ) : null}
         </div>
     );
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx b/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx
index 99b3dfa93..97b0b7373 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentKnowledgeFields.tsx
@@ -9,7 +9,8 @@ import {
     readAgentKnowledge, resolvedAgentDocuments, selectedKnowledgeSources, toggleAgentKnowledgeSource,
     toggleString, updateAgentKnowledge, type AgentKnowledgeCatalog, type AgentKnowledgeSource,
 } from '../../lib/workspaceAgentKnowledge';
-import { GlassButton, Toggle } from '../ui/primitives';
+import { GlassButton } from '../ui/primitives';
+import { EditorDependents, EditorFieldset, EditorGroup, EditorPanel, EditorSwitch } from '../workspace/EditorLayout';
 import { SectionSearch } from '../workspace/primitives';
 import { AgentField, AgentNotice, AgentTextField } from './AgentFields';
 
@@ -78,24 +79,23 @@ export function AgentKnowledgeFields({
     }
     return (
         <div className="space-y-4">
-            <Toggle label="Restrict to assigned knowledge" checked={config.enabled}
+            <EditorSwitch lead label="Restrict to assigned knowledge" checked={config.enabled}
                 description="Ground this agent in selected authorized workspaces and URLs. Turning this off retains the configuration for later."
                 onChange={(enabled) => setDraft((current) => updateAgentKnowledge(current, { enabled }))} />
             {!config.enabled && error ? <AgentNotice error>{error} <GlassButton type="button" size="sm" onClick={onRefresh}>Retry knowledge catalogue</GlassButton></AgentNotice> : null}
             {config.enabled ? (
-                <>
-                    <div className="flex flex-wrap items-center gap-3">
+                <EditorDependents>
+                    <div className="flex flex-wrap items-center gap-3 pt-1">
                         <GlassButton type="button" size="sm" disabled={loading} onClick={onRefresh}><RefreshCw size={14} />Refresh knowledge</GlassButton>
                         <span className="text-xs text-text-3">{selectedKeys.size} sources · {config.document_ids.length} explicit documents · {config.tags.length} tags · {config.web_sources.length} URLs</span>
                     </div>
                     {loading ? <p role="status" className="text-sm text-text-3">Loading authorized knowledge sources…</p> : null}
                     {error ? <AgentNotice error>{error} Existing selections are preserved.</AgentNotice> : null}
                     {inputError ? <AgentNotice error>{inputError}</AgentNotice> : null}
-                    <fieldset className="space-y-3">
-                        <legend className="mb-2 text-sm font-medium text-text-1">Source workspaces</legend>
-                        <p className="text-xs text-text-3">{knowledgeScopes.includes('personal') || knowledgeScopes.includes('group')
+                    <EditorFieldset legend="Source workspaces"
+                        help={`${knowledgeScopes.includes('personal') || knowledgeScopes.includes('group')
                             ? 'Only your personal workspace and permitted public workspaces can be newly assigned.'
-                            : 'Only public workspaces can be assigned, because a global agent answers everyone.'} Removing a source does not silently remove stored document references.</p>
+                            : 'Only public workspaces can be assigned, because a global agent answers everyone.'} Removing a source does not silently remove stored document references.`}>
                         <SectionSearch value={sourceQuery} onChange={setSourceQuery} placeholder="Search knowledge workspaces" />
                         <div className="grid gap-2 sm:grid-cols-2">
                             {sources.filter((source) => `${source.label} ${source.id}`.toLowerCase().includes(sourceQuery.toLowerCase())).map((source) => (
@@ -123,17 +123,16 @@ export function AgentKnowledgeFields({
                                 }}>Remove reference</GlassButton> : null}
                             </div>
                         ))}
-                    </fieldset>
-                    <fieldset className="space-y-3">
-                        <legend className="mb-2 text-sm font-medium text-text-1">Documents and tags</legend>
-                        <p className="text-xs text-text-3">With no document or tag limits, all indexed documents in selected sources are active. Otherwise, explicit documents are included alongside documents matching every selected tag.</p>
+                    </EditorFieldset>
+                    <EditorFieldset legend="Documents and tags"
+                        help="With no document or tag limits, all indexed documents in selected sources are active. Otherwise, explicit documents are included alongside documents matching every selected tag.">
                         <SectionSearch value={documentQuery} onChange={(value) => { setDocumentQuery(value); setDocumentLimit(25); }} placeholder="Search knowledge documents" />
                         <div className="space-y-2">
                             {visibleDocuments.slice(0, documentLimit).map((document) => {
                                 const checked = config.document_ids.includes(document.id);
                                 const inSources = selectedKeys.has(`${document.scope}:${document.source_id}`);
                                 return (
-                                    <label key={`${document.scope}:${document.id}`} className="flex items-start gap-2 rounded-xl border border-edge p-3 text-sm text-text-2">
+                                    <label key={`${document.scope}:${document.id}`} className="flex items-start gap-2 rounded-lg border border-edge bg-surface-1 p-3 text-sm text-text-2">
                                         <input type="checkbox" className="mt-1 accent-accent" checked={checked}
                                             disabled={readOnly || (!checked && (config.document_ids.length >= KNOWLEDGE_LIMITS.documents ||
                                                 (!inSources && document.scope === 'public' && config.scopes.public_workspace_ids.length >= KNOWLEDGE_LIMITS.sources)))}
@@ -184,22 +183,21 @@ export function AgentKnowledgeFields({
                                     onClick={() => setDraft((current) => updateAgentKnowledge(current, { tags: readAgentKnowledge(current).tags.filter((item) => item !== tag) }))}>Remove reference</GlassButton> : null}
                             </div>
                         ))}
-                    </fieldset>
-                    <details className="rounded-xl border border-edge p-3" open>
-                        <summary className="cursor-pointer text-sm font-medium text-text-1">Active documents ({active.length})</summary>
-                        <p className="mt-2 text-xs text-text-3">Preview from the authorized catalogue. Catalogue queries are limited to 1000 documents; runtime authorization and indexing determine the final context.</p>
+                    </EditorFieldset>
+                    <EditorGroup summary={`Active documents (${active.length})`} defaultOpen>
+                        <p className="pt-2 text-xs text-text-3">Preview from the authorized catalogue. Catalogue queries are limited to 1000 documents; runtime authorization and indexing determine the final context.</p>
                         {catalog ? (
-                            <ul className="mt-2 space-y-1 text-xs text-text-2">
+                            <ul className="space-y-1 text-xs text-text-2">
                                 {active.slice(0, activeLimit).map((document) => <li key={document.id} className="break-words">{document.title || document.file_name} · {document.source_name}{config.document_ids.includes(document.id) ? ' · explicit' : ''}</li>)}
                             </ul>
-                        ) : <p className="mt-2 text-xs text-text-3">Load the catalogue to resolve active documents.</p>}
+                        ) : <p className="text-xs text-text-3">Load the catalogue to resolve active documents.</p>}
                         {active.length > activeLimit ? <GlassButton type="button" size="sm" onClick={() => setActiveLimit((value) => value + 50)}>Show more active documents</GlassButton> : null}
-                    </details>
-                    <div className="space-y-3 rounded-xl border border-edge p-3">
-                        <Toggle label="Allow user-added workspace context" checked={config.allow_user_workspace_context}
+                    </EditorGroup>
+                    <EditorPanel title="User-added context">
+                        <EditorSwitch label="Allow user-added workspace context" checked={config.allow_user_workspace_context}
                             description="Let chat users supplement the assigned sources within their own permissions."
                             onChange={(value) => setDraft((current) => updateAgentKnowledge(current, { allow_user_workspace_context: value }))} />
-                        <fieldset disabled={!config.allow_user_workspace_context} className="flex flex-wrap gap-4">
+                        <fieldset disabled={!config.allow_user_workspace_context} className="flex flex-wrap gap-4 ps-14">
                             <legend className="mb-2 text-xs text-text-3">Allowed user-added context actions</legend>
                             {USER_KNOWLEDGE_ACTIONS.map((action) => (
                                 <label key={action} className="flex items-center gap-2 text-sm text-text-2">
@@ -211,10 +209,9 @@ export function AgentKnowledgeFields({
                                 </label>
                             ))}
                         </fieldset>
-                    </div>
-                    <fieldset className="space-y-3">
-                        <legend className="mb-2 text-sm font-medium text-text-1">Assigned URLs</legend>
-                        <p className="text-xs text-text-3">URL review targets the assigned page. Deep research allows research from that source. Requests still follow the application’s web access policy.</p>
+                    </EditorPanel>
+                    <EditorFieldset legend="Assigned URLs"
+                        help="URL review targets the assigned page. Deep research allows research from that source. Requests still follow the application’s web access policy.">
                         {!readOnly ? <div className="grid items-end gap-3 sm:grid-cols-[minmax(0,1fr)_10rem_auto]">
                             <AgentTextField label="Assigned URL" value={url} onChange={setUrl} placeholder="https://example.org/page" />
                             <AgentField id="agent-new-url-mode" label="URL mode">
@@ -225,7 +222,7 @@ export function AgentKnowledgeFields({
                             <GlassButton type="button" size="sm" onClick={addUrl}><Plus size={14} />Add URL</GlassButton>
                         </div> : null}
                         {config.web_sources.map((source, index) => (
-                            <div key={`${source.url}:${index}`} className="grid gap-2 rounded-xl border border-edge p-3 sm:grid-cols-[minmax(0,1fr)_10rem_auto]">
+                            <div key={`${source.url}:${index}`} className="grid items-center gap-2 rounded-lg border border-edge bg-surface-1 p-3 sm:grid-cols-[minmax(0,1fr)_10rem_auto]">
                                 <span className="break-all text-sm text-text-2">{source.url}</span>
                                 <select aria-label={`Mode for ${source.url}`} value={source.mode} className={AGENT_INPUT_CLASS}
                                     onChange={(event) => setDraft((current) => updateAgentKnowledge(current, {
@@ -240,9 +237,9 @@ export function AgentKnowledgeFields({
                                     }))}><Trash2 size={14} /></GlassButton> : null}
                             </div>
                         ))}
-                    </fieldset>
-                </>
-            ) : <p className="text-sm text-text-3">This agent follows the normal chat context policy. Enable the restriction to define its assigned knowledge.</p>}
+                    </EditorFieldset>
+                </EditorDependents>
+            ) : <p className="text-[0.8125rem] text-text-3">This agent follows the normal chat context policy. Enable the restriction to define its assigned knowledge.</p>}
         </div>
     );
 }
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentModelFields.tsx b/application/v2_ui/src/components/workspaceAgents/AgentModelFields.tsx
index fd6a957ee..dde7d1cdd 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentModelFields.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentModelFields.tsx
@@ -11,7 +11,8 @@ import {
     updateAgentSetting, type FoundryDiscoveryRecord,
 } from '../../lib/workspaceAgentAuthoring';
 import { normalizeAgentKnowledgeUrl } from '../../lib/workspaceAgentKnowledge';
-import { GlassButton, Toggle } from '../ui/primitives';
+import { GlassButton } from '../ui/primitives';
+import { EditorGroup, EditorRow, EditorSwitch } from '../workspace/EditorLayout';
 import { AgentField, AgentNotice, AgentSecretField, AgentTextField } from './AgentFields';
 
 interface ModelFieldsProps {
@@ -68,27 +69,28 @@ function LocalModelFields({ draft, setDraft, options, original, allowCustomEndpo
             {!choices.length ? <AgentNotice>{neutralReadOnlyCopy
                 ? 'Uses a configured model.'
                 : 'No enabled models are listed. You can retain the saved connection or configure a custom connection below.'}</AgentNotice> : null}
-            <dl className="grid gap-3 rounded-xl border border-edge p-3 text-xs sm:grid-cols-3">
-                <div className="min-w-0"><dt className="text-text-3">Endpoint ID</dt><dd className="break-all text-text-1">{draft.model_endpoint_id || 'Legacy / configured default'}</dd></div>
-                <div className="min-w-0"><dt className="text-text-3">Model ID</dt><dd className="break-all text-text-1">{draft.model_id || draft.azure_openai_gpt_deployment || draft.azure_agent_apim_gpt_deployment || 'Configured default'}</dd></div>
-                <div className="min-w-0"><dt className="text-text-3">Provider</dt><dd className="break-all text-text-1">{draft.model_provider || 'Configured default'}</dd></div>
-            </dl>
-            <details open={customOpen} onToggle={(event) => setCustomOpen(event.currentTarget.open)} className="rounded-xl border border-edge p-3">
-                <summary className="cursor-pointer text-sm font-medium text-text-2">Custom / legacy connection and APIM</summary>
-                <div className="mt-4 space-y-4">
-                    <p className="text-xs text-text-3">A selected endpoint takes precedence. Custom values and stored credentials are retained when you choose a model; they are never copied from app settings.</p>
-                    {!customAllowed ? <AgentNotice>Your administrator has disabled custom-connection changes. Existing values and credentials remain stored.</AgentNotice> : null}
-                    <fieldset disabled={!customAllowed} className="space-y-4">
+            <EditorRow heading="Current selection" help="What the agent calls when it runs.">
+                <dl className="grid gap-3 rounded-lg border border-edge bg-surface-1 p-3 text-xs sm:grid-cols-3">
+                    <div className="min-w-0"><dt className="text-text-3">Endpoint ID</dt><dd className="break-all text-text-1">{draft.model_endpoint_id || 'Legacy / configured default'}</dd></div>
+                    <div className="min-w-0"><dt className="text-text-3">Model ID</dt><dd className="break-all text-text-1">{draft.model_id || draft.azure_openai_gpt_deployment || draft.azure_agent_apim_gpt_deployment || 'Configured default'}</dd></div>
+                    <div className="min-w-0"><dt className="text-text-3">Provider</dt><dd className="break-all text-text-1">{draft.model_provider || 'Configured default'}</dd></div>
+                </dl>
+            </EditorRow>
+            <EditorGroup summary="Custom / legacy connection and APIM" open={customOpen} onToggle={setCustomOpen}>
+                <p className="pt-2 text-[0.8125rem] leading-relaxed text-text-3">A selected endpoint takes precedence. Custom values and stored credentials are retained when you choose a model; they are never copied from app settings.</p>
+                {!customAllowed ? <AgentNotice>Your administrator has disabled custom-connection changes. Existing values and credentials remain stored.</AgentNotice> : null}
+                <fieldset disabled={!customAllowed} className="min-w-0">
                     <legend className="sr-only">Custom connection settings</legend>
                     {draft.model_endpoint_id ? (
-                        <GlassButton type="button" size="sm" onClick={() => setDraft((current) => ({
-                            ...current, model_endpoint_id: '', model_id: '', model_provider: '',
-                        }))}>Use custom connection instead of selected endpoint</GlassButton>
+                        <div className="pb-2">
+                            <GlassButton type="button" size="sm" variant="subtle" onClick={() => setDraft((current) => ({
+                                ...current, model_endpoint_id: '', model_id: '', model_provider: '',
+                            }))}>Use custom connection instead of selected endpoint</GlassButton>
+                        </div>
                     ) : null}
-                    <Toggle label="Use APIM for this agent" checked={draft.enable_agent_gpt_apim === true}
+                    <EditorSwitch label="Use APIM for this agent" checked={draft.enable_agent_gpt_apim === true}
                         description="Switches which custom connection fields are used. Inactive connection values remain in the draft."
                         onChange={(value) => update('enable_agent_gpt_apim', value)} />
-                    <div className="grid gap-4 sm:grid-cols-2">
                         {draft.enable_agent_gpt_apim ? (
                             <>
                                 <AgentTextField label="APIM endpoint" value={draft.azure_agent_apim_gpt_endpoint}
@@ -114,10 +116,8 @@ function LocalModelFields({ draft, setDraft, options, original, allowCustomEndpo
                                     onChange={(value) => update('azure_openai_gpt_key', value)} />
                             </>
                         )}
-                    </div>
-                    </fieldset>
-                </div>
-            </details>
+                </fieldset>
+            </EditorGroup>
         </div>
     );
 }
@@ -207,7 +207,7 @@ function FoundryModelFields({ draft, setDraft, options, neutralReadOnlyCopy, dis
                     {endpoints.map((endpoint) => <option key={endpoint.id} value={endpoint.id}>{endpoint.name || endpoint.id} · {agentText(endpoint.scope) || 'global'}</option>)}
                 </select>
             </AgentField>
-            <div className="flex flex-wrap items-center gap-3">
+            <div className="flex flex-wrap items-center gap-3 pb-1">
                 <GlassButton type="button" size="sm" onClick={() => void discover()} disabled={!selectedEndpoint || loading}>
                     <RefreshCw size={14} className={loading ? 'animate-spin' : ''} />
                     {loading ? 'Discovering…' : type === 'foundry_workflow' ? 'Discover workflows' : type === 'new_foundry' ? 'Discover applications' : 'Discover agents'}
@@ -232,7 +232,7 @@ function FoundryModelFields({ draft, setDraft, options, neutralReadOnlyCopy, dis
                     </select>
                 </AgentField>
             ) : null}
-            <div className="grid gap-4 sm:grid-cols-2">
+            <div className="min-w-0">
                 <AgentTextField label="Foundry project endpoint" required value={settings.endpoint || draft.azure_openai_gpt_endpoint}
                     onChange={(value) => updateConnection('endpoint', value)} />
                 <AgentTextField label="Foundry project name" value={settings.project_name || draft.azure_openai_gpt_deployment}
@@ -290,7 +290,7 @@ function FoundryModelFields({ draft, setDraft, options, neutralReadOnlyCopy, dis
                     </>
                 )}
             </div>
-            {type === 'foundry_workflow' ? <Toggle label="Include SimpleChat document context"
+            {type === 'foundry_workflow' ? <EditorSwitch label="Include SimpleChat document context"
                 checked={settings.include_document_context !== false}
                 description="Pack selected or uploaded document context into workflow prompts."
                 onChange={(value) => update('include_document_context', value)} /> : null}
diff --git a/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx b/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx
index 64d35f515..102c92cf8 100644
--- a/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx
+++ b/application/v2_ui/src/components/workspaceAgents/AgentTemplatesPanel.tsx
@@ -6,7 +6,8 @@ import type { ActionConfiguration, AgentConfiguration, AgentEditorOptions } from
 import {
     agentDraftFromTemplate, agentTemplateSubmission, fetchAgentTemplates, safeAgentTemplateSettings, type AgentTemplate,
 } from '../../lib/workspaceAgentTemplates';
-import { GlassButton, GlassPanel } from '../ui/primitives';
+import { GlassButton } from '../ui/primitives';
+import { EditorGroup } from '../workspace/EditorLayout';
 import { SectionSearch } from '../workspace/primitives';
 import { AgentNotice } from './AgentFields';
 
@@ -96,12 +97,14 @@ export function AgentTemplatesPanel({
         `${template.title} ${template.display_name} ${template.description} ${(template.tags ?? []).join(' ')}`.toLowerCase().includes(query.toLowerCase()));
     return (
         <div className="space-y-4">
-            <p className="text-sm text-text-3">Start a new agent from an approved example or template. Instructions, tags, and recommended actions are copied into a draft, never saved automatically. Connection credentials are excluded.</p>
-            <div className="flex flex-wrap gap-2">
-                <GlassButton type="button" size="sm" disabled={loading} onClick={() => setRevision((value) => value + 1)}>Refresh templates</GlassButton>
-                {submissionsAllowed ? <GlassButton type="button" size="sm" disabled={submitting} onClick={() => void submit()}>
-                    {submitting ? 'Submitting template…' : globalScope ? 'Publish as template' : groupScope ? 'Submit template' : 'Submit personal template'}
-                </GlassButton> : null}
+            <div className="flex flex-wrap items-start justify-between gap-3">
+                <p className="min-w-0 flex-[1_1_20rem] text-[0.8125rem] leading-relaxed text-text-3">Start a new agent from an approved example or template. Instructions, tags, and recommended actions are copied into a draft, never saved automatically. Connection credentials are excluded.</p>
+                <div className="flex flex-wrap items-center gap-2">
+                    <GlassButton type="button" size="sm" variant="ghost" disabled={loading} onClick={() => setRevision((value) => value + 1)}>Refresh templates</GlassButton>
+                    {submissionsAllowed ? <GlassButton type="button" size="sm" variant="subtle" disabled={submitting} onClick={() => void submit()}>
+                        {submitting ? 'Submitting template…' : globalScope ? 'Publish as template' : groupScope ? 'Submit template' : 'Submit personal template'}
+                    </GlassButton> : null}
+                </div>
             </div>
             {error ? <AgentNotice error>{error}</AgentNotice> : null}
             {notice ? <AgentNotice>{notice}</AgentNotice> : null}
@@ -116,22 +119,25 @@ export function AgentTemplatesPanel({
                     </div>
                 </AgentNotice>
             ) : null}
-            <div className="space-y-3">
+            <ul className="space-y-2" aria-label="Templates">
                 {visible.map((template) => (
-                    <GlassPanel key={template.id} elevation="flat" className="space-y-3 border border-edge p-4">
-                        <h4 className="text-sm font-semibold text-text-1">{template.title || template.display_name}</h4>
-                        <p className="text-sm text-text-3">{template.description || template.helper_text}</p>
-                        {template.tags?.length ? <p className="text-xs text-text-3">{template.tags.join(' · ')}</p> : null}
-                        <details>
-                            <summary className="cursor-pointer text-xs font-medium text-accent">Preview template</summary>
-                            <pre className="mt-3 whitespace-pre-wrap break-words text-xs leading-relaxed text-text-2">{template.instructions}</pre>
-                            {template.actions_to_load?.length ? <p className="mt-3 break-words text-xs text-text-3">Recommended actions: {template.actions_to_load.join(', ')}</p> : null}
-                            {template.additional_settings ? <pre className="mt-3 whitespace-pre-wrap break-words rounded-lg border border-edge p-3 text-xs text-text-3">{templateSettingsPreview(template)}</pre> : null}
-                        </details>
-                        {isNew && !readOnly ? <GlassButton type="button" size="sm" onClick={() => dirty ? setPending(template) : apply(template)}>Use template</GlassButton> : null}
-                    </GlassPanel>
+                    <li key={template.id} className="space-y-3 rounded-lg border border-edge bg-surface-1 p-3">
+                        <div className="flex flex-wrap items-start justify-between gap-3">
+                            <div className="min-w-0 flex-[1_1_16rem]">
+                                <h4 className="break-words text-sm font-semibold text-text-1">{template.title || template.display_name}</h4>
+                                <p className="mt-0.5 break-words text-xs text-text-3">{template.description || template.helper_text}</p>
+                                {template.tags?.length ? <p className="mt-1 break-words text-[11px] text-text-3">{template.tags.join(' · ')}</p> : null}
+                            </div>
+                            {isNew && !readOnly ? <GlassButton type="button" size="sm" variant="subtle" onClick={() => dirty ? setPending(template) : apply(template)}>Use template</GlassButton> : null}
+                        </div>
+                        <EditorGroup summary="Preview template">
+                            <pre className="whitespace-pre-wrap break-words pt-2 text-xs leading-relaxed text-text-2">{template.instructions}</pre>
+                            {template.actions_to_load?.length ? <p className="break-words text-xs text-text-3">Recommended actions: {template.actions_to_load.join(', ')}</p> : null}
+                            {template.additional_settings ? <pre className="whitespace-pre-wrap break-words rounded-lg border border-edge p-3 text-xs text-text-3">{templateSettingsPreview(template)}</pre> : null}
+                        </EditorGroup>
+                    </li>
                 ))}
-            </div>
+            </ul>
             {!visible.length && !loading && !error ? <p role="status" className="text-sm text-text-3">No approved templates match.</p> : null}
             {!isNew ? <p className="text-xs text-text-3">Templates start new agents; applying one will not overwrite this saved agent.</p> : null}
             {submissionsAllowed ? <p className="text-xs text-text-3">{globalScope
diff --git a/application/v2_ui/src/pages/AdminGlobalEditorPages.tsx b/application/v2_ui/src/pages/AdminGlobalEditorPages.tsx
index 66463fe3d..727b57b29 100644
--- a/application/v2_ui/src/pages/AdminGlobalEditorPages.tsx
+++ b/application/v2_ui/src/pages/AdminGlobalEditorPages.tsx
@@ -23,7 +23,7 @@ function AdminEditorFrame({ description, children }: { description: string; chil
             <PageHeader title="Admin settings" description={description} />
             {isAdmin ? (
                 <div className="flex min-h-0 flex-1 flex-col overflow-hidden p-4 lg:px-6">
-                    <div className="mx-auto flex min-h-0 w-full max-w-6xl flex-1 flex-col">{children}</div>
+                    <div className="flex min-h-0 w-full flex-1 flex-col">{children}</div>
                 </div>
             ) : (
                 <div className="flex flex-1 items-center justify-center p-6">
diff --git a/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx b/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx
index 6474b26e9..01deae7b9 100644
--- a/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx
+++ b/application/v2_ui/src/pages/workspace/ActionEditorPage.tsx
@@ -2,7 +2,7 @@
 
 import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
-import { CheckCircle2, RefreshCw } from 'lucide-react';
+import { CheckCircle2, IdCard, KeyRound, Plug, RefreshCw, Settings2, SlidersHorizontal } from 'lucide-react';
 import { GlassButton, GlassPanel, Skeleton } from '../../components/ui/primitives';
 import { ConfirmDialog } from '../../components/ui/ConfirmDialog';
 import { WorkspaceEditorFrame } from '../../components/workspace/WorkspaceEditorFrame';
@@ -291,11 +291,11 @@ function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: st
             {draft.type && !definition && !catalogueLoading && !catalogueError ? <p role="status" className="rounded-xl bg-warn-soft p-3 text-sm text-warn">
                 This action’s type is no longer offered to this workspace. Its configuration is preserved for review. Choose a permitted type before saving.
             </p> : null}
-            {!readOnly && canAuthor ? <ActionField id={`${id}-type-search`} label="Search action types">
+            {!readOnly && canAuthor ? <ActionField id={`${id}-type-search`} label="Search action types" width="standard">
                 <input id={`${id}-type-search`} type="search" className={ACTION_INPUT_CLASS} value={typeSearch}
                     onChange={(event) => setTypeSearch(event.target.value)} />
             </ActionField> : null}
-            <ActionField id={`${id}-type`} label="Action type" required help={displayDefinition.description}
+            <ActionField id={`${id}-type`} label="Action type" required width="standard" help={displayDefinition.description}
                 error={actionFieldError(fieldErrors, '/type')}>
                 <select id={`${id}-type`} className={ACTION_INPUT_CLASS} value={draft.type} required disabled={readOnly || !canAuthor || catalogueLoading}
                     onChange={(event) => {
@@ -314,7 +314,7 @@ function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: st
                 <input id={`${id}-name`} autoFocus={!readOnly && canAuthor} disabled={!canAuthor} className={ACTION_INPUT_CLASS} value={draft.displayName ?? draft.name ?? ''} required
                     onChange={(event) => setDraft((current) => changeActionDisplayName(current, event.target.value, isNew))} />
             </ActionField>
-            <ActionField id={`${id}-description`} label="Description" help="Explain what this action does and when an agent should use it.">
+            <ActionField id={`${id}-description`} label="Description" width="full" help="Explain what this action does and when an agent should use it.">
                 <textarea id={`${id}-description`} rows={3} disabled={!canAuthor} className={ACTION_INPUT_CLASS} value={draft.description}
                     onChange={(event) => setDraft((current) => ({ ...current, description: event.target.value }))} />
             </ActionField>
@@ -328,11 +328,15 @@ function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: st
         draft.type === 'mcp' ? <McpActionAuthentication {...connectorProps} /> :
             <ActionAuthentication {...connectorProps} definition={displayDefinition} />;
     const sections = [
-        { id: 'identity', label: 'Identity and type', content: identitySection },
+        { id: 'identity', label: 'Identity and type', icon: IdCard,
+            description: 'The kind of connector, the name agents see, and what the action does.', content: identitySection },
         ...(draft.type ? [
-            { id: 'configuration', label: 'Configuration', content: configuration },
-            { id: 'authentication', label: 'Authentication', content: authentication },
-            { id: 'advanced', label: 'Advanced', content: <ActionAdvancedFields {...connectorProps} definition={displayDefinition} hints={hints} hintsError={hintsError} /> },
+            { id: 'configuration', label: 'Configuration', icon: Settings2,
+                description: 'Where the action connects, and what it is allowed to do there.', content: configuration },
+            { id: 'authentication', label: 'Authentication', icon: KeyRound,
+                description: 'How the action signs in to the service it calls.', content: authentication },
+            { id: 'advanced', label: 'Advanced', icon: SlidersHorizontal,
+                description: 'The machine name, metadata, and the full configuration as JSON.', content: <ActionAdvancedFields {...connectorProps} definition={displayDefinition} hints={hints} hintsError={hintsError} /> },
         ] : []),
     ];
     if (loading) return <div role="status" className="space-y-4"><p className="text-sm text-text-3">Loading action…</p><Skeleton className="h-44 w-full" /></div>;
@@ -347,7 +351,7 @@ function ActionEditor({ resourceId, scope, returnTo, adapter }: { resourceId: st
 
     return (
         <>
-            <WorkspaceEditorFrame title={readOnly ? 'Action details' : isNew ? 'New action' : canAuthor ? 'Edit action' : 'Action details'}
+            <WorkspaceEditorFrame title={readOnly ? 'Action details' : isNew ? 'New action' : canAuthor ? 'Edit action' : 'Action details'} icon={Plug}
                 description={readOnly ? 'This provided action is managed by an administrator.' :
                     isNew ? 'Configure an action, then explicitly save it. Connectors run only when you choose a discovery or test command.' : draft.displayName || draft.name}
                 backTo={returnTo || adapter.basePath} sections={sections.map((section) => ({
diff --git a/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx b/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx
index 33e945c9a..77d26b593 100644
--- a/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx
+++ b/application/v2_ui/src/pages/workspace/AgentEditorPage.tsx
@@ -2,6 +2,7 @@
 
 import { useEffect, useRef, useState, type Dispatch, type ReactNode, type SetStateAction } from 'react';
 import { Link, useLocation, useNavigate, useParams } from 'react-router-dom';
+import { BookOpen, Cpu, IdCard, LayoutTemplate, Plug, ScrollText, SlidersHorizontal, Sparkles } from 'lucide-react';
 import { GlassButton } from '../../components/ui/primitives';
 import { WorkspaceEditorFrame } from '../../components/workspace/WorkspaceEditorFrame';
 import { SectionSkeleton } from '../../components/workspace/primitives';
@@ -63,19 +64,12 @@ function AgentEditorSession({ resourceId, scope, adapter }: { resourceId: string
     const [knowledgeRevision, setKnowledgeRevision] = useState(0);
     const returnedAction = useRef<ActionConfiguration | null>(null);
     const handoffChecked = useRef(false);
-    const templatesAnchor = useRef<HTMLDivElement>(null);
     // A member without the edit hint sees the group editor read-only; personal scope always authors.
     const canAuthor = adapter.allows(isNew ? 'create' : 'edit', original?.record ?? draft);
     const readOnly = accessReadOnly || original?.read_only === true || !canAuthor;
     const advancedError = agentAdvancedError(draft, original);
     const arraySecretError = agentText(draft._editor_array_secret_error) || null;
 
-    useEffect(() => {
-        if (bootLoading || new URLSearchParams(location.search).get('templates') !== '1') return;
-        templatesAnchor.current?.scrollIntoView({ block: 'start' });
-        templatesAnchor.current?.focus({ preventScroll: true });
-    }, [bootLoading, location.search]);
-
     useEffect(() => {
         const controller = new AbortController();
         setBootLoading(true);
@@ -206,10 +200,11 @@ function AgentEditorSession({ resourceId, scope, adapter }: { resourceId: string
     const structured = (content: ReactNode) => <fieldset disabled={Boolean(advancedError) || iconBusy} className="min-w-0">{content}</fieldset>;
     return (
         <WorkspaceEditorFrame
-            title={isNew ? 'New agent' : draft.display_name || draft.name || 'Agent details'}
+            title={isNew ? 'New agent' : draft.display_name || draft.name || 'Agent details'} icon={Sparkles}
             description={isNew ? 'Configure a reusable assistant. Changes are saved only when you choose Save agent.' : `Stable ID: ${draft.id}`}
             backTo={adapter.basePath} dirty={dirty || iconBusy} saving={saving} readOnly={readOnly} error={arraySecretError || saveError}
             onSave={() => void save()} onDiscard={clear} saveLabel="Save agent" saveDisabled={Boolean(advancedError) || iconBusy}
+            initialSection={new URLSearchParams(location.search).get('templates') === '1' ? 'templates' : undefined}
             actions={<>
                 {advancedError ? <span role="status" className="max-w-xs text-xs text-danger">
                     {arraySecretError ? 'Review stored array credentials before saving.' : 'Fix Additional settings JSON to enable saving.'}
@@ -225,30 +220,36 @@ function AgentEditorSession({ resourceId, scope, adapter }: { resourceId: string
             </>}
             sections={[
                 {
-                    id: 'identity', label: 'Identity',
+                    id: 'identity', label: 'Identity', icon: IdCard,
+                    description: 'The name people see, what the agent is for, its type and its icon.',
                     content: <><AgentIdentityFields draft={draft} setDraft={setDraft} options={options} isNew={isNew} onIconBusyChange={setIconBusy} />
                         {restored ? <p role="status" className="mt-3 text-xs text-text-3">Your unsaved draft was restored from this tab’s memory.</p> : null}</>,
                 },
-                { id: 'model', label: 'Model & connection', content: structured(<AgentModelFields draft={draft} setDraft={setDraft} options={options} original={original}
+                { id: 'model', label: 'Model & connection', icon: Cpu,
+                    description: 'The model that answers, or the Foundry resource that runs the agent.', content: structured(<AgentModelFields draft={draft} setDraft={setDraft} options={options} original={original}
                     allowCustomEndpoints={adapter.allowsCustomEndpoints(options.settings)} discoverFoundryResources={adapter.discoverFoundryResources}
                     neutralReadOnlyCopy={adapter.scope.kind === 'group' && readOnly} />) },
-                { id: 'actions', label: 'Actions', content: structured(<AgentActionPicker draft={draft} setDraft={setDraft}
+                { id: 'actions', label: 'Actions', icon: Plug,
+                    description: 'The actions the agent can call, and what each one may do.', content: structured(<AgentActionPicker draft={draft} setDraft={setDraft}
                     actions={actions} targets={targets} loading={actionsLoading} error={actionsError} targetError={targetError}
                     builtinActions={options.builtin_actions} ownerId={ownerId} canCreateActions={canCreateActions} readOnly={readOnly}
                     scopeKind={adapter.scope.kind}
                     onRefresh={() => setActionsRevision((value) => value + 1)}
                     onNewAction={() => navigate(`${adapter.actionsBasePath}/new?returnTo=${encodeURIComponent(location.pathname)}`, { state: { preserveWorkspaceDraft: true, workspaceEditorFrom: location.key } })} />) },
-                { id: 'knowledge', label: 'Assigned knowledge', content: structured(<AgentKnowledgeFields draft={draft} setDraft={setDraft}
+                { id: 'knowledge', label: 'Assigned knowledge', icon: BookOpen,
+                    description: 'The documents, tags and web pages the agent answers from.', content: structured(<AgentKnowledgeFields draft={draft} setDraft={setDraft}
                     catalog={knowledge} loading={knowledgeLoading} error={knowledgeError} readOnly={readOnly} knowledgeScopes={adapter.knowledgeScopes}
                     onRefresh={() => setKnowledgeRevision((value) => value + 1)} />) },
-                { id: 'instructions', label: 'Instructions', content: <AgentInstructionsFields key={draft.agent_type}
+                { id: 'instructions', label: 'Instructions', icon: ScrollText,
+                    description: 'How the agent behaves and responds.', content: <AgentInstructionsFields key={draft.agent_type}
                     draft={draft} setDraft={setDraft} actions={actions} catalog={knowledge} readOnly={readOnly} draftInstructions={adapter.draftInstructions}
                     contextError={actionsError || (readAgentKnowledgeEnabled(draft) ? knowledgeError : null)} /> },
-                { id: 'advanced', label: 'Advanced', content: <AgentAdvancedFields draft={draft} setDraft={setDraft} options={options} original={original} /> },
-                { id: 'templates', label: 'Examples & templates', content: structured(<div ref={templatesAnchor} tabIndex={-1}>
+                { id: 'advanced', label: 'Advanced', icon: SlidersHorizontal,
+                    description: 'Token and reasoning limits, and every setting as JSON.', content: <AgentAdvancedFields draft={draft} setDraft={setDraft} options={options} original={original} /> },
+                { id: 'templates', label: 'Examples & templates', icon: LayoutTemplate,
+                    description: 'Approved examples and templates to start a new agent from.', content: structured(
                     <AgentTemplatesPanel draft={draft} setDraft={setDraft} options={options} actions={actions} isNew={isNew} dirty={dirty} readOnly={readOnly}
-                        submissionAllowed={adapter.allowsTemplateSubmission(options.settings)} scope={adapter.scope.kind} />
-                </div>) },
+                        submissionAllowed={adapter.allowsTemplateSubmission(options.settings)} scope={adapter.scope.kind} />) },
             ]}
         />
     );
diff --git a/application/v2_ui/src/styles/theme.css b/application/v2_ui/src/styles/theme.css
index 8f83c9b59..0d809bc9d 100644
--- a/application/v2_ui/src/styles/theme.css
+++ b/application/v2_ui/src/styles/theme.css
@@ -464,6 +464,94 @@ html[data-font-size='xl'] {
         }
     }
 
+    /*
+     * Agent and action editor rows (components/workspace/EditorLayout.tsx).
+     *
+     * The editors reuse the setting row above, but they nest fields in panels, groups and
+     * fieldsets, so a row cannot go by the card's width. Each row measures its own width
+     * and is marked `data-wide` from 50rem, the width at which an Admin Settings row puts
+     * its label beside the control. Neither rows nor editor cards are size containers: in
+     * Chromium a size container can be left with a stale, collapsed layout when React adds
+     * an editor section after it. The stacked rules win over any container query above.
+     */
+    .editor-field {
+        inline-size: 100%;
+        min-inline-size: 0;
+    }
+
+    .editor-field > .admin-field {
+        grid-template-columns: minmax(0, 1fr);
+        grid-template-rows: none;
+        grid-template-areas:
+            'heading'
+            'control'
+            'help';
+        column-gap: 0;
+        row-gap: 0.375rem;
+    }
+
+    .editor-field > .admin-field > .admin-field-heading {
+        padding-top: 0;
+    }
+
+    .editor-field > .admin-field > .admin-field-control {
+        max-width: none;
+    }
+
+    .editor-field[data-wide] > .admin-field {
+        grid-template-columns: minmax(13rem, 26rem) minmax(18rem, 1fr);
+        grid-template-rows: auto 1fr;
+        grid-template-areas:
+            'heading control'
+            'help control';
+        column-gap: 2rem;
+        row-gap: 0.25rem;
+        align-items: start;
+    }
+
+    /* Lines the label up with the text inside a 40px control. */
+    .editor-field[data-wide] > .admin-field > .admin-field-heading {
+        padding-top: 0.625rem;
+    }
+
+    /* A nested row gives its label column the indent, so its control lines up. */
+    [data-setting-emphasis='dependent'] .editor-field[data-wide] > .admin-field {
+        grid-template-columns: minmax(11rem, calc(26rem - 1.5rem - 2px)) minmax(18rem, 1fr);
+    }
+
+    .editor-field[data-wide] > .admin-field[data-field-width='compact'] > .admin-field-control {
+        max-width: 12rem;
+    }
+
+    .editor-field[data-wide] > .admin-field[data-field-width='standard'] > .admin-field-control {
+        max-width: 26rem;
+    }
+
+    .editor-field[data-wide] > .admin-field[data-field-width='wide'] > .admin-field-control {
+        max-width: 42rem;
+    }
+
+    /* Consecutive rows read as one list, separated by a hairline as settings rows are. */
+    .editor-field + .editor-field {
+        border-top: 1px solid var(--edge-strong);
+    }
+
+    .editor-field:has(+ .editor-field) {
+        margin-block-end: 0;
+    }
+
+    .admin-settings-distinct.editor-section {
+        container-type: normal;
+    }
+
+    /* Panels and groups have the solid surface of an Admin Settings group, where the
+       translucent light-theme edge disappears. Rows and outlined buttons inside one use the
+       strong edge so they stay visible; inputs keep the admin field border above. */
+    .editor-panel :is(.border-edge, .glass-flat):not(input, select, textarea),
+    .editor-group :is(.border-edge, .glass-flat):not(input, select, textarea) {
+        border-color: var(--edge-strong);
+    }
+
     /* Relative to the card, not the viewport, so text scaling also triggers wrapping. */
     @container (max-width: 16rem) {
         .admin-settings-distinct .admin-section-body {
diff --git a/docs/admin/agents-actions.md b/docs/admin/agents-actions.md
index 79237ec70..abb179fae 100644
--- a/docs/admin/agents-actions.md
+++ b/docs/admin/agents-actions.md
@@ -100,27 +100,31 @@ only agents there are, and everyone chats with the **default agent** you choose
 here. With Workspace Mode on they appear beside people's own agents only when
 **Add Global Agents and Actions to Workspaces** is on.
 
-The list shows each agent's type, model, how many actions it uses, and whether it
-is the default or disabled. Each change on the list saves straight away, because
-these are records rather than settings, so the save bar is not involved. Opening
-an agent replaces this page, so if other settings here are unsaved you are asked
-to keep editing or discard them first:
+Each row shows the agent's type, model, and how many actions it uses, with a badge
+for whether it is enabled and another on the default agent. The icons at the end of
+a row make the agent the default, enable or disable it, open it, and delete it. Each
+change on the list saves straight away, because these are records rather than
+settings, so the save bar is not involved. Opening an agent replaces this page, so
+if other settings here are unsaved you are asked to keep editing or discard them
+first:
 
 - **New agent** opens the same full-page agent editor people use in their
   workspaces: identity, model and connection, actions, assigned knowledge,
-  instructions, advanced settings, and examples and templates. Saving returns you
+  instructions, advanced settings, and examples and templates. The editor is laid
+  out as this page is, a card per section with each setting's label and help beside
+  it, and it looks the same in My Workspace and group workspaces. Saving returns you
   to this list.
 - **Start from a template** opens a new agent with the template gallery in view.
   Applying a template copies its instructions, tags, and recommended actions into
   an unsaved draft; connection credentials are never copied. Choose a model, then
   save. The button appears while **Enable Agent Template Gallery** is on.
-- **Make default** chooses the agent that answers when nobody picks one. A
-  disabled agent cannot be the default.
-- **Disable** keeps an agent's configuration but stops offering it. Disabling the
+- **Make default** (the star) chooses the agent that answers when nobody picks
+  one. A disabled agent cannot be the default.
+- **Disable** (the power icon) keeps an agent's configuration but stops offering it. Disabling the
   default hands the default to another enabled agent, if there is one, and the
   confirmation names which.
-- **Delete** removes an agent after you confirm. The default agent cannot be
-  deleted; choose another default first.
+- **Delete** (the bin) removes an agent after you confirm. The default agent
+  cannot be deleted; choose another default first.
 
 A few things differ from a workspace agent, because a global agent answers
 everyone:
@@ -355,9 +359,9 @@ As with Global Agents, each change saves straight away:
   connector catalogue the deployment provides, MCP presets and the global MCP
   preconfigurations, connection tests, and Key Vault credential handling. Saving
   returns you to this list.
-- **Disable** keeps an action's configuration without loading it, and **Delete**
-  removes it after you confirm. Deleting an action does not edit the agents that
-  used it.
+- **Disable** (the power icon) keeps an action's configuration without loading
+  it, and **Delete** (the bin) removes it after you confirm. Deleting an action
+  does not edit the agents that used it.
 
 Connection tests and MCP tool discovery run in the global scope, so a stored
 credential resolves from the global Key Vault namespace rather than your own. A
diff --git a/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
index 2a2df8a88..696f1ff1e 100644
--- a/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
+++ b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
@@ -119,6 +119,44 @@ asks before leaving for a global editor while settings are unsaved (the same
 **Discard unsaved changes?** prompt the editors use), and the approvals link opens
 in a new tab.
 
+### Shared editor design
+
+The agent and action editors are one implementation for personal, group, and
+global records, so a change to them changes all three. `WorkspaceEditorFrame`
+lays them out as Admin Settings is laid out:
+
+- A section rail on the left, with an icon per section, marks the section in view
+  as the pane scrolls. Below the `lg` breakpoint it becomes the **Jump to section**
+  list. Choosing a section pins it: while it is pinned, the frame keeps it at the
+  top as lists above or inside it finish loading, and scrolling, clicking, or typing
+  in the pane releases it. `initialSection` opens the editor at a section this way,
+  which is how `?templates=1` shows the gallery.
+- Each section is a card with an icon tile, a title, and a line on what it holds.
+  **Advanced** is a collapsible card.
+- The fields are Admin Settings rows, built from `components/workspace/EditorLayout.tsx`:
+  `EditorFieldRow` and `EditorRow` for a setting, `EditorFieldset` for a group of
+  choices, `EditorSwitch` for a switch, with `lead` and `EditorDependents` for a
+  switch and the settings that depend on it, and `EditorGroup`, `EditorPanel`, and
+  `EditorPanelFieldset` for collapsible groups and titled panels. `AgentField` and
+  `ActionField` render through `EditorFieldRow`, so every existing field took the new
+  layout without changing its label, help, or error wiring.
+
+A row puts its label and help beside the control once it is at least 50rem wide, with
+the grid Admin Settings rows use. Unlike an Admin Settings row, an editor row measures
+its own width (one shared `ResizeObserver`, applied before paint) and is marked
+`data-wide`, because editor fields sit inside panels, groups, and fieldsets where the
+card's width would overstate the room a row has. Neither rows nor editor cards are CSS
+size containers: in Chromium 145 a size container could be left with a stale, collapsed
+layout when React added an editor section after it, which hid the **Action type** row
+once a new action's type was chosen. On the solid surface of a panel or group, rows and
+outlined buttons use the strong edge colour so they stay visible in the light theme.
+
+The Global Agents and Global Actions lists use the AI Connections list rows: an
+Enabled or Disabled badge (`AdminListPill`), a Default agent badge, and icon buttons
+whose accessible names are the same as the text buttons they replace, such as
+**Make Policy advisor the default agent** and **Disable Ticket search**. Search
+appears once a list has four or more entries.
+
 ### Classic interoperability
 
 The classic Admin Settings tables and the V2 editors work on the same records, so
@@ -148,6 +186,9 @@ document.
 - `application/v2_ui/src/components/admin/GlobalAgentsManager.tsx` (new)
 - `application/v2_ui/src/components/admin/GlobalActionsManager.tsx` (new)
 - `application/v2_ui/src/components/admin/AgentTemplateApprovalsLink.tsx` (new)
+- `application/v2_ui/src/components/admin/AdminListPill.tsx` (new)
+- `application/v2_ui/src/components/workspace/EditorLayout.tsx` (new)
+- `application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx` (redesigned)
 - `application/v2_ui/src/pages/AdminGlobalEditorPages.tsx` (new)
 
 ## Usage instructions
@@ -176,6 +217,7 @@ administrator reference.
 | `functional_tests/test_v2_admin_agents_parity.py`, `test_v2_admin_actions_parity.py` | Section and component declarations |
 | `functional_tests/route_tests/` | Blueprint policy and admin-only access for all 13 routes |
 | `ui_tests/test_v2_admin_global_agents_actions.py` | The built SPA: lists, default, enable/disable, delete, agent creation from scratch and from a template, template publishing, a global Call agent action attached to a global agent, credential-preserving edits, load failures and revision conflicts, the unsaved-settings prompt, and non-administrator refusal |
+| `ui_tests/test_v2_workspace_authoring.py`, `test_v2_workspace_draft_navigation.py`, `test_v2_group_agents.py`, `test_v2_group_actions.py`, `test_v2_cross_scope_journeys.py` | The redesigned editors in personal and group scope: section navigation, every field and connector, draft protection, and saving |
 
 ### Known limitations
 
diff --git a/docs/explanation/release_notes.md b/docs/explanation/release_notes.md
index 7609de1c8..8e9394814 100644
--- a/docs/explanation/release_notes.md
+++ b/docs/explanation/release_notes.md
@@ -24,6 +24,14 @@ For feature-focused and fix-focused drill-downs by version, see [Features by Ver
     *   The V2 Call agent target picker always listed the signed-in person's personal targets. It now asks for the targets of the workspace the action belongs to: global agents for a global action, and for a group action the group's agents plus any permitted global ones, which matches what the server accepts when the action is saved.
     *   (Ref: `CallAgentActionConfiguration.tsx`, `/api/plugins/agent-targets`)
 
+#### User Interface Enhancements
+
+*   **Agent and Action Editors Share the Admin Settings Design**
+    *   The full-page agent and action editors, the same ones in My Workspace, group workspaces and Admin Settings, are now laid out as Admin Settings is. Each section is a card headed by an icon, its title and what it holds. Settings are rows with the label and help beside the control on a wide screen, stacked on a narrow one. A setting others depend on, such as **Restrict to assigned knowledge** or **Track secret expiration**, is highlighted with the settings it controls indented beneath it, and collapsible groups and panels match Admin Settings.
+    *   The section list on the left stays, now with an icon per section, and marks the section in view. Choosing a section, or arriving through **Start from a template**, keeps that section in view while lists above it finish loading, until you scroll.
+    *   The Global Agents and Global Actions lists now match AI Connections: an Enabled or Disabled badge, a Default agent badge, and icon buttons to make an agent the default, enable or disable, edit, and delete.
+    *   (Ref: `EditorLayout.tsx`, `WorkspaceEditorFrame.tsx`, `theme.css` `.editor-field`, `AgentFields.tsx`, `ActionFields.tsx`, `GlobalAgentsManager.tsx`, `GlobalActionsManager.tsx`, `AdminListPill.tsx`, [V2 Admin Global Agents and Actions](features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md))
+
 ### **(v0.261.267)**
 
 #### User Interface Enhancements
diff --git a/ui_tests/test_v2_admin_global_agents_actions.py b/ui_tests/test_v2_admin_global_agents_actions.py
index d363bf371..49488dfc8 100644
--- a/ui_tests/test_v2_admin_global_agents_actions.py
+++ b/ui_tests/test_v2_admin_global_agents_actions.py
@@ -333,6 +333,9 @@ def test_a_call_agent_action_is_an_ordinary_global_action(global_ui):
     ).click()
     expect(page).to_have_url(f"{ORIGIN}/v2/admin/actions/new")
     _action_field(page, "Action type").select_option("agent")
+    # Choosing a type adds the other sections; the rows above them must stay laid out.
+    expect(_action_field(page, "Action type")).to_be_visible()
+    expect(_action_field(page, "Action type")).to_have_value("agent")
     _action_field(page, "Action name").fill("Ask the policy advisor")
     page.get_by_label("Description", exact=True).fill("Hand policy questions to the policy advisor.")
     _editor_section(page, "Configuration")

From 0babc2442c452f78e85b0874d88bd89b8ab23c95 Mon Sep 17 00:00:00 2001
From: Paul Lizer <paullizer@microsoft.com>
Date: Tue, 6 Oct 2026 20:00:18 -0400
Subject: [PATCH 4/5] Release a pinned editor section on save, validation and
 focus

A section chosen from the editor rail stayed pinned through Save, because
the pin was only released by input inside the scrolling pane and Save sits
in the header. When the save failed, or native validation revealed a field
in a closed group, the content resized and the pin scrolled the focused
error or field back out of view.

The pin is now released by pointer or key input anywhere in the editor
form, on submit, on an invalid field, before the error summary is focused,
and when focus moves to anything other than the pinned section. A rail
choice still pins, because its click follows the pointerdown or keydown.
Two UI tests cover a failed save and an invalid field after a rail jump.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../workspace/WorkspaceEditorFrame.tsx        | 32 +++++++++++++----
 .../V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md         |  8 +++--
 .../test_v2_admin_global_agents_actions.py    | 36 +++++++++++++++++++
 3 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx b/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx
index 7f9242629..ea36f08ff 100644
--- a/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx
+++ b/application/v2_ui/src/components/workspace/WorkspaceEditorFrame.tsx
@@ -98,7 +98,9 @@ export function WorkspaceEditorFrame({
     const [current, setCurrent] = useState<string | null>(sections[0]?.id ?? null);
     // A section chosen in the rail stays marked while the pane scrolls to it, and until the
     // person scrolls themselves; one near the end could never rise far enough to be marked.
-    // Until then it also stays in place while lists above or inside it finish loading.
+    // Until then it also stays in place while lists above or inside it finish loading. Any
+    // other use of the editor ends the pin, as does a save or focus moving anywhere else, so
+    // holding the section never scrolls an error or an invalid field back out of view.
     const pinned = useRef<string | null>(null);
     const sectionIds = sections.map((section) => section.id).join('|');
     const blocker = useBlocker(({ currentLocation, nextLocation, historyAction }) => {
@@ -134,7 +136,9 @@ export function WorkspaceEditorFrame({
     }, [dirty, saving, readOnly]);
 
     useEffect(() => {
-        if (error) errorSummary.current?.focus();
+        if (!error) return;
+        pinned.current = null;
+        errorSummary.current?.focus();
     }, [error]);
 
     // Mark the section in view, as the Admin Settings index does: the last one whose top has
@@ -165,6 +169,11 @@ export function WorkspaceEditorFrame({
         const release = () => {
             pinned.current = null;
         };
+        // Only the pinned section itself may take focus without ending the pin.
+        const releaseOnFocus = (event: FocusEvent) => {
+            if (pinned.current && event.target !== document.getElementById(`${prefix}-${pinned.current}`)) release();
+        };
+        const owner = form.current;
         const content = root.firstElementChild;
         const realign = typeof ResizeObserver === 'undefined' ? null : new ResizeObserver(() => {
             if (pinned.current) document.getElementById(`${prefix}-${pinned.current}`)?.scrollIntoView({ block: 'start' });
@@ -174,16 +183,20 @@ export function WorkspaceEditorFrame({
         root.addEventListener('scroll', onScroll, { passive: true });
         root.addEventListener('wheel', release, { passive: true });
         root.addEventListener('touchstart', release, { passive: true });
-        root.addEventListener('pointerdown', release);
-        root.addEventListener('keydown', release);
+        // The whole form, not just the pane: Save and the header commands sit above it. A rail
+        // choice still pins, because its click follows the pointerdown or keydown.
+        owner?.addEventListener('pointerdown', release);
+        owner?.addEventListener('keydown', release);
+        owner?.addEventListener('focusin', releaseOnFocus);
         return () => {
             cancelAnimationFrame(frame);
             realign?.disconnect();
             root.removeEventListener('scroll', onScroll);
             root.removeEventListener('wheel', release);
             root.removeEventListener('touchstart', release);
-            root.removeEventListener('pointerdown', release);
-            root.removeEventListener('keydown', release);
+            owner?.removeEventListener('pointerdown', release);
+            owner?.removeEventListener('keydown', release);
+            owner?.removeEventListener('focusin', releaseOnFocus);
         };
     }, [sectionIds, prefix]);
 
@@ -212,8 +225,13 @@ export function WorkspaceEditorFrame({
 
     return (
         <form ref={form} className="flex h-full min-h-0 flex-col"
-            onSubmit={(event) => { event.preventDefault(); if (!readOnly && !saving && !saveDisabled) onSave(); }}
+            onSubmit={(event) => {
+                event.preventDefault();
+                pinned.current = null;
+                if (!readOnly && !saving && !saveDisabled) onSave();
+            }}
             onInvalidCapture={(event) => {
+                pinned.current = null;
                 const input = event.target;
                 if (input instanceof HTMLElement) {
                     const details = input.closest('details');
diff --git a/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
index 696f1ff1e..217ed9f22 100644
--- a/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
+++ b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
@@ -128,9 +128,11 @@ lays them out as Admin Settings is laid out:
 - A section rail on the left, with an icon per section, marks the section in view
   as the pane scrolls. Below the `lg` breakpoint it becomes the **Jump to section**
   list. Choosing a section pins it: while it is pinned, the frame keeps it at the
-  top as lists above or inside it finish loading, and scrolling, clicking, or typing
-  in the pane releases it. `initialSection` opens the editor at a section this way,
-  which is how `?templates=1` shows the gallery.
+  top as lists above or inside it finish loading. Scrolling, clicking or typing
+  anywhere in the editor releases it, and so do saving, a field failing validation,
+  and focus moving anywhere but the section itself, so holding the section never
+  scrolls a save error or an invalid field back out of view. `initialSection` opens
+  the editor at a section this way, which is how `?templates=1` shows the gallery.
 - Each section is a card with an icon tile, a title, and a line on what it holds.
   **Advanced** is a collapsible card.
 - The fields are Admin Settings rows, built from `components/workspace/EditorLayout.tsx`:
diff --git a/ui_tests/test_v2_admin_global_agents_actions.py b/ui_tests/test_v2_admin_global_agents_actions.py
index 49488dfc8..e23b29f68 100644
--- a/ui_tests/test_v2_admin_global_agents_actions.py
+++ b/ui_tests/test_v2_admin_global_agents_actions.py
@@ -430,6 +430,42 @@ def test_failures_are_shown_and_a_conflicting_draft_is_kept(global_ui):
     assert ui.agents[POLICY_AGENT_ID]["description"] == "Changed by another administrator."
 
 
+def test_a_failed_save_stays_in_view_after_jumping_to_a_section(global_ui):
+    """A section chosen in the rail is held in place while it loads, but never over a failed save."""
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Agents")
+    page.get_by_role("link", name="Policy advisor", exact=True).click()
+    description = page.get_by_label("Description", exact=True)
+    expect(description).to_have_value("Policy advisor for everyone in the organisation.")
+    description.fill("An edit the server refuses.")
+    _editor_section(page, "Instructions")
+    path = f"/api/v2/admin/agents/{POLICY_AGENT_ID}"
+    ui.fail_next("PATCH", path, error="The agent service is unavailable.")
+    assert _save(ui, "Save agent", "PATCH", path).status == 503
+    error = page.get_by_role("alert").filter(has_text="The agent service is unavailable.")
+    expect(error).to_be_focused()
+    expect(error).to_be_in_viewport()
+    expect(description).to_have_value("An edit the server refuses.")
+
+
+def test_an_invalid_field_stays_in_view_after_jumping_to_a_section(global_ui):
+    """Saving reveals an invalid field in a closed group; the chosen section must not hide it again."""
+    ui, page = global_ui, global_ui.page
+    ui.open(ready_region="Global Agents")
+    page.get_by_role("link", name="Policy advisor", exact=True).click()
+    internal_identity = page.locator("summary", has_text="Internal identity")
+    internal_identity.click()
+    internal_name = _action_field(page, "Internal name")
+    internal_name.fill("")
+    internal_identity.click()
+    expect(internal_name).to_be_hidden()
+    _editor_section(page, "Advanced")
+    page.get_by_role("button", name="Save agent", exact=True).click()
+    expect(internal_name).to_be_focused()
+    expect(internal_name).to_be_in_viewport()
+    assert not ui.writes_to("PATCH", f"/api/v2/admin/agents/{POLICY_AGENT_ID}")
+
+
 def test_unsaved_settings_are_kept_unless_discarded_before_opening_an_editor(global_ui):
     """Opening a global editor replaces the page, so it asks before dropping unsaved settings."""
     ui, page = global_ui, global_ui.page

From da8bddc1911d89f67c09d5fe72c99c55a40f4d69 Mon Sep 17 00:00:00 2001
From: Paul Lizer <paullizer@microsoft.com>
Date: Tue, 6 Oct 2026 21:38:55 -0400
Subject: [PATCH 5/5] Keep exception text out of global agent refusals and tidy
 test imports

Address the CodeQL review findings on the global agents and actions editor.

- route_backend_agents.py: _prepare_global_agent_payload no longer returns a
  caught AgentPayloadError or AssignedKnowledgeError's text in its 400
  response (py/stack-trace-exposure, alerts 4054 and 4055). It answers with a
  fixed message and logs the reason as a warning. The editor engine already
  replaced the body with "Invalid agent configuration.", so nothing changes on
  screen; the reason, which was discarded, is now kept in the server log.
- test_v2_admin_global_editor_backend.py: a test runs the real function from
  its source and checks both refusals answer with a fixed message while the
  log keeps the reason, and that no response in the function names a caught
  exception. It fails against the previous code. Also drops the unused
  MagicMock import (alert 4057) and passes deepcopy directly instead of
  wrapping it in a lambda (alert 4058).
- The feature doc notes where a refused global agent's reason is logged.

The connect_options import flagged in the UI test (alert 4056) is kept: it
overrides pytest-playwright's fixture by name, as in the other UI tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../single_app/route_backend_agents.py        | 17 +++-
 .../V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md         |  9 +-
 .../test_v2_admin_global_editor_backend.py    | 84 ++++++++++++++++++-
 3 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/application/single_app/route_backend_agents.py b/application/single_app/route_backend_agents.py
index da2823d88..194a53247 100644
--- a/application/single_app/route_backend_agents.py
+++ b/application/single_app/route_backend_agents.py
@@ -1353,10 +1353,18 @@ def _prepare_global_agent_payload(user_id, agent, settings, existing):
     against the global scope. Returns ``(cleaned_agent, error_response)`` with exactly
     one set; the signature matches ``apply_global_agent_write``.
     """
+    action = 'create' if existing is None else 'edit'
+    # A refusal carries a fixed message and keeps the reason in the server log, so no
+    # exception text reaches a response (CodeQL py/stack-trace-exposure).
     try:
         cleaned_agent = sanitize_agent_payload(agent)
     except AgentPayloadError as exc:
-        return None, (jsonify({'error': str(exc)}), 400)
+        log_event(
+            "Global agent save refused: invalid payload",
+            level=logging.WARNING,
+            extra={"scope": "global", "action": action, "error": str(exc)},
+        )
+        return None, (jsonify({'error': 'Invalid agent configuration.'}), 400)
 
     cleaned_agent['is_global'] = True
     cleaned_agent['is_group'] = False
@@ -1373,7 +1381,12 @@ def _prepare_global_agent_payload(user_id, agent, settings, existing):
                 is_admin=True,
             )
     except AssignedKnowledgeError as exc:
-        return None, (jsonify({'error': str(exc)}), 400)
+        log_event(
+            "Global agent save refused: assigned knowledge",
+            level=logging.WARNING,
+            extra={"scope": "global", "action": action, "error": str(exc)},
+        )
+        return None, (jsonify({'error': 'Invalid assigned knowledge configuration.'}), 400)
 
     validation_error = validate_agent(cleaned_agent)
     if validation_error:
diff --git a/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
index 6ec0fc516..df52c5a70 100644
--- a/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
+++ b/docs/explanation/features/V2_ADMIN_GLOBAL_AGENTS_ACTIONS.md
@@ -76,6 +76,13 @@ Reads return `{record, revision, secret_paths, read_only}`. Writes send
 `{updates, expected_revision, clear_secret_paths, removed_paths}`, the same
 editor contract the personal and group routes use; a stale revision is a 409.
 
+A global agent the server refuses, because a value is invalid or its assigned
+knowledge cannot be resolved, is a 400 with **Invalid agent configuration.** The
+response never carries the exception's text. The reason, such as a field over its
+length limit or a workspace that no longer exists, is logged as a warning, "Global
+agent save refused: invalid payload" or "Global agent save refused: assigned
+knowledge", with its `error` in the event's properties.
+
 The lists reuse the classic routes for state changes the editor contract does not
 model: `PATCH /api/admin/agents/<name>/enabled` (which hands the default to another
 enabled agent when the default is disabled), `POST /api/admin/agents/selected_agent`,
@@ -213,7 +220,7 @@ administrator reference.
 
 | Test | Covers |
 |---|---|
-| `functional_tests/test_v2_admin_global_editor_backend.py` | Global scope in the authoring engine: secret masking and Key Vault naming, conditional writes, duplicate names, stamped fields, default-agent rename and delete rules, route access and boundaries |
+| `functional_tests/test_v2_admin_global_editor_backend.py` | Global scope in the authoring engine: secret masking and Key Vault naming, conditional writes, duplicate names, stamped fields, default-agent rename and delete rules, route access and boundaries, and refused saves that log their reason instead of returning exception text |
 | `functional_tests/test_workspace_authoring_credential_compatibility.py` | The classic global delete removes a credential the V2 editor stored, using the real Key Vault helpers |
 | `functional_tests/test_v2_admin_global_editor_logic.mjs` | The global adapters, return paths, stripped server fields, connector and template scopes, and admin routes, against the real TypeScript |
 | `functional_tests/test_v2_admin_agents_parity.py`, `test_v2_admin_actions_parity.py` | Section and component declarations |
diff --git a/functional_tests/test_v2_admin_global_editor_backend.py b/functional_tests/test_v2_admin_global_editor_backend.py
index 0f753b19e..2450533d9 100644
--- a/functional_tests/test_v2_admin_global_editor_backend.py
+++ b/functional_tests/test_v2_admin_global_editor_backend.py
@@ -25,18 +25,20 @@
 - renaming the default agent keeps it selected.
 """
 
+import ast
 import importlib.util
+import logging
 import sys
 import uuid
 from copy import deepcopy
 from pathlib import Path
 from types import ModuleType, SimpleNamespace
-from unittest.mock import MagicMock
 
 import pytest
 
 sys.path.append(str(Path(__file__).resolve().parent))
 
+from test_support.app_source import definitions, run_definitions
 from test_support.versioning import assert_app_version_at_least
 
 
@@ -191,7 +193,7 @@ def activity(name):
             "functions_settings",
             get_settings=lambda: deepcopy(settings),
             update_settings=lambda updates, **kwargs: calls.settings_updates.append(updates) or True,
-            sanitize_settings_for_user=lambda values: deepcopy(values),
+            sanitize_settings_for_user=deepcopy,
         ),
         "functions_agent_templates": _module(
             "functions_agent_templates",
@@ -361,6 +363,84 @@ def invalid(user_id, record, settings, existing):
     assert engine.agents.writes == []
 
 
+def test_a_refused_global_agent_keeps_the_reason_in_the_server_log():
+    """A refusal answers with a fixed message; the exception's text goes only to the log.
+
+    CodeQL py/stack-trace-exposure: no caught exception may reach a response. The real
+    ``_prepare_global_agent_payload`` runs here unchanged from its source.
+    """
+    class AgentPayloadError(ValueError):
+        pass
+
+    class AssignedKnowledgeError(ValueError):
+        pass
+
+    refusal, logged = {}, []
+
+    def sanitize_agent_payload(agent):
+        if "payload" in refusal:
+            raise AgentPayloadError(refusal["payload"])
+        return deepcopy(agent)
+
+    def apply_assigned_knowledge_to_agent_payload(agent, **kwargs):
+        if "knowledge" in refusal:
+            raise AssignedKnowledgeError(refusal["knowledge"])
+        return agent
+
+    namespace = run_definitions("route_backend_agents.py", ["_prepare_global_agent_payload"], {
+        "AgentPayloadError": AgentPayloadError,
+        "AssignedKnowledgeError": AssignedKnowledgeError,
+        "sanitize_agent_payload": sanitize_agent_payload,
+        "apply_assigned_knowledge_to_agent_payload": apply_assigned_knowledge_to_agent_payload,
+        "validate_agent": lambda agent: None,
+        "validate_agent_delegation_bindings": lambda agent, **kwargs: None,
+        "jsonify": lambda body: body,
+        "log_event": lambda message, **kwargs: logged.append((message, kwargs)),
+        "logging": logging,
+    })
+    prepare = namespace["_prepare_global_agent_payload"]
+
+    refusal["payload"] = "description exceeds maximum length of 2000."
+    cleaned, error = prepare("admin-1", {"name": "guide"}, {}, None)
+    assert cleaned is None
+    assert error == ({"error": "Invalid agent configuration."}, 400)
+    assert logged[-1] == ("Global agent save refused: invalid payload", {
+        "level": logging.WARNING,
+        "extra": {"scope": "global", "action": "create", "error": refusal["payload"]},
+    })
+
+    refusal.clear()
+    refusal["knowledge"] = "Assigned public workspace was not found."
+    edited = {"name": "guide", "other_settings": {"assigned_knowledge": {"enabled": True}}}
+    cleaned, error = prepare("admin-1", edited, {}, {"name": "guide"})
+    assert cleaned is None
+    assert error == ({"error": "Invalid assigned knowledge configuration."}, 400)
+    assert logged[-1] == ("Global agent save refused: assigned knowledge", {
+        "level": logging.WARNING,
+        "extra": {"scope": "global", "action": "edit", "error": refusal["knowledge"]},
+    })
+
+    refusal.clear()
+    cleaned, error = prepare("admin-1", {"name": "guide"}, {}, None)
+    assert error is None
+    assert cleaned["is_global"] is True and cleaned["is_group"] is False
+
+    # Every response the function builds, including any added later, is a fixed message.
+    node = definitions("route_backend_agents.py", ["_prepare_global_agent_payload"]).body[0]
+    caught = {
+        handler.name for handler in ast.walk(node)
+        if isinstance(handler, ast.ExceptHandler) and handler.name
+    }
+    responses = [
+        call for call in ast.walk(node)
+        if isinstance(call, ast.Call) and isinstance(call.func, ast.Name) and call.func.id == "jsonify"
+    ]
+    assert caught and responses
+    for call in responses:
+        names = {child.id for child in ast.walk(call) if isinstance(child, ast.Name)}
+        assert not names & caught, ast.unparse(call)
+
+
 def test_global_agents_may_be_any_type_and_carry_their_own_connection(engine):
     validate = engine.authoring._validate_agent_editor_changes
     for agent_type in ("local", "aifoundry", "new_foundry", "foundry_workflow"):