Merge pull request #3 from magaransoft/hotfix-sbt-auto-mode

hotfix(sbt): auto-mode default — pick bsp when .bsp/sbt.json present

Author: Blanquitoh

.gitignore

@@ -1,32 +1,19 @@
-# OS
-.DS_Store
-Thumbs.db
-
-# editors
-.vscode/
+# build artifacts — generated by backing tools during smoke tests
+project/
+target/
+.bsp/
+.bloop/
+.metals/
+.scala-build/
 .idea/
-*.swp
-*~
-
-# language servers / caches
-node_modules/
-.venv/
-venv/
-__pycache__/
-*.pyc
-.pytest_cache/
-.mypy_cache/
 
-# fixture build artifacts
-fixtures/**/obj/
-fixtures/**/bin/
-fixtures/**/dist/
-fixtures/**/.bloop/
-fixtures/**/target/
-# eclipse jdt.ls writes these into the java fixture on first start
+# java-direct / jdtls generates Eclipse project metadata on first open
 fixtures/java/.classpath
 fixtures/java/.project
 fixtures/java/.settings/
 
-# local state (user-owned, not repo data)
-.claude/
+# dotnet restore + build outputs
+fixtures/csharp/obj/
+fixtures/csharp/bin/
+fixtures/dotnet-csproj/obj/
+fixtures/dotnet-csproj/bin/

README.md

@@ -119,9 +119,10 @@ of one cold + two warm runs.
 ### Where direct wrappers don't help (or hurt)
 
 - **sbt oneshot mode** — no persistence, so it strictly adds
-  coordinator overhead on top of bare sbt. Exists only as a fallback
-  for when BSP isn't configured in the workspace. **Use `bsp` mode
-  (`SBT_DIRECT_MODE=bsp`) whenever possible.**
+  coordinator overhead on top of bare sbt. Only hit when `.bsp/sbt.json`
+  is absent in the workspace. `sbt-direct`'s **auto mode** (default)
+  detects this at start and prints a log line pointing at
+  `sbt bspConfig` to switch to the warm path.
 - **dotnet-direct** — MSBuild's build-server gives bare dotnet the
   same warm-path benefit. Direct wrapper is within 2× of bare;
   shipping it is about uniform CLI contract + `calls.log` observability,

bin/sbt-direct

@@ -8,12 +8,15 @@ set -euo pipefail
 STATE_ROOT="${SBT_DIRECT_STATE:-$HOME/.cache/sbt-direct}"
 COORDINATOR="$HOME/.claude/bin/sbt-direct-coordinator.js"
 WORKSPACE_MARKERS=(build.sbt build.sc build.mill project/build.properties)
-# SBT_DIRECT_MODE=oneshot (default) | bsp
-#   oneshot: each /call spawns fresh `sbt <task>` (20-40s each).
-#   bsp: persistent sbt via Build Server Protocol (`.bsp/sbt.json`
-#        launch descriptor). Cold init ~15-30s; warm calls sub-second.
-#        Requires `sbt bspConfig` run once in the workspace.
-SBT_MODE="${SBT_DIRECT_MODE:-oneshot}"
+# SBT_DIRECT_MODE=auto (default) | bsp | oneshot
+#   auto: coordinator probes <workspace>/.bsp/sbt.json. If present → bsp
+#         mode (warm calls <200ms). If absent → oneshot (20-40s per call),
+#         with a log message telling the user to run `sbt bspConfig`.
+#   bsp: force Build Server Protocol mode. Errors if .bsp/sbt.json absent.
+#   oneshot: force per-call subprocess. Slower than bare sbt; kept as a
+#            fallback for projects without BSP and as an integration test
+#            path.
+SBT_MODE="${SBT_DIRECT_MODE:-auto}"
 
 die() { echo "sbt-direct: $*" >&2; exit 1; }
 
