Merge branch 'main' into fix/issue13712

Author: mcanouil

.github/workflows/test-smokes.yml

@@ -126,9 +126,9 @@ jobs:
           path: |
             ${{ env.RENV_PATHS_ROOT }}
             renv/library
-          key: ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-1-${{ hashFiles('tests/renv.lock') }}
+          key: ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-2-${{ hashFiles('tests/renv.lock') }}
           restore-keys: |
-            ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-1-
+            ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-2-
 
       - name: Install missing system deps
         if: runner.os == 'Linux'
@@ -149,15 +149,23 @@ jobs:
       - name: Restore R packages
         working-directory: tests
         run: |
+          cat("::group::Installing renv if needed\n")
           if (!requireNamespace('renv', quietly = TRUE)) install.packages('renv')
+          cat("::endgroup::\n")
+          cat("::group::Restoring R packages from renv.lock\n")
           renv::restore()
+          cat("::endgroup::\n")
+          cat("::group::Installing dev versions of knitr and rmarkdown\n")
           # Install dev versions for our testing
           # Use r-universe to avoid github api calls
           try(install.packages('rmarkdown', repos = c('https://rstudio.r-universe.dev', getOption('repos'))))
           try(install.packages('knitr', repos = c('https://yihui.r-universe.dev', getOption('repos'))))
+          cat("::endgroup::\n")
           if ('${{ inputs.extra-r-packages }}' != '') {
             cat(sprintf("::notice::Running with the following extra R packages for renv: %s\n", "${{ inputs.extra-r-packages }}"))
+            cat("::group::Installing extra R packages\n")
             renv::install(strsplit("${{ inputs.extra-r-packages }}", split = ",")[[1]])
+            cat("::endgroup::\n")
           }
         shell: Rscript {0}
         env:
@@ -256,17 +264,36 @@ jobs:
         env:
           # Useful as TinyTeX latest release is checked in run-test.sh
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          QUARTO_LOG_LEVEL: DEBUG
         run: |
           haserror=0
+          failed_tests=()
           readarray -t my_array < <(echo '${{ inputs.buckets }}' | jq -rc '.[]')
-          for file in "${my_array[@]}"; do 
+          for file in "${my_array[@]}"; do
+            echo "::group::Testing ${file}"
             echo ">>> ./run-tests.sh ${file}"
-            shopt -s globstar && ./run-tests.sh $file
+            # Run tests without -e so we don't exit on first failure
+            set +e
+            shopt -s globstar && ./run-tests.sh "$file"
             status=$?
-            [ $status -eq 0 ] && echo ">>> No error in this test file" || haserror=1
+            set -e
+            echo "::endgroup::"
+            if [ $status -ne 0 ]; then
+              echo "::error title=Test Bucket Failed::Test bucket ${file} failed with exit code ${status}"
+              echo ">>> Error found in test file: ${file}"
+              haserror=1
+              failed_tests+=("$file")
+            fi
           done
-          [ $haserror -eq 0 ] && echo ">>> All tests passed" || exit 1
+          if [ $haserror -eq 1 ]; then
+            echo "---- FAILING TESTS SUMMARY ----"
+            echo "    The following test buckets failed:"
+            for failed in "${failed_tests[@]}"; do
+              echo "    - $failed"
+            done
+            exit 1
+          else
+            echo ">>> All tests passed"
+          fi
         working-directory: tests
         shell: bash
 
