fix(app): pin controller compose project name

Author: skulidropek

packages/app/src/docker-git/controller-compose.ts

@@ -23,6 +23,23 @@ export type ControllerComposeFiles = {
   readonly runtimeOverlayPath: string | null
 }
 
+export const controllerComposeProjectName = "docker-git"
+
+// CHANGE: pin the controller compose project name across checkout directories
+// WHY: fixed controller container_name must be recreated by the same compose project, not by cwd-derived names
+// QUOTE(ТЗ): "container name \"/docker-git-api\" is already in use"
+// REF: user-message-2026-06-06-controller-compose-conflict
+// SOURCE: n/a
+// FORMAT THEOREM: forall cwd: compose_project(controller_bootstrap(cwd)) = "docker-git"
+// PURITY: CORE
+// EFFECT: n/a
+// INVARIANT: controller bootstrap compose commands use one global project name
+// COMPLEXITY: O(1)
+export const controllerComposeProjectArgs: ReadonlyArray<string> = [
+  "--project-name",
+  controllerComposeProjectName
+]
+
 const skillerSubmodulePath = "third_party/skiller-desktop-skills-manager"
 const skillerPackagePath = `${skillerSubmodulePath}/package.json`
 

packages/app/src/docker-git/controller-docker.ts

@@ -4,23 +4,22 @@ import type * as FileSystem from "@effect/platform/FileSystem"
 import type * as Path from "@effect/platform/Path"
 import { Effect } from "effect"
 
-import { composeFilesToArgs, prepareControllerRevision, resolveControllerComposeFiles } from "./controller-compose.js"
-import { readCurrentContainerName } from "./controller-hostname.js"
-import {
-  runCommandCaptureWithFailureOutput,
-  runCommandExitCode,
-  runCommandExitCodeStreaming,
-  runCommandWithCapturedOutput
-} from "./frontend-lib/shell/command-runner.js"
-
+import * as ControllerCompose from "./controller-compose.js"
 import { type DockerProbeOutcome, renderDockerAccessDeniedMessage } from "./controller-docker-diagnostics.js"
+import { readCurrentContainerName } from "./controller-hostname.js"
 import {
   type DockerNetworkIps,
   parseDockerNetworkIps,
   resolveConfiguredApiBaseUrl,
   uniqueStrings
 } from "./controller-reachability.js"
 import { parseControllerRevisionEnvOutput } from "./controller-revision.js"
