Feat/session aware plot viewer

.github/workflows/main.yml

@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
     branches:
       - main
+      - master
   workflow_call:
     inputs:
       prerelease-date:
@@ -20,6 +22,8 @@ concurrency:
 
 jobs:
   test:
+    env:
+      VSCR_REQUIRE_PLOT_TESTS: '1'
     strategy:
       fail-fast: false
       matrix:
@@ -45,7 +49,22 @@ jobs:
       - name: Install R test dependencies
         run: install.packages(c("remotes", "pkgbuild", "languageserver", "lintr", "styler", "renv"))
         shell: Rscript {0}
+      - name: Install Linux plot system dependencies
+        if: runner.os == 'Linux'
+        # The unigd binary links libtiffxx.so.6, which the hosted image lacks.
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libtiffxx6
       - run: pnpm run build
+      - name: Verify live plot lifecycle dependencies
+        run: |
+          packages <- c("processx", "later", "jsonlite", "jgd", "httpgd", "svglite")
+          for (package in packages) {
+            message("Loading plot test dependency: ", package)
+            loadNamespace(package)
+          }
+          stopifnot(packageVersion("httpgd") >= "2.0.1")
+        shell: Rscript {0}
       - name: Verify managed jgd preparation
         run: pnpm run test:prepare-jgd
       - name: Verify managed rstudioapi preparation
@@ -88,14 +107,20 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y tmux
           VSCR_TEST_TMUX=1 pnpm exec mocha out/test/node/interactiveRuntime.test.js --ui tdd --timeout 60000 --grep "^Interactive real R runtime standalone agent survives its launcher process exiting$"
-      - name: Run Node tests
+      - name: Run Node tests including live plot lifecycle tests
         run: pnpm run test:node
+      - name: Run plot lifecycle extension tests (Linux)
+        if: runner.os == 'Linux'
+        run: xvfb-run -a pnpm run test:extension --label plot-lifecycle
+      - name: Run plot lifecycle extension tests
+        if: runner.os != 'Linux'
+        run: pnpm run test:extension --label plot-lifecycle
       - name: Run extension tests (Linux)
         if: runner.os == 'Linux'
-        run: xvfb-run -a pnpm run test:extension
+        run: xvfb-run -a pnpm run test:extension --label provider-tests --label editor-command-tests --label interactive-integration
       - name: Run extension tests
         if: runner.os != 'Linux'
-        run: pnpm run test:extension
+        run: pnpm run test:extension --label provider-tests --label editor-command-tests --label interactive-integration
       - name: Preserve extension test failure logs
         if: failure()
         uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2

.vscode-test.mjs

@@ -11,6 +11,11 @@ const common = {
 	}
 };
 
+const plotSuites = [
+	'jgdPlotHistory', 'jgdSocketServer', 'standardPlotViewer', 'plotCommands',
+	'plotBackend', 'plotRestoration', 'httpgdViewer', 'viewerSession', 'sessionConnectionLifecycle'
+];
+
 // Keep mock/provider tests independent of R language-server startup. Editor
 // command tests also need a fresh window after fixtures create terminals and
 // webviews. The real Interactive suite has its own window with the LSP enabled.
