fix(shell): resolve merge conflict — keep healthcheck + add upstream DNS settings

Merges upstream/main into issue-137, combining our healthcheck feature
with upstream's DNS settings (8.8.8.8, 8.8.4.4, 1.1.1.1) on the browser service.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: konard

.githooks/pre-commit

@@ -15,6 +15,15 @@ done < <(
     -print0
 )
 
+# CHANGE: auto-stage AI agent config directories (.gemini, .claude, .codex)
+# WHY: ensures AI session context is always included in commits without manual git add
+# REF: issue-170
+for ai_dir in .gemini .claude .codex; do
+  if [ -d "$ai_dir" ]; then
+    git add -A -- "$ai_dir"
+  fi
+done
+
 MAX_BYTES=$((99 * 1000 * 1000))
 too_large=()
 

.githooks/pre-push

@@ -10,3 +10,14 @@ if [ "${DOCKER_GIT_SKIP_KNOWLEDGE_GUARD:-}" = "1" ]; then
 fi
 
 node scripts/pre-push-knowledge-guard.js "$@"
+
+# CHANGE: backup AI session to a private session repository on push (supports Claude, Codex, Gemini)
+# WHY: allows returning to old AI sessions and provides PR context without gist limits
+# QUOTE(ТЗ): "когда происходит push мы сразу заливаем текущую сессию с AI агентом в gits приватный"
+# REF: issue-143
+# PURITY: SHELL
+if [ "${DOCKER_GIT_SKIP_SESSION_BACKUP:-}" != "1" ]; then
+  if command -v gh >/dev/null 2>&1; then
+    node scripts/session-backup-gist.js --verbose || echo "[session-backup] Warning: session backup failed (non-fatal)"
+  fi
+fi

.github/actions/setup/action.yml

@@ -10,12 +10,12 @@ runs:
   using: composite
   steps:
     - name: Install pnpm
-      uses: pnpm/action-setup@v3
+      uses: pnpm/action-setup@v5
     - name: Install node
       uses: actions/setup-node@v6
       with:
         cache: pnpm
         node-version: ${{ inputs.node-version }}
     - name: Install dependencies
       shell: bash
-      run: pnpm install
+      run: pnpm install --frozen-lockfile

.github/workflows/check.yml

@@ -23,6 +23,8 @@ jobs:
       - uses: actions/checkout@v6
       - name: Install dependencies
         uses: ./.github/actions/setup
+      - name: Build (docker-git package)
+        run: pnpm --filter ./packages/app build
 
   types:
     name: Types

.github/workflows/checking-dependencies.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v5
       - uses: actions/setup-node@v6
         with:
           node-version: 24.14.0

.gitignore

@@ -23,4 +23,3 @@ yarn-error.log*
 pnpm-debug.log*
 reports/
 .idea
-.claude

docker-compose.yml

@@ -9,6 +9,10 @@ services:
       CODEX_HOME: "/home/dev/.codex"
     ports:
       - "127.0.0.1:2222:22"
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 1.1.1.1
     volumes:
       - dev_home:/home/dev
       - ./authorized_keys:/authorized_keys:ro

entrypoint.sh

@@ -11,6 +11,42 @@
 # COMPLEXITY: O(network + repo_size)
 set -euo pipefail
 
+# 0) Ensure DNS resolution works; repair /etc/resolv.conf if Docker DNS is broken
+docker_git_repair_dns() {
+  local test_domain="github.com"
+  local resolv="/etc/resolv.conf"
+  local fallback_dns="8.8.8.8 8.8.4.4 1.1.1.1"
+
+  if getent hosts "$test_domain" >/dev/null 2>&1; then
+    return 0
+  fi
+
+  echo "[dns-repair] DNS resolution failed for $test_domain; attempting repair..."
+
+  local has_external=0
+  for ns in $fallback_dns; do
+    if grep -q "nameserver $ns" "$resolv" 2>/dev/null; then
+      has_external=1
+    fi
+  done
+
+  if [[ "$has_external" -eq 0 ]]; then
+    for ns in $fallback_dns; do
+      printf "nameserver %s\n" "$ns" >> "$resolv"
+    done
+    echo "[dns-repair] appended fallback nameservers to $resolv"
+  fi
+
+  if getent hosts "$test_domain" >/dev/null 2>&1; then
+    echo "[dns-repair] DNS resolution restored"
+    return 0
+  fi
+
+  echo "[dns-repair] WARNING: DNS resolution still failing after repair attempt"
+  return 1
+}
+docker_git_repair_dns || true
+
 REPO_URL="${REPO_URL:-}"
 REPO_REF="${REPO_REF:-}"
 TARGET_DIR="${TARGET_DIR:-/work/app}"

experiments/test-pre-commit-ai-dirs.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Test that the pre-commit hook logic correctly stages AI config directories
+echo "=== Testing AI directory auto-staging logic ==="
+
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+cd "$REPO_ROOT"
+
+# Create test AI directories with test files
+for ai_dir in .gemini .claude .codex; do
+  mkdir -p "$ai_dir"
+  echo "test-content-$(date +%s)" > "$ai_dir/test-file.txt"
+done
+
+echo "Created test files:"
+ls -la .gemini/test-file.txt .claude/test-file.txt .codex/test-file.txt
+
+# Check gitignore status
+echo ""
+echo "=== Checking gitignore status ==="
+for ai_dir in .gemini .claude .codex; do
+  if git check-ignore -q "$ai_dir/test-file.txt" 2>/dev/null; then
+    echo "IGNORED: $ai_dir (this is a problem!)"
+  else
+    echo "NOT IGNORED: $ai_dir (good - can be tracked)"
+  fi
+done
+
+# Simulate the auto-staging logic from the pre-commit hook
+echo ""
+echo "=== Simulating auto-staging ==="
+for ai_dir in .gemini .claude .codex; do
+  if [ -d "$ai_dir" ]; then
+    git add -A -- "$ai_dir"
+    echo "Staged: $ai_dir"
+  fi
+done
+
+echo ""
+echo "=== Staged files ==="
+git diff --cached --name-only | grep -E "^\.(gemini|claude|codex)/" || echo "(none found)"
+
+# Clean up - unstage the test files
+git reset HEAD -- .gemini .claude .codex 2>/dev/null || true
+rm -rf .gemini/test-file.txt .claude/test-file.txt .codex/test-file.txt
+
+echo ""
+echo "=== Test complete ==="

packages/api/package.json

@@ -19,18 +19,18 @@
   },
   "dependencies": {
     "@effect-template/lib": "workspace:*",
-    "@effect/platform": "^0.94.5",
-    "@effect/platform-node": "^0.104.1",
+    "@effect/platform": "^0.96.0",
+    "@effect/platform-node": "^0.106.0",
     "@effect/schema": "^0.75.5",
-    "effect": "^3.19.19"
+    "effect": "^3.21.0"
   },
   "devDependencies": {
-    "@effect/vitest": "^0.27.0",
+    "@effect/vitest": "^0.29.0",
     "@eslint/js": "10.0.1",
     "@types/node": "^24.12.0",
-    "@typescript-eslint/eslint-plugin": "^8.57.0",
-    "@typescript-eslint/parser": "^8.57.0",
-    "eslint": "^10.0.3",
+    "@typescript-eslint/eslint-plugin": "^8.57.1",
+    "@typescript-eslint/parser": "^8.57.1",
+    "eslint": "^10.1.0",
     "globals": "^17.4.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.0"