@object-ui/app-shell 7.0.0 → 7.1.0

package/dist/views/metadata-admin/anchors.js

@@ -352,6 +352,15 @@ export function registerBuiltinAnchors() {
         createDerive: [
             { from: 'label', to: 'name', transform: 'slugify', untilUserEdits: true },
         ],
+        // A new action defaults to `type: 'script'` (ActionType.default), which the
+        // spec requires to carry an executable `body` or `target` — otherwise the
+        // draft fails validation on save (422) and AppPlugin registers no engine
+        // handler (the #2169 "Mark Done" runtime miss). Seed a no-op L2 body so
+        // "New action -> name -> Save" round-trips; the author edits the source after.
+        createDefaults: {
+            type: 'script',
+            body: { language: 'js', source: 'return { success: true };' },
+        },
     });
     // dashboard / report — surface ones bound to a specific object.
     // Many will not have an explicit anchor; those simply don't appear.
@@ -377,11 +386,20 @@ export function registerBuiltinAnchors() {
                 groupLabel: 'Reports',
                 order: 81,
             }],
-        createFields: ['label', 'name', 'objectName', 'description'],
+        // ADR-0021 single-form: a report is dataset-bound — `objectName` and the
+        // legacy `columns` array were removed from ReportSchema, so seeding them
+        // here produced a stub that failed server validation ("a report needs
+        // `dataset` + `values`"). Report-create now lights up the canvas +
+        // ReportDefaultInspector (see CREATE_MODE_CANVAS_TYPES), where the author
+        // picks the dataset/measures/dimensions directly; we just seed a sensible
+        // starting type.
+        createFields: ['label', 'name', 'description'],
         createDerive: [
             { from: 'label', to: 'name', transform: 'slugify', untilUserEdits: true },
         ],
-        createDefaults: { columns: [] },
+        // Seed `drilldown:true` so the inspector toggle reflects the schema default
+        // (otherwise it shows OFF on a fresh report while the spec default is true).
+        createDefaults: { type: 'summary', drilldown: true },
     });
     // Cosmetic defaults for the `object` type list page — gives Object the
     // same look as every other metadata type while still surfacing the

package/dist/views/metadata-admin/i18n.js

