agent-flutter 0.1.24 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-flutter",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "Portable Flutter skill/rule pack initializer for multiple AI IDEs.",
   "type": "module",
   "bin": {

package/templates/shared/TEMPLATES.md

@@ -74,3 +74,30 @@ Finalize this feature:
 - Screenshot evidence: [No UI OR before/after]
 - Paired with: [Solo OR name]
 ```
+
+---
+
+## **5. Refactor Converted UI (Post-Convert)**
+
+Use this when code comes from convert script and needs production refactor:
+
+```text
+Refactor converted UI:
+- Source file: [e.g. lib/src/ui/home_demo_figma/home_demo_figma_page.dart]
+- Feature name: [e.g. home_demo]
+- Keep exact Figma visual: [yes/no]
+- Needs API integration now?: [yes/no]
+- Normalize/rename convert assets?: [yes/no]
+- Commit now?: [yes/no]
+- Push now?: [yes/no]
+- Create PR now?: [yes/no]
+- Priority fixes: [naming, localization, App* widgets, token cleanup, asset-rename, overflow]
+```
+
+Expected behavior:
+1. Apply `ui-refactor-convert.md` + `ui.md`.
+2. Rename generated classes/files to semantic names.
+3. Normalize convert-generated asset folder and names, then update `AppAssets` usages.
+4. Replace hardcoded style/string with tokens + localization.
+5. Extract components and pass UI correctness gates.
+6. Ask and execute in order: commit -> push -> create PR.

package/templates/shared/rules/ci-cd-pr.md

@@ -21,7 +21,7 @@ This is the required "done" flow before feature handoff.
 6. If answer is `yes`, push branch to remote.
 7. Ask user explicitly: `Do you want me to create PR now? (yes/no)`
 8. If answer is `yes`, create PR with mandatory template sections.
-9. If any answer is `no`, stop at that step and return current status.
+9. If answer is `no` at any step, stop at that step and return current status.
 
 If any step is skipped, feature is not considered complete.
 
@@ -48,6 +48,6 @@ PR must follow `.github/pull_request_template.md` and include all sections:
 
 ## 6. Agent Behavior
 - After finishing UI/API tasks, agent must ask in order: commit -> push -> create PR.
-- Agent must execute only steps explicitly confirmed by user (`yes`).
+- Agent executes only steps explicitly confirmed by user (`yes`).
 - If user confirms all steps, agent returns PR URL as final output.
-- If user declines at any step, agent stops and returns current repository status.
+- If user declines at any step, agent stops and returns repository status.

package/templates/shared/rules/integration-api.md

@@ -51,6 +51,9 @@ If any item is missing, stop implementation and request contract clarification f
 - UI/domain-only models: `lib/src/core/model/`
 - Never pass raw `Map<String, dynamic>` across UI layers for non-trivial APIs.
 - Reuse-first: check existing models before creating new ones.
+- Required API fields must not silently fallback to fake defaults in `fromJson`.
+- Nullable/non-nullable and enum values must match backend contract explicitly.
+- Date/number parsing must be guarded (safe parse/cast), not optimistic cast.
 
 ### D. Repository Boundary
 - All remote calls must be wrapped by repository classes in `lib/src/core/repository/`.
@@ -83,6 +86,11 @@ If any item is missing, stop implementation and request contract clarification f
 - Prefer typed fields and safe nullability.
 - Add parser methods (`fromJson/toJson`) consistently.
 - Apply reuse/evolution checklist from [dart-model-reuse](../skills/dart-model-reuse/SKILL.md).
+- Validate model correctness against contract:
+  - Required/optional fields match schema.
+  - Enum/status values are constrained.
+  - No hidden fallback defaults for required fields.
+  - Update `spec/model-registry.md` for any model additions/changes.
 
 ### Step 4: Implement Repository Method
 - Repository extends/reuses `Api`.
@@ -107,6 +115,7 @@ If any item is missing, stop implementation and request contract clarification f
 - UI reads bloc state and renders loading/error/success.
 - No API parsing logic in widget tree.
 - All strings shown from API errors must pass localization policy in [getx-localization-standard](../skills/getx-localization-standard/SKILL.md).
+- UI should consume repository-mapped typed models only (not raw response JSON/map).
 
 ## 5. Minimal Reference Pattern
 
@@ -137,6 +146,9 @@ class FeatureRepository extends Api {
 ## 7. Verification Checklist Before PR
 - [ ] Endpoint added in `api_url.dart` and consumed from repository only.
 - [ ] Request/response models are separated and typed.
+- [ ] Model correctness validated against API contract (required/nullable/enum/date/number).
+- [ ] No hidden fallback defaults for required contract fields in `fromJson`.
+- [ ] UI/Bloc consumes typed models only (no raw JSON/map parsing).
 - [ ] Bloc uses `PageState` lifecycle correctly.
 - [ ] All displayed text/error is localized via `LocaleKey`.
 - [ ] Flavor run verified at least on staging command.

package/templates/shared/rules/ui-refactor-convert.md

@@ -0,0 +1,120 @@
+---
+alwaysApply: false
+---
+# UI Refactor Rule for Convert Output (JSX/Figma -> Dart)
+
+## 1. Goal
+Turn generated UI code into production-ready Flutter code that fully complies with `ui.md`.
+
+This rule applies after running convert scripts (for example files like `home_demo_figma_page.dart` and generated component trees), especially when convert output creates non-standard asset names/folders.
+
+## 1.1 Required References
+Always apply together with:
+- [ui.md](./ui.md)
+- [flutter-ui-widgets](../skills/flutter-ui-widgets/SKILL.md)
+- [flutter-assets-management](../skills/flutter-assets-management/SKILL.md)
+- [getx-localization-standard](../skills/getx-localization-standard/SKILL.md)
+- [dart-best-practices](../skills/dart-best-practices/SKILL.md)
+- [ci-cd-pr.md](./ci-cd-pr.md)
+
+If API data is involved, also apply:
+- [integration-api.md](./integration-api.md)
+- [dart-model-reuse](../skills/dart-model-reuse/SKILL.md)
+
+## 2. Trigger Conditions
+Use this rule when at least one condition is true:
+- Source file is generated by convert pipeline.
+- Class/file names are non-semantic (for example: `UhomeUdemoFigma`, `Frame123`).
+- Generated UI has hardcoded strings/colors/styles or deep nested widget trees.
+- Converted UI works visually but fails architecture/readability/maintainability standards.
+
+## 3. Refactor Workflow
+
+### Step 1: Normalize Structure and Naming
+- Keep page architecture:
+  - `lib/src/ui/<feature>/{binding,interactor,components}`
+- Rename generated class/file names to semantic names.
+- Keep page entry simple (`<feature>_page.dart` should not contain huge raw trees).
+
+### Step 2: Apply Design Tokens and Shared Widgets
+- Replace raw style values with:
+  - `AppColors`
+  - `AppStyles`
+  - `AppDimensions` and extensions (`n.width`, `n.height`)
+- Replace raw controls with existing `App*` widgets where applicable.
+- Keep exact Figma values when overriding tokens (radius/spacing/typography).
+
+### Step 3: Remove Convert Artifacts
+- Remove redundant wrappers (`ClipRRect + Container` duplicates, empty containers, unnecessary stacks).
+- Reduce deeply nested UI into clear sub-components under `components/`.
+- Add `const` where possible.
+- Avoid `Get.width` direct usage when local layout constraints are more correct (`LayoutBuilder`, `MediaQuery` scoped use).
+
+### Step 4: Localization and Content Cleanup
+- Move all user-facing text to `LocaleKey` + `.tr`.
+- Do not keep demo/static strings inside production widget tree.
+- If temporary mock is needed, source it from `app_demo_data.dart`.
+
+### Step 5: State and Behavior Correctness
+- Ensure required states render correctly:
+  - `loading`, `success`, `empty`, `error` (plus `unauthorized` if relevant).
+- Ensure UI behavior is not only visual:
+  - tap handlers wired,
+  - enabled/disabled state clear,
+  - no broken interaction overlays.
+
+### Step 6: Asset and Icon Hygiene
+- Use `AppAssets` only (no raw asset path in widget code).
+- Keep icon/image naming consistent and avoid duplicates.
+- Verify SVG rendering without unexpected tint/color shift.
+- Normalize convert-generated asset folders and names:
+  - Detect non-standard convert folders (for example: `assets/figma/**`).
+  - Move/rename assets to project-standard locations (`assets/images/**`, `assets/images/icons/**`) when applicable.
+  - Rename files to meaningful `snake_case` names based on feature and purpose.
+  - Replace convert-style asset constants in `lib/src/utils/app_assets.dart` with UI-standard naming.
+  - Update all usages in Dart code to new `AppAssets` constants.
+  - Remove orphan/unused old asset files and constants.
+
+### Step 7: Verify and Prepare for PR
+- Run at minimum:
+  - `fvm flutter analyze`
+- Validate UI correctness gates from `ui.md`:
+  - responsive widths `320/390/430`
+  - text scale `1.0/1.3`
+  - no overflow warnings in debug logs
+
+### Step 8: Commit/Push/PR Confirmation (Mandatory)
+- After refactor verification, ask user in strict order:
+  1. `Do you want me to commit now? (yes/no)`
+  2. `Do you want me to push now? (yes/no)`
+  3. `Do you want me to create PR now? (yes/no)`
+- Execute only steps explicitly confirmed with `yes`.
+- If user answers `no` at any step, stop there and return current status.
+
+## 4. Mandatory Output of Refactor Task
+After refactor, output must include:
+- List of renamed files/classes.
+- List of extracted components.
+- List of localized keys added/updated.
+- List of token replacements (`raw -> AppColors/AppStyles/AppDimensions`).
+- Asset rename mapping (`old path/name -> new path/name`) and updated `AppAssets` constants.
+- Commit/push/PR confirmation answers and execution results.
+- Remaining known gaps (if any) with exact file paths.
+
+## 5. Anti-Patterns (Do Not)
+- Do not keep generated class names in final code.
+- Do not leave hardcoded colors/text if a project token/key exists.
+- Do not keep convert-only asset naming/folders in final code if they violate project standard.
+- Do not parse API JSON directly in UI widgets.
+- Do not submit refactor that only changes formatting but leaves architectural violations.
+
+## 6. Prompt Template
+Use this prompt to trigger this rule:
+
+> Refactor converted UI using `ui-refactor-convert.md` + `ui.md`.
+> Source: `<path-to-generated-page-or-component>`.
+> Keep visual fidelity, but enforce architecture/tokens/localization/state correctness.
+> Extract reusable components and remove convert artifacts.
+> Normalize asset folder/naming and update `AppAssets` references.
+> Then ask: commit now? push now? create PR now?
+> Return changed files and verification checklist results.

package/templates/shared/rules/ui.md

@@ -14,6 +14,14 @@ alwaysApply: false
 - **Shadows**: Normalize `BoxShadow` closest to CSS box-shadow; do not change blur/spread arbitrarily.
 - **Backgrounds**: Use `DecorationImage` + appropriate `BoxFit` (cover/contain) and correct alignment.
 
+### **UI Correctness Gate (Priority P1)**
+- Every new/updated screen must pass visual + behavioral correctness, not only "looks similar".
+- Required state coverage for each screen: `loading`, `success`, `empty`, `error` (and `permission/unauthorized` if applicable).
+- Required responsive check: at least widths `320`, `390`, `430`.
+- Required accessibility check: text scale `1.0` and `1.3` without overflow/clipping.
+- No layout overflow warnings are allowed in debug console.
+- Tap targets should remain usable (recommended minimum 44x44 when interactive).
+
 ### **Overrides (Per-Component)**
 - App* widgets must allow overriding tokens: `size`, `radius`, `padding/margin`, `backgroundColor`, `textStyle`, `iconSize`, `constraints`.
 - Defaults must come from tokens (`AppStyles`, `AppColors`, `AppDimensions`) and act only as fallbacks; do not hardcode.
@@ -91,6 +99,16 @@ alwaysApply: false
   - **No dynamic data in UI**: Pages/components MUST receive typed models via constructor/BLoC state; do not hardcode demo lists in widgets.
   - **Demo/Mock Data Location**: Keep all demo/sample data in `lib/src/utils/app_demo_data.dart` only. Import from there when previewing or testing UI.
 - **Reuse-first**: Before creating a new model, check the [Model Registry](../../spec/model-registry.md) and follow [Dart Model Reuse Skill](../skills/dart-model-reuse/SKILL.md). Prefer extending existing models (optional fields) or composition over duplication.
+- **Model Correctness Gate (Priority P1)**:
+  - Each model class must state purpose/source in class doc (Request/Response/UI).
+  - Do not use `dynamic`/`Object?` for API payload fields unless contract truly allows unknown schema.
+  - Required contract fields must not silently fallback to fake defaults (`''`, `0`, `false`) in `fromJson`.
+  - Nullable/non-nullable must match backend contract.
+  - Date/number parsing must use guarded conversion (`DateTime.tryParse`, safe numeric casting).
+  - UI layer must consume typed UI/domain model only, not raw response map/json.
+- **Mapper Boundary (Required)**:
+  - If API response shape differs from UI needs, map in repository or mapper layer (`lib/src/core/mapper/`).
+  - Widgets and page blocs must not parse JSON directly.
 
 ### **E. Composition & State**
 - **State**: Default to `StatelessWidget`. Use `StatefulWidget` only for local UI logic (animations, focus).
@@ -147,6 +165,7 @@ Follow these steps when creating a new UI screen:
 - Check Figma/Design.
 - Identify reusable components -> Are they in `lib/src/ui/widgets`?
 - Identify unique components -> Plan to put them in `components/`.
+- Define UI state matrix before coding: loading/success/empty/error + action states (enabled/disabled).
 
 ### **Step 2: Scaffolding**
 - Create the folder structure (See [Lib Src Architecture Skill](../skills/flutter-standard-lib-src-architecture/SKILL.md)):
@@ -157,6 +176,11 @@ Follow these steps when creating a new UI screen:
 ### **Step 3: Data Modeling (If API involved)**
 - Create Request model in `lib/src/core/model/request/`.
 - Create Response model in `lib/src/core/model/response/`.
+- Validate each model against API contract before UI wiring:
+  - Required vs nullable fields are correct.
+  - Enum/status values are represented safely (enum or controlled constants).
+  - No silent fallback for required fields.
+  - Update `spec/model-registry.md` when adding/changing model.
 
 ### **Step 4: Logic & Binding**
 - Create the Controller/Bloc in `interactor/` (See [Bloc Skill](../skills/flutter-bloc-state-management/SKILL.md)).
@@ -174,9 +198,13 @@ Follow these steps when creating a new UI screen:
   - Use `AppColors` / `AppStyles`.
   - Use `App*` widgets.
   - Use `LocaleKey.my_key.tr` for text.
-- **Radius & Icon**:
+ - **Radius & Icon**:
   - If Figma requires radius = 14, **must** use `BorderRadius.circular(14)` at the corresponding component.
   - Icon 24×24; if framed, use container 40×40/44×44 per Figma.
+ - **Behavioral Correctness (STRICT)**:
+   - Implement and render all required states from Step 1 (loading/success/empty/error...).
+   - Avoid overflow on small width and long localization strings.
+   - UI must not depend on mock constants inside widget tree for production flow.
  - **Documentation Comments (STRICT)**:
    - Add top-of-class `///` description for every Page and Component, summarizing its purpose and main actions.
    - Generator reads these docs to build `spec/ui-workflow.md` (run `dart run tool/generate_ui_workflow_spec.dart`).
@@ -190,7 +218,7 @@ Follow these steps when creating a new UI screen:
      ```
 
 ### **Step 7: Component Extraction**
-- **Rule**: If a widget block is > 50 lines or reused twice, extract it to `components/` (See [Idiomatic Flutter Skill](../skills/idiomatic-flutter/SKILL.md)).
+- **Rule**: If a widget block is > 50 lines or reused twice, extract it to `components/` (See [Flutter UI Widgets Skill](../skills/flutter-ui-widgets/SKILL.md)).
 - Keep the main `build()` method clean and readable.
 
 ### **Step 8: Route Registration (Choose One)**
@@ -257,6 +285,14 @@ Follow these steps when creating a new UI screen:
 - [ ] Page broken down into `components/`?
 - [ ] Logic separated into `interactor/`?
 - [ ] **Data Models Separated?** (Request/Response in `core/model/`)
+- [ ] **Model Correctness Gate passed?** (required/nullable/enum/date/number mapping validated)
+- [ ] **No hidden fallback defaults for required fields?** (`fromJson` does not hide bad contract)
+- [ ] **Mapper Boundary respected?** (UI/Bloc does not parse raw JSON/Map)
+- [ ] **Model Registry Updated?** (`spec/model-registry.md` reflects new/changed models)
+- [ ] **UI Correctness Gate passed?** (loading/success/empty/error implemented and verified)
+- [ ] **Responsive check passed?** (320/390/430 widths)
+- [ ] **Accessibility text scale check passed?** (`1.0` and `1.3` no overflow/clipping)
+- [ ] **No debug overflow/error logs from layout?**
 - [ ] File naming matches `<feature>_<type>.dart`?
 - [ ] **Route Registered?**
   - [ ] If Full Screen: Added to `AppPages`?

package/templates/shared/tools/jsx2flutter/jsx2flutter.mjs

@@ -1,48 +1,20 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { createRequire } from 'node:module'
-import { fileURLToPath } from 'node:url'
 import { parse } from '@babel/parser'
 import traverseModule from '@babel/traverse'
 const traverse = traverseModule.default
 import postcss from 'postcss'
 import safeParser from 'postcss-safe-parser'
 
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
+const __dirname = path.dirname(new URL(import.meta.url).pathname)
 const require = createRequire(import.meta.url)
 let sass = null
 try {
   sass = require('sass')
 } catch {}
 
-function resolveProjectRoot() {
-  const fromCwd = process.cwd()
-  if (fs.existsSync(path.resolve(fromCwd, 'pubspec.yaml'))) {
-    return fromCwd
-  }
-  let current = __dirname
-  while (true) {
-    if (fs.existsSync(path.resolve(current, 'pubspec.yaml'))) {
-      return current
-    }
-    const parent = path.dirname(current)
-    if (parent === current) break
-    current = parent
-  }
-  return fromCwd
-}
-
-function readPackageName(projectRoot) {
-  const pubspecPath = path.resolve(projectRoot, 'pubspec.yaml')
-  if (!fs.existsSync(pubspecPath)) return 'app'
-  const content = fs.readFileSync(pubspecPath, 'utf8')
-  const matched = content.match(/^name:\s*([A-Za-z0-9_]+)/m)
-  return matched?.[1] || 'app'
-}
-
-const REPO_ROOT = resolveProjectRoot()
-const PROJECT_PACKAGE_NAME = readPackageName(REPO_ROOT)
+const REPO_ROOT = path.resolve(__dirname, '../..')
 const APP_ASSETS_FILE = path.resolve(REPO_ROOT, 'lib/src/utils/app_assets.dart')
 let ICONS_MAP = {}
 try {
@@ -745,6 +717,47 @@ function textAlignFromProps(props) {
   return null
 }
 
+function isInlineTextTag(tag) {
+  return tag === 'span' || tag === 'p'
+}
+
+function mergeTextStyles(baseStyle, ownStyle) {
+  if (baseStyle && ownStyle) return `(${baseStyle}).merge(${ownStyle})`
+  return ownStyle || baseStyle || null
+}
+
+function buildInlineTextSpans(el, cssMap, topClassName, skipRootDecoration, inheritedStyle = null) {
+  const className = getClassNameAttr(el)
+  const props = className && cssMap[className] ? cssMap[className] : {}
+  const style = mergeTextStyles(inheritedStyle, textStyleFromProps(props))
+  const spans = []
+  for (const c of el.children || []) {
+    if (isTextNode(c)) {
+      const text = c.value.trim()
+      if (!text) continue
+      const parts = [`text: ${toDartLiteral(text)}`]
+      if (style) parts.push(`style: ${style}`)
+      spans.push(`TextSpan(${parts.join(', ')})`)
+      continue
+    }
+    if (c.type !== 'JSXElement') continue
+    const childTag = jsxElementName(c).toLowerCase()
+    if (childTag === 'br') {
+      const parts = [`text: '\\n'`]
+      if (style) parts.push(`style: ${style}`)
+      spans.push(`TextSpan(${parts.join(', ')})`)
+      continue
+    }
+    if (isInlineTextTag(childTag)) {
+      spans.push(...buildInlineTextSpans(c, cssMap, topClassName, skipRootDecoration, style))
+      continue
+    }
+    const child = buildWidgetFromElement(c, cssMap, topClassName, skipRootDecoration)
+    spans.push(`WidgetSpan(child: ${child.widget})`)
+  }
+  return spans
+}
+
 function paddingFromProps(props) {
   const p = props['padding']
   const pt = props['padding-top']
@@ -881,15 +894,9 @@ function usesAppOwnedInputBackground(widget) {
   return normalized.startsWith('AppInput(') || normalized.startsWith('_GeneratedDateTimeField(')
 }
 
-function usesAppOwnedProgressBarBackground(widget) {
-  if (!widget) return false
-  const normalized = String(widget).trim()
-  return normalized.startsWith('AppProgressBar(')
-}
-
 function toDartLiteral(s) {
   const t = String(s || '')
-  return `'${t.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`
+  return `'${t.replace(/\\/g, '\\\\').replace(/\$/g, '\\$').replace(/'/g, "\\'")}'`
 }
 
 function isTextNode(node) {
@@ -1176,6 +1183,13 @@ function simplifySvgWidget(widget, size) {
   return `SizedBox(${width}${height}child: ${svgCall})`
 }
 
+function applySizeToWidget(widget, size) {
+  if (!size || (size.w == null && size.h == null)) return widget
+  const width = size.w != null ? `width: ${size.w}, ` : ''
+  const height = size.h != null ? `height: ${size.h}, ` : ''
+  return `SizedBox(${width}${height}child: ${widget})`
+}
+
 function shouldStripIconPositioning(size, position, rotate) {
   return (position != null || rotate != null) && isSmallIconSize(size)
 }
@@ -1297,92 +1311,6 @@ function buildRadioGroupWidgetFromElement(el, cssMap) {
   return `_GeneratedRadioGroup(${widgetArgs.join(', ')})`
 }
 
-function roundNumber(value, digits = 4) {
-  const factor = 10 ** digits
-  return Math.round(value * factor) / factor
-}
-
-function parsePaddingValues(props) {
-  const fromPadding = parseBoxValues(props['padding'])
-  if (fromPadding) return fromPadding
-  return {
-    top: cssPxToDouble(props['padding-top']) || 0,
-    right: cssPxToDouble(props['padding-right']) || 0,
-    bottom: cssPxToDouble(props['padding-bottom']) || 0,
-    left: cssPxToDouble(props['padding-left']) || 0,
-  }
-}
-
-function solidColorFromBackground(props) {
-  const bg = props['background-color'] || props['background']
-  if (!bg || /linear-gradient/i.test(String(bg))) return null
-  return cssColorToAppColor(bg)
-}
-
-function gradientOrSolidFromBackground(props) {
-  const bgSource = props['background-image'] || props['background']
-  if (bgSource && /linear-gradient/i.test(String(bgSource))) {
-    const gradient = parseLinearGradient(bgSource)
-    if (gradient) return gradient
-  }
-  const solid = solidColorFromBackground(props)
-  if (solid) return `LinearGradient(colors: [${solid}, ${solid}])`
-  return null
-}
-
-function buildProgressBarWidgetFromElement(el, cssMap) {
-  if (!el || !Array.isArray(el.children)) return null
-  const directElements = el.children.filter(c => c.type === 'JSXElement')
-  if (directElements.length !== 1) return null
-
-  const parentClass = getClassNameAttr(el)
-  const child = directElements[0]
-  const childClass = getClassNameAttr(child)
-  if (!parentClass || !childClass) return null
-
-  const parentProps = (cssMap && cssMap[parentClass]) ? cssMap[parentClass] : {}
-  const childProps = (cssMap && cssMap[childClass]) ? cssMap[childClass] : {}
-
-  const parentSize = normalizeGeneratedSize(sizeFromProps(parentProps))
-  const childSize = normalizeGeneratedSize(sizeFromProps(childProps))
-  if (childSize.w == null || childSize.h == null) return null
-
-  const hasProgressLikeBackground = !!solidColorFromBackground(parentProps)
-  const fillGradient = gradientOrSolidFromBackground(childProps)
-  if (!hasProgressLikeBackground || !fillGradient) return null
-
-  const padding = parsePaddingValues(parentProps)
-  let totalWidth = parentSize.w
-  if (totalWidth == null) {
-    const inferred = childSize.w + (padding.left || 0) + (padding.right || 0)
-    if (inferred > childSize.w) totalWidth = inferred
-  }
-  if (totalWidth == null || totalWidth <= 0) return null
-
-  let value = childSize.w / totalWidth
-  if (!Number.isFinite(value)) return null
-  if (value <= 0 || value > 1.05) return null
-  value = Math.max(0, Math.min(1, value))
-
-  const height = parentSize.h ?? childSize.h
-  if (height == null || height <= 0) return null
-
-  const backgroundColor = solidColorFromBackground(parentProps)
-  const radius = borderRadiusFromProps(parentProps) || borderRadiusFromProps(childProps)
-  const args = [
-    `value: ${roundNumber(value)}`,
-    `height: ${roundNumber(height, 2)}`,
-    `width: ${roundNumber(totalWidth, 2)}`,
-    `progressGradient: ${fillGradient}`,
-    'padding: 0',
-    'showDot: false',
-  ]
-  if (backgroundColor) args.push(`backgroundColor: ${backgroundColor}`)
-  if (radius) args.push(`borderRadius: ${radius}`)
-
-  return `AppProgressBar(${args.join(', ')})`
-}
-
 function wrapOverflowIfSized(body, size) {
   if (process.env.JSX2FLUTTER_ENABLE_OVERFLOW !== '1') return body
   if (!size || (!size.w && !size.h)) return body
@@ -1413,8 +1341,20 @@ function wrapOverflowIfSized(body, size) {
   return `OverflowBox(${overflowArgs.join(', ')}, child: ${body})`
 }
 
+function unwrapDirectFlexWidget(widgetExpr) {
+  let current = String(widgetExpr || '').trim()
+  while (/^(?:const\s+)?(?:Expanded|Flexible)\s*\(/.test(current)) {
+    const wrapperMatch = current.match(/^(?:const\s+)?(?:Expanded|Flexible)\s*\(([\s\S]*)\)$/)
+    if (!wrapperMatch) break
+    const childMatch = wrapperMatch[1].match(/\bchild:\s*([\s\S]+)$/)
+    if (!childMatch) break
+    current = childMatch[1].trim()
+  }
+  return current
+}
+
 function buildGeneratedRippleButton(titleExpr) {
-  return `RippleButton(title: ${titleExpr}, backgroundColor: Colors.transparent, minWidth: 0, padding: EdgeInsets.zero, onTap: () {})`
+  return `RippleButton(title: ${titleExpr}, backgroundColor: Colors.transparent,minWidth : 0, padding: EdgeInsets.zero, onTap: () {})`
 }
 
 function buildWidgetFromElement(el, cssMap, topClassName, skipRootDecoration) {
@@ -1469,12 +1409,6 @@ function buildWidgetFromElement(el, cssMap, topClassName, skipRootDecoration) {
         semanticWidget = radioGroupWidget
       }
     }
-    if (!semanticWidget) {
-      const progressBarWidget = buildProgressBarWidgetFromElement(el, cssMap)
-      if (progressBarWidget) {
-        semanticWidget = progressBarWidget
-      }
-    }
     if (!semanticWidget && looksLikeButtonClass(className)) {
       const buttonLabel = uniqueTexts(extractTextsFromElement(el, [])).find(Boolean)
       if (buttonLabel) {
@@ -1525,7 +1459,8 @@ function buildWidgetFromElement(el, cssMap, topClassName, skipRootDecoration) {
     const src = getAttr(el, 'src') || ''
     if (/^https?:\/\//.test(src)) {
       const widget = `Image.network(${toDartLiteral(src)}, fit: BoxFit.cover)`
-      return { widget: rotate != null ? `Transform.rotate(angle: ${rotate}, child: ${widget})` : widget, isAbsolute: !!position, position, zIndex, flexGrow, size }
+      const sized = applySizeToWidget(widget, size)
+      return { widget: rotate != null ? `Transform.rotate(angle: ${rotate}, child: ${sized})` : sized, isAbsolute: !!position, position, zIndex, flexGrow, size }
     }
     const local = resolveLocalAsset(src, className)
     if (local) {
@@ -1538,7 +1473,8 @@ function buildWidgetFromElement(el, cssMap, topClassName, skipRootDecoration) {
         const finalWidget = (rotate != null && !stripPlacement) ? `Transform.rotate(angle: ${rotate}, child: ${simplified})` : simplified
         return { widget: finalWidget, isAbsolute: stripPlacement ? false : !!position, position: stripPlacement ? null : position, zIndex, flexGrow, size }
       }
-      return { widget: rotate != null ? `Transform.rotate(angle: ${rotate}, child: ${widget})` : widget, isAbsolute: !!position, position, zIndex, flexGrow, size }
+      const sized = applySizeToWidget(widget, size)
+      return { widget: rotate != null ? `Transform.rotate(angle: ${rotate}, child: ${sized})` : sized, isAbsolute: !!position, position, zIndex, flexGrow, size }
     }
     const asset = assetForClassName(className)
     if (asset) {
@@ -1561,12 +1497,10 @@ function buildWidgetFromElement(el, cssMap, topClassName, skipRootDecoration) {
     return { widget: rotate != null ? `Transform.rotate(angle: ${rotate}, child: ${widget})` : widget, isAbsolute: !!position, position, zIndex, flexGrow, size }
   }
   if (tag === 'span' || tag === 'p') {
-    if (children.length === 1) {
-      const widget = children[0].widget
-      return { widget: rotate != null ? `Transform.rotate(angle: ${rotate}, child: ${widget})` : widget, isAbsolute: !!position, position, zIndex, flexGrow, size }
-    }
-    const widget = children.length
-      ? `Row(children: [${children.map(c => c.widget).join(', ')}])`
+    const align = textAlignFromProps(props)
+    const spans = buildInlineTextSpans(el, cssMap, topClassName, skipRootDecoration)
+    const widget = spans.length
+      ? `RichText(text: TextSpan(children: [${spans.join(', ')}])${align ? `, textAlign: ${align}` : ''})`
       : 'SizedBox.shrink()'
     return { widget: rotate != null ? `Transform.rotate(angle: ${rotate}, child: ${widget})` : widget, isAbsolute: !!position, position, zIndex, flexGrow, size }
   }
@@ -1575,27 +1509,24 @@ function buildWidgetFromElement(el, cssMap, topClassName, skipRootDecoration) {
   const flowKids = semanticWidget ? [] : children.filter(c => !c.isAbsolute)
   const absKids = semanticWidget ? [] : children.filter(c => c.isAbsolute).sort((a, b) => (a.zIndex || 0) - (b.zIndex || 0))
   const inputOwnedWidget = usesAppOwnedInputBackground(semanticWidget)
-  const progressBarOwnedWidget = usesAppOwnedProgressBarBackground(semanticWidget)
   const wrappedInputOwnedWidget = !semanticWidget && flowKids.length === 1 && usesAppOwnedInputBackground(flowKids[0].widget)
-  const wrappedProgressBarOwnedWidget = !semanticWidget && flowKids.length === 1 && usesAppOwnedProgressBarBackground(flowKids[0].widget)
   const appOwnedInputWidget = inputOwnedWidget || wrappedInputOwnedWidget
-  const appOwnedProgressBarWidget = progressBarOwnedWidget || wrappedProgressBarOwnedWidget
-  const appOwnedStyledWidget = appOwnedInputWidget || appOwnedProgressBarWidget
-  const omitBackgroundColor = appOwnedStyledWidget
+  const omitBackgroundColor = appOwnedInputWidget
   const decoration = (skipRootDecoration && className === topClassName)
     ? null
     : boxDecorationFromProps(props, { omitBackgroundColor })
-  const effectivePadding = appOwnedStyledWidget ? null : padding
-  const effectiveDecoration = appOwnedStyledWidget ? null : decoration
+  const effectivePadding = appOwnedInputWidget ? null : padding
+  const effectiveDecoration = appOwnedInputWidget ? null : decoration
   const layoutSize = (appOwnedInputWidget && size) ? { ...size, h: null } : size
   const flex = flexConfigFromProps(props)
   let flowBody = semanticWidget
   if (!flowBody && flowKids.length) {
     if (flex) {
+      const isScrollableRoot = className === topClassName && process.env.JSX2FLUTTER_MODE !== 'classic'
       const alignSelf = String(props['align-self'] || '').toLowerCase()
-      const hasMainAxisSize = flex.isRow
+      const hasMainAxisSize = !isScrollableRoot && (flex.isRow
         ? (layoutSize.w != null || alignSelf === 'stretch')
-        : (layoutSize.h != null)
+        : (layoutSize.h != null))
       const gapLiteral = flex.gap ? (flex.isRow ? `${flex.gap}.width` : `${flex.gap}.height`) : null
       const baseKids = flowKids.map(c => {
         if (flex && c.flexGrow > 0 && hasMainAxisSize) {
@@ -1727,6 +1658,7 @@ function generateDart(ast, cssMap, outClassName, outPath) {
   const rootDeco = boxDecorationFromProps(rootProps)
   const mode = process.env.JSX2FLUTTER_MODE
   let inner = rootWidget?.widget || 'const SizedBox.shrink()'
+  inner = unwrapDirectFlexWidget(inner)
   let finalRoot
   if (mode === 'classic') {
     finalRoot = inner
@@ -1752,35 +1684,31 @@ function generateDart(ast, cssMap, outClassName, outPath) {
   const usesCheckbox = finalRoot.includes('_GeneratedCheckbox(') || finalRoot.includes('AppCheckbox(')
   const usesRippleButton = finalRoot.includes('RippleButton(')
   const usesTextGradient = finalRoot.includes('AppTextGradient(')
-  const usesProgressBar = finalRoot.includes('AppProgressBar(')
   const usesGetWidth = finalRoot.includes('Get.width')
   const imports = [
     "import 'package:flutter/material.dart';",
-    `import 'package:${PROJECT_PACKAGE_NAME}/src/utils/app_colors.dart';`,
-    `import 'package:${PROJECT_PACKAGE_NAME}/src/extensions/int_extensions.dart';`,
+    "import 'package:link_home/src/utils/app_colors.dart';",
+    "import 'package:link_home/src/extensions/int_extensions.dart';",
     "import 'package:flutter_svg/flutter_svg.dart';",
-    `import 'package:${PROJECT_PACKAGE_NAME}/src/utils/app_assets.dart';`,
+    "import 'package:link_home/src/utils/app_assets.dart';",
   ]
   if (usesInput) {
-    imports.push(`import 'package:${PROJECT_PACKAGE_NAME}/src/ui/widgets/app_input.dart';`)
+    imports.push("import 'package:link_home/src/ui/widgets/app_input.dart';")
   }
   if (usesDateTimeField) {
-    imports.push(`import 'package:${PROJECT_PACKAGE_NAME}/src/ui/widgets/app_input_full_time.dart';`)
+    imports.push("import 'package:link_home/src/ui/widgets/app_input_full_time.dart';")
   }
   if (usesRadio) {
-    imports.push(`import 'package:${PROJECT_PACKAGE_NAME}/src/ui/widgets/app_radio_button.dart';`)
+    imports.push("import 'package:link_home/src/ui/widgets/app_radio_button.dart';")
   }
   if (usesCheckbox) {
-    imports.push(`import 'package:${PROJECT_PACKAGE_NAME}/src/ui/widgets/base/checkbox/app_checkbox.dart';`)
+    imports.push("import 'package:link_home/src/ui/widgets/base/checkbox/app_checkbox.dart';")
   }
   if (usesRippleButton) {
-    imports.push(`import 'package:${PROJECT_PACKAGE_NAME}/src/ui/widgets/base/ripple_button.dart';`)
+    imports.push("import 'package:link_home/src/ui/widgets/base/ripple_button.dart';")
   }
   if (usesTextGradient) {
-    imports.push(`import 'package:${PROJECT_PACKAGE_NAME}/src/ui/widgets/app_text_gradient.dart';`)
-  }
-  if (usesProgressBar) {
-    imports.push(`import 'package:${PROJECT_PACKAGE_NAME}/src/ui/widgets/app_progressbar.dart';`)
+    imports.push("import 'package:link_home/src/ui/widgets/app_text_gradient.dart';")
   }
   if (usesGetWidth) {
     imports.push("import 'package:get/get.dart';")