diff --git a/.github/badges/api-coverage.svg b/.github/badges/api-coverage.svg
index c3cb4a9..c22654b 100644
--- a/.github/badges/api-coverage.svg
+++ b/.github/badges/api-coverage.svg
@@ -1,14 +1,14 @@
-<svg width="118.9" height="20" viewBox="0 0 1189 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="API coverage: 78%">
-  <title>API coverage: 78%</title>
+<svg width="118.9" height="20" viewBox="0 0 1189 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="API coverage: 81%">
+  <title>API coverage: 81%</title>
   <g>
     <rect fill="#555" width="829" height="200"/>
-    <rect fill="#08C" x="829" width="360" height="200"/>
+    <rect fill="#3C1" x="829" width="360" height="200"/>
   </g>
   <g aria-hidden="true" fill="#fff" text-anchor="start" font-family="Verdana,DejaVu Sans,sans-serif" font-size="110">
     <text x="60" y="148" textLength="729" fill="#000" opacity="0.1">API coverage</text>
     <text x="50" y="138" textLength="729">API coverage</text>
-    <text x="884" y="148" textLength="260" fill="#000" opacity="0.1">78%</text>
-    <text x="874" y="138" textLength="260">78%</text>
+    <text x="884" y="148" textLength="260" fill="#000" opacity="0.1">81%</text>
+    <text x="874" y="138" textLength="260">81%</text>
   </g>
   
 </svg>
\ No newline at end of file
diff --git a/.github/badges/api-types.svg b/.github/badges/api-types.svg
index 1933772..e9afafa 100644
--- a/.github/badges/api-types.svg
+++ b/.github/badges/api-types.svg
@@ -1,14 +1,14 @@
-<svg width="164.28" height="24" viewBox="0 0 1369 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="types: 137/180 (76%)">
-  <title>types: 137/180 (76%)</title>
+<svg width="164.28" height="24" viewBox="0 0 1369 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="types: 166/180 (92%)">
+  <title>types: 166/180 (92%)</title>
   <g>
     <rect fill="#555" width="400" height="200"/>
-    <rect fill="#08C" x="400" width="969" height="200"/>
+    <rect fill="#3C1" x="400" width="969" height="200"/>
   </g>
   <g aria-hidden="true" fill="#fff" text-anchor="start" font-family="Verdana,DejaVu Sans,sans-serif" font-size="110">
     <text x="60" y="148" textLength="300" fill="#000" opacity="0.1">types</text>
     <text x="50" y="138" textLength="300">types</text>
-    <text x="455" y="148" textLength="869" fill="#000" opacity="0.1">137/180 (76%)</text>
-    <text x="445" y="138" textLength="869">137/180 (76%)</text>
+    <text x="455" y="148" textLength="869" fill="#000" opacity="0.1">166/180 (92%)</text>
+    <text x="445" y="138" textLength="869">166/180 (92%)</text>
   </g>
   
 </svg>
\ No newline at end of file
diff --git a/.github/badges/coverage.svg b/.github/badges/coverage.svg
index 1676d0b..03b8d7f 100644
--- a/.github/badges/coverage.svg
+++ b/.github/badges/coverage.svg
@@ -1,20 +1,20 @@
-<svg width="132.1" height="20" viewBox="0 0 1321 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="test coverage: 87.3%">
-  <title>test coverage: 87.3%</title>
-  <linearGradient id="WCZDX" x2="0" y2="100%">
+<svg width="132.1" height="20" viewBox="0 0 1321 200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="test coverage: 87.8%">
+  <title>test coverage: 87.8%</title>
+  <linearGradient id="dqeIX" x2="0" y2="100%">
     <stop offset="0" stop-opacity=".1" stop-color="#EEE"/>
     <stop offset="1" stop-opacity=".1"/>
   </linearGradient>
-  <mask id="HSqDs"><rect width="1321" height="200" rx="30" fill="#FFF"/></mask>
-  <g mask="url(#HSqDs)">
+  <mask id="ekkyI"><rect width="1321" height="200" rx="30" fill="#FFF"/></mask>
+  <g mask="url(#ekkyI)">
     <rect width="851" height="200" fill="#555"/>
     <rect width="470" height="200" fill="#3C1" x="851"/>
-    <rect width="1321" height="200" fill="url(#WCZDX)"/>
+    <rect width="1321" height="200" fill="url(#dqeIX)"/>
   </g>
   <g aria-hidden="true" fill="#fff" text-anchor="start" font-family="Verdana,DejaVu Sans,sans-serif" font-size="110">
     <text x="60" y="148" textLength="751" fill="#000" opacity="0.25">test coverage</text>
     <text x="50" y="138" textLength="751">test coverage</text>
-    <text x="906" y="148" textLength="370" fill="#000" opacity="0.25">87.3%</text>
-    <text x="896" y="138" textLength="370">87.3%</text>
+    <text x="906" y="148" textLength="370" fill="#000" opacity="0.25">87.8%</text>
+    <text x="896" y="138" textLength="370">87.8%</text>
   </g>
   
 </svg>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6670613..20f3af4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,49 @@
 # Change Log
 
-## [0.9.2] - 2026-03-05 - Gradient Fill, Matrix Inverse, Array Optimizations & Plot Fixes
+## [0.9.3] - 2026-03-06 - Streaming Support, request.security Fixes, Transpiler Robustness
 
 ### Added
 
-- **Gradient Fill (`fill()`)**: Added support for Pine Script's gradient fill signature — `fill(plot1, plot2, top_value, bottom_value, top_color, bottom_color)`. The `FillHelper` now detects the gradient form by checking whether the third argument is a number (gradient) or a string/color (simple fill), and stores per-bar `top_value`/`bottom_value`/`top_color`/`bottom_color` data for rendering.
+- **`array.new_box` / `new_label` / `new_line` / `new_linefill` / `new_table` / `new_color`**: Added the six missing typed array factory methods so `array<box>`, `array<label>`, etc. can be created with a proper element type. The auto-generator (`scripts/generate-array-index.js`) now lists them as static factory functions (called with context) rather than instance delegates. `isValueOfType` in `array/utils.ts` was extended to accept object values for these types, allowing `array.push(label.new(...))` on typed arrays.
+- **`request.security` — Live Streaming Support**: `request.security` now correctly handles live (streaming) bar updates. The secondary context is re-evaluated on each tick, and `findSecContextIdx` resolves the correct intra-bar index for the current live bar. Paired with drawing-object rollback (see below), streaming ticks no longer produce duplicate drawing objects.
+- **`str.tostring` Format Patterns**: Added support for Pine Script's named and pattern-based format strings: `"#"`, `"#.#"`, `"#.##"`, `"0.00"`, and the `format.*` named constants. The formatter now applies these patterns before falling back to `toString()`.
 
 ### Fixed
 
