Merge upstream/main into issue-132

Author: skulidropek

.githooks/pre-commit

@@ -9,12 +9,20 @@ node scripts/split-knowledge-large-files.js
 while IFS= read -r -d '' knowledge_dir; do
   git add -A -- "$knowledge_dir"
 done < <(
-  find . -type d \
-    \( -name ".knowledge" -o -name ".knowlenge" \) \
-    -not -path "*/.git/*" \
-    -print0
+  find . \
+    \( -name ".git" -o -name "tmp" \) -type d -prune -o \
+    \( -type d \( -name ".knowledge" -o -name ".knowlenge" \) -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=()
 

.gitignore

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

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/src/api/contracts.ts

@@ -25,6 +25,7 @@ export type ProjectDetails = ProjectSummary & {
   readonly envProjectPath: string
   readonly codexAuthPath: string
   readonly codexHome: string
+  readonly clonedOnHostname?: string | undefined
 }
 
 export type CreateProjectRequest = {

packages/api/src/services/projects.ts

@@ -121,7 +121,8 @@ const toProjectDetails = (
   envGlobalPath: project.envGlobalPath,
   envProjectPath: project.envProjectPath,
   codexAuthPath: project.codexAuthPath,
-  codexHome: project.codexHome
+  codexHome: project.codexHome,
+  clonedOnHostname: project.clonedOnHostname
 })
 
 const findProjectById = (projectId: string) =>

packages/app/CHANGELOG.md

@@ -1,5 +1,83 @@
 # @prover-coder-ai/docker-git
 
+## 1.0.73
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.72
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.71
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.70
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.69
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.68
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.67
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.66
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.65
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.64
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.63
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.62
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.61
+
+### Patch Changes
+
+- chore: automated version bump
+
 ## 1.0.60
 
 ### Patch Changes

packages/app/eslint.effect-ts-check.config.mjs

@@ -134,6 +134,10 @@ const restrictedSyntaxBaseNoServiceFactory = [
 ]
 
 export default tseslint.config(
+  {
+    name: "effect-ts-compliance-ignore-shell-tests",
+    ignores: ["tests/hooks/**"]
+  },
   {
     name: "effect-ts-compliance-check",
     files: ["src/**/*.ts", "scripts/**/*.ts", "tests/**/*.ts"],

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prover-coder-ai/docker-git",
-  "version": "1.0.60",
+  "version": "1.0.73",
   "description": "Minimal Vite-powered TypeScript console starter using Effect",
   "main": "dist/src/docker-git/main.js",
   "bin": {
@@ -101,7 +101,7 @@
     "eslint-plugin-sonarjs": "^4.0.2",
     "eslint-plugin-sort-destructure-keys": "^3.0.0",
     "eslint-plugin-unicorn": "^63.0.0",
-    "@vitest/eslint-plugin": "^1.6.12",
+    "@vitest/eslint-plugin": "^1.6.13",
     "@types/react": "^19.2.14",
     "biome": "npm:@biomejs/biome@^2.4.8",
     "globals": "^17.4.0",

packages/app/src/docker-git/cli/parser.ts

@@ -23,6 +23,20 @@ const menuCommand: Command = { _tag: "Menu" }
 const statusCommand: Command = { _tag: "Status" }
 const downAllCommand: Command = { _tag: "DownAll" }
 
+// CHANGE: parse --active flag for apply-all command to restrict to running containers
+// WHY: allow users to apply config only to currently active containers via --active flag
+// QUOTE(ТЗ): "сделать это возможным через атрибут --active применять только к активным контейнерам, а не ко всем"
+// REF: issue-185
+// PURITY: CORE
+// EFFECT: n/a
+// INVARIANT: activeOnly is true only when --active flag is present
+// COMPLEXITY: O(n) where n = |args|
+const parseApplyAll = (args: ReadonlyArray<string>): Either.Either<Command, ParseError> => {
+  const activeOnly = args.includes("--active")
+  const command: Command = { _tag: "ApplyAll", activeOnly }
+  return Either.right(command)
+}
+
 const parseCreate = (args: ReadonlyArray<string>): Either.Either<Command, ParseError> =>
   Either.flatMap(parseRawOptions(args), (raw) => buildCreateCommand(raw))
 
@@ -75,6 +89,8 @@ export const parseArgs = (args: ReadonlyArray<string>): Either.Either<Command, P
       Match.when("ui", () => Either.right(menuCommand))
     )
     .pipe(
+      Match.when("apply-all", () => parseApplyAll(rest)),
+      Match.when("update-all", () => parseApplyAll(rest)),
       Match.when("auth", () => parseAuth(rest)),
       Match.when("open", () => parseAttach(rest)),
       Match.when("apply", () => parseApply(rest)),

packages/app/src/docker-git/cli/usage.ts

@@ -19,6 +19,7 @@ docker-git session-gists backup [<url>] [options]
 docker-git session-gists view <snapshot-ref>
 docker-git session-gists download <snapshot-ref> [options]
 docker-git ps
+docker-git apply-all [--active]
 docker-git down-all
 docker-git auth <provider> <action> [options]
 docker-git state <action> [options]
@@ -36,6 +37,7 @@ Commands:
   sessions            List/kill/log container terminal processes
   session-gists       Manage AI session backups via a private session repository (backup/list/view/download)
   ps, status          Show docker compose status for all docker-git projects
+  apply-all           Apply docker-git config and refresh all containers (docker compose up); use --active to restrict to running containers only
   down-all            Stop all docker-git containers (docker compose down)
   auth                Manage GitHub/Codex/Claude Code auth for docker-git
   state               Manage docker-git state directory via git (sync across machines)
@@ -78,7 +80,8 @@ Options:
   --ssh | --no-ssh          Auto-open SSH after create/clone (default: clone=--ssh, create=--no-ssh)
   --mcp-playwright | --no-mcp-playwright  Enable Playwright MCP + Chromium sidecar (default: --no-mcp-playwright)
   --auto[=claude|codex]     Auto-execute an agent; without value picks by auth, random if both are available
-  --force                   Overwrite existing files and wipe compose volumes (docker compose down -v)
+  --active                  apply-all: apply only to currently running containers (skip stopped ones)
+  --force                   Overwrite existing files, remove conflicting containers, and wipe compose volumes
   --force-env               Reset project env defaults only (keep workspace volume/data)
   -h, --help                Show this help