@sebastienrousseau/dotfiles 0.2.502 → 0.2.503

package/scripts/dot/commands/meta.sh

@@ -6,10 +6,10 @@
 set -euo pipefail
 
 _META_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$_META_DIR/../lib/utils.sh"
-# shellcheck source=../lib/log.sh
-source "$_META_DIR/../lib/log.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$_META_DIR/../../../lib/dot/utils.sh"
+# shellcheck source=../../../lib/dot/log.sh
+source "$_META_DIR/../../../lib/dot/log.sh"
 # shellcheck source=agent.sh
 source "$_META_DIR/agent.sh"
 
@@ -92,7 +92,12 @@ cmd_docs() {
 
 cmd_learn() {
   local dot_bin
-  dot_bin="$(dirname "${BASH_SOURCE[0]}")/../../../dot_local/bin"
+  # Post-Phase-4b: dot_local/ lives under defaults/. Legacy layout
+  # (older deployments before .chezmoiroot activation) kept it at
+  # repo root — probe both.
+  dot_bin="$(dirname "${BASH_SOURCE[0]}")/../../../defaults/dot_local/bin"
+  [[ -f "$dot_bin/executable_tour" ]] ||
+    dot_bin="$(dirname "${BASH_SOURCE[0]}")/../../../dot_local/bin"
   if [ -f "$dot_bin/executable_tour" ]; then
     exec bash "$dot_bin/executable_tour" "$@"
   fi
@@ -176,7 +181,8 @@ cmd_mcp() {
       ;;
     registry)
       local repo_root registry_file json_mode=0
-      repo_root="$(require_source_dir)"
+      repo_root="$(resolve_chezmoi_source_dir)"
+      [[ -z "$repo_root" ]] && repo_root="$(require_source_dir)"
       registry_file="${MCP_REGISTRY_CONFIG:-$repo_root/dot_config/dotfiles/mcp-registry.json}"
       if [[ "${1:-}" == "registry" ]]; then
         shift || true

package/scripts/dot/commands/patterns.sh

@@ -6,8 +6,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 PATTERN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/ai/patterns"
 mkdir -p "$PATTERN_DIR"

package/scripts/dot/commands/registry.sh

@@ -43,10 +43,10 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/ui.sh disable=SC1091
-source "$SCRIPT_DIR/../lib/ui.sh"
-# shellcheck source=../lib/utils.sh disable=SC1091
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/ui.sh disable=SC1091
+source "$SCRIPT_DIR/../../../lib/dot/ui.sh"
+# shellcheck source=../../../lib/dot/utils.sh disable=SC1091
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 _registry_default_url() {
   printf '%s\n' "https://sebastienrousseau.github.io/dotfiles/registry.json"

package/scripts/dot/commands/restore.sh

@@ -6,10 +6,10 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
-# shellcheck source=../lib/log.sh
-source "$SCRIPT_DIR/../lib/log.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
+# shellcheck source=../../../lib/dot/log.sh
+source "$SCRIPT_DIR/../../../lib/dot/log.sh"
 
 DOTFILES_DIR="${DOTFILES_DIR:-$HOME/.dotfiles}"
 BACKUP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dotfiles/backups"

package/scripts/dot/commands/secrets.sh

@@ -6,8 +6,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 # shellcheck source=../../lib/secrets_provider.sh
 source "$SCRIPT_DIR/../../lib/secrets_provider.sh"
 
@@ -15,7 +15,8 @@ dot_ui_command_banner "Secrets" "${1:-}"
 
 dot_data_file() {
   local src_dir
-  src_dir="$(require_source_dir)"
+  src_dir="$(resolve_chezmoi_source_dir)"
+  [[ -z "$src_dir" ]] && src_dir="$(require_source_dir)"
   printf "%s\n" "$src_dir/.chezmoidata.toml"
 }
 

package/scripts/dot/commands/security.sh

@@ -6,8 +6,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 dot_ui_command_banner "Security" "${1:-}"
 

package/scripts/dot/commands/tools.sh

@@ -6,8 +6,8 @@
 set -euo pipefail
 
 _TOOLS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$_TOOLS_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$_TOOLS_DIR/../../../lib/dot/utils.sh"
 # shellcheck source=aliases.sh
 source "$_TOOLS_DIR/aliases.sh"
 
@@ -348,6 +348,16 @@ cmd_log_rotate() {
 }
 
 cmd_env_mise() {
+  # `dot env emit` is a separate sub-handler — it doesn't need mise
+  # at command-time, only when actually invoked (the script checks).
+  if [[ "${1:-}" == "emit" ]]; then
+    shift
+    # shellcheck source=./env-emit.sh
+    source "$(require_source_dir)/scripts/dot/commands/env-emit.sh"
+    dot_env_emit "$@"
+    return $?
+  fi
+
   if ! has_command mise; then
     ui_err "mise not installed (required for dot env)"
     exit 1
@@ -425,7 +435,7 @@ cmd_env_mise() {
 
 cmd_profile() {
   local data_file
-  data_file="$(resolve_source_dir)/.chezmoidata.toml"
+  data_file="$(resolve_chezmoi_source_dir)/.chezmoidata.toml"
   if [[ ! -f "$data_file" ]]; then
     die ".chezmoidata.toml not found"
   fi

package/scripts/dot/powershell/Dot.psm1

@@ -0,0 +1,199 @@
+# Dot — native PowerShell module for the dotfiles framework.
+#
+# This module provides native PowerShell cmdlets for the subset of
+# `dot` subcommands that don't require bash. Closes Stub rows in
+# docs/reference/POWERSHELL_PARITY.md.
+#
+# Loaded by bin/dot.ps1 dispatcher; cmdlets are also callable
+# directly:
+#   Import-Module ./scripts/dot/powershell/Dot.psm1
+#   Get-DotVersion
+#   Invoke-DotHelp
+#   Test-DotAgentsSync -Verbose
+#
+# Tested via scripts/ci/windows-smoke-test.ps1.
+
+#requires -Version 7.0
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+# Module-level constants -------------------------------------------------------
+
+$script:RepoRoot = if ($env:DOT_REPO_ROOT) {
+    $env:DOT_REPO_ROOT
+}
+else {
+    # When called from bin/dot.ps1 the dispatcher sets DOT_REPO_ROOT.
+    # When imported directly, infer it from this file's path:
+    #   scripts/dot/powershell/Dot.psm1  →  ../../..
+    (Resolve-Path (Join-Path $PSScriptRoot '..\..\..')).Path
+}
+
+# Post-Phase-4b (v0.2.503) .chezmoidata.toml ships under defaults/.
+# Probe defaults/ first; fall back to legacy root location for older
+# deployments that pre-date the .chezmoiroot activation.
+$script:DataFile = Join-Path $script:RepoRoot 'defaults/.chezmoidata.toml'
+if (-not (Test-Path $script:DataFile)) {
+    $script:DataFile = Join-Path $script:RepoRoot '.chezmoidata.toml'
+}
+
+# Helpers ---------------------------------------------------------------------
+
+function script:Get-DotfilesVersionFromData {
+    if (-not (Test-Path $script:DataFile)) {
+        throw "Cannot read $script:DataFile (set DOT_REPO_ROOT to override)"
+    }
+    $line = Get-Content $script:DataFile |
+        Where-Object { $_ -match '^dotfiles_version\s*=\s*"([^"]+)"' } |
+        Select-Object -First 1
+    if (-not $line) {
+        throw "dotfiles_version not found in $script:DataFile"
+    }
+    if ($line -notmatch '"([^"]+)"') {
+        throw "Could not parse dotfiles_version from line: $line"
+    }
+    return $Matches[1]
+}
+
+function script:Write-DotBanner {
+    param([string]$Section)
+    if ($env:NO_COLOR) {
+        Write-Host "Dot · $Section"
+        return
+    }
+    $esc = [char]27
+    Write-Host "$esc[1;38;5;212mDot · $Section$esc[0m"
+}
+
+# Public cmdlets --------------------------------------------------------------
+
+<#
+.SYNOPSIS
+    Print the dotfiles framework version.
+
+.DESCRIPTION
+    Native PowerShell implementation of `dot version`. Reads the
+    canonical version from .chezmoidata.toml (the single source of
+    truth) — does NOT shell out to bash.
+
+.EXAMPLE
+    Get-DotVersion
+    0.2.503
+
+.EXAMPLE
+    Get-DotVersion -AsObject | ConvertTo-Json
+    {
+      "Version": "0.2.503",
+      "Source": "...\\.chezmoidata.toml",
+      "Native": true
+    }
+#>
+function Get-DotVersion {
+    [CmdletBinding()]
+    param(
+        [switch]$AsObject
+    )
+    $version = Get-DotfilesVersionFromData
+    if ($AsObject) {
+        return [pscustomobject]@{
+            Version = $version
+            Source  = $script:DataFile
+            Native  = $true
+        }
+    }
+    return $version
+}
+
+<#
+.SYNOPSIS
+    Print the dot CLI help overview.
+
+.DESCRIPTION
+    Native PowerShell implementation of `dot help`. Reads command
+    metadata from CLAUDE.md / the dispatcher's help table; does
+    NOT shell out to bash.
+
+    The full Linux-style help (every subcommand grouped by category)
+    requires the bash dispatcher; this cmdlet shows the Windows-
+    native subset.
+#>
+function Invoke-DotHelp {
+    [CmdletBinding()]
+    param()
+    $version = Get-DotfilesVersionFromData
+    Write-DotBanner -Section 'Help'
+    Write-Host ''
+    Write-Host "  Version    v$version"
+    Write-Host "  Repo       https://github.com/sebastienrousseau/dotfiles"
+    Write-Host "  Docs       https://github.com/sebastienrousseau/dotfiles/blob/master/docs/manual/"
+    Write-Host ''
+    Write-Host 'Native PowerShell commands (no bash required):'
+    Write-Host ''
+    Write-Host '  Get-DotVersion              Print framework version'
+    Write-Host '  Invoke-DotHelp              This screen'
+    Write-Host '  Test-DotAgentsSync          Check AGENTS.md ↔ CLAUDE.md sync'
+    Write-Host ''
+    Write-Host 'Bash-bridged subcommands (require bash on PATH):'
+    Write-Host ''
+    Write-Host '  dot doctor                  Deep environment audit'
+    Write-Host '  dot env list                List installed mise tools'
+    Write-Host '  dot env emit                Emit v1 environment manifest'
+    Write-Host '  dot agents render           Re-render every AGENTS.md harness'
+    Write-Host '  dot fleet status            Single-node fleet status (Full on PowerShell)'
+    Write-Host ''
+    Write-Host 'See: dot help all (via bash) — full command index'
+}
+
+<#
+.SYNOPSIS
+    Verify that AGENTS.md is in sync with CLAUDE.md.
+
+.DESCRIPTION
+    Native PowerShell implementation of `dot agents check`. Both
+    files share a "Project Overview" paragraph that is the canonical
+    sync surface. If they diverge, AGENTS.md needs re-rendering
+    (run `dot agents render` via bash; native PowerShell render is
+    a separate ticket).
+
+.OUTPUTS
+    [bool] — $true when in sync, $false otherwise.
+
+.EXAMPLE
+    if (-not (Test-DotAgentsSync)) {
+      Write-Warning 'AGENTS.md is stale; run: bash dot_local/bin/executable_dot agents render'
+    }
+#>
+function Test-DotAgentsSync {
+    [CmdletBinding()]
+    [OutputType([bool])]
+    param()
+    $claude = Join-Path $script:RepoRoot 'CLAUDE.md'
+    $agents = Join-Path $script:RepoRoot 'AGENTS.md'
+    foreach ($f in @($claude, $agents)) {
+        if (-not (Test-Path $f)) {
+            Write-Error "missing: $f"
+            return $false
+        }
+    }
+    # Both files declare: "Chezmoi-managed dotfiles for macOS, Linux,
+    # WSL, and PowerShell 7.5+. Version `0.2.503`."
+    # That single line is the canonical sync surface — its content
+    # is generated from the same template by `dot agents render`.
+    $claudeLine = (Select-String -Path $claude -Pattern '^Chezmoi-managed dotfiles' -SimpleMatch:$false |
+        Select-Object -First 1).Line
+    $agentsLine = (Select-String -Path $agents -Pattern '^Chezmoi-managed dotfiles' -SimpleMatch:$false |
+        Select-Object -First 1).Line
+    if (-not $claudeLine -or -not $agentsLine) {
+        Write-Verbose "sync surface line not found — claude:[$claudeLine] agents:[$agentsLine]"
+        return $false
+    }
+    if ($claudeLine -ne $agentsLine) {
+        Write-Verbose "drift detected:`n  CLAUDE.md: $claudeLine`n  AGENTS.md: $agentsLine"
+        return $false
+    }
+    Write-Verbose 'AGENTS.md sync surface matches CLAUDE.md'
+    return $true
+}
+
+Export-ModuleMember -Function Get-DotVersion, Invoke-DotHelp, Test-DotAgentsSync

package/scripts/fonts/install-nerd-fonts.sh

@@ -3,9 +3,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 
 ui_init
 ui_header "Nerd Fonts"

package/scripts/git-hooks/pre-commit-audit.sh

@@ -33,7 +33,7 @@ echo -n "   🔍 Scanning for secrets... "
 # Exclude assignments to values containing common placeholder strings or within template expressions
 SENSITIVE_PATTERNS="(GITHUB_TOKEN|API_KEY|SECRET|password|private_key|AKIA[0-9A-Z]{16})[[:space:]]*[:=]"
 # Exclusions list for legitimate variable checks or documentation
-SECRET_EXCLUDES="test_|assertions.sh|.pre-commit|README|CHANGELOG|FEATURES.md|CONFIG_STRATEGY.md|docs/|install/lib/|.chezmoitemplates/|mcp-doctor.sh|\.github/workflows/"
+SECRET_EXCLUDES="test_|assertions.sh|.pre-commit|README|CHANGELOG|FEATURES.md|docs/|install/lib/|.chezmoitemplates/|mcp-doctor.sh|\.github/workflows/"
 # Also exclude .tmpl files from secret scanning as they contain many false positive markers
 if echo "$STAGED_FILES" | grep -v "\.tmpl" | xargs grep -EiE "$SENSITIVE_PATTERNS" /dev/null | grep -vE "$SECRET_EXCLUDES" | grep -viE "dummy|placeholder|example|test|sk-placeholder|\\{\\{" >/dev/null 2>&1; then
   printf '%b\\n' "${RED}FAILED${NC}"
@@ -140,6 +140,6 @@ if [[ $FAILED -eq 1 ]]; then
   printf '%b\\n' "   (Use --no-verify to bypass if absolutely necessary)"
   exit 1
 else
-  printf '%b\n' "${GREEN}${BOLD}✅ Audit passed.${NC} v0.2.502 standards maintained."
+  printf '%b\n' "${GREEN}${BOLD}✅ Audit passed.${NC} v0.2.503 standards maintained."
   exit 0
 fi

package/scripts/git-hooks/pre-push

@@ -90,3 +90,16 @@ if [ "${DOTFILES_ALLOW_UNSKIPPED_PUSH:-}" = "1" ]; then
 fi
 
 bash "$repo_root/scripts/qa/reliability-audit.sh" --quick
+
+# Step 4 — version-string consistency. Catches the case where the
+# canonical version in .chezmoidata.toml advanced but a human-visible
+# surface (CLI banner, man page, README badge) wasn't bumped. The
+# script is cheap (~8 grep calls); failure tells the user exactly
+# which file drifted and offers --fix.
+bash "$repo_root/scripts/qa/check-version-consistency.sh" --quiet || {
+  echo "" >&2
+  echo "Pre-push blocked: version-string drift detected." >&2
+  echo "Run: scripts/qa/check-version-consistency.sh" >&2
+  echo "Then: scripts/qa/check-version-consistency.sh --fix    (optional auto-fix)" >&2
+  exit 1
+}

package/scripts/ops/ai-setup.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/dot/lib/ui.sh"
+source "$SCRIPT_DIR/../lib/dot/ui.sh"
 
 ui_header "Universal AI Toolchain Setup"
 

package/scripts/ops/bundle.sh

@@ -9,9 +9,9 @@ trap 'rm -f "${_cleanup_files[@]}"' EXIT
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/dot/lib/ui.sh"
+source "$SCRIPT_DIR/../lib/dot/ui.sh"
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/dot/lib/log.sh"
+source "$SCRIPT_DIR/../lib/dot/log.sh"
 export DOT_COMMAND="bundle"
 
 # Concurrency guard

package/scripts/ops/chaos.sh

@@ -6,9 +6,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 ui_init
 
 if [[ "${1:-}" != "--force" ]]; then

package/scripts/ops/chezmoi-apply.sh

@@ -3,12 +3,12 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
-# shellcheck source=../dot/lib/log.sh
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
+# shellcheck source=../../lib/dot/log.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/log.sh"
+source "$SCRIPT_DIR/../../lib/dot/log.sh"
 export DOT_COMMAND="apply"
 
 # Temp file cleanup

package/scripts/ops/heal.sh

@@ -21,12 +21,12 @@ trap cleanup EXIT
 
 # Configuration
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
-# shellcheck source=../dot/lib/log.sh
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
+# shellcheck source=../../lib/dot/log.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/log.sh"
+source "$SCRIPT_DIR/../../lib/dot/log.sh"
 DOT_COMMAND="heal"
 REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"
 DOTFILES_SOURCE="$REPO_ROOT"

package/scripts/ops/post-apply-repair.sh

@@ -3,9 +3,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 
 ZWC_CACHE_DIRS_DEFAULT=("$HOME/.config/shell" "$HOME/.config/zsh")
 

package/scripts/ops/prewarm.sh

@@ -6,9 +6,9 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/dot/lib/ui.sh"
+source "$SCRIPT_DIR/../lib/dot/ui.sh"
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/dot/lib/log.sh"
+source "$SCRIPT_DIR/../lib/dot/log.sh"
 export DOT_COMMAND="prewarm"
 
 # Prevent concurrent execution

package/scripts/ops/release.sh

@@ -10,12 +10,12 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
-# shellcheck source=../dot/lib/log.sh
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
+# shellcheck source=../../lib/dot/log.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/log.sh"
+source "$SCRIPT_DIR/../../lib/dot/log.sh"
 export DOT_COMMAND="release"
 ui_init
 

package/scripts/ops/rollback.sh

@@ -14,12 +14,12 @@ trap 'set +u; rm -f "${_cleanup_files[@]}" 2>/dev/null; set -u' EXIT
 
 # Configuration
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
-# shellcheck source=../dot/lib/log.sh
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
+# shellcheck source=../../lib/dot/log.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/log.sh"
+source "$SCRIPT_DIR/../../lib/dot/log.sh"
 export DOT_COMMAND="rollback"
 REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"
 # Resolve symlinks for consistent path handling

package/scripts/ops/setup.sh

@@ -6,9 +6,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 
 ui_init