Skip to content

docs(hosts): state the kept config roots as an exception to the env scrub - #1165

Merged
Birfy merged 1 commit into
mainfrom
agent/1098-env-scrub-exception
Nov 19, 2026
Merged

Birfy merged 1 commit into
mainfrom
agent/1098-env-scrub-exception

Conversation

@HugoXK

@HugoXK HugoXK commented Nov 19, 2026 •

Copy link
Copy Markdown
Collaborator

Fixes #1098

What changed

docs/dsh-super-agent.md:110-116 and the #1082 release note
(changelog.d/1082-host-env-scrub.md:2-12) said the scrub drops every
session marker and then, two lines later, that four config roots are kept — with
XDG_CONFIG_HOME named in both halves, so the first clause read as dropping a
variable the second one kept.

Both texts now state the exception in the first clause, over the marker list,
instead of after it:

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 …

The wildcards stay where they do the work — they are what enforces the drop for
CLAUDE*, DSH_* and CODEX* — but they no longer appear next to a "kept"
clause without that explicit exception. New fragment
changelog.d/1098-env-scrub-exception.md (Fixed) records the correction.

Before (main f2eda2e)

docs/dsh-super-agent.md:110-113:

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).

changelog.d/1082-host-env-scrub.md:2-5:

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, …

After

Both files: the first clause names the four kept roots as the exception, then the
marker list follows. The page keeps the DETACHED_KEEP_VARS constant next to
the SESSION_MARKERS name in the following sentence, so the two halves stay
parallel. No other sentence changed meaning.

Reproduce

sed -n '110,118p' docs/dsh-super-agent.md
sed -n '1,13p' changelog.d/1082-host-env-scrub.md
grep -n -E 'except the four host config roots|drops every' docs/dsh-super-agent.md changelog.d/1082-host-env-scrub.md

The last command returns the exception line in both files and no drops every.

Verification at the tip

Tip SHA: d56c4f0

Ran:

  • python3 -m tools.changelog_fragments check → 78 changelog fragment(s) OK
  • python3 -m tools.gen_api_docs --check → docs/api.md is up to date
  • python3 -m pytest tests/test_site_navigation.py tests/test_repo_hygiene.py → 4 passed

Not run:

  • tests/test_docs_links.py — ModuleNotFoundError: No module named 'markdown' in this clone
  • mkdocs build --strict — no mkdocs in this clone; CI build is the real line

Scope

docs/dsh-super-agent.md + changelog.d/1082-host-env-scrub.md + one Fixed
fragment. No code, no test (the issue says none should be added), no
surface_common.py, no behaviour change.

No UI surface: docs-only prose change, no code path touched; the page is
docs/dsh-super-agent.md (mkdocs nav: "dsh-super-agent — the zero-code
composition"), rendered by CI build.

Written-by: AgentDescent Dev-4
Bot: AgentDescent Dev-4

@HugoXK HugoXK added documentation Improvements or additions to documentation area:docs Documentation site (docs/, mkdocs.yml) and README labels Nov 19, 2026
@HugoXK
HugoXK requested a review from Birfy November 19, 2026 02:41
…crub

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.
@Birfy

Birfy commented Nov 19, 2026

Copy link
Copy Markdown
Collaborator

Review (Birfy)

Tip SHA: d56c4f0
Ran:

  • .github/scripts/risk_gate.py --repo ThinkFlowLab/agentdescent --pr 1165 (fresh clone of main f2eda2e) → low risk (docs + changelog fragments, 42 lines / 3 files)
  • git diff origin/main...d56c4f0: docs/dsh-super-agent.md, changelog.d/1082-host-env-scrub.md (unreleased fragment: #963 remainder: write-dir confinement, per-Ticket budget caps, host MCP-config scrub #1082 is not in CHANGELOG.md yet), new changelog.d/1098-env-scrub-exception.md
  • checked the text against code: agentdescent/surface_common.py:297 DETACHED_KEEP_VARS = (CLAUDE_CONFIG_DIR, CODEX_HOME, DSH_HOME, XDG_CONFIG_HOME), and the scrub keeps a name in that tuple before testing is_session_marker (:330) — matches the new "drops the markers except the four config roots" wording
  • python -m tools.changelog_fragments check at this tip → 78 fragment(s) OK
  • CI at this tip: build (mkdocs), otel-wire, test (3.9–3.13), reviewed tip, risk tier SUCCESS; deploy skipped
    Not run:
  • mkdocs build --strict locally — the CI build job is green at this tip
    Findings:
  • Meets docs(hosts): the env-scrub note says it drops "every" session marker, then keeps two of them #1098: the exception is stated in the first clause in both texts; no behaviour change.
    Verdict: PASS

@Birfy
Birfy merged commit 264f1a3 into main Nov 19, 2026
10 checks passed
@Birfy
Birfy deleted the agent/1098-env-scrub-exception branch November 19, 2026 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:docs Documentation site (docs/, mkdocs.yml) and README documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docs(hosts): the env-scrub note says it drops "every" session marker, then keeps two of them

2 participants