Fix multi-file prettify output directory structure

Include files were getting the full CWD-relative path baked into the
output directory (e.g., out/a/b/c/restaurant/file.riddl instead of
out/restaurant/file.riddl). Added mandatory inputDir parameter to
PrettifyPass.Options and PrettifyState so toDestination() strips
the input file's parent directory prefix from include paths.

Made inputDir mandatory (no default) to prevent silent fallback to
the broken behavior. All callers updated.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: reid-spencer

commands/shared/src/main/scala/com/ossuminc/riddl/commands/PrettifyCommand.scala

@@ -97,12 +97,16 @@ class PrettifyCommand(using pc: PlatformContext)
       .map(_.getFileName.toString).getOrElse("")
     val outDir = options.outputDir
       .map(_.toString).getOrElse("")
+    val inDir = options.inputFile
+      .flatMap(p => Option(p.getParent))
+      .map(_.toString).getOrElse("")
     standardPasses ++ Seq(
       { (input: PassInput, outputs: PassesOutput) =>
         PrettifyPass(input, outputs, PrettifyPass.Options(
           flatten = options.singleFile,
           topFile = topFile,
-          outputDir = outDir
+          outputDir = outDir,
+          inputDir = inDir
         ))
       }
     )

commands/shared/src/main/scala/com/ossuminc/riddl/commands/UnbastifyCommand.scala