+import {
+  runCommandCaptureWithFailureOutput,
+  runCommandExitCode,
+  runCommandExitCodeStreaming,
+  runCommandWithCapturedOutput
+} from "./frontend-lib/shell/command-runner.js"
 import type { ControllerBootstrapError } from "./host-errors.js"
 
 export {
@@ -32,10 +31,7 @@ export {
 } from "./controller-compose.js"
 export { parseControllerDockerRuntime } from "./controller-runtime.js"
 
-export type ControllerRuntime =
-  | CommandExecutor.CommandExecutor
-  | FileSystem.FileSystem
-  | Path.Path
+export type ControllerRuntime = CommandExecutor.CommandExecutor | FileSystem.FileSystem | Path.Path
 
 export const controllerContainerName = process.env["DOCKER_GIT_API_CONTAINER_NAME"]?.trim() || "docker-git-api"
 
@@ -383,10 +379,10 @@ export const runCompose = (
 ): Effect.Effect<void, ControllerBootstrapError, ControllerRuntime> =>
   Effect.gen(function*(_) {
     const dockerCommand = yield* _(resolveDockerCommand())
-    const composeFiles = yield* _(resolveControllerComposeFiles())
     const invocation = buildDockerInvocation(dockerCommand, [
       "compose",
-      ...composeFilesToArgs(composeFiles),
+      ...ControllerCompose.controllerComposeProjectArgs,
+      ...ControllerCompose.composeFilesToArgs(yield* _(ControllerCompose.resolveControllerComposeFiles())),
       ...args
     ])
     const exitCode = yield* _(
@@ -440,7 +436,7 @@ export const inspectControllerRevision = (): Effect.Effect<
   )
 
 export const prepareLocalControllerRevision = (): Effect.Effect<string, ControllerBootstrapError, ControllerRuntime> =>
-  prepareControllerRevision()
+  ControllerCompose.prepareControllerRevision()
 
 export const inspectContainerNetworks = (
   containerName: string

packages/app/src/docker-git/controller-image-revision.ts

@@ -1,6 +1,10 @@
 import { Effect } from "effect"
 
-import { composeFilesToArgs, resolveControllerComposeFiles } from "./controller-compose.js"
+import {
+  composeFilesToArgs,
+  controllerComposeProjectArgs,
+  resolveControllerComposeFiles
+} from "./controller-compose.js"
 import { type ControllerRuntime, runDockerCapture, runDockerCaptureWithFailureOutput } from "./controller-docker.js"
 import { parseControllerRevisionLabelOutput } from "./controller-revision.js"
 import type { ControllerBootstrapError } from "./host-errors.js"
@@ -131,6 +135,7 @@ const inspectControllerComposeImageName = (): Effect.Effect<
       runDockerCapture(
         [
           "compose",
+          ...controllerComposeProjectArgs,
           ...composeFilesToArgs(composeFiles),
           "config",
           "--images"

packages/app/tests/docker-git/controller-compose.test.ts

@@ -8,11 +8,13 @@ import * as fc from "fast-check"
 import { resolveControllerRuntimeOverlayPath } from "../../src/docker-git/controller-compose-runtime.js"
 import {
   controllerBuildSkillerEnvKey,
+  controllerComposeProjectName,
   controllerGpuModeEnvKey,
   ensureSkillerSubmoduleInitialized,
   prepareControllerRevision,
   resolveControllerComposeFiles
 } from "../../src/docker-git/controller-compose.js"
+import { runCompose } from "../../src/docker-git/controller-docker.js"
 import { controllerRevisionEnvKey } from "../../src/docker-git/controller-revision.js"
 import { controllerDockerRuntimeEnvKey } from "../../src/docker-git/controller-runtime.js"
 import type { TestCommandResult } from "./fixtures/command-executor.js"
@@ -205,6 +207,33 @@ const assertControllerComposeProperty = <PropertyArgs>(property: fc.IAsyncProper
   })
 
 describe("controller compose preparation", () => {
+  it.effect("runs controller compose under the stable controller project name", () => {
+    const startedCommands: Array<string> = []
+
+    return withMinimalControllerRoot(() =>
+      Effect.gen(function*(_) {
+        yield* _(
+          withControllerEnv([
+            [controllerBuildSkillerEnvKey, "0"],
+            [controllerDockerRuntimeEnvKey, undefined],
+            [controllerGpuModeEnvKey, undefined]
+          ])
+        )
+        yield* _(
+          runCompose(["up", "-d"]).pipe(
+            Effect.provide(recordedCommandExecutorLayer(startedCommands, emptyCommandResult))
+          )
+        )
+
+        const composeCommand = startedCommands.find((command) =>
+          command.startsWith(`docker compose --project-name ${controllerComposeProjectName} -f `)
+        )
+        expect(composeCommand).toBeDefined()
+        expect(composeCommand?.endsWith(" up -d")).toBe(true)
+      })
+    ).pipe(Effect.provide(NodeContext.layer))
+  })
+
   it.effect("does not initialize the Skiller submodule when package metadata already exists", () => {
     const startedCommands: Array<string> = []
 

packages/app/tests/docker-git/controller-image-revision.test.ts

@@ -4,6 +4,7 @@ import { describe, expect, it } from "@effect/vitest"
 import { Effect, Either } from "effect"
 import * as fc from "fast-check"
 
+import { controllerComposeProjectArgs } from "../../src/docker-git/controller-compose.js"
 import { inspectControllerImageRevision } from "../../src/docker-git/controller-image-revision.js"
 import type { ControllerBootstrapError } from "../../src/docker-git/host-errors.js"
 import {
@@ -189,6 +190,29 @@ const expectRevisionFailureMessage = (
   )
 
 describe("controller image revision", () => {
+  it.effect("resolves compose images under the stable controller project name", () => {
+    const composeImageCommands: Array<ReadonlyArray<string>> = []
+
+    return inspectRevisionWithCommandHandler((command) => {
+      if (command.command === "docker" && command.args.includes("--images")) {
+        composeImageCommands.push(command.args)
+        return { exitCode: 0, stderr: "", stdout: "app-api:latest\n" }
+      }
+      if (command.command === "docker" && command.args.includes("image") && command.args.includes("inspect")) {
+        return { exitCode: 0, stderr: "", stdout: " rev123 \n" }
+      }
+      return emptyCommandResult
+    }).pipe(
+      Effect.map((revision) => {
+        expect(revision).toBe("rev123")
+        expect(composeImageCommands[0]?.slice(0, 1 + controllerComposeProjectArgs.length)).toEqual([
+          "compose",
+          ...controllerComposeProjectArgs
+        ])
+      })
+    )
+  })
+
   it.effect("falls back to null for non-reusable compose image output cardinalities", () =>
     Effect.tryPromise({
       catch: (cause) => cause,