update callback wrapper gen;cross-link opens

Author: houstonhaynes

src/Farscape.Cli/Program.fs

@@ -319,6 +319,7 @@ let pilotInitCommand =
             Callbacks = None
             Nonnull = None
             ProtocolConfig = None
+            Layer3 = None
         }
 
         let tomlPath = Path.Combine(outputDir, $"{library}.pilot.toml")

src/Farscape.Core/BindingGenerator.fs

@@ -85,7 +85,6 @@ module CallbackWrapperGenerator =
     let generateRegistrationWrapper
         (reg: CallbackRegistration)
         (funcDecl: CppParser.FunctionDecl)
-        (bindingsModuleName: string)
         (model: Types.PlatformABI)
         : FsDecl list =
 
@@ -106,8 +105,8 @@ module CallbackWrapperGenerator =
         // Body: let handler = dlsym 0n handlerSymbol in originalFunc arg1 handler arg2 ...
         let body =
             LetIn("handler",
-                FunctionCall("Fidelity.Libc.DynamicLink", "dlsym", [Literal "0n"; Identifier "handlerSymbol"]),
-                FunctionCall(bindingsModuleName, reg.Function,
+                FunctionCall("", "dlsym", [Literal "0n"; Identifier "handlerSymbol"]),
+                FunctionCall("", reg.Function,
                     funcDecl.Parameters |> List.map (fun (name, _) ->
                         if name = reg.CallbackParam then Identifier "handler"
                         elif reg.DataParam = Some name then Literal "0n"
@@ -152,7 +151,7 @@ module CallbackWrapperGenerator =
             let fields =
                 structDecl.Fields |> List.map (fun f ->
                     if isCallbackField f then
-                        (f.Name, FunctionCall("Fidelity.Libc.DynamicLink", "dlsym",
+                        (f.Name, FunctionCall("", "dlsym",
                             [Literal "0n"; Identifier (f.Name + "Sym")]))
                     else
                         // Non-callback field: zero-init
@@ -172,7 +171,6 @@ module CallbackWrapperGenerator =
     let generateDecls
         (spec: CallbackSpec)
         (declarations: CppParser.Declaration list)
-        (bindingsModuleName: string)
         (model: Types.PlatformABI)
         : FsDecl list =
 
@@ -191,7 +189,7 @@ module CallbackWrapperGenerator =
                         | CppParser.Declaration.Function f when f.Name = reg.Function -> Some f
                         | _ -> None)
                 match funcDecl with
-                | Some f -> generateRegistrationWrapper reg f bindingsModuleName model
+                | Some f -> generateRegistrationWrapper reg f model
                 | None -> [])
 
         let listenerDecls =
@@ -215,12 +213,13 @@ module CallbackWrapperGenerator =
         (spec: CallbackSpec)
         (declarations: CppParser.Declaration list)
         (namespace': string)
-        (bindingsModuleName: string)
         (model: Types.PlatformABI)
+        (openModules: string list)
         : string option =
 
-        let decls = generateDecls spec declarations bindingsModuleName model
+        let decls = generateDecls spec declarations model
         if decls.IsEmpty then None
         else
-            let moduleDecl = Module(namespace', "Callback wrappers — dlsym-based runtime symbol resolution", decls)
+            let opens = openModules |> List.map OpenModule
+            let moduleDecl = Module(namespace', "Callback wrappers — dlsym-based runtime symbol resolution", opens @ decls)
             Some (CodeRenderer.render moduleDecl)

src/Farscape.Core/CallbackWrapperGenerator.fs

@@ -24,7 +24,7 @@ module CodeRenderer =
     let rec renderExpr (indent: string) = function
         | DefaultOf ty -> $"Unchecked.defaultof<{renderType ty}>"
         | FunctionCall (mod', name, args) ->
-            let argStr = args |> List.map (renderExpr indent) |> String.concat " "
+            let argStr = args |> List.map (renderArg indent) |> String.concat " "
             if mod' = "" then $"{name} {argStr}"
             else $"{mod'}.{name} {argStr}"
         | Identifier name -> name
@@ -57,6 +57,12 @@ module CodeRenderer =
                 |> String.concat ""
             $"match {renderExpr indent scrutinee} with{caseStr}"
 
+    /// Render an expression as a function argument, parenthesizing compound expressions.
+    and renderArg (indent: string) (expr: FsExpr) =
+        match expr with
+        | Identifier _ | Literal _ -> renderExpr indent expr
+        | _ -> $"({renderExpr indent expr})"
+
     /// Render a single FsDecl node to the StringBuilder at the given indentation level
     let rec private renderDecl (sb: StringBuilder) (indent: int) (decl: FsDecl) =
         let prefix = String.replicate indent "    "

src/Farscape.Core/CodeRenderer.fs

@@ -393,7 +393,8 @@ module PilotAnalyzer =
           Options = None
           Callbacks = None
           Nonnull = None
-          ProtocolConfig = None }
+          ProtocolConfig = None
+          Layer3 = None }
 
     // =========================================================================
     // Declaration Filtering (for scoped generation)
@@ -568,3 +569,40 @@ module PilotAnalyzer =
                 match declarationName decl with
                 | Some name -> Set.contains name typeNames
                 | None -> false)
+
+    // =========================================================================
+    // Layer 3 Bridge Requirement Analysis
+    // =========================================================================
+
+    /// Analyze whether a project needs a Layer 3 Bridge package.
+    /// Examines protocol config and callbacks to determine cross-library dependencies.
+    /// The unpairedConstructors parameter is computed by the caller from parsed protocol data
+    /// (PilotAnalyzer cannot reference ProtocolParser due to fsproj ordering).
+    let analyzeLayer3Requirements
+        (project: PilotProject)
+        (resolvedCallbackSpec: CallbackSpec option)
+        (unpairedConstructors: string list)
+        : Layer3Requirement option =
+
+        let hasProtocol = project.ProtocolConfig.IsSome
+        let hasCallbacks =
+            match resolvedCallbackSpec with
+            | Some spec -> not spec.Registrations.IsEmpty || not spec.ListenerStructs.IsEmpty
+            | None -> false
+
+        if not hasProtocol && not hasCallbacks then None
+        else
+            let deps =
+                [ if hasProtocol then
+                    yield LibcDynamicLink
+                    yield LibcMemory
+                  if hasCallbacks then
+                    yield LibcDynamicLink ]
+                |> List.distinct
+            Some {
+                Dependencies = deps
+                HasProtocolDispatch = hasProtocol
+                HasCallbackWrappers = hasCallbacks
+                UnpairedConstructors = unpairedConstructors
+                UnmappedPatterns = []
+            }

src/Farscape.Core/PilotAnalyzer.fs

@@ -424,7 +424,8 @@ module PilotDiscovery =
           Options = None
           Callbacks = None
           Nonnull = None
-          ProtocolConfig = None }
+          ProtocolConfig = None
+          Layer3 = None }
 
     // =========================================================================
     // IO Layer (CLI consumption)

src/Farscape.Core/PilotDiscovery.fs

@@ -488,7 +488,8 @@ module PilotSerializer =
                  Options = deserializeOptions doc
                  Callbacks = deserializeCallbacks doc
                  Nonnull = deserializeNonnull doc
-                 ProtocolConfig = deserializeProtocolConfig doc }
+                 ProtocolConfig = deserializeProtocolConfig doc
+                 Layer3 = None }
         | Error e, _, _ | _, Error e, _ | _, _, Error e -> Error e
 
     // =========================================================================

src/Farscape.Core/PilotSerializer.fs

@@ -158,6 +158,31 @@ module PilotTypes =
         DestroyFlag: uint32
     }
 
+    // =========================================================================
+    // Layer 3 Bridge Requirements
+    // =========================================================================
+
+    /// External dependencies required by Layer 3 bridge code.
+    type Layer3Dependency =
+        /// dlsym for interface resolution + callback binding
+        | LibcDynamicLink
+        /// malloc/free for protocol argument arrays
+        | LibcMemory
+
+    /// Layer 3 requirement analysis result — determines whether a Bridge package is needed.
+    type Layer3Requirement = {
+        /// External dependencies the bridge code needs
+        Dependencies: Layer3Dependency list
+        /// Protocol dispatch implementations needed
+        HasProtocolDispatch: bool
+        /// Callback wrappers (dlsym-based) needed
+        HasCallbackWrappers: bool
+        /// Interfaces with constructors but no paired destructor — developer must review
+        UnpairedConstructors: string list
+        /// Patterns the generator couldn't handle — developer must implement by hand
+        UnmappedPatterns: string list
+    }
+
     /// Complete Pilot project, corresponding to a .pilot.toml file.
     type PilotProject = {
         Library: LibrarySpec
@@ -173,6 +198,9 @@ module PilotTypes =
         Nonnull: NonnullAnnotations option
         /// Protocol dispatch configuration (None = no XML protocol request generation)
         ProtocolConfig: ProtocolConfig option
+        /// Layer 3 bridge requirements (None = no bridge package needed).
+        /// Computed by PilotAnalyzer.analyzeLayer3Requirements, not serialized.
+        Layer3: Layer3Requirement option
     }
 
     // =========================================================================

src/Farscape.Core/PilotTypes.fs

@@ -308,11 +308,11 @@ module ProtocolParser =
         | Int -> Named "int32"
         | Uint -> Named "uint32"
         | Fixed -> Named "int32"  // wl_fixed_t is int32
-        | String -> Generic("Option", Generic("nativeptr", Named "byte"))
-        | Object -> Generic("Option", Named "nativeint")
-        | NewId -> Generic("Option", Named "nativeint")
+        | String -> Named "nativeint"  // string pointer, passed as nativeint in arg array
+        | Object -> Named "nativeint"  // proxy handle
+        | NewId -> Named "nativeint"
         | Fd -> Named "int32"
-        | Array -> Generic("Option", Named "nativeint")
+        | Array -> Named "nativeint"  // wl_array pointer
 
     /// Convert a protocol arg value to nativeint for the argument array.
     let private argToNativeint (arg: ProtocolArg) : FsExpr =
@@ -361,18 +361,18 @@ module ProtocolParser =
 
         // Build the body
         let flags =
-            if request.IsDestructor then Literal $"{config.DestroyFlag}u"
-            else Literal "0u"
+            if request.IsDestructor then TypeConversion("uint32", Literal $"{config.DestroyFlag}")
+            else TypeConversion("uint32", Literal "0")
 
-        let opcodeExpr = Literal $"{opcode}u"
+        let opcodeExpr = TypeConversion("uint32", Literal $"{opcode}")
 
         // Interface pointer: resolve via dlsym for typed new_id, or use caller-provided for untyped
         let interfaceExpr =
             if isConstructor && not isUntypedNewId then
                 match newIdArg with
                 | Some a ->
                     let targetIface = a.Interface |> Option.defaultValue iface.Name
-                    FunctionCall("Fidelity.Libc.DynamicLink", "dlsym", [Literal "0n"; Literal $"\"{targetIface}_interface\""])
+                    FunctionCall("", "dlsym", [Literal "0n"; Literal $"\"{targetIface}_interface\""])
                 | None -> Literal "0n"
             elif isUntypedNewId then
                 Identifier "``interface``"
@@ -384,7 +384,7 @@ module ProtocolParser =
             if isUntypedNewId then
                 Identifier "version"
             else
-                FunctionCall(config.MarshalModule, config.VersionFunction, [FunctionCall("", "Some", [Identifier "self"])])
+                FunctionCall("", config.VersionFunction, [FunctionCall("", "Some", [Identifier "self"])])
 
         // For requests with no args (besides self and new_id), pass None for args array
         // For requests with args, we need to construct the argument array
@@ -394,7 +394,7 @@ module ProtocolParser =
             if marshalArgs.IsEmpty && not isUntypedNewId then
                 // Simple case: no argument array needed
                 let marshalCall =
-                    FunctionCall(config.MarshalModule, config.MarshalFunction,
+                    FunctionCall("", config.MarshalFunction,
                         [ FunctionCall("", "Some", [Identifier "self"])
                           opcodeExpr
                           FunctionCall("", "Some", [interfaceExpr])
@@ -416,7 +416,7 @@ module ProtocolParser =
                 // This requires constructing an argument array with the bind-specific args
                 // For now, generate with the regular args + interface name + version + NULL sentinel
                 let marshalCall =
-                    FunctionCall(config.MarshalModule, config.MarshalFunction,
+                    FunctionCall("", config.MarshalFunction,
                         [ FunctionCall("", "Some", [Identifier "self"])
                           opcodeExpr
                           FunctionCall("", "Some", [Identifier "``interface``"])
@@ -438,21 +438,21 @@ module ProtocolParser =
                         let offset = i * 8
                         // NativePtr.set on the buffer cast to nativeptr<nativeint>
                         let writeExpr =
-                            FunctionCall("NativeInterop.NativePtr", "set",
+                            FunctionCall("NativePtr", "set",
                                 [ Identifier "argsPtr"; Literal $"{i}"; argToNativeint arg ])
                         (i, writeExpr))
 
                 // Build the sequential expression: alloc, write args, marshal, free
                 let allocExpr =
-                    FunctionCall("Fidelity.Libc.Memory", "malloc",
+                    FunctionCall("", "malloc",
                         [ TypeConversion("unativeint", Literal allocSize) ])
                 let castExpr =
-                    FunctionCall("NativeInterop.NativePtr", "ofNativeInt",
+                    FunctionCall("NativePtr", "ofNativeInt",
                         [ Identifier "argsRaw" ])
 
                 // Chain: let argsRaw = malloc(...) in let argsPtr = cast in write0; write1; ... marshal; free
                 let marshalCall =
-                    FunctionCall(config.MarshalModule, config.MarshalFunction,
+                    FunctionCall("", config.MarshalFunction,
                         [ FunctionCall("", "Some", [Identifier "self"])
                           opcodeExpr
                           FunctionCall("", "Some", [interfaceExpr])
@@ -461,7 +461,7 @@ module ProtocolParser =
                           FunctionCall("", "Some", [Identifier "argsRaw"]) ])
 
                 let freeCall =
-                    FunctionCall("Fidelity.Libc.Memory", "free",
+                    FunctionCall("", "free",
                         [ FunctionCall("", "Some", [Identifier "argsRaw"]) ])
 
                 // Build nested let expressions for arg writes, then marshal + free

src/Farscape.Core/ProtocolParser.fs

@@ -226,6 +226,7 @@ module CallbackSerializerTests =
             }
             Nonnull = None
             ProtocolConfig = None
+            Layer3 = None
         }
         let toml = PilotSerializer.toTomlString project
         Assert.Contains("callbacks", toml)
@@ -264,6 +265,7 @@ module CallbackSerializerTests =
             }
             Nonnull = None
             ProtocolConfig = None
+            Layer3 = None
         }
         let toml = PilotSerializer.toTomlString project
         Assert.Contains("listener_structs", toml)
@@ -308,6 +310,7 @@ module CallbackSerializerTests =
             }
             Nonnull = None
             ProtocolConfig = None
+            Layer3 = None
         }
         let toml = PilotSerializer.toTomlString project
         match Fidelity.Data.TOML.Toml.parse toml with
@@ -345,7 +348,7 @@ module CallbackWrapperGeneratorTests =
                     mkField "motion" "void (*)(void *, struct wl_pointer *, uint32_t, wl_fixed_t, wl_fixed_t)"
                 ] None)
         ]
-        match CallbackWrapperGenerator.generate spec decls "Fidelity.Wayland.Callbacks" "Fidelity.Wayland" LP64 with
+        match CallbackWrapperGenerator.generate spec decls "Fidelity.Wayland.Callbacks" LP64 [] with
         | None -> Assert.Fail "Expected some generated output"
         | Some code ->
             Assert.Contains("dlsym", code)
@@ -373,7 +376,7 @@ module CallbackWrapperGeneratorTests =
                     mkField "leave" "WlPointerLeaveHandler"
                 ] None)
         ]
