@tishlang/tish-lsp 2.39.0 → 2.43.8

package/crates/tish_eval/src/eval.rs

@@ -293,6 +293,16 @@ impl Evaluator {
             math.insert("log10".into(), Value::Native(natives::math_log10));
             math.insert("PI".into(), Value::Number(std::f64::consts::PI));
             math.insert("E".into(), Value::Number(std::f64::consts::E));
+            // #539: the remaining ECMAScript Math value constants (were missing → `null`).
+            math.insert("LN2".into(), Value::Number(std::f64::consts::LN_2));
+            math.insert("LN10".into(), Value::Number(std::f64::consts::LN_10));
+            math.insert("LOG2E".into(), Value::Number(std::f64::consts::LOG2_E));
+            math.insert("LOG10E".into(), Value::Number(std::f64::consts::LOG10_E));
+            math.insert("SQRT2".into(), Value::Number(std::f64::consts::SQRT_2));
+            math.insert(
+                "SQRT1_2".into(),
+                Value::Number(std::f64::consts::FRAC_1_SQRT_2),
+            );
             s.set(
                 "Math".into(),
                 Value::object(math),
@@ -336,6 +346,8 @@ impl Evaluator {
 
             let mut object = PropMap::with_capacity(5);
             object.insert("keys".into(), Value::Native(Self::object_keys));
+            object.insert("freeze".into(), Value::Native(Self::object_freeze));
+            object.insert("isFrozen".into(), Value::Native(Self::object_is_frozen));
             object.insert("values".into(), Value::Native(Self::object_values));
             object.insert("entries".into(), Value::Native(Self::object_entries));
             object.insert("assign".into(), Value::Native(Self::object_assign));
@@ -1190,6 +1202,10 @@ impl Evaluator {
                 from
             )));
         }
