From d56c4f0e09946a911694967d9b7d9025759bd3ec Mon Sep 17 00:00:00 2001 From: HugoXK <87640074+HugoXK@users.noreply.github.com> Date: Thu, 19 Nov 2026 01:47:13 +0000 Subject: [PATCH] docs(hosts): state the kept config roots as an exception to the env scrub Closes #1098. The env-scrub note said it drops "every" session marker and then kept two of them: CLAUDE_CONFIG_DIR and XDG_CONFIG_HOME are literal SESSION_MARKERS entries and DETACHED_KEEP_VARS keeps them (plus CODEX_HOME/DSH_HOME, matched by the CODEX_/DSH_ prefixes). Both texts now name the four kept host config roots as an exception to the marker list before the wildcard list appears, so the first clause cannot be read as dropping them. docs/dsh-super-agent.md and changelog.d/1082-host-env-scrub.md only; one Fixed fragment for this change. No code, no test, no behaviour. --- changelog.d/1082-host-env-scrub.md | 19 ++++++++++--------- changelog.d/1098-env-scrub-exception.md | 6 ++++++ docs/dsh-super-agent.md | 17 +++++++++-------- 3 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 changelog.d/1098-env-scrub-exception.md diff --git a/changelog.d/1082-host-env-scrub.md b/changelog.d/1082-host-env-scrub.md index a15f05e1..91c88fce 100644 --- a/changelog.d/1082-host-env-scrub.md +++ b/changelog.d/1082-host-env-scrub.md @@ -1,12 +1,13 @@ Fixed A detached run no longer inherits the worker's own session: `runstore.launch` -drops every `SESSION_MARKERS` variable -- `DSH_*`, `CLAUDE*`, `CODEX*`, `MCP_*`, -the OpenCode config carriers and `XDG_CONFIG_HOME` -- before it starts the -grandchild, so the host worker's session identity and MCP server configuration -stay with the host while the credentials and `PATH` the run needs still pass -through (#1082). The list is the one the candidate worker already dropped +drops the host-session markers it lists, except the four host config roots it +keeps (`CLAUDE_CONFIG_DIR`, `CODEX_HOME`, `DSH_HOME`, `XDG_CONFIG_HOME`), before +it starts the grandchild, so the host worker's session identity and MCP server +configuration stay with the host while the credentials and `PATH` the run needs +still pass through (#1082). The marker list is `SESSION_MARKERS` (`DSH_*`, +`CLAUDE*`, `CODEX*`, `MCP_*`, the OpenCode config carriers and +`XDG_CONFIG_HOME`), the one the candidate worker already dropped (`agentdescent.agents.worker_env`); it used to be a second, shorter copy, and -five of its eleven entries crossed the scrub. The host's config/home -directories (`CLAUDE_CONFIG_DIR`, `CODEX_HOME`, `DSH_HOME`, `XDG_CONFIG_HOME`) -are kept, because they name configuration rather than session and the run -resolves a host's real home from them (#1082). +five of its eleven entries crossed the scrub. Those four roots name +configuration rather than session, and the run resolves a host's real home from +them (#1082). diff --git a/changelog.d/1098-env-scrub-exception.md b/changelog.d/1098-env-scrub-exception.md new file mode 100644 index 00000000..166166c8 --- /dev/null +++ b/changelog.d/1098-env-scrub-exception.md @@ -0,0 +1,6 @@ +Fixed +The env-scrub note no longer says it drops "every" session marker and then keeps +some of them: `docs/dsh-super-agent.md` and the #1082 release note now name the +four host config roots (`CLAUDE_CONFIG_DIR`, `CODEX_HOME`, `DSH_HOME`, +`XDG_CONFIG_HOME`) as an exception to the marker list before that list appears, +so the first clause cannot be read as dropping them (#1098). diff --git a/docs/dsh-super-agent.md b/docs/dsh-super-agent.md index 1faecb35..9aa4fdbc 100644 --- a/docs/dsh-super-agent.md +++ b/docs/dsh-super-agent.md @@ -108,14 +108,15 @@ your tree, under the operator's write allowlist). the Ticket. - `plan` is the budget line: it estimates cost without executing. Read it before `start`, and put the number in the Ticket. -- A detached run no longer inherits the worker session: `launch` drops every - host-session marker (`SESSION_MARKERS`: `DSH_*`, `CLAUDE*`, `CODEX*`, `MCP_*`, - the OpenCode config carriers, `XDG_CONFIG_HOME`) before it starts the - grandchild, so the worker's session identity and MCP config stay with the - host while the API keys the run needs are passed through (`#1082`). The list - is the one the candidate worker drops, not a second copy of it. The host's - config/home directories (`DETACHED_KEEP_VARS`: `CLAUDE_CONFIG_DIR`, - `CODEX_HOME`, `DSH_HOME`, `XDG_CONFIG_HOME`) are kept: they name +- A detached run no longer inherits the worker session: `launch` drops the + host-session markers it lists, except the four host config roots it keeps + (`DETACHED_KEEP_VARS`: `CLAUDE_CONFIG_DIR`, `CODEX_HOME`, `DSH_HOME`, + `XDG_CONFIG_HOME`), before it starts the grandchild, so the worker's session + identity and MCP config stay with the host while the API keys the run needs + are passed through (`#1082`). + The marker list is `SESSION_MARKERS`: `DSH_*`, `CLAUDE*`, `CODEX*`, `MCP_*`, + the OpenCode config carriers and `XDG_CONFIG_HOME`; it is the one the + candidate worker drops, not a second copy of it. Those four roots name configuration, not session, and this run resolves a host's real home from them for `isolate: false` workers and for `agentdescent start` from a terminal.