-        match CallbackWrapperGenerator.generate spec decls "Fidelity.Wayland.Callbacks" "Fidelity.Wayland" LP64 with
+        match CallbackWrapperGenerator.generate spec decls "Fidelity.Wayland.Callbacks" LP64 [] with
         | None -> Assert.Fail "Expected some generated output"
         | Some code ->
             Assert.Contains("dlsym", code)
@@ -390,13 +393,13 @@ module CallbackWrapperGeneratorTests =
             ]
         }
         // No struct found → no decls generated → None
-        let result = CallbackWrapperGenerator.generate spec [] "Fidelity.Test.Callbacks" "Fidelity.Test" LP64
+        let result = CallbackWrapperGenerator.generate spec [] "Fidelity.Test.Callbacks" LP64 []
         Assert.True(result.IsNone)
 
     [<Fact>]
     let ``empty callback spec produces None`` () =
         let spec : CallbackSpec = { Registrations = []; ListenerStructs = [] }
-        let result = CallbackWrapperGenerator.generate spec [] "Ns" "Mod" LP64
+        let result = CallbackWrapperGenerator.generate spec [] "Ns" LP64 []
         Assert.True(result.IsNone)
 
     [<Fact>]
@@ -412,7 +415,7 @@ module CallbackWrapperGeneratorTests =
                 mkFunc "g_idle_add" "unsigned int"
                     [("function", "int (*)(void *)"); ("data", "void *")])
         ]