@@ -181,6 +181,7 @@ const ENGINE_STRINGS_EN = {
     'engine.list.warnCount': '{count} warning(s):',
     'engine.list.allSources': 'All sources',
     'engine.list.allPackages': 'All packages',
+    'engine.package.local': 'Local / Custom (this env)',
     'engine.list.packageFilter': 'Package',
     'engine.list.source.artifact': 'Artifact',
     'engine.list.source.runtime': 'Runtime',
@@ -313,6 +314,7 @@ const ENGINE_STRINGS_EN = {
     'engine.inspector.flowEdge.source': 'From',
     'engine.inspector.flowEdge.target': 'To',
     'engine.inspector.flowEdge.routing': 'Routing',
+    'engine.inspector.flowEdge.branch': 'Branch',
     'engine.inspector.flowEdge.label': 'Branch label',
     'engine.inspector.flowEdge.labelHint': 'e.g. approve / reject',
     'engine.inspector.flowEdge.condition': 'Condition',
@@ -320,6 +322,18 @@ const ENGINE_STRINGS_EN = {
     'engine.inspector.flowEdge.isDefault': 'Default branch (else)',
     'engine.inspector.flowEdge.hint': 'The engine follows this connection when its branch label is selected or its condition is met. The default branch is taken when no other matches.',
     'engine.inspector.flowEdge.remove': 'Remove connection',
+    'engine.inspector.flowEdge.approvalBranch': 'Approval branch',
+    'engine.inspector.flowEdge.branchApprove': 'Approve',
+    'engine.inspector.flowEdge.branchReject': 'Reject',
+    'engine.inspector.flowEdge.branchRevise': 'Revise — send back',
+    'engine.inspector.flowEdge.branchCustom': '— Custom —',
+    'engine.inspector.flowEdge.connection': 'Connection',
+    'engine.inspector.flowEdge.type': 'Type',
+    'engine.inspector.flowEdge.typeDefault': 'Normal',
+    'engine.inspector.flowEdge.typeConditional': 'Conditional',
+    'engine.inspector.flowEdge.typeFault': 'Fault (error path)',
+    'engine.inspector.flowEdge.typeBack': 'Back-edge (revise loop)',
+    'engine.inspector.flowEdge.backHint': 'A back-edge re-enters an earlier node to close a loop (e.g. an approval revise loop). It is traversed normally at run time but excluded from cycle validation.',
     // Workflow action inspector
     'engine.inspector.workflowAction.kind': 'Action',
     'engine.inspector.workflowAction.close': 'Close action',
@@ -378,6 +392,9 @@ const ENGINE_STRINGS_EN = {
     // Report default ("home") inspector
     'engine.inspector.report.kind': 'Report',
     'engine.inspector.report.close': 'Close report',
+    'engine.inspector.report.name': 'Name',
+    'engine.inspector.report.nameHint': 'snake_case identifier (cannot change after create)',
+    'engine.inspector.report.namePlaceholder': 'e.g. pipeline_by_stage',
     'engine.inspector.report.label': 'Label',
     'engine.inspector.report.labelPlaceholder': 'e.g. Pipeline by Stage',
     'engine.inspector.report.type': 'Report type',
@@ -393,6 +410,12 @@ const ENGINE_STRINGS_EN = {
     'engine.inspector.report.rowsEmpty': 'No dimensions yet. Add one from the dataset below.',
     'engine.inspector.report.columnsAcross': 'Columns (across dimensions)',
     'engine.inspector.report.columnsAcrossEmpty': 'No across dimensions yet — the matrix pivots rows × columns.',
+    'engine.inspector.report.chart': 'Chart',
+    'engine.inspector.report.chartType': 'Chart type',
+    'engine.inspector.report.chartNone': 'None (table only)',
+    'engine.inspector.report.chartTitle': 'Chart title',
+    'engine.inspector.report.chartX': 'X-Axis (dimension)',
+    'engine.inspector.report.chartY': 'Y-Axis (measure)',
     'engine.inspector.report.noSchema': 'Spec schema unavailable — basic properties only.',
     // Trailing section for fields the live server has but the bundled spec lacks.
     'engine.inspector.moreFields': 'More fields',
@@ -423,7 +446,7 @@ const ENGINE_STRINGS_EN = {
     'engine.edit.overlay': 'overlay',
     'engine.edit.readOnlyBanner': 'Viewing in read-only mode. Click {edit} to make changes.',
     'engine.edit.readOnlyTypeBanner': 'This metadata type is read-only for safety: it ships executable code or sensitive configuration and cannot be overlaid at runtime. Edit the source in your package and redeploy. To override this lock (use with caution), set {flag} to include {type}, or flip {override} in the registry.',
-    'engine.edit.artifactLockedBanner': 'This item is shipped by a code package and cannot be modified at runtime. You can still create your own {type} from scratch and freely edit or delete it.',
+    'engine.edit.artifactLockedBanner': 'This {type} is provided by an installed package, so it is read-only at runtime. To change it, edit it in its source package and republish — or create a new {type} from scratch.',
     'engine.badge.createOnly': 'create-only',
     'engine.repeater.empty': 'No items. Click + to add.',
     'engine.badge.writable': 'writable',
@@ -698,6 +721,26 @@ const ENGINE_STRINGS_EN = {
     'designer.field.relationshipName': 'Relationship name',
     'designer.field.relationshipNameHint': 'Inverse collection key on the parent',
     'designer.field.objectNamePlaceholder': 'object_name',
+    // Lookup "Picker config" advanced sub-panel
+    'designer.field.lookup.pickerConfig': 'Picker config',
+    'designer.field.lookup.displayField': 'Display field',
+    'designer.field.lookup.descriptionField': 'Description field',
+    'designer.field.lookup.selectField': 'Select a field…',
+    'designer.field.lookup.setTargetFirst': 'Set the target object first',
+    'designer.field.lookup.searchFields': 'Search fields…',
+    'designer.field.lookup.selectableRecords': 'Selectable records',
+    'designer.field.lookup.addFilter': 'Add filter',
+    'designer.field.lookup.noFilter': 'No filter — every {ref} record is selectable.',
+    'designer.field.lookup.filterN': 'Filter {n}',
+    'designer.field.lookup.removeFilter': 'Remove filter',
+    'designer.field.lookup.filterField': 'Field',
+    'designer.field.lookup.filterOperator': 'Operator',
+    'designer.field.lookup.filterValue': 'Value',
+    'designer.field.lookup.dependsOn': 'Depends on (same-record fields)',
+    'designer.field.lookup.addDependsOn': 'Add a field this lookup depends on…',
+    'designer.field.lookup.searchHostFields': "Search this object's fields…",
+    'designer.field.lookup.pageSize': 'Picker page size',
+    'designer.field.lookup.allowCreate': 'Allow quick-create',
     'designer.field.formula': 'Formula (CEL)',
     'designer.field.precision': 'Precision',
     'designer.field.scale': 'Scale',
@@ -824,6 +867,7 @@ const ENGINE_STRINGS_ZH = {
     'engine.list.warnCount': '{count} 个警告：',
     'engine.list.allSources': '全部来源',
     'engine.list.allPackages': '全部软件包',
+    'engine.package.local': '本地 / 自定义（本环境）',
     'engine.list.packageFilter': '软件包',
     'engine.list.source.artifact': '代码包',
     'engine.list.source.runtime': '运行时',
@@ -956,6 +1000,7 @@ const ENGINE_STRINGS_ZH = {
     'engine.inspector.flowEdge.source': '起点',
     'engine.inspector.flowEdge.target': '终点',
     'engine.inspector.flowEdge.routing': '路由',
+    'engine.inspector.flowEdge.branch': '分支',
     'engine.inspector.flowEdge.label': '分支标签',
     'engine.inspector.flowEdge.labelHint': '例如 approve / reject',
     'engine.inspector.flowEdge.condition': '条件',
@@ -963,6 +1008,18 @@ const ENGINE_STRINGS_ZH = {
     'engine.inspector.flowEdge.isDefault': '默认分支（else）',
     'engine.inspector.flowEdge.hint': '当此连线的分支标签被选中、或其条件成立时，引擎会走这条连线。其余都不匹配时走默认分支。',
     'engine.inspector.flowEdge.remove': '删除连线',
+    'engine.inspector.flowEdge.approvalBranch': '审批分支',
+    'engine.inspector.flowEdge.branchApprove': '通过',
+    'engine.inspector.flowEdge.branchReject': '驳回',
+    'engine.inspector.flowEdge.branchRevise': '退回修改',
+    'engine.inspector.flowEdge.branchCustom': '—— 自定义 ——',
+    'engine.inspector.flowEdge.connection': '连线',
+    'engine.inspector.flowEdge.type': '类型',
+    'engine.inspector.flowEdge.typeDefault': '普通',
+    'engine.inspector.flowEdge.typeConditional': '条件',
+    'engine.inspector.flowEdge.typeFault': '故障（错误路径）',
+    'engine.inspector.flowEdge.typeBack': '回边（退回修改环）',
+    'engine.inspector.flowEdge.backHint': '回边会重新进入更早的节点以闭合一个环（例如审批的退回修改环）。它在运行时正常通行，但不参与环路校验。',
     // Workflow action inspector
     'engine.inspector.workflowAction.kind': '动作',
     'engine.inspector.workflowAction.close': '关闭动作',
@@ -1020,6 +1077,9 @@ const ENGINE_STRINGS_ZH = {
     // Report default ("home") inspector
     'engine.inspector.report.kind': '报表',
     'engine.inspector.report.close': '关闭报表',
+    'engine.inspector.report.name': '名称',
+    'engine.inspector.report.nameHint': 'snake_case 标识符（创建后不可修改）',
+    'engine.inspector.report.namePlaceholder': '例如：pipeline_by_stage',
     'engine.inspector.report.label': '显示名',
     'engine.inspector.report.labelPlaceholder': '例如：按阶段统计的销售管道',
     'engine.inspector.report.type': '报表类型',
@@ -1035,6 +1095,12 @@ const ENGINE_STRINGS_ZH = {
     'engine.inspector.report.rowsEmpty': '还没有维度。从下方数据集中添加。',
     'engine.inspector.report.columnsAcross': '列（横向维度）',
     'engine.inspector.report.columnsAcrossEmpty': '还没有横向维度——矩阵按 行 × 列 透视。',
+    'engine.inspector.report.chart': '图表',
+    'engine.inspector.report.chartType': '图表类型',
+    'engine.inspector.report.chartNone': '无（仅表格）',
+    'engine.inspector.report.chartTitle': '图表标题',
+    'engine.inspector.report.chartX': 'X 轴（维度）',
+    'engine.inspector.report.chartY': 'Y 轴（度量）',
     'engine.inspector.report.noSchema': '规格 schema 不可用 —— 仅显示基础属性。',
     // Trailing section for fields the live server has but the bundled spec lacks.
     'engine.inspector.moreFields': '更多字段',
@@ -1065,7 +1131,7 @@ const ENGINE_STRINGS_ZH = {
     'engine.edit.overlay': '覆盖',
     'engine.edit.readOnlyBanner': '当前为只读模式。点击 {edit} 进行修改。',
     'engine.edit.readOnlyTypeBanner': '出于安全考虑，此元数据类型为只读：它包含可执行代码或敏感配置，不允许在运行时通过覆盖层修改。请编辑包内源代码后重新部署。如需临时解除限制（请谨慎使用），可将 {flag} 设置为包含 {type}，或在注册表中开启 {override}。',
-    'engine.edit.artifactLockedBanner': '此条目由代码包提供，无法在运行时修改。但您可以新建自己的 {type}，并自由地编辑或删除。',
+    'engine.edit.artifactLockedBanner': '此 {type} 来自已安装的包，因此在运行时为只读。如需修改，请在其所属包的源中编辑并重新发布——或从零新建一个 {type}。',
     'engine.badge.createOnly': '仅可新建',
     'engine.repeater.empty': '暂无条目。点击 + 添加。',
     'engine.badge.writable': '可写',
@@ -1340,6 +1406,26 @@ const ENGINE_STRINGS_ZH = {
     'designer.field.relationshipName': '关系名称',
     'designer.field.relationshipNameHint': '父对象上的反向集合键',
     'designer.field.objectNamePlaceholder': 'object_name',
+    // Lookup "Picker config" advanced sub-panel
+    'designer.field.lookup.pickerConfig': '选择器配置',
+    'designer.field.lookup.displayField': '显示字段',
+    'designer.field.lookup.descriptionField': '描述字段',
+    'designer.field.lookup.selectField': '选择字段…',
+    'designer.field.lookup.setTargetFirst': '请先设置目标对象',
+    'designer.field.lookup.searchFields': '搜索字段…',
+    'designer.field.lookup.selectableRecords': '可选记录范围',
+    'designer.field.lookup.addFilter': '添加筛选条件',
+    'designer.field.lookup.noFilter': '未设筛选 — 所有 {ref} 记录均可选。',
+    'designer.field.lookup.filterN': '筛选条件 {n}',
+    'designer.field.lookup.removeFilter': '移除筛选条件',
+    'designer.field.lookup.filterField': '字段',
+    'designer.field.lookup.filterOperator': '运算符',
+    'designer.field.lookup.filterValue': '值',
+    'designer.field.lookup.dependsOn': '依赖字段（同记录字段）',
+    'designer.field.lookup.addDependsOn': '添加该查找依赖的字段…',
+    'designer.field.lookup.searchHostFields': '搜索本对象的字段…',
+    'designer.field.lookup.pageSize': '选择器分页大小',
+    'designer.field.lookup.allowCreate': '允许快速创建',
     'designer.field.formula': '公式 (CEL)',
     'designer.field.precision': '精度',
     'designer.field.scale': '小数位',

package/dist/views/metadata-admin/inspectors/DatasetDefaultInspector.d.ts

@@ -6,7 +6,7 @@
  *   - base `object`,
  *   - `include` relationships (the join allowlist — D-C),
  *   - `dimensions` (name + field/`relationship.field` + type + granularity), and
- *   - `measures` (name + aggregate + field + certified + format/currency/derived).
+ *   - `measures` (name + aggregate + field + format/currency/derived).
  *
  * The base object, the included relationships, and every `field` are picked
  * from the live object graph (a searchable combo over {@link useDatasetFieldCatalog})
@@ -18,4 +18,4 @@
  */
 import * as React from 'react';
 import type { MetadataDefaultInspectorProps } from '../default-inspector-registry';
-export declare function DatasetDefaultInspector({ draft, onPatch, readOnly }: MetadataDefaultInspectorProps): React.JSX.Element;
+export declare function DatasetDefaultInspector({ draft, onPatch, readOnly, name }: MetadataDefaultInspectorProps): React.JSX.Element;

package/dist/views/metadata-admin/inspectors/DatasetDefaultInspector.js

@@ -8,7 +8,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  *   - base `object`,
  *   - `include` relationships (the join allowlist — D-C),
  *   - `dimensions` (name + field/`relationship.field` + type + granularity), and
- *   - `measures` (name + aggregate + field + certified + format/currency/derived).
+ *   - `measures` (name + aggregate + field + format/currency/derived).
  *
  * The base object, the included relationships, and every `field` are picked
  * from the live object graph (a searchable combo over {@link useDatasetFieldCatalog})
@@ -19,10 +19,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * `onPatch`; the DatasetPreview on the canvas re-runs live as the draft changes.
  */
 import * as React from 'react';
-import { ArrowRight, Plus, Trash2, X } from 'lucide-react';
-import { Badge, Button, Label } from '@object-ui/components';
+import { AlertTriangle, ArrowRight, ChevronDown, Plus, Trash2, X } from 'lucide-react';
+import { Badge, Button, FilterBuilder, Label, Popover, PopoverContent, PopoverTrigger } from '@object-ui/components';
 import { InspectorShell, InspectorTextField, InspectorSelectField, InspectorCheckboxField, appendArray, spliceArray, } from './_shared';
 import { InspectorComboField } from './InspectorComboField';
+import { toFieldName } from '../previews/object-fields-io';
+import { formatMeasure } from '@object-ui/core';
+import { conditionToGroup, groupToCondition } from './datasetFilterCondition';
 import { useObjectOptions, useDatasetFieldCatalog, useDatasetUsage, fieldTypeToDimensionType, } from './useDatasetFields';
 // Closed to what the dataset compiler supports (no array_agg/string_agg in v1).
 const AGGREGATE_OPTIONS = [
@@ -54,6 +57,30 @@ const DERIVED_OP_OPTIONS = [
     { value: 'difference', label: 'difference (a − b)' },
     { value: 'product', label: 'product (a × b)' },
 ];
+// Display-format picker options — a business user shouldn't have to know numeral
+// syntax (`$0,0.00`), so the inspector offers kind + decimals + currency and
+// generates the `format`/`currency` strings.
+const FORMAT_KIND_OPTIONS = [
+    { value: 'raw', label: 'Raw number' },
+    { value: 'number', label: 'Number — 1,234.5' },
+    { value: 'currency', label: 'Currency — $1,234.50' },
+    { value: 'percent', label: 'Percent — 12.3%' },
+];
+const DECIMALS_OPTIONS = [
+    { value: '0', label: '0' },
+    { value: '1', label: '1' },
+    { value: '2', label: '2' },
+];
+const CURRENCY_OPTIONS = [
+    { value: 'USD', label: 'USD ($)' },
+    { value: 'EUR', label: 'EUR (€)' },
+    { value: 'GBP', label: 'GBP (£)' },
+    { value: 'CNY', label: 'CNY (¥)' },
+    { value: 'JPY', label: 'JPY (¥)' },
+    { value: 'INR', label: 'INR (₹)' },
+    { value: 'CAD', label: 'CAD ($)' },
+    { value: 'AUD', label: 'AUD ($)' },
+];
 function SectionHeader({ title, count, onAdd, addLabel }) {
     return (_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: title }), _jsx(Badge, { variant: "outline", className: "text-[10px]", children: count })] }), onAdd && (_jsxs(Button, { type: "button", variant: "ghost", size: "sm", className: "h-6 gap-1 px-1.5 text-[11px]", onClick: onAdd, children: [_jsx(Plus, { className: "h-3 w-3" }), " ", addLabel] }))] }));
 }
@@ -61,7 +88,65 @@ function SectionHeader({ title, count, onAdd, addLabel }) {
 function Advanced({ children }) {
     return (_jsxs("details", { className: "group", children: [_jsx("summary", { className: "cursor-pointer select-none list-none text-[11px] text-muted-foreground hover:text-foreground", children: _jsxs("span", { className: "inline-flex items-center gap-1", children: [_jsx(ArrowRight, { className: "h-3 w-3 transition-transform group-open:rotate-90" }), "Advanced"] }) }), _jsx("div", { className: "mt-1.5 space-y-1.5 border-l pl-2.5", children: children })] }));
 }
-export function DatasetDefaultInspector({ draft, onPatch, readOnly }) {
+/** Best-effort parse of a stored measure format into the picker's {kind, decimals}. */
+function parseMeasureFormat(format, currency) {
+    const f = (format ?? '').trim();
+    const m = f.match(/\.(0+)/);
+    const decimals = m ? Math.min(m[1].length, 2) : 0;
+    if (currency || /[$£€¥₹]/.test(f))
+        return { kind: 'currency', decimals };
+    if (f.includes('%'))
+        return { kind: 'percent', decimals };
+    if (f)
+        return { kind: 'number', decimals };
+    return { kind: 'raw', decimals: 0 };
+}
+/** Generate {format, currency} from the picker selection. */
+function buildMeasureFormat(kind, decimals, currency) {
+    const dp = decimals > 0 ? '.' + '0'.repeat(decimals) : '';
+    switch (kind) {
+        case 'number': return { format: `0,0${dp}`, currency: undefined };
+        case 'currency': return { format: `0,0${dp}`, currency: currency || 'USD' };
+        case 'percent': return { format: `0${dp}%`, currency: undefined };
+        default: return { format: undefined, currency: undefined };
+    }
+}
+/**
+ * Structured display-format picker for a measure. Maps {kind, decimals, currency}
+ * ⇄ the spec's `format`/`currency` strings and shows a live sample so a business
+ * user never has to hand-write a numeral pattern.
+ */
+function MeasureFormatField({ measure, onPatch, disabled }) {
+    const { kind, decimals } = parseMeasureFormat(measure.format, measure.currency);
+    const currency = measure.currency || 'USD';
+    const apply = (k, d, c) => onPatch(buildMeasureFormat(k, d, c));
+    const sample = formatMeasure(kind === 'percent' ? 0.1234 : 1234.5, measure.format, measure.currency);
+    return (_jsxs("div", { className: "space-y-1.5", children: [_jsxs("div", { className: "grid grid-cols-2 gap-1.5", children: [_jsx(InspectorSelectField, { label: "Display format", value: kind, options: FORMAT_KIND_OPTIONS, onCommit: (v) => apply(v, decimals, currency), disabled: disabled }), kind !== 'raw' && (_jsx(InspectorSelectField, { label: "Decimals", value: String(decimals), options: DECIMALS_OPTIONS, onCommit: (v) => apply(kind, parseInt(v, 10) || 0, currency), disabled: disabled }))] }), kind === 'currency' && (_jsx(InspectorSelectField, { label: "Currency", value: currency, options: CURRENCY_OPTIONS, onCommit: (v) => apply(kind, decimals, v), disabled: disabled })), kind !== 'raw' && (_jsxs("p", { className: "text-[10px] text-muted-foreground", children: ["Sample: ", _jsx("span", { className: "font-mono tabular-nums", children: sample })] }))] }));
+}
+/** The relationship prefix of a `relationship.field` path that isn't yet in `include`, else null. */
+function missingRelationship(field, include) {
+    if (!field || !field.includes('.'))
+        return null;
+    const rel = field.split('.')[0];
+    return rel && !include.includes(rel) ? rel : null;
+}
+/** Inline author-time warning: a `relationship.field` whose join isn't declared in `include`. */
+function RelWarning({ rel, onAdd, disabled }) {
+    return (_jsxs("p", { className: "flex items-center gap-1 text-[10px] text-amber-600 dark:text-amber-400", children: [_jsx(AlertTriangle, { className: "h-3 w-3 shrink-0" }), _jsxs("span", { children: ["Relationship ", _jsx("code", { className: "font-mono", children: rel }), " isn't in Included relationships."] }), !disabled && onAdd && (_jsx("button", { type: "button", className: "underline hover:no-underline", onClick: onAdd, children: "Add it" }))] }));
+}
+/**
+ * Visual filter editor for a dataset/measure `FilterCondition`. Wraps the shared
+ * {@link FilterBuilder} (a flat AND of `field op value` rows) and converts to/from
+ * the spec's Mongo-style `FilterCondition`. Filters it can't faithfully edit
+ * (nested / `$or` / multi-op) degrade to a "edit in Source" note rather than being
+ * silently rewritten. See {@link conditionToGroup} / {@link groupToCondition}.
+ */
+function DatasetFilterField({ label, help, value, onCommit, fields, disabled }) {
+    const { group, representable } = conditionToGroup(value);
+    const count = group.conditions.length;
+    return (_jsxs("div", { className: "space-y-1", children: [_jsx(Label, { className: "text-xs text-muted-foreground", children: label }), !representable ? (_jsxs("p", { className: "rounded-md border border-dashed bg-muted/30 px-2.5 py-1.5 text-[11px] text-muted-foreground", children: ["Advanced filter (nested / OR) \u2014 edit it in the ", _jsx("span", { className: "font-medium", children: "Source" }), " tab."] })) : (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsxs(Button, { type: "button", variant: "outline", size: "sm", disabled: disabled, className: "h-8 w-full justify-between text-xs font-normal", children: [_jsx("span", { className: "truncate text-left", children: count ? `${count} condition${count === 1 ? '' : 's'}` : _jsx("span", { className: "text-muted-foreground", children: "+ Add filter\u2026" }) }), _jsx(ChevronDown, { className: "h-3.5 w-3.5 opacity-60 shrink-0" })] }) }), _jsx(PopoverContent, { align: "start", className: "w-[440px] max-w-[90vw] p-3", children: fields.length === 0 ? (_jsx("p", { className: "text-xs text-muted-foreground", children: "Pick a base object to add filter conditions." })) : (_jsx(FilterBuilder, { fields: fields, value: group, onChange: (g) => onCommit(groupToCondition(g)) })) })] })), help && _jsx("p", { className: "text-[10px] text-muted-foreground", children: help })] }));
+}
+export function DatasetDefaultInspector({ draft, onPatch, readOnly, name }) {
     const label = typeof draft.label === 'string' ? draft.label : '';
     const description = typeof draft.description === 'string' ? draft.description : '';
     const object = typeof draft.object === 'string' ? draft.object : '';
@@ -69,33 +154,62 @@ export function DatasetDefaultInspector({ draft, onPatch, readOnly }) {
     const dimensions = Array.isArray(draft.dimensions) ? draft.dimensions : [];
     const measures = Array.isArray(draft.measures) ? draft.measures : [];
     const datasetName = typeof draft.name === 'string' ? draft.name : undefined;
+    // In create mode the host passes an empty `name` (the PK is assigned on first
+    // save). Mirror ReportDefaultInspector: expose an editable Name that auto-
+    // derives a snake_case slug from the label until the author edits it directly,
+    // so a dataset created through the canvas saves with a valid identifier instead
+    // of dead-ending on the empty-name identity rule.
+    const createMode = !name;
+    const nameTouched = React.useRef(false);
+    const nameValue = typeof draft.name === 'string' ? draft.name : '';
     const { options: objectOptions, loading: objectsLoading } = useObjectOptions();
     const { relationships, fieldOptions, loading: catalogLoading } = useDatasetFieldCatalog(object, include);
     const usage = useDatasetUsage(datasetName);
     const objectComboOptions = React.useMemo(() => objectOptions.map((o) => ({ value: o.name, label: o.label })), [objectOptions]);
     const relationshipComboOptions = React.useMemo(() => relationships.map((r) => ({ value: r.name, label: r.label, hint: r.referenceTo ? `→ ${r.referenceTo}` : undefined })), [relationships]);
     const fieldComboOptions = React.useMemo(() => fieldOptions.map((f) => ({ value: f.value, label: f.label, hint: f.type, group: f.group })), [fieldOptions]);
+    // Base-object fields for the filter builders (scope + measure filters operate on
+    // the base table; relationship-path filters are out of scope for v1).
+    const filterFields = React.useMemo(() => fieldOptions.filter((f) => !f.value.includes('.')).map((f) => ({ value: f.value, label: f.label, type: f.type })), [fieldOptions]);
+    const datasetFilter = draft.filter && typeof draft.filter === 'object' ? draft.filter : undefined;
     const baseLabel = objectComboOptions.find((o) => o.value === object)?.label ?? object;
     const patchDimension = (i, patch) => onPatch({ dimensions: dimensions.map((d, idx) => (idx === i ? { ...d, ...patch } : d)) });
     const patchMeasure = (i, patch) => onPatch({ measures: measures.map((m, idx) => (idx === i ? { ...m, ...patch } : m)) });
     // Picking a field auto-infers the dimension type from the field's framework
     // type (region:string, close_date:date, …) — the BI "pick field, type follows"
     // convention — while leaving the Type select free to override.
+    const leafName = (path) => (path.includes('.') ? path.split('.').pop() ?? path : path);
     const pickDimensionField = (i, v) => {
         const opt = fieldOptions.find((o) => o.value === v);
-        patchDimension(i, opt?.type ? { field: v, type: fieldTypeToDimensionType(opt.type) } : { field: v });
+        const patch = opt?.type ? { field: v, type: fieldTypeToDimensionType(opt.type) } : { field: v };
+        if (!dimensions[i]?.name)
+            patch.name = leafName(v); // auto-name from field when unnamed
+        patchDimension(i, patch);
+    };
+    const pickMeasureField = (i, v) => {
+        const patch = { field: v };
+        if (!measures[i]?.name)
+            patch.name = leafName(v); // auto-name from field when unnamed
+        patchMeasure(i, patch);
     };
     return (_jsxs(InspectorShell, { kindLabel: "Dataset", title: String(label || draft.name || 'Dataset'), onClose: () => { }, hideClose: true, children: [datasetName && !usage.loading && (_jsx("p", { className: usage.reports + usage.dashboards > 0
                     ? 'rounded-md border border-amber-500/30 bg-amber-500/5 px-2.5 py-1.5 text-[11px] text-amber-700 dark:text-amber-300'
                     : 'text-[11px] text-muted-foreground', children: usage.reports + usage.dashboards > 0
                     ? `Bound by ${usage.reports} report${usage.reports === 1 ? '' : 's'} · ${usage.dashboards} dashboard${usage.dashboards === 1 ? '' : 's'} — changes affect them.`
-                    : 'Not yet bound by any report or dashboard.' })), _jsx(InspectorTextField, { label: "Label", value: label, onCommit: (v) => onPatch({ label: v }), disabled: readOnly }), _jsx(InspectorTextField, { label: "Description", value: description, onCommit: (v) => onPatch({ description: v }), disabled: readOnly }), _jsx(InspectorComboField, { label: "Base object", value: object, onCommit: (v) => onPatch({ object: v }), options: objectComboOptions, loading: objectsLoading, placeholder: "Select an object\u2026", searchPlaceholder: "Search objects\u2026", disabled: readOnly, mono: true }), _jsxs("div", { className: "border-t pt-3 space-y-1.5", children: [_jsx(SectionHeader, { title: "Included relationships", count: include.length, addLabel: "Add", onAdd: readOnly ? undefined : () => onPatch({ include: appendArray(include, '') }) }), include.length === 0 ? (_jsxs("p", { className: "rounded-md border border-dashed bg-muted/30 px-3 py-2 text-center text-[11px] text-muted-foreground", children: ["No joins. Add a relationship (a lookup field on ", _jsx("code", { children: baseLabel || 'the base object' }), ") to use ", _jsx("code", { children: "relationship.field" }), " dimensions/measures."] })) : (include.map((rel, i) => (_jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(InspectorComboField, { value: rel, onCommit: (v) => onPatch({ include: include.map((r, idx) => (idx === i ? v : r)) }), options: relationshipComboOptions, loading: catalogLoading, placeholder: "Select a relationship\u2026", searchPlaceholder: "Search relationships\u2026", disabled: readOnly, mono: true }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", className: "h-7 w-7 shrink-0 p-0", onClick: () => onPatch({ include: spliceArray(include, i, null) }), "aria-label": "Remove relationship", children: _jsx(X, { className: "h-3.5 w-3.5" }) }))] }, i)))), object && include.length > 0 && (_jsxs("div", { className: "flex flex-wrap items-center gap-x-1 gap-y-0.5 pt-0.5 text-[10px] text-muted-foreground", children: [_jsx("span", { className: "font-mono font-medium", children: baseLabel }), include.map((rel, i) => {
+                    : 'Not yet bound by any report or dashboard.' })), createMode && (_jsx(InspectorTextField, { label: "Name", value: nameValue, onCommit: (v) => { nameTouched.current = true; onPatch({ name: toFieldName(v) }); }, placeholder: "snake_case identifier", disabled: readOnly, mono: true })), _jsx(InspectorTextField, { label: "Label", value: label, onCommit: (v) => {
+                    // Live-derive the snake_case name from the label until the author edits
+                    // the Name field directly (create mode only).
+                    const patch = { label: v };
+                    if (createMode && !nameTouched.current)
+                        patch.name = toFieldName(v);
+                    onPatch(patch);
+                }, disabled: readOnly }), _jsx(InspectorTextField, { label: "Description", value: description, onCommit: (v) => onPatch({ description: v }), disabled: readOnly }), _jsx(InspectorComboField, { label: "Base object", value: object, onCommit: (v) => onPatch({ object: v }), options: objectComboOptions, loading: objectsLoading, placeholder: "Select an object\u2026", searchPlaceholder: "Search objects\u2026", disabled: readOnly, mono: true }), _jsxs("div", { className: "border-t pt-3 space-y-1.5", children: [_jsx(SectionHeader, { title: "Included relationships", count: include.length, addLabel: "Add", onAdd: readOnly ? undefined : () => onPatch({ include: appendArray(include, '') }) }), include.length === 0 ? (_jsxs("p", { className: "rounded-md border border-dashed bg-muted/30 px-3 py-2 text-center text-[11px] text-muted-foreground", children: ["No joins. Add a relationship (a lookup field on ", _jsx("code", { children: baseLabel || 'the base object' }), ") to use ", _jsx("code", { children: "relationship.field" }), " dimensions/measures."] })) : (include.map((rel, i) => (_jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx(InspectorComboField, { value: rel, onCommit: (v) => onPatch({ include: include.map((r, idx) => (idx === i ? v : r)) }), options: relationshipComboOptions, loading: catalogLoading, placeholder: "Select a relationship\u2026", searchPlaceholder: "Search relationships\u2026", disabled: readOnly, mono: true }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", className: "h-7 w-7 shrink-0 p-0", onClick: () => onPatch({ include: spliceArray(include, i, null) }), "aria-label": "Remove relationship", children: _jsx(X, { className: "h-3.5 w-3.5" }) }))] }, i)))), object && include.length > 0 && (_jsxs("div", { className: "flex flex-wrap items-center gap-x-1 gap-y-0.5 pt-0.5 text-[10px] text-muted-foreground", children: [_jsx("span", { className: "font-mono font-medium", children: baseLabel }), include.map((rel, i) => {
                                 const r = relationships.find((x) => x.name === rel);
                                 return (_jsxs("span", { className: "inline-flex items-center gap-1", children: [_jsx(ArrowRight, { className: "h-3 w-3 opacity-60" }), _jsxs("span", { className: "font-mono", children: [rel, r?.referenceTo ? ` (${r.referenceTo})` : ''] })] }, i));
-                            })] }))] }), _jsxs("div", { className: "border-t pt-3 space-y-2", children: [_jsx(SectionHeader, { title: "Dimensions", count: dimensions.length, addLabel: "Add dimension", onAdd: readOnly ? undefined : () => onPatch({ dimensions: appendArray(dimensions, { name: '', field: '', type: 'string' }) }) }), dimensions.map((d, i) => (_jsxs("div", { className: "rounded-md border p-2 space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-[11px] font-medium text-muted-foreground", children: ["Dimension ", i + 1] }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", "aria-label": "Remove dimension", title: "Remove dimension", className: "h-6 w-6 shrink-0 p-0 text-muted-foreground hover:text-destructive", onClick: () => onPatch({ dimensions: spliceArray(dimensions, i, null) }), children: _jsx(Trash2, { className: "h-3.5 w-3.5" }) }))] }), _jsx(InspectorTextField, { label: "Name", value: d.name ?? '', onCommit: (v) => patchDimension(i, { name: v }), placeholder: "e.g. region", disabled: readOnly, mono: true }), _jsx(InspectorComboField, { label: "Field", value: d.field ?? '', onCommit: (v) => pickDimensionField(i, v), options: fieldComboOptions, loading: catalogLoading, placeholder: "field or relationship.field", searchPlaceholder: "Search fields\u2026", disabled: readOnly, mono: true }), _jsx(InspectorSelectField, { label: "Type", value: d.type, options: DIMENSION_TYPE_OPTIONS, onCommit: (v) => patchDimension(i, { type: v }), disabled: readOnly }), _jsxs(Advanced, { children: [_jsx(InspectorTextField, { label: "Label (optional)", value: d.label ?? '', onCommit: (v) => patchDimension(i, { label: v || undefined }), placeholder: d.name || 'Display label', disabled: readOnly }), d.type === 'date' && (_jsx(InspectorSelectField, { label: "Date bucket", value: d.dateGranularity ?? '', options: DATE_GRANULARITY_OPTIONS, onCommit: (v) => patchDimension(i, { dateGranularity: v || undefined }), disabled: readOnly }))] })] }, i)))] }), _jsxs("div", { className: "border-t pt-3 space-y-2", children: [_jsx(SectionHeader, { title: "Measures", count: measures.length, addLabel: "Add measure", onAdd: readOnly ? undefined : () => onPatch({ measures: appendArray(measures, { name: '', aggregate: 'sum', field: '', certified: false }) }) }), measures.map((m, i) => {
+                            })] }))] }), _jsx("div", { className: "border-t pt-3", children: _jsx(DatasetFilterField, { label: "Scope filter", help: "Intrinsic scope, ANDed into every query (e.g. exclude soft-deleted records).", value: datasetFilter, onCommit: (fc) => onPatch({ filter: fc }), fields: filterFields, disabled: readOnly }) }), _jsxs("div", { className: "border-t pt-3 space-y-2", children: [_jsx(SectionHeader, { title: "Dimensions", count: dimensions.length, addLabel: "Add dimension", onAdd: readOnly ? undefined : () => onPatch({ dimensions: appendArray(dimensions, { name: '', field: '', type: 'string' }) }) }), dimensions.map((d, i) => (_jsxs("div", { className: "rounded-md border p-2 space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-[11px] font-medium text-muted-foreground", children: ["Dimension ", i + 1] }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", "aria-label": "Remove dimension", title: "Remove dimension", className: "h-6 w-6 shrink-0 p-0 text-muted-foreground hover:text-destructive", onClick: () => onPatch({ dimensions: spliceArray(dimensions, i, null) }), children: _jsx(Trash2, { className: "h-3.5 w-3.5" }) }))] }), _jsx(InspectorTextField, { label: "Name", value: d.name ?? '', onCommit: (v) => patchDimension(i, { name: v }), placeholder: "e.g. region", disabled: readOnly, mono: true }), _jsx(InspectorComboField, { label: "Field", value: d.field ?? '', onCommit: (v) => pickDimensionField(i, v), options: fieldComboOptions, loading: catalogLoading, placeholder: "field or relationship.field", searchPlaceholder: "Search fields\u2026", disabled: readOnly, mono: true }), (() => { const rel = missingRelationship(d.field, include); return rel ? _jsx(RelWarning, { rel: rel, disabled: readOnly, onAdd: () => onPatch({ include: appendArray(include, rel) }) }) : null; })(), _jsx(InspectorSelectField, { label: "Type", value: d.type, options: DIMENSION_TYPE_OPTIONS, onCommit: (v) => patchDimension(i, { type: v }), disabled: readOnly }), _jsxs(Advanced, { children: [_jsx(InspectorTextField, { label: "Label (optional)", value: d.label ?? '', onCommit: (v) => patchDimension(i, { label: v || undefined }), placeholder: d.name || 'Display label', disabled: readOnly }), d.type === 'date' && (_jsx(InspectorSelectField, { label: "Date bucket", value: d.dateGranularity ?? '', options: DATE_GRANULARITY_OPTIONS, onCommit: (v) => patchDimension(i, { dateGranularity: v || undefined }), disabled: readOnly }))] })] }, i)))] }), _jsxs("div", { className: "border-t pt-3 space-y-2", children: [_jsx(SectionHeader, { title: "Measures", count: measures.length, addLabel: "Add measure", onAdd: readOnly ? undefined : () => onPatch({ measures: appendArray(measures, { name: '', aggregate: 'sum', field: '' }) }) }), measures.map((m, i) => {
                         const otherMeasures = measures.filter((_, idx) => idx !== i).map((x) => x.name).filter((n) => !!n);
                         const derived = m.derived;
-                        return (_jsxs("div", { className: "rounded-md border p-2 space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-[11px] font-medium text-muted-foreground", children: ["Measure ", i + 1] }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", "aria-label": "Remove measure", title: "Remove measure", className: "h-6 w-6 shrink-0 p-0 text-muted-foreground hover:text-destructive", onClick: () => onPatch({ measures: spliceArray(measures, i, null) }), children: _jsx(Trash2, { className: "h-3.5 w-3.5" }) }))] }), _jsx(InspectorTextField, { label: "Name", value: m.name ?? '', onCommit: (v) => patchMeasure(i, { name: v }), placeholder: "e.g. revenue", disabled: readOnly, mono: true }), _jsx(InspectorSelectField, { label: "Aggregate", value: m.aggregate, options: AGGREGATE_OPTIONS, onCommit: (v) => patchMeasure(i, { aggregate: v }), disabled: readOnly }), _jsx(InspectorComboField, { label: "Field", value: m.field ?? '', onCommit: (v) => patchMeasure(i, { field: v }), options: fieldComboOptions, loading: catalogLoading, placeholder: "field (optional for count)", searchPlaceholder: "Search fields\u2026", disabled: readOnly, mono: true }), _jsx(InspectorCheckboxField, { label: "Certified", value: !!m.certified, onCommit: (v) => patchMeasure(i, { certified: v }), disabled: readOnly }), _jsxs(Advanced, { children: [_jsx(InspectorTextField, { label: "Label (optional)", value: m.label ?? '', onCommit: (v) => patchMeasure(i, { label: v || undefined }), placeholder: m.name || 'Display label', disabled: readOnly }), _jsxs("div", { className: "grid grid-cols-2 gap-1.5", children: [_jsx(InspectorTextField, { label: "Format", value: m.format ?? '', onCommit: (v) => patchMeasure(i, { format: v || undefined }), placeholder: "$0,0.00", disabled: readOnly, mono: true }), _jsx(InspectorTextField, { label: "Currency", value: m.currency ?? '', onCommit: (v) => patchMeasure(i, { currency: v ? v.toUpperCase().slice(0, 3) : undefined }), placeholder: "USD", disabled: readOnly, mono: true })] }), _jsx(InspectorCheckboxField, { label: "Derived \u2014 computed from other measures", value: !!derived, onCommit: (v) => patchMeasure(i, { derived: v ? { op: 'ratio', of: [] } : undefined }), disabled: readOnly }), derived && (_jsxs("div", { className: "space-y-1.5 rounded-md border border-dashed p-2", children: [_jsx(InspectorSelectField, { label: "Operation", value: derived.op, options: DERIVED_OP_OPTIONS, onCommit: (v) => patchMeasure(i, { derived: { ...derived, op: v } }), disabled: readOnly }), _jsx(Label, { className: "text-xs text-muted-foreground", children: "Operands (other measures)" }), otherMeasures.length === 0 ? (_jsx("p", { className: "text-[11px] italic text-muted-foreground", children: "Add other measures first." })) : (_jsx("div", { className: "space-y-1", children: otherMeasures.map((nm) => {
+                        return (_jsxs("div", { className: "rounded-md border p-2 space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-[11px] font-medium text-muted-foreground", children: ["Measure ", i + 1] }), !readOnly && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", "aria-label": "Remove measure", title: "Remove measure", className: "h-6 w-6 shrink-0 p-0 text-muted-foreground hover:text-destructive", onClick: () => onPatch({ measures: spliceArray(measures, i, null) }), children: _jsx(Trash2, { className: "h-3.5 w-3.5" }) }))] }), _jsx(InspectorTextField, { label: "Name", value: m.name ?? '', onCommit: (v) => patchMeasure(i, { name: v }), placeholder: "e.g. revenue", disabled: readOnly, mono: true }), _jsx(InspectorSelectField, { label: "Aggregate", value: m.aggregate, options: AGGREGATE_OPTIONS, onCommit: (v) => patchMeasure(i, { aggregate: v }), disabled: readOnly }), _jsx(InspectorComboField, { label: "Field", value: m.field ?? '', onCommit: (v) => pickMeasureField(i, v), options: fieldComboOptions, loading: catalogLoading, placeholder: "field (optional for count)", searchPlaceholder: "Search fields\u2026", disabled: readOnly, mono: true }), (() => { const rel = missingRelationship(m.field, include); return rel ? _jsx(RelWarning, { rel: rel, disabled: readOnly, onAdd: () => onPatch({ include: appendArray(include, rel) }) }) : null; })(), _jsxs(Advanced, { children: [_jsx(InspectorTextField, { label: "Label (optional)", value: m.label ?? '', onCommit: (v) => patchMeasure(i, { label: v || undefined }), placeholder: m.name || 'Display label', disabled: readOnly }), _jsx(MeasureFormatField, { measure: m, onPatch: (pp) => patchMeasure(i, pp), disabled: readOnly }), _jsx(DatasetFilterField, { label: "Filter (measure-scoped)", help: "Only rows matching this filter feed this measure (e.g. won_amount = sum(amount) where stage = won).", value: m.filter, onCommit: (fc) => patchMeasure(i, { filter: fc }), fields: filterFields, disabled: readOnly }), _jsx(InspectorCheckboxField, { label: "Derived \u2014 computed from other measures", value: !!derived, onCommit: (v) => patchMeasure(i, { derived: v ? { op: 'ratio', of: [] } : undefined }), disabled: readOnly }), derived && (_jsxs("div", { className: "space-y-1.5 rounded-md border border-dashed p-2", children: [_jsx(InspectorSelectField, { label: "Operation", value: derived.op, options: DERIVED_OP_OPTIONS, onCommit: (v) => patchMeasure(i, { derived: { ...derived, op: v } }), disabled: readOnly }), _jsx(Label, { className: "text-xs text-muted-foreground", children: "Operands (other measures)" }), (() => { const need = derived.op === 'ratio' || derived.op === 'difference' ? 2 : 1; const have = Array.isArray(derived.of) ? derived.of.length : 0; return have < need ? _jsxs("p", { className: "text-[10px] text-amber-600 dark:text-amber-400", children: ["Select ", need === 2 ? 'exactly 2 measures' : 'at least 1 measure', " for ", derived.op, "."] }) : null; })(), otherMeasures.length === 0 ? (_jsx("p", { className: "text-[11px] italic text-muted-foreground", children: "Add other measures first." })) : (_jsx("div", { className: "space-y-1", children: otherMeasures.map((nm) => {
                                                         const checked = Array.isArray(derived.of) && derived.of.includes(nm);
                                                         return (_jsx(InspectorCheckboxField, { label: nm, value: checked, disabled: readOnly, onCommit: (v) => {
                                                                 const current = Array.isArray(derived.of) ? derived.of : [];

package/dist/views/metadata-admin/inspectors/FlowEdgeInspector.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { t } from '../i18n';
-import { InspectorShell, InspectorTextField, InspectorCheckboxField, InspectorRemoveButton, InspectorEmptyState, spliceArray, } from './_shared';
+import { InspectorShell, InspectorTextField, InspectorSelectField, InspectorCheckboxField, InspectorRemoveButton, InspectorEmptyState, spliceArray, } from './_shared';
 import { Label } from '@object-ui/components';
 import { edgeKey, conditionText } from '../previews/flow-canvas-layout';
 import { validateExpressionClient } from './expression-validate';
@@ -27,13 +27,89 @@ export function FlowEdgeInspector({ selection, draft, onPatch, onClearSelection,
             if (v === undefined || v === '' || v === false)
                 delete next[k];
         }
+        // `type` defaults to 'default' (FlowEdgeSchema) — don't persist the noise so
+        // a normal edge stays `{ source, target }`; only `back`/`fault`/`conditional`
+        // are written.
+        if (next.type === 'default' || next.type === '' || next.type === undefined)
+            delete next.type;
         onPatch({ edges: spliceArray(edges, index, next) });
     };
     const isDefault = edge.isDefault === true;
+    // Decision out-edges can bind EXPLICITLY to one of the source decision's
+    // branches (vs the implicit by-order auto-wire): picking a branch writes its
+    // expression / label (or marks the default) onto this edge, so routing stays
+    // correct even when edges are connected out of branch order.
+    const nodes = Array.isArray(draft.nodes)
+        ? (draft.nodes)
+        : [];
+    const sourceNode = nodes.find((n) => n.id === edge.source);
+    const branches = sourceNode?.type === 'decision' &&
+        Array.isArray(sourceNode.config?.conditions)
+        ? (sourceNode.config.conditions)
+        : [];
+    const branchExpr = (b) => (typeof b.expression === 'string' ? b.expression.trim() : '');
+    const branchName = (b) => (typeof b.label === 'string' ? b.label.trim() : '');
+    // Which branch this edge currently represents: the default edge maps to the
+    // `true`/empty branch; otherwise match by condition, then by label. '' = custom.
+    const selectedBranch = (() => {
+        if (!branches.length)
+            return '';
+        if (isDefault) {
+            const i = branches.findIndex((b) => { const e = branchExpr(b); return e === '' || e === 'true'; });
+            return i >= 0 ? String(i) : '';
+        }
+        const cond = conditionText(edge.condition);
+        let i = cond ? branches.findIndex((b) => branchExpr(b) === cond) : -1;
+        if (i < 0 && edge.label)
+            i = branches.findIndex((b) => branchName(b) === edge.label);
+        return i >= 0 ? String(i) : '';
+    })();
+    const applyBranch = (key) => {
+        if (key === '')
+            return; // keep current custom values
+        const b = branches[Number(key)];
+        if (!b)
+            return;
+        const expr = branchExpr(b);
+        const lbl = branchName(b) || undefined;
+        if (expr === '' || expr === 'true')
+            patchEdge({ isDefault: true, condition: undefined, label: lbl });
+        else
+            patchEdge({ isDefault: false, condition: expr, label: lbl });
+    };
+    // Approval out-edges (ADR-0019/0044) route by branch *label*: the engine
+    // resumes down the out-edge whose label matches the decision — `approve` /
+    // `reject`, or `revise` (ADR-0044 send-back-for-revision). Offer those as a
+    // picker (mirrors APPROVAL_BRANCH_LABELS in @objectstack/spec) so the author
+    // need not recall the exact keyword; a free-text label is still allowed.
+    const isApprovalSource = sourceNode?.type === 'approval';
+    const APPROVAL_BRANCHES = ['approve', 'reject', 'revise'];
+    const currentApprovalBranch = (() => {
+        const l = (edge.label ?? '').trim().toLowerCase();
+        return APPROVAL_BRANCHES.includes(l) ? l : '';
+    })();
+    const edgeType = (typeof edge.type === 'string' && edge.type) || 'default';
     return (_jsxs(InspectorShell, { kindLabel: t('engine.inspector.flowEdge.kind', locale), title: selection.label ?? `${edge.source} → ${edge.target}`, onClose: onClearSelection, closeLabel: t('engine.inspector.flowEdge.close', locale), footer: _jsx(InspectorRemoveButton, { label: t('engine.inspector.flowEdge.remove', locale), onClick: () => {
                 onPatch({ edges: spliceArray(edges, index, null) });
                 onClearSelection();
-            }, disabled: readOnly }), children: [_jsx(EndpointRow, { label: t('engine.inspector.flowEdge.source', locale), value: edge.source }), _jsx(EndpointRow, { label: t('engine.inspector.flowEdge.target', locale), value: edge.target }), _jsxs("div", { className: "flex items-center gap-2 pt-1", children: [_jsx("span", { className: "text-[11px] font-semibold uppercase tracking-wide text-muted-foreground", children: t('engine.inspector.flowEdge.routing', locale) }), _jsx("span", { className: "h-px flex-1 bg-border", "aria-hidden": true })] }), _jsx(InspectorTextField, { label: t('engine.inspector.flowEdge.label', locale), value: edge.label ?? '', onCommit: (v) => patchEdge({ label: v }), placeholder: t('engine.inspector.flowEdge.labelHint', locale), disabled: readOnly || isDefault }), _jsx(InspectorTextField, { label: t('engine.inspector.flowEdge.condition', locale), value: conditionText(edge.condition) ?? '', onCommit: (v) => patchEdge({ condition: v || undefined }), placeholder: t('engine.inspector.flowEdge.conditionHint', locale), disabled: readOnly || isDefault, mono: true }), (() => {
+            }, disabled: readOnly }), children: [_jsx(EndpointRow, { label: t('engine.inspector.flowEdge.source', locale), value: edge.source }), _jsx(EndpointRow, { label: t('engine.inspector.flowEdge.target', locale), value: edge.target }), _jsxs("div", { className: "flex items-center gap-2 pt-1", children: [_jsx("span", { className: "text-[11px] font-semibold uppercase tracking-wide text-muted-foreground", children: t('engine.inspector.flowEdge.routing', locale) }), _jsx("span", { className: "h-px flex-1 bg-border", "aria-hidden": true })] }), branches.length > 0 && (_jsx(InspectorSelectField, { label: t('engine.inspector.flowEdge.branch', locale), value: selectedBranch, options: [
+                    ...branches.map((b, i) => {
+                        const expr = branchExpr(b);
+                        const nm = branchName(b) || `Branch ${i + 1}`;
+                        const suffix = expr === '' || expr === 'true' ? ' \u00b7 default' : ` \u00b7 ${expr}`;
+                        return { value: String(i), label: `${nm}${suffix}` };
+                    }),
+                    { value: '', label: '\u2014 Custom \u2014' },
+                ], onCommit: applyBranch, disabled: readOnly })), isApprovalSource && (_jsx(InspectorSelectField, { label: t('engine.inspector.flowEdge.approvalBranch', locale), value: currentApprovalBranch, options: [
+                    { value: 'approve', label: t('engine.inspector.flowEdge.branchApprove', locale) },
+                    { value: 'reject', label: t('engine.inspector.flowEdge.branchReject', locale) },
+                    { value: 'revise', label: t('engine.inspector.flowEdge.branchRevise', locale) },
+                    { value: '', label: t('engine.inspector.flowEdge.branchCustom', locale) },
+                ], 
+                // Picking a branch writes the matching label; "Custom" keeps the
+                // free-text label the author typed below.
+                onCommit: (v) => { if (v)
+                    patchEdge({ label: v }); }, disabled: readOnly })), _jsx(InspectorTextField, { label: t('engine.inspector.flowEdge.label', locale), value: edge.label ?? '', onCommit: (v) => patchEdge({ label: v }), placeholder: t('engine.inspector.flowEdge.labelHint', locale), disabled: readOnly || isDefault }), _jsx(InspectorTextField, { label: t('engine.inspector.flowEdge.condition', locale), value: conditionText(edge.condition) ?? '', onCommit: (v) => patchEdge({ condition: v || undefined }), placeholder: t('engine.inspector.flowEdge.conditionHint', locale), disabled: readOnly || isDefault, mono: true }), (() => {
                 // ADR-0032 — flag a malformed edge guard (e.g. `{record.x}` brace-in-CEL)
                 // inline, with the same corrective message as build/agent validation.
                 const issue = isDefault ? null : validateExpressionClient('predicate', edge.condition);
@@ -41,5 +117,10 @@ export function FlowEdgeInspector({ selection, draft, onPatch, onClearSelection,
             })(), _jsx(InspectorCheckboxField, { label: t('engine.inspector.flowEdge.isDefault', locale), value: isDefault, 
                 // The default ("else") branch is taken when no other guard matches, so
                 // it carries neither a condition nor a branch label — clear both.
-                onCommit: (v) => patchEdge(v ? { isDefault: true, condition: undefined, label: undefined } : { isDefault: false }), disabled: readOnly }), _jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: t('engine.inspector.flowEdge.hint', locale) })] }));
+                onCommit: (v) => patchEdge(v ? { isDefault: true, condition: undefined, label: undefined } : { isDefault: false }), disabled: readOnly }), _jsx("p", { className: "text-[11px] leading-snug text-muted-foreground", children: t('engine.inspector.flowEdge.hint', locale) }), _jsxs("div", { className: "flex items-center gap-2 pt-1", children: [_jsx("span", { className: "text-[11px] font-semibold uppercase tracking-wide text-muted-foreground", children: t('engine.inspector.flowEdge.connection', locale) }), _jsx("span", { className: "h-px flex-1 bg-border", "aria-hidden": true })] }), _jsx(InspectorSelectField, { label: t('engine.inspector.flowEdge.type', locale), value: edgeType, options: [
+                    { value: 'default', label: t('engine.inspector.flowEdge.typeDefault', locale) },
+                    { value: 'conditional', label: t('engine.inspector.flowEdge.typeConditional', locale) },
+                    { value: 'fault', label: t('engine.inspector.flowEdge.typeFault', locale) },
+                    { value: 'back', label: t('engine.inspector.flowEdge.typeBack', locale) },
+                ], onCommit: (v) => patchEdge({ type: v }), disabled: readOnly }), edge.type === 'back' && (_jsx("p", { className: "text-[11px] leading-snug text-amber-600 dark:text-amber-400", role: "note", children: t('engine.inspector.flowEdge.backHint', locale) }))] }));
 }