More custom directive tweaks

modules/scala/launcher/src/main/scala/almond/launcher/Launcher.scala

@@ -188,7 +188,8 @@ object Launcher extends CaseApp[LauncherOptions] {
       msgFileArgs,
       noExecuteInputArgs,
       optionsArgs,
-      options.kernelOptions
+      options.kernelOptions,
+      params0.kernelOptions
     )
 
     (proc, scalaVersion, jvmIdOpt)

modules/scala/launcher/src/main/scala/almond/launcher/LauncherOptions.scala

@@ -64,6 +64,8 @@ final case class LauncherOptions(
       b ++= Seq(s"--silent-imports=$value")
     for (value <- useNotebookCoursierLogger)
       b ++= Seq(s"--use-notebook-coursier-logger=$value")
+    for (group <- customDirectiveGroup.map(_.split(":", 2)).collect { case Array(k, _) => k })
+      b ++= Seq(s"--launcher-directive-group=$group")
     b.result()
   }
 

modules/scala/scala-interpreter/src/main/scala/almond/Execute.scala

@@ -17,7 +17,7 @@ import almond.internals.{
 import almond.interpreter.ExecuteResult
 import almond.interpreter.api.{CommHandler, DisplayData, OutputHandler}
 import almond.interpreter.input.InputManager
-import almond.launcher.directives.LauncherParameters
+import almond.launcher.directives.{CustomGroup, LauncherParameters}
 import almond.logger.LoggerContext
 import ammonite.compiler.Parsers
 import ammonite.repl.api.History
@@ -49,11 +49,27 @@ final class Execute(
   useThreadInterrupt: Boolean,
   initialCellCount: Int,
   enableExitHack: Boolean,
-  ignoreLauncherDirectivesIn: Set[String]
+  ignoreLauncherDirectivesIn: Set[String],
+  launcherDirectiveGroups: Seq[CustomGroup]
 ) {
 
   private val handlers = HasKernelOptions.handlers ++
-    LauncherParameters.handlers.mapDirectives(_.ignoredDirective)
+    LauncherParameters.handlers.mapDirectives(_.ignoredDirective).addCustomHandler { key =>
+      launcherDirectiveGroups.find(_.matches(key)).map { group =>
+        new DirectiveHandler[HasKernelOptions] {
+          def name        = s"custom group ${group.prefix}"
+          def description = s"custom group ${group.prefix}"
+          def usage       = s"//> ${group.prefix}..."
+          def keys        = Seq(key)
+          def handleValues(scopedDirective: ScopedDirective)
+            : Either[DirectiveException, ProcessedDirective[HasKernelOptions]] =
+            Right(ProcessedDirective(
+              Some(HasKernelOptions.IgnoredDirectives(Seq(IgnoredDirective(scopedDirective)))),
+              Nil
+            ))
+        }
+      }
+    }
 
   private val log = logCtx(getClass)
 

modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreter.scala

@@ -74,7 +74,8 @@ final class ScalaInterpreter(
     params.useThreadInterrupt,
     params.initialCellCount,
     enableExitHack = params.compileOnly,
-    ignoreLauncherDirectivesIn = params.ignoreLauncherDirectivesIn
+    ignoreLauncherDirectivesIn = params.ignoreLauncherDirectivesIn,
+    launcherDirectiveGroups = params.launcherDirectiveGroups
   )
 
   val sessApi = new SessionApiImpl(frames0)

modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreterParams.scala

@@ -3,6 +3,7 @@ package almond
 import java.nio.file.Path
 
 import almond.directives.KernelOptions
+import almond.launcher.directives.CustomGroup
 import almond.protocol.KernelInfo
 import ammonite.compiler.iface.CodeWrapper
 import ammonite.compiler.CodeClassWrapper
@@ -44,5 +45,6 @@ final case class ScalaInterpreterParams(
   extraClassPath: List[os.Path] = Nil,
   initialCellCount: Int = 0,
   upfrontKernelOptions: KernelOptions = KernelOptions(),
-  ignoreLauncherDirectivesIn: Set[String] = Set.empty
+  ignoreLauncherDirectivesIn: Set[String] = Set.empty,
+  launcherDirectiveGroups: Seq[CustomGroup] = Nil
 )

modules/scala/scala-kernel/src/main/scala/almond/Options.scala

@@ -122,7 +122,11 @@ final case class Options(
 
   @HelpMessage("Do warn users about launcher directives for incoming messages with the passed ids")
   @Hidden
-    ignoreLauncherDirectivesIn: List[String] = Nil
+    ignoreLauncherDirectivesIn: List[String] = Nil,
+
+  @HelpMessage("Pass launcher directive groups with this option. These directives will be either ignored (see --ignore-launcher-directives-in), or trigger an unused directive warning")
+  @Hidden
+    launcherDirectiveGroup: List[String] = Nil
 ) {
   // format: on
 

modules/scala/scala-kernel/src/main/scala/almond/ScalaKernel.scala

@@ -8,6 +8,7 @@ import almond.directives.KernelOptions
 import almond.interpreter.messagehandlers.MessageHandler
 import almond.kernel.{Kernel, KernelThreads}
 import almond.kernel.install.Install
+import almond.launcher.directives.CustomGroup
 import almond.logger.{Level, LoggerContext}
 import almond.util.ThreadUtil.singleThreadedExecutionContext
 import caseapp._
@@ -192,7 +193,8 @@ object ScalaKernel extends CaseApp[Options] {
           },
         initialCellCount = options.initialCellCount.getOrElse(0),
         upfrontKernelOptions = kernelOptionsFromJson,
-        ignoreLauncherDirectivesIn = options.ignoreLauncherDirectivesIn.toSet
+        ignoreLauncherDirectivesIn = options.ignoreLauncherDirectivesIn.toSet,
+        launcherDirectiveGroups = options.launcherDirectiveGroup.map(CustomGroup(_, ""))
       ),
       logCtx = logCtx
     )

modules/scala/shared-directives/src/main/scala/almond/launcher/directives/LauncherParameters.scala

@@ -11,6 +11,7 @@ final case class LauncherParameters(
   javaOptions: Seq[String] = Nil,
   scala: Option[String] = None,
   javaCmd: Option[Seq[String]] = None,
+  kernelOptions: Seq[String] = Nil,
   customDirectives: Seq[(CustomGroup, String, Seq[String])] = Nil
 ) {
   import LauncherParameters._
@@ -21,6 +22,7 @@ final case class LauncherParameters(
       javaOptions ++ other.javaOptions,
       scala.orElse(other.scala),
       javaCmd.orElse(other.javaCmd),
+      kernelOptions ++ other.kernelOptions,
       customDirectives = customDirectives ++ other.customDirectives
     )
 
@@ -109,21 +111,24 @@ object LauncherParameters {
     jvm: Option[String] = None,
     javaOptions: Seq[String] = Nil,
     scala: Option[String] = None,
-    javaCmd: Option[Seq[String]] = None
+    javaCmd: Option[Seq[String]] = None,
+    kernelOptions: Seq[String] = Nil
   ) {
     def +(other: AsJson): AsJson =
       AsJson(
         jvm = jvm.orElse(other.jvm),
         javaOptions = javaOptions ++ other.javaOptions,
         scala = scala.orElse(other.scala),
-        javaCmd = javaCmd.orElse(other.javaCmd)
+        javaCmd = javaCmd.orElse(other.javaCmd),
+        kernelOptions = kernelOptions ++ other.kernelOptions
       )
     def params: LauncherParameters =
       LauncherParameters(
         jvm = jvm,
         javaOptions = javaOptions,
         scala = scala,
-        javaCmd = javaCmd
+        javaCmd = javaCmd,
+        kernelOptions = kernelOptions
       )
   }
 

project/deps.sc

@@ -50,7 +50,7 @@ object Deps {
   def coursierApi        = ivy"io.get-coursier:interface:1.0.18"
   def coursierLauncher   = ivy"io.get-coursier:coursier-launcher_2.13:${Versions.coursier}"
   def dependencyInterface = ivy"io.get-coursier::dependency-interface:0.2.3"
-  def directiveHandler    = ivy"io.github.alexarchambault.scala-cli::directive-handler:0.1.3"
+  def directiveHandler    = ivy"io.github.alexarchambault.scala-cli::directive-handler:0.1.4"
   def expecty             = ivy"com.eed3si9n.expecty::expecty:0.16.0"
   def fansi               = ivy"com.lihaoyi::fansi:0.4.0"
   def fs2(sv: String) =