-- **`matrix.inv()` — Full NxN Support**: Rewrote `matrix.inv()` from a 2×2-only implementation to a general Gauss-Jordan elimination with partial pivoting, supporting any square matrix of arbitrary size. Singular matrices (pivot < 1e-14) correctly return a NaN matrix.
-- **`matrix.pinv()` — Real Pseudoinverse**: Rewrote `matrix.pinv()` from a placeholder stub to a correct Moore-Penrose pseudoinverse: square matrices use `inv()`, tall matrices (m > n) use `(AᵀA)⁻¹Aᵀ`, and wide matrices (m < n) use `Aᵀ(AAᵀ)⁻¹`.
-- **`array.min()` / `array.max()` Performance**: Added an O(N) fast path for the common `nth=0` case (find absolute min/max) instead of always sorting the full array O(N log N). Sorting is still used only when `nth > 0`.
-- **`array.median()` Performance**: Replaced the `for...of` copy + complex sort comparator with a direct index loop and simple numeric sort for faster execution.
-- **`array.percentile_linear_interpolation()` Performance**: Validate and copy the array in a single pass (eliminating the separate `validValues` allocation), then sort once.
-- **`array.percentile_nearest_rank()` Performance**: Same single-pass validate-and-copy optimization as `percentile_linear_interpolation`.
-- **`isPlot()` with Undefined Title**: Fixed the `isPlot()` helper check to accept plots that have no `title` property but do have a `_plotKey` property (e.g., plots created via `fill()` or accessed by callsite ID). Previously these were not recognised as plot objects, causing `fill()` to misidentify its arguments (contribution by @dcaoyuan, [#142](https://github.com/QuantForgeOrg/PineTS/issues/142)).
+- **While-Loop Test Condition Hoisting** (infinite-loop crash): `array.size()` and similar calls in a `while` condition were being hoisted to a temp variable *outside* the loop by the default CallExpression walker, making them one-shot evaluations and causing an infinite loop followed by a crash. `MainTransformer` now registers a `WhileStatement` handler and `transformWhileStatement` was rewritten to use a recursive walker with hoisting suppressed throughout the entire test condition.
+- **Array Pattern Scoping Crash**: `isArrayPatternVar` was determined using a global (non-scoped) set in `ScopeManager`. A local function variable whose name happened to match an outer-scope destructured tuple element was falsely treated as an array pattern, causing a runtime crash. Fixed by adding a shape guard: the flag is only set when `decl.init` is a computed `MemberExpression` (the `_tmp_0[0]` pattern produced by the AnalysisPass destructuring rewrite).
+- **For-Loop Namespace Wrapping** (`math.min` → `$.get(math, 0).min`): In the for-loop test condition walker, `MemberExpression` nodes unconditionally recursed into their object, causing the `Identifier` handler to wrap context-bound namespace objects (`math`, `array`, `ta`, …) with `$.get()`. Fixed by skipping recursion and `addArrayAccess` for identifiers that are the object of a `MemberExpression` and are context-bound namespaces.
+- **`request.security` Cross-Timeframe Value Alignment**: `barmerge.gaps_off` / `barmerge.lookahead_off` were passed as strings; their truthiness caused `findLTFContextIdx` to take the wrong branch (returning the first intra-bar instead of the last). Fixed by converting barmerge string enums to booleans. Added `normalizeTimeframe()` to map non-canonical formats (`'1h'`→`'60'`, `'1d'`→`'D'`) so `isLTF` determination is correct. Fixed secondary context date-range derivation to use `effectiveSDate` from `marketData` and extend `secEDate` to cover the last bar's intra-bars.
+- **`barmerge` Missing from `CONTEXT_BOUND_VARS`**: `barmerge.gaps_off` / `barmerge.lookahead_off` (used in `request.security()`) were not in the transpiler's context-bound list, so they were left as bare identifiers instead of being mapped to the runtime context. Added `'barmerge'` to `settings.ts`.
+- **`barstate.isconfirmed` Wrong Bar**: Was checking whether the last bar's close time equalled the session close via `closeTime[length-1]` (always the last bar in history) instead of the currently-executing bar. Fixed to use `closeTime.data[context.idx]` for correct per-bar evaluation.
+- **`array.get()` Out-of-Bounds → NaN**: `array.get(arr, -1)` and other out-of-bounds accesses returned `undefined` (native JS), causing crashes when Pine Script code accessed properties (e.g., `.strength`) on the result. The method now returns `NaN` (Pine's `na`) for negative or out-of-range indices.
+- **Drawing Helpers — `na` Color Resolution**: Drawing object helpers' `_resolve()` method now detects `NAHelper` instances and returns `NaN`, fixing cases where `border_color=na` (and similar `na` arguments) were silently ignored in `box.new()`, `line.new()`, etc. `BoxHelper` also gains a dedicated `_resolveColor()` that preserves `NaN` instead of letting it fall through an `||` fallback to the default color.
+- **Streaming Rollback for Drawing Objects**: All five drawing types (`box`, `line`, `label`, `linefill`, `polyline`) now track a `_createdAtBar` property and expose a `rollbackFromBar(barIndex)` method. `Context.rollbackDrawings()` calls this during `_runPaginated` / `updateTail` to remove any drawing objects created on the current streaming bar before re-running it, preventing duplicate objects from accumulating across live ticks.
+
+---
+
+## [0.9.2] - 2026-03-06 - Drawing Object Method Syntax, Gradient Fill, Matrix & Array Improvements
+
+### Added
+
+- **Method-Call Syntax on Drawing Instances**: `LineObject`, `LabelObject`, and `BoxObject` now carry delegate setter/getter methods directly on the instance (e.g., `myLine.set_x2(x)`, `myBox.set_right(r)`, `myLabel.set_text(t)`). Each delegate forwards to the owning helper so the plot sync (`_syncToPlot`) fires correctly. Enables Pine Script patterns where drawing objects stored in UDTs or arrays are mutated via method syntax.
+- **Gradient Fill (`fill()`)**: Added support for Pine Script's gradient fill signature — `fill(plot1, plot2, top_value, bottom_value, top_color, bottom_color)`. The `FillHelper` detects the gradient form (third argument is a number) and stores per-bar `top_value`/`bottom_value`/`top_color`/`bottom_color` data for the renderer.
+- **Typed Generic Function Parameters**: The Pine Script parser now correctly handles generic type annotations in function parameter lists (e.g., `array<float> src`, `map<string, float> data`). Previously these caused parse errors.
+
+### Fixed
+
+- **UDT Thunk Resolution for Drawing Object Fields**: When a `var` UDT instance contains fields initialised with factory calls (e.g., `line.new(...)`, `box.new(...)`), those fields are now correctly resolved as thunks on bar 0 inside `initVar`. Previously the thunk-wrapped factory results were stored as raw functions in the UDT field, causing the drawing object to never be created.
+- **Typed Array Type Inference for Object Types**: `inferValueType()` no longer throws `"Cannot infer type from value"` when called with an object (e.g., a `LineObject` or `BoxObject`). It now returns `PineArrayType.any`, allowing `array<line>` and similar typed arrays to work correctly.
+- **Non-Computed Namespace Property Access in `$.param()`**: Fixed `ExpressionTransformer` incorrectly wrapping namespace constant accesses (e.g., `label.style_label_down`, `line.style_dashed`) in `$.get()` calls when they appeared inside function arguments. The transformer now detects non-computed member access on `NAMESPACES_LIKE` identifiers and leaves them untransformed.
+- **`histbase` Type in `PlotOptions`**: Fixed the `histbase` field in the `PlotOptions` TypeScript type from `boolean` to `number`, matching the actual Pine Script `plot(histbase=50)` signature.
+- **For-Loop `MemberExpression` Recursion**: Fixed user variable identifiers inside method calls in `for` loops (e.g., `lineMatrix.rows()`) not being transformed. The `MemberExpression` visitor in `transformForStatement` now recurses into the object node after transformation so nested identifiers are correctly resolved.
+- **Multiline `and` / Comparison Expressions**: Fixed the Pine Script parser dropping continuation lines in `and`/`&&` chains and comparison expressions spanning multiple lines. `skipNewlines(true)` is now called after the operator.
+- **`matrix.inv()` — Full NxN Support**: Rewrote `matrix.inv()` from a 2×2-only implementation to Gauss-Jordan elimination with partial pivoting, supporting any square matrix. Singular matrices (pivot < 1e-14) return a NaN matrix.
+- **`matrix.pinv()` — Real Pseudoinverse**: Rewrote `matrix.pinv()` from a placeholder stub to a correct Moore-Penrose pseudoinverse: square → `inv()`, tall (m > n) → `(AᵀA)⁻¹Aᵀ`, wide (m < n) → `Aᵀ(AAᵀ)⁻¹`.
+- **`array.min()` / `array.max()` Performance**: Added an O(N) fast path for the common `nth=0` case instead of always sorting O(N log N).
+- **`array.median()`, `percentile_linear_interpolation()`, `percentile_nearest_rank()` Performance**: Single-pass copy-and-validate optimizations.
+- **`isPlot()` with Undefined Title**: Fixed `isPlot()` to accept plot objects that have `_plotKey` but no `title` property (e.g., fill plots created via callsite ID), preventing `fill()` from misidentifying its arguments (contribution by @dcaoyuan, [#142](https://github.com/QuantForgeOrg/PineTS/issues/142)).
+- **Duplicate `map` in `CONTEXT_PINE_VARS`**: Removed an accidental duplicate `'map'` entry from `settings.ts`.
 
 ## [0.9.1] - 2026-03-04 - Enum Values, ATR/DMI/Supertrend Fixes, UDT & Transpiler Improvements
 
diff --git a/docs/api-coverage/pinescript-v6/types.json b/docs/api-coverage/pinescript-v6/types.json
index 56cede3..c5ab518 100644
--- a/docs/api-coverage/pinescript-v6/types.json
+++ b/docs/api-coverage/pinescript-v6/types.json
@@ -31,10 +31,10 @@
         "backadjustment.on": true
     },
     "barmerge": {
-        "barmerge.gaps_off": false,
-        "barmerge.gaps_on": false,
-        "barmerge.lookahead_off": false,
-        "barmerge.lookahead_on": false
+        "barmerge.gaps_off": true,
+        "barmerge.gaps_on": true,
+        "barmerge.lookahead_off": true,
+        "barmerge.lookahead_on": true
     },
     "currency": {
         "currency.AED": true,
@@ -113,14 +113,14 @@
         "display.status_line": true
     },
     "extend": {
-        "extend.both": false,
-        "extend.left": false,
-        "extend.none": false,
-        "extend.right": false
+        "extend.both": true,
+        "extend.left": true,
+        "extend.none": true,
+        "extend.right": true
     },
     "font": {
-        "font.family_default": false,
-        "font.family_monospace": false
+        "font.family_default": true,
+        "font.family_monospace": true
     },
     "format": {
         "format.inherit": true,
@@ -162,15 +162,15 @@
         "plot.style_steplinebr": true
     },
     "position": {
-        "position.bottom_center": false,
-        "position.bottom_left": false,
-        "position.bottom_right": false,
-        "position.middle_center": false,
-        "position.middle_left": false,
-        "position.middle_right": false,
-        "position.top_center": false,
-        "position.top_left": false,
-        "position.top_right": false
+        "position.bottom_center": true,
+        "position.bottom_left": true,
+        "position.bottom_right": true,
+        "position.middle_center": true,
+        "position.middle_left": true,
+        "position.middle_right": true,
+        "position.top_center": true,
+        "position.top_left": true,
+        "position.top_right": true
     },
     "scale": {
         "scale.left": false,
@@ -210,23 +210,23 @@
     },
     "text": {
         "text.align_bottom": false,
-        "text.align_center": false,
-        "text.align_left": false,
-        "text.align_right": false,
+        "text.align_center": true,
+        "text.align_left": true,
+        "text.align_right": true,
         "text.align_top": false,
         "text.format_bold": false,
         "text.format_italic": false,
         "text.format_none": false,
-        "text.wrap_auto": false,
-        "text.wrap_none": false
+        "text.wrap_auto": true,
+        "text.wrap_none": true
     },
     "xloc": {
-        "xloc.bar_index": false,
-        "xloc.bar_time": false
+        "xloc.bar_index": true,
+        "xloc.bar_time": true
     },
     "yloc": {
-        "yloc.abovebar": false,
-        "yloc.belowbar": false,
-        "yloc.price": false
+        "yloc.abovebar": true,
+        "yloc.belowbar": true,
+        "yloc.price": true
     }
 }
diff --git a/docs/api-coverage/types.md b/docs/api-coverage/types.md
index 3d054ca..8a30116 100644
--- a/docs/api-coverage/types.md
+++ b/docs/api-coverage/types.md
@@ -95,17 +95,17 @@ parent: API Coverage
 
 | Function       | Status | Description  |
 | -------------- | ------ | ------------ |
-| `extend.both`  |        | Extend both  |
-| `extend.left`  |        | Extend left  |
-| `extend.none`  |        | Extend none  |
-| `extend.right` |        | Extend right |
+| `extend.both`  | ✅     | Extend both  |
+| `extend.left`  | ✅     | Extend left  |
+| `extend.none`  | ✅     | Extend none  |
+| `extend.right` | ✅     | Extend right |
 
 ### Font
 
 | Function                | Status | Description           |
 | ----------------------- | ------ | --------------------- |
-| `font.family_default`   |        | Default font family   |
-| `font.family_monospace` |        | Monospace font family |
+| `font.family_default`   | ✅     | Default font family   |
+| `font.family_monospace` | ✅     | Monospace font family |
 
 ### Format
 
@@ -165,15 +165,15 @@ parent: API Coverage
 
 | Function                 | Status | Description            |
 | ------------------------ | ------ | ---------------------- |
-| `position.bottom_center` |        | Bottom center position |
-| `position.bottom_left`   |        | Bottom left position   |
-| `position.bottom_right`  |        | Bottom right position  |
-| `position.middle_center` |        | Middle center position |
-| `position.middle_left`   |        | Middle left position   |
-| `position.middle_right`  |        | Middle right position  |
-| `position.top_center`    |        | Top center position    |
-| `position.top_left`      |        | Top left position      |
-| `position.top_right`     |        | Top right position     |
+| `position.bottom_center` | ✅     | Bottom center position |
+| `position.bottom_left`   | ✅     | Bottom left position   |
+| `position.bottom_right`  | ✅     | Bottom right position  |
+| `position.middle_center` | ✅     | Middle center position |
+| `position.middle_left`   | ✅     | Middle left position   |
+| `position.middle_right`  | ✅     | Middle right position  |
+| `position.top_center`    | ✅     | Top center position    |
+| `position.top_left`      | ✅     | Top left position      |
+| `position.top_right`     | ✅     | Top right position     |
 
 ### Scale
 
@@ -231,30 +231,30 @@ parent: API Coverage
 | Function             | Status | Description           |
 | -------------------- | ------ | --------------------- |
 | `text.align_bottom`  |        | Bottom text alignment |
-| `text.align_center`  |        | Center text alignment |
-| `text.align_left`    |        | Left text alignment   |
-| `text.align_right`   |        | Right text alignment  |
+| `text.align_center`  | ✅     | Center text alignment |
+| `text.align_left`    | ✅     | Left text alignment   |
+| `text.align_right`   | ✅     | Right text alignment  |
 | `text.align_top`     |        | Top text alignment    |
 | `text.format_bold`   |        | Bold text format      |
 | `text.format_italic` |        | Italic text format    |
 | `text.format_none`   |        | No text format        |
-| `text.wrap_auto`     |        | Auto text wrap        |
-| `text.wrap_none`     |        | No text wrap          |
+| `text.wrap_auto`     | ✅     | Auto text wrap        |
+| `text.wrap_none`     | ✅     | No text wrap          |
 
 ### Xloc
 
 | Function         | Status | Description          |
 | ---------------- | ------ | -------------------- |
-| `xloc.bar_index` |        | Bar index x-location |
-| `xloc.bar_time`  |        | Bar time x-location  |
+| `xloc.bar_index` | ✅     | Bar index x-location |
+| `xloc.bar_time`  | ✅     | Bar time x-location  |
 
 ### Yloc
 
 | Function        | Status | Description          |
 | --------------- | ------ | -------------------- |
-| `yloc.abovebar` |        | Above bar y-location |
-| `yloc.belowbar` |        | Below bar y-location |
-| `yloc.price`    |        | Price y-location     |
+| `yloc.abovebar` | ✅     | Above bar y-location |
+| `yloc.belowbar` | ✅     | Below bar y-location |
+| `yloc.price`    | ✅     | Price y-location     |
 
 ### Dividends
 
@@ -306,7 +306,7 @@ parent: API Coverage
 
 | Function                 | Status | Description   |
 | ------------------------ | ------ | ------------- |
-| `barmerge.gaps_off`      |        | Gaps off      |
-| `barmerge.gaps_on`       |        | Gaps on       |
-| `barmerge.lookahead_off` |        | Lookahead off |
-| `barmerge.lookahead_on`  |        | Lookahead on  |
+| `barmerge.gaps_off`      | ✅     | Gaps off      |
+| `barmerge.gaps_on`       | ✅     | Gaps on       |
+| `barmerge.lookahead_off` | ✅     | Lookahead off |
+| `barmerge.lookahead_on`  | ✅     | Lookahead on  |
diff --git a/package.json b/package.json
index 93ff9b1..e345514 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pinets",
-    "version": "0.9.2",
+    "version": "0.9.3",
     "description": "Run Pine Script anywhere. PineTS is an open-source transpiler and runtime that brings Pine Script logic to Node.js and the browser with 1:1 syntax compatibility. Reliably write, port, and run indicators or strategies on your own infrastructure.",
     "keywords": [
         "Pine Script",
diff --git a/scripts/generate-array-index.js b/scripts/generate-array-index.js
index d9abe31..d4dbe92 100644
--- a/scripts/generate-array-index.js
+++ b/scripts/generate-array-index.js
@@ -33,7 +33,7 @@ async function generateIndex() {
                 return name === 'new' ? { file: name, export: 'new_fn', classProp: 'new' } : { file: name, export: name, classProp: name };
             });
 
-        const staticMethods = ['new', 'new_bool', 'new_float', 'new_int', 'new_string', 'from', 'param'];
+        const staticMethods = ['new', 'new_bool', 'new_box', 'new_color', 'new_float', 'new_int', 'new_label', 'new_line', 'new_linefill', 'new_string', 'new_table', 'from', 'param'];
 
         // --- Generate PineArrayObject.ts ---
         const objectMethods = methods.filter((m) => !staticMethods.includes(m.classProp));
diff --git a/src/Context.class.ts b/src/Context.class.ts
index 0f157d2..5405567 100644
--- a/src/Context.class.ts
+++ b/src/Context.class.ts
@@ -12,6 +12,7 @@ import { Input } from './namespaces/input/input.index';
 import PineMath from './namespaces/math/math.index';
 import { PineRequest } from './namespaces/request/request.index';
 import TechnicalAnalysis from './namespaces/ta/ta.index';
+import { PineTypeObject } from './namespaces/PineTypeObject';
 import { Series } from './Series';
 import { Log } from './namespaces/Log';
 import { Str } from './namespaces/Str';
@@ -44,12 +45,16 @@ export class Context {
     public cache: any = {};
     public taState: any = {}; // State for incremental TA calculations
     public isSecondaryContext: boolean = false; // Flag to prevent infinite recursion in request.security
+    public dataVersion: number = 0; // Incremented when market data changes (streaming mode)
 
     public NA: any = NaN;
 
     public lang: any;
     public length: number = 0;
 
+    /** References to drawing helpers for streaming rollback */
+    public _drawingHelpers: { rollbackFromBar(barIdx: number): void }[] = [];
+
     // Combined namespace and core functions - the default way to access everything
     public pine: {
         // input: Input;
@@ -415,6 +420,9 @@ export class Context {
             get: () => polylineHelper.all,
         });
 
+        // Register drawing helpers for streaming rollback
+        this._drawingHelpers = [labelHelper, lineHelper, boxHelper, linefillHelper, polylineHelper];
+
         // table namespace
         const tableHelper = new TableHelper(this);
         this.bindContextObject(
@@ -451,6 +459,16 @@ export class Context {
         });
     }
 
+    /**
+     * Roll back all drawing objects created at or after the given bar index.
+     * Called during streaming updates to prevent accumulation when bars are re-processed.
+     */
+    rollbackDrawings(fromBarIdx: number): void {
+        for (const helper of this._drawingHelpers) {
+            helper.rollbackFromBar(fromBarIdx);
+        }
+    }
+
     private bindContextObject(instance: any, entries: string[], root: string = '') {
         if (root && !this.pine[root]) this.pine[root] = {};
 
@@ -535,6 +553,20 @@ export class Context {
             src = src();
         }
 
+        // Resolve thunks inside PineTypeObject fields (UDT instances).
+        // When a `var` declaration initializes a UDT with factory calls like
+        // `MyType.new(line.new(...), label.new(...))`, the factory calls are
+        // wrapped in thunks to prevent orphan objects on bars 1+. Here on bar 0,
+        // we evaluate those thunks to get the actual drawing objects.
+        if (src instanceof PineTypeObject) {
+            const def = src.__def__;
+            for (const key in def) {
+                if (typeof src[key] === 'function') {
+                    src[key] = src[key]();
+                }
+            }
+        }
+
         // First bar: Initialize with source value
         let value;
         if (src instanceof Series) {
diff --git a/src/PineTS.class.ts b/src/PineTS.class.ts
index 411d377..ba59176 100644
--- a/src/PineTS.class.ts
+++ b/src/PineTS.class.ts
@@ -339,13 +339,20 @@ export class PineTS {
                 continue;
             }
 
-            // #4: Always recalculate last candle + new ones
+            // #4: Data changed — bump version so secondary contexts know to refresh
+            context.dataVersion++;
+
+            // Always recalculate last candle + new ones
             // Remove last result (will be recalculated with fresh data)
             this._removeLastResult(context);
 
             // Step back one position to reprocess last candle
             processedUpToIdx = this.data.length - (newCandles + 1);
 
+            // Roll back drawing objects created during the previous processing of
+            // these bars so they don't accumulate on each streaming tick.
+            context.rollbackDrawings(processedUpToIdx);
+
             // Next iteration of loop will process from updated position (#1)
 
             //barstate.isnew becomes false on live bars
@@ -503,6 +510,29 @@ export class PineTS {
         this.closeTime.push(candle.closeTime);
     }
 
+    /**
+     * Update the secondary context's tail with fresh market data.
+     * Mirrors the streaming update logic in _runPaginated:
+     * fetches new/updated candles, rolls back the last result, and re-executes
+     * only the affected bars.
+     * @param context - The cached secondary context to update
+     * @returns true if data was updated, false if no changes
+     */
+    public async updateTail(context: Context): Promise<boolean> {
+        // Guard: skip if no data (e.g. secondary context failed to load from provider)
+        if (this.data.length === 0 || Array.isArray(this.source)) return false;
+
+        const { newCandles, updatedLastCandle } = await this._updateMarketData();
+        if (newCandles === 0 && !updatedLastCandle) return false;
+
+        this._removeLastResult(context);
+        context.length = this.data.length;
+        const processFrom = this.data.length - (newCandles + 1);
+        context.rollbackDrawings(processFrom);
+        await this._executeIterations(context, this._transpiledCode as Function, processFrom, this.data.length);
+        return true;
+    }
+
     /**
      * Remove the last result from context (for updating an open candle)
      * @private
diff --git a/src/namespaces/Barstate.ts b/src/namespaces/Barstate.ts
index 2512f7f..5832447 100644
--- a/src/namespaces/Barstate.ts
+++ b/src/namespaces/Barstate.ts
@@ -28,12 +28,18 @@ export class Barstate {
     }
 
     public get isconfirmed() {
-        return this.context.data.closeTime[this.context.data.closeTime.length - 1] <= new Date().getTime();
+        // Check if the CURRENT bar (not the last bar) has closed.
+        // Historical bars are always confirmed; only the live bar is unconfirmed.
+        // closeTime is a Series object — access .data[] for raw array indexing.
+        const closeTime = this.context.data.closeTime.data[this.context.idx];
+        return closeTime <= Date.now();
     }
 
     public get islastconfirmedhistory() {
-        //FIXME : this is a temporary solution to get the islastconfirmedhistory value,
-        //we need to implement a better way to handle it based on market data
-        return this.context.data.closeTime[this.context.data.closeTime.length - 1] <= new Date().getTime();
+        // True when this is the last bar whose close time is in the past
+        // (the bar right before the current live bar).
+        const closeTime = this.context.data.closeTime.data[this.context.idx];
+        const nextCloseTime = this.context.data.closeTime.data[this.context.idx + 1];
+        return closeTime <= Date.now() && (nextCloseTime === undefined || nextCloseTime > Date.now());
     }
 }
diff --git a/src/namespaces/Str.ts b/src/namespaces/Str.ts
index 5cf0305..06e726f 100644
--- a/src/namespaces/Str.ts
+++ b/src/namespaces/Str.ts
@@ -10,11 +10,53 @@ export class Str {
         return Series.from(source).get(index);
     }
     tostring(value: any, formatStr?: string) {
-        if (formatStr === 'mintick' && typeof value === 'number') {
+        if (typeof value !== 'number' || isNaN(value) || !formatStr) {
+            return String(value);
+        }
+
+        // Named format: mintick
+        if (formatStr === 'mintick') {
+            const mintick = this.context.pine?.syminfo?.mintick || 0.01;
+            const decimals = Math.max(0, -Math.floor(Math.log10(mintick)));
+            return value.toFixed(decimals);
+        }
+
+        // Named format: integer
+        if (formatStr === 'integer') {
+            return String(Math.round(value));
+        }
+
+        // Named format: percent
+        if (formatStr === 'percent') {
+            return (value * 100).toFixed(2) + '%';
+        }
+
+        // Named format: price — same as mintick
+        if (formatStr === 'price') {
             const mintick = this.context.pine?.syminfo?.mintick || 0.01;
             const decimals = Math.max(0, -Math.floor(Math.log10(mintick)));
             return value.toFixed(decimals);
         }
+
+        // Named format: volume
+        if (formatStr === 'volume') {
+            return String(Math.round(value));
+        }
+
+        // Pattern-based format: "#", "#.#", "#.##", "0.000", etc.
+        // Count decimal places from the pattern
+        const dotIdx = formatStr.indexOf('.');
+        if (dotIdx >= 0) {
+            const decimalPart = formatStr.substring(dotIdx + 1);
+            const decimals = decimalPart.length;
+            return value.toFixed(decimals);
+        }
+
+        // No decimal point in format → integer
+        if (formatStr.includes('#') || formatStr.includes('0')) {
+            return String(Math.round(value));
+        }
+
         return String(value);
     }
     tonumber(value: any) {
@@ -91,6 +133,13 @@ export class Str {
     }
 
     format(message: string, ...args: any[]) {
-        return message.replace(/{(\d+)}/g, (match, index) => args[index]);
+        // Handle both simple {0} and extended {0,number,#.##} patterns
+        return message.replace(/\{(\d+)(?:,number,([^}]+))?\}/g, (match, index, fmt) => {
+            const val = args[index];
+            if (fmt && typeof val === 'number' && !isNaN(val)) {
+                return this.tostring(val, fmt);
+            }
+            return String(val);
+        });
     }
 }
diff --git a/src/namespaces/array/array.index.ts b/src/namespaces/array/array.index.ts
index a9a8b5b..9e9dd10 100644
--- a/src/namespaces/array/array.index.ts
+++ b/src/namespaces/array/array.index.ts
@@ -8,9 +8,15 @@ import { PineArrayObject } from './PineArrayObject';
 import { from } from './methods/from';
 import { new_fn } from './methods/new';
 import { new_bool } from './methods/new_bool';
+import { new_box } from './methods/new_box';
+import { new_color } from './methods/new_color';
 import { new_float } from './methods/new_float';
 import { new_int } from './methods/new_int';
+import { new_label } from './methods/new_label';
+import { new_line } from './methods/new_line';
+import { new_linefill } from './methods/new_linefill';
 import { new_string } from './methods/new_string';
+import { new_table } from './methods/new_table';
 import { param } from './methods/param';
 
 export class PineArray {
@@ -45,9 +51,15 @@ export class PineArray {
     this.mode = (id: PineArrayObject, ...args: any[]) => id.mode(...args);
     this.new = new_fn(context);
     this.new_bool = new_bool(context);
+    this.new_box = new_box(context);
+    this.new_color = new_color(context);
     this.new_float = new_float(context);
     this.new_int = new_int(context);
+    this.new_label = new_label(context);
+    this.new_line = new_line(context);
+    this.new_linefill = new_linefill(context);
     this.new_string = new_string(context);
+    this.new_table = new_table(context);
     this.param = param(context);
     this.percentile_linear_interpolation = (id: PineArrayObject, ...args: any[]) => id.percentile_linear_interpolation(...args);
     this.percentile_nearest_rank = (id: PineArrayObject, ...args: any[]) => id.percentile_nearest_rank(...args);
diff --git a/src/namespaces/array/methods/get.ts b/src/namespaces/array/methods/get.ts
index 3b3af22..f5880d1 100644
--- a/src/namespaces/array/methods/get.ts
+++ b/src/namespaces/array/methods/get.ts
@@ -4,6 +4,12 @@ import { PineArrayObject } from '../PineArrayObject';
 
 export function get(context: any) {
     return (id: PineArrayObject, index: number) => {
+        // Bounds check: return NaN (Pine's na) for out-of-bounds access.
+        // In TradingView, out-of-bounds array.get() throws a runtime error.
+        // PineTS returns na instead to avoid hard crashes during development/testing.
+        if (index < 0 || index >= id.array.length) {
+            return NaN;
+        }
         return id.array[index];
     };
 }
diff --git a/src/namespaces/array/methods/new_box.ts b/src/namespaces/array/methods/new_box.ts
new file mode 100644
index 0000000..35ded91
--- /dev/null
+++ b/src/namespaces/array/methods/new_box.ts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { PineArrayObject, PineArrayType } from '../PineArrayObject';
+
+export function new_box(context: any) {
+    return (size: number = 0, initial_value: any = null): PineArrayObject => {
+        return new PineArrayObject(Array(size).fill(initial_value), PineArrayType.box, context);
+    };
+}
diff --git a/src/namespaces/array/methods/new_color.ts b/src/namespaces/array/methods/new_color.ts
new file mode 100644
index 0000000..aee33c9
--- /dev/null
+++ b/src/namespaces/array/methods/new_color.ts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { PineArrayObject, PineArrayType } from '../PineArrayObject';
+
+export function new_color(context: any) {
+    return (size: number = 0, initial_value: any = null): PineArrayObject => {
+        return new PineArrayObject(Array(size).fill(initial_value), PineArrayType.color, context);
+    };
+}
diff --git a/src/namespaces/array/methods/new_label.ts b/src/namespaces/array/methods/new_label.ts
new file mode 100644
index 0000000..104cfe9
--- /dev/null
+++ b/src/namespaces/array/methods/new_label.ts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { PineArrayObject, PineArrayType } from '../PineArrayObject';
+
+export function new_label(context: any) {
+    return (size: number = 0, initial_value: any = null): PineArrayObject => {
+        return new PineArrayObject(Array(size).fill(initial_value), PineArrayType.label, context);
+    };
+}
diff --git a/src/namespaces/array/methods/new_line.ts b/src/namespaces/array/methods/new_line.ts
new file mode 100644
index 0000000..2ae6162
--- /dev/null
+++ b/src/namespaces/array/methods/new_line.ts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { PineArrayObject, PineArrayType } from '../PineArrayObject';
+
+export function new_line(context: any) {
+    return (size: number = 0, initial_value: any = null): PineArrayObject => {
+        return new PineArrayObject(Array(size).fill(initial_value), PineArrayType.line, context);
+    };
+}
diff --git a/src/namespaces/array/methods/new_linefill.ts b/src/namespaces/array/methods/new_linefill.ts
new file mode 100644
index 0000000..730add3
--- /dev/null
+++ b/src/namespaces/array/methods/new_linefill.ts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { PineArrayObject, PineArrayType } from '../PineArrayObject';
+
+export function new_linefill(context: any) {
+    return (size: number = 0, initial_value: any = null): PineArrayObject => {
+        return new PineArrayObject(Array(size).fill(initial_value), PineArrayType.linefill, context);
+    };
+}
diff --git a/src/namespaces/array/methods/new_table.ts b/src/namespaces/array/methods/new_table.ts
new file mode 100644
index 0000000..de5e5d0
--- /dev/null
+++ b/src/namespaces/array/methods/new_table.ts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { PineArrayObject, PineArrayType } from '../PineArrayObject';
+
+export function new_table(context: any) {
+    return (size: number = 0, initial_value: any = null): PineArrayObject => {
+        return new PineArrayObject(Array(size).fill(initial_value), PineArrayType.table, context);
+    };
+}
diff --git a/src/namespaces/array/utils.ts b/src/namespaces/array/utils.ts
index 9830b4d..621d1a2 100644
--- a/src/namespaces/array/utils.ts
+++ b/src/namespaces/array/utils.ts
@@ -33,7 +33,8 @@ export function inferValueType(value: any): PineArrayType {
     } else if (typeof value === 'boolean') {
         return PineArrayType.bool;
     } else {
-        throw new Error('Cannot infer type from value');
+        // Objects (LineObject, LabelObject, BoxObject, etc.) get 'any' type
+        return PineArrayType.any;
     }
 }
 
@@ -64,6 +65,14 @@ export function isValueOfType(value: any, type: PineArrayType) {
             return typeof value === 'string';
         case PineArrayType.bool:
             return typeof value === 'boolean';
+        // Drawing object types accept any object (or null for na)
+        case PineArrayType.box:
+        case PineArrayType.label:
+        case PineArrayType.line:
+        case PineArrayType.linefill:
+        case PineArrayType.table:
+        case PineArrayType.color:
+            return value === null || typeof value === 'object' || typeof value === 'string';
     }
     return false;
 }
diff --git a/src/namespaces/box/BoxHelper.ts b/src/namespaces/box/BoxHelper.ts
index 3fe135a..1c460b9 100644
--- a/src/namespaces/box/BoxHelper.ts
+++ b/src/namespaces/box/BoxHelper.ts
@@ -4,6 +4,7 @@ import { Series } from '../../Series';
 import { parseArgsForPineParams } from '../utils';
 import { BoxObject } from './BoxObject';
 import { ChartPointObject } from '../chart/ChartPointObject';
+import { NAHelper } from '../Core';
 
 //prettier-ignore
 const BOX_NEW_SIGNATURES = [
@@ -62,6 +63,8 @@ export class BoxHelper {
 
     private _resolve(val: any): any {
         if (val === null || val === undefined) return val;
+        // NAHelper (na) → resolve to NaN
+        if (val instanceof NAHelper) return NaN;
         if (typeof val === 'object' && Array.isArray(val.data) && typeof val.get === 'function') {
             return val.get(0);
         }
@@ -71,6 +74,18 @@ export class BoxHelper {
         return val;
     }
 
+    /**
+     * Resolve a color value, preserving NaN (na) so renderers can detect "no color".
+     * The regular `_resolve(val) || fallback` pattern treats NaN as falsy and replaces
+     * it with the default, losing the explicit `border_color = na` intent.
+     */
+    private _resolveColor(val: any, fallback: string): any {
+        const resolved = this._resolve(val);
+        // NaN means `na` in Pine Script — preserve it so renderers can detect it
+        if (typeof resolved === 'number' && isNaN(resolved)) return NaN;
+        return resolved || fallback;
+    }
+
     private _createBox(
         left: number, top: number, right: number, bottom: number,
         xloc: string = 'bi', extend: string = 'none',
@@ -85,12 +100,12 @@ export class BoxHelper {
         const b = new BoxObject(
             left, top, right, bottom, xloc,
             this._resolve(extend),
-            this._resolve(border_color) || '#2962ff',
+            this._resolveColor(border_color, '#2962ff'),
             this._resolve(border_style) || 'style_solid',
             this._resolve(border_width) ?? 1,
-            this._resolve(bgcolor) || '#2962ff',
+            this._resolveColor(bgcolor, '#2962ff'),
             this._resolve(text) || '',
-            this._resolve(text_color) || '#000000',
+            this._resolveColor(text_color, '#000000'),
             this._resolve(text_size) || 'auto',
             this._resolve(text_halign) || 'center',
             this._resolve(text_valign) || 'center',
@@ -99,6 +114,8 @@ export class BoxHelper {
             this._resolve(text_formatting) || 'format_none',
             force_overlay,
         );
+        b._helper = this;
+        b._createdAtBar = this.context.idx;
         this._boxes.push(b);
         this._syncToPlot();
         return b;
@@ -289,6 +306,8 @@ export class BoxHelper {
     copy(id: BoxObject): BoxObject | undefined {
         if (!id) return undefined;
         const b = id.copy();
+        b._helper = this;
+        b._createdAtBar = this.context.idx;
         this._boxes.push(b);
         this._syncToPlot();
         return b;
@@ -301,4 +320,14 @@ export class BoxHelper {
     get all(): BoxObject[] {
         return this._boxes.filter((b) => !b._deleted);
     }
+
+    /**
+     * Remove all drawing objects created at or after the given bar index,
+     * and un-delete objects that were deleted during rolled-back bars.
+     * Called during streaming rollback to prevent accumulation.
+     */
+    rollbackFromBar(barIdx: number): void {
+        this._boxes = this._boxes.filter((b) => b._createdAtBar < barIdx);
+        this._syncToPlot();
+    }
 }
diff --git a/src/namespaces/box/BoxObject.ts b/src/namespaces/box/BoxObject.ts
index 84d4cfe..8245a5d 100644
--- a/src/namespaces/box/BoxObject.ts
+++ b/src/namespaces/box/BoxObject.ts
@@ -34,6 +34,9 @@ export class BoxObject {
     // Flags
     public force_overlay: boolean;
     public _deleted: boolean;
+    public _helper: any;
+    /** Bar index at which this object was created (for streaming rollback) */
+    public _createdAtBar: number = -1;
 
     constructor(
         left: number,
@@ -77,8 +80,39 @@ export class BoxObject {
         this.text_formatting = text_formatting;
         this.force_overlay = force_overlay;
         this._deleted = false;
+        this._helper = null;
     }
 
+    // --- Delegate methods for method-call syntax (e.g. myBox.set_right(x)) ---
+
+    set_left(left: number): void { if (this._helper) this._helper.set_left(this, left); else if (!this._deleted) this.left = left; }
+    set_right(right: number): void { if (this._helper) this._helper.set_right(this, right); else if (!this._deleted) this.right = right; }
+    set_top(top: number): void { if (this._helper) this._helper.set_top(this, top); else if (!this._deleted) this.top = top; }
+    set_bottom(bottom: number): void { if (this._helper) this._helper.set_bottom(this, bottom); else if (!this._deleted) this.bottom = bottom; }
+    set_lefttop(left: number, top: number): void { if (this._helper) this._helper.set_lefttop(this, left, top); else if (!this._deleted) { this.left = left; this.top = top; } }
+    set_rightbottom(right: number, bottom: number): void { if (this._helper) this._helper.set_rightbottom(this, right, bottom); else if (!this._deleted) { this.right = right; this.bottom = bottom; } }
+    set_top_left_point(point: any): void { if (this._helper) this._helper.set_top_left_point(this, point); }
+    set_bottom_right_point(point: any): void { if (this._helper) this._helper.set_bottom_right_point(this, point); }
+    set_xloc(left: number, right: number, xloc: string): void { if (this._helper) this._helper.set_xloc(this, left, right, xloc); else if (!this._deleted) { this.left = left; this.right = right; this.xloc = xloc; } }
+    set_bgcolor(color: string): void { if (this._helper) this._helper.set_bgcolor(this, color); else if (!this._deleted) this.bgcolor = color; }
+    set_border_color(color: string): void { if (this._helper) this._helper.set_border_color(this, color); else if (!this._deleted) this.border_color = color; }
+    set_border_width(width: number): void { if (this._helper) this._helper.set_border_width(this, width); else if (!this._deleted) this.border_width = width; }
+    set_border_style(style: string): void { if (this._helper) this._helper.set_border_style(this, style); else if (!this._deleted) this.border_style = style; }
+    set_extend(extend: string): void { if (this._helper) this._helper.set_extend(this, extend); else if (!this._deleted) this.extend = extend; }
+    set_text(text: string): void { if (this._helper) this._helper.set_text(this, text); else if (!this._deleted) this.text = text; }
+    set_text_color(color: string): void { if (this._helper) this._helper.set_text_color(this, color); else if (!this._deleted) this.text_color = color; }
+    set_text_size(size: string): void { if (this._helper) this._helper.set_text_size(this, size); else if (!this._deleted) this.text_size = size; }
+    set_text_halign(align: string): void { if (this._helper) this._helper.set_text_halign(this, align); else if (!this._deleted) this.text_halign = align; }
+    set_text_valign(align: string): void { if (this._helper) this._helper.set_text_valign(this, align); else if (!this._deleted) this.text_valign = align; }
+    set_text_wrap(wrap: string): void { if (this._helper) this._helper.set_text_wrap(this, wrap); else if (!this._deleted) this.text_wrap = wrap; }
+    set_text_font_family(family: string): void { if (this._helper) this._helper.set_text_font_family(this, family); else if (!this._deleted) this.text_font_family = family; }
+    set_text_formatting(formatting: string): void { if (this._helper) this._helper.set_text_formatting(this, formatting); else if (!this._deleted) this.text_formatting = formatting; }
+
+    get_left(): number { return this.left; }
+    get_right(): number { return this.right; }
+    get_top(): number { return this.top; }
+    get_bottom(): number { return this.bottom; }
+
     delete(): void {
         this._deleted = true;
     }
diff --git a/src/namespaces/label/LabelHelper.ts b/src/namespaces/label/LabelHelper.ts
index 8d5056e..a36df1d 100644
--- a/src/namespaces/label/LabelHelper.ts
+++ b/src/namespaces/label/LabelHelper.ts
@@ -4,6 +4,7 @@ import { Series } from '../../Series';
 import { parseArgsForPineParams } from '../utils';
 import { LabelObject } from './LabelObject';
 import { ChartPointObject } from '../chart/ChartPointObject';
+import { NAHelper } from '../Core';
 
 //prettier-ignore
 const LABEL_NEW_SIGNATURES = [
@@ -63,6 +64,8 @@ export class LabelHelper {
      */
     private _resolve(val: any): any {
         if (val === null || val === undefined) return val;
+        // NAHelper (na) → resolve to NaN
+        if (val instanceof NAHelper) return NaN;
         // Resolve Series-like objects (has data array and get method)
         if (typeof val === 'object' && Array.isArray(val.data) && typeof val.get === 'function') {
             return val.get(0);
@@ -104,6 +107,8 @@ export class LabelHelper {
             this._resolve(text_font_family),
             force_overlay,
         );
+        lbl._helper = this;
+        lbl._createdAtBar = this.context.idx;
         this._labels.push(lbl);
         this._syncToPlot();
         return lbl;
@@ -235,6 +240,8 @@ export class LabelHelper {
     copy(id: LabelObject): LabelObject | undefined {
         if (!id) return undefined;
         const lbl = id.copy();
+        lbl._helper = this;
+        lbl._createdAtBar = this.context.idx;
         this._labels.push(lbl);
         this._syncToPlot();
         return lbl;
@@ -250,6 +257,15 @@ export class LabelHelper {
         return this._labels.filter((l) => !l._deleted);
     }
 
+    /**
+     * Remove all drawing objects created at or after the given bar index.
+     * Called during streaming rollback to prevent accumulation.
+     */
+    rollbackFromBar(barIdx: number): void {
+        this._labels = this._labels.filter((l) => l._createdAtBar < barIdx);
+        this._syncToPlot();
+    }
+
     // --- Style constants ---
 
     get style_label_down() {
diff --git a/src/namespaces/label/LabelObject.ts b/src/namespaces/label/LabelObject.ts
index 92d81d0..4771168 100644
--- a/src/namespaces/label/LabelObject.ts
+++ b/src/namespaces/label/LabelObject.ts
@@ -22,6 +22,9 @@ export class LabelObject {
     public text_font_family: string;
     public force_overlay: boolean;
     public _deleted: boolean;
+    public _helper: any;
+    /** Bar index at which this object was created (for streaming rollback) */
+    public _createdAtBar: number = -1;
 
     constructor(
         x: number,
@@ -53,8 +56,30 @@ export class LabelObject {
         this.text_font_family = text_font_family;
         this.force_overlay = force_overlay;
         this._deleted = false;
+        this._helper = null;
     }
 
+    // --- Delegate methods for method-call syntax (e.g. myLabel.set_x(x)) ---
+
+    set_x(x: number): void { if (this._helper) this._helper.set_x(this, x); else if (!this._deleted) this.x = x; }
+    set_y(y: number): void { if (this._helper) this._helper.set_y(this, y); else if (!this._deleted) this.y = y; }
+    set_xy(x: number, y: number): void { if (this._helper) this._helper.set_xy(this, x, y); else if (!this._deleted) { this.x = x; this.y = y; } }
+    set_text(text: string): void { if (this._helper) this._helper.set_text(this, text); else if (!this._deleted) this.text = text; }
+    set_color(color: string): void { if (this._helper) this._helper.set_color(this, color); else if (!this._deleted) this.color = color; }
+    set_textcolor(textcolor: string): void { if (this._helper) this._helper.set_textcolor(this, textcolor); else if (!this._deleted) this.textcolor = textcolor; }
+    set_size(size: string): void { if (this._helper) this._helper.set_size(this, size); else if (!this._deleted) this.size = size; }
+    set_style(style: string): void { if (this._helper) this._helper.set_style(this, style); else if (!this._deleted) this.style = style; }
+    set_textalign(textalign: string): void { if (this._helper) this._helper.set_textalign(this, textalign); else if (!this._deleted) this.textalign = textalign; }
+    set_tooltip(tooltip: string): void { if (this._helper) this._helper.set_tooltip(this, tooltip); else if (!this._deleted) this.tooltip = tooltip; }
+    set_xloc(xloc: string): void { if (this._helper) this._helper.set_xloc(this, xloc); else if (!this._deleted) this.xloc = xloc; }
+    set_yloc(yloc: string): void { if (this._helper) this._helper.set_yloc(this, yloc); else if (!this._deleted) this.yloc = yloc; }
+    set_point(point: any): void { if (this._helper) this._helper.set_point(this, point); }
+    set_text_font_family(family: string): void { if (!this._deleted) this.text_font_family = family; }
+
+    get_x(): number { return this.x; }
+    get_y(): number { return this.y; }
+    get_text(): string { return this.text; }
+
     delete(): void {
         this._deleted = true;
     }
diff --git a/src/namespaces/line/LineHelper.ts b/src/namespaces/line/LineHelper.ts
index a4bc489..32de4af 100644
--- a/src/namespaces/line/LineHelper.ts
+++ b/src/namespaces/line/LineHelper.ts
@@ -4,6 +4,7 @@ import { Series } from '../../Series';
 import { parseArgsForPineParams } from '../utils';
 import { LineObject } from './LineObject';
 import { ChartPointObject } from '../chart/ChartPointObject';
+import { NAHelper } from '../Core';
 
 //prettier-ignore
 const LINE_NEW_SIGNATURES = [
@@ -69,6 +70,8 @@ export class LineHelper {
      */
     private _resolve(val: any): any {
         if (val === null || val === undefined) return val;
+        // NAHelper (na) → resolve to NaN
+        if (val instanceof NAHelper) return NaN;
         // Resolve Series-like objects (has data array and get method)
         if (typeof val === 'object' && Array.isArray(val.data) && typeof val.get === 'function') {
             return val.get(0);
@@ -101,6 +104,8 @@ export class LineHelper {
             this._resolve(width) || 1,
             force_overlay,
         );
+        ln._helper = this;
+        ln._createdAtBar = this.context.idx;
         this._lines.push(ln);
         this._syncToPlot();
         return ln;
@@ -260,6 +265,8 @@ export class LineHelper {
     copy(id: LineObject): LineObject | undefined {
         if (!id) return undefined;
         const ln = id.copy();
+        ln._helper = this;
+        ln._createdAtBar = this.context.idx;
         this._lines.push(ln);
         this._syncToPlot();
         return ln;
@@ -275,6 +282,15 @@ export class LineHelper {
         return this._lines.filter((l) => !l._deleted);
     }
 
+    /**
+     * Remove all drawing objects created at or after the given bar index.
+     * Called during streaming rollback to prevent accumulation.
+     */
+    rollbackFromBar(barIdx: number): void {
+        this._lines = this._lines.filter((l) => l._createdAtBar < barIdx);
+        this._syncToPlot();
+    }
+
     // --- Style constants ---
 
     get style_solid() {
diff --git a/src/namespaces/line/LineObject.ts b/src/namespaces/line/LineObject.ts
index 2d173e6..acc87e4 100644
--- a/src/namespaces/line/LineObject.ts
+++ b/src/namespaces/line/LineObject.ts
@@ -19,6 +19,9 @@ export class LineObject {
     public width: number;
     public force_overlay: boolean;
     public _deleted: boolean;
+    public _helper: any;
+    /** Bar index at which this object was created (for streaming rollback) */
+    public _createdAtBar: number = -1;
 
     constructor(
         x1: number,
@@ -44,8 +47,31 @@ export class LineObject {
         this.width = width;
         this.force_overlay = force_overlay;
         this._deleted = false;
+        this._helper = null;
     }
 
+    // --- Delegate methods for method-call syntax (e.g. myLine.set_x2(x)) ---
+
+    set_x1(x: number): void { if (this._helper) this._helper.set_x1(this, x); else if (!this._deleted) this.x1 = x; }
+    set_y1(y: number): void { if (this._helper) this._helper.set_y1(this, y); else if (!this._deleted) this.y1 = y; }
+    set_x2(x: number): void { if (this._helper) this._helper.set_x2(this, x); else if (!this._deleted) this.x2 = x; }
+    set_y2(y: number): void { if (this._helper) this._helper.set_y2(this, y); else if (!this._deleted) this.y2 = y; }
+    set_xy1(x: number, y: number): void { if (this._helper) this._helper.set_xy1(this, x, y); else if (!this._deleted) { this.x1 = x; this.y1 = y; } }
+    set_xy2(x: number, y: number): void { if (this._helper) this._helper.set_xy2(this, x, y); else if (!this._deleted) { this.x2 = x; this.y2 = y; } }
+    set_color(color: string): void { if (this._helper) this._helper.set_color(this, color); else if (!this._deleted) this.color = color; }
+    set_width(width: number): void { if (this._helper) this._helper.set_width(this, width); else if (!this._deleted) this.width = width; }
+    set_style(style: string): void { if (this._helper) this._helper.set_style(this, style); else if (!this._deleted) this.style = style; }
+    set_extend(extend: string): void { if (this._helper) this._helper.set_extend(this, extend); else if (!this._deleted) this.extend = extend; }
+    set_xloc(x1: number, x2: number, xloc: string): void { if (this._helper) this._helper.set_xloc(this, x1, x2, xloc); else if (!this._deleted) { this.x1 = x1; this.x2 = x2; this.xloc = xloc; } }
+    set_first_point(point: any): void { if (this._helper) this._helper.set_first_point(this, point); }
+    set_second_point(point: any): void { if (this._helper) this._helper.set_second_point(this, point); }
+
+    get_x1(): number { return this.x1; }
+    get_y1(): number { return this.y1; }
+    get_x2(): number { return this.x2; }
+    get_y2(): number { return this.y2; }
+    get_price(x: number): number { if (this._helper) return this._helper.get_price(this, x); return NaN; }
+
     delete(): void {
         this._deleted = true;
     }
diff --git a/src/namespaces/linefill/LinefillHelper.ts b/src/namespaces/linefill/LinefillHelper.ts
index 7f0a8aa..12bad43 100644
--- a/src/namespaces/linefill/LinefillHelper.ts
+++ b/src/namespaces/linefill/LinefillHelper.ts
@@ -3,6 +3,7 @@
 import { Series } from '../../Series';
 import { LineObject } from '../line/LineObject';
 import { LinefillObject } from './LinefillObject';
+import { NAHelper } from '../Core';
 
 export class LinefillHelper {
     private _linefills: LinefillObject[] = [];
@@ -40,6 +41,8 @@ export class LinefillHelper {
      */
     private _resolve(val: any): any {
         if (val === null || val === undefined) return val;
+        // NAHelper (na) → resolve to NaN
+        if (val instanceof NAHelper) return NaN;
         if (typeof val === 'object' && Array.isArray(val.data) && typeof val.get === 'function') {
             return val.get(0);
         }
@@ -53,6 +56,7 @@ export class LinefillHelper {
     new(line1: LineObject, line2: LineObject, color: any): LinefillObject {
         const resolvedColor = this._resolve(color) || '';
         const lf = new LinefillObject(line1, line2, resolvedColor);
+        lf._createdAtBar = this.context.idx;
         this._linefills.push(lf);
         this._syncToPlot();
         return lf;
@@ -89,4 +93,13 @@ export class LinefillHelper {
     get all(): LinefillObject[] {
         return this._linefills.filter((lf) => !lf._deleted);
     }
+
+    /**
+     * Remove all drawing objects created at or after the given bar index.
+     * Called during streaming rollback to prevent accumulation.
+     */
+    rollbackFromBar(barIdx: number): void {
+        this._linefills = this._linefills.filter((lf) => lf._createdAtBar < barIdx);
+        this._syncToPlot();
+    }
 }
diff --git a/src/namespaces/linefill/LinefillObject.ts b/src/namespaces/linefill/LinefillObject.ts
index 4251161..91be159 100644
--- a/src/namespaces/linefill/LinefillObject.ts
+++ b/src/namespaces/linefill/LinefillObject.ts
@@ -14,6 +14,8 @@ export class LinefillObject {
     public line2: LineObject;
     public color: string;
     public _deleted: boolean;
+    /** Bar index at which this object was created (for streaming rollback) */
+    public _createdAtBar: number = -1;
 
     constructor(line1: LineObject, line2: LineObject, color: string) {
         this.id = _linefillIdCounter++;
diff --git a/src/namespaces/polyline/PolylineHelper.ts b/src/namespaces/polyline/PolylineHelper.ts
index 39c92ca..b9381d0 100644
--- a/src/namespaces/polyline/PolylineHelper.ts
+++ b/src/namespaces/polyline/PolylineHelper.ts
@@ -3,6 +3,7 @@
 import { Series } from '../../Series';
 import { PolylineObject } from './PolylineObject';
 import { ChartPointObject } from '../chart/ChartPointObject';
+import { NAHelper } from '../Core';
 
 export class PolylineHelper {
     private _polylines: PolylineObject[] = [];
@@ -41,6 +42,8 @@ export class PolylineHelper {
      */
     private _resolve(val: any): any {
         if (val === null || val === undefined) return val;
+        // NAHelper (na) → resolve to NaN
+        if (val instanceof NAHelper) return NaN;
         if (typeof val === 'object' && Array.isArray(val.data) && typeof val.get === 'function') {
             return val.get(0);
         }
@@ -126,6 +129,7 @@ export class PolylineHelper {
             this._resolve(line_width) || 1,
             this._resolve(force_overlay) ?? false,
         );
+        pl._createdAtBar = this.context.idx;
         this._polylines.push(pl);
         this._syncToPlot();
         return pl;
@@ -145,4 +149,13 @@ export class PolylineHelper {
     get all(): PolylineObject[] {
         return this._polylines.filter((pl) => !pl._deleted);
     }
+
+    /**
+     * Remove all drawing objects created at or after the given bar index.
+     * Called during streaming rollback to prevent accumulation.
+     */
+    rollbackFromBar(barIdx: number): void {
+        this._polylines = this._polylines.filter((pl) => pl._createdAtBar < barIdx);
+        this._syncToPlot();
+    }
 }
diff --git a/src/namespaces/polyline/PolylineObject.ts b/src/namespaces/polyline/PolylineObject.ts
index ae43880..b70bdea 100644
--- a/src/namespaces/polyline/PolylineObject.ts
+++ b/src/namespaces/polyline/PolylineObject.ts
@@ -20,6 +20,8 @@ export class PolylineObject {
     public line_width: number;
     public force_overlay: boolean;
     public _deleted: boolean;
+    /** Bar index at which this object was created (for streaming rollback) */
+    public _createdAtBar: number = -1;
 
     constructor(
         points: ChartPointObject[],
diff --git a/src/namespaces/request/methods/security.ts b/src/namespaces/request/methods/security.ts
index 82fa751..41a7f69 100644
--- a/src/namespaces/request/methods/security.ts
+++ b/src/namespaces/request/methods/security.ts
@@ -2,7 +2,7 @@
 
 import { PineTS } from '../../../PineTS.class';
 import { Series } from '../../../Series';
-import { TIMEFRAMES } from '../utils/TIMEFRAMES';
+import { TIMEFRAMES, normalizeTimeframe } from '../utils/TIMEFRAMES';
 import { findSecContextIdx } from '../utils/findSecContextIdx';
 import { findLTFContextIdx } from '../utils/findLTFContextIdx';
 
@@ -24,8 +24,12 @@ export function security(context: any) {
         const _timeframe = timeframe[0];
         const _expression = expression[0];
         const _expression_name = expression[1];
-        const _gaps = Array.isArray(gaps) ? gaps[0] : gaps;
-        const _lookahead = Array.isArray(lookahead) ? lookahead[0] : lookahead;
+        const _gapsRaw = Array.isArray(gaps) ? gaps[0] : gaps;
+        const _lookaheadRaw = Array.isArray(lookahead) ? lookahead[0] : lookahead;
+        // barmerge.gaps_off/on and barmerge.lookahead_off/on are string enums ('gaps_off', 'gaps_on', etc.)
+        // Convert to boolean for correct behavior in findLTFContextIdx/findSecContextIdx
+        const _gaps = _gapsRaw === true || _gapsRaw === 'gaps_on';
+        const _lookahead = _lookaheadRaw === true || _lookaheadRaw === 'lookahead_on';
 
         // CRITICAL: Prevent infinite recursion in secondary contexts
         // If this is a secondary context (created by another request.security),
@@ -34,8 +38,8 @@ export function security(context: any) {
             return Array.isArray(_expression) ? [_expression] : _expression;
         }
 
-        const ctxTimeframeIdx = TIMEFRAMES.indexOf(context.timeframe);
-        const reqTimeframeIdx = TIMEFRAMES.indexOf(_timeframe);
+        const ctxTimeframeIdx = TIMEFRAMES.indexOf(normalizeTimeframe(context.timeframe));
+        const reqTimeframeIdx = TIMEFRAMES.indexOf(normalizeTimeframe(_timeframe));
 
         if (ctxTimeframeIdx == -1 || reqTimeframeIdx == -1) {
             throw new Error('Invalid timeframe');
@@ -52,13 +56,28 @@ export function security(context: any) {
         const myOpenTime = Series.from(context.data.openTime).get(0);
         const myCloseTime = Series.from(context.data.closeTime).get(0);
 
+        // On the realtime (live) bar, lookahead_off has no effect per TradingView behavior:
+        // the current developing HTF values are returned instead of the previous completed bar.
+        // A bar is realtime only if it's the last bar AND its close time is in the future
+        // (i.e., the bar hasn't closed yet). In backtesting mode with a fixed eDate, all bars
+        // are historical even the last one, so isRealtime stays false.
+        const isRealtime = context.idx === context.length - 1 && myCloseTime > Date.now();
+
         // Cache key must be unique per symbol+timeframe+expression to avoid collisions
         const cacheKey = `${_symbol}_${_timeframe}_${_expression_name}`;
         // Cache key for tracking previous bar index (for gaps detection)
         const gapCacheKey = `${cacheKey}_prevIdx`;
 
         if (context.cache[cacheKey]) {
-            const secContext = context.cache[cacheKey];
+            const cached = context.cache[cacheKey];
+
+            // Refresh secondary context when main context's data has changed (streaming mode)
+            if (context.dataVersion > cached.dataVersion) {
+                await cached.pineTS.updateTail(cached.context);
+                cached.dataVersion = context.dataVersion;
+            }
+
+            const secContext = cached.context;
             const secContextIdx = isLTF
                 ? findLTFContextIdx(
                       myOpenTime,
@@ -69,7 +88,7 @@ export function security(context: any) {
                       context.eDate,
                       _gaps
                   )
-                : findSecContextIdx(myOpenTime, myCloseTime, secContext.data.openTime.data, secContext.data.closeTime.data, _lookahead);
+                : findSecContextIdx(myOpenTime, myCloseTime, secContext.data.openTime.data, secContext.data.closeTime.data, _lookahead, isRealtime);
 
             if (secContextIdx == -1) {
                 return NaN;
@@ -101,22 +120,37 @@ export function security(context: any) {
             return Array.isArray(value) ? [value] : value;
         }
 
-        // Add buffer to sDate to ensure bar start is covered
+        // Buffer to extend date range and ensure bar boundaries are covered
         const buffer = 1000 * 60 * 60 * 24 * 30; // 30 days buffer (generous)
-        const adjustedSDate = context.sDate ? context.sDate - buffer : undefined;
-
-        // If we have a date range, we shouldn't artificially limit the bars to 1000
-        const limit = context.sDate && context.eDate ? undefined : context.limit || 1000;
 
-        // We pass undefined for eDate to allow loading full history for the security context
-        const pineTS = new PineTS(context.source, _symbol, _timeframe, limit, adjustedSDate, undefined);
+        // Determine start date for secondary context.
+        // Use context.sDate if available, otherwise derive from the earliest bar's
+        // openTime to ensure the secondary context covers the same time range as the main chart.
+        const effectiveSDate = context.sDate
+            || (context.marketData?.length > 0 ? context.marketData[0].openTime : undefined);
+        const adjustedSDate = effectiveSDate ? effectiveSDate - buffer : undefined;
+
+        // Determine end date for secondary context.
+        // The last chart bar's intrabars may extend beyond context.eDate (e.g., a weekly
+        // bar that opens before eDate but whose daily intrabars close after eDate).
+        // Use lastBarCloseTime to cover the full range of the last bar's intrabars.
+        // When eDate is undefined (live/streaming mode), derive from the last bar's
+        // closeTime or current time, adding a buffer for partial/current bars.
+        const lastBarCloseTime = context.marketData?.length > 0
+            ? context.marketData[context.marketData.length - 1].closeTime
+            : 0;
+        const secEDate = context.eDate
+            ? Math.max(context.eDate, lastBarCloseTime)
+            : (lastBarCloseTime || Date.now()) + buffer;
+
+        const pineTS = new PineTS(context.source, _symbol, _timeframe, undefined, adjustedSDate, secEDate);
 
         // Mark as secondary context to prevent infinite recursion
         pineTS.markAsSecondary();
 
         const secContext = await pineTS.run(context.pineTSCode);
 
-        context.cache[cacheKey] = secContext;
+        context.cache[cacheKey] = { pineTS, context: secContext, dataVersion: context.dataVersion };
 
         const secContextIdx = isLTF
             ? findLTFContextIdx(
@@ -128,7 +162,7 @@ export function security(context: any) {
                   context.eDate,
                   _gaps
               )
-            : findSecContextIdx(myOpenTime, myCloseTime, secContext.data.openTime.data, secContext.data.closeTime.data, _lookahead);
+            : findSecContextIdx(myOpenTime, myCloseTime, secContext.data.openTime.data, secContext.data.closeTime.data, _lookahead, isRealtime);
 
         if (secContextIdx == -1) {
             return NaN;
diff --git a/src/namespaces/request/methods/security_lower_tf.ts b/src/namespaces/request/methods/security_lower_tf.ts
index 8b1faeb..cc37971 100644
--- a/src/namespaces/request/methods/security_lower_tf.ts
+++ b/src/namespaces/request/methods/security_lower_tf.ts
@@ -2,7 +2,7 @@
 
 import { PineTS } from '../../../PineTS.class';
 import { Series } from '../../../Series';
-import { TIMEFRAMES } from '../utils/TIMEFRAMES';
+import { TIMEFRAMES, normalizeTimeframe } from '../utils/TIMEFRAMES';
 
 /**
  * Requests the results of an expression from a specified symbol on a timeframe lower than or equal to the chart's timeframe.
@@ -35,8 +35,8 @@ export function security_lower_tf(context: any) {
             return Array.isArray(_expression) ? [_expression] : _expression;
         }
 
-        const ctxTimeframeIdx = TIMEFRAMES.indexOf(context.timeframe);
-        const reqTimeframeIdx = TIMEFRAMES.indexOf(_timeframe);
+        const ctxTimeframeIdx = TIMEFRAMES.indexOf(normalizeTimeframe(context.timeframe));
+        const reqTimeframeIdx = TIMEFRAMES.indexOf(normalizeTimeframe(_timeframe));
 
         if (ctxTimeframeIdx === -1 || reqTimeframeIdx === -1) {
             if (_ignore_invalid_timeframe) return NaN;
@@ -56,17 +56,37 @@ export function security_lower_tf(context: any) {
 
         if (!context.cache[cacheKey]) {
             const buffer = 1000 * 60 * 60 * 24 * 30; // 30 days buffer
-            const adjustedSDate = context.sDate ? context.sDate - buffer : undefined;
-            const limit = context.sDate && context.eDate ? undefined : context.limit || 1000;
 
-            const pineTS = new PineTS(context.source, _symbol, _timeframe, limit, adjustedSDate, context.eDate);
+            // Determine start date: use context.sDate if available, otherwise
+            // derive from the earliest bar's openTime (same logic as security.ts)
+            const effectiveSDate = context.sDate
+                || (context.marketData?.length > 0 ? context.marketData[0].openTime : undefined);
+            const adjustedSDate = effectiveSDate ? effectiveSDate - buffer : undefined;
+
+            // Determine end date: cover last bar's intrabars without overshooting
+            const lastBarCloseTime = context.marketData?.length > 0
+                ? context.marketData[context.marketData.length - 1].closeTime
+                : 0;
+            const secEDate = context.eDate
+                ? Math.max(context.eDate, lastBarCloseTime)
+                : (lastBarCloseTime || Date.now()) + buffer;
+
+            const pineTS = new PineTS(context.source, _symbol, _timeframe, undefined, adjustedSDate, secEDate);
             pineTS.markAsSecondary();
 
             const secContext = await pineTS.run(context.pineTSCode);
-            context.cache[cacheKey] = secContext;
+            context.cache[cacheKey] = { pineTS, context: secContext, dataVersion: context.dataVersion };
         }
 
-        const secContext = context.cache[cacheKey];
+        const cached = context.cache[cacheKey];
+
+        // Refresh secondary context when main context's data has changed (streaming mode)
+        if (context.dataVersion > cached.dataVersion) {
+            await cached.pineTS.updateTail(cached.context);
+            cached.dataVersion = context.dataVersion;
+        }
+
+        const secContext = cached.context;
         
         const myOpenTime = Series.from(context.data.openTime).get(0);
         const myCloseTime = Series.from(context.data.closeTime).get(0);
diff --git a/src/namespaces/request/utils/TIMEFRAMES.ts b/src/namespaces/request/utils/TIMEFRAMES.ts
index 58155ae..044044a 100644
--- a/src/namespaces/request/utils/TIMEFRAMES.ts
+++ b/src/namespaces/request/utils/TIMEFRAMES.ts
@@ -1,4 +1,33 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//Pine Script Timeframes
+//Pine Script Timeframes (canonical format: minutes as integers, D/W/M for day/week/month)
 export const TIMEFRAMES = ['1', '3', '5', '15', '30', '45', '60', '120', '180', '240', 'D', 'W', 'M'];
+
+/**
+ * Normalize a timeframe string to the canonical Pine Script format used in TIMEFRAMES.
+ * Handles common formats like '1h', '4h', '1d', '1w', '1D', '1W', '1M', etc.
+ */
+const TIMEFRAME_MAP: Record<string, string> = {
+    '1m': '1', '3m': '3', '5m': '5', '15m': '15', '30m': '30', '45m': '45',
+    '1h': '60', '2h': '120', '3h': '180', '4h': '240',
+    '1d': 'D', '1w': 'W', '1M': 'M',
+};
+
+export function normalizeTimeframe(tf: string): string {
+    // Already canonical?
+    if (TIMEFRAMES.includes(tf)) return tf;
+
+    // Try direct map (case-sensitive first for '1M')
+    if (TIMEFRAME_MAP[tf]) return TIMEFRAME_MAP[tf];
+
+    // Try lowercase (handles '1H', '4H', '1D', '1W', etc.)
+    const lower = tf.toLowerCase();
+    if (TIMEFRAME_MAP[lower]) return TIMEFRAME_MAP[lower];
+
+    // Handle uppercase single letters ('d' → 'D', 'w' → 'W', 'm' → 'M')
+    const upper = tf.toUpperCase();
+    if (TIMEFRAMES.includes(upper)) return upper;
+
+    // Return as-is (will fail indexOf check and throw Error)
+    return tf;
+}
diff --git a/src/namespaces/request/utils/findSecContextIdx.ts b/src/namespaces/request/utils/findSecContextIdx.ts
index d5517b5..9b25076 100644
--- a/src/namespaces/request/utils/findSecContextIdx.ts
+++ b/src/namespaces/request/utils/findSecContextIdx.ts
@@ -5,7 +5,8 @@ export function findSecContextIdx(
     myCloseTime: number,
     openTime: number[],
     closeTime: number[],
-    lookahead: boolean = false
+    lookahead: boolean = false,
+    isRealtime: boolean = false
 ): number {
     for (let i = 0; i < openTime.length; i++) {
         // Match based on where the LTF bar opens, not requiring full containment.
@@ -18,6 +19,11 @@ export function findSecContextIdx(
             // For lookahead=false (default):
             // If the HTF bar is closed (myCloseTime >= closeTime[i]), we can use its value (i).
             // If the HTF bar is still open, we must use the previous bar (i-1) to avoid future leak.
+            // Exception: on the realtime (last) bar, TradingView returns the current developing
+            // HTF values (i) — lookahead_off only prevents future leak on historical bars.
+            if (isRealtime) {
+                return i;
+            }
             return myCloseTime >= closeTime[i] ? i : i - 1;
         }
     }
diff --git a/src/transpiler/pineToJS/parser.ts b/src/transpiler/pineToJS/parser.ts
index 599b291..623875d 100644
--- a/src/transpiler/pineToJS/parser.ts
+++ b/src/transpiler/pineToJS/parser.ts
@@ -703,6 +703,15 @@ export class Parser {
                 paramType = (paramType || '') + this.advance().value;
             }
 
+            // Handle generic type: array<float>, map<string, float>, etc.
+            if (
+                this.peek().type === TokenType.IDENTIFIER &&
+                this.peek(1).type === TokenType.OPERATOR && this.peek(1).value === '<'
+            ) {
+                const genericType = this.parseTypeExpression();
+                paramType = paramType ? paramType + ' ' + genericType : genericType;
+            }
+
             const paramName = this.expect(TokenType.IDENTIFIER).value;
             const param = new Identifier(paramName);
             if (paramType) param.varType = paramType;
@@ -765,6 +774,15 @@ export class Parser {
                 paramType = (paramType || '') + this.advance().value;
             }
 
+            // Handle generic type: array<float>, map<string, float>, etc.
+            if (
+                this.peek().type === TokenType.IDENTIFIER &&
+                this.peek(1).type === TokenType.OPERATOR && this.peek(1).value === '<'
+            ) {
+                const genericType = this.parseTypeExpression();
+                paramType = paramType ? paramType + ' ' + genericType : genericType;
+            }
+
             const paramName = this.expect(TokenType.IDENTIFIER).value;
             const param = new Identifier(paramName);
             if (paramType) param.varType = paramType;
@@ -1269,7 +1287,7 @@ export class Parser {
 
         while (this.matchEx(TokenType.KEYWORD, 'and', true) || this.peekOperatorEx(['&&'])) {
             this.advance();
-            this.skipNewlines();
+            this.skipNewlines(true);
             const right = this.parseEquality();
             left = new BinaryExpression('&&', left, right);
         }
@@ -1295,7 +1313,7 @@ export class Parser {
 
         while (this.peekOperatorEx(['<', '>', '<=', '>='])) {
             const op = this.advance().value;
-            this.skipNewlines();
+            this.skipNewlines(true);
             const right = this.parseAdditive();
             left = new BinaryExpression(op, left, right);
         }
diff --git a/src/transpiler/settings.ts b/src/transpiler/settings.ts
index 2dd83ec..4d08506 100644
--- a/src/transpiler/settings.ts
+++ b/src/transpiler/settings.ts
@@ -55,7 +55,6 @@ export const CONTEXT_PINE_VARS = [
     'map',
     'matrix',
     'log',
-    'map',
     //types
     'Type', //UDT
     'bool',
@@ -102,6 +101,9 @@ export const CONTEXT_PINE_VARS = [
     'extend',
     'position',
 
+    // Merge constants (request.security)
+    'barmerge',
+
     // Adjustment constants
     'adjustment',
     'backadjustment',
diff --git a/src/transpiler/transformers/ExpressionTransformer.ts b/src/transpiler/transformers/ExpressionTransformer.ts
index 20af1ca..2ab9251 100644
--- a/src/transpiler/transformers/ExpressionTransformer.ts
+++ b/src/transpiler/transformers/ExpressionTransformer.ts
@@ -512,15 +512,24 @@ function transformOperand(node: any, scopeManager: ScopeManager, namespace: stri
             return getParamFromLogicalExpression(node, scopeManager, namespace);
         }
         case 'MemberExpression': {
+            // For non-computed property access on NAMESPACES_LIKE identifiers (e.g. label.style_label_down),
+            // leave as-is — these are namespace constant accesses, not series values.
+            const isNamespacePropAccess = !node.computed &&
+                node.object.type === 'Identifier' &&
+                NAMESPACES_LIKE.includes(node.object.name) &&
+                scopeManager.isContextBound(node.object.name);
+
             // Handle array access
-            const transformedObject = node.object.type === 'Identifier' ? transformIdentifierForParam(node.object, scopeManager) : node.object;
+            const transformedObject = (node.object.type === 'Identifier' && !isNamespacePropAccess)
+                ? transformIdentifierForParam(node.object, scopeManager)
+                : node.object;
 
             // For non-computed property access on user variables (e.g. get_spt.output),
             // wrap the object in $.get() to extract the current bar's value.
             // Without this, `$.let.glb1_get_spt.output` accesses the Series object itself,
             // not the current bar value's property.
             let finalObject = transformedObject;
-            if (!node.computed && node.object.type === 'Identifier') {
+            if (!node.computed && node.object.type === 'Identifier' && !isNamespacePropAccess) {
                 const [scopedName] = scopeManager.getVariable(node.object.name);
                 const isUserVariable = scopedName !== node.object.name;
                 if (isUserVariable && !scopeManager.isLoopVariable(node.object.name)) {
@@ -650,6 +659,13 @@ function getParamFromConditionalExpression(node: any, scopeManager: ScopeManager
             Identifier(node: any, state: any, c: any) {
                 if (node.name == 'NaN') return;
                 if (NAMESPACES_LIKE.includes(node.name) && scopeManager.isContextBound(node.name)) {
+                    // Skip wrapping when this identifier is the object of a non-computed
+                    // member access (e.g. label.style_label_down) — it's a namespace
+                    // constant access, not a series value.
+                    const isMemberAccess = state.parent && state.parent.type === 'MemberExpression' &&
+                        state.parent.object === node && !state.parent.computed;
+                    if (isMemberAccess) return;
+
                     const originalName = node.name;
                     const valueExpr = {
                         type: 'MemberExpression',
diff --git a/src/transpiler/transformers/MainTransformer.ts b/src/transpiler/transformers/MainTransformer.ts
index bf84a30..becdad8 100644
--- a/src/transpiler/transformers/MainTransformer.ts
+++ b/src/transpiler/transformers/MainTransformer.ts
@@ -10,6 +10,7 @@ import {
     transformReturnStatement,
     transformAssignmentExpression,
     transformForStatement,
+    transformWhileStatement,
     transformIfStatement,
     transformFunctionDeclaration,
 } from './StatementTransformer';
@@ -278,6 +279,9 @@ export function runTransformationPass(
         ForStatement(node: any, state: ScopeManager, c: any) {
             transformForStatement(node, state, c);
         },
+        WhileStatement(node: any, state: ScopeManager, c: any) {
+            transformWhileStatement(node, state, c);
+        },
         IfStatement(node: any, state: ScopeManager, c: any) {
             transformIfStatement(node, state, c);
         },
diff --git a/src/transpiler/transformers/StatementTransformer.ts b/src/transpiler/transformers/StatementTransformer.ts
index 6a536ca..f4f8277 100644
--- a/src/transpiler/transformers/StatementTransformer.ts
+++ b/src/transpiler/transformers/StatementTransformer.ts
@@ -245,7 +245,15 @@ export function transformVariableDeclaration(varNode: any, scopeManager: ScopeMa
         const newName = scopeManager.addVariable(decl.id.name, varNode.kind);
         const kind = varNode.kind; // 'const', 'let', or 'var'
 
-        const isArrayPatternVar = scopeManager.isArrayPatternElement(decl.id.name);
+        // Only treat as an array pattern variable when it actually has the destructured
+        // MemberExpression shape (e.g. _tmp_0[0]) from the AnalysisPass rewrite.
+        // The arrayPatternElements set is global (not scoped), so a same-named variable
+        // inside a function body may be falsely flagged — guard with a shape check.
+        const isArrayPatternVar =
+            scopeManager.isArrayPatternElement(decl.id.name) &&
+            decl.init &&
+            decl.init.type === 'MemberExpression' &&
+            decl.init.computed;
 
         // Transform identifiers in the init expression
         if (decl.init && !isArrowFunction && !isArrayPatternVar) {
@@ -540,7 +548,6 @@ export function transformVariableDeclaration(varNode: any, scopeManager: ScopeMa
             // 1. Use $.get(tempVar, 0) to get the current value from the Series
             // 2. Then access the array element [index]
 
-            // We skipped transformation for decl.init, so it's still a MemberExpression (temp[index])
             const tempVarName = decl.init.object.name;
             const tempVarRef = createScopedVariableReference(tempVarName, scopeManager);
             const arrayIndex = decl.init.property.value;
@@ -692,16 +699,36 @@ export function transformForStatement(node: any, scopeManager: ScopeManager, c:
                     scopeManager.pushScope('for');
                     transformIdentifier(node, state);
                     if (node.type === 'Identifier') {
-                        node.computed = true;
-                        addArrayAccess(node, state);
+                        // Skip $.get() wrapping for namespace objects used as MemberExpression
+                        // objects (e.g. math in math.min(), array in array.size()).
+                        // These are namespace objects, not series variables.
+                        const isNamespaceObject =
+                            scopeManager.isContextBound(node.name) &&
+                            node.parent &&
+                            node.parent.type === 'MemberExpression' &&
+                            node.parent.object === node;
+                        if (!isNamespaceObject) {
+                            node.computed = true;
+                            addArrayAccess(node, state);
+                        }
                     }
                     scopeManager.popScope();
                 }
             },
-            MemberExpression(node: any) {
+            MemberExpression(node: any, state: ScopeManager, c: any) {
                 scopeManager.pushScope('for');
                 transformMemberExpression(node, '', scopeManager);
                 scopeManager.popScope();
+                // If still a MemberExpression after transformation, recurse into the
+                // object so user variable identifiers (e.g. lineMatrix in
+                // lineMatrix.rows()) get transformed via the Identifier handler.
+                // Skip recursion for context-bound namespace objects (math, array, ta, etc.)
+                // — they are namespace objects, not series variables, and must not get $.get() wrapping.
+                if (node.type === 'MemberExpression' && node.object) {
+                    if (node.object.type !== 'Identifier' || !scopeManager.isContextBound(node.object.name)) {
+                        c(node.object, state);
+                    }
+                }
             },
             CallExpression(node: any, state: ScopeManager, c: any) {
                 // Set parent on callee so transformMemberExpression knows it's already being called
@@ -744,13 +771,42 @@ export function transformForStatement(node: any, scopeManager: ScopeManager, c:
 }
 
 export function transformWhileStatement(node: any, scopeManager: ScopeManager, c: any): void {
+    // While-loop test conditions must NOT be hoisted — they're re-evaluated each iteration.
+    // Suppress hoisting so namespace calls like array.size() stay inline.
     scopeManager.setSuppressHoisting(true);
-    // Transform the test condition of the while loop
-    walk.simple(node.test, {
-        Identifier(idNode: any) {
-            transformIdentifier(idNode, scopeManager);
-        },
-    });
+
+    // Transform the test condition
+    if (node.test) {
+        walk.recursive(node.test, scopeManager, {
+            Identifier(node: any, state: ScopeManager) {
+                if (!node.computed) {
+                    transformIdentifier(node, state);
+                }
+            },
+            MemberExpression(node: any, state: ScopeManager, c: any) {
+                transformMemberExpression(node, '', scopeManager);
+                // Recurse into non-namespace objects for user variable resolution
+                if (node.type === 'MemberExpression' && node.object) {
+                    if (node.object.type !== 'Identifier' || !scopeManager.isContextBound(node.object.name)) {
+                        c(node.object, state);
+                    }
+                }
+            },
+            CallExpression(node: any, state: ScopeManager, c: any) {
+                // Transform namespace method calls inline (no hoisting)
+                node.callee.parent = node;
+                c(node.callee, state);
+                transformCallExpression(node, state);
+                // Also traverse arguments
+                if (node.arguments) {
+                    for (const arg of node.arguments) {
+                        c(arg, state);
+                    }
+                }
+            },
+        });
+    }
+
     scopeManager.setSuppressHoisting(false);
 
     // Process the body of the while loop
diff --git a/src/types/PineTypes.ts b/src/types/PineTypes.ts
index 14208b9..72a4122 100644
--- a/src/types/PineTypes.ts
+++ b/src/types/PineTypes.ts
@@ -24,7 +24,7 @@ export type PlotOptions = {
     linewidth?: number;
     style?: string;
     trackprice?: boolean;
-    histbase?: boolean;
+    histbase?: number;
     offset?: number;
     join?: boolean;
     editable?: boolean;
diff --git a/tests/core/udt-drawing-objects.test.ts b/tests/core/udt-drawing-objects.test.ts
new file mode 100644
index 0000000..2d4f8af
--- /dev/null
+++ b/tests/core/udt-drawing-objects.test.ts
@@ -0,0 +1,547 @@
+import { describe, it, expect } from 'vitest';
+import { PineTS, Provider } from 'index';
+
+/**
+ * Tests for UDT (User-Defined Types) containing drawing object fields (line, label, box).
+ *
+ * These tests cover the fix for the "$.get(...).ln.set_xy1 is not a function" bug,
+ * where factory method thunks inside `var` UDT declarations were stored as raw
+ * functions instead of being evaluated to actual drawing objects.
+ *
+ * The fix resolves thunks inside PineTypeObject fields in initVar() on bar 0.
+ */
+describe('UDT with Drawing Objects', () => {
+    const makePineTS = () =>
+        new PineTS(Provider.Mock, 'BTCUSDC', 'W', null, new Date('2019-01-01').getTime(), new Date('2019-03-01').getTime());
+
+    // ----------------------------------------------------------------
+    // Core fix: var UDT with line field — thunk resolution in initVar
+    // ----------------------------------------------------------------
+
+    it('var UDT with line field: set_xy1/set_xy2 work (thunk resolution)', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT Line", overlay=true)
+type MyObj
+    line ln
+
+var MyObj container = MyObj.new(
+    line.new(na, na, na, na, color=#ff0000, width=2)
+)
+container.ln.set_xy1(bar_index, high)
+container.ln.set_xy2(bar_index, low)
+plot(close)
+`;
+        const { plots } = await pineTS.run(code);
+
+        // Line should be created and accessible
+        expect(plots['__lines__']).toBeDefined();
+        const lines = plots['__lines__'].data[0].value;
+        expect(Array.isArray(lines)).toBe(true);
+        // Only 1 line should exist (no orphans from thunks firing on every bar)
+        expect(lines.filter((l: any) => !l._deleted).length).toBe(1);
+
+        const ln = lines[0];
+        expect(ln.color).toBe('#ff0000');
+        expect(ln.width).toBe(2);
+        // Coordinates should have been updated by set_xy1/set_xy2
+        expect(typeof ln.x1).toBe('number');
+        expect(typeof ln.y1).toBe('number');
+        expect(typeof ln.x2).toBe('number');
+        expect(typeof ln.y2).toBe('number');
+        expect(ln.x1).not.toBeNaN();
+    });
+
+    it('var UDT with label field: set_xy/set_text work (thunk resolution)', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT Label", overlay=true)
+type MyObj
+    label lb
+
+var MyObj container = MyObj.new(
+    label.new(na, na, "", color=#5b9cf6, style=label.style_label_down, size=size.small)
+)
+container.lb.set_xy(bar_index, high)
+container.lb.set_text("Price: " + str.tostring(close, "#.##"))
+plot(close)
+`;
+        const { plots } = await pineTS.run(code);
+
+        expect(plots['__labels__']).toBeDefined();
+        const labels = plots['__labels__'].data[0].value;
+        expect(Array.isArray(labels)).toBe(true);
+        expect(labels.filter((l: any) => !l._deleted).length).toBe(1);
+
+        const lb = labels[0];
+        expect(typeof lb.x).toBe('number');
+        expect(lb.x).not.toBeNaN();
+        expect(lb.text).toContain('Price:');
+    });
+
+    it('var UDT with box field: set_lefttop/set_rightbottom work (thunk resolution)', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT Box", overlay=true)
+type MyObj
+    box bx
+
+var MyObj container = MyObj.new(
+    box.new(na, na, na, na, border_color=#5b9cf6, bgcolor=#5b9cf610)
+)
+container.bx.set_lefttop(bar_index - 5, high)
+container.bx.set_rightbottom(bar_index, low)
+plot(close)
+`;
+        const { plots } = await pineTS.run(code);
+
+        expect(plots['__boxes__']).toBeDefined();
+        const boxes = plots['__boxes__'].data[0].value;
+        expect(Array.isArray(boxes)).toBe(true);
+        expect(boxes.filter((b: any) => !b._deleted).length).toBe(1);
+
+        const bx = boxes[0];
+        expect(typeof bx.left).toBe('number');
+        expect(typeof bx.top).toBe('number');
+        expect(bx.border_color).toBe('#5b9cf6');
+    });
+
+    // ----------------------------------------------------------------
+    // Multi-field UDT: line + label + box in a single type
+    // ----------------------------------------------------------------
+
+    it('var UDT with line + label + box fields: all thunks resolved, no orphans', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT Multi-Field", overlay=true)
+type ObjectContainer
+    line  ln
+    label lb
+    box   bx
+
+var ObjectContainer myContainer = ObjectContainer.new(
+    line.new(na, na, na, na, color=#5b9cf6, width=2),
+    label.new(na, na, "", color=#5b9cf6, style=label.style_label_down, size=size.small),
+    box.new(na, na, na, na, border_color=#5b9cf6)
+)
+
+myContainer.ln.set_xy1(bar_index, high)
+myContainer.ln.set_xy2(bar_index, low)
+myContainer.lb.set_xy(bar_index, high)
+myContainer.lb.set_text("Price: " + str.tostring(close, "#.##"))
+myContainer.bx.set_lefttop(bar_index - 4, ta.highest(high, 5))
+myContainer.bx.set_rightbottom(bar_index, ta.lowest(low, 5))
+plot(close, "Price Plot", color=color.new(#5b9cf6, 50))
+`;
+        const { plots } = await pineTS.run(code);
+
+        // All three drawing object types should exist
+        expect(plots['__lines__']).toBeDefined();
+        expect(plots['__labels__']).toBeDefined();
+        expect(plots['__boxes__']).toBeDefined();
+
+        // Exactly 1 of each — no orphan objects from thunks on bars 1+
+        const lines = plots['__lines__'].data[0].value.filter((l: any) => !l._deleted);
+        const labels = plots['__labels__'].data[0].value.filter((l: any) => !l._deleted);
+        const boxes = plots['__boxes__'].data[0].value.filter((b: any) => !b._deleted);
+        expect(lines.length).toBe(1);
+        expect(labels.length).toBe(1);
+        expect(boxes.length).toBe(1);
+
+        // Verify the objects have valid coordinates (were updated via delegate methods)
+        expect(lines[0].x1).not.toBeNaN();
+        expect(lines[0].y1).not.toBeNaN();
+        expect(lines[0].color).toBe('#5b9cf6');
+        expect(labels[0].text).toContain('Price:');
+        expect(typeof boxes[0].left).toBe('number');
+        expect(typeof boxes[0].top).toBe('number');
+    });
+
+    // ----------------------------------------------------------------
+    // Delegate methods (instance.method() syntax) on UDT fields
+    // ----------------------------------------------------------------
+
+    it('delegate methods on UDT line field (instance.set_xy1 syntax)', async () => {
+        const pineTS = makePineTS();
+
+        const { result } = await pineTS.run((context) => {
+            const { Type, line, na, bar_index, high, low } = context.pine;
+
+            const MyType = Type({ ln: 'line' });
+            var container = MyType.new(line.new(0, 100, 10, 200));
+
+            // Use delegate syntax: container.ln.set_xy1(...)
+            container.ln.set_xy1(42, 500);
+            container.ln.set_xy2(99, 600);
+
+            var x1 = container.ln.get_x1();
+            var y1 = container.ln.get_y1();
+            var x2 = container.ln.get_x2();
+            var y2 = container.ln.get_y2();
+
+            return { x1, y1, x2, y2 };
+        });
+
+        expect(result.x1[0]).toBe(42);
+        expect(result.y1[0]).toBe(500);
+        expect(result.x2[0]).toBe(99);
+        expect(result.y2[0]).toBe(600);
+    });
+
+    it('delegate methods on UDT label field (instance.set_text syntax)', async () => {
+        const pineTS = makePineTS();
+
+        const { result } = await pineTS.run((context) => {
+            const { Type, label } = context.pine;
+
+            const MyType = Type({ lb: 'label' });
+            var container = MyType.new(label.new(0, 100, 'initial'));
+
+            container.lb.set_text('updated');
+            container.lb.set_xy(42, 500);
+
+            var text = container.lb.get_text();
+            var x = container.lb.get_x();
+            var y = container.lb.get_y();
+
+            return { text, x, y };
+        });
+
+        expect(result.text[0]).toBe('updated');
+        expect(result.x[0]).toBe(42);
+        expect(result.y[0]).toBe(500);
+    });
+
+    it('delegate methods on UDT box field (instance.set_lefttop syntax)', async () => {
+        const pineTS = makePineTS();
+
+        const { result } = await pineTS.run((context) => {
+            const { Type, box } = context.pine;
+
+            const MyType = Type({ bx: 'box' });
+            var container = MyType.new(box.new(0, 100, 10, 50));
+
+            container.bx.set_lefttop(42, 500);
+            container.bx.set_rightbottom(99, 200);
+
+            var left = container.bx.get_left();
+            var top = container.bx.get_top();
+            var right = container.bx.get_right();
+            var bottom = container.bx.get_bottom();
+
+            return { left, top, right, bottom };
+        });
+
+        expect(result.left[0]).toBe(42);
+        expect(result.top[0]).toBe(500);
+        expect(result.right[0]).toBe(99);
+        expect(result.bottom[0]).toBe(200);
+    });
+
+    // ----------------------------------------------------------------
+    // UDT field persistence with var across bars
+    // ----------------------------------------------------------------
+
+    it('var UDT persists drawing object across bars (same object mutated)', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT Persistence", overlay=true)
+type MyObj
+    line ln
+
+var MyObj container = MyObj.new(
+    line.new(0, 100, 10, 200)
+)
+container.ln.set_x1(bar_index)
+container.ln.set_y1(close)
+plot(close)
+`;
+        const { plots } = await pineTS.run(code);
+
+        const lines = plots['__lines__'].data[0].value;
+        // Should still be 1 line (var persists, not recreated)
+        expect(lines.filter((l: any) => !l._deleted).length).toBe(1);
+        // The line's coordinates should reflect the last bar's values
+        const ln = lines[0];
+        expect(ln.x1).not.toBe(0); // Updated from initial 0
+    });
+
+    // ----------------------------------------------------------------
+    // Non-var UDT with drawing objects (let — no thunk wrapping)
+    // ----------------------------------------------------------------
+
+    it('let UDT with line field works without thunks', async () => {
+        const pineTS = makePineTS();
+
+        const { result } = await pineTS.run((context) => {
+            const { Type, line } = context.pine;
+
+            const MyType = Type({ ln: 'line' });
+            let container = MyType.new(line.new(0, 100, 10, 200));
+
+            container.ln.set_xy1(42, 500);
+            var x1 = container.ln.get_x1();
+            var y1 = container.ln.get_y1();
+
+            return { x1, y1 };
+        });
+
+        expect(result.x1[0]).toBe(42);
+        expect(result.y1[0]).toBe(500);
+    });
+});
+
+/**
+ * Tests for simple `var` line/label/box declarations (no UDT).
+ * Ensures that thunk wrapping + initVar deferred evaluation still works
+ * correctly after the UDT fix.
+ */
+describe('var Drawing Objects (non-UDT, regression)', () => {
+    const makePineTS = () =>
+        new PineTS(Provider.Mock, 'BTCUSDC', 'W', null, new Date('2019-01-01').getTime(), new Date('2019-03-01').getTime());
+
+    it('var line creates exactly 1 line (no orphans)', async () => {
+        const pineTS = makePineTS();
+
+        const { plots } = await pineTS.run((context) => {
+            var myLine = line.new(0, 100, 10, 200, xloc.bar_index, 'none', '#ff0000');
+            line.set_xy1(myLine, bar_index, high);
+            line.set_xy2(myLine, bar_index, low);
+            return {};
+        });
+
+        const lines = plots['__lines__'].data[0].value;
+        expect(lines.filter((l: any) => !l._deleted).length).toBe(1);
+    });
+
+    it('var label creates exactly 1 label (no orphans)', async () => {
+        const pineTS = makePineTS();
+
+        const { plots } = await pineTS.run((context) => {
+            var myLabel = label.new(0, 100, 'test');
+            label.set_xy(myLabel, bar_index, high);
+            return {};
+        });
+
+        const labels = plots['__labels__'].data[0].value;
+        expect(labels.filter((l: any) => !l._deleted).length).toBe(1);
+    });
+
+    it('var box creates exactly 1 box (no orphans)', async () => {
+        const pineTS = makePineTS();
+
+        const { plots } = await pineTS.run((context) => {
+            var myBox = box.new(0, 100, 10, 50);
+            box.set_lefttop(myBox, bar_index - 5, high);
+            box.set_rightbottom(myBox, bar_index, low);
+            return {};
+        });
+
+        const boxes = plots['__boxes__'].data[0].value;
+        expect(boxes.filter((b: any) => !b._deleted).length).toBe(1);
+    });
+});
+
+/**
+ * Tests for map namespace — ensuring no conflict with native JS Map.
+ *
+ * Covers the fix for duplicate 'map' in CONTEXT_PINE_VARS which caused
+ * `const {map, map} = $.pine` (invalid destructuring).
+ */
+describe('Map Namespace (no native JS conflict)', () => {
+    const makePineTS = () =>
+        new PineTS(Provider.Mock, 'BTCUSDC', 'W', null, new Date('2019-01-01').getTime(), new Date('2019-03-01').getTime());
+
+    it('map.new() and map operations work in Pine Script source', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("Map Test")
+var m = map.new<string, float>()
+if bar_index == 0
+    m.put("a", 10.0)
+    m.put("b", 20.0)
+    m.put("c", 30.0)
+plot(m.size(), "size")
+plot(m.get("b"), "val_b")
+plot(m.contains("a") ? 1 : 0, "has_a")
+`;
+        const { plots } = await pineTS.run(code);
+
+        const lastVal = (plotName: string) => {
+            const data = plots[plotName]?.data;
+            return data?.[data.length - 1]?.value;
+        };
+
+        expect(lastVal('size')).toBe(3);
+        expect(lastVal('val_b')).toBe(20);
+        expect(lastVal('has_a')).toBe(1);
+    });
+
+    it('map with drawing object values (map<int, line>)', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("Map Drawing Objects", overlay=true)
+var m = map.new<int, line>()
+if bar_index == 0
+    m.put(1, line.new(0, 100, 10, 200, color=#ff0000))
+    m.put(2, line.new(0, 300, 10, 400, color=#00ff00))
+plot(m.size(), "size")
+plot(m.contains(1) ? 1 : 0, "has_1")
+`;
+        const { plots } = await pineTS.run(code);
+
+        const lastVal = (plotName: string) => {
+            const data = plots[plotName]?.data;
+            return data?.[data.length - 1]?.value;
+        };
+
+        expect(lastVal('size')).toBe(2);
+        expect(lastVal('has_1')).toBe(1);
+    });
+});
+
+/**
+ * Tests for UDT with drawing objects in Pine Script source code (string).
+ * These use the full transpiler pipeline end-to-end.
+ */
+describe('UDT Drawing Objects - Pine Script Source (E2E)', () => {
+    const makePineTS = () =>
+        new PineTS(Provider.Mock, 'BTCUSDC', 'W', null, new Date('2019-01-01').getTime(), new Date('2019-03-01').getTime());
+
+    it('full UDT Object Management indicator (the original bug script)', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT Object Management", overlay = true)
+color MAIN_COLOR = #5b9cf6
+type ObjectContainer
+    line  ln
+    label lb
+    box   bx
+
+var ObjectContainer myContainer = ObjectContainer.new(
+    line.new(na, na, na, na, color = MAIN_COLOR, width = 2),
+    label.new(na, na, "", color = MAIN_COLOR, style = label.style_label_down, size = size.small),
+    box.new(na, na, na, na, border_color = MAIN_COLOR, bgcolor = color.new(MAIN_COLOR, 90))
+)
+
+myContainer.ln.set_xy1(bar_index, high)
+myContainer.ln.set_xy2(bar_index, low)
+myContainer.lb.set_xy(bar_index, high)
+myContainer.lb.set_text("Price: " + str.tostring(close, "#.##"))
+
+int lookback = 5
+float top = ta.highest(high, lookback)
+float bottom = ta.lowest(low, lookback)
+myContainer.bx.set_lefttop(bar_index - lookback + 1, top)
+myContainer.bx.set_rightbottom(bar_index, bottom)
+plot(close, "Price Plot", color = color.new(MAIN_COLOR, 50))
+`;
+        const { plots } = await pineTS.run(code);
+
+        // All drawing types present
+        expect(plots['__lines__']).toBeDefined();
+        expect(plots['__labels__']).toBeDefined();
+        expect(plots['__boxes__']).toBeDefined();
+        expect(plots['Price Plot']).toBeDefined();
+
+        // Exactly 1 of each — no orphans
+        const lines = plots['__lines__'].data[0].value.filter((l: any) => !l._deleted);
+        const labels = plots['__labels__'].data[0].value.filter((l: any) => !l._deleted);
+        const boxes = plots['__boxes__'].data[0].value.filter((b: any) => !b._deleted);
+        expect(lines.length).toBe(1);
+        expect(labels.length).toBe(1);
+        expect(boxes.length).toBe(1);
+
+        // Verify line properties
+        expect(lines[0].color).toBe('#5b9cf6');
+        expect(lines[0].width).toBe(2);
+        expect(lines[0].x1).not.toBeNaN();
+        expect(lines[0].y1).not.toBeNaN();
+
+        // Verify label text was set
+        expect(labels[0].text).toContain('Price:');
+
+        // Verify box coordinates
+        expect(typeof boxes[0].left).toBe('number');
+        expect(typeof boxes[0].top).toBe('number');
+        expect(boxes[0].left).not.toBeNaN();
+        expect(boxes[0].top).not.toBeNaN();
+    });
+
+    it('UDT with var and let drawing objects coexisting', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT var+let", overlay=true)
+type MyObj
+    line persistent_ln
+    label persistent_lb
+
+var MyObj container = MyObj.new(
+    line.new(na, na, na, na, color=#ff0000),
+    label.new(na, na, "", color=#0000ff)
+)
+
+container.persistent_ln.set_xy1(bar_index, high)
+container.persistent_ln.set_xy2(bar_index, low)
+container.persistent_lb.set_xy(bar_index, high)
+container.persistent_lb.set_text(str.tostring(bar_index))
+plot(close)
+`;
+        const { plots } = await pineTS.run(code);
+
+        const lines = plots['__lines__'].data[0].value.filter((l: any) => !l._deleted);
+        const labels = plots['__labels__'].data[0].value.filter((l: any) => !l._deleted);
+
+        // var UDT: exactly 1 line, 1 label
+        expect(lines.length).toBe(1);
+        expect(labels.length).toBe(1);
+        expect(lines[0].color).toBe('#ff0000');
+    });
+
+    it('UDT with mixed drawing and scalar fields', async () => {
+        const pineTS = makePineTS();
+
+        const code = `
+//@version=6
+indicator("UDT Mixed Fields", overlay=true)
+type PriceLevel
+    float price = 0.0
+    string name = ""
+    line ln
+
+var PriceLevel level = PriceLevel.new(100.0, "support", line.new(0, 100, 10, 100, color=#00ff00))
+
+level.ln.set_xy1(0, level.price)
+level.ln.set_xy2(bar_index, level.price)
+plot(level.price, "level_price")
+`;
+        const { plots } = await pineTS.run(code);
+
+        expect(plots['__lines__']).toBeDefined();
+        const lines = plots['__lines__'].data[0].value.filter((l: any) => !l._deleted);
+        expect(lines.length).toBe(1);
+        expect(lines[0].color).toBe('#00ff00');
+
+        // Scalar field should be accessible
+        expect(plots['level_price']).toBeDefined();
+        expect(plots['level_price'].data[0].value).toBe(100);
+    });
+});
diff --git a/tests/debug/debug-htf-lastbar.ts b/tests/debug/debug-htf-lastbar.ts
new file mode 100644
index 0000000..0464030
--- /dev/null
+++ b/tests/debug/debug-htf-lastbar.ts
@@ -0,0 +1,107 @@
+/**
+ * Debug script: Verify HTF last-bar fix on 1h timeframe.
+ *
+ * Usage: cd PineTS && npx tsx --tsconfig tsconfig.json tests/debug/debug-htf-lastbar.ts
+ */
+
+import { PineTS } from '../../src/PineTS.class';
+import { Provider } from '../../src/marketData/Provider.class';
+
+const TAIL_BARS = 30;
+
+async function main() {
+    const sDate = new Date('2026-02-24').getTime();
+    const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', '60', undefined, sDate);
+
+    const ctx = await pineTS.run(
+`//@version=5
+indicator("HTF Debug")
+float wkHigh  = request.security(syminfo.tickerid, "W", high, barmerge.gaps_off, barmerge.lookahead_off)
+float wkLow   = request.security(syminfo.tickerid, "W", low, barmerge.gaps_off, barmerge.lookahead_off)
+float wkClose = request.security(syminfo.tickerid, "W", close, barmerge.gaps_off, barmerge.lookahead_off)
+plot(wkHigh, "wkHigh")
+plot(wkLow, "wkLow")
+plot(wkClose, "wkClose")
+`) as any;
+
+    const totalBars = ctx.data.close.data.length;
+    const start = Math.max(0, totalBars - TAIL_BARS);
+
+    // Extract plot values from plot data objects
+    const wkHighData = ctx.plots['wkHigh'].data;
+    const wkLowData = ctx.plots['wkLow'].data;
+    const wkCloseData = ctx.plots['wkClose'].data;
+
+    // Get secondary context for reference
+    const cacheKeys = Object.keys(ctx.cache).filter(k => !k.endsWith('_prevIdx'));
+    const cached0 = ctx.cache[cacheKeys[0]];
+    const secCtx = cached0.context || cached0;
+    const secOpenTimes = secCtx.data?.openTime?.data || [];
+    const secCloseTimes = secCtx.data?.closeTime?.data || [];
+
+    // Show weekly bars
+    console.log(`=== Secondary context (Weekly bars): ${secOpenTimes.length} bars ===`);
+    for (let j = 0; j < secOpenTimes.length; j++) {
+        const ot = new Date(secOpenTimes[j]).toISOString().slice(0, 10);
+        const ct = new Date(secCloseTimes[j]).toISOString().slice(0, 10);
+        const isCurrent = secCloseTimes[j] > Date.now() ? ' ◄ CURRENT' : '';
+        const vals: string[] = [];
+        for (const ck of cacheKeys) {
+            const sc = (ctx.cache[ck].context || ctx.cache[ck]);
+            const exprKey = ck.split('_').pop()!;
+            vals.push(String(sc.params[exprKey]?.[j] ?? 'N/A'));
+        }
+        console.log(`  [${j}] ${ot} → ${ct} | high=${vals[0]} | low=${vals[1]} | close=${vals[2]}${isCurrent}`);
+    }
+
+    // Show last N hourly bars
+    console.log(`\n=== Last ${totalBars - start} hourly bars: PineTS output ===`);
+    console.log('bar  | time                 | wkHigh       | wkLow        | wkClose      | week');
+    console.log('-----|----------------------|--------------|--------------|--------------|------');
+
+    let prevHigh: number | null = null;
+    for (let i = start; i < totalBars; i++) {
+        const myOpenTime = ctx.data.openTime.data[i];
+        const myCloseTime = ctx.data.closeTime.data[i];
+        const time = new Date(myOpenTime).toISOString().replace('T', ' ').slice(0, 16);
+
+        const h = wkHighData[i]?.value;
+        const l = wkLowData[i]?.value;
+        const c = wkCloseData[i]?.value;
+
+        // Which weekly bar
+        let weekIdx = -1;
+        let isOpenWeek = false;
+        for (let j = 0; j < secOpenTimes.length; j++) {
+            if (secOpenTimes[j] <= myOpenTime && myOpenTime < secCloseTimes[j]) {
+                weekIdx = j;
+                isOpenWeek = secCloseTimes[j] > Date.now();
+                break;
+            }
+        }
+
+        const isLast = i === totalBars - 1;
+        const isRealtime = isLast && myCloseTime > Date.now();
+        const changed = prevHigh !== null && h !== prevHigh ? ' ◄ VALUE CHANGED' : '';
+        const marker = isRealtime ? ' ◄ REALTIME' : (isLast ? ' ◄ LAST' : '');
+
+        console.log(
+            `${String(i).padStart(4)} | ${time} | ${String(h ?? 'NaN').padStart(12)} | ${String(l ?? 'NaN').padStart(12)} | ${String(c ?? 'NaN').padStart(12)} | wk${weekIdx}${isOpenWeek ? '(open)' : ''}${marker}${changed}`
+        );
+        prevHigh = h;
+    }
+
+    console.log(`\n=== Summary ===`);
+    console.log(`Total bars: ${totalBars}, last bar closeTime: ${new Date(ctx.data.closeTime.data[totalBars - 1]).toISOString()}`);
+    console.log(`Current time: ${new Date().toISOString()}`);
+    console.log(`Last bar is realtime: ${ctx.data.closeTime.data[totalBars - 1] > Date.now()}`);
+
+    // Highlight the fix
+    const lastH = wkHighData[totalBars - 1]?.value;
+    const prevH = wkHighData[totalBars - 2]?.value;
+    console.log(`\nSecond-to-last bar wkHigh: ${prevH} (should be prev week = 70023.8)`);
+    console.log(`Last bar (realtime) wkHigh: ${lastH} (should be current week = 74086.95)`);
+    console.log(`Fix working: ${lastH !== prevH ? 'YES - last bar shows developing HTF values' : 'NO - still showing previous week'}`);
+}
+
+main().catch(console.error);
diff --git a/tests/namespaces/array/bounds-check.test.ts b/tests/namespaces/array/bounds-check.test.ts
new file mode 100644
index 0000000..423ebd9
--- /dev/null
+++ b/tests/namespaces/array/bounds-check.test.ts
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (C) 2025 Alaa-eddine KADDOURI
+
+/**
+ * Array.get Bounds Checking Tests
+ *
+ * Regression tests for array.get() out-of-bounds access.
+ * Previously, out-of-bounds array.get() returned `undefined`, which caused
+ * downstream crashes when accessing properties (e.g., `undefined.zoneLine`).
+ *
+ * The fix returns NaN (Pine's `na`) for out-of-bounds indices, matching
+ * Pine Script's behavior where out-of-bounds access returns na.
+ */
+
+import { describe, it, expect } from 'vitest';
+import PineTS from '../../../src/PineTS.class';
+import { Provider } from '../../../src/marketData/Provider.class';
+
+describe('Array.get Bounds Checking', () => {
+    const sDate = new Date('2024-01-01').getTime();
+    const eDate = new Date('2024-01-02').getTime();
+
+    it('should return NaN for negative index', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { array, na } = context.pine;
+
+            const arr = array.new_float(3, 100);
+            const val = array.get(arr, -1);
+            const isNa = na(val);
+
+            return { val, isNa };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.val)).toBeNaN();
+        expect(last(result.isNa)).toBe(true);
+    });
+
+    it('should return NaN for index >= array length', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { array, na } = context.pine;
+
+            const arr = array.new_float(3, 100);
+            const val_at_length = array.get(arr, 3);    // index == length
+            const val_beyond = array.get(arr, 10);       // index > length
+            const isNa1 = na(val_at_length);
+            const isNa2 = na(val_beyond);
+
+            return { val_at_length, val_beyond, isNa1, isNa2 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.val_at_length)).toBeNaN();
+        expect(last(result.val_beyond)).toBeNaN();
+        expect(last(result.isNa1)).toBe(true);
+        expect(last(result.isNa2)).toBe(true);
+    });
+
+    it('should return correct value for valid index', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { array } = context.pine;
+
+            const arr = array.new_float(0);
+            array.push(arr, 10);
+            array.push(arr, 20);
+            array.push(arr, 30);
+
+            const first = array.get(arr, 0);
+            const mid = array.get(arr, 1);
+            const last_val = array.get(arr, 2);
+
+            return { first, mid, last_val };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.first)).toBe(10);
+        expect(last(result.mid)).toBe(20);
+        expect(last(result.last_val)).toBe(30);
+    });
+
+    it('should return NaN for empty array access', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { array, na } = context.pine;
+
+            const arr = array.new_float(0);
+            const val = array.get(arr, 0);
+            const isNa = na(val);
+
+            return { val, isNa };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.val)).toBeNaN();
+        expect(last(result.isNa)).toBe(true);
+    });
+
+    it('should use method syntax for bounds check (arr.get())', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { array, na } = context.pine;
+
+            const arr = array.new_int(5, 42);
+            const valid = arr.get(2);
+            const invalid = arr.get(10);
+
+            return { valid, invalid };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.valid)).toBe(42);
+        expect(last(result.invalid)).toBeNaN();
+    });
+
+    it('should handle bounds check in conditional logic (regression: zoneLine crash)', async () => {
+        // This reproduces the pattern that caused the PZA crash:
+        // array.get(zones, idx) where idx is out of bounds returned undefined,
+        // then accessing .someProperty on undefined crashed.
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { array, na } = context.pine;
+
+            const arr = array.new_float(0);
+            array.push(arr, 100);
+            array.push(arr, 200);
+
+            // Access out of bounds — should be NaN, not undefined
+            const oob = array.get(arr, 5);
+            // na() check should work on the result
+            const isOobNa = na(oob);
+
+            // Safe conditional access pattern
+            let safeVal = 0;
+            if (!na(array.get(arr, 0))) {
+                safeVal = array.get(arr, 0);
+            }
+
+            return { oob, isOobNa, safeVal };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.isOobNa)).toBe(true);
+        expect(last(result.safeVal)).toBe(100);
+    });
+});
diff --git a/tests/namespaces/barstate.test.ts b/tests/namespaces/barstate.test.ts
new file mode 100644
index 0000000..4b6ebf4
--- /dev/null
+++ b/tests/namespaces/barstate.test.ts
@@ -0,0 +1,179 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (C) 2025 Alaa-eddine KADDOURI
+
+/**
+ * Barstate Namespace Tests
+ *
+ * Tests for barstate properties: isfirst, islast, ishistory, isrealtime,
+ * isconfirmed, islastconfirmedhistory.
+ *
+ * Uses Binance live data for accurate closeTime values, which are essential
+ * for isconfirmed, islastconfirmedhistory, ishistory, and isrealtime.
+ *
+ * Includes regression tests for:
+ * - isconfirmed: Was checking last bar's closeTime instead of current bar's.
+ *   Also had a data access bug using `closeTime[idx]` on a Series object
+ *   (returns undefined) instead of `closeTime.data[idx]` for raw array access.
+ * - islastconfirmedhistory: Same Series data access fix.
+ */
+
+import { describe, it, expect } from 'vitest';
+import PineTS from '../../src/PineTS.class';
+import { Provider } from '../../src/marketData/Provider.class';
+
+describe('Barstate Namespace', () => {
+    // Use Binance weekly data with a well-defined historical range
+    const sDate = new Date('2020-01-01').getTime();
+    const eDate = new Date('2020-06-01').getTime();
+
+    it('should report isfirst correctly', async () => {
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { barstate } = context.pine;
+            const isFirst = barstate.isfirst;
+            return { isFirst };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+
+        expect(result.isFirst.length).toBeGreaterThan(10);
+        // First bar should be true, rest should be false
+        expect(result.isFirst[0]).toBe(true);
+        for (let i = 1; i < result.isFirst.length; i++) {
+            expect(result.isFirst[i]).toBe(false);
+        }
+    });
+
+    it('should report islast correctly', async () => {
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { barstate } = context.pine;
+            const isLast = barstate.islast;
+            return { isLast };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const len = result.isLast.length;
+
+        expect(len).toBeGreaterThan(10);
+        // Last bar should be true, all others false
+        expect(result.isLast[len - 1]).toBe(true);
+        for (let i = 0; i < len - 1; i++) {
+            expect(result.isLast[i]).toBe(false);
+        }
+    });
+
+    it('should report ishistory and isrealtime as booleans for each bar', async () => {
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { barstate } = context.pine;
+            const isHistory = barstate.ishistory;
+            const isRealtime = barstate.isrealtime;
+            return { isHistory, isRealtime };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const len = result.isHistory.length;
+
+        expect(len).toBeGreaterThan(10);
+        // Each value should be a boolean and isHistory/isRealtime should be complementary
+        for (let i = 0; i < len; i++) {
+            expect(typeof result.isHistory[i]).toBe('boolean');
+            expect(typeof result.isRealtime[i]).toBe('boolean');
+        }
+    });
+
+    it('should report isconfirmed=true for all historical bars (regression: Series data access)', async () => {
+        // Regression test: barstate.isconfirmed used to access closeTime[idx]
+        // on a Series object (always undefined → false). Fixed to use closeTime.data[idx].
+        // All bars from 2020 are historical — their closeTime is in the past.
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { barstate } = context.pine;
+            const isConfirmed = barstate.isconfirmed;
+            return { isConfirmed };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const len = result.isConfirmed.length;
+
+        // All bars from 2020 should be confirmed (their closeTime is far in the past)
+        expect(len).toBeGreaterThan(10);
+        const confirmedCount = result.isConfirmed.filter((v: boolean) => v === true).length;
+        expect(confirmedCount).toBe(len);
+    });
+
+    it('should count confirmed bars in a loop (regression: confirmedCount was always 0)', async () => {
+        // Before the fix, barstate.isconfirmed was always false for historical data
+        // because it used Series bracket access instead of .data[] access.
+        // This caused confirmedCount to be 0 in the pressure-zone-analyzer script.
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { barstate } = context.pine;
+
+            // Accumulate confirmed count — before the fix, this was always 0
+            let confirmedCount = 0;
+            if (barstate.isconfirmed) {
+                confirmedCount = 1;
+            }
+
+            return { confirmedCount };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+
+        // Every bar in 2020 should have confirmedCount = 1
+        // (before the fix, every bar had confirmedCount = 0)
+        const allConfirmed = result.confirmedCount.every((v: number) => v === 1);
+        expect(allConfirmed).toBe(true);
+    });
+
+    it('should report islastconfirmedhistory as boolean without crashing (regression: Series data access)', async () => {
+        // Regression test: islastconfirmedhistory used to crash when accessing
+        // closeTime[idx] on a Series object. Fixed to use closeTime.data[idx].
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { barstate } = context.pine;
+            const isLCH = barstate.islastconfirmedhistory;
+            return { isLCH };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+
+        // Should not crash and return booleans for each bar
+        expect(result.isLCH.length).toBeGreaterThan(10);
+        for (const val of result.isLCH) {
+            expect(typeof val).toBe('boolean');
+        }
+    });
+
+    it('should use barstate.isconfirmed in conditional logic (Pine Script)', async () => {
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate, eDate);
+
+        const code = `
+//@version=5
+indicator("Barstate Confirmed Pine Test")
+
+var int confirmedBars = 0
+if barstate.isconfirmed
+    confirmedBars += 1
+
+plot(confirmedBars, "Confirmed")
+`;
+        const { plots } = await pineTS.run(code);
+        expect(plots['Confirmed']).toBeDefined();
+
+        // Last value should be the total number of confirmed bars
+        // For all-historical data, every bar is confirmed so the final count
+        // should equal the total number of bars
+        const lastValue = plots['Confirmed'].data[plots['Confirmed'].data.length - 1].value;
+        expect(lastValue).toBeGreaterThan(0);
+        expect(lastValue).toBe(plots['Confirmed'].data.length);
+    });
+});
diff --git a/tests/namespaces/constants.test.ts b/tests/namespaces/constants.test.ts
index ea9ba75..f8f4ef6 100644
--- a/tests/namespaces/constants.test.ts
+++ b/tests/namespaces/constants.test.ts
@@ -335,8 +335,7 @@ describe('Constants', () => {
     });
 
     // ── barmerge ───────────────────────────────────────────────────────
-    // barmerge is defined in Types.ts but not yet registered in CONTEXT_PINE_VARS
-    it.todo('barmerge.* constants match TradingView values', async () => {
+    it('barmerge.* constants match TradingView values', async () => {
         const pineTS = makePineTS();
 
         const { result } = await pineTS.run((context) => {
@@ -354,6 +353,54 @@ describe('Constants', () => {
         expect(result.lookahead_off[0]).toBe('lookahead_off');
     });
 
+    // ── extend ────────────────────────────────────────────────────────
+    it('extend.* constants match TradingView values', async () => {
+        const pineTS = makePineTS();
+
+        const { result } = await pineTS.run((context) => {
+            return {
+                left: extend.left,
+                right: extend.right,
+                both: extend.both,
+                none: extend.none,
+            };
+        });
+
+        expect(result.left[0]).toBe('l');
+        expect(result.right[0]).toBe('r');
+        expect(result.both[0]).toBe('b');
+        expect(result.none[0]).toBe('n');
+    });
+
+    // ── position ─────────────────────────────────────────────────────
+    it('position.* constants match TradingView values', async () => {
+        const pineTS = makePineTS();
+
+        const { result } = await pineTS.run((context) => {
+            return {
+                top_left: position.top_left,
+                top_center: position.top_center,
+                top_right: position.top_right,
+                middle_left: position.middle_left,
+                middle_center: position.middle_center,
+                middle_right: position.middle_right,
+                bottom_left: position.bottom_left,
+                bottom_center: position.bottom_center,
+                bottom_right: position.bottom_right,
+            };
+        });
+
+        expect(result.top_left[0]).toBe('top_left');
+        expect(result.top_center[0]).toBe('top_center');
+        expect(result.top_right[0]).toBe('top_right');
+        expect(result.middle_left[0]).toBe('middle_left');
+        expect(result.middle_center[0]).toBe('middle_center');
+        expect(result.middle_right[0]).toBe('middle_right');
+        expect(result.bottom_left[0]).toBe('bottom_left');
+        expect(result.bottom_center[0]).toBe('bottom_center');
+        expect(result.bottom_right[0]).toBe('bottom_right');
+    });
+
     // ── plot (style constants) ─────────────────────────────────────────
     it('plot.* style constants match TradingView values', async () => {
         const pineTS = makePineTS();
diff --git a/tests/namespaces/plot/plot.test.ts b/tests/namespaces/plot/plot.test.ts
index 029a822..d8462df 100644
--- a/tests/namespaces/plot/plot.test.ts
+++ b/tests/namespaces/plot/plot.test.ts
@@ -153,6 +153,33 @@ describe('PLOT Namespace', () => {
         expect(plots[fillEntry.plot2]).toBeDefined();
     });
 
+    it('plot() with histbase option stores numeric value in options', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, new Date('2025-01-01').getTime(), new Date('2025-01-10').getTime());
+
+        const { plots } = await pineTS.run((context) => {
+            plot(close - open, 'Hist', { style: plot.style_histogram, histbase: 50, color: color.blue });
+            return {};
+        });
+
+        expect(plots['Hist']).toBeDefined();
+        expect(plots['Hist'].options).toBeDefined();
+        expect(plots['Hist'].options.histbase).toBe(50);
+        expect(plots['Hist'].options.style).toBe('style_histogram');
+    });
+
+    it('plot() with histbase=0 stores zero correctly', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, new Date('2025-01-01').getTime(), new Date('2025-01-10').getTime());
+
+        const { plots } = await pineTS.run((context) => {
+            plot(close - open, 'ZeroBase', { style: plot.style_histogram, histbase: 0 });
+            return {};
+        });
+
+        expect(plots['ZeroBase']).toBeDefined();
+        expect(plots['ZeroBase'].options).toBeDefined();
+        expect(plots['ZeroBase'].options.histbase).toBe(0);
+    });
+
     it('plot() returns a reference that fill() can consume', async () => {
         const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, new Date('2025-01-01').getTime(), new Date('2025-01-10').getTime());
 
diff --git a/tests/namespaces/request-cross-tf.test.ts b/tests/namespaces/request-cross-tf.test.ts
new file mode 100644
index 0000000..2653675
--- /dev/null
+++ b/tests/namespaces/request-cross-tf.test.ts
@@ -0,0 +1,247 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Tests for request.security cross-timeframe fixes:
+// 1. normalizeTimeframe() for non-canonical timeframe strings
+// 2. barmerge string enum ('gaps_off'/'lookahead_off') → boolean conversion
+// 3. Weekly→Daily (LTF) cross-TF correctness against TV reference data
+// 4. 1h→Daily (HTF) cross-TF correctness (no NaN)
+
+import { describe, it, expect } from 'vitest';
+import { PineTS } from '../../src/PineTS.class';
+import { Provider } from '@pinets/marketData/Provider.class';
+import { normalizeTimeframe, TIMEFRAMES } from '../../src/namespaces/request/utils/TIMEFRAMES';
+
+// ── normalizeTimeframe unit tests ──────────────────────────────────────────────
+
+describe('normalizeTimeframe', () => {
+    it('should pass through canonical formats unchanged', () => {
+        for (const tf of TIMEFRAMES) {
+            expect(normalizeTimeframe(tf)).toBe(tf);
+        }
+    });
+
+    it('should normalize minute formats (1m, 3m, 5m, 15m, 30m, 45m)', () => {
+        expect(normalizeTimeframe('1m')).toBe('1');
+        expect(normalizeTimeframe('3m')).toBe('3');
+        expect(normalizeTimeframe('5m')).toBe('5');
+        expect(normalizeTimeframe('15m')).toBe('15');
+        expect(normalizeTimeframe('30m')).toBe('30');
+        expect(normalizeTimeframe('45m')).toBe('45');
+    });
+
+    it('should normalize hour formats (1h, 2h, 3h, 4h)', () => {
+        expect(normalizeTimeframe('1h')).toBe('60');
+        expect(normalizeTimeframe('2h')).toBe('120');
+        expect(normalizeTimeframe('3h')).toBe('180');
+        expect(normalizeTimeframe('4h')).toBe('240');
+    });
+
+    it('should normalize uppercase hour formats (1H, 4H)', () => {
+        expect(normalizeTimeframe('1H')).toBe('60');
+        expect(normalizeTimeframe('4H')).toBe('240');
+    });
+
+    it('should normalize day/week/month formats', () => {
+        expect(normalizeTimeframe('1d')).toBe('D');
+        expect(normalizeTimeframe('1D')).toBe('D');
+        expect(normalizeTimeframe('1w')).toBe('W');
+        expect(normalizeTimeframe('1W')).toBe('W');
+        expect(normalizeTimeframe('1M')).toBe('M');
+    });
+
+    it('should normalize lowercase single-letter formats (d, w, m)', () => {
+        expect(normalizeTimeframe('d')).toBe('D');
+        expect(normalizeTimeframe('w')).toBe('W');
+        expect(normalizeTimeframe('m')).toBe('M');
+    });
+
+    it('should return unknown formats as-is', () => {
+        expect(normalizeTimeframe('2D')).toBe('2D');
+        expect(normalizeTimeframe('xyz')).toBe('xyz');
+    });
+});
+
+// ── barmerge string enum handling ──────────────────────────────────────────────
+
+describe('request.security barmerge string enum handling', () => {
+    // Helper: extract plot data as { time, value }[] filtered to date range
+    function extractPlot(
+        plots: any,
+        name: string,
+        sDate: number,
+        eDate: number,
+    ): { time: string; value: any }[] {
+        const plotdata = plots[name]?.data || [];
+        return plotdata
+            .filter((e: any) => e.time >= sDate && e.time <= eDate)
+            .map((e: any) => ({
+                time: new Date(e.time).toISOString().slice(0, 10),
+                value: e.value,
+            }));
+    }
+
+    it('barmerge.gaps_off/lookahead_off strings should behave like false/false', async () => {
+        // The transpiler emits barmerge.gaps_off = 'gaps_off' and barmerge.lookahead_off = 'lookahead_off'
+        // These are truthy strings and must be explicitly converted to boolean false.
+        // Before the fix, they were passed directly to findLTFContextIdx/findSecContextIdx
+        // where `if (gaps && lookahead)` evaluated as TRUE, taking the wrong code path.
+        const sDate = new Date('2019-01-07').getTime();
+        const eDate = new Date('2019-02-04').getTime();
+        const warmup = 365 * 24 * 60 * 60 * 1000;
+
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate - warmup);
+
+        const { plots } = await pineTS.run(
+`//@version=5
+indicator("barmerge enum test")
+// These use barmerge.gaps_off / barmerge.lookahead_off (string enums)
+float dc_enum = request.security(syminfo.tickerid, "D", close, barmerge.gaps_off, barmerge.lookahead_off)
+// These pass boolean false directly
+float dc_bool = request.security(syminfo.tickerid, "D", close, false, false)
+plot(dc_enum, "enum")
+plot(dc_bool, "bool")
+`);
+
+        const enumData = extractPlot(plots, 'enum', sDate, eDate);
+        const boolData = extractPlot(plots, 'bool', sDate, eDate);
+
+        expect(enumData.length).toBeGreaterThan(0);
+        expect(enumData.length).toBe(boolData.length);
+
+        // Every value from string enum path must match boolean path exactly
+        for (let i = 0; i < enumData.length; i++) {
+            expect(enumData[i].value).toBe(boolData[i].value);
+            expect(enumData[i].time).toBe(boolData[i].time);
+        }
+
+        // Verify none are NaN
+        for (const d of enumData) {
+            expect(isNaN(d.value)).toBe(false);
+        }
+    }, 30000);
+});
+
+// ── Cross-TF correctness against TradingView reference data ────────────────────
+
+describe('request.security Cross-TF Correctness', () => {
+    // Helper: extract plot data as { time, value }[] filtered to date range
+    function extractPlot(
+        plots: any,
+        name: string,
+        sDate: number,
+        eDate: number,
+    ): { time: string; value: any }[] {
+        const plotdata = plots[name]?.data || [];
+        return plotdata
+            .filter((e: any) => e.time >= sDate && e.time <= eDate)
+            .map((e: any) => ({
+                time: new Date(e.time).toISOString().slice(0, 10),
+                value: e.value,
+            }));
+    }
+
+    // TradingView reference values captured from BTCUSDC Weekly chart
+    // requesting Daily data with barmerge.gaps_off, barmerge.lookahead_off
+    const TV_WEEKLY_REFERENCE = [
+        { time: '2019-01-07', dailyClose: 3509.21, dailyHigh: 3652.00, dailyClose1: 3616.15 },
+        { time: '2019-01-14', dailyClose: 3535.79, dailyHigh: 3706.62, dailyClose1: 3682.09 },
+        { time: '2019-01-21', dailyClose: 3531.36, dailyHigh: 3565.00, dailyClose1: 3552.93 },
+        { time: '2019-01-28', dailyClose: 3413.46, dailyHigh: 3474.21, dailyClose1: 3465.05 },
+        { time: '2019-02-04', dailyClose: 3651.57, dailyHigh: 3652.61, dailyClose1: 3626.54 },
+    ];
+
+    it('Weekly chart requesting Daily close/high/close[1] should match TradingView', async () => {
+        const sDate = new Date('2019-01-07').getTime();
+        const eDate = new Date('2019-02-10').getTime();
+        const warmup = 365 * 24 * 60 * 60 * 1000;
+
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', 'W', null, sDate - warmup, eDate);
+
+        const { plots } = await pineTS.run(
+`//@version=5
+indicator("Cross-TF W->D")
+float dailyClose  = request.security(syminfo.tickerid, "D", close, barmerge.gaps_off, barmerge.lookahead_off)
+float dailyHigh   = request.security(syminfo.tickerid, "D", high, barmerge.gaps_off, barmerge.lookahead_off)
+float dailyClose1 = request.security(syminfo.tickerid, "D", close[1], barmerge.gaps_off, barmerge.lookahead_off)
+plot(dailyClose, "dc")
+plot(dailyHigh, "dh")
+plot(dailyClose1, "dc1")
+`);
+
+        const dcData = extractPlot(plots, 'dc', sDate, new Date('2019-02-05').getTime());
+        const dhData = extractPlot(plots, 'dh', sDate, new Date('2019-02-05').getTime());
+        const dc1Data = extractPlot(plots, 'dc1', sDate, new Date('2019-02-05').getTime());
+
+        expect(dcData.length).toBe(TV_WEEKLY_REFERENCE.length);
+
+        for (let i = 0; i < TV_WEEKLY_REFERENCE.length; i++) {
+            const ref = TV_WEEKLY_REFERENCE[i];
+            expect(dcData[i].time).toBe(ref.time);
+            expect(dcData[i].value).toBeCloseTo(ref.dailyClose, 1);
+            expect(dhData[i].value).toBeCloseTo(ref.dailyHigh, 1);
+            expect(dc1Data[i].value).toBeCloseTo(ref.dailyClose1, 1);
+        }
+    }, 30000);
+
+    it('1h chart requesting Daily should produce valid values (no NaN) with canonical TF', async () => {
+        const sDate = new Date('2019-01-07').getTime();
+        const eDate = new Date('2019-01-10').getTime();
+
+        // '60' is the canonical 1h timeframe
+        const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', '60', null, sDate, eDate);
+
+        const { plots } = await pineTS.run(
+`//@version=5
+indicator("Cross-TF 1h->D")
+float dailyClose = request.security(syminfo.tickerid, "D", close, barmerge.gaps_off, barmerge.lookahead_off)
+plot(dailyClose, "dc")
+`);
+
+        const dcData = extractPlot(plots, 'dc', sDate, eDate);
+
+        // Should have hourly bars (at least 48 for 2 full days)
+        expect(dcData.length).toBeGreaterThan(48);
+
+        // No values should be NaN (this was the bug before the fix)
+        const nanCount = dcData.filter(d => isNaN(d.value)).length;
+        expect(nanCount).toBe(0);
+
+        // All values should be positive (valid BTC prices)
+        for (const d of dcData) {
+            expect(d.value).toBeGreaterThan(0);
+        }
+    }, 30000);
+
+    it('normalizeTimeframe produces correct isLTF determination in security.ts', () => {
+        // The normalizeTimeframe fix ensures that non-canonical formats like '1h', '4h'
+        // are mapped to canonical ('60', '240') before TIMEFRAMES.indexOf() comparison.
+        // Without this fix, TIMEFRAMES.indexOf('1h') returns -1 and throws Error.
+
+        // Simulate what security.ts does on lines 41-42:
+        const ctxTF_canonical = '60';           // canonical 1h
+        const ctxTF_nonCanonical = '1h';        // non-canonical 1h
+        const reqTF = 'D';                      // requesting Daily
+
+        const ctxIdx_canonical = TIMEFRAMES.indexOf(normalizeTimeframe(ctxTF_canonical));
+        const ctxIdx_nonCanonical = TIMEFRAMES.indexOf(normalizeTimeframe(ctxTF_nonCanonical));
+        const reqIdx = TIMEFRAMES.indexOf(normalizeTimeframe(reqTF));
+
+        // Both should resolve to the same index
+        expect(ctxIdx_canonical).toBe(ctxIdx_nonCanonical);
+        expect(ctxIdx_canonical).not.toBe(-1);
+        expect(reqIdx).not.toBe(-1);
+
+        // 1h < Daily → isLTF = false (HTF request)
+        const isLTF = ctxIdx_canonical > reqIdx;
+        expect(isLTF).toBe(false);
+
+        // Weekly > Daily → isLTF = true (LTF request)
+        const weeklyIdx = TIMEFRAMES.indexOf(normalizeTimeframe('W'));
+        const isLTF_weekly = weeklyIdx > reqIdx;
+        expect(isLTF_weekly).toBe(true);
+
+        // Non-canonical formats should also work
+        expect(TIMEFRAMES.indexOf(normalizeTimeframe('4h'))).toBe(TIMEFRAMES.indexOf('240'));
+        expect(TIMEFRAMES.indexOf(normalizeTimeframe('1w'))).toBe(TIMEFRAMES.indexOf('W'));
+        expect(TIMEFRAMES.indexOf(normalizeTimeframe('1d'))).toBe(TIMEFRAMES.indexOf('D'));
+    });
+});
diff --git a/tests/namespaces/request-streaming.test.ts b/tests/namespaces/request-streaming.test.ts
new file mode 100644
index 0000000..65a0180
--- /dev/null
+++ b/tests/namespaces/request-streaming.test.ts
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Streaming verification tests for request.security secondary context refresh.
+// Verifies that when the main context's data changes during streaming,
+// the cached secondary context is updated via updateTail().
+
+import { describe, it, expect } from 'vitest';
+import PineTS from 'PineTS.class';
+import { Provider } from '@pinets/index';
+
+describe('request.security Streaming Refresh', () => {
+    /**
+     * HTF test: 1-minute chart requesting 5-minute close.
+     * Streams a few live iterations at 3s interval.
+     * Verifies that:
+     * - dataVersion increments when main context data changes
+     * - The secondary context cache entry has the correct structure
+     * - The cached secondary dataVersion is updated (proving updateTail was called)
+     */
+    it('HTF: secondary context cache is refreshed during streaming', async () => {
+        return new Promise<void>((resolve, reject) => {
+            const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', '1');
+
+            const evt = pineTS.stream(
+                `//@version=5
+indicator("HTF Stream Test")
+float htfClose = request.security(syminfo.tickerid, "5", close, barmerge.gaps_off, barmerge.lookahead_off)
+plot(htfClose, "htf")`,
+                { pageSize: 500, live: true, interval: 3000 },
+            );
+
+            let liveEventCount = 0;
+            const dataVersions: number[] = [];
+            const cachedDataVersions: number[] = [];
+            let pageCount = 0;
+
+            evt.on('data', (ctx: any) => {
+                const currentCandle = ctx.marketData[ctx.idx];
+                const isHistorical = currentCandle && currentCandle.closeTime < Date.now();
+
+                if (isHistorical) {
+                    pageCount++;
+                    return;
+                }
+
+                liveEventCount++;
+                const fullCtx = ctx.fullContext;
+                const dv = fullCtx.dataVersion;
+                dataVersions.push(dv);
+
+                // Check cache structure
+                const cacheKeys = Object.keys(fullCtx.cache).filter(
+                    (k) => !k.endsWith('_prevIdx'),
+                );
+
+                let cachedDV = -1;
+                if (cacheKeys.length > 0) {
+                    const entry = fullCtx.cache[cacheKeys[0]];
+                    cachedDV = entry?.dataVersion ?? -1;
+                    cachedDataVersions.push(cachedDV);
+                }
+
+                console.log(
+                    `  [HTF Live #${liveEventCount}] dataVersion=${dv}, cachedDV=${cachedDV}, cacheKeys=${cacheKeys.length}`,
+                );
+
+                if (liveEventCount >= 3) {
+                    evt.stop();
+
+                    try {
+                        // 1. dataVersion should have incremented (data changed at least once)
+                        const maxDV = Math.max(...dataVersions);
+                        expect(maxDV).toBeGreaterThan(0);
+                        console.log(`  dataVersions: [${dataVersions.join(', ')}]`);
+                        console.log(`  cachedDataVersions: [${cachedDataVersions.join(', ')}]`);
+
+                        // 2. Cache entry should have the new { pineTS, context, dataVersion } structure
+                        if (cacheKeys.length > 0) {
+                            const entry = fullCtx.cache[cacheKeys[0]];
+                            expect(entry).toHaveProperty('pineTS');
+                            expect(entry).toHaveProperty('context');
+                            expect(entry).toHaveProperty('dataVersion');
+
+                            // 3. Cached dataVersion should match latest main context version
+                            // This proves updateTail() was called and the cache was refreshed
+                            expect(entry.dataVersion).toBe(maxDV);
+                        }
+
+                        // 4. dataVersion should be increasing across iterations
+                        for (let i = 1; i < dataVersions.length; i++) {
+                            expect(dataVersions[i]).toBeGreaterThanOrEqual(dataVersions[i - 1]);
+                        }
+
+                        resolve();
+                    } catch (e) {
+                        reject(e);
+                    }
+                }
+            });
+
+            evt.on('error', (error: any) => {
+                reject(error);
+            });
+
+            setTimeout(() => {
+                evt.stop();
+                if (liveEventCount >= 1) {
+                    console.warn(
+                        `  HTF Timeout: ${liveEventCount} live events, ${pageCount} pages.`,
+                    );
+                    resolve();
+                } else {
+                    reject(
+                        new Error(
+                            `HTF Timeout: no live events. ${pageCount} historical pages.`,
+                        ),
+                    );
+                }
+            }, 60000);
+        });
+    }, 90000);
+
+    /**
+     * LTF test: 5-minute chart requesting 1-minute close.
+     * Streams a few live iterations at 3s interval.
+     * Verifies that:
+     * - dataVersion increments
+     * - The LTF secondary context cache is refreshed
+     */
+    it('LTF: secondary context cache is refreshed during streaming', async () => {
+        return new Promise<void>((resolve, reject) => {
+            const pineTS = new PineTS(Provider.Binance, 'BTCUSDC', '5');
+
+            const evt = pineTS.stream(
+                `//@version=5
+indicator("LTF Stream Test")
+float[] ltfCloses = request.security_lower_tf(syminfo.tickerid, "1", close)
+plot(close, "c")`,
+                { pageSize: 200, live: true, interval: 3000 },
+            );
+
+            let liveEventCount = 0;
+            const dataVersions: number[] = [];
+            const cachedDataVersions: number[] = [];
+            let pageCount = 0;
+
+            evt.on('data', (ctx: any) => {
+                const currentCandle = ctx.marketData[ctx.idx];
+                const isHistorical = currentCandle && currentCandle.closeTime < Date.now();
+
+                if (isHistorical) {
+                    pageCount++;
+                    return;
+                }
+
+                liveEventCount++;
+                const fullCtx = ctx.fullContext;
+                const dv = fullCtx.dataVersion;
+                dataVersions.push(dv);
+
+                // Check LTF cache
+                const cacheKeys = Object.keys(fullCtx.cache).filter((k) =>
+                    k.endsWith('_lower'),
+                );
+
+                let cachedDV = -1;
+                if (cacheKeys.length > 0) {
+                    const entry = fullCtx.cache[cacheKeys[0]];
+                    cachedDV = entry?.dataVersion ?? -1;
+                    cachedDataVersions.push(cachedDV);
+                }
+
+                console.log(
+                    `  [LTF Live #${liveEventCount}] dataVersion=${dv}, cachedDV=${cachedDV}, ltfCacheKeys=${cacheKeys.length}`,
+                );
+
+                if (liveEventCount >= 3) {
+                    evt.stop();
+
+                    try {
+                        // 1. dataVersion should have incremented
+                        const maxDV = Math.max(...dataVersions);
+                        expect(maxDV).toBeGreaterThan(0);
+                        console.log(`  dataVersions: [${dataVersions.join(', ')}]`);
+                        console.log(`  cachedDataVersions: [${cachedDataVersions.join(', ')}]`);
+
+                        // 2. LTF cache should exist with new structure
+                        if (cacheKeys.length > 0) {
+                            const entry = fullCtx.cache[cacheKeys[0]];
+                            expect(entry).toHaveProperty('pineTS');
+                            expect(entry).toHaveProperty('context');
+                            expect(entry).toHaveProperty('dataVersion');
+
+                            // 3. Cached dataVersion should be up-to-date
+                            expect(entry.dataVersion).toBe(maxDV);
+                        }
+
+                        resolve();
+                    } catch (e) {
+                        reject(e);
+                    }
+                }
+            });
+
+            evt.on('error', (error: any) => {
+                reject(error);
+            });
+
+            setTimeout(() => {
+                evt.stop();
+                if (liveEventCount >= 1) {
+                    console.warn(
+                        `  LTF Timeout: ${liveEventCount} live events, ${pageCount} pages.`,
+                    );
+                    resolve();
+                } else {
+                    reject(
+                        new Error(
+                            `LTF Timeout: no live events. ${pageCount} historical pages.`,
+                        ),
+                    );
+                }
+            }, 60000);
+        });
+    }, 90000);
+});
diff --git a/tests/namespaces/str-format-patterns.test.ts b/tests/namespaces/str-format-patterns.test.ts
new file mode 100644
index 0000000..3b6fa7d
--- /dev/null
+++ b/tests/namespaces/str-format-patterns.test.ts
@@ -0,0 +1,259 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (C) 2025 Alaa-eddine KADDOURI
+
+/**
+ * Str Namespace: Format Pattern Tests
+ *
+ * Regression tests for str.tostring() format pattern support and
+ * str.format() extended patterns ({0,number,#.##}).
+ *
+ * Previously, str.tostring() only returned String(value) for all formats.
+ * The fix adds support for:
+ * - Pattern-based formats: "#", "#.#", "#.##", "#.####", "0.000"
+ * - Named formats: "integer", "percent", "price", "volume", "mintick"
+ *
+ * str.format() was also fixed to handle {0,number,#.##} extended patterns
+ * in addition to simple {0} placeholders.
+ */
+
+import { describe, it, expect } from 'vitest';
+import PineTS from '../../src/PineTS.class';
+import { Provider } from '../../src/marketData/Provider.class';
+
+describe('Str.tostring Format Patterns', () => {
+    const sDate = new Date('2019-01-01').getTime();
+    const eDate = new Date('2019-01-02').getTime();
+
+    it('should format with "#" pattern (integer, no decimals)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(123.456, '#');
+            const r2 = str.tostring(0.9, '#');
+            const r3 = str.tostring(-5.7, '#');
+            return { r1, r2, r3 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('123');
+        expect(last(result.r2)).toBe('1');
+        expect(last(result.r3)).toBe('-6');
+    });
+
+    it('should format with "#.#" pattern (1 decimal)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(123.456, '#.#');
+            const r2 = str.tostring(5.0, '#.#');
+            const r3 = str.tostring(-0.14, '#.#');
+            return { r1, r2, r3 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('123.5');
+        expect(last(result.r2)).toBe('5.0');
+        expect(last(result.r3)).toBe('-0.1');
+    });
+
+    it('should format with "#.##" pattern (2 decimals)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(123.456, '#.##');
+            const r2 = str.tostring(42195.1, '#.##');
+            const r3 = str.tostring(0.005, '#.##');
+            return { r1, r2, r3 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('123.46');
+        expect(last(result.r2)).toBe('42195.10');
+        expect(last(result.r3)).toBe('0.01');  // 0.005 rounds to 0.01
+    });
+
+    it('should format with "#.####" pattern (4 decimals)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(3.14159, '#.####');
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('3.1416');
+    });
+
+    it('should format with "integer" named format', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(123.7, 'integer');
+            const r2 = str.tostring(-0.4, 'integer');
+            return { r1, r2 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('124');
+        expect(last(result.r2)).toBe('0');
+    });
+
+    it('should format with "percent" named format', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(0.4567, 'percent');
+            const r2 = str.tostring(1.0, 'percent');
+            return { r1, r2 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('45.67%');
+        expect(last(result.r2)).toBe('100.00%');
+    });
+
+    it('should format with "volume" named format (integer)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(1234567.89, 'volume');
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('1234568');
+    });
+
+    it('should return String(value) for NaN', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str, na } = context.pine;
+            const r1 = str.tostring(NaN, '#.##');
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('NaN');
+    });
+
+    it('should return String(value) when no format is provided', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.tostring(42.5);
+            const r2 = str.tostring('hello');
+            return { r1, r2 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('42.5');
+        expect(last(result.r2)).toBe('hello');
+    });
+});
+
+describe('Str.format Extended Patterns', () => {
+    const sDate = new Date('2019-01-01').getTime();
+    const eDate = new Date('2019-01-02').getTime();
+
+    it('should handle {0,number,#.##} pattern', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.format('{0,number,#.##}', 123.456);
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('123.46');
+    });
+
+    it('should handle mixed simple and extended patterns', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.format('Price: {0,number,#.##}, Volume: {1}', 42195.123, 1000);
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('Price: 42195.12, Volume: 1000');
+    });
+
+    it('should handle {0,number,#} integer pattern', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.format('Count: {0,number,#}', 99.7);
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('Count: 100');
+    });
+
+    it('should handle multiple extended patterns in one format string', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.format('{0,number,#.#} / {1,number,#.###}', 3.14159, 2.71828);
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('3.1 / 2.718');
+    });
+
+    it('should fall back to String() for non-numeric values with number pattern', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', 'D', null, sDate, eDate);
+
+        const sourceCode = (context: any) => {
+            const { str } = context.pine;
+            const r1 = str.format('{0,number,#.##}', 'not_a_number');
+            return { r1 };
+        };
+
+        const { result } = await pineTS.run(sourceCode);
+        const last = (arr: any[]) => arr[arr.length - 1];
+
+        expect(last(result.r1)).toBe('not_a_number');
+    });
+});
diff --git a/tests/transpiler/for-loop-namespace.test.ts b/tests/transpiler/for-loop-namespace.test.ts
new file mode 100644
index 0000000..688f6e7
--- /dev/null
+++ b/tests/transpiler/for-loop-namespace.test.ts
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (C) 2025 Alaa-eddine KADDOURI
+
+/**
+ * For Loop Test Condition: Namespace Method Call Tests
+ *
+ * Regression tests for a bug where namespace method calls (e.g. array.size(),
+ * math.min()) in for-loop test conditions were incorrectly wrapped with $.get().
+ *
+ * Example of the bug:
+ *   for (i = 0; i < math.min(array.size(zones), 2); i++)
+ *   was transpiled to:
+ *   for (i = 0; i < $.get(math, 0).min($.get(array, 0).size(zones), 2); i++)
+ *
+ * The fix skips $.get() wrapping for context-bound namespace identifiers that
+ * are the object of a MemberExpression (i.e. the namespace itself, not a variable).
+ */
+
+import { describe, it, expect } from 'vitest';
+import { transpile } from '../../src/transpiler/index';
+import { PineTS } from '../../src/PineTS.class';
+import { Provider } from '../../src/marketData/Provider.class';
+
+describe('For Loop: Namespace Methods in Test Condition', () => {
+    it('should NOT wrap namespace objects (math, array) with $.get() in for-loop test', () => {
+        const code = `
+//@version=5
+indicator("For Namespace Test")
+
+var int[] zones = array.new_int(0)
+array.push(zones, 10)
+array.push(zones, 20)
+array.push(zones, 30)
+
+int total = 0
+for i = 0 to math.min(array.size(zones), 2) - 1
+    total += array.get(zones, i)
+
+plot(total, "Total")
+`;
+        const result = transpile(code);
+        const jsCode = result.toString();
+
+        // Namespace objects should NOT be wrapped with $.get()
+        // Bad: $.get(math, 0).min(...)  or  $.get(array, 0).size(...)
+        expect(jsCode).not.toContain('$.get(math');
+        expect(jsCode).not.toContain('$.get(array');
+    });
+
+    it('should correctly transpile nested namespace calls in for-loop test', () => {
+        const code = `
+//@version=5
+indicator("Nested NS Test")
+
+var int[] arr = array.new_int(5, 1)
+for i = 0 to math.min(array.size(arr), 3) - 1
+    array.set(arr, i, i * 10)
+
+plot(array.get(arr, 0))
+`;
+        const result = transpile(code);
+        const jsCode = result.toString();
+
+        // Should have proper namespace method calls, not $.get(namespace) calls
+        expect(jsCode).not.toContain('$.get(math');
+        expect(jsCode).not.toContain('$.get(array');
+    });
+
+    it('should correctly run for loop with math.min(array.size()) in test (runtime)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null,
+            new Date('2024-01-01').getTime(), new Date('2024-01-02').getTime());
+
+        const code = `
+//@version=5
+indicator("For NS Runtime Test")
+
+var int[] zones = array.new_int(0)
+array.push(zones, 100)
+array.push(zones, 200)
+array.push(zones, 300)
+array.push(zones, 400)
+array.push(zones, 500)
+
+int total = 0
+// Only sum the first 3 elements (math.min(5, 3) = 3)
+for i = 0 to math.min(array.size(zones), 3) - 1
+    total += array.get(zones, i)
+
+plot(total, "Total")
+`;
+        const { plots } = await pineTS.run(code);
+        expect(plots['Total']).toBeDefined();
+
+        // Should sum first 3: 100 + 200 + 300 = 600
+        const lastValue = plots['Total'].data[plots['Total'].data.length - 1].value;
+        expect(lastValue).toBe(600);
+    });
+
+    it('should correctly handle ta namespace calls in for-loop test (runtime)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null,
+            new Date('2024-01-01').getTime(), new Date('2024-01-10').getTime());
+
+        const code = `
+//@version=5
+indicator("For TA NS Test")
+
+int count = 0
+// math.max returns a number that can be used as loop bound
+for i = 0 to math.max(1, 3) - 1
+    count += 1
+
+plot(count, "Count")
+`;
+        const { plots } = await pineTS.run(code);
+        expect(plots['Count']).toBeDefined();
+
+        // math.max(1, 3) = 3, so loop runs for i = 0, 1, 2 → count = 3
+        const lastValue = plots['Count'].data[plots['Count'].data.length - 1].value;
+        expect(lastValue).toBe(3);
+    });
+
+    it('should still wrap user variables with $.get() in for-loop test', () => {
+        const code = `
+//@version=5
+indicator("For User Var Test")
+
+int limit = 5
+for i = 0 to limit - 1
+    0
+
+plot(close)
+`;
+        const result = transpile(code);
+        const jsCode = result.toString();
+
+        // User variables like 'limit' SHOULD get $.get() wrapping
+        // The for-loop test should reference the user variable through $.get
+        expect(jsCode).toContain('$.get');
+    });
+});
diff --git a/tests/transpiler/parser-fixes.test.ts b/tests/transpiler/parser-fixes.test.ts
index 9ff0f18..7722bfa 100644
--- a/tests/transpiler/parser-fixes.test.ts
+++ b/tests/transpiler/parser-fixes.test.ts
@@ -1158,3 +1158,218 @@ plot(_sum, "Sum")
         expect(lastValue).toBe(25);
     });
 });
+
+// ---------------------------------------------------------------------------
+// 13. Multi-Line Expression Continuation
+// ---------------------------------------------------------------------------
+describe('Parser Fix: Multi-Line Expression Continuation', () => {
+    it('should parse "and" at end of line with continuation', () => {
+        const code = `
+//@version=5
+indicator("And Continuation")
+
+a = close < open and
+    low < high
+plot(a ? 1 : 0)
+`;
+        const pine2js = pineToJS(code);
+        expect(pine2js.success).toBe(true);
+        expect(pine2js.code).toContain('&&');
+    });
+
+    it('should parse "or" at end of line with continuation', () => {
+        const code = `
+//@version=5
+indicator("Or Continuation")
+
+b = close > open or
+    high > low
+plot(b ? 1 : 0)
+`;
+        const pine2js = pineToJS(code);
+        expect(pine2js.success).toBe(true);
+        expect(pine2js.code).toContain('||');
+    });
+
+    it('should parse chained "and" across multiple lines', () => {
+        const code = `
+//@version=5
+indicator("Chained And")
+
+c = close > open and
+    high > low and
+    volume > 0
+plot(c ? 1 : 0)
+`;
+        const pine2js = pineToJS(code);
+        expect(pine2js.success).toBe(true);
+        // Should produce two && operators
+        const matches = pine2js.code!.match(/&&/g);
+        expect(matches).not.toBeNull();
+        expect(matches!.length).toBeGreaterThanOrEqual(2);
+    });
+
+    it('should parse comparison operator at end of line with continuation', () => {
+        const code = `
+//@version=5
+indicator("Comparison Continuation")
+
+d = close >
+    open
+plot(d ? 1 : 0)
+`;
+        const pine2js = pineToJS(code);
+        expect(pine2js.success).toBe(true);
+        expect(pine2js.code).toContain('>');
+    });
+
+    it('should parse mixed "and"/"or" across lines', () => {
+        const code = `
+//@version=5
+indicator("Mixed And Or")
+
+e = close < open and
+    low < high or
+    volume > 0
+plot(e ? 1 : 0)
+`;
+        const pine2js = pineToJS(code);
+        expect(pine2js.success).toBe(true);
+        expect(pine2js.code).toContain('&&');
+        expect(pine2js.code).toContain('||');
+    });
+
+    it('should parse deeply nested multiline with parentheses', () => {
+        const code = `
+//@version=5
+indicator("Nested Parens")
+
+f = (close > open and
+    high > low) or
+    (volume > 0 and
+    close > 100)
+plot(f ? 1 : 0)
+`;
+        const pine2js = pineToJS(code);
+        expect(pine2js.success).toBe(true);
+        expect(pine2js.code).toContain('&&');
+        expect(pine2js.code).toContain('||');
+    });
+
+    it('should parse "not" on continuation line after "and"', () => {
+        const code = `
+//@version=5
+indicator("Not Continuation")
+
+g = close > open and
+    not (low > high)
+plot(g ? 1 : 0)
+`;
+        const pine2js = pineToJS(code);
+        expect(pine2js.success).toBe(true);
+        expect(pine2js.code).toContain('&&');
+        expect(pine2js.code).toContain('!');
+    });
+
+    it('should run multiline "and" condition at runtime', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '60', null, new Date('2024-01-01').getTime(), new Date('2024-01-10').getTime());
+
+        const code = `
+//@version=5
+indicator("And Runtime")
+
+_a = close < open and
+    low < high
+plot(_a ? 1 : 0, "A")
+`;
+        const { plots } = await pineTS.run(code);
+        expect(plots['A']).toBeDefined();
+        expect(plots['A'].data.length).toBeGreaterThan(0);
+
+        // Every value should be 0 or 1
+        for (const pt of plots['A'].data) {
+            expect([0, 1]).toContain(pt.value);
+        }
+    });
+
+    it('should run multiline comparison continuation at runtime', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '60', null, new Date('2024-01-01').getTime(), new Date('2024-01-10').getTime());
+
+        const code = `
+//@version=5
+indicator("Cmp Runtime")
+
+_d = close >
+    open
+plot(_d ? 1 : 0, "D")
+`;
+        const { plots } = await pineTS.run(code);
+        expect(plots['D']).toBeDefined();
+        expect(plots['D'].data.length).toBeGreaterThan(0);
+
+        // Every value should be 0 or 1
+        for (const pt of plots['D'].data) {
+            expect([0, 1]).toContain(pt.value);
+        }
+    });
+});
+
+// ---------------------------------------------------------------------------
+// 14. Namespace Constants in Ternary Arguments
+// ---------------------------------------------------------------------------
+describe('Parser Fix: Namespace Constants in Ternary Arguments', () => {
+    it('should not wrap namespace property access with $.get in ternary inside function args', () => {
+        const code = `
+//@version=5
+indicator("Label Style Ternary")
+
+_above = close > open
+label.new(bar_index, close, "X",
+     style = _above ? label.style_label_down : label.style_label_up)
+`;
+        const result = transpile(code);
+        const jsCode = result.toString();
+
+        // label.style_label_down should NOT be wrapped with $.get(label.__value, 0)
+        expect(jsCode).not.toContain('label.__value');
+        // It should appear as direct namespace access
+        expect(jsCode).toContain('label.style_label_down');
+        expect(jsCode).toContain('label.style_label_up');
+    });
+
+    it('should run label with ternary style at runtime', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '60', null, new Date('2024-01-01').getTime(), new Date('2024-01-10').getTime());
+
+        const code = `
+//@version=5
+indicator("Label Style Runtime", overlay=true)
+
+_above = close > open
+label.new(bar_index, close, "X",
+     style = _above ? label.style_label_down : label.style_label_up,
+     color = color.new(color.blue, 50))
+plot(close, "Close")
+`;
+        // Should not throw "Cannot read properties of undefined (reading 'style_label_down')"
+        const { plots } = await pineTS.run(code);
+        expect(plots['Close']).toBeDefined();
+        expect(plots['__labels__']).toBeDefined();
+    });
+
+    it('should preserve line namespace constants in ternary args', () => {
+        const code = `
+//@version=5
+indicator("Line Style Ternary")
+
+_bull = close > open
+line.new(bar_index[1], close[1], bar_index, close,
+     style = _bull ? line.style_solid : line.style_dashed)
+`;
+        const result = transpile(code);
+        const jsCode = result.toString();
+
+        expect(jsCode).not.toContain('line.__value');
+        expect(jsCode).toContain('line.style_solid');
+        expect(jsCode).toContain('line.style_dashed');
+    });
+});
diff --git a/tests/transpiler/pinescript-to-js.test.ts b/tests/transpiler/pinescript-to-js.test.ts
index fbfbfe6..84c5b61 100644
--- a/tests/transpiler/pinescript-to-js.test.ts
+++ b/tests/transpiler/pinescript-to-js.test.ts
@@ -902,6 +902,32 @@ plot(close)
             expect(jsCode).toContain("count: 'int'");
             expect(jsCode).toContain("lookup: 'map<string, int>'");
         });
+
+        it('should handle generic types in function parameters', () => {
+            const code = `
+//@version=6
+indicator("Generic Function Params")
+
+sumArray(array<float> arr) =>
+    float total = 0.0
+    for i = 0 to array.size(arr) - 1
+        total += array.get(arr, i)
+    total
+
+lookupValue(map<string, float> m, string key) =>
+    map.get(m, key)
+
+plot(close)
+            `;
+
+            const result = transpile(code);
+            const jsCode = result.toString();
+            expect(jsCode).toBeDefined();
+            // The function should be transpiled without errors
+            // Generic type annotations in params should not cause parse failures
+            expect(jsCode).toContain('sumArray');
+            expect(jsCode).toContain('lookupValue');
+        });
     });
 
     describe('Dot-Prefix Number Literals', () => {
diff --git a/tests/transpiler/scope-edge-cases.test.ts b/tests/transpiler/scope-edge-cases.test.ts
index 4caa612..32e521f 100644
--- a/tests/transpiler/scope-edge-cases.test.ts
+++ b/tests/transpiler/scope-edge-cases.test.ts
@@ -197,6 +197,79 @@ describe('Transpiler Scope Edge Cases', () => {
         expect(plots['outer'].data[0].value).toBe(60); // 10 + 20 + 30
     });
 
+    it('should handle tuple destructuring where function locals share names with outer vars (Pine Script)', async () => {
+        // Regression test: when a function returns a tuple and the caller destructures into
+        // variables (e.g., [fib236, fib382] = calcFibs()), if the function itself also has
+        // local variables with the same names, the transpiler's arrayPatternElements set
+        // (which is global, not scoped) would falsely flag the function's locals as array
+        // pattern vars, causing a crash ("Cannot read properties of undefined (reading 'name')")
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, new Date('2024-01-01').getTime(), new Date('2024-01-10').getTime());
+
+        const pineCode = `
+//@version=6
+indicator("Tuple Scope Test")
+
+calcLevels(float highVal, float lowVal) =>
+    float range = highVal - lowVal
+    float level1 = lowVal + range * 0.236
+    float level2 = lowVal + range * 0.382
+    float level3 = lowVal + range * 0.500
+    [level1, level2, level3]
+
+float h = ta.highest(high, 10)
+float l = ta.lowest(low, 10)
+
+// Destructure into variables - these names DON'T collide with function locals
+[level1, level2, level3] = calcLevels(h, l)
+
+plot(level1, "L1")
+plot(level2, "L2")
+plot(level3, "L3")
+`;
+
+        const { plots } = await pineTS.run(pineCode);
+        expect(plots).toBeDefined();
+        expect(plots['L1']).toBeDefined();
+        expect(plots['L2']).toBeDefined();
+        expect(plots['L3']).toBeDefined();
+        expect(Array.isArray(plots['L1'].data)).toBe(true);
+    });
+
+    it('should handle tuple destructuring where caller vars match function locals (Pine Script)', async () => {
+        // More specific regression: the exact pattern that caused the crash - caller
+        // destructures into the SAME variable names used inside the function
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, new Date('2024-01-01').getTime(), new Date('2024-01-10').getTime());
+
+        const pineCode = `
+//@version=6
+indicator("Tuple Same Names Test")
+
+calcValues(float src) =>
+    float val1 = src * 2
+    float val2 = src * 3
+    [val1, val2]
+
+// Destructure uses the SAME names as the function's locals
+[val1, val2] = calcValues(close)
+
+plot(val1, "V1")
+plot(val2, "V2")
+`;
+
+        const { plots } = await pineTS.run(pineCode);
+        expect(plots).toBeDefined();
+        expect(plots['V1']).toBeDefined();
+        expect(plots['V2']).toBeDefined();
+        // val1 should be close * 2, val2 should be close * 3
+        const v1 = plots['V1'].data[0]?.value;
+        const v2 = plots['V2'].data[0]?.value;
+        expect(typeof v1).toBe('number');
+        expect(typeof v2).toBe('number');
+        if (v1 && v2) {
+            expect(v2 / v1).toBeCloseTo(1.5, 5); // (close * 3) / (close * 2) = 1.5
+        }
+    });
+
     it('should handle block scope in switch statements', async () => {
         const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null, new Date('2024-01-01').getTime(), new Date('2024-01-10').getTime());
 
diff --git a/tests/transpiler/while-loop-hoisting.test.ts b/tests/transpiler/while-loop-hoisting.test.ts
new file mode 100644
index 0000000..d3e625d
--- /dev/null
+++ b/tests/transpiler/while-loop-hoisting.test.ts
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (C) 2025 Alaa-eddine KADDOURI
+
+/**
+ * While Loop Test Condition Hoisting Tests
+ *
+ * Regression tests for a bug where namespace method calls (e.g. array.size())
+ * in while-loop test conditions were hoisted to temp variables OUTSIDE the loop.
+ * This caused the condition to be evaluated only once, leading to infinite loops
+ * when the condition depended on values that changed each iteration.
+ *
+ * The fix adds a dedicated WhileStatement handler in MainTransformer that
+ * suppresses hoisting during test-condition transformation.
+ */
+
+import { describe, it, expect } from 'vitest';
+import { transpile } from '../../src/transpiler/index';
+import { PineTS } from '../../src/PineTS.class';
+import { Provider } from '../../src/marketData/Provider.class';
+
+describe('While Loop: Test Condition Hoisting', () => {
+    it('should NOT hoist array.size() out of while-loop test condition', () => {
+        const code = `
+//@version=5
+indicator("While Hoisting Test")
+
+var int[] arr = array.new_int(0)
+array.push(arr, 1)
+array.push(arr, 2)
+array.push(arr, 3)
+
+while array.size(arr) > 1
+    array.shift(arr)
+
+plot(array.size(arr), "Size")
+`;
+        const result = transpile(code);
+        const jsCode = result.toString();
+
+        // The while condition should contain array.size() inline, not a temp variable
+        // It should NOT have something like: const temp_X = array.size(arr); while (temp_X > 1)
+        // Instead, the while condition should evaluate array.size each iteration
+        expect(jsCode).not.toMatch(/temp_\d+.*=.*array.*size[\s\S]*while\s*\(/);
+
+        // The while condition should contain the size call directly
+        expect(jsCode).toMatch(/while\s*\(/);
+    });
+
+    it('should NOT hoist math.min() out of while-loop test condition', () => {
+        const code = `
+//@version=5
+indicator("While Math Test")
+
+int counter = 0
+while counter < math.min(5, 10)
+    counter += 1
+
+plot(counter, "Counter")
+`;
+        const result = transpile(code);
+        const jsCode = result.toString();
+
+        // math.min should remain inline in the while condition
+        expect(jsCode).not.toMatch(/temp_\d+.*=.*math\.min[\s\S]*while\s*\(/);
+    });
+
+    it('should correctly run while loop with array.size() in condition (runtime)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null,
+            new Date('2024-01-01').getTime(), new Date('2024-01-02').getTime());
+
+        const code = `
+//@version=5
+indicator("While Runtime Test")
+
+var int[] arr = array.new_int(0)
+array.push(arr, 10)
+array.push(arr, 20)
+array.push(arr, 30)
+array.push(arr, 40)
+array.push(arr, 50)
+
+// Remove elements until only 2 remain
+while array.size(arr) > 2
+    array.shift(arr)
+
+plot(array.size(arr), "FinalSize")
+plot(array.first(arr), "First")
+`;
+        const { plots } = await pineTS.run(code);
+        expect(plots['FinalSize']).toBeDefined();
+        expect(plots['First']).toBeDefined();
+
+        // After removing 3 elements from [10,20,30,40,50], should have [40,50]
+        const lastSize = plots['FinalSize'].data[plots['FinalSize'].data.length - 1].value;
+        const lastFirst = plots['First'].data[plots['First'].data.length - 1].value;
+        expect(lastSize).toBe(2);
+        expect(lastFirst).toBe(40);
+    });
+
+    it('should correctly run while loop with nested namespace calls in condition (runtime)', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null,
+            new Date('2024-01-01').getTime(), new Date('2024-01-02').getTime());
+
+        const code = `
+//@version=5
+indicator("While Nested NS Test")
+
+var int[] arr = array.new_int(0)
+array.push(arr, 1)
+array.push(arr, 2)
+array.push(arr, 3)
+array.push(arr, 4)
+array.push(arr, 5)
+array.push(arr, 6)
+
+// math.min(array.size(arr), 4) — nested namespace calls in while condition
+while array.size(arr) > math.min(3, 10)
+    array.pop(arr)
+
+plot(array.size(arr), "Result")
+`;
+        const { plots } = await pineTS.run(code);
+        expect(plots['Result']).toBeDefined();
+
+        const lastValue = plots['Result'].data[plots['Result'].data.length - 1].value;
+        expect(lastValue).toBe(3);
+    });
+
+    it('should handle while loop with user variable in condition alongside namespace call', async () => {
+        const pineTS = new PineTS(Provider.Mock, 'BTCUSDC', '1h', null,
+            new Date('2024-01-01').getTime(), new Date('2024-01-02').getTime());
+
+        const code = `
+//@version=5
+indicator("While User Var Test")
+
+var int[] items = array.new_int(0)
+for i = 1 to 8
+    array.push(items, i)
+
+int maxItems = 3
+
+while array.size(items) > maxItems
+    array.shift(items)
+
+plot(array.size(items), "Size")
+plot(array.first(items), "First")
+`;
+        const { plots } = await pineTS.run(code);
+
+        const size = plots['Size'].data[plots['Size'].data.length - 1].value;
+        const first = plots['First'].data[plots['First'].data.length - 1].value;
+        expect(size).toBe(3);
+        expect(first).toBe(6); // After removing 1,2,3,4,5 from [1..8], first is 6
+    });
+});