@@ -111,7 +111,7 @@ class UnbastifyCommand(using pc: PlatformContext) extends Command[UnbastifyComma
         val passInput = PassInput(nebula)
         // BAST stores all content inline (includes are resolved), so
         // flatten output to produce a single self-contained .riddl file
-        val prettifyOptions = PrettifyPass.Options(flatten = true)
+        val prettifyOptions = PrettifyPass.Options(flatten = true, inputDir = "")
 
         // Create the pass and run it using Pass.runThesePasses
         val passes: PassCreators = Seq(

passes/jvm-native/src/test/scala/com/ossuminc/riddl/passes/RiddlTest.scala

@@ -218,7 +218,7 @@ class RiddlTest extends AbstractTestingBasis {
           case Right(root) =>
             val input = PassInput(root)
             val outputs = PassesOutput()
-            val options = PrettifyPass.Options(flatten = false)
+            val options = PrettifyPass.Options(flatten = false, inputDir = "language/input/includes")
             val result = Pass.runPass[PrettifyOutput](
               input, outputs,
               PrettifyPass(input, outputs, options)
@@ -244,7 +244,7 @@ class RiddlTest extends AbstractTestingBasis {
           case Right(root) =>
             val input = PassInput(root)
             val outputs = PassesOutput()
-            val options = PrettifyPass.Options(flatten = true)
+            val options = PrettifyPass.Options(flatten = true, inputDir = "")
             val result = Pass.runPass[PrettifyOutput](
               input, outputs,
               PrettifyPass(input, outputs, options)

passes/jvm/src/test/scala/com/ossuminc/riddl/passes/prettify/PrettifyPassTest.scala

@@ -28,7 +28,7 @@ abstract class PrettifyPassTest extends RiddlFilesTestBase {
   def runPrettify(source: RiddlParserInput, run: String): String = {
     val passes = standardPasses ++ Seq(
       { (input: PassInput, outputs: PassesOutput) =>
-        val options = PrettifyPass.Options(flatten = true)
+        val options = PrettifyPass.Options(flatten = true, inputDir = "")
         PrettifyPass(input, outputs, options)
       }
     )
@@ -94,7 +94,7 @@ abstract class PrettifyPassTest extends RiddlFilesTestBase {
 
   "PrettifyOutput" must {
     "construct" in { _ =>
-      val ps = PrettifyState(flatten = true)
+      val ps = PrettifyState(flatten = true, inputDir = "")
       ps.numFiles must be(1)
       val po = PrettifyOutput(Root.empty, Messages.empty, ps)
       po.messages must be(empty)

passes/shared/src/main/scala/com/ossuminc/riddl/passes/Riddl.scala

@@ -143,7 +143,7 @@ object Riddl {
     val result = Pass.runPass[PrettifyOutput](
       input,
       outputs,
-      PrettifyPass(input, outputs, PrettifyPass.Options(flatten = true))
+      PrettifyPass(input, outputs, PrettifyPass.Options(flatten = true, inputDir = ""))
     )
     result.state.filesAsString
   end toRiddlText

passes/shared/src/main/scala/com/ossuminc/riddl/passes/prettify/PrettifyPass.scala

@@ -20,14 +20,15 @@ import scala.scalajs.js.annotation.JSExportTopLevel
 @JSExportTopLevel("PrettifyPass$")
 object PrettifyPass extends PassInfo[PrettifyPass.Options]:
   val name: String = "prettify"
-  def creator(options: PrettifyPass.Options = PrettifyPass.Options())(using PlatformContext) =
+  def creator(options: PrettifyPass.Options)(using PlatformContext) =
     (in: PassInput, out: PassesOutput) => PrettifyPass(in, out, options)
   end creator
 
   case class Options(
     flatten: Boolean = false,
     topFile: String = "",
-    outputDir: String = ""
+    outputDir: String = "",
+    inputDir: String
   ) extends PassOptions
 end PrettifyPass
 

passes/shared/src/main/scala/com/ossuminc/riddl/passes/prettify/PrettifyState.scala

@@ -12,14 +12,22 @@ import com.ossuminc.riddl.utils.{PlatformContext, URL}
 import scala.collection.mutable
 import scala.scalajs.js.annotation.JSExport
 
-case class PrettifyState(flatten: Boolean = false, topFile: String = "prettify-output.riddl", outDir: String = ".")(using PlatformContext):
+case class PrettifyState(flatten: Boolean = false, topFile: String = "prettify-output.riddl", outDir: String = ".", inputDir: String)(using PlatformContext):
 
   // Strip leading/trailing '/' from outDir for URL basis field, which
   // already gets '/' separators in URL format (scheme://authority/basis/path)
   private val normalizedOutDir: String =
     val stripped = if outDir.startsWith("/") then outDir.drop(1) else outDir
     if stripped.endsWith("/") then stripped.dropRight(1) else stripped
 
+  // Prefix to strip from include paths so output files are relative
+  // to the main input file's directory, not to CWD
+  private val inputDirPrefix: String =
+    if inputDir.isEmpty then ""
+    else
+      val normalized = inputDir.replace('\\', '/')
+      if normalized.endsWith("/") then normalized else normalized + "/"
+
   def filesAsString: String = {
     closeStack()
     files.map(fe => fe.toString).mkString("\n")
@@ -40,7 +48,11 @@ case class PrettifyState(flatten: Boolean = false, topFile: String = "prettify-o
   }
 
   def toDestination(url: URL): URL = {
-    URL(url.scheme, url.authority, normalizedOutDir, url.path)
+    val relativePath =
+      if inputDirPrefix.nonEmpty && url.path.startsWith(inputDirPrefix) then
+        url.path.drop(inputDirPrefix.length)
+      else url.path
+    URL(url.scheme, url.authority, normalizedOutDir, relativePath)
   }
   def numFiles: Int = files.length
 

passes/shared/src/main/scala/com/ossuminc/riddl/passes/prettify/PrettifyVisitor.scala

@@ -20,7 +20,8 @@ class PrettifyVisitor(options: PrettifyPass.Options)(using PlatformContext) exte
     if options.topFile.nonEmpty then options.topFile
     else "prettify-output.riddl",
     if options.outputDir.nonEmpty then options.outputDir
-    else "."
+    else ".",
+    options.inputDir
   )
 
   def result: PrettifyState = state

riddlLib/shared/src/main/scala/com/ossuminc/riddl/RiddlLib.scala

@@ -531,7 +531,7 @@ object RiddlLib extends RiddlLib:
     val passInput = PassInput(root)
     val passes = Seq(
       PrettifyPass.creator(
-        PrettifyPass.Options(flatten = true)
+        PrettifyPass.Options(flatten = true, inputDir = "")
       )
     )
     val result = Pass.runThesePasses(passInput, passes)