@@ -32,10 +37,17 @@ export default defineConfig([
 	{
 		...common,
 		label: 'provider-tests',
-		files: 'out/test/suite/**/!(interactiveEditor|interactiveInputFeatures|completionMiddleware).test.js',
+		files: `out/test/suite/**/!(${['interactiveEditor', 'interactiveInputFeatures', 'completionMiddleware', ...plotSuites].join('|')}).test.js`,
 		mocha: { ...common.mocha, require: './out/test/common/extensionSetup.js' },
 		launchArgs: testProfile('provider-tests', false)
 	},
+	{
+		...common,
+		label: 'plot-lifecycle',
+		files: plotSuites.map(name => `out/test/suite/${name}.test.js`),
+		mocha: { ...common.mocha, require: './out/test/common/extensionSetup.js' },
+		launchArgs: testProfile('plots', false)
+	},
 	{
 		...common,
 		label: 'editor-command-tests',

R/tests/attach_sess.R

@@ -238,7 +238,7 @@ writeLines(c(
     "      sys.source(file.path(getwd(), 'sess', 'R', 'server.R'), scheduler)",
     "      scheduler$.read_discovery <- function(path) list(endpoint='endpoint-b')",
     "      scheduler$.configure_discovery_jgd <- function(discovery, enabled) NULL",
-    "      scheduler$runtime_stop <- function() invisible(NULL)",
+    "      scheduler$runtime_stop <- function(preserve_plots=FALSE) invisible(NULL)",
     "      scheduler$connect <- function(endpoint, ...) {",
     "        connect_count <<- connect_count + 1L",
     "        observed[[connect_count]] <<- readLines(reconnect_file, warn=FALSE)",
@@ -410,14 +410,16 @@ writeLines(c(
     "  inherited <- vscode_r_startup_existing('endpoint')",
     "  if (!is.null(inherited)) stop('child reused the parent startup context')",
     "}",
-    "ids <- character(); identities <- character(); deadline <- Sys.time() + 30",
+    "ids <- character(); identities <- character(); deadline <- Sys.time() + 30; read_error <- NULL",
     "while (length(ids) < count && Sys.time() < deadline) {",
     "  requests <- list.files(directory, pattern='\\\\.request$', full.names=TRUE)",
     "  for (request in requests) {",
     "    id <- sub('\\\\.request$', '', basename(request))",
     "    if (id %in% ids) next",
+    # Requests can disappear or be briefly locked during cancellation on Windows.
+    # Retry on the next scan; the existing deadline still bounds persistent errors.
     "    lines <- suppressWarnings(tryCatch(readLines(request, warn=FALSE),",
-    "      error=function(e) { if (!file.exists(request)) NULL else stop(e) }))",
+    "      error=function(e) { read_error <<- conditionMessage(e); NULL }))",
     "    if (is.null(lines)) next",
     "    if (length(lines) != 5L || lines[[1L]] != 'vscode-r-sess-consent-v1' ||",
     "        lines[[2L]] != id) stop('bad request')",
@@ -431,7 +433,7 @@ writeLines(c(
     "  }",
     "  Sys.sleep(0.025)",
     "}",
-    "if (length(ids) != count) stop('timed out waiting for consent requests')",
+    "if (length(ids) != count) stop('timed out waiting for consent requests: ', read_error)",
     "writeLines(ids, log)",
     "writeLines(identities, identity_log)",
     "writeLines('ok', status_log)",

R/tests/prepare-jgd.R

@@ -46,10 +46,20 @@ local({
             "jgd <- function() {",
             "  path <- Sys.getenv('JGD_TEST_DEVICE_LOG', '')",
             "  if (nzchar(path)) cat('jgd\\n', file=path, append=TRUE)",
+            # sess now tracks the opened device and attaches its session identity.
+            # A null PDF supplies a real device without requiring a JGD renderer.
+            "  grDevices::pdf(NULL)",
+            "  invisible(NULL)",
+            "}",
+            "jgd_server_info <- function() list(server_info=c(deviceId=as.character(grDevices::dev.cur())))",
+            "jgd_frame_ext <- function(value) {",
+            "  path <- Sys.getenv('JGD_TEST_DEVICE_LOG', '')",
+            "  if (nzchar(path)) cat(value, '\\n', file=paste0(path, '-frames'), append=TRUE)",
             "  invisible(NULL)",
             "}"
         ), file.path(package, "R", "api.R"))
-        writeLines(c("export(fixture_device)", "export(jgd)"), file.path(package, "NAMESPACE"))
+        writeLines(c("export(fixture_device)", "export(jgd)",
+                     "export(jgd_server_info)", "export(jgd_frame_ext)"), file.path(package, "NAMESPACE"))
         previous <- setwd(root)
         on.exit(setwd(previous), add = TRUE)
         output <- system2_with_child_environment(
@@ -336,6 +346,16 @@ local({
                           "fixture-jgd-socket-next", "TRUE")))
     stopifnot(identical(readLines(file.path(root, "real-approved-real-device"), warn = FALSE),
                         c("jgd", "jgd")))
+    frames <- lapply(readLines(file.path(root, "real-approved-real-device-frames"), warn = FALSE),
+                     jsonlite::fromJSON)
+    stopifnot(length(frames) == 2L)
+    stopifnot(all(vapply(frames, function(frame) {
+        identity <- frame$vscodeR
+        nzchar(identity$sessionId) && nzchar(identity$pid) &&
+            nzchar(identity$deviceId) && identical(identity$restoring, FALSE)
+    }, logical(1))))
+    stopifnot(identical(frames[[1L]]$vscodeR$sessionId, frames[[2L]]$vscodeR$sessionId))
+    stopifnot(!identical(frames[[1L]]$vscodeR$deviceId, frames[[2L]]$vscodeR$deviceId))
 
     approved_root <- file.path(root, "approved")
     dir.create(approved_root)