@@ -69,10 +72,11 @@ cmd_start() {
   nohup node "$COORDINATOR" --tool-name sbt-direct --mode "$SBT_MODE" --workspace "$ws" --port "$port" >"$dir/log" 2>&1 &
   pid=$!
   echo "$pid" > "$dir/pid"
-  # bsp mode waits for sbt JVM boot + BSP initialize (15-30s warm,
-  # up to 120s on fresh ivy/coursier cache). oneshot binds immediately.
+  # bsp + auto modes wait for sbt JVM boot + BSP initialize (15-30s
+  # warm, up to 120s on fresh ivy/coursier cache). Pure oneshot binds
+  # immediately since no persistent child spawns.
   local timeout=30
-  [ "$SBT_MODE" = "bsp" ] && timeout=120
+  [ "$SBT_MODE" != "oneshot" ] && timeout=120
   local i=0
   until port_ready "$port"; do
     sleep 1

bin/sbt-direct-coordinator.js

@@ -21,16 +21,29 @@ const WORKSPACE = path.resolve(arg('workspace', process.cwd()));
 const PORT = parseInt(arg('port', '0'), 10);
 const TOOL_NAME = arg('tool-name', 'sbt-direct');
 const SBT_CMD = arg('sbt-cmd', 'sbt');
-// mode: oneshot (default) — per-call subprocess, no persistent JVM
-//       bsp — persistent sbt via Build Server Protocol. Requires a
-//       one-time `sbt bspConfig` in the workspace to generate
-//       .bsp/sbt.json (sbt auto-creates it on first compile/bspConfig).
-//       Warm calls sub-second; cold first init ~15-30s.
-const MODE = arg('mode', process.env.SBT_DIRECT_MODE || 'oneshot');
+// mode selection:
+//   auto (default) — probe <ws>/.bsp/sbt.json; use bsp if present, oneshot otherwise
+//   bsp            — persistent sbt via Build Server Protocol (warm calls <200ms).
+//                    Requires `.bsp/sbt.json`; errors if absent.
+//   oneshot        — per-call `sbt <task>` subprocess (20-40s per call; slower
+//                    than bare sbt because we don't reuse sbt's launcher daemon).
+//                    Fallback only — users with a working bsp descriptor
+//                    should never end up here.
+let MODE = arg('mode', process.env.SBT_DIRECT_MODE || 'auto');
+if (MODE === 'auto') {
+  const bspDescriptor = path.join(WORKSPACE, '.bsp', 'sbt.json');
+  if (fs.existsSync(bspDescriptor)) {
+    MODE = 'bsp';
+  } else {
+    MODE = 'oneshot';
+    console.error(`[sbt-direct] ${bspDescriptor} not found — falling back to oneshot mode (slower). Run \`sbt bspConfig\` once in the workspace to enable bsp mode (warm calls <200ms).`);
+  }
+}
 const adapterModule = MODE === 'bsp'
   ? './adapters/sbt-bsp.js'
   : './adapters/sbt-oneshot.js';
 const { createAdapter } = require(adapterModule);
+console.error(`[sbt-direct] mode=${MODE}`);
 
 if (!fs.existsSync(WORKSPACE)) die(`workspace does not exist: ${WORKSPACE}`);
 

docs/per-language/sbt.md

@@ -1,11 +1,24 @@
 # sbt — `sbt-direct`
 
-Per-workspace sbt coordinator with two modes:
+Per-workspace sbt coordinator. Default mode is **auto**: on `start`,
+the coordinator probes `<workspace>/.bsp/sbt.json` and selects:
 
-| mode | activation | cold first call | warm call | prereq |
-|---|---|---|---|---|
-| `oneshot` (default) | `SBT_DIRECT_MODE=oneshot` or unset | 20-40s | 20-40s | sbt on PATH |
-| `bsp` | `SBT_DIRECT_MODE=bsp` | 15-30s (JVM boot + BSP init) | sub-second (~150ms observed) | sbt on PATH + `sbt bspConfig` run once in the workspace |
+| detected state | selected mode | cold first call | warm call |
+|---|---|---|---|
+| `.bsp/sbt.json` present | `bsp` (persistent JVM) | 15-30s (JVM boot + BSP init) | **~130ms** |
+| `.bsp/sbt.json` absent | `oneshot` (per-call subprocess) | 4-5s | 3-4s |
+
+`bsp` mode is strictly faster whenever it's available. If your
+workspace doesn't have `.bsp/sbt.json`, run `sbt bspConfig` once to
+generate it — every subsequent `sbt-direct call` in that workspace
+switches to the warm path automatically.
+
+Override auto-detection with `SBT_DIRECT_MODE=bsp` (force; errors if
+descriptor absent) or `SBT_DIRECT_MODE=oneshot` (force; useful only
+for a deliberate test of the fallback path).
+
+Prereq for either mode: `sbt` on `PATH`. `bsp` adds the one-time
+`sbt bspConfig` step per workspace.
 
 The bsp mode uses the Build Server Protocol (Scala-BSP 2.x). sbt writes
 `.bsp/sbt.json` describing how to launch itself in BSP server mode; the