Skip to content

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

refactor(verbose): rename output.log → subprocess.log; -vv keeps Info on stderr (#2913)

Maximilian Roos21e0b27e49f8
diff --git a/docs/content/config.md b/docs/content/config.md
index 6efac7c9c..359d21996 100644
--- a/docs/content/config.md
+++ b/docs/content/config.md
@@ -588,8 +588,8 @@ Usage: <b><span class=c>wt config</span></b> <span class=c>[OPTIONS]</span> <spa
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -649,8 +649,8 @@ Usage: <b><span class=c>wt config show</span></b> <span class=c>[OPTIONS]</span>
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -700,8 +700,8 @@ Usage: <b><span class=c>wt config approvals</span></b> <span class=c>[OPTIONS]</
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -747,8 +747,8 @@ Usage: <b><span class=c>wt config alias</span></b> <span class=c>[OPTIONS]</span
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -822,8 +822,8 @@ Usage: <b><span class=c>wt config state</span></b> <span class=c>[OPTIONS]</span
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -880,8 +880,8 @@ Usage: <b><span class=c>wt config state default-branch</span></b> <span class=c>
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -928,10 +928,10 @@ All `post-*` hooks (post-start, post-switch, post-commit, post-merge) run in the
| File | Created when |
|------|-------------|
| `trace.log` | Running with `-vv` |
-| `output.log` | Running with `-vv` |
+| `subprocess.log` | Running with `-vv` |
| `diagnostic.md` | Running with `-vv` |
-`trace.log` receives the noisy `log::*` pipeline at `-vv` — commands, `[wt-trace]` records, bounded subprocess previews — so stderr stays readable (user-facing status messages still print as normal). `output.log` holds the raw uncapped subprocess stdout/stderr bodies. `diagnostic.md` is a markdown report for pasting into GitHub issues; it inlines `trace.log` but not `output.log`, which can be multi-MB. All three are overwritten on each `-vv` run.
+`trace.log` captures debug-level records at `-vv` — commands, `[wt-trace]` records, bounded subprocess previews. `subprocess.log` holds the raw uncapped subprocess stdout/stderr bodies. `diagnostic.md` is a markdown bug-report bundle that inlines `trace.log`; `wt` prints a `gh gist create` command pointing at it. All three are overwritten on each `-vv` run.
### Location
@@ -985,8 +985,8 @@ Usage: <b><span class=c>wt config state logs</span></b> <span class=c>[OPTIONS]<
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -1046,8 +1046,8 @@ Usage: <b><span class=c>wt config state ci-status</span></b> <span class=c>[OPTI
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -1115,8 +1115,8 @@ Usage: <b><span class=c>wt config state marker</span></b> <span class=c>[OPTIONS
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -1190,8 +1190,8 @@ Usage: <b><span class=c>wt config state vars</span></b> <span class=c>[OPTIONS]<
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
diff --git a/docs/content/faq.md b/docs/content/faq.md
index 181324ffa..95f692d63 100644
--- a/docs/content/faq.md
+++ b/docs/content/faq.md
@@ -73,6 +73,26 @@ Claude will run `wt config show`, inspect the shell config files, and identify t
If Claude can't fix it, please [open an issue](https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20setup%20issue&body=%23%23%20Shell%20and%20OS%0A%0A-%20Shell%3A%20%0A-%20OS%3A%20%0A%0A%23%23%20Output%20of%20%60wt%20config%20show%60%0A%0A%60%60%60%0A%0A%60%60%60%0A%0A%23%23%20What%20Claude%20found%20%28if%20available%29%0A%0A) with the output of `wt config show`, the shell (bash/zsh/fish), and OS. (And even if it fixes the problem, feel free to open an issue: non-standard success cases are useful for ensuring Worktrunk is easy to set up for others.)
+## What does `-v` / `-vv` do?
+
+Three verbosity levels. Each is a superset of the previous one.
+
+| Level | Stderr | Files (`.git/wt/logs/`) | Use case |
+|-------|--------|-------------------------|----------|
+| (none) | Warnings only | — | Normal use |
+| `-v` | + Info: hook output, alias template variable resolution | — | Debugging hooks/aliases |
+| `-vv` | Same as `-v` | + `trace.log`, `subprocess.log`, `diagnostic.md` | Filing a bug |
+
+At `-vv`, debug-level records (`$ cmd` headers, `[wt-trace]` timing, bounded subprocess preview) route to `trace.log` instead of stderr — so the terminal stays readable while the deep trace lands on disk. A one-line pointer on stderr shows where the files went.
+
+The three `-vv` files have distinct audiences:
+
+- **`trace.log`** — bounded preview (~1K lines), `[wt-trace]` records, gistable.
+- **`subprocess.log`** — raw uncapped stdout/stderr of every subprocess `wt` spawns (multi-MB possible, e.g. full `git log -p` output). The deep-dive escape hatch.
+- **`diagnostic.md`** — markdown bug-report bundle that inlines `trace.log`. `wt` prints a `gh gist create` command pointing at it.
+
+`RUST_LOG` overrides the flag baseline when set (`RUST_LOG=debug wt -v` lifts `-v` to debug-on-stderr).
+
## What files does Worktrunk create?
Worktrunk creates files in four categories.
@@ -122,8 +142,8 @@ Worktrunk stores small amounts of cache and log data in the repository's `.git/`
| `.git/wt/cache/summary/{branch}/{hash}.json` | Cached LLM branch summaries, content-addressed by diff hash | `wt list --full`, `wt switch` (when `[list] summary = true`) |
| `.git/wt/logs/{branch}/**/*.log` | Background hook output (nested per branch) | Hooks, background `wt remove` |
| `.git/wt/logs/commands.jsonl` | Command audit log (~2MB max) | Hooks, LLM commands |
-| `.git/wt/logs/trace.log` | Debug log for issue reporting (captures the `log::*` pipeline that `-vv` would otherwise put on stderr) | Running with `-vv` |
-| `.git/wt/logs/output.log` | Raw uncapped subprocess stdout/stderr (may be multi-MB) | Running with `-vv` |
+| `.git/wt/logs/trace.log` | Debug log for issue reporting | Running with `-vv` |
+| `.git/wt/logs/subprocess.log` | Raw uncapped subprocess stdout/stderr (may be multi-MB) | Running with `-vv` |
| `.git/wt/logs/diagnostic.md` | Diagnostic report for issue reporting | Running with `-vv` |
| `.git/wt/trash/<name>-<timestamp>` | Staged worktree contents pending background deletion | `wt remove` |
diff --git a/docs/content/hook.md b/docs/content/hook.md
index 0305fdc25..48d1ecbae 100644
--- a/docs/content/hook.md
+++ b/docs/content/hook.md
@@ -361,8 +361,8 @@ Usage: <b><span class=c>wt hook</span></b> <span class=c>[OPTIONS]</span> <span
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
diff --git a/docs/content/list.md b/docs/content/list.md
index 6c9a3113d..ed7f319df 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -304,8 +304,8 @@ Usage: <b><span class=c>wt list</span></b> <span class=c>[OPTIONS]</span>
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
diff --git a/docs/content/merge.md b/docs/content/merge.md
index 0d4954cb2..28e4983e6 100644
--- a/docs/content/merge.md
+++ b/docs/content/merge.md
@@ -158,8 +158,8 @@ Usage: <b><span class=c>wt merge</span></b> <span class=c>[OPTIONS]</span> <span
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
diff --git a/docs/content/remove.md b/docs/content/remove.md
index 164215345..186127790 100644
--- a/docs/content/remove.md
+++ b/docs/content/remove.md
@@ -139,8 +139,8 @@ Usage: <b><span class=c>wt remove</span></b> <span class=c>[OPTIONS]</span> <spa
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
diff --git a/docs/content/step.md b/docs/content/step.md
index 224374837..5ad9126e7 100644
--- a/docs/content/step.md
+++ b/docs/content/step.md
@@ -83,8 +83,8 @@ Usage: <b><span class=c>wt step</span></b> <span class=c>[OPTIONS]</span> <span
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -175,8 +175,8 @@ Usage: <b><span class=c>wt step commit</span></b> <span class=c>[OPTIONS]</span>
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -270,8 +270,8 @@ Usage: <b><span class=c>wt step squash</span></b> <span class=c>[OPTIONS]</span>
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -331,8 +331,8 @@ Usage: <b><span class=c>wt step diff</span></b> <span class=c>[OPTIONS]</span> <
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -484,8 +484,8 @@ Usage: <b><span class=c>wt step copy-ignored</span></b> <span class=c>[OPTIONS]<
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -562,8 +562,8 @@ Usage: <b><span class=c>wt step eval</span></b> <span class=c>[OPTIONS]</span> <
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -635,8 +635,8 @@ Usage: <b><span class=c>wt step for-each</span></b> <span class=c>[OPTIONS]</spa
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -712,8 +712,8 @@ Usage: <b><span class=c>wt step promote</span></b> <span class=c>[OPTIONS]</span
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -786,8 +786,8 @@ Usage: <b><span class=c>wt step prune</span></b> <span class=c>[OPTIONS]</span>
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -894,8 +894,8 @@ Usage: <b><span class=c>wt step relocate</span></b> <span class=c>[OPTIONS]</spa
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
@@ -965,8 +965,8 @@ Usage: <b><span class=c>wt step tether</span></b> <span class=c>[OPTIONS]</span>
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
diff --git a/docs/content/switch.md b/docs/content/switch.md
index b45a4c474..ca23eeb05 100644
--- a/docs/content/switch.md
+++ b/docs/content/switch.md
@@ -218,8 +218,8 @@ Usage: <b><span class=c>wt switch</span></b> <span class=c>[OPTIONS]</span> <spa
User config file path
<b><span class=c>-v</span></b>, <b><span class=c>--verbose</span></b><span class=c>...</span>
- Verbose output (-v: info logs + hook/alias template variable &amp; output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
<b><span class=c>-y</span></b>, <b><span class=c>--yes</span></b>
Skip approval prompts
diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.md
index 73a07f062..07a601d4f 100644
--- a/skills/worktrunk/reference/config.md
+++ b/skills/worktrunk/reference/config.md
@@ -587,8 +587,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -650,8 +650,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -707,8 +707,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -761,8 +761,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -850,8 +850,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -910,8 +910,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -958,10 +958,10 @@ All `post-*` hooks (post-start, post-switch, post-commit, post-merge) run in the
| File | Created when |
|------|-------------|
| `trace.log` | Running with `-vv` |
-| `output.log` | Running with `-vv` |
+| `subprocess.log` | Running with `-vv` |
| `diagnostic.md` | Running with `-vv` |
-`trace.log` receives the noisy `log::*` pipeline at `-vv` — commands, `[wt-trace]` records, bounded subprocess previews — so stderr stays readable (user-facing status messages still print as normal). `output.log` holds the raw uncapped subprocess stdout/stderr bodies. `diagnostic.md` is a markdown report for pasting into GitHub issues; it inlines `trace.log` but not `output.log`, which can be multi-MB. All three are overwritten on each `-vv` run.
+`trace.log` captures debug-level records at `-vv` — commands, `[wt-trace]` records, bounded subprocess previews. `subprocess.log` holds the raw uncapped subprocess stdout/stderr bodies. `diagnostic.md` is a markdown bug-report bundle that inlines `trace.log`; `wt` prints a `gh gist create` command pointing at it. All three are overwritten on each `-vv` run.
### Location
@@ -1025,8 +1025,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -1086,8 +1086,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -1158,8 +1158,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -1244,8 +1244,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/skills/worktrunk/reference/faq.md b/skills/worktrunk/reference/faq.md
index ee715d17b..3144b3643 100644
--- a/skills/worktrunk/reference/faq.md
+++ b/skills/worktrunk/reference/faq.md
@@ -66,6 +66,26 @@ Claude will run `wt config show`, inspect the shell config files, and identify t
If Claude can't fix it, please [open an issue](https://github.com/max-sixty/worktrunk/issues/new?title=Shell%20setup%20issue&body=%23%23%20Shell%20and%20OS%0A%0A-%20Shell%3A%20%0A-%20OS%3A%20%0A%0A%23%23%20Output%20of%20%60wt%20config%20show%60%0A%0A%60%60%60%0A%0A%60%60%60%0A%0A%23%23%20What%20Claude%20found%20%28if%20available%29%0A%0A) with the output of `wt config show`, the shell (bash/zsh/fish), and OS. (And even if it fixes the problem, feel free to open an issue: non-standard success cases are useful for ensuring Worktrunk is easy to set up for others.)
+## What does `-v` / `-vv` do?
+
+Three verbosity levels. Each is a superset of the previous one.
+
+| Level | Stderr | Files (`.git/wt/logs/`) | Use case |
+|-------|--------|-------------------------|----------|
+| (none) | Warnings only | — | Normal use |
+| `-v` | + Info: hook output, alias template variable resolution | — | Debugging hooks/aliases |
+| `-vv` | Same as `-v` | + `trace.log`, `subprocess.log`, `diagnostic.md` | Filing a bug |
+
+At `-vv`, debug-level records (`$ cmd` headers, `[wt-trace]` timing, bounded subprocess preview) route to `trace.log` instead of stderr — so the terminal stays readable while the deep trace lands on disk. A one-line pointer on stderr shows where the files went.
+
+The three `-vv` files have distinct audiences:
+
+- **`trace.log`** — bounded preview (~1K lines), `[wt-trace]` records, gistable.
+- **`subprocess.log`** — raw uncapped stdout/stderr of every subprocess `wt` spawns (multi-MB possible, e.g. full `git log -p` output). The deep-dive escape hatch.
+- **`diagnostic.md`** — markdown bug-report bundle that inlines `trace.log`. `wt` prints a `gh gist create` command pointing at it.
+
+`RUST_LOG` overrides the flag baseline when set (`RUST_LOG=debug wt -v` lifts `-v` to debug-on-stderr).
+
## What files does Worktrunk create?
Worktrunk creates files in four categories.
@@ -115,8 +135,8 @@ Worktrunk stores small amounts of cache and log data in the repository's `.git/`
| `.git/wt/cache/summary/{branch}/{hash}.json` | Cached LLM branch summaries, content-addressed by diff hash | `wt list --full`, `wt switch` (when `[list] summary = true`) |
| `.git/wt/logs/{branch}/**/*.log` | Background hook output (nested per branch) | Hooks, background `wt remove` |
| `.git/wt/logs/commands.jsonl` | Command audit log (~2MB max) | Hooks, LLM commands |
-| `.git/wt/logs/trace.log` | Debug log for issue reporting (captures the `log::*` pipeline that `-vv` would otherwise put on stderr) | Running with `-vv` |
-| `.git/wt/logs/output.log` | Raw uncapped subprocess stdout/stderr (may be multi-MB) | Running with `-vv` |
+| `.git/wt/logs/trace.log` | Debug log for issue reporting | Running with `-vv` |
+| `.git/wt/logs/subprocess.log` | Raw uncapped subprocess stdout/stderr (may be multi-MB) | Running with `-vv` |
| `.git/wt/logs/diagnostic.md` | Diagnostic report for issue reporting | Running with `-vv` |
| `.git/wt/trash/<name>-<timestamp>` | Staged worktree contents pending background deletion | `wt remove` |
diff --git a/skills/worktrunk/reference/hook.md b/skills/worktrunk/reference/hook.md
index dbde00f2c..792765753 100644
--- a/skills/worktrunk/reference/hook.md
+++ b/skills/worktrunk/reference/hook.md
@@ -357,8 +357,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index bad258f9c..ded1929da 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -311,8 +311,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/skills/worktrunk/reference/merge.md b/skills/worktrunk/reference/merge.md
index 240fd2f2a..4744dc5fc 100644
--- a/skills/worktrunk/reference/merge.md
+++ b/skills/worktrunk/reference/merge.md
@@ -147,8 +147,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/skills/worktrunk/reference/remove.md b/skills/worktrunk/reference/remove.md
index cb606f87c..a868b4a5f 100644
--- a/skills/worktrunk/reference/remove.md
+++ b/skills/worktrunk/reference/remove.md
@@ -137,8 +137,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.md
index 31f36622a..1c894e08b 100644
--- a/skills/worktrunk/reference/step.md
+++ b/skills/worktrunk/reference/step.md
@@ -74,8 +74,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -170,8 +170,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -269,8 +269,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -340,8 +340,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -493,8 +493,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -577,8 +577,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -660,8 +660,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -740,8 +740,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -821,8 +821,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -937,8 +937,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -1012,8 +1012,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/skills/worktrunk/reference/switch.md b/skills/worktrunk/reference/switch.md
index 3c7e5fc4f..7645c6709 100644
--- a/skills/worktrunk/reference/switch.md
+++ b/skills/worktrunk/reference/switch.md
@@ -210,8 +210,8 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs +
- diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug
+ logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/src/cli/config.rs b/src/cli/config.rs
index 6e11698ef..d17681c8e 100644
--- a/src/cli/config.rs
+++ b/src/cli/config.rs
@@ -784,10 +784,10 @@ All `post-*` hooks (post-start, post-switch, post-commit, post-merge) run in the
| File | Created when |
|------|-------------|
| `trace.log` | Running with `-vv` |
-| `output.log` | Running with `-vv` |
+| `subprocess.log` | Running with `-vv` |
| `diagnostic.md` | Running with `-vv` |
-`trace.log` receives the noisy `log::*` pipeline at `-vv` — commands, `[wt-trace]` records, bounded subprocess previews — so stderr stays readable (user-facing status messages still print as normal). `output.log` holds the raw uncapped subprocess stdout/stderr bodies. `diagnostic.md` is a markdown report for pasting into GitHub issues; it inlines `trace.log` but not `output.log`, which can be multi-MB. All three are overwritten on each `-vv` run.
+`trace.log` captures debug-level records at `-vv` — commands, `[wt-trace]` records, bounded subprocess previews. `subprocess.log` holds the raw uncapped subprocess stdout/stderr bodies. `diagnostic.md` is a markdown bug-report bundle that inlines `trace.log`; `wt` prints a `gh gist create` command pointing at it. All three are overwritten on each `-vv` run.
## Location
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 48418a4f0..ef93efeb9 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -241,7 +241,7 @@ pub(crate) struct Cli {
)]
pub config: Option<std::path::PathBuf>,
- /// Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ /// Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
#[arg(
long,
short = 'v',
diff --git a/src/commands/config/state.rs b/src/commands/config/state.rs
index e04b29c98..06aca7b0e 100644
--- a/src/commands/config/state.rs
+++ b/src/commands/config/state.rs
@@ -33,7 +33,7 @@
//! # Log layout invariant
//!
//! Inside `wt_logs_dir()`, top-level *files* are shared logs (`commands.jsonl*`,
-//! `internal-*.log`, `trace.log`, `output.log`, `diagnostic.md`) and top-level
+//! `internal-*.log`, `trace.log`, `subprocess.log`, `diagnostic.md`) and top-level
//! *directories* are per-branch log trees
//! (`{branch}/{source|internal}/{hook-type}/{name}.log`).
//! Categorization
@@ -97,7 +97,7 @@ fn picker_preview_clear(repo: &Repository) -> anyhow::Result<usize> {
// ==================== Log Management ====================
/// Top-level files created by `-vv` under `wt_logs_dir()`.
-const DIAGNOSTIC_FILES: &[&str] = &["trace.log", "output.log", "diagnostic.md"];
+const DIAGNOSTIC_FILES: &[&str] = &["trace.log", "subprocess.log", "diagnostic.md"];
/// Whether a top-level file is a diagnostic log.
///
@@ -295,7 +295,7 @@ fn count_log_files_recursive(dir: &Path) -> anyhow::Result<usize> {
///
/// Walks the two layers of log storage:
///
-/// 1. **Top-level files**: `commands.jsonl*`, `trace.log`, `output.log`, `diagnostic.md`.
+/// 1. **Top-level files**: `commands.jsonl*`, `trace.log`, `subprocess.log`, `diagnostic.md`.
/// Also sweeps any legacy flat `.log` files left over from the pre-nested
/// layout so the transition is self-healing (no explicit migrator).
/// 2. **Top-level directories**: per-branch log trees — counted recursively
diff --git a/src/diagnostic.rs b/src/diagnostic.rs
index 773b7b239..80e36af88 100644
--- a/src/diagnostic.rs
+++ b/src/diagnostic.rs
@@ -33,7 +33,7 @@
//! # File Location
//!
//! Reports are written to `<git-common-dir>/wt/logs/diagnostic.md` (typically
-//! `.git/wt/logs/diagnostic.md`). Companion log files (`trace.log`, `output.log`) live in the same directory.
+//! `.git/wt/logs/diagnostic.md`). Companion log files (`trace.log`, `subprocess.log`) live in the same directory.
//!
//! # Usage
//!
@@ -167,7 +167,7 @@ impl DiagnosticReport {
.filter(|s| !s.is_empty());
// Forward slashes on both platforms so the rendered markdown reads the
// same in bug reports regardless of where it was produced.
- let output_log_path = crate::log_files::OUTPUT
+ let output_log_path = crate::log_files::SUBPROCESS
.path()
.map(|p| path_slash::PathExt::to_slash_lossy(p.as_path()).into_owned());
diff --git a/src/git/repository/mod.rs b/src/git/repository/mod.rs
index 3580d2c6b..87cfb4c06 100644
--- a/src/git/repository/mod.rs
+++ b/src/git/repository/mod.rs
@@ -76,7 +76,7 @@
//! external state that could go stale:
//! - Resource limiters: `CMD_SEMAPHORE` (shell_exec), `HEAVY_OPS_SEMAPHORE` (git),
//! `LLM_SEMAPHORE` (summary), `COPY_POOL` (copy)
-//! - Global state: `OUTPUT_STATE` (output), `TRACE` and `OUTPUT` (log_files), `COMMAND_LOG`
+//! - Global state: `OUTPUT_STATE` (output), `TRACE` and `SUBPROCESS` (log_files), `COMMAND_LOG`
//! - Config: `CONFIG_PATH` (config/user/path), `SHELL_CONFIG`, `GIT_ENV_OVERRIDES` (shell_exec)
//!
//! The picker also maintains a `PreviewCache` (`Arc<DashMap>` in `commands/picker/items.rs`)
diff --git a/src/llm.rs b/src/llm.rs
index 6affe22b8..98e61cc81 100644
--- a/src/llm.rs
+++ b/src/llm.rs
@@ -356,8 +356,8 @@ pub(crate) fn execute_llm_command(command: &str, prompt: &str) -> anyhow::Result
// MB-scale diffs in our process memory and removes them from our logs
// entirely. See conversation around PR #2136 for sketch.
- // Log the prompt to output.log alongside captured subprocess stdout —
- // SUBPROCESS_FULL_TARGET routes to output.log at `-vv`, never to stderr.
+ // Log the prompt to subprocess.log alongside captured subprocess stdout —
+ // SUBPROCESS_FULL_TARGET routes to subprocess.log at `-vv`, never to stderr.
log::debug!(target: SUBPROCESS_FULL_TARGET, " Prompt (stdin):");
for line in prompt.lines() {
log::debug!(target: SUBPROCESS_FULL_TARGET, " {}", line);
diff --git a/src/log_files.rs b/src/log_files.rs
index 6e347b39c..342f95478 100644
--- a/src/log_files.rs
+++ b/src/log_files.rs
@@ -5,9 +5,10 @@
//! - [`TRACE`] → `trace.log`: structured records, `$ cmd [context]`
//! headers, and bounded subprocess previews. High-signal, bounded size —
//! safe to embed in `diagnostic.md` bug reports.
-//! - [`OUTPUT`] → `output.log`: raw, uncapped subprocess stdout/stderr
-//! bodies captured by `shell_exec::Cmd`. Potentially multi-MB (full
-//! `git log -p` / patch-id output); opt-in for deep dives.
+//! - [`SUBPROCESS`] → `subprocess.log`: raw, uncapped subprocess
+//! stdout/stderr bodies captured by `shell_exec::Cmd`. Potentially
+//! multi-MB (full `git log -p` / patch-id output); opt-in for deep
+//! dives.
//!
//! Direct user-facing output (`info_message` / `eprintln!` from command
//! code) is unaffected — it goes to stderr at every verbosity level. This
@@ -18,12 +19,14 @@
//! Routing is performed structurally by the `tracing-subscriber` layers
//! registered in `init_logging`:
//!
-//! - The `output.log` layer filters to `SUBPROCESS_FULL_TARGET` only,
+//! - The `subprocess.log` layer filters to `SUBPROCESS_FULL_TARGET` only,
//! so raw bodies never reach stderr or `trace.log`.
//! - The `trace.log` layer accepts every record *except*
//! `SUBPROCESS_FULL_TARGET` and writes to this file when `-vv` opened it.
-//! - The stderr layer is disabled at `-vv` (the file layers replace it)
-//! and otherwise honors `RUST_LOG` plus the `-v` baseline.
+//! - The stderr layer honors `RUST_LOG` plus the flag baseline (`Off` at
+//! no `-v`, `Info` at `-v` *and* `-vv`). Debug records (the noisy
+//! ones) route to the file layers only — `-vv` is a strict superset
+//! of `-v` on stderr.
use std::fs::{File, OpenOptions};
use std::io::{self, Write};
@@ -94,9 +97,9 @@ pub(crate) static TRACE: LogSink = LogSink {
file: OnceLock::new(),
filename: "trace.log",
};
-pub(crate) static OUTPUT: LogSink = LogSink {
+pub(crate) static SUBPROCESS: LogSink = LogSink {
file: OnceLock::new(),
- filename: "output.log",
+ filename: "subprocess.log",
};
/// Initialize both log sinks.
@@ -107,7 +110,7 @@ pub(crate) static OUTPUT: LogSink = LogSink {
/// here doesn't emit records to a half-built pipeline.
pub(crate) fn init() {
TRACE.init();
- OUTPUT.init();
+ SUBPROCESS.init();
}
/// Per-event writer: collects formatted bytes, then forwards them to the
@@ -155,13 +158,13 @@ impl<'a> tracing_subscriber::fmt::MakeWriter<'a> for TraceMakeWriter {
}
}
-/// `MakeWriter` for the output.log layer: always writes to `OUTPUT`.
-pub(crate) struct OutputMakeWriter;
+/// `MakeWriter` for the subprocess.log layer: always writes to `SUBPROCESS`.
+pub(crate) struct SubprocessMakeWriter;
-impl<'a> tracing_subscriber::fmt::MakeWriter<'a> for OutputMakeWriter {
+impl<'a> tracing_subscriber::fmt::MakeWriter<'a> for SubprocessMakeWriter {
type Writer = SinkWriter;
fn make_writer(&'a self) -> SinkWriter {
- OUTPUT.writer()
+ SUBPROCESS.writer()
}
}
diff --git a/src/logging.rs b/src/logging.rs
index a6030a427..799a68769 100644
--- a/src/logging.rs
+++ b/src/logging.rs
@@ -4,11 +4,15 @@
//! routing it needs. Filtering is structural (per-layer `Filter`), not done
//! after-the-fact in a format closure:
//!
-//! | layer | filter | format |
-//! | ----------- | ------------------------------------------------- | ----------------- |
-//! | stderr | off at `-vv`; else `$RUST_LOG` or `-v` baseline | styled with ANSI |
-//! | `trace.log` | `-vv` only, excludes `SUBPROCESS_FULL_TARGET` | plain text |
-//! | `output.log`| `-vv` only, includes only `SUBPROCESS_FULL_TARGET`| raw (no prefix) |
+//! | layer | filter | format |
+//! | ---------------- | --------------------------------------------------- | ----------------- |
+//! | stderr | `$RUST_LOG` or flag baseline (`Off`/`Info`/`Info`) | styled with ANSI |
+//! | `trace.log` | `-vv` only, excludes `SUBPROCESS_FULL_TARGET` | plain text |
+//! | `subprocess.log` | `-vv` only, includes only `SUBPROCESS_FULL_TARGET` | raw (no prefix) |
+//!
+//! At `-vv` the stderr layer keeps its Info baseline — `-vv` is a strict
+//! superset of `-v`, with Debug-level records (the noisy ones, including
+//! the bounded subprocess preview) routed to the file layers only.
//!
//! The `log` crate calls (used throughout the codebase) are bridged into
//! `tracing` by [`tracing_log::LogTracer::init`] — every layer above sees
@@ -28,7 +32,7 @@ use worktrunk::shell_exec::SUBPROCESS_FULL_TARGET;
use worktrunk::styling::{eprintln, info_message};
use worktrunk::trace::WT_TRACE_TARGET;
-use crate::log_files::{self, OutputMakeWriter, TraceMakeWriter};
+use crate::log_files::{self, SubprocessMakeWriter, TraceMakeWriter};
use crate::output;
/// Single-character thread label (e.g. `a`, `b`, …, `A`, …) used to group
@@ -293,11 +297,11 @@ fn format_wt_trace(f: &WtTraceFields) -> String {
}
}
-/// `output.log` formatter: the message verbatim. Subprocess bodies are
+/// `subprocess.log` formatter: the message verbatim. Subprocess bodies are
/// already prefixed (` …` / ` ! …`) by `shell_exec::format_stream_full`.
-struct OutputFileFormat;
+struct SubprocessFileFormat;
-impl<S, N> FormatEvent<S, N> for OutputFileFormat
+impl<S, N> FormatEvent<S, N> for SubprocessFileFormat
where
S: Subscriber + for<'a> LookupSpan<'a>,
N: for<'a> FormatFields<'a> + 'static,
@@ -341,7 +345,7 @@ pub(crate) fn init(verbose_level: u8) {
// naturally with subscriber `.with(...)` calls.
let stderr_layer = build_stderr_layer(verbose_level);
let trace_layer = build_trace_layer(verbose_level);
- let output_layer = build_output_layer(verbose_level);
+ let subprocess_layer = build_subprocess_layer(verbose_level);
// `try_init` fails only if a subscriber is already installed (the
// single-call-per-process contract). `wt`'s `main` runs `logging::init`
@@ -350,7 +354,7 @@ pub(crate) fn init(verbose_level: u8) {
let _ = tracing_subscriber::registry()
.with(stderr_layer)
.with(trace_layer)
- .with(output_layer)
+ .with(subprocess_layer)
.try_init();
// Forward `log::*` macros into `tracing`. Must come after subscriber
@@ -412,19 +416,17 @@ fn rust_log_level() -> Option<log::LevelFilter> {
.max()
}
-/// Stderr layer: off at `-vv` (the file layers take over). For `-v 0` and
-/// `-v`, the flag sets a baseline (`Off` / `Info`) and `RUST_LOG`, when
-/// set, overrides via the standard directive grammar — matching the
-/// env-wins-when-set convention (see PR #2901). Excludes
-/// `SUBPROCESS_FULL_TARGET` at all levels — raw bodies must never reach
-/// the terminal.
+/// Stderr layer: the flag sets a baseline (`Off` / `Info` / `Info`) and
+/// `RUST_LOG`, when set, overrides via the standard directive grammar —
+/// matching the env-wins-when-set convention (see PR #2901). At `-vv`
+/// stderr keeps the Info baseline so `-vv` is a strict superset of `-v`;
+/// Debug-level records (the noisy ones) route to the file layers only.
+/// Excludes `SUBPROCESS_FULL_TARGET` at all levels — raw bodies must
+/// never reach the terminal.
fn build_stderr_layer<S>(verbose_level: u8) -> Option<impl Layer<S>>
where
S: Subscriber + for<'a> LookupSpan<'a>,
{
- if verbose_level >= 2 {
- return None;
- }
let baseline = match verbose_level {
0 => LevelFilter::OFF,
_ => LevelFilter::INFO,
@@ -444,7 +446,7 @@ where
/// `trace.log` layer: only when `-vv` opened the file. Captures everything
/// at the Debug baseline (`RUST_LOG`, when set, overrides — e.g.
/// `RUST_LOG=trace wt -vv` lifts the file to Trace) except
-/// `SUBPROCESS_FULL_TARGET` (raw bodies go to `output.log`).
+/// `SUBPROCESS_FULL_TARGET` (raw bodies go to `subprocess.log`).
fn build_trace_layer<S>(verbose_level: u8) -> Option<impl Layer<S>>
where
S: Subscriber + for<'a> LookupSpan<'a>,
@@ -464,19 +466,19 @@ where
Some(layer)
}
-/// `output.log` layer: only `SUBPROCESS_FULL_TARGET` records, raw passthrough.
-fn build_output_layer<S>(verbose_level: u8) -> Option<impl Layer<S>>
+/// `subprocess.log` layer: only `SUBPROCESS_FULL_TARGET` records, raw passthrough.
+fn build_subprocess_layer<S>(verbose_level: u8) -> Option<impl Layer<S>>
where
S: Subscriber + for<'a> LookupSpan<'a>,
{
- if verbose_level < 2 || !log_files::OUTPUT.is_active() {
+ if verbose_level < 2 || !log_files::SUBPROCESS.is_active() {
return None;
}
let only_full = filter_fn(|meta| meta.target() == SUBPROCESS_FULL_TARGET);
let layer = tracing_subscriber::fmt::layer()
- .with_writer(OutputMakeWriter)
+ .with_writer(SubprocessMakeWriter)
.with_ansi(false)
- .event_format(OutputFileFormat)
+ .event_format(SubprocessFileFormat)
.with_filter(only_full);
Some(layer)
}
@@ -486,23 +488,23 @@ where
/// (outside a git repo, permission error) — there's nothing meaningful to
/// point at.
fn announce_trace_destination() {
- // TRACE and OUTPUT open independently — `LogSink::init` succeeds per
- // file. The (Some, None) case (trace.log open, output.log failed) is
+ // TRACE and SUBPROCESS open independently — `LogSink::init` succeeds per
+ // file. The (Some, None) case (trace.log open, subprocess.log failed) is
// rare but real (path-type mismatch, fs quota); the reverse is
- // possible too but `output.log` alone has no `$ cmd` context, so we
+ // possible too but `subprocess.log` alone has no `$ cmd` context, so we
// stay silent there.
let Some(trace_path) = log_files::TRACE.path() else {
return;
};
let trace_display = worktrunk::path::format_path_for_display(&trace_path);
- let msg = match log_files::OUTPUT.path() {
+ let msg = match log_files::SUBPROCESS.path() {
Some(output_path) => {
let output_display = worktrunk::path::format_path_for_display(&output_path);
cformat!(
"Tracing to <underline>{trace_display}</> (raw subprocess output @ <underline>{output_display}</>)"
)
}
- None => cformat!("Tracing to <underline>{trace_display}</> (output.log unavailable)"),
+ None => cformat!("Tracing to <underline>{trace_display}</> (subprocess.log unavailable)"),
};
eprintln!("{}", info_message(msg));
}
diff --git a/src/shell_exec.rs b/src/shell_exec.rs
index 961c196ed..f8898d9f0 100644
--- a/src/shell_exec.rs
+++ b/src/shell_exec.rs
@@ -454,7 +454,7 @@ pub fn set_command_timeout(timeout: Option<Duration>) {
/// Maximum lines of the bounded subprocess preview per stream. Exceeded
/// content is elided with a `… (N more lines, M bytes elided)` marker; the
-/// full output is still written to `output.log` via
+/// full output is still written to `subprocess.log` via
/// [`SUBPROCESS_FULL_TARGET`].
const LOG_OUTPUT_MAX_LINES: usize = 200;
@@ -463,7 +463,7 @@ const LOG_OUTPUT_MAX_LINES: usize = 200;
const LOG_OUTPUT_MAX_BYTES: usize = 64 * 1024;
/// Log target used for *full* subprocess stdout/stderr. The tracing-subscriber
-/// `output.log` layer filters on this target, so raw subprocess bodies (diffs,
+/// `subprocess.log` layer filters on this target, so raw subprocess bodies (diffs,
/// `git log -p`, patch-id pipelines) never reach stderr or `trace.log`.
pub const SUBPROCESS_FULL_TARGET: &str = "worktrunk::subprocess_full";
@@ -478,7 +478,7 @@ pub const SUBPROCESS_BOUNDED_TARGET: &str = "worktrunk::subprocess_bounded";
///
/// At `tracing::DEBUG` (`-vv`) each stream is emitted twice via separate
/// targets, and the tracing-subscriber layers route them:
-/// - [`SUBPROCESS_FULL_TARGET`]: uncapped, line-per-record, `output.log` only.
+/// - [`SUBPROCESS_FULL_TARGET`]: uncapped, line-per-record, `subprocess.log` only.
/// - [`SUBPROCESS_BOUNDED_TARGET`]: capped at [`LOG_OUTPUT_MAX_LINES`] and
/// [`LOG_OUTPUT_MAX_BYTES`] per stream with an elision marker, then
/// routed to `trace.log` at `-vv` or stderr otherwise.
@@ -516,9 +516,9 @@ fn format_stream_full(bytes: &[u8], prefix: &str) -> Vec<String> {
/// Split captured bytes into prefixed lines with at most [`LOG_OUTPUT_MAX_LINES`]
/// and [`LOG_OUTPUT_MAX_BYTES`] emitted; remainder replaced by a single
/// `… (N more lines, M bytes elided — <hint>)` marker. The hint text tracks
-/// whether `output.log` is collecting the full bodies, asked through
+/// whether `subprocess.log` is collecting the full bodies, asked through
/// `tracing::enabled!` against [`SUBPROCESS_FULL_TARGET`] — true iff the
-/// `output.log` layer is registered and accepting that target (`-vv` opened
+/// `subprocess.log` layer is registered and accepting that target (`-vv` opened
/// the file successfully).
fn format_stream_bounded(bytes: &[u8], prefix: &str) -> Vec<String> {
if bytes.is_empty() {
@@ -535,7 +535,7 @@ fn format_stream_bounded(bytes: &[u8], prefix: &str) -> Vec<String> {
let remaining_lines = 1 + lines.count();
let remaining_bytes = total_bytes.saturating_sub(bytes_emitted);
let hint = if tracing::enabled!(target: SUBPROCESS_FULL_TARGET, tracing::Level::DEBUG) {
- "full output in output.log"
+ "full output in subprocess.log"
} else {
"rerun with -vv for full output"
};
diff --git a/src/trace/emit.rs b/src/trace/emit.rs
index e27db60e6..c8172552f 100644
--- a/src/trace/emit.rs
+++ b/src/trace/emit.rs
@@ -46,7 +46,7 @@
//!
//! Events emit at `tracing::DEBUG`, so `-vv` or `RUST_LOG=debug` makes them
//! visible. Subprocess stdout/stderr continuations route through separate
-//! targets: the full output goes to `output.log`, and a bounded preview
+//! targets: the full output goes to `subprocess.log`, and a bounded preview
//! shares the routing of all other records — `trace.log` at `-vv`, stderr
//! otherwise — so raw bodies don't spam `-vv`.
diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rs
index c0ff4ca33..c8ee80c08 100644
--- a/tests/integration_tests/config_state.rs
+++ b/tests/integration_tests/config_state.rs
@@ -752,7 +752,7 @@ fn test_state_get_logs_diagnostic_files(repo: TestRepo) {
let log_dir = git_dir.join("wt/logs");
std::fs::create_dir_all(&log_dir).unwrap();
std::fs::write(log_dir.join("trace.log"), "debug output").unwrap();
- std::fs::write(log_dir.join("output.log"), "raw subprocess output").unwrap();
+ std::fs::write(log_dir.join("subprocess.log"), "raw subprocess output").unwrap();
std::fs::write(log_dir.join("diagnostic.md"), "# Diagnostic Report").unwrap();
// Also add a hook output file to verify separation
let remove_rel = internal_log_rel_path("feature", "remove");
@@ -764,7 +764,7 @@ fn test_state_get_logs_diagnostic_files(repo: TestRepo) {
// Diagnostic files appear under DIAGNOSTIC, not HOOK OUTPUT
assert!(stdout.contains("DIAGNOSTIC"), "Expected DIAGNOSTIC heading");
- for name in ["trace.log", "output.log", "diagnostic.md"] {
+ for name in ["trace.log", "subprocess.log", "diagnostic.md"] {
assert!(stdout.contains(name), "Expected {name} in output");
}
@@ -781,7 +781,7 @@ fn test_state_get_logs_diagnostic_files(repo: TestRepo) {
hook_section.contains(&remove_display),
"Expected {remove_display} in HOOK OUTPUT: {hook_section}"
);
- for name in ["trace.log", "output.log"] {
+ for name in ["trace.log", "subprocess.log"] {
assert!(
!hook_section.contains(name),
"{name} should not be in HOOK OUTPUT: {hook_section}"
@@ -796,7 +796,7 @@ fn test_state_clear_logs_includes_diagnostic_files(repo: TestRepo) {
let log_dir = git_dir.join("wt/logs");
std::fs::create_dir_all(&log_dir).unwrap();
std::fs::write(log_dir.join("trace.log"), "debug output").unwrap();
- std::fs::write(log_dir.join("output.log"), "raw output").unwrap();
+ std::fs::write(log_dir.join("subprocess.log"), "raw output").unwrap();
std::fs::write(log_dir.join("diagnostic.md"), "# Report").unwrap();
let output = wt_state_cmd(&repo, "logs", "clear", &[]).output().unwrap();
diff --git a/tests/integration_tests/diagnostic.rs b/tests/integration_tests/diagnostic.rs
index 8455d641f..82ee388e4 100644
--- a/tests/integration_tests/diagnostic.rs
+++ b/tests/integration_tests/diagnostic.rs
@@ -302,7 +302,7 @@ fn test_diagnostic_written_to_correct_location(mut repo: TestRepo) {
);
}
-/// Both log files (`trace.log` and `output.log`) should be created at `-vv`.
+/// Both log files (`trace.log` and `subprocess.log`) should be created at `-vv`.
#[rstest]
fn test_log_files_created(mut repo: TestRepo) {
repo.add_worktree("feature");
@@ -312,9 +312,12 @@ fn test_log_files_created(mut repo: TestRepo) {
let logs_dir = repo.root_path().join(".git").join("wt/logs");
let trace_log = logs_dir.join("trace.log");
- let output_log = logs_dir.join("output.log");
+ let output_log = logs_dir.join("subprocess.log");
assert!(trace_log.exists(), "trace.log should be created with -vv");
- assert!(output_log.exists(), "output.log should be created with -vv");
+ assert!(
+ output_log.exists(),
+ "subprocess.log should be created with -vv"
+ );
let trace = fs::read_to_string(&trace_log).unwrap();
assert!(!trace.is_empty(), "trace.log should not be empty");
@@ -325,7 +328,7 @@ fn test_log_files_created(mut repo: TestRepo) {
}
/// At `-vv`, the full (uncapped) subprocess stdout/stderr should land in
-/// `output.log` via `shell_exec::SUBPROCESS_FULL_TARGET` — not in `trace.log`.
+/// `subprocess.log` via `shell_exec::SUBPROCESS_FULL_TARGET` — not in `trace.log`.
/// `trace.log` gets the bounded preview alongside trace records.
#[rstest]
fn test_vv_splits_full_and_bounded_output(repo: TestRepo) {
@@ -333,7 +336,7 @@ fn test_vv_splits_full_and_bounded_output(repo: TestRepo) {
let logs_dir = repo.root_path().join(".git").join("wt/logs");
let trace = fs::read_to_string(logs_dir.join("trace.log")).unwrap();
- let output = fs::read_to_string(logs_dir.join("output.log")).unwrap();
+ let output = fs::read_to_string(logs_dir.join("subprocess.log")).unwrap();
assert!(
trace.contains("[wt-trace]"),
@@ -341,27 +344,27 @@ fn test_vv_splits_full_and_bounded_output(repo: TestRepo) {
);
// Captured stdout is emitted line-by-line with the ` ` / ` ! `
// continuation prefix used by log_output. Full subprocess output lives
- // in output.log.
+ // in subprocess.log.
assert!(
output.lines().any(|l| l.contains(" worktree ")),
- "output.log should contain `git worktree list --porcelain` stdout lines at -vv"
+ "subprocess.log should contain `git worktree list --porcelain` stdout lines at -vv"
);
- // Structured trace records stay in trace.log only, not output.log.
+ // Structured trace records stay in trace.log only, not subprocess.log.
assert!(
!output.contains("[wt-trace]"),
- "output.log should not contain [wt-trace] records"
+ "subprocess.log should not contain [wt-trace] records"
);
}
-/// At `-vv`, the `log::*` pipeline is silent on stderr — the bounded
-/// preview lands in `trace.log` (not stderr), and `output.log` still holds
-/// the unbounded body. Guards against a regression that re-routes the
-/// debug stream to stderr and floods the terminal. (Direct stderr writes
-/// from command code — the "Tracing to ..." pointer, "Diagnostic saved",
-/// bug-report hint — are not part of the `log::*` pipeline and DO appear
-/// on stderr; those are asserted at the end of this test.)
+/// At `-vv`, Debug-level records (the noisy ones) stay out of stderr —
+/// the bounded subprocess preview lands in `trace.log` (not stderr), and
+/// `subprocess.log` still holds the unbounded body. Info-level routing
+/// from `-v` still applies at `-vv` (it's a superset), so the "Tracing
+/// to ..." pointer and similar status lines DO appear on stderr; they're
+/// asserted at the end of this test. Guards against a regression that
+/// re-routes the debug stream to stderr and floods the terminal.
#[rstest]
-fn test_vv_log_pipeline_silent_on_stderr(repo: TestRepo) {
+fn test_vv_debug_pipeline_silent_on_stderr(repo: TestRepo) {
// `wt list` runs `git for-each-ref refs/heads/` (captured via `Cmd::run`),
// so its output flows through `log_output` and exercises the split.
// Populate packed-refs with 250 fake branches pointing at HEAD — far more
@@ -393,7 +396,7 @@ fn test_vv_log_pipeline_silent_on_stderr(repo: TestRepo) {
let logs_dir = repo.root_path().join(".git").join("wt/logs");
let trace = fs::read_to_string(logs_dir.join("trace.log")).unwrap();
- let raw = fs::read_to_string(logs_dir.join("output.log")).unwrap();
+ let raw = fs::read_to_string(logs_dir.join("subprocess.log")).unwrap();
// Elision marker belongs to the bounded preview, which now lives in
// trace.log only — never on stderr.
@@ -408,14 +411,14 @@ fn test_vv_log_pipeline_silent_on_stderr(repo: TestRepo) {
);
assert!(
!raw.contains(marker),
- "output.log holds full output and must not contain an elision marker"
+ "subprocess.log holds full output and must not contain an elision marker"
);
// The tail refs only appear in the full log.
let tail_ref = "many-branch-249";
assert!(
raw.contains(tail_ref),
- "output.log should contain the full for-each-ref stdout (last ref)"
+ "subprocess.log should contain the full for-each-ref stdout (last ref)"
);
assert!(
!stderr.contains(tail_ref),
@@ -426,12 +429,12 @@ fn test_vv_log_pipeline_silent_on_stderr(repo: TestRepo) {
"trace.log holds the bounded preview, which is capped before the last ref"
);
- // The full subprocess stdout still lands in output.log, and trace.log
+ // The full subprocess stdout still lands in subprocess.log, and trace.log
// still captures the `$ cmd` / `[wt-trace]` records — confirm both so a
// regression that disables the file sinks fails loudly here too.
assert!(
raw.lines().any(|l| l.contains("refs/heads/many-branch-")),
- "output.log should contain the captured for-each-ref stdout"
+ "subprocess.log should contain the captured for-each-ref stdout"
);
assert!(
trace.contains("[wt-trace]"),
@@ -514,8 +517,8 @@ fn test_rust_log_debug_fallback_without_vv(repo: TestRepo) {
"trace.log should NOT be created without -vv"
);
assert!(
- !logs_dir.join("output.log").exists(),
- "output.log should NOT be created without -vv"
+ !logs_dir.join("subprocess.log").exists(),
+ "subprocess.log should NOT be created without -vv"
);
// Subprocess stdout still reaches stderr via the bounded preview —
@@ -609,8 +612,8 @@ fn test_vv_writes_diagnostic_on_error(mut repo: TestRepo) {
fn test_vv_pointer_handles_split_init(repo: TestRepo) {
let logs_dir = repo.root_path().join(".git").join("wt/logs");
std::fs::create_dir_all(&logs_dir).unwrap();
- // Block output.log open by occupying the path with a directory.
- std::fs::create_dir(logs_dir.join("output.log")).unwrap();
+ // Block subprocess.log open by occupying the path with a directory.
+ std::fs::create_dir(logs_dir.join("subprocess.log")).unwrap();
let output = repo
.wt_command()
@@ -622,11 +625,11 @@ fn test_vv_pointer_handles_split_init(repo: TestRepo) {
assert!(
stderr.contains("Tracing to") && stderr.contains("trace.log"),
- "stderr should point at trace.log even when output.log can't open: {stderr}"
+ "stderr should point at trace.log even when subprocess.log can't open: {stderr}"
);
assert!(
- stderr.contains("output.log unavailable"),
- "stderr should note output.log is unavailable: {stderr}"
+ stderr.contains("subprocess.log unavailable"),
+ "stderr should note subprocess.log is unavailable: {stderr}"
);
assert!(
logs_dir.join("trace.log").exists(),
@@ -635,7 +638,7 @@ fn test_vv_pointer_handles_split_init(repo: TestRepo) {
}
/// With just -v, info-level logging goes to stderr but no log files are written.
-/// `-vv` is the threshold for `trace.log`, `output.log`, and `diagnostic.md`.
+/// `-vv` is the threshold for `trace.log`, `subprocess.log`, and `diagnostic.md`.
#[rstest]
fn test_v_does_not_write_log_files(repo: TestRepo) {
// Run a successful command with just -v
@@ -645,7 +648,7 @@ fn test_v_does_not_write_log_files(repo: TestRepo) {
// None of the -vv diagnostic files should exist with just -v
let wt_logs = repo.root_path().join(".git").join("wt/logs");
- for name in ["diagnostic.md", "trace.log", "output.log"] {
+ for name in ["diagnostic.md", "trace.log", "subprocess.log"] {
assert!(
!wt_logs.join(name).exists(),
"{name} should NOT be created with just -v (requires -vv)"
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index 8c36ff02b..f2f075c93 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -3284,7 +3284,7 @@ for c in "${{COMPREPLY[@]}}"; do echo "${{c%% *}}"; done
// Create a temp file for the redirect target
let tmp_dir = tempfile::tempdir().unwrap();
- let redirect_file = tmp_dir.path().join("output.log");
+ let redirect_file = tmp_dir.path().join("subprocess.log");
let redirect_path = redirect_file.display().to_string();
// Generate wrapper script
diff --git a/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap b/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap
index cf27f43f0..926d02df9 100644
--- a/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap
+++ b/tests/snapshots/integration__integration_tests__diagnostic__diagnostic_file_format.snap
@@ -64,5 +64,5 @@ Project config: _REPO_/.config/wt.toml
<details>
<summary>Raw subprocess output</summary>
-Full captured stdout/stderr is in `_REPO_/.git/wt/logs/output.log` — not inlined because it can be multi-MB.
+Full captured stdout/stderr is in `_REPO_/.git/wt/logs/subprocess.log` — not inlined because it can be multi-MB.
</details>
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
index eaca50bbd..38a489a99 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals.snap
@@ -12,21 +12,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -51,7 +57,7 @@ Usage: wt config approvals [OPTIONS] <COMMAND>
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap
index 34a06c914..976415d3f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals_add.snap
@@ -13,21 +13,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -51,7 +57,7 @@ Usage: wt config approvals add [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap b/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
index 111991736..544de120c 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_approvals_clear.snap
@@ -13,21 +13,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -51,7 +57,7 @@ Usage: wt config approvals clear [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index 36b141194..bf63fad59 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -15,7 +15,6 @@ info:
LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
@@ -57,7 +56,7 @@ Usage: wt config create [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 0b4f210b1..0a38f2057 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -14,7 +14,6 @@ info:
LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
@@ -65,7 +64,7 @@ Usage: wt config [OPTIONS] <COMMAND>
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_plugins.snap b/tests/snapshots/integration__integration_tests__help__help_config_plugins.snap
index 319b01b3c..ddf1ebc0d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_plugins.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_plugins.snap
@@ -12,21 +12,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -58,7 +58,7 @@ Usage: wt config plugins [OPTIONS] <COMMAND>
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex.snap b/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex.snap
index 114d8491a..70e36e08f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex.snap
@@ -13,21 +13,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -58,7 +58,7 @@ Usage: wt config plugins codex [OPTIONS] <COMMAND>[0
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex_install.snap b/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex_install.snap
index bfa0c01c8..bf3e6a17b 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex_install.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_plugins_codex_install.snap
@@ -14,21 +14,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -49,7 +55,7 @@ Usage: wt config plugins codex install [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
index a4c861e9f..a9b707d79 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_shell.snap
@@ -12,21 +12,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -47,7 +53,7 @@ Usage: wt config shell [OPTIONS] <COMMAND>
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_short.snap b/tests/snapshots/integration__integration_tests__help__help_config_short.snap
index 32cfbe0bc..afad9d7f6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_short.snap
@@ -11,21 +11,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -50,7 +56,7 @@ Usage: wt config [OPTIONS] <COMMAND>
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_show.snap b/tests/snapshots/integration__integration_tests__help__help_config_show.snap
index 42f5970b3..2d04f5530 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_show.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_show.snap
@@ -12,21 +12,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -60,7 +66,7 @@ Usage: wt config show [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state.snap b/tests/snapshots/integration__integration_tests__help__help_config_state.snap
index e9e48aa4f..b7534e3eb 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state.snap
@@ -12,21 +12,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -58,7 +64,7 @@ Usage: wt config state [OPTIONS] <COMMAND>
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
index 1e32f2697..bd3c0a54a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_ci_status.snap
@@ -13,19 +13,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -60,7 +62,7 @@ Usage: wt config state ci-status [OPTIONS] [COMMAND]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
index f46b5bd1c..80ba2f394 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_clear.snap
@@ -13,19 +13,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -52,7 +54,7 @@ Usage: wt config state clear [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap
index 0e7a9a3a4..afff857c4 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_default_branch.snap
@@ -13,21 +13,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -53,7 +59,7 @@ Usage: wt config state default-branch [OPTIONS] [COMM
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
index 29a3249d5..fca34ae89 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
@@ -13,19 +13,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -57,7 +59,7 @@ Usage: wt config state get [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
index 3c5e96107..3758304db 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_logs.snap
@@ -16,7 +16,6 @@ info:
LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
@@ -63,7 +62,7 @@ Usage: wt config state logs [OPTIONS] [COMMAND]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
@@ -102,13 +101,13 @@ All post-* hooks (post-start, post-switch, post-commit, post-merge) run
Diagnostic files
- File Created when
- ───────────── ────────────────
- trace.log Running with -vv
- output.log Running with -vv
- diagnostic.md Running with -vv
+ File Created when
+ ────────────── ────────────────
+ trace.log Running with -vv
+ subprocess.log Running with -vv
+ diagnostic.md Running with -vv
-trace.log receives the noisy log::* pipeline at -vv — commands, [wt-trace] records, bounded subprocess previews — so stderr stays readable (user-facing status messages still print as normal). output.log holds the raw uncapped subprocess stdout/stderr bodies. diagnostic.md is a markdown report for pasting into GitHub issues; it inlines trace.log but not output.log, which can be multi-MB. All three are overwritten on each -vv run.
+trace.log captures debug-level records at -vv — commands, [wt-trace] records, bounded subprocess previews. subprocess.log holds the raw uncapped subprocess stdout/stderr bodies. diagnostic.md is a markdown bug-report bundle that inlines trace.log; wt prints a gh gist create command pointing at it. All three are overwritten on each -vv run.
Location
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap
index 8d01f219e..549b39f97 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_marker.snap
@@ -13,22 +13,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -58,7 +63,7 @@ Usage: wt config state marker [OPTIONS] [COMMAND]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap
index f3ed1b1f1..c61adc40f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_previous_branch.snap
@@ -13,21 +13,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -53,7 +59,7 @@ Usage: wt config state previous-branch [OPTIONS] [COM
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index 1694cba4e..5fcb392f5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -11,19 +11,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -73,7 +75,7 @@ Usage: wt list [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
index 238c0e49d..14187fb82 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
@@ -11,9 +11,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
@@ -21,9 +21,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -75,8 +77,8 @@ Usage: wt list [OPTIONS]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output;
- -vv: debug logs + diagnostic report + trace.log/output.log under
+ Verbose output (-v: info logs + hook/alias template variables on
+ stderr; -vv: also debug logs and raw subprocess output written to
.git/wt/logs/)
-y, --yes
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_short.snap b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
index f52ed6848..817187d2a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
@@ -11,21 +11,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -49,7 +55,7 @@ Usage: wt list [OPTIONS]
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap
index 54a9bfedd..8007d3025 100644
--- a/tests/snapshots/integration__integration_tests__help__help_md_merge.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_md_merge.snap
@@ -11,21 +11,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -92,7 +98,7 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_md_root.snap b/tests/snapshots/integration__integration_tests__help__help_md_root.snap
index b34f98e18..cf4ccd9e0 100644
--- a/tests/snapshots/integration__integration_tests__help__help_md_root.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_md_root.snap
@@ -10,21 +10,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -57,7 +63,7 @@ Global Options:
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
index ee2df5b7d..5ce4f51f9 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge_long.snap
@@ -11,21 +11,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -92,7 +98,7 @@ Usage: wt merge [OPTIONS] [TARGET]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap b/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
index aefd9867f..9ca6298b1 100644
--- a/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_merge_short.snap
@@ -11,21 +11,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -53,7 +59,7 @@ Usage: wt merge [OPTIONS] [TARGET]
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_no_args.snap b/tests/snapshots/integration__integration_tests__help__help_no_args.snap
index eb4fd5654..8560afee3 100644
--- a/tests/snapshots/integration__integration_tests__help__help_no_args.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_no_args.snap
@@ -9,21 +9,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -48,7 +54,7 @@ Usage: wt [OPTIONS] [COMMAND]
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
index 49294c517..a2365a102 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_long.snap
@@ -14,7 +14,6 @@ info:
LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
@@ -88,7 +87,7 @@ Usage: wt remove [OPTIONS] [BRANCHES]...
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
index e7bc42aa9..b5dc70866 100644
--- a/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_remove_short.snap
@@ -11,21 +11,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -51,7 +57,7 @@ Usage: wt remove [OPTIONS] [BRANCHES]...
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_long.snap b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
index f2d9cc7d6..0ca4fe79a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_long.snap
@@ -10,21 +10,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -57,7 +63,7 @@ Usage: wt [OPTIONS] [COMMAND]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_root_short.snap b/tests/snapshots/integration__integration_tests__help__help_root_short.snap
index 9afb9abbe..5c0e5c64d 100644
--- a/tests/snapshots/integration__integration_tests__help__help_root_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_root_short.snap
@@ -10,21 +10,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -49,7 +55,7 @@ Usage: wt [OPTIONS] [COMMAND]
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_long.snap b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
index 84667ee85..06414d2f6 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
@@ -11,20 +11,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -67,7 +68,7 @@ Usage: wt step [OPTIONS] <COMMAND>
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_promote.snap b/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
index 63dba4565..9cf606202 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_promote.snap
@@ -12,21 +12,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -55,7 +61,7 @@ Usage: wt step promote [OPTIONS] [BRANCH]
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_short.snap b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
index 9a500c524..75da9eee5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_short.snap
@@ -11,20 +11,21 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- LLVM_PROFILE_FILE: /var/folders/v3/8k5q0_6j3_q6gl4h8czr66sh0000gn/T/wt-test-profraw/cov-%m_%p.profraw
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -59,7 +60,7 @@ Usage: wt step [OPTIONS] <COMMAND>
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
index b7b34f023..1a6722dc0 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -14,7 +14,6 @@ info:
LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
@@ -118,7 +117,7 @@ Usage: wt switch [OPTIONS] [BRANCH] [--
User config file path
-v, --verbose...
- Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes
Skip approval prompts
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap b/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
index 3e148d1d6..eea5ff2d4 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_short.snap
@@ -11,21 +11,27 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
NO_COLOR: ""
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
- WORKTRUNK_APPROVALS_PATH: /nonexistent/wt/approvals.toml
- WORKTRUNK_CONFIG_PATH: /nonexistent/wt/config.toml
- WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.toml
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
---
success: true
exit_code: 0
@@ -57,7 +63,7 @@ Usage: wt switch [OPTIONS] [BRANCH] [--
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap
index 66b6ac085..71d9ad364 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_help_includes_aliases.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -38,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -81,7 +82,7 @@ Run wt config alias show for the full definitions.
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap
index bbff22ded..7be126a9f 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_list_no_aliases.snap
@@ -28,7 +28,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +36,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -75,7 +76,7 @@ Usage: wt step [OPTIONS] <COMMAND>
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap b/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap
index f3f9cb4ad..be9dd9686 100644
--- a/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap
+++ b/tests/snapshots/integration__integration_tests__step_alias__step_list_with_aliases.snap
@@ -28,7 +28,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +36,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -80,7 +81,7 @@ Run wt config alias show for the full definitions.
Global Options:
-C <path> Working directory for this command
--config <path> User config file path
- -v, --verbose... Verbose output (-v: info logs + hook/alias template variable & output; -vv: debug logs + diagnostic report + trace.log/output.log under .git/wt/logs/)
+ -v, --verbose... Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/)
-y, --yes Skip approval prompts
----- stderr -----