fix(state): keep shared caches out of state git sync

Author: skulidropek

packages/lib/src/usecases/projects-delete.ts

@@ -1,4 +1,4 @@
-import type { CommandExecutor } from "@effect/platform/CommandExecutor"
+import type * as CommandExecutor from "@effect/platform/CommandExecutor"
 import type { PlatformError } from "@effect/platform/Error"
 import * as FileSystem from "@effect/platform/FileSystem"
 import * as Path from "@effect/platform/Path"
@@ -67,7 +67,11 @@ const removeContainersFallback = (
 // COMPLEXITY: O(docker + fs)
 export const deleteDockerGitProject = (
   item: ProjectItem
-): Effect.Effect<void, PlatformError | DockerCommandError, FileSystem.FileSystem | Path.Path | CommandExecutor> =>
+): Effect.Effect<
+  void,
+  PlatformError | DockerCommandError,
+  FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor
+> =>
   Effect.gen(function*(_) {
     const fs = yield* _(FileSystem.FileSystem)
     const path = yield* _(Path.Path)

packages/lib/src/usecases/state-repo.ts

@@ -24,6 +24,19 @@ type StateRepoEnv = FileSystem.FileSystem | Path.Path | CommandExecutor.CommandE
 
 const resolveStateRoot = (path: Path.Path, cwd: string): string => path.resolve(defaultProjectsRoot(cwd))
 
+const managedRepositoryCachePaths = [".cache/git-mirrors", ".cache/packages"] as const
+
+const ensureStateIgnoreAndUntrackCaches = (
+  fs: FileSystem.FileSystem,
+  path: Path.Path,
+  root: string
+): Effect.Effect<void, CommandFailedError | PlatformError, StateRepoEnv> =>
+  Effect.gen(function*(_) {
+    yield* _(ensureStateGitignore(fs, path, root))
+    // Best-effort idempotent cleanup: keep cache artifacts out of git history.
+    yield* _(git(root, ["rm", "-r", "--cached", "--ignore-unmatch", ...managedRepositoryCachePaths], gitBaseEnv))
+  }).pipe(Effect.asVoid)
+
 export const statePath: Effect.Effect<void, PlatformError, Path.Path> = Effect.gen(function*(_) {
   const path = yield* _(Path.Path)
   const cwd = process.cwd()
@@ -48,6 +61,8 @@ export const stateSync = (
       )
     }
 
+    yield* _(ensureStateIgnoreAndUntrackCaches(fs, path, root))
+
     const originUrlExit = yield* _(gitExitCode(root, ["remote", "get-url", "origin"], gitBaseEnv))
     if (originUrlExit !== successExitCode) {
       yield* _(Effect.logWarning(`State dir has no origin remote: ${root}`))
@@ -269,11 +284,17 @@ export const statePush = Effect.gen(function*(_) {
 
 export const stateCommit = (
   message: string
-): Effect.Effect<void, CommandFailedError | PlatformError, Path.Path | CommandExecutor.CommandExecutor> =>
+): Effect.Effect<
+  void,
+  CommandFailedError | PlatformError,
+  FileSystem.FileSystem | Path.Path | CommandExecutor.CommandExecutor
+> =>
   Effect.gen(function*(_) {
+    const fs = yield* _(FileSystem.FileSystem)
     const path = yield* _(Path.Path)
     const root = resolveStateRoot(path, process.cwd())
 
+    yield* _(ensureStateIgnoreAndUntrackCaches(fs, path, root))
     yield* _(git(root, ["add", "-A"], gitBaseEnv))
     const diffExit = yield* _(gitExitCode(root, ["diff", "--cached", "--quiet"], gitBaseEnv))