@shwfed/config 2.9.13 → 2.10.0

package/dist/runtime/components/form/fields/2026-05-28/com.shwfed.form.field.combobox.single/runtime.vue

@@ -25,7 +25,7 @@ import { Markdown } from "../../../../ui/markdown";
 import { Popover, PopoverAnchor, PopoverContent, PopoverTrigger } from "../../../../ui/popover";
 import { DEFAULT_FIELD_ORIENTATION } from "../../../utils/common";
 import { useFormReadonly } from "../../../utils/readonly";
-import { useFormState } from "../../../utils/state";
+import { useFormScope, useFormState } from "../../../utils/state";
 import { useFieldValidation } from "../../../utils/validation";
 defineOptions({ name: "ShwfedComboboxSingleFieldRuntime" });
 const props = defineProps({
@@ -55,7 +55,8 @@ const { locale, t } = useI18n({
     }
   }
 });
-const { state, getAt, setAt, setAtSilent } = useFormState();
+const { getAt, setAt, setAtSilent } = useFormState();
+const formScope = useFormScope();
 const inherited = injectCELContext();
 const $cel = (expression, context) => _rawCel(expression, { ...celBindings(inherited), ...context });
 const labelText = computed(() => getLocalizedText(props.config.label, locale.value));
@@ -68,7 +69,7 @@ const tooltipText = computed(
 function evalBool(expression, label) {
   if (!expression) return false;
   try {
-    return Effect.runSync($cel(expression, { form: state.value ?? {} }));
+    return Effect.runSync($cel(expression, { form: formScope.state.value ?? {} }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate ${label} for ${props.fieldId}:`, err);
     return false;
@@ -103,7 +104,7 @@ const requestSignature = computed(() => {
   const expr = opts.request;
   if (!expr) return null;
   try {
-    const req = asRequest(Effect.runSync($cel(expr, { form: state.value ?? {} })));
+    const req = asRequest(Effect.runSync($cel(expr, { form: formScope.state.value ?? {} })));
     return Option.isSome(req) ? JSON.stringify(req.value.describe()) : null;
   } catch {
     return null;
@@ -126,7 +127,7 @@ async function fetchOptions() {
   }
   isLoading.value = true;
   const program = Effect.gen(function* () {
-    const body = yield* fetchJsonOption(yield* $cel(expr, { form: state.value ?? {} }));
+    const body = yield* fetchJsonOption(yield* $cel(expr, { form: formScope.state.value ?? {} }));
     return Option.getOrNull(body);
   });
   try {
@@ -142,7 +143,7 @@ function remoteValueOf(option) {
   const opts = props.config.options;
   if (opts.kind !== "remote") return void 0;
   try {
-    return Effect.runSync($cel(opts.optionValue, { form: state.value ?? {}, option }));
+    return Effect.runSync($cel(opts.optionValue, { form: formScope.state.value ?? {}, option }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate optionValue for ${props.fieldId}:`, err);
     return void 0;
@@ -153,13 +154,13 @@ function remoteLabelOf(option) {
   if (opts.kind !== "remote") return "";
   const tpl = getLocalizedText(opts.optionLabel, locale.value) ?? "";
   if (!tpl) return "";
-  return interpolateMarkdown(tpl, $cel, { form: state.value ?? {}, option });
+  return interpolateMarkdown(tpl, $cel, { form: formScope.state.value ?? {}, option });
 }
 function remoteKeywordsOf(option) {
   const opts = props.config.options;
   if (opts.kind !== "remote" || !opts.optionKeywords) return void 0;
   try {
-    const raw = Effect.runSync($cel(opts.optionKeywords, { form: state.value ?? {}, option }));
+    const raw = Effect.runSync($cel(opts.optionKeywords, { form: formScope.state.value ?? {}, option }));
     if (!Array.isArray(raw)) return void 0;
     const joined = raw.map((k) => k == null ? "" : String(k)).filter(Boolean).join(" ");
     return joined.length > 0 ? joined : void 0;
@@ -174,7 +175,7 @@ const entries = computed(() => {
     return (opts.items ?? []).map((item) => {
       const labelTpl = getLocalizedText(item.label, locale.value) ?? "";
       const tooltipTpl = item.tooltip ? getLocalizedText(item.tooltip, locale.value) : void 0;
-      const ctx = { form: state.value ?? {} };
+      const ctx = { form: formScope.state.value ?? {} };
       const kw = (item.keywords ?? []).filter(Boolean).join(" ");
       return {
         key: item.id,
@@ -188,7 +189,7 @@ const entries = computed(() => {
   }
   let raw;
   try {
-    raw = Effect.runSync($cel(opts.options, { form: state.value ?? {}, json: json.value }));
+    raw = Effect.runSync($cel(opts.options, { form: formScope.state.value ?? {}, json: json.value }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate options for ${props.fieldId}:`, err);
     return [];
@@ -311,14 +312,15 @@ const anyHasTooltip = computed(
     </FieldLabel>
     <div
       v-if="effectiveReadonly"
-      class="min-h-9 py-1.5 text-sm text-zinc-700"
+      class="min-h-9 py-1.5 text-sm"
+      :class="selectedLabel ? 'text-zinc-700' : 'font-mono text-zinc-300 select-none'"
     >
       <Markdown
         v-if="selectedLabel"
         :source="selectedLabel"
       />
       <template v-else>
-        —
+        -
       </template>
     </div>
     <Popover

package/dist/runtime/components/form/fields/2026-05-28/com.shwfed.form.field.tree.combobox.multi/runtime.vue

@@ -18,7 +18,7 @@ import { Tree as UiTree } from "../../../../ui/tree";
 import { interpolateMarkdown } from "../../../../table/utils/runtime";
 import { DEFAULT_FIELD_ORIENTATION } from "../../../utils/common";
 import { useFormReadonly } from "../../../utils/readonly";
-import { useFormState } from "../../../utils/state";
+import { useFormScope, useFormState } from "../../../utils/state";
 import { useFieldValidation } from "../../../utils/validation";
 import {
   findWrappedPath,
@@ -39,8 +39,7 @@ const { locale, t } = useI18n({
       "tree-combobox-multi-search-clear": "\u6E05\u9664\u641C\u7D22",
       "tree-combobox-multi-empty": "\u65E0\u53EF\u9009\u9879",
       "tree-combobox-multi-load-error": "\u52A0\u8F7D\u5931\u8D25",
-      "tree-combobox-multi-retry": "\u91CD\u8BD5",
-      "tree-combobox-multi-readonly-empty": "\u2014"
+      "tree-combobox-multi-retry": "\u91CD\u8BD5"
     },
     en: {
       "tree-combobox-multi-placeholder": "Select\u2026",
@@ -48,8 +47,7 @@ const { locale, t } = useI18n({
       "tree-combobox-multi-search-clear": "Clear search",
       "tree-combobox-multi-empty": "No options",
       "tree-combobox-multi-load-error": "Failed to load",
-      "tree-combobox-multi-retry": "Retry",
-      "tree-combobox-multi-readonly-empty": "\u2014"
+      "tree-combobox-multi-retry": "Retry"
     },
     ja: {
       "tree-combobox-multi-placeholder": "\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044",
@@ -57,12 +55,12 @@ const { locale, t } = useI18n({
       "tree-combobox-multi-search-clear": "\u691C\u7D22\u3092\u30AF\u30EA\u30A2",
       "tree-combobox-multi-empty": "\u9078\u629E\u80A2\u306A\u3057",
       "tree-combobox-multi-load-error": "\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
-      "tree-combobox-multi-retry": "\u518D\u8A66\u884C",
-      "tree-combobox-multi-readonly-empty": "\u2014"
+      "tree-combobox-multi-retry": "\u518D\u8A66\u884C"
     }
   }
 });
-const { state, getAt, setAt } = useFormState();
+const { getAt, setAt } = useFormState();
+const formScope = useFormScope();
 const inherited = injectCELContext();
 const $cel = (expression, context) => _rawCel(expression, { ...celBindings(inherited), ...context });
 const labelText = computed(() => getLocalizedText(props.config.label, locale.value));
@@ -75,7 +73,7 @@ const placeholderText = computed(
 function evalBool(expression, label) {
   if (!expression) return false;
   try {
-    return Effect.runSync($cel(expression, { form: state.value ?? {} }));
+    return Effect.runSync($cel(expression, { form: formScope.state.value ?? {} }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate ${label} for ${props.fieldId}:`, err);
     return false;
@@ -111,7 +109,7 @@ const model = computed({
   }
 });
 function nodeCtx(raw) {
-  return { form: state.value ?? {}, node: raw };
+  return { form: formScope.state.value ?? {}, node: raw };
 }
 function nodeKey(raw) {
   try {
@@ -184,11 +182,11 @@ async function fetchTree() {
     let jsonOpt = Option.none();
     if (dataSource.request) {
       jsonOpt = yield* fetchJsonOption(yield* $cel(dataSource.request, {
-        form: state.value ?? {}
+        form: formScope.state.value ?? {}
       }));
     }
     const dataRaw = yield* $cel(dataSource.data, {
-      form: state.value ?? {},
+      form: formScope.state.value ?? {},
       json: jsonOpt
     });
     return Array.isArray(dataRaw) ? dataRaw : [];
@@ -365,9 +363,10 @@ const hoveredTooltip = computed(() => {
 
     <div
       v-if="effectiveReadonly"
-      class="min-h-9 py-1.5 text-sm text-zinc-700"
+      class="min-h-9 py-1.5 text-sm"
+      :class="triggerLabel ? 'text-zinc-700' : 'font-mono text-zinc-300 select-none'"
     >
-      {{ triggerLabel || t("tree-combobox-multi-readonly-empty") }}
+      {{ triggerLabel || "-" }}
     </div>
 
     <Popover

package/dist/runtime/components/form/fields/2026-05-28/com.shwfed.form.field.tree.combobox.single/runtime.vue

@@ -18,7 +18,7 @@ import { Tree as UiTree } from "../../../../ui/tree";
 import { interpolateMarkdown } from "../../../../table/utils/runtime";
 import { DEFAULT_FIELD_ORIENTATION } from "../../../utils/common";
 import { useFormReadonly } from "../../../utils/readonly";
-import { useFormState } from "../../../utils/state";
+import { useFormScope, useFormState } from "../../../utils/state";
 import { useFieldValidation } from "../../../utils/validation";
 import {
   findWrappedPath,
@@ -39,8 +39,7 @@ const { locale, t } = useI18n({
       "tree-combobox-single-search-clear": "\u6E05\u9664\u641C\u7D22",
       "tree-combobox-single-empty": "\u65E0\u53EF\u9009\u9879",
       "tree-combobox-single-load-error": "\u52A0\u8F7D\u5931\u8D25",
-      "tree-combobox-single-retry": "\u91CD\u8BD5",
-      "tree-combobox-single-readonly-empty": "\u2014"
+      "tree-combobox-single-retry": "\u91CD\u8BD5"
     },
     en: {
       "tree-combobox-single-placeholder": "Select\u2026",
@@ -48,8 +47,7 @@ const { locale, t } = useI18n({
       "tree-combobox-single-search-clear": "Clear search",
       "tree-combobox-single-empty": "No options",
       "tree-combobox-single-load-error": "Failed to load",
-      "tree-combobox-single-retry": "Retry",
-      "tree-combobox-single-readonly-empty": "\u2014"
+      "tree-combobox-single-retry": "Retry"
     },
     ja: {
       "tree-combobox-single-placeholder": "\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044",
@@ -57,12 +55,12 @@ const { locale, t } = useI18n({
       "tree-combobox-single-search-clear": "\u691C\u7D22\u3092\u30AF\u30EA\u30A2",
       "tree-combobox-single-empty": "\u9078\u629E\u80A2\u306A\u3057",
       "tree-combobox-single-load-error": "\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
-      "tree-combobox-single-retry": "\u518D\u8A66\u884C",
-      "tree-combobox-single-readonly-empty": "\u2014"
+      "tree-combobox-single-retry": "\u518D\u8A66\u884C"
     }
   }
 });
-const { state, getAt, setAt } = useFormState();
+const { getAt, setAt } = useFormState();
+const formScope = useFormScope();
 const inherited = injectCELContext();
 const $cel = (expression, context) => _rawCel(expression, { ...celBindings(inherited), ...context });
 const labelText = computed(() => getLocalizedText(props.config.label, locale.value));
@@ -75,7 +73,7 @@ const placeholderText = computed(
 function evalBool(expression, label) {
   if (!expression) return false;
   try {
-    return Effect.runSync($cel(expression, { form: state.value ?? {} }));
+    return Effect.runSync($cel(expression, { form: formScope.state.value ?? {} }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate ${label} for ${props.fieldId}:`, err);
     return false;
@@ -112,7 +110,7 @@ const model = computed({
   }
 });
 function nodeCtx(raw) {
-  return { form: state.value ?? {}, node: raw };
+  return { form: formScope.state.value ?? {}, node: raw };
 }
 function nodeKey(raw) {
   try {
@@ -185,11 +183,11 @@ async function fetchTree() {
     let jsonOpt = Option.none();
     if (dataSource.request) {
       jsonOpt = yield* fetchJsonOption(yield* $cel(dataSource.request, {
-        form: state.value ?? {}
+        form: formScope.state.value ?? {}
       }));
     }
     const dataRaw = yield* $cel(dataSource.data, {
-      form: state.value ?? {},
+      form: formScope.state.value ?? {},
       json: jsonOpt
     });
     return Array.isArray(dataRaw) ? dataRaw : [];
@@ -353,9 +351,10 @@ const hoveredTooltip = computed(() => {
 
     <div
       v-if="effectiveReadonly"
-      class="min-h-9 py-1.5 text-sm text-zinc-700"
+      class="min-h-9 py-1.5 text-sm"
+      :class="triggerLabel ? 'text-zinc-700' : 'font-mono text-zinc-300 select-none'"
     >
-      {{ triggerLabel || t("tree-combobox-single-readonly-empty") }}
+      {{ triggerLabel || "-" }}
     </div>
 
     <Popover

package/dist/runtime/components/form/fields/2026-05-28/com.shwfed.form.field.tree.multi/runtime.vue

@@ -17,7 +17,7 @@ import { Skeleton } from "../../../../ui/skeleton";
 import { Tree as UiTree } from "../../../../ui/tree";
 import { interpolateMarkdown } from "../../../../table/utils/runtime";
 import { useFormReadonly } from "../../../utils/readonly";
-import { useFormState } from "../../../utils/state";
+import { useFormScope, useFormState } from "../../../utils/state";
 import { useFieldValidation } from "../../../utils/validation";
 defineOptions({ name: "ShwfedTreeMultiFieldRuntime" });
 const props = defineProps({
@@ -32,7 +32,6 @@ const { locale, t } = useI18n({
       "tree-multi-search-clear": "\u6E05\u9664\u641C\u7D22",
       "tree-multi-load-error": "\u52A0\u8F7D\u5931\u8D25",
       "tree-multi-empty": "\u65E0\u53EF\u9009\u9879",
-      "tree-multi-readonly-empty": "\u2014",
       "tree-multi-readonly-separator": "\u3001"
     },
     en: {
@@ -40,7 +39,6 @@ const { locale, t } = useI18n({
       "tree-multi-search-clear": "Clear search",
       "tree-multi-load-error": "Failed to load",
       "tree-multi-empty": "No options",
-      "tree-multi-readonly-empty": "\u2014",
       "tree-multi-readonly-separator": ", "
     },
     ja: {
@@ -48,12 +46,12 @@ const { locale, t } = useI18n({
       "tree-multi-search-clear": "\u691C\u7D22\u3092\u30AF\u30EA\u30A2",
       "tree-multi-load-error": "\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
       "tree-multi-empty": "\u9078\u629E\u80A2\u306A\u3057",
-      "tree-multi-readonly-empty": "\u2014",
       "tree-multi-readonly-separator": "\u3001"
     }
   }
 });
-const { state, getAt, setAt } = useFormState();
+const { getAt, setAt } = useFormState();
+const formScope = useFormScope();
 const inherited = injectCELContext();
 const $cel = (expression, context) => _rawCel(expression, { ...celBindings(inherited), ...context });
 const labelText = computed(() => getLocalizedText(props.config.label, locale.value));
@@ -63,7 +61,7 @@ const tooltipText = computed(
 function evalBool(expression, label) {
   if (!expression) return false;
   try {
-    return Effect.runSync($cel(expression, { form: state.value ?? {} }));
+    return Effect.runSync($cel(expression, { form: formScope.state.value ?? {} }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate ${label} for ${props.fieldId}:`, err);
     return false;
@@ -111,11 +109,11 @@ async function fetchTree() {
     let jsonOpt = Option.none();
     if (dataSource.request) {
       jsonOpt = yield* fetchJsonOption(yield* $cel(dataSource.request, {
-        form: state.value ?? {}
+        form: formScope.state.value ?? {}
       }));
     }
     const dataRaw = yield* $cel(dataSource.data, {
-      form: state.value ?? {},
+      form: formScope.state.value ?? {},
       json: jsonOpt
     });
     return Array.isArray(dataRaw) ? dataRaw : [];
@@ -149,7 +147,7 @@ watch(
   { immediate: true }
 );
 function nodeCtx(node) {
-  return { form: state.value ?? {}, node };
+  return { form: formScope.state.value ?? {}, node };
 }
 function getKey(node) {
   try {
@@ -186,7 +184,7 @@ function nodeSelectable(node, _depth) {
 }
 function safeInterpolate(tpl, node) {
   try {
-    return interpolateMarkdown(tpl, $cel, { form: state.value ?? {}, node });
+    return interpolateMarkdown(tpl, $cel, { form: formScope.state.value ?? {}, node });
   } catch (err) {
     console.error(`[shwfed-form] failed to interpolate node text for ${props.fieldId}:`, err);
     return tpl;
@@ -289,14 +287,13 @@ publishSelection(
   }
 );
 const readonlyText = computed(() => {
-  const empty = t("tree-multi-readonly-empty");
-  if (model.value.length === 0) return empty;
+  if (model.value.length === 0) return null;
   const found = resolvedByKey.value;
   const labels = model.value.map((id) => {
     const n = found.get(id);
     return n !== void 0 ? nodeLabelText(n) : id;
   }).filter((l) => l.length > 0);
-  return labels.length > 0 ? labels.join(t("tree-multi-readonly-separator")) : empty;
+  return labels.length > 0 ? labels.join(t("tree-multi-readonly-separator")) : null;
 });
 </script>
 
@@ -327,9 +324,10 @@ const readonlyText = computed(() => {
 
     <div
       v-if="effectiveReadonly"
-      class="min-h-9 py-1.5 text-sm text-zinc-700"
+      class="min-h-9 py-1.5 text-sm"
+      :class="readonlyText ? 'text-zinc-700' : 'font-mono text-zinc-300 select-none'"
     >
-      {{ readonlyText }}
+      {{ readonlyText || "-" }}
     </div>
 
     <template v-else>

package/dist/runtime/components/form/fields/2026-05-28/com.shwfed.form.field.tree.single/runtime.vue

@@ -16,7 +16,7 @@ import { Skeleton } from "../../../../ui/skeleton";
 import { Tree as UiTree } from "../../../../ui/tree";
 import { interpolateMarkdown } from "../../../../table/utils/runtime";
 import { useFormReadonly } from "../../../utils/readonly";
-import { useFormState } from "../../../utils/state";
+import { useFormScope, useFormState } from "../../../utils/state";
 import { useFieldValidation } from "../../../utils/validation";
 defineOptions({ name: "ShwfedTreeSingleFieldRuntime" });
 const props = defineProps({
@@ -30,26 +30,24 @@ const { locale, t } = useI18n({
       "tree-single-search-label": "\u641C\u7D22",
       "tree-single-search-clear": "\u6E05\u9664\u641C\u7D22",
       "tree-single-load-error": "\u52A0\u8F7D\u5931\u8D25",
-      "tree-single-empty": "\u65E0\u53EF\u9009\u9879",
-      "tree-single-readonly-empty": "\u2014"
+      "tree-single-empty": "\u65E0\u53EF\u9009\u9879"
     },
     en: {
       "tree-single-search-label": "Search",
       "tree-single-search-clear": "Clear search",
       "tree-single-load-error": "Failed to load",
-      "tree-single-empty": "No options",
-      "tree-single-readonly-empty": "\u2014"
+      "tree-single-empty": "No options"
     },
     ja: {
       "tree-single-search-label": "\u691C\u7D22",
       "tree-single-search-clear": "\u691C\u7D22\u3092\u30AF\u30EA\u30A2",
       "tree-single-load-error": "\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
-      "tree-single-empty": "\u9078\u629E\u80A2\u306A\u3057",
-      "tree-single-readonly-empty": "\u2014"
+      "tree-single-empty": "\u9078\u629E\u80A2\u306A\u3057"
     }
   }
 });
-const { state, getAt, setAt } = useFormState();
+const { getAt, setAt } = useFormState();
+const formScope = useFormScope();
 const inherited = injectCELContext();
 const $cel = (expression, context) => _rawCel(expression, { ...celBindings(inherited), ...context });
 const labelText = computed(() => getLocalizedText(props.config.label, locale.value));
@@ -59,7 +57,7 @@ const tooltipText = computed(
 function evalBool(expression, label) {
   if (!expression) return false;
   try {
-    return Effect.runSync($cel(expression, { form: state.value ?? {} }));
+    return Effect.runSync($cel(expression, { form: formScope.state.value ?? {} }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate ${label} for ${props.fieldId}:`, err);
     return false;
@@ -107,11 +105,11 @@ async function fetchTree() {
     let jsonOpt = Option.none();
     if (dataSource.request) {
       jsonOpt = yield* fetchJsonOption(yield* $cel(dataSource.request, {
-        form: state.value ?? {}
+        form: formScope.state.value ?? {}
       }));
     }
     const dataRaw = yield* $cel(dataSource.data, {
-      form: state.value ?? {},
+      form: formScope.state.value ?? {},
       json: jsonOpt
     });
     return Array.isArray(dataRaw) ? dataRaw : [];
@@ -145,7 +143,7 @@ watch(
   { immediate: true }
 );
 function nodeCtx(node) {
-  return { form: state.value ?? {}, node };
+  return { form: formScope.state.value ?? {}, node };
 }
 function getKey(node) {
   try {
@@ -182,7 +180,7 @@ function nodeSelectable(node, _depth) {
 }
 function safeInterpolate(tpl, node) {
   try {
-    return interpolateMarkdown(tpl, $cel, { form: state.value ?? {}, node });
+    return interpolateMarkdown(tpl, $cel, { form: formScope.state.value ?? {}, node });
   } catch (err) {
     console.error(`[shwfed-form] failed to interpolate node text for ${props.fieldId}:`, err);
     return tpl;
@@ -278,7 +276,7 @@ publishSelection(
 );
 const readonlyText = computed(() => {
   const selected = model.value;
-  if (selected == null) return t("tree-single-readonly-empty");
+  if (selected == null) return null;
   const n = selectedNode.value;
   if (n === void 0) return selected;
   const label = nodeLabelText(n);
@@ -313,9 +311,10 @@ const readonlyText = computed(() => {
 
     <div
       v-if="effectiveReadonly"
-      class="min-h-9 py-1.5 text-sm text-zinc-700"
+      class="min-h-9 py-1.5 text-sm"
+      :class="readonlyText ? 'text-zinc-700' : 'font-mono text-zinc-300 select-none'"
     >
-      {{ readonlyText }}
+      {{ readonlyText || "-" }}
     </div>
 
     <template v-else>

package/dist/runtime/components/form/fields/2026-06-09/com.shwfed.form.field.upload/runtime.vue

@@ -14,7 +14,7 @@ import { Markdown } from "../../../../ui/markdown";
 import { DEFAULT_FIELD_ORIENTATION } from "../../../utils/common";
 import { useFieldValidation } from "../../../utils/validation";
 import { useFormReadonly } from "../../../utils/readonly";
-import { useFormState } from "../../../utils/state";
+import { useFormScope, useFormState } from "../../../utils/state";
 const ICONS = {
   "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "vscode-icons:file-type-excel",
   "application/vnd.ms-excel": "vscode-icons:file-type-excel",
@@ -91,7 +91,8 @@ const { locale, t } = useI18n({
     }
   }
 });
-const { state, getAt, setAt } = useFormState();
+const { getAt, setAt } = useFormState();
+const formScope = useFormScope();
 const inherited = injectCELContext();
 const $cel = (expression, context) => _rawCel(expression, { ...celBindings(inherited), ...context });
 const labelText = computed(
@@ -106,7 +107,7 @@ const tooltipText = computed(
 function evalBool(expression, label) {
   if (!expression) return false;
   try {
-    return Effect.runSync($cel(expression, { form: state.value ?? {} }));
+    return Effect.runSync($cel(expression, { form: formScope.state.value ?? {} }));
   } catch (err) {
     console.error(`[shwfed-form] failed to evaluate ${label} for ${props.fieldId}:`, err);
     return false;
@@ -146,7 +147,7 @@ function entryName(entry) {
   const expr = props.config.upload?.filename;
   if (expr) {
     try {
-      const name = Effect.runSync($cel(expr, { form: state.value ?? {}, file: entry }));
+      const name = Effect.runSync($cel(expr, { form: formScope.state.value ?? {}, file: entry }));
       if (typeof name === "string" && name.length > 0) return name;
     } catch (err) {
       console.error(`[shwfed-form] failed to evaluate upload filename for ${props.fieldId}:`, err);
@@ -215,11 +216,11 @@ async function uploadFiles(accepted) {
   if (!upload) return [];
   const program = Effect.gen(function* () {
     const builder = yield* $cel(upload.request, {
-      form: state.value ?? {},
+      form: formScope.state.value ?? {},
       files: accepted
     });
     const json = yield* builder.json();
-    return yield* $cel(upload.handle, { form: state.value ?? {}, json });
+    return yield* $cel(upload.handle, { form: formScope.state.value ?? {}, json });
   });
   try {
     const items = await Effect.runPromise(Effect.provide(program, Fetch.layer));
@@ -287,7 +288,7 @@ function templateLabelText(template) {
   return (template.label ? getLocalizedText(template.label, locale.value) : void 0) ?? "\u4E0B\u8F7D\u6A21\u677F";
 }
 async function onDownloadTemplate(template) {
-  const ctx = { form: state.value ?? {} };
+  const ctx = { form: formScope.state.value ?? {} };
   const program = Effect.gen(function* () {
     const requestBuilder = yield* $cel(template.request, ctx);
     if (!template.download) {