@@ -277,18 +304,26 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           $haserror=$false
+          $failed_tests=@()
           foreach ($file in ('${{ inputs.buckets }}' | ConvertFrom-Json)) {
+            Write-Host "::group::Testing ${file}"
             Write-Host ">>> ./run-tests.ps1 ${file}"
             ./run-tests.ps1 $file
             $status=$LASTEXITCODE
-            if ($status -eq 1) {
-              Write-Host ">>> Error found in test file"
+            Write-Host "::endgroup::"
+            if ($status -ne 0) {
+              Write-Host "::error title=Test Bucket Failed::Test bucket ${file} failed with exit code ${status}"
+              Write-Host ">>> Error found in test file: ${file}"
               $haserror=$true
-            } else {
-              Write-Host ">>> No error in this test file"
+              $failed_tests+=$file
             }
           }
           if ($haserror) {
+            Write-Host "---- FAILING TESTS SUMMARY ----"
+            Write-Host "    The following test buckets failed:"
+            foreach ($failed in $failed_tests) {
+              Write-Host "    - $failed"
+            }
             Exit 1
           } else {
             Write-Host ">>> All tests have passed"

configuration

@@ -7,17 +7,16 @@
 # but it also used when packaging (e.g. run configure.sh, then prepare-dist.sh, then package.sh)
 # deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
 
-# NB: When these are updated, you must also update the versions
+# IMPORTANT: When these are updated, you must also update the versions
 # in src/command/check/check.ts
-
 # Binary dependencies
 export DENO=v2.4.5
 # TODO figure out where 0.1.41 apple silicon libs are available
 export DENO_DOM=v0.1.41-alpha-artifacts
-export PANDOC=3.6.3
+export PANDOC=3.8.3
 export DARTSASS=1.87.0
 export ESBUILD=0.25.10
-export TYPST=0.13.0
+export TYPST=0.14.2
 
 
 # NB: we can't put comments in the same line as export statements because it

configure.cmd

@@ -62,6 +62,12 @@ if "%QUARTO_VENDOR_BINARIES%" == "true" (
   POPD
 )
 
+IF NOT DEFINED QUARTO_DENO_DIR (
+  SET "DENO_DIR=!QUARTO_BIN_PATH!\deno_cache"
+) ELSE (
+  SET "DENO_DIR=!QUARTO_DENO_DIR!"
+)
+
 PUSHD !QUARTO_PACKAGE_PATH!\src
 ECHO Configuring Quarto from !cd!
 CALL quarto-bld.cmd configure --log-level info

dev-docs/feature-format-matrix/qmd-files/math/document.qmd

@@ -5,6 +5,8 @@ format:
   html: default
 _quarto:
   tests:
+    run:
+      skip: "Pandoc 3.7+ removes newlines in display math blocks (fixed in pandoc@8123be6, awaiting release)"
     html:
       ensureHtmlElements:
         - []

dev-docs/subtree-extensions.md

@@ -0,0 +1,41 @@
+# Subtree extensions
+
+Subtree extensions live in `src/resources/subtree-extensions`.
+
+Each is the complete git repository of a Quarto extension, e.g. the directory tree for the Julia engine looks like
+
+```
+src/resources/extension-subtrees/
+  julia-engine/
+    _extensions/
+      julia-engine/
+        _extension.yml
+        julia-engine.ts
+        ...
+```
+
+The command to add or update a subtree is
+
+```
+quarto dev-call pull-git-subtree subtree-name
+```
+
+Omit _subtree-name_ to add/update all.
+
+The code in `src/command/dev-call/pull-git-subtree/cmd.ts` contains a table of subtree
+
+- `name`
+- `prefix` (subdirectory)
+- `remoteUrl`
+- `remoteBranch`
+
+If the command is successful, it will add two commits, one the squashed changes from the remote repo and one a merge commit.
+
+The commits have subtree status information in the message and metadata, so don't change them.
+
+The commits can't be rebased -- you'll get weird errors indicating it tried to merge changes at the root of the repo.
+
+So you must either
+
+- run the command when ready to merge to main, or
+- remove the commits when rebasing, and run the `dev-call` command again

dev-docs/update-pandoc-checklist.md

@@ -6,6 +6,25 @@ Carlos needs to run this:
 - [ ] Run `AWS_PROFILE=... ./package/src/quarto-bld update-pandoc PANDOC_VERSION`
 - [ ] look at `git diff`, specifically for changes in Pandoc templates, and adjust as needed.
 
+As a reminder, our templates are kept in the same directories as Pandoc's templates, but with different names. `git diff` will show the diff in Pandoc's template; we have to manually patch
+ours. (We can't just use `patch` because the templates have diverged too much)
+
+### Pandoc templates
+
+The general rule for the naming is that "format.template" indicates Pandoc naming, and "template.format" indicates ours. Examples below:
+
+#### beamer
+
+- Pandoc's: src/resources/formats/beamer/pandoc/beamer.template
+- Ours: src/resources/formats/beamer/pandoc/template.tex
+
+Partials:
+
+- Pandoc's:
+  - src/resources/formats/beamer/pandoc/latex.common
+- Ours:
+  - src/resources/formats/beamer/pandoc/common.latex
+
 ## Manual steps
 
 - [ ] Update schemas by inspecting [their changelog](https://github.com/jgm/pandoc/blob/main/changelog.md) for new commands, deprecation removals, etc

llm-docs/README.md

@@ -0,0 +1,4 @@
+# LLM documentation for Quarto
+
+This directory contains documents providing context and instructions for LLMs
+to execute tasks in the `quarto-cli` codebase.

llm-docs/error-messages.md

@@ -0,0 +1,103 @@
+# Writing Error Messages in Quarto
+
+## The Rule
+
+Each `error()`, `warning()`, or `info()` call should be **exactly one line**.
+
+- ✅ End messages with `\n` to add blank lines after
+- ❌ Never start messages with `\n`
+- ❌ Never use empty `error("")` calls
+
+## Why This Matters
+
+Quarto's logging prefixes each call with `ERROR:` / `WARNING:` / `INFO:`. Starting a message with `\n` or using empty calls creates confusing output:
+
+```
+ERROR: Multiple files found
+ERROR:
+Or specify entry point:    ← Empty "ERROR:" line from \n at start
+```
+
+## Adding Blank Lines
+
+To add a blank line between sections, end the **previous** message with `\n`:
+
+### ✅ Good
+
+```typescript
+error("Multiple .ts files found in src/\n");  // \n at END
+error("Specify entry point as argument:");
+error("  quarto call build-ts-extension src/my-engine.ts");
+```
+
+Output:
+```
+ERROR: Multiple .ts files found in src/
+ERROR:
+ERROR: Specify entry point as argument:
+ERROR:   quarto call build-ts-extension src/my-engine.ts
+```
+
+### ❌ Bad
+
+```typescript
+error("Multiple .ts files found in src/");
+error("\nSpecify entry point as argument:");  // \n at START
+error("  quarto call build-ts-extension src/my-engine.ts");
+```
+
+Output:
+```
+ERROR: Multiple .ts files found in src/
+ERROR:
+ERROR: Specify entry point as argument:     ← Blank "ERROR:" line before
+ERROR:   quarto call build-ts-extension src/my-engine.ts
+```
+
+### ❌ Also Bad
+
+```typescript
+error("Multiple .ts files found in src/");
+error("");  // Empty call to add spacing
+error("Specify entry point as argument:");
+```
+
+Output:
+```
+ERROR: Multiple .ts files found in src/
+ERROR:                                      ← Empty "ERROR:" line
+ERROR: Specify entry point as argument:
+```
+
+## Complete Example
+
+Here's a real example from `build-ts-extension` showing proper formatting:
+
+### ✅ Good
+
+```typescript
+error("No src/ directory found.\n");
+error("Create a TypeScript file in src/:");
+error("  mkdir -p src");
+error("  touch src/my-engine.ts\n");
+error("Or specify entry point as argument:");
+error("  quarto call build-ts-extension src/my-engine.ts");
+```
+
+Output:
+```
+ERROR: No src/ directory found.
+ERROR:
+ERROR: Create a TypeScript file in src/:
+ERROR:   mkdir -p src
+ERROR:   touch src/my-engine.ts
+ERROR:
+ERROR: Or specify entry point as argument:
+ERROR:   quarto call build-ts-extension src/my-engine.ts
+```
+
+Notice:
+- Each `error()` call is one complete line
+- Blank lines are created by ending the previous message with `\n`
+- Indentation (with spaces) is preserved within each message
+- Message flow is clear and readable