-        match CallbackWrapperGenerator.generate spec decls "Fidelity.GTK.Callbacks" "Fidelity.GTK" LP64 with
+        match CallbackWrapperGenerator.generate spec decls "Fidelity.GTK.Callbacks" LP64 [] with
         | None -> Assert.Fail "Expected some output"
         | Some code ->
             Assert.Contains("dlsym", code)
@@ -434,7 +437,7 @@ module CallbackWrapperGeneratorTests =
                 mkFunc "signal" "void (*)(int)"
                     [("signum", "int"); ("handler", "void (*)(int)")])
         ]
-        match CallbackWrapperGenerator.generate spec decls "Fidelity.Libc.Callbacks" "Fidelity.Libc" LP64 with
+        match CallbackWrapperGenerator.generate spec decls "Fidelity.Libc.Callbacks" LP64 [] with
         | None -> Assert.Fail "Expected some output"
         | Some code ->
             Assert.Contains("signum", code)
@@ -449,5 +452,5 @@ module CallbackWrapperGeneratorTests =
             ]
             ListenerStructs = []
         }
-        let result = CallbackWrapperGenerator.generate spec [] "Ns" "Mod" LP64
+        let result = CallbackWrapperGenerator.generate spec [] "Ns" LP64 []
         Assert.True(result.IsNone)