Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Migrate docs syntax highlighting to giallo with warm theme (#1080)

Maximilian Roos1d85de945f11
diff --git a/docs/.gitignore b/docs/.gitignore
index de73cb36a..96fee8079 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1,3 @@
public/
static/assets/
+static/giallo*.css
diff --git a/docs/config.toml b/docs/config.toml
index e59130e18..be0b90e24 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -7,15 +7,15 @@ build_search_index = true
title = "Worktrunk"
[markdown]
-highlight_code = true
-highlight_theme = "css"
-highlight_themes_css = [
- { theme = "inspired-github", filename = "syntax-light.css" },
- { theme = "base16-ocean-dark", filename = "syntax-dark.css" },
-]
-error_on_missing_highlight = true
insert_anchor_links = "heading"
+[markdown.highlighting]
+style = "class"
+light_theme = "worktrunk-light"
+dark_theme = "base16-ocean-dark"
+extra_themes = ["themes/worktrunk-light.json", "themes/base16-ocean-dark.json"]
+error_on_missing_language = true
+
[extra]
logo_name = "Worktrunk"
logo_path = "logo.png"
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index 4bd003b9f..0f5bfb5dc 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -35,7 +35,7 @@ The plugin tracks Claude sessions with status markers in `wt list`:
<!-- ⚠️ AUTO-GENERATED-HTML from tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap — edit source to update -->
-{% terminal() %}
+{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ main <span class=d>^</span><span class=d>⇡</span> . <span class=g>⇡1</span> <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
diff --git a/docs/content/list.md b/docs/content/list.md
index c4d139b9f..edae48a5f 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -27,8 +27,7 @@ List all worktrees:
<!-- ⚠️ AUTO-GENERATED from tests/snapshots/integration__integration_tests__list__readme_example_list.snap — edit source to update -->
-{% terminal() %}
-<span class="cmd">wt list</span>
+{% terminal(cmd="wt list") %}
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-api <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</span>
@@ -43,8 +42,7 @@ Include CI status and line diffs:
<!-- ⚠️ AUTO-GENERATED from tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap — edit source to update -->
-{% terminal() %}
-<span class="cmd">wt list --full</span>
+{% terminal(cmd="wt list --full") %}
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-api <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</span>
@@ -59,8 +57,7 @@ Include branches that don't have worktrees:
<!-- ⚠️ AUTO-GENERATED from tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap — edit source to update -->
-{% terminal() %}
-<span class="cmd">wt list --branches --full</span>
+{% terminal(cmd="wt list --branches --full") %}
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-api <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</span>
diff --git a/docs/content/step.md b/docs/content/step.md
index eb8c5ac48..5f1ed28eb 100644
--- a/docs/content/step.md
+++ b/docs/content/step.md
@@ -269,7 +269,7 @@ All gitignored files are copied by default. Tracked files are never touched.
To limit what gets copied, create `.worktreeinclude` with gitignore-style patterns. Files must be **both** gitignored **and** in `.worktreeinclude`:
-```gitignore
+```text
# .worktreeinclude
.env
node_modules/
diff --git a/docs/content/tips-patterns.md b/docs/content/tips-patterns.md
index 871fce795..b2b3cc31b 100644
--- a/docs/content/tips-patterns.md
+++ b/docs/content/tips-patterns.md
@@ -51,7 +51,7 @@ The URL column in `wt list` shows each worktree's dev server:
<!-- ⚠️ AUTO-GENERATED-HTML from tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap — edit source to update -->
-{% terminal() %}
+{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b> <b>Age</b>
@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.md
index 47f410f4c..525470e6e 100644
--- a/docs/content/worktrunk.md
+++ b/docs/content/worktrunk.md
@@ -136,7 +136,7 @@ Create a worktree for a new feature:
<!-- ⚠️ AUTO-GENERATED-HTML from tests/snapshots/integration__integration_tests__list__quickstart_switch.snap — edit source to update -->
-{% terminal() %}
+{% terminal(cmd="wt switch --create feature-auth") %}
<span class="cmd">wt switch --create feature-auth</span>
<span class=g>✓</span> <span class=g>Created branch <b>feature-auth</b> from <b>main</b> and worktree @ <b>repo.feature-auth</b></span>
{% end %}
@@ -147,7 +147,7 @@ This creates a new branch and worktree, then switches to it. Do your work, then
<!-- ⚠️ AUTO-GENERATED-HTML from tests/snapshots/integration__integration_tests__list__quickstart_list.snap — edit source to update -->
-{% terminal() %}
+{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-auth <span class=c>+</span> <span class=d>–</span> <span class=g>+53</span> <span class=d>0e631add</span> <span class=d>1d</span> <span class=d>Initial commit</span>
@@ -174,7 +174,7 @@ wt remove # after PR is merged
<!-- ⚠️ AUTO-GENERATED-HTML from tests/snapshots/integration__integration_tests__list__quickstart_merge.snap — edit source to update -->
-{% terminal() %}
+{% terminal(cmd="wt merge main") %}
<span class="cmd">wt merge main</span>
<span class=c>◎</span> <span class=c>Generating commit message and committing changes... <span style='color:var(--bright-black,#555)'>(2 files, <span class=g>+53</span></span></span>, no squashing needed<span style='color:var(--bright-black,#555)'>)</span>
<span style='background:var(--bright-white,#fff)'> </span> <b>Add authentication module</b>
diff --git a/docs/sass/custom.scss b/docs/sass/custom.scss
index 729436d58..8998536a2 100644
--- a/docs/sass/custom.scss
+++ b/docs/sass/custom.scss
@@ -450,6 +450,16 @@ main {
background-color: transparent;
}
+// Quoted strings get olive color via CSS sibling selector (light mode only).
+// Giallo emits: <span class="z-punctuation z-definition z-string">'</span><span class="z-string">content</span>
+// Bare strings (subcommands like `switch`) are just <span class="z-string"> without a preceding quote span.
+// Must match punctuation.definition.string in worktrunk-light.json (#588a10).
+@media (prefers-color-scheme: light) {
+ .z-punctuation.z-definition.z-string + .z-string {
+ color: #588a10;
+ }
+}
+
// Shared styles for code blocks and terminal output
%code-block-base {
position: relative;
@@ -532,16 +542,14 @@ main {
line-height: 1.5;
color: var(--wt-color-text); // Default text color for terminal (not syntax-highlighted)
- // Command text - bold amber for visibility
- // Prompt ($) is generated via ::before, making it non-copyable
+ // Command text with $ prompt (generated via ::before, making it non-copyable)
+ // When giallo spans are present, their colors take precedence over the base color
.cmd {
color: var(--wt-color-accent);
- font-weight: 600;
&::before {
content: "$ ";
color: var(--wt-color-text-soft);
- font-weight: 400;
}
}
diff --git a/docs/static/syntax-dark.css b/docs/static/syntax-dark.css
deleted file mode 100644
index b55346721..000000000
--- a/docs/static/syntax-dark.css
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * theme "Base16 Ocean Dark" generated by syntect
- */
-
-.z-code {
- color: #c0c5ce;
- background-color: #2b303b;
-}
-
-.z-variable.z-parameter.z-function {
- color: #c0c5ce;
-}
-.z-comment, .z-punctuation.z-definition.z-comment {
- color: #65737e;
-}
-.z-punctuation.z-definition.z-string, .z-punctuation.z-definition.z-variable, .z-punctuation.z-definition.z-string, .z-punctuation.z-definition.z-parameters, .z-punctuation.z-definition.z-string, .z-punctuation.z-definition.z-array {
- color: #c0c5ce;
-}
-.z-none {
- color: #c0c5ce;
-}
-.z-keyword.z-operator {
- color: #c0c5ce;
-}
-.z-keyword {
- color: #b48ead;
-}
-.z-variable {
- color: #bf616a;
-}
-.z-entity.z-name.z-function, .z-meta.z-require, .z-support.z-function.z-any-method {
- color: #8fa1b3;
-}
-.z-support.z-class, .z-entity.z-name.z-class, .z-entity.z-name.z-type.z-class {
- color: #ebcb8b;
-}
-.z-meta.z-class {
- color: #eff1f5;
-}
-.z-keyword.z-other.z-special-method {
- color: #8fa1b3;
-}
-.z-storage {
- color: #b48ead;
-}
-.z-support.z-function {
- color: #96b5b4;
-}
-.z-string, .z-constant.z-other.z-symbol, .z-entity.z-other.z-inherited-class {
- color: #a3be8c;
-}
-.z-constant.z-numeric {
- color: #d08770;
-}
-.z-none {
- color: #d08770;
-}
-.z-none {
- color: #d08770;
-}
-.z-constant {
- color: #d08770;
-}
-.z-entity.z-name.z-tag {
- color: #bf616a;
-}
-.z-entity.z-other.z-attribute-name {
- color: #d08770;
-}
-.z-entity.z-other.z-attribute-name.z-id, .z-punctuation.z-definition.z-entity {
- color: #8fa1b3;
-}
-.z-meta.z-selector {
- color: #b48ead;
-}
-.z-none {
- color: #d08770;
-}
-.z-markup.z-heading .z-punctuation.z-definition.z-heading, .z-entity.z-name.z-section {
- color: #8fa1b3;
-}
-.z-keyword.z-other.z-unit {
- color: #d08770;
-}
-.z-markup.z-bold, .z-punctuation.z-definition.z-bold {
- color: #ebcb8b;
-font-weight: bold;
-}
-.z-markup.z-italic, .z-punctuation.z-definition.z-italic {
- color: #b48ead;
-font-style: italic;
-}
-.z-markup.z-raw.z-inline {
- color: #a3be8c;
-}
-.z-string.z-other.z-link {
- color: #bf616a;
-}
-.z-meta.z-link {
- color: #d08770;
-}
-.z-markup.z-list {
- color: #bf616a;
-}
-.z-markup.z-quote {
- color: #d08770;
-}
-.z-meta.z-separator {
- color: #c0c5ce;
- background-color: #4f5b66;
-}
-.z-markup.z-inserted, .z-markup.z-inserted.z-git_gutter {
- color: #a3be8c;
-}
-.z-markup.z-deleted, .z-markup.z-deleted.z-git_gutter {
- color: #bf616a;
-}
-.z-markup.z-changed, .z-markup.z-changed.z-git_gutter {
- color: #b48ead;
-}
-.z-markup.z-ignored, .z-markup.z-ignored.z-git_gutter {
- color: #4f5b66;
-}
-.z-markup.z-untracked, .z-markup.z-untracked.z-git_gutter {
- color: #4f5b66;
-}
-.z-constant.z-other.z-color {
- color: #96b5b4;
-}
-.z-string.z-regexp {
- color: #96b5b4;
-}
-.z-constant.z-character.z-escape {
- color: #96b5b4;
-}
-.z-punctuation.z-section.z-embedded, .z-variable.z-interpolation {
- color: #ab7967;
-}
-.z-invalid.z-illegal {
- color: #2b303b;
- background-color: #bf616a;
-}
-.z-markup.z-deleted.z-git_gutter {
- color: #f92672;
-}
-.z-markup.z-inserted.z-git_gutter {
- color: #a6e22e;
-}
-.z-markup.z-changed.z-git_gutter {
- color: #967efb;
-}
-.z-markup.z-ignored.z-git_gutter {
- color: #565656;
-}
-.z-markup.z-untracked.z-git_gutter {
- color: #565656;
-}
diff --git a/docs/static/syntax-light.css b/docs/static/syntax-light.css
deleted file mode 100644
index f7dfcb332..000000000
--- a/docs/static/syntax-light.css
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * theme "GitHub" generated by syntect
- */
-
-.z-code {
- color: #323232;
- background-color: #ffffff;
-}
-
-.z-comment {
- color: #969896;
-font-style: italic;
-}
-.z-string {
- color: #183691;
-}
-.z-regexp-operator {
- color: #a71d5d;
-}
-.z-string.z-regexp.z-characterclass .z-punctuation.z-definition.z-string.z-begin, .z-string.z-regexp.z-characterclass .z-punctuation.z-definition.z-string.z-end {
- color: #a71d5d;
-}
-.z-constant.z-numeric {
- color: #0086b3;
-}
-.z-constant.z-language {
- color: #0086b3;
-}
-.z-constant.z-character, .z-constant.z-other, .z-variable.z-other.z-constant {
- color: #0086b3;
-}
-.z-variable {
- color: #323232;
-}
-.z-keyword {
- color: #a71d5d;
-font-weight: bold;
-}
-.z-bitwise-operator {
- color: #a71d5d;
-font-weight: bold;
-}
-.z-storage {
- color: #a71d5d;
-font-weight: bold;
-}
-.z-storage.z-type {
- color: #a71d5d;
-font-weight: bold;
-}
-.z-entity.z-name.z-class {
- color: #0086b3;
-}
-.z-entity.z-other.z-inherited-class {
- color: #0086b3;
-}
-.z-entity.z-name.z-function {
- color: #795da3;
-font-weight: bold;
-}
-.z-variable.z-parameter {
- color: #323232;
-}
-.z-entity.z-name.z-tag {
- color: #63a35c;
-}
-.z-entity.z-other.z-attribute-name {
- color: #795da3;
-}
-.z-support.z-function {
- color: #62a35c;
-}
-.z-support.z-constant {
- color: #0086b3;
-}
-.z-support.z-type, .z-support.z-class {
- color: #0086b3;
-}
-.z-support.z-other.z-variable {
- color: #323232;
-}
-.z-invalid, .z-invalid.z-illegal, .z-invalid.z-deprecated {
- color: #b52a1d;
- background-color: #f5f5f5;
-font-weight: bold;
-}
-.z-entity.z-name.z-filename.z-find-in-files {
- color: #323232;
-font-weight: bold;
-}
-.z-constant.z-numeric.z-line-number.z-find-in-files, .z-constant.z-numeric.z-line-number.z-match.z-find-in-files {
- color: #b3b3b3;
-}
-.z-meta.z-diff.z-header {
- color: #969896;
- background-color: #ffffff;
-font-style: italic;
-}
-.z-meta.z-diff.z-header .z-punctuation.z-definition.z-from-file.z-diff {
- color: #bd2c00;
- background-color: #ffecec;
-font-weight: bold;
-font-style: italic;
-}
-.z-meta.z-diff.z-header .z-punctuation.z-definition.z-to-file.z-diff {
- color: #55a532;
- background-color: #eaffea;
-font-weight: bold;
-font-style: italic;
-}
-.z-meta.z-diff.z-range {
- color: #969896;
-font-weight: bold;
-font-style: italic;
-}
-.z-markup.z-deleted {
- background-color: #ffecec;
-}
-.z-markup.z-deleted .z-punctuation.z-definition.z-inserted {
- color: #bd2c00;
-font-weight: bold;
-}
-.z-markup.z-inserted {
- background-color: #eaffea;
-}
-.z-markup.z-inserted .z-punctuation.z-definition.z-inserted {
- color: #55a532;
-font-weight: bold;
-}
-.z-markup.z-deleted.z-git_gutter {
- color: #bd2c00;
-}
-.z-markup.z-inserted.z-git_gutter {
- color: #55a532;
-}
-.z-markup.z-changed.z-git_gutter {
- color: #0086b3;
-}
-.z-markup.z-ignored.z-git_gutter {
- color: #b3b3b3;
-}
-.z-markup.z-untracked.z-git_gutter {
- color: #b3b3b3;
-}
-.z-source.z-css .z-punctuation.z-definition.z-entity {
- color: #323232;
-}
-.z-source.z-css .z-entity.z-other.z-attribute-name.z-pseudo-class, .z-source.z-css .z-entity.z-other.z-attribute-name.z-pseudo-element {
- color: #a71d5d;
-}
-.z-source.z-css .z-meta.z-value, .z-source.z-css .z-support.z-constant, .z-source.z-css .z-support.z-function {
- color: #323232;
-}
-.z-source.z-css .z-constant.z-other.z-color {
- color: #ed6a43;
-}
-.z-source.z-scss .z-punctuation.z-definition.z-entity {
- color: #323232;
-}
-.z-source.z-scss .z-entity.z-other.z-attribute-name.z-pseudo-class, .z-source.z-scss .z-entity.z-other.z-attribute-name.z-pseudo-element {
- color: #a71d5d;
-}
-.z-source.z-scss .z-support.z-constant.z-property-value, .z-source.z-scss .z-support.z-function {
- color: #323232;
-}
-.z-source.z-scss .z-variable {
- color: #a71d5d;
-}
-.z-variable.z-language.z-this.z-js {
- color: #ed6a43;
-}
-.z-source.z-js .z-entity.z-name.z-function {
- color: #323232;
-}
-.z-source.z-js .z-meta.z-function .z-entity.z-name.z-function, .z-source.z-js .z-entity.z-name.z-function .z-meta.z-function {
- color: #795da3;
-font-weight: bold;
-}
-.z-entity.z-name.z-type.z-new.z-js {
- color: #795da3;
-}
-.z-variable.z-language.z-prototype.z-js {
- color: #0086b3;
-}
-.z-source.z-js .z-support.z-function {
- color: #0086b3;
-}
-.z-support.z-type.z-object.z-console.z-js {
- color: #795da3;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta .z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta .z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-meta.z-structure.z-dictionary.z-json .z-string.z-quoted.z-double.z-json {
- color: #183691;
-font-weight: bold;
-}
-.z-meta.z-structure.z-dictionary.z-json .z-meta.z-structure.z-dictionary.z-value.z-json .z-string.z-quoted.z-double.z-json {
- color: #323232;
-}
-.z-source.z-python .z-keyword {
-font-weight: bold;
-}
-.z-source.z-python .z-storage {
-font-weight: bold;
-}
-.z-source.z-python .z-storage.z-type {
-font-weight: bold;
-}
-.z-source.z-python .z-entity.z-name.z-function {
- color: #323232;
-font-weight: bold;
-}
-.z-source.z-php .z-entity.z-name.z-type.z-class {
- color: #323232;
-font-weight: bold;
-}
-.z-variable.z-language.z-ruby {
- color: #ed6a43;
-}
-.z-entity.z-name.z-type.z-module.z-ruby {
- color: #795da3;
-font-weight: bold;
-}
-.z-entity.z-name.z-type.z-class.z-ruby {
- color: #795da3;
-font-weight: bold;
-}
-.z-entity.z-other.z-inherited-class.z-ruby {
- color: #795da3;
-font-weight: bold;
-}
-.z-punctuation.z-definition.z-heading.z-markdown, .z-punctuation.z-definition.z-italic.z-markdown, .z-punctuation.z-definition.z-bold.z-markdown, .z-punctuation.z-definition.z-string.z-begin.z-markdown, .z-punctuation.z-definition.z-string.z-end.z-markdown, .z-punctuation.z-definition.z-metadata.z-markdown, .z-punctuation.z-definition.z-link.z-markdown, .z-punctuation.z-definition.z-blockquote.z-markdown, .z-punctuation.z-definition.z-raw.z-markdown {
- color: #a71d5d;
-}
-.z-text.z-html.z-markdown .z-meta.z-separator {
- color: #b3b3b3;
-}
-.z-text.z-html.z-markdown .z-markup.z-heading {
-font-weight: bold;
-}
-.z-text.z-html.z-markdown .z-markup.z-raw.z-block {
- color: #323232;
-}
-.z-text.z-html.z-markdown .z-markup.z-raw.z-inline {
- color: #323232;
-}
-.z-text.z-html.z-markdown .z-meta.z-link, .z-text.z-html.z-markdown .z-meta.z-image {
- color: #4183c4;
-}
-.z-text.z-html.z-markdown .z-markup.z-underline.z-link, .z-text.z-html.z-markdown .z-constant.z-other.z-reference {
-font-style: italic;
-}
-.z-text.z-html.z-markdown .z-markup.z-list {
- color: #ed6a43;
-}
-.z-text.z-html.z-markdown .z-markup.z-bold {
-font-weight: bold;
-}
-.z-text.z-html.z-markdown .z-markup.z-italic {
-font-style: italic;
-}
-.z-text.z-html.z-markdown .z-markup.z-bold .z-markup.z-italic {
-font-weight: bold;
-font-style: italic;
-}
-.z-text.z-html.z-markdown .z-markup.z-italic .z-markup.z-bold {
-font-weight: bold;
-font-style: italic;
-}
diff --git a/docs/templates/base.html b/docs/templates/base.html
index cb6fe3cbb..eec53cd88 100644
--- a/docs/templates/base.html
+++ b/docs/templates/base.html
@@ -104,10 +104,10 @@
<link rel="preload" href="/custom.css" as="style">
<link rel="stylesheet" href="/custom.css">
<!-- Syntax highlighting themes - preload and load conditionally by color scheme -->
- <link rel="preload" href="/syntax-light.css" as="style" media="(prefers-color-scheme: light)">
- <link rel="preload" href="/syntax-dark.css" as="style" media="(prefers-color-scheme: dark)">
- <link rel="stylesheet" href="/syntax-light.css" media="(prefers-color-scheme: light)">
- <link rel="stylesheet" href="/syntax-dark.css" media="(prefers-color-scheme: dark)">
+ <link rel="preload" href="/giallo-light.css" as="style" media="(prefers-color-scheme: light)">
+ <link rel="preload" href="/giallo-dark.css" as="style" media="(prefers-color-scheme: dark)">
+ <link rel="stylesheet" href="/giallo-light.css" media="(prefers-color-scheme: light)">
+ <link rel="stylesheet" href="/giallo-dark.css" media="(prefers-color-scheme: dark)">
<script src="/elasticlunr.min.js" defer></script>
<script src="/search_index.en.js" defer></script>
<script src="/search.js" defer></script>
diff --git a/docs/templates/shortcodes/terminal.html b/docs/templates/shortcodes/terminal.html
index 467960ef1..340917dd5 100644
--- a/docs/templates/shortcodes/terminal.html
+++ b/docs/templates/shortcodes/terminal.html
@@ -1 +1,13 @@
+{% if cmd %}
+{% set fence = "```" %}
+{% set md = fence ~ "bash
+" ~ cmd ~ "
+" ~ fence %}
+{% set raw = md | markdown %}
+{% set hl = raw | regex_replace(pattern="(?s)<pre[^>]*><code[^>]*>(.*)</code>\s*</pre>", rep="$1") | trim %}
+{% set clean_body = body | regex_replace(pattern='<span class="cmd">[^<]*</span>\n?', rep="") %}
+<pre class="terminal"><code><span class="cmd">{{ hl | safe }}</span>
+{{ clean_body | safe }}</code></pre>
+{% else %}
<pre class="terminal"><code>{{ body | safe }}</code></pre>
+{% endif %}
diff --git a/docs/themes/base16-ocean-dark.json b/docs/themes/base16-ocean-dark.json
new file mode 100644
index 000000000..eb9e4465c
--- /dev/null
+++ b/docs/themes/base16-ocean-dark.json
@@ -0,0 +1,299 @@
+{
+ "name": "base16-ocean-dark",
+ "displayName": "Base16 Ocean Dark",
+ "type": "dark",
+ "colors": {
+ "foreground": "#c0c5ce",
+ "background": "#2b303b"
+ },
+ "tokenColors": [
+ {
+ "settings": {
+ "foreground": "#c0c5ce",
+ "background": "#2b303b"
+ }
+ },
+ {
+ "name": "Text",
+ "scope": "variable.parameter.function",
+ "settings": {
+ "foreground": "#c0c5ce"
+ }
+ },
+ {
+ "name": "Comments",
+ "scope": "comment, punctuation.definition.comment",
+ "settings": {
+ "foreground": "#65737e"
+ }
+ },
+ {
+ "name": "Punctuation",
+ "scope": "punctuation.definition.string, punctuation.definition.variable, punctuation.definition.parameters, punctuation.definition.array",
+ "settings": {
+ "foreground": "#c0c5ce"
+ }
+ },
+ {
+ "name": "Operators",
+ "scope": "keyword.operator",
+ "settings": {
+ "foreground": "#c0c5ce"
+ }
+ },
+ {
+ "name": "Keywords",
+ "scope": "keyword",
+ "settings": {
+ "foreground": "#b48ead"
+ }
+ },
+ {
+ "name": "Variables",
+ "scope": "variable",
+ "settings": {
+ "foreground": "#bf616a"
+ }
+ },
+ {
+ "name": "Functions",
+ "scope": "entity.name.function, meta.require, support.function.any-method",
+ "settings": {
+ "foreground": "#8fa1b3"
+ }
+ },
+ {
+ "name": "Classes",
+ "scope": "support.class, entity.name.class, entity.name.type.class",
+ "settings": {
+ "foreground": "#ebcb8b"
+ }
+ },
+ {
+ "name": "Classes",
+ "scope": "meta.class",
+ "settings": {
+ "foreground": "#eff1f5"
+ }
+ },
+ {
+ "name": "Methods",
+ "scope": "keyword.other.special-method",
+ "settings": {
+ "foreground": "#8fa1b3"
+ }
+ },
+ {
+ "name": "Storage",
+ "scope": "storage",
+ "settings": {
+ "foreground": "#b48ead"
+ }
+ },
+ {
+ "name": "Support",
+ "scope": "support.function",
+ "settings": {
+ "foreground": "#96b5b4"
+ }
+ },
+ {
+ "name": "Strings, Inherited Class",
+ "scope": "string, constant.other.symbol, entity.other.inherited-class",
+ "settings": {
+ "foreground": "#a3be8c"
+ }
+ },
+ {
+ "name": "Integers",
+ "scope": "constant.numeric",
+ "settings": {
+ "foreground": "#d08770"
+ }
+ },
+ {
+ "name": "Constants",
+ "scope": "constant",
+ "settings": {
+ "foreground": "#d08770"
+ }
+ },
+ {
+ "name": "Tags",
+ "scope": "entity.name.tag",
+ "settings": {
+ "foreground": "#bf616a"
+ }
+ },
+ {
+ "name": "Attributes",
+ "scope": "entity.other.attribute-name",
+ "settings": {
+ "foreground": "#d08770"
+ }
+ },
+ {
+ "name": "Attribute IDs",
+ "scope": "entity.other.attribute-name.id, punctuation.definition.entity",
+ "settings": {
+ "foreground": "#8fa1b3"
+ }
+ },
+ {
+ "name": "Selector",
+ "scope": "meta.selector",
+ "settings": {
+ "foreground": "#b48ead"
+ }
+ },
+ {
+ "name": "Headings",
+ "scope": "markup.heading punctuation.definition.heading, entity.name.section",
+ "settings": {
+ "foreground": "#8fa1b3"
+ }
+ },
+ {
+ "name": "Units",
+ "scope": "keyword.other.unit",
+ "settings": {
+ "foreground": "#d08770"
+ }
+ },
+ {
+ "name": "Bold",
+ "scope": "markup.bold, punctuation.definition.bold",
+ "settings": {
+ "fontStyle": "bold",
+ "foreground": "#ebcb8b"
+ }
+ },
+ {
+ "name": "Italic",
+ "scope": "markup.italic, punctuation.definition.italic",
+ "settings": {
+ "fontStyle": "italic",
+ "foreground": "#b48ead"
+ }
+ },
+ {
+ "name": "Code",
+ "scope": "markup.raw.inline",
+ "settings": {
+ "foreground": "#a3be8c"
+ }
+ },
+ {
+ "name": "Link Text",
+ "scope": "string.other.link, punctuation.definition.string.end.markdown",
+ "settings": {
+ "foreground": "#bf616a"
+ }
+ },
+ {
+ "name": "Link Url",
+ "scope": "meta.link",
+ "settings": {
+ "foreground": "#d08770"
+ }
+ },
+ {
+ "name": "Lists",
+ "scope": "markup.list",
+ "settings": {
+ "foreground": "#bf616a"
+ }
+ },
+ {
+ "name": "Quotes",
+ "scope": "markup.quote",
+ "settings": {
+ "foreground": "#d08770"
+ }
+ },
+ {
+ "name": "Separator",
+ "scope": "meta.separator",
+ "settings": {
+ "foreground": "#c0c5ce"
+ }
+ },
+ {
+ "name": "Inserted",
+ "scope": "markup.inserted",
+ "settings": {
+ "foreground": "#a3be8c"
+ }
+ },
+ {
+ "name": "Deleted",
+ "scope": "markup.deleted",
+ "settings": {
+ "foreground": "#bf616a"
+ }
+ },
+ {
+ "name": "Changed",
+ "scope": "markup.changed",
+ "settings": {
+ "foreground": "#b48ead"
+ }
+ },
+ {
+ "name": "Colors",
+ "scope": "constant.other.color",
+ "settings": {
+ "foreground": "#96b5b4"
+ }
+ },
+ {
+ "name": "Regular Expressions",
+ "scope": "string.regexp",
+ "settings": {
+ "foreground": "#96b5b4"
+ }
+ },
+ {
+ "name": "Escape Characters",
+ "scope": "constant.character.escape",
+ "settings": {
+ "foreground": "#96b5b4"
+ }
+ },
+ {
+ "name": "Embedded",
+ "scope": "punctuation.section.embedded, variable.interpolation",
+ "settings": {
+ "foreground": "#ab7967"
+ }
+ },
+ {
+ "name": "Illegal",
+ "scope": "invalid.illegal",
+ "settings": {
+ "foreground": "#eff1f5"
+ }
+ },
+ {
+ "name": "Broken",
+ "scope": "invalid.broken",
+ "settings": {
+ "foreground": "#2b303b"
+ }
+ },
+ {
+ "name": "Deprecated",
+ "scope": "invalid.deprecated",
+ "settings": {
+ "foreground": "#eff1f5"
+ }
+ },
+ {
+ "name": "Unimplemented",
+ "scope": "invalid.unimplemented",
+ "settings": {
+ "foreground": "#eff1f5"
+ }
+ }
+ ]
+}
diff --git a/docs/themes/worktrunk-light.json b/docs/themes/worktrunk-light.json
new file mode 100644
index 000000000..765103527
--- /dev/null
+++ b/docs/themes/worktrunk-light.json
@@ -0,0 +1,274 @@
+{
+ "name": "worktrunk-light",
+ "displayName": "Worktrunk Light",
+ "type": "light",
+ "colors": {
+ "foreground": "#3d3632",
+ "background": "#ffffff"
+ },
+ "tokenColors": [
+ {
+ "settings": {
+ "foreground": "#3d3632",
+ "background": "#ffffff"
+ }
+ },
+ {
+ "name": "Text",
+ "scope": "variable.parameter.function",
+ "settings": {
+ "foreground": "#3d3632"
+ }
+ },
+ {
+ "name": "Comments",
+ "scope": "comment, punctuation.definition.comment",
+ "settings": {
+ "foreground": "#7a756e",
+ "fontStyle": "italic"
+ }
+ },
+ {
+ "name": "String Punctuation",
+ "scope": "punctuation.definition.string",
+ "settings": {
+ "foreground": "#588a10"
+ }
+ },
+ {
+ "name": "Other Punctuation",
+ "scope": "punctuation.definition.variable, punctuation.definition.parameters, punctuation.definition.array",
+ "settings": {
+ "foreground": "#3d3632"
+ }
+ },
+ {
+ "name": "Operators",
+ "scope": "keyword.operator",
+ "settings": {
+ "foreground": "#3d3632"
+ }
+ },
+ {
+ "name": "Keywords",
+ "scope": "keyword",
+ "settings": {
+ "foreground": "#a03c15"
+ }
+ },
+ {
+ "name": "Variables",
+ "scope": "variable",
+ "settings": {
+ "foreground": "#7a5230"
+ }
+ },
+ {
+ "name": "Functions",
+ "scope": "entity.name.function, meta.require, support.function.any-method",
+ "settings": {
+ "foreground": "#b07800",
+ "fontStyle": "bold"
+ }
+ },
+ {
+ "name": "Classes",
+ "scope": "support.class, entity.name.class, entity.name.type.class",
+ "settings": {
+ "foreground": "#7a5230"
+ }
+ },
+ {
+ "name": "Methods",
+ "scope": "keyword.other.special-method",
+ "settings": {
+ "foreground": "#b07800"
+ }
+ },
+ {
+ "name": "Storage",
+ "scope": "storage",
+ "settings": {
+ "foreground": "#a03c15",
+ "fontStyle": "bold"
+ }
+ },
+ {
+ "name": "Support",
+ "scope": "support.function",
+ "settings": {
+ "foreground": "#b05a20"
+ }
+ },
+ {
+ "name": "Strings, Inherited Class",
+ "scope": "string, constant.other.symbol, entity.other.inherited-class",
+ "settings": {
+ "foreground": "#947a00"
+ }
+ },
+ {
+ "name": "Integers",
+ "scope": "constant.numeric",
+ "settings": {
+ "foreground": "#b05a20"
+ }
+ },
+ {
+ "name": "Constants",
+ "scope": "constant",
+ "settings": {
+ "foreground": "#b05a20"
+ }
+ },
+ {
+ "name": "Tags",
+ "scope": "entity.name.tag",
+ "settings": {
+ "foreground": "#b07800"
+ }
+ },
+ {
+ "name": "Attributes",
+ "scope": "entity.other.attribute-name",
+ "settings": {
+ "foreground": "#7a5230"
+ }
+ },
+ {
+ "name": "Attribute IDs",
+ "scope": "entity.other.attribute-name.id, punctuation.definition.entity",
+ "settings": {
+ "foreground": "#b07800"
+ }
+ },
+ {
+ "name": "Selector",
+ "scope": "meta.selector",
+ "settings": {
+ "foreground": "#a03c15"
+ }
+ },
+ {
+ "name": "Headings",
+ "scope": "markup.heading punctuation.definition.heading, entity.name.section",
+ "settings": {
+ "foreground": "#b07800"
+ }
+ },
+ {
+ "name": "Units",
+ "scope": "keyword.other.unit",
+ "settings": {
+ "foreground": "#b05a20"
+ }
+ },
+ {
+ "name": "Bold",
+ "scope": "markup.bold, punctuation.definition.bold",
+ "settings": {
+ "fontStyle": "bold",
+ "foreground": "#3d3632"
+ }
+ },
+ {
+ "name": "Italic",
+ "scope": "markup.italic, punctuation.definition.italic",
+ "settings": {
+ "fontStyle": "italic",
+ "foreground": "#3d3632"
+ }
+ },
+ {
+ "name": "Code",
+ "scope": "markup.raw.inline",
+ "settings": {
+ "foreground": "#b07800"
+ }
+ },
+ {
+ "name": "Link Text",
+ "scope": "string.other.link, punctuation.definition.string.end.markdown",
+ "settings": {
+ "foreground": "#a03c15"
+ }
+ },
+ {
+ "name": "Link Url",
+ "scope": "meta.link",
+ "settings": {
+ "foreground": "#b07800"
+ }
+ },
+ {
+ "name": "Lists",
+ "scope": "markup.list",
+ "settings": {
+ "foreground": "#7a5230"
+ }
+ },
+ {
+ "name": "Quotes",
+ "scope": "markup.quote",
+ "settings": {
+ "foreground": "#4d5a20"
+ }
+ },
+ {
+ "name": "Separator",
+ "scope": "meta.separator",
+ "settings": {
+ "foreground": "#3d3632"
+ }
+ },
+ {
+ "name": "Inserted",
+ "scope": "markup.inserted",
+ "settings": {
+ "foreground": "#4d5a20"
+ }
+ },
+ {
+ "name": "Deleted",
+ "scope": "markup.deleted",
+ "settings": {
+ "foreground": "#a03c15"
+ }
+ },
+ {
+ "name": "Changed",
+ "scope": "markup.changed",
+ "settings": {
+ "foreground": "#b07800"
+ }
+ },
+ {
+ "name": "Regular Expressions",
+ "scope": "string.regexp",
+ "settings": {
+ "foreground": "#b05a20"
+ }
+ },
+ {
+ "name": "Escape Characters",
+ "scope": "constant.character.escape",
+ "settings": {
+ "foreground": "#b05a20"
+ }
+ },
+ {
+ "name": "Embedded",
+ "scope": "punctuation.section.embedded, variable.interpolation",
+ "settings": {
+ "foreground": "#7a5230"
+ }
+ },
+ {
+ "name": "Invalid",
+ "scope": "invalid.illegal, invalid.broken, invalid.deprecated, invalid.unimplemented",
+ "settings": {
+ "foreground": "#a03c15"
+ }
+ }
+ ]
+}
diff --git a/skills/worktrunk/reference/claude-code.md b/skills/worktrunk/reference/claude-code.md
index 6373c3ac4..54924d2e8 100644
--- a/skills/worktrunk/reference/claude-code.md
+++ b/skills/worktrunk/reference/claude-code.md
@@ -27,6 +27,7 @@ Claude Code is designed to load the skill automatically when it detects worktrun
The plugin tracks Claude sessions with status markers in `wt list`:
+{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ main <span class=d>^</span><span class=d>⇡</span> . <span class=g>⇡1</span> <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
@@ -35,6 +36,7 @@ The plugin tracks Claude sessions with status markers in `wt list`:
+ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>
+{% end %}
- 🤖 — Claude is working
- 💬 — Claude is waiting for input
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index 428e259b6..e5212c68f 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -10,27 +10,29 @@ The table renders progressively: branch names, paths, and commit hashes appear i
List all worktrees:
-<span class="cmd">wt list</span>
+{% terminal(cmd="wt list") %}
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-api <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</span>
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=d>|</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
+{% end %}
Include CI status and line diffs:
-<span class="cmd">wt list --full</span>
+{% terminal(cmd="wt list --full") %}
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-api <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</span>
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> <span class=d>|</span> <span class=g>●</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure t…</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
+{% end %}
Include branches that don't have worktrees:
-<span class="cmd">wt list --branches --full</span>
+{% terminal(cmd="wt list --branches --full") %}
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-api <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-au…</span>
@@ -39,6 +41,7 @@ Include branches that don't have worktrees:
wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>b40716dc</span> <span class=d>3d</span> <span class=d>Start API do…</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
+{% end %}
Output as JSON for scripting:
diff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.md
index b0dad7baf..24bec709a 100644
--- a/skills/worktrunk/reference/step.md
+++ b/skills/worktrunk/reference/step.md
@@ -250,7 +250,7 @@ All gitignored files are copied by default. Tracked files are never touched.
To limit what gets copied, create `.worktreeinclude` with gitignore-style patterns. Files must be **both** gitignored **and** in `.worktreeinclude`:
-```gitignore
+```text
# .worktreeinclude
.env
node_modules/
diff --git a/skills/worktrunk/reference/tips-patterns.md b/skills/worktrunk/reference/tips-patterns.md
index 0f93ca74d..7d0a48643 100644
--- a/skills/worktrunk/reference/tips-patterns.md
+++ b/skills/worktrunk/reference/tips-patterns.md
@@ -43,6 +43,7 @@ server = "lsof -ti :{{ branch | hash_port }} -sTCP:LISTEN | xargs kill 2>/dev/nu
The URL column in `wt list` shows each worktree's dev server:
+{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b> <b>Age</b>
@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
@@ -50,6 +51,7 @@ The URL column in `wt list` shows each worktree's dev server:
+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span> <span class=d>5h</span>
<span class=d>○</span> <span class=d>Showing 3 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
+{% end %}
Ports are deterministic — `fix-auth` always gets port 16460, regardless of which machine or when. The URL dims if the server isn't running.
diff --git a/skills/worktrunk/reference/worktrunk.md b/skills/worktrunk/reference/worktrunk.md
index 07ea580db..9bfd9d1ee 100644
--- a/skills/worktrunk/reference/worktrunk.md
+++ b/skills/worktrunk/reference/worktrunk.md
@@ -115,17 +115,21 @@ paru worktrunk-bin && wt config shell install
Create a worktree for a new feature:
+{% terminal(cmd="wt switch --create feature-auth") %}
<span class="cmd">wt switch --create feature-auth</span>
<span class=g>✓</span> <span class=g>Created branch <b>feature-auth</b> from <b>main</b> and worktree @ <b>repo.feature-auth</b></span>
+{% end %}
This creates a new branch and worktree, then switches to it. Do your work, then check all worktrees with [`wt list`](https://worktrunk.dev/list/):
+{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
@ feature-auth <span class=c>+</span> <span class=d>–</span> <span class=g>+53</span> <span class=d>0e631add</span> <span class=d>1d</span> <span class=d>Initial commit</span>
^ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> <span class=d>0e631add</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 2 worktrees, 1 with changes, 1 column hidden</span>
+{% end %}
The `@` marks the current worktree. `+` means staged changes, `⇡` means unpushed commits.
@@ -141,6 +145,7 @@ wt remove # after PR is merged
**Local merge** — squash, rebase onto main, fast-forward merge, clean up:
+{% terminal(cmd="wt merge main") %}
<span class="cmd">wt merge main</span>
<span class=c>◎</span> <span class=c>Generating commit message and committing changes... <span style='color:var(--bright-black,#555)'>(2 files, <span class=g>+53</span></span></span>, no squashing needed<span style='color:var(--bright-black,#555)'>)</span>
<span style='background:var(--bright-white,#fff)'> </span> <b>Add authentication module</b>
@@ -153,6 +158,7 @@ wt remove # after PR is merged
<span class=g>✓</span> <span class=g>Merged to <b>main</b> <span style='color:var(--bright-black,#555)'>(1 commit, 2 files, +53</span></span><span style='color:var(--bright-black,#555)'>)</span>
<span class=c>◎ Removing <b>feature-auth</b> worktree &amp; branch in background (same commit as <b>main</b>,</span> <span class=d>_</span><span class=c>)</span>
<span class=d>○</span> Switched to worktree for <b>main</b> @ <b>repo</b>
+{% end %}
For parallel agents, create multiple worktrees and launch an agent in each:
diff --git a/src/cli/step.rs b/src/cli/step.rs
index f33dccb2e..bbf9f7e17 100644
--- a/src/cli/step.rs
+++ b/src/cli/step.rs
@@ -191,7 +191,7 @@ All gitignored files are copied by default. Tracked files are never touched.
To limit what gets copied, create `.worktreeinclude` with gitignore-style patterns. Files must be **both** gitignored **and** in `.worktreeinclude`:
-```gitignore
+```text
# .worktreeinclude
.env
node_modules/
diff --git a/tests/integration_tests/readme_sync.rs b/tests/integration_tests/readme_sync.rs
index b3989ceeb..36bc2aa00 100644
--- a/tests/integration_tests/readme_sync.rs
+++ b/tests/integration_tests/readme_sync.rs
@@ -42,9 +42,10 @@ static ANSI_LITERAL_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\[[0-
/// Regex to find docs snapshot markers (HTML output)
/// Format: <!-- ⚠️ AUTO-GENERATED-HTML from path.snap — edit source to update -->
+/// Matches both old `{% terminal() %}` and new `{% terminal(cmd="...") %}` forms
static DOCS_SNAPSHOT_MARKER_PATTERN: LazyLock<Regex> = LazyLock::new(|| {
Regex::new(
- r"(?s)<!-- ⚠️ AUTO-GENERATED-HTML from ([^\s]+\.snap) — edit source to update -->\n+\{% terminal\(\) %\}\n(.*?)\{% end %\}\n+<!-- END AUTO-GENERATED -->",
+ r#"(?s)<!-- ⚠️ AUTO-GENERATED-HTML from ([^\s]+\.snap) — edit source to update -->\n+\{% terminal\([^)]*\) %\}\n(.*?)\{% end %\}\n+<!-- END AUTO-GENERATED -->"#,
)
.unwrap()
});
@@ -286,9 +287,17 @@ fn replace_placeholders(content: &str) -> String {
fn format_replacement(id: &str, content: &str, format: &OutputFormat) -> String {
match format {
OutputFormat::DocsHtml => {
+ // Extract command from <span class="cmd"> in body to also emit as cmd= parameter
+ // The cmd= parameter enables giallo syntax highlighting in the shortcode
+ // The span is kept in body for stable sync comparisons
+ let cmd_re = Regex::new(r#"^<span class="cmd">([^<]+)</span>"#).unwrap();
+ let cmd_attr = cmd_re
+ .captures(content)
+ .map(|c| format!(r#"cmd="{}""#, c.get(1).unwrap().as_str()))
+ .unwrap_or_default();
format!(
- "<!-- ⚠️ AUTO-GENERATED-HTML from {} — edit source to update -->\n\n{{% terminal() %}}\n{}\n{{% end %}}\n\n<!-- END AUTO-GENERATED -->",
- id, content
+ "<!-- ⚠️ AUTO-GENERATED-HTML from {} — edit source to update -->\n\n{{% terminal({}) %}}\n{}\n{{% end %}}\n\n<!-- END AUTO-GENERATED -->",
+ id, cmd_attr, content
)
}
OutputFormat::Unwrapped => {
@@ -414,11 +423,11 @@ fn expand_command_placeholders(content: &str, snapshots_dir: &Path) -> Result<St
let normalized = trim_lines(&html);
// Build the terminal shortcode with standard template markers
+ // cmd= parameter enables giallo syntax highlighting on the command line
// Prompt ($) is added via CSS ::before, so not included in HTML
let replacement = format!(
"<!-- ⚠️ AUTO-GENERATED from tests/snapshots/{} — edit source to update -->\n\n\
- {{% terminal() %}}\n\
- <span class=\"cmd\">{}</span>\n\
+ {{% terminal(cmd=\"{}\") %}}\n\
{}\n\
{{% end %}}\n\n\
<!-- END AUTO-GENERATED -->",
@@ -737,9 +746,10 @@ fn heading_to_anchor(heading: &str) -> String {
/// Regex to match terminal shortcodes with AUTO-GENERATED-HTML markers
/// Optionally captures a preceding bash code block (which becomes redundant)
/// These need to be converted to plain code blocks for README
+/// Matches both `{% terminal() %}` and `{% terminal(cmd="...") %}` forms
static TERMINAL_MARKER_PATTERN: LazyLock<Regex> = LazyLock::new(|| {
Regex::new(
- r"(?s)(?:```bash\n[^\n]+\n```\n+)?<!-- ⚠️ AUTO-GENERATED-HTML from [^\n]+ -->\n+\{% terminal\(\) %\}\n(.*?)\{% end %\}\n+<!-- END AUTO-GENERATED -->",
+ r#"(?s)(?:```bash\n[^\n]+\n```\n+)?<!-- ⚠️ AUTO-GENERATED-HTML from [^\n]+ -->\n+\{% terminal\([^)]*\) %\}\n(.*?)\{% end %\}\n+<!-- END AUTO-GENERATED -->"#,
)
.unwrap()
});