+        let ctx = tishlang_compile::resolve_context();
+        if let Some(path) = tishlang_compile::resolve_with_platform(from, dir, ctx) {
+            return Ok(path);
+        }
         let base = dir.join(from);
         let path = if base.extension().is_none() {
             let with_ext = base.with_extension("tish");
@@ -3366,6 +3382,17 @@ impl Evaluator {
                 let val = self.eval_expr(value)?;
                 match obj_val {
                     Value::Object(map) => {
+                        if map.borrow().frozen {
+                            return Err(EvalError::Throw(
+                                crate::natives::type_error_construct(&[Value::String(
+                                    format!(
+                                        "Cannot assign to read only property '{prop}' of a frozen object"
+                                    )
+                                    .into(),
+                                )])
+                                .unwrap_or(Value::Null),
+                            ));
+                        }
                         map.borrow_mut()
                             .strings
                             .insert(Arc::clone(prop), val.clone());
@@ -3417,7 +3444,18 @@ impl Evaluator {
                         arr_mut[idx] = val.clone();
                         Ok(val)
                     }
-                    Value::Object(_) => {
+                    Value::Object(ref map) => {
+                        if map.borrow().frozen {
+                            return Err(EvalError::Throw(
+                                crate::natives::type_error_construct(&[Value::String(
+                                    format!(
+                                        "Cannot assign to read only property '{idx_val}' of a frozen object"
+                                    )
+                                    .into(),
+                                )])
+                                .unwrap_or(Value::Null),
+                            ));
+                        }
                         eval_object_set(&obj_val, &idx_val, val.clone())
                             .map_err(EvalError::Error)?;
                         Ok(val)
@@ -3912,7 +3950,23 @@ impl Evaluator {
                 if let Some(call) = o.borrow().strings.get("__call").cloned() {
                     return self.call_func(&call, args);
                 }
-                Err(EvalError::Error("Not a function".to_string()))
+                Err(EvalError::Throw(
+                    crate::natives::type_error_construct(&[Value::String(
+                        format!(
+                            "Call of non-function: {}",
+                            match f {
+                                Value::Number(_) => "number",
+                                Value::String(_) => "string",
+                                Value::Bool(_) => "boolean",
+                                Value::Null => "null",
+                                Value::Symbol(_) => "symbol",
+                                _ => "object",
+                            }
+                        )
+                        .into(),
+                    )])
+                    .unwrap_or(Value::Null),
+                ))
             }
             Value::Native(native_fn) => {
                 // #122: Node fs callback form — `readFile(path, (err, data) => …)`. The self-less
@@ -4154,7 +4208,23 @@ impl Evaluator {
                     }
                 }
             }
-            _ => Err(EvalError::Error("Not a function".to_string())),
+            _ => Err(EvalError::Throw(
+                    crate::natives::type_error_construct(&[Value::String(
+                        format!(
+                            "Call of non-function: {}",
+                            match f {
+                                Value::Number(_) => "number",
+                                Value::String(_) => "string",
+                                Value::Bool(_) => "boolean",
+                                Value::Null => "null",
+                                Value::Symbol(_) => "symbol",
+                                _ => "object",
+                            }
+                        )
+                        .into(),
+                    )])
+                    .unwrap_or(Value::Null),
+                )),
         }
     }
 
@@ -4852,6 +4922,23 @@ impl Evaluator {
         }
     }
 
+    /// Object.freeze(obj) — mark frozen so writes throw a catchable TypeError (#437); returns obj.
+    fn object_freeze(args: &[Value]) -> Result<Value, String> {
+        if let Some(Value::Object(obj)) = args.first() {
+            obj.borrow_mut().frozen = true;
+        }
+        Ok(args.first().cloned().unwrap_or(Value::Null))
+    }
+
+    /// Object.isFrozen(obj) — true if frozen; primitives are frozen, arrays are not (this slice).
+    fn object_is_frozen(args: &[Value]) -> Result<Value, String> {
+        Ok(match args.first() {
+            Some(Value::Object(obj)) => Value::Bool(obj.borrow().frozen),
+            Some(Value::Array(_)) => Value::Bool(false),
+            _ => Value::Bool(true),
+        })
+    }
+
     fn object_keys(args: &[Value]) -> Result<Value, String> {
         match args.first() {
             Some(Value::Object(obj)) => {

package/crates/tish_eval/src/value.rs

@@ -24,6 +24,8 @@ pub type PropMap = indexmap::IndexMap<Arc<str>, Value>;
 pub struct EvalObjectData {
     pub strings: PropMap,
     pub symbols: Option<AHashMap<u64, Value>>,
+    /// `Object.freeze` marker (#437) — writes to a frozen object throw a catchable TypeError.
+    pub frozen: bool,
 }
 
 impl EvalObjectData {
@@ -31,8 +33,14 @@ impl EvalObjectData {
         Self {
             strings,
             symbols: None,
+            frozen: false,
         }
     }
+
+    #[inline]
+    pub fn is_frozen(&self) -> bool {
+        self.frozen
+    }
 }
 
 pub fn eval_object_get(obj: &Value, key: &Value) -> Option<Value> {

package/crates/tish_eval/src/value_convert.rs

@@ -1,16 +1,77 @@
 //! Conversion between tishlang_eval::Value and tishlang_core::Value for opaque method calls.
 
 use std::cell::RefCell;
-use std::rc::Rc;
+use std::rc::{Rc, Weak};
 use std::sync::Arc;
 
 #[cfg(feature = "regex")]
 use tishlang_core::TishRegExp;
-use ahash::AHashMap;
+use ahash::{AHashMap, AHashSet};
 use tishlang_core::{ObjectData, Value as CoreValue, VmRef};
 
 use crate::value::{EvalObjectData, PropMap, Value};
 
+/// #466 — identity-stable bridging for reference values (objects, arrays).
+///
+/// Core `Map`/`Set` key equality is SameValueZero (`VmRef::ptr_eq` for objects/arrays), so a fresh
+/// `VmRef` per `eval_to_core` call made `m.get(k)`/`s.has(a)` fail for ANY object/array key in the
+/// interpreter: the stored key and the lookup probe were different core allocations. This cache
+/// gives every eval `Rc` a single stable core **twin**: repeat bridges return the same `VmRef`
+/// (identity holds), with contents refreshed from the eval side on each bridge (preserving the
+/// existing copy-at-the-boundary semantics — and matching vm/node more closely on
+/// mutate-after-insert, since the stored key's view updates with its object).
+///
+/// The reverse maps let `core_to_eval` return the ORIGINAL eval object when a forward-bridged twin
+/// flows back out (`m.get(k) === v`, `[...m.keys()][0] === k` — identity across the round trip,
+/// as on vm/native/node).
+///
+/// Soundness against address reuse (the #250 lesson): forward entries pair the twin with a `Weak`
+/// to the eval `Rc` and every hit verifies `upgrade() + Rc::ptr_eq`; a dead/differing weak means
+/// the address was reused and the entry is replaced. Reverse hits re-verify through the forward
+/// entry (`VmRef::ptr_eq`), and a live forward entry holds the twin strongly, so a live reverse
+/// key's address cannot have been recycled. `in_flight` makes conversion cycle-safe: a
+/// self/mutually-referential object hit mid-refresh returns its twin as-is instead of recursing
+/// forever (the enclosing refresh completes the contents).
+struct BridgeCache {
+    obj_fwd: AHashMap<usize, (Weak<RefCell<EvalObjectData>>, VmRef<ObjectData>)>,
+    arr_fwd: AHashMap<usize, (Weak<RefCell<Vec<Value>>>, VmRef<Vec<CoreValue>>)>,
+    obj_rev: AHashMap<usize, Weak<RefCell<EvalObjectData>>>,
+    arr_rev: AHashMap<usize, Weak<RefCell<Vec<Value>>>>,
+    /// Eval addresses currently being refreshed (cycle guard).
+    in_flight: AHashSet<usize>,
+    /// Amortized cleanup threshold: sweep dead entries when the cache outgrows it.
+    high_water: usize,
+}
+
+impl BridgeCache {
+    fn new() -> Self {
+        Self {
+            obj_fwd: AHashMap::default(),
+            arr_fwd: AHashMap::default(),
+            obj_rev: AHashMap::default(),
+            arr_rev: AHashMap::default(),
+            in_flight: AHashSet::default(),
+            high_water: 256,
+        }
+    }
+
+    /// Drop entries whose eval side has died. Called on the insert path only; amortized O(1).
+    fn maybe_sweep(&mut self) {
+        if self.obj_fwd.len() + self.arr_fwd.len() <= self.high_water {
+            return;
+        }
+        self.obj_fwd.retain(|_, (w, _)| w.upgrade().is_some());
+        self.arr_fwd.retain(|_, (w, _)| w.upgrade().is_some());
+        self.obj_rev.retain(|_, w| w.upgrade().is_some());
+        self.arr_rev.retain(|_, w| w.upgrade().is_some());
+        self.high_water = ((self.obj_fwd.len() + self.arr_fwd.len()) * 2).max(256);
+    }
+}
+
+thread_local! {
+    static BRIDGE: RefCell<BridgeCache> = RefCell::new(BridgeCache::new());
+}
+
 /// Convert interpreter Value to core Value. Fails for interpreter-only variants.
 pub fn eval_to_core(v: &Value) -> Result<CoreValue, String> {
     match v {
@@ -19,28 +80,110 @@ pub fn eval_to_core(v: &Value) -> Result<CoreValue, String> {
         Value::Bool(b) => Ok(CoreValue::Bool(*b)),
         Value::Null => Ok(CoreValue::Null),
         Value::Array(arr) => {
-            let mut out = Vec::new();
-            for item in arr.borrow().iter() {
-                out.push(eval_to_core(item)?);
+            let addr = Rc::as_ptr(arr) as usize;
+            // Cycle guard: this array is already being refreshed higher up this same
+            // conversion — hand back its twin as-is; the enclosing refresh fills it.
+            if let Some(twin) = BRIDGE.with(|c| {
+                let c = c.borrow();
+                if c.in_flight.contains(&addr) {
+                    c.arr_fwd
+                        .get(&addr)
+                        .filter(|(w, _)| w.upgrade().is_some_and(|up| Rc::ptr_eq(&up, arr)))
+                        .map(|(_, t)| t.clone())
+                } else {
+                    None
+                }
+            }) {
+                return Ok(CoreValue::Array(twin));
             }
-            Ok(CoreValue::Array(VmRef::new(out)))
+            // Resolve (or mint) the stable core twin for this eval Rc, then refresh contents.
+            let twin = BRIDGE.with(|c| {
+                let mut c = c.borrow_mut();
+                match c.arr_fwd.get(&addr) {
+                    Some((w, t)) if w.upgrade().is_some_and(|up| Rc::ptr_eq(&up, arr)) => {
+                        t.clone()
+                    }
+                    _ => {
+                        c.maybe_sweep();
+                        let t: VmRef<Vec<CoreValue>> = VmRef::new(Vec::new());
+                        c.arr_fwd.insert(addr, (Rc::downgrade(arr), t.clone()));
+                        c.arr_rev.insert(t.as_ptr() as usize, Rc::downgrade(arr));
+                        t
+                    }
+                }
+            });
+            BRIDGE.with(|c| c.borrow_mut().in_flight.insert(addr));
+            let contents = (|| -> Result<Vec<CoreValue>, String> {
+                let mut out = Vec::new();
+                for item in arr.borrow().iter() {
+                    out.push(eval_to_core(item)?);
+                }
+                Ok(out)
+            })();
+            BRIDGE.with(|c| {
+                c.borrow_mut().in_flight.remove(&addr);
+            });
+            *twin.borrow_mut() = contents?;
+            Ok(CoreValue::Array(twin))
         }
         Value::Object(map) => {
-            let b = map.borrow();
-            let mut strings = tishlang_core::PropMap::default();
-            for (k, v) in b.strings.iter() {
-                strings.insert(Arc::clone(k), eval_to_core(v)?);
+            let addr = Rc::as_ptr(map) as usize;
+            // Cycle guard — see the Array arm.
+            if let Some(twin) = BRIDGE.with(|c| {
+                let c = c.borrow();
+                if c.in_flight.contains(&addr) {
+                    c.obj_fwd
+                        .get(&addr)
+                        .filter(|(w, _)| w.upgrade().is_some_and(|up| Rc::ptr_eq(&up, map)))
+                        .map(|(_, t)| t.clone())
+                } else {
+                    None
+                }
+            }) {
+                return Ok(CoreValue::Object(twin));
             }
-            let symbols = if let Some(ss) = &b.symbols {
-                let mut sm = AHashMap::default();
-                for (id, v) in ss.iter() {
-                    sm.insert(*id, eval_to_core(v)?);
+            let twin = BRIDGE.with(|c| {
+                let mut c = c.borrow_mut();
+                match c.obj_fwd.get(&addr) {
+                    Some((w, t)) if w.upgrade().is_some_and(|up| Rc::ptr_eq(&up, map)) => {
+                        t.clone()
+                    }
+                    _ => {
+                        c.maybe_sweep();
+                        let t: VmRef<ObjectData> = VmRef::new(ObjectData {
+                            strings: tishlang_core::PropMap::default(),
+                            symbols: None,
+                            frozen: false,
+                        });
+                        c.obj_fwd.insert(addr, (Rc::downgrade(map), t.clone()));
+                        c.obj_rev.insert(t.as_ptr() as usize, Rc::downgrade(map));
+                        t
+                    }
+                }
+            });
+            BRIDGE.with(|c| c.borrow_mut().in_flight.insert(addr));
+            let contents = (|| -> Result<ObjectData, String> {
+                let b = map.borrow();
+                let mut strings = tishlang_core::PropMap::default();
+                for (k, v) in b.strings.iter() {
+                    strings.insert(Arc::clone(k), eval_to_core(v)?);
                 }
-                Some(sm)
-            } else {
-                None
-            };
-            Ok(CoreValue::Object(VmRef::new(ObjectData { strings, symbols })))
+                let symbols = if let Some(ss) = &b.symbols {
+                    let mut sm = AHashMap::default();
+                    for (id, v) in ss.iter() {
+                        sm.insert(*id, eval_to_core(v)?);
+                    }
+                    Some(sm)
+                } else {
+                    None
+                };
+                Ok(ObjectData { strings, symbols, frozen: false })
+            })();
+            BRIDGE.with(|c| {
+                c.borrow_mut().in_flight.remove(&addr);
+            });
+            *twin.borrow_mut() = contents?;
+            Ok(CoreValue::Object(twin))
         }
         Value::Symbol(s) => Ok(CoreValue::Symbol(Arc::clone(s))),
         Value::Opaque(o) => Ok(CoreValue::Opaque(Arc::clone(o))),
@@ -59,6 +202,21 @@ pub fn core_to_eval(v: CoreValue) -> Value {
         CoreValue::Bool(b) => Value::Bool(b),
         CoreValue::Null => Value::Null,
         CoreValue::Array(arr) => {
+            // #466: a forward-bridged twin flowing back out returns the ORIGINAL eval array, so
+            // identity survives the round trip (`s.has(a)` after `[...s.keys()]`, `x === a`).
+            if let Some(orig) = BRIDGE.with(|c| {
+                let c = c.borrow();
+                c.arr_rev
+                    .get(&(arr.as_ptr() as usize))
+                    .and_then(|w| w.upgrade())
+                    .filter(|orig| {
+                        c.arr_fwd
+                            .get(&(Rc::as_ptr(orig) as usize))
+                            .is_some_and(|(_, t)| VmRef::ptr_eq(t, &arr))
+                    })
+            }) {
+                return Value::Array(orig);
+            }
             let mut out = Vec::new();
             for item in arr.borrow().iter() {
                 out.push(core_to_eval(item.clone()));
@@ -66,6 +224,20 @@ pub fn core_to_eval(v: CoreValue) -> Value {
             Value::Array(Rc::new(RefCell::new(out)))
         }
         CoreValue::Object(map) => {
+            // #466: see the Array arm.
+            if let Some(orig) = BRIDGE.with(|c| {
+                let c = c.borrow();
+                c.obj_rev
+                    .get(&(map.as_ptr() as usize))
+                    .and_then(|w| w.upgrade())
+                    .filter(|orig| {
+                        c.obj_fwd
+                            .get(&(Rc::as_ptr(orig) as usize))
+                            .is_some_and(|(_, t)| VmRef::ptr_eq(t, &map))
+                    })
+            }) {
+                return Value::Object(orig);
+            }
             let b = map.borrow();
             let mut out = PropMap::default();
             for (k, v) in b.strings.iter() {
@@ -89,8 +261,17 @@ pub fn core_to_eval(v: CoreValue) -> Value {
         CoreValue::Promise(_) => Value::Null,
         // NumberArray: materialize to boxed Array for the interpreter (it has no packed path).
         CoreValue::NumberArray(arr) => {
-            let nums = arr.borrow();
-            let out: Vec<Value> = nums.iter().map(|&n| Value::Number(n)).collect();
+            // Materialize to a boxed Array for the interpreter (it has no packed path). `to_values`
+            // handles a packed or a deopted (#199) backing.
+            let out: Vec<Value> = arr
+                .borrow()
+                .to_values()
+                .into_iter()
+                .map(|v| match v {
+                    tishlang_core::Value::Number(n) => Value::Number(n),
+                    _ => core_to_eval(v),
+                })
+                .collect();
             Value::Array(Rc::new(RefCell::new(out)))
         }
         // `CoreNativeFn` is feature-gated (Rc vs Arc), so use Clone::clone
@@ -115,3 +296,117 @@ pub fn core_to_eval(v: CoreValue) -> Value {
         }
     }
 }
+
+#[cfg(test)]
+mod bridge_identity_tests {
+    use super::*;
+
+    fn eval_obj(pairs: &[(&str, Value)]) -> Value {
+        let mut strings = PropMap::default();
+        for (k, v) in pairs {
+            strings.insert(Arc::from(*k), v.clone());
+        }
+        Value::Object(Rc::new(RefCell::new(EvalObjectData::from_strings(strings))))
+    }
+
+    /// #466: the same eval object must bridge to the SAME core allocation every time —
+    /// that's what makes it usable as a Map/Set key (SameValueZero is ptr_eq for objects).
+    #[test]
+    fn same_eval_object_bridges_to_same_core_twin() {
+        let k = eval_obj(&[("id", Value::Number(1.0))]);
+        let (CoreValue::Object(t1), CoreValue::Object(t2)) =
+            (eval_to_core(&k).unwrap(), eval_to_core(&k).unwrap())
+        else {
+            panic!("expected core objects");
+        };
+        assert!(VmRef::ptr_eq(&t1, &t2), "twin identity must be stable across bridges");
+
+        // Distinct eval objects get distinct twins.
+        let k2 = eval_obj(&[("id", Value::Number(1.0))]);
+        let CoreValue::Object(t3) = eval_to_core(&k2).unwrap() else { panic!() };
+        assert!(!VmRef::ptr_eq(&t1, &t3), "distinct objects must not share a twin");
+    }
+
+    /// Re-bridging refreshes the twin's contents (copy-at-the-boundary semantics kept).
+    #[test]
+    fn rebridge_refreshes_twin_contents() {
+        let k = eval_obj(&[("id", Value::Number(1.0))]);
+        let CoreValue::Object(t1) = eval_to_core(&k).unwrap() else { panic!() };
+        assert!(matches!(t1.borrow().strings.get("id"), Some(CoreValue::Number(n)) if *n == 1.0));
+
+        if let Value::Object(o) = &k {
+            o.borrow_mut().strings.insert(Arc::from("id"), Value::Number(42.0));
+        }
+        let CoreValue::Object(t2) = eval_to_core(&k).unwrap() else { panic!() };
+        assert!(VmRef::ptr_eq(&t1, &t2));
+        assert!(matches!(t2.borrow().strings.get("id"), Some(CoreValue::Number(n)) if *n == 42.0));
+    }
+
+    /// A forward-bridged twin converts BACK to the original eval object (round-trip identity:
+    /// `m.get(k) === v` / `[...m.keys()][0] === k`).
+    #[test]
+    fn core_to_eval_returns_original_for_bridged_twin() {
+        let k = eval_obj(&[("id", Value::Number(1.0))]);
+        let core = eval_to_core(&k).unwrap();
+        let back = core_to_eval(core);
+        let (Value::Object(orig), Value::Object(round)) = (&k, &back) else { panic!() };
+        assert!(Rc::ptr_eq(orig, round), "round trip must return the original eval object");
+
+        // An unrelated core object (never forward-bridged) still gets a fresh conversion.
+        let alien = CoreValue::Object(VmRef::new(ObjectData {
+            strings: tishlang_core::PropMap::default(),
+            symbols: None,
+            frozen: false,
+        }));
+        assert!(matches!(core_to_eval(alien), Value::Object(_)));
+    }
+
+    /// Arrays get the same treatment (Set members / Map values).
+    #[test]
+    fn array_identity_and_roundtrip() {
+        let a = Value::Array(Rc::new(RefCell::new(vec![Value::Number(1.0), Value::Number(2.0)])));
+        let (CoreValue::Array(t1), CoreValue::Array(t2)) =
+            (eval_to_core(&a).unwrap(), eval_to_core(&a).unwrap())
+        else {
+            panic!();
+        };
+        assert!(VmRef::ptr_eq(&t1, &t2));
+        let back = core_to_eval(CoreValue::Array(t1));
+        let (Value::Array(orig), Value::Array(round)) = (&a, &back) else { panic!() };
+        assert!(Rc::ptr_eq(orig, round));
+    }
+
+    /// A self-referential object must terminate (insert-before-recurse) and its twin's
+    /// self-property must be the twin itself — mirroring the eval-side cycle.
+    #[test]
+    fn cyclic_object_converts_without_recursing_forever() {
+        let k = eval_obj(&[]);
+        if let Value::Object(o) = &k {
+            let self_ref = k.clone();
+            o.borrow_mut().strings.insert(Arc::from("me"), self_ref);
+        }
+        let CoreValue::Object(twin) = eval_to_core(&k).unwrap() else { panic!() };
+        let inner = twin.borrow().strings.get("me").cloned();
+        let Some(CoreValue::Object(inner)) = inner else { panic!("self prop missing") };
+        assert!(VmRef::ptr_eq(&twin, &inner), "cycle must map to the twin itself");
+    }
+
+    /// Dropping the eval object invalidates its cache entry: a NEW object (even if the allocator
+    /// reuses the address) must get a fresh twin, never the stale one (the #250 lesson).
+    #[test]
+    fn dead_eval_object_never_resurrects_stale_twin() {
+        let mut stale_twin = None;
+        for _ in 0..64 {
+            let k = eval_obj(&[("x", Value::Number(7.0))]);
+            let CoreValue::Object(t) = eval_to_core(&k).unwrap() else { panic!() };
+            if let Some(prev) = &stale_twin {
+                assert!(
+                    !VmRef::ptr_eq(prev, &t),
+                    "a fresh eval object must never receive a dead object's twin"
+                );
+            }
+            stale_twin = Some(t);
+            // k drops here — its address is free for reuse by the next iteration.
+        }
+    }
+}

package/crates/tish_lsp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tishlang_lsp"
-version = "2.39.0"
+version = "2.43.8"
 edition = "2021"
 description = "Language Server Protocol implementation for Tish"
 license-file = { workspace = true }
@@ -29,3 +29,5 @@ walkdir = "2"
 # implements `Service` against (0.4), or the trait bound on `.call()` won't be satisfied. `util`
 # brings in `ServiceExt::ready`.
 tower = { version = "0.4", features = ["util"] }
+# Temp dirs for the platform-cascade import-resolution test.
+tempfile = "3"

package/crates/tish_lsp/src/import_goto.rs

@@ -451,19 +451,29 @@ fn module_source(can: &Path, u: &Url, open_docs: &HashMap<Url, String>) -> Optio
     }
 }
 
-fn resolve_relative_tish(
-    from_dir: &Path,
-    from_s: &str,
-    imported: &str,
-    open_docs: &HashMap<Url, String>,
-) -> Option<Location> {
+fn resolve_relative_module_path(from_dir: &Path, from_s: &str) -> Option<std::path::PathBuf> {
+    let _ = tishlang_compile::apply_resolve_env(None, None);
+    let ctx = tishlang_compile::resolve_context();
+    if let Some(p) = tishlang_compile::resolve_with_platform(from_s, from_dir, ctx) {
+        return Some(p);
+    }
+    // Fallback: legacy exact `.tish` join (no cascade).
     let target = from_dir.join(from_s.trim_start_matches("./"));
     let target = if target.extension().is_none() {
         target.with_extension("tish")
     } else {
         target
     };
-    let can = target.canonicalize().ok()?;
+    target.canonicalize().ok()
+}
+
+fn resolve_relative_tish(
+    from_dir: &Path,
+    from_s: &str,
+    imported: &str,
+    open_docs: &HashMap<Url, String>,
+) -> Option<Location> {
+    let can = resolve_relative_module_path(from_dir, from_s)?;
     let u = Url::from_file_path(&can).ok()?;
     let src = module_source(&can, &u, open_docs)?;
     let prog = tishlang_parser::parse(&src).ok()?;
@@ -476,13 +486,7 @@ fn resolve_relative_tish_default(
     from_s: &str,
     open_docs: &HashMap<Url, String>,
 ) -> Option<Location> {
-    let target = from_dir.join(from_s.trim_start_matches("./"));
-    let target = if target.extension().is_none() {
-        target.with_extension("tish")
-    } else {
-        target
-    };
-    let can = target.canonicalize().ok()?;
+    let can = resolve_relative_module_path(from_dir, from_s)?;
     let u = Url::from_file_path(&can).ok()?;
     let src = module_source(&can, &u, open_docs)?;
     let prog = tishlang_parser::parse(&src).ok()?;
@@ -628,4 +632,27 @@ mod receiver_member_tests {
         let k = super::pragma_key_for_native_member(Some("window"), &[Arc::from("innerHeight")]);
         assert_eq!(k.as_deref(), Some("window.innerHeight"));
     }
+
+    // Goto-def resolves relative imports through the platform/surface cascade (same rules as
+    // `tish resolve-id` / disk resolve), falling back to the bare `.tish` when no context is set.
+    #[test]
+    fn resolve_relative_module_path_honors_platform_cascade() {
+        use tishlang_compile::{set_resolve_context, Platform, ResolveContext, Surface};
+        let dir = tempfile::tempdir().unwrap();
+        let root = dir.path();
+        std::fs::write(root.join("Button.tish"), "export fn Button() {}").unwrap();
+        std::fs::write(root.join("Button.macos.tish"), "export fn Button() {}").unwrap();
+
+        set_resolve_context(ResolveContext {
+            platform: Platform::Macos,
+            surface: Surface::Native,
+        });
+        let hit = super::resolve_relative_module_path(root, "./Button").expect("macos resolve");
+        assert!(hit.ends_with("Button.macos.tish"));
+
+        // No platform context → legacy bare `.tish`.
+        set_resolve_context(ResolveContext::default());
+        let base = super::resolve_relative_module_path(root, "./Button").expect("base resolve");
+        assert!(base.ends_with("Button.tish"));
+    }
 }