[john-the-dev]

What changed

sync-workspace now resolves the per-host settings/access snapshot source with claude-sutando-config-dir, the same canonical config path that startup exports to the Claude core and channel bridges.

Previously _snapshot_per_host_config used claude-home-path. In launchd/cron environments without CLAUDE_CONFIG_DIR, that helper falls back to legacy ~/.claude, so a stale Discord access.json could overwrite the vault backup and later restore an owner without their owner tier.

This is the focused corrective follow-up to the drift detector in #2277.

Before / after evidence

Parent 649af1f with the regression added but before the implementation change:

$ bash tests/sync-workspace.test.sh
==== Test 2b: per-host config snapshot resolves canonical Claude config without env ====
  FAIL: snapshot used legacy HOME instead of canonical Claude config
{"allowFrom":["member-stale"],"tierMap":{"member-stale":"team"}}
  INFO: push-only output: claude-home-path: $CLAUDE_CONFIG_DIR not set — falling back to ~/.claude/.

HEAD 23f2867:

$ bash tests/sync-workspace.test.sh
==== Test 2b: per-host config snapshot resolves canonical Claude config without env ====
  OK: snapshot preserved live owner tierMap without CLAUDE_CONFIG_DIR
...
Total: 89 — pass: 89, fail: 0

Additional checks:

$ bash -n scripts/sync-workspace.sh tests/sync-workspace.test.sh
# exit 0

$ git diff --check
# exit 0

Live post-restart round trip

Tested on the affected host after restarting the Discord bridge:

Discord bridge ready: Rui Bot#5744
[msg] #DM @immaculate_possum_27099: sutando access test
[task-write] wrote task-1785161360808.txt (@immaculate_possum_27099, #DM, tier=owner)
Replied: Live test passed ✅ After the bridge restart, your DM was received as `access_tier: owner` and the reply path is working.

The live access file retained owner ID 1358841611580080168 as owner through the restart.

Scope / risk

Single concern: snapshot source resolution plus its regression. No bridge behavior, prompts, restore semantics, or unrelated sync logic changed. The added lines contain no host-specific paths or inline path fallbacks.

[github-actions]

Coverage Gate

✅ No Python changes — nothing to gate (bar: 95% on changed lines).

[qingyun-wu]

Approval signal for current head 23f286753715db9ba0090a696554da03205a8924.

Reviewed the new sync-workspace snapshot fix. Switching the per-host settings/access snapshot from claude-home-path to claude-sutando-config-dir matches the startup-exported canonical Claude config directory and avoids copying stale legacy ~/.claude access state from launchd/cron environments where CLAUDE_CONFIG_DIR is absent. The snapshot remains intentionally narrow: settings.json and channel access.json only, with channel .env token files still excluded.

Focused verification in an isolated /private/tmp checkout:

• git diff --check origin/main...HEAD - PASS
• bash -n scripts/sync-workspace.sh tests/sync-workspace.test.sh scripts/sutando-config.sh - PASS
• bash tests/sync-workspace.test.sh - PASS (89 checks)
• bash tests/sutando-config-runtime.test.sh - PASS (11 checks)
• bash tests/sutando-config-claude-home-path.test.sh - PASS (11 checks)

GitHub CI is green on this head. No blocking findings from this pass.
Reviewed by Qingyun's Personal Codex.

[qingyun-wu]

Approval signal for current head 551ada579d619c10d4dcffae8a2dcce9d85a64b1.

Re-reviewed after the main refresh. The PR-owned diff remains the focused sync-workspace snapshot fix: per-host settings/access backups now resolve the canonical Claude config directory from Sutando config instead of falling back to legacy ~/.claude when launchd/cron lacks CLAUDE_CONFIG_DIR. The merge-main refresh brings in #2280 but does not change the snapshot behavior.

Focused verification in an isolated /private/tmp checkout passed: git diff --check origin/main...HEAD; shell syntax for scripts/sync-workspace.sh, tests/sync-workspace.test.sh, and scripts/sutando-config.sh; bash tests/sync-workspace.test.sh (89/89); bash tests/sutando-config-runtime.test.sh (11/11); and bash tests/sutando-config-claude-home-path.test.sh (11/11). GitHub CI is green on this head.

Reviewed by Qingyun's Personal Codex.

[qingyun-wu]

Current-head re-review on 551ada57.

The main refresh preserves the functional commit exactly (git range-diff is unchanged). The full current diff still resolves the snapshot source through claude-sutando-config-dir, matching startup’s canonical Claude config rather than a launchd/cron process’s stale legacy home, and the regression exercises the missing-ambient-env path.

Exact-head verification passed: tests/sync-workspace.test.sh (89/89), shell syntax, git diff --check, and the repository hardcoded-path review gate. GitHub CI and CLA are green. Worst-case disruption—backing up stale access/tier state and later restoring it over the live owner configuration—is directly covered and mitigated without changing the vault carrier set or making snapshot failures fatal.

Ready to merge from this review.

Reviewed by Qingyun's Personal Codex.

[sonichi]

Approving on the owner's explicit instruction. Verified the fix is correct + needed on this machine: without CLAUDE_CONFIG_DIR (launchd/cron), the old claude-home-path resolves to legacy ~/.claude, where a stale Jun-8 access.json (2.3KB) sits vs the live 8.3KB canonical one — so the snapshot could back up stale access-control and roll it back on restore. This fix reads the canonical config-dir. Tested (Test 2b).

[github-actions]

@cla-assistant check

[qingyun-wu]

Current-head approval signal for 079867ae32e94cca7588b5da2f19e5c89a475e3b.

The main refresh leaves the PR-owned change focused on the canonical Claude config snapshot: sync-workspace.sh resolves claude-sutando-config-dir for the per-host backup instead of falling back to legacy ~/.claude when launchd/cron lacks CLAUDE_CONFIG_DIR. The added regression still covers that exact missing-env path.

Focused verification passed in an isolated /private/tmp checkout: git diff --check origin/main...HEAD, shell syntax for scripts/sync-workspace.sh, tests/sync-workspace.test.sh, and scripts/sutando-config.sh, bash tests/sync-workspace.test.sh (89/89), bash tests/sutando-config-runtime.test.sh (11/11), and bash tests/sutando-config-claude-home-path.test.sh (11/11). GitHub CI is green on this head. No blocking findings.

Reviewed by Qingyun's Personal Codex.