diff --git a/packages/app-shell/src/views/metadata-admin/default-schemas.ts b/packages/app-shell/src/views/metadata-admin/default-schemas.ts
index 6ff590f21..c0bd476dd 100644
--- a/packages/app-shell/src/views/metadata-admin/default-schemas.ts
+++ b/packages/app-shell/src/views/metadata-admin/default-schemas.ts
@@ -159,6 +159,35 @@ const SCHEMAS: Record<string, Record<string, unknown>> = {
       ...headerProps,
       instructions: { type: 'string', title: 'Instructions', format: 'multiline' },
       tools: { type: 'array', title: 'Tools', items: { type: 'string' } },
+      surface: {
+        type: 'string',
+        title: 'Surface',
+        description: "Agent surface this skill binds to (ADR-0063).",
+        enum: ['ask', 'build', 'both'],
+      },
+      triggerPhrases: {
+        type: 'array',
+        title: 'Trigger Phrases',
+        description: 'Natural-language phrases that activate this skill.',
+        items: { type: 'string' },
+      },
+      triggerConditions: {
+        type: 'array',
+        title: 'Trigger Conditions',
+        description: 'Programmatic activation conditions (context field / operator / value). The activation-critical field — previously only hand-editable (#1878/#1895).',
+        items: {
+          type: 'object',
+          properties: {
+            field: { type: 'string', title: 'Field' },
+            operator: {
+              type: 'string',
+              title: 'Operator',
+              enum: ['eq', 'neq', 'in', 'not_in', 'contains'],
+            },
+            value: { type: 'string', title: 'Value' },
+          },
+        },
+      },
     },
   },
 
diff --git a/packages/plugin-dashboard/src/DashboardGridLayout.tsx b/packages/plugin-dashboard/src/DashboardGridLayout.tsx
index 98e347bc8..0729fa1f7 100644
--- a/packages/plugin-dashboard/src/DashboardGridLayout.tsx
+++ b/packages/plugin-dashboard/src/DashboardGridLayout.tsx
@@ -306,7 +306,7 @@ export const DashboardGridLayout: React.FC<DashboardGridLayoutProps> = ({
     <div ref={containerRef} className={cn("w-full", className)} data-testid="grid-layout">
       {hasDndProvider && <DndEditModeBridge editMode={editMode} />}
       <div className="mb-4 flex items-center justify-between">
-        <h2 className="text-2xl font-bold">{schema.title || 'Dashboard'}</h2>
+        <h2 className="text-2xl font-bold">{schema.title || schema.label || 'Dashboard'}</h2>
         <div className="flex gap-2">
           {editMode ? (
             <>