fix(setup): isolate standalone compose installs

Author: TheodoreSpeaks

.github/workflows/publish-sim-setup.yml

@@ -16,7 +16,7 @@ permissions:
 
 concurrency:
   group: publish-sim-setup-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: false
 
 jobs:
   publish-npm:

packages/sim-setup/src/compose-project.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest'
+import { legacyComposeProjectName, standaloneComposeProjectName } from './compose-project'
+
+describe('standaloneComposeProjectName', () => {
+  it('is stable for one installation directory', () => {
+    expect(standaloneComposeProjectName('/srv/one/sim')).toBe(
+      standaloneComposeProjectName('/srv/one/sim')
+    )
+  })
+
+  it('isolates installations that share the same directory basename', () => {
+    expect(standaloneComposeProjectName('/srv/one/sim')).not.toBe(
+      standaloneComposeProjectName('/srv/two/sim')
+    )
+  })
+
+  it('produces a valid Compose project name without exposing the path', () => {
+    expect(standaloneComposeProjectName('/Users/example/Customer Project/sim')).toMatch(
+      /^sim-[0-9a-f]{12}$/
+    )
+  })
+
+  it('retains the directory-derived name for legacy installations', () => {
+    expect(legacyComposeProjectName('/srv/Sim.Demo')).toBe('simdemo')
+    expect(() => legacyComposeProjectName('/srv/---')).toThrow(/Cannot derive/)
+  })
+})

packages/sim-setup/src/compose-project.ts

@@ -0,0 +1,22 @@
+import { createHash } from 'node:crypto'
+import path from 'node:path'
+
+/** Returns the stable Docker Compose project name for a new standalone installation. */
+export function standaloneComposeProjectName(root: string): string {
+  const digest = createHash('sha256').update(path.resolve(root)).digest('hex').slice(0, 12)
+  return `sim-${digest}`
+}
+
+/** Reproduces Compose's directory-derived identity for installs created before names were stored. */
+export function legacyComposeProjectName(root: string): string {
+  const name = path
+    .basename(path.resolve(root))
+    .toLowerCase()
+    .replace(/[^a-z0-9_-]/g, '')
+  if (!/^[a-z0-9]/.test(name)) {
+    throw new Error(
+      `Cannot derive the existing Compose project name from ${root}; set COMPOSE_PROJECT_NAME in its .env file.`
+    )
+  }
+  return name
+}

packages/sim-setup/src/context.ts

@@ -53,7 +53,7 @@ function isStandaloneInstall(candidate: string): boolean {
   return readFileSync(composeFile, 'utf8').includes(SIM_COMPOSE_MARKER)
 }
 
-function directoryOverride(args: readonly string[]): string | null {
+export function directoryOverride(args: readonly string[]): string | null {
   const equalsArg = args.find((arg) => arg.startsWith('--dir='))
   if (equalsArg) {
     const value = equalsArg.slice('--dir='.length)

packages/sim-setup/src/index.ts

@@ -10,29 +10,18 @@ const SETUP_FEATURES =
   'email | storage | sandbox | jobs | cache | knowledge | knowledge-embeddings | llm | integration <slug>'
 
 const USAGE = `Usage:
-  npx @sim/setup                             run the setup wizard
-  npx @sim/setup [--quick] [--dir <path>]    create a Compose installation
-  npx @sim/setup config                      show configured capabilities and integrations
-  npx @sim/setup add <feature>               configure ${SETUP_FEATURES}
-  npx @sim/setup doctor [--fix] [--json]     check your setup
-  npx @sim/setup start | stop | restart      bring your install up / down / cycle
-  npx @sim/setup update                      pull and apply Compose images
-  npx @sim/setup status                      show what's installed and healthy
-  npx @sim/setup logs                        follow logs
-  npx @sim/setup down                        remove containers (data kept)
-  npx @sim/setup reset                       archive .env + wipe managed data
+  sim-setup [--quick] [--dir <path>] [--mode compose|dev|k8s]
+  sim-setup config                         show configured capabilities and integrations
+  sim-setup add <feature>                  configure ${SETUP_FEATURES}
+  sim-setup doctor [--fix] [--json]        check your setup
+  sim-setup start | stop | restart         bring your install up / down / cycle
+  sim-setup update                         pull/rebuild and apply Compose images
+  sim-setup status                         show what's installed and healthy
+  sim-setup logs                           follow logs
+  sim-setup down                           remove containers (data kept)
+  sim-setup reset                          archive .env + wipe managed data
 
-Inside a Sim source checkout, use the repository command:
-  bun run sim-setup [--quick] [--mode compose|dev|k8s]
-  bun run sim-setup config                      show configured capabilities and integrations
-  bun run sim-setup add <feature>                configure ${SETUP_FEATURES}
-  bun run sim-setup doctor [--fix] [--json]      check your setup
-  bun run sim-setup start | stop | restart       bring your install up / down / cycle
-  bun run sim-setup update                       pull/rebuild and apply Compose images
-  bun run sim-setup status                       what's installed and healthy
-  bun run sim-setup logs                         follow logs
-  bun run sim-setup down                         remove containers (data kept)
-  bun run sim-setup reset                        archive .env + wipe managed data`
+Note: dev and k8s modes require a Sim source checkout.`
 
 async function main(): Promise<void> {
   const invocation = parseSetupArguments(process.argv.slice(2))

packages/sim-setup/src/lifecycle.test.ts

@@ -4,7 +4,12 @@ import { tmpdir } from 'node:os'
 import path from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { ensureProductionComposeFile } from './compose-asset'
-import { getComposeUpdateMode, isLifecycleCommand, refreshComposeFileForUpdate } from './lifecycle'
+import {
+  composeInstallFromDirectory,
+  getComposeUpdateMode,
+  isLifecycleCommand,
+  refreshComposeFileForUpdate,
+} from './lifecycle'
 
 describe('setup lifecycle', () => {
   it('recognizes update as a lifecycle command', () => {
@@ -38,4 +43,33 @@ describe('setup lifecycle', () => {
       rmSync(root, { recursive: true, force: true })
     }
   })
+
+  it('restores a downed standalone install from its persisted project name', () => {
+    const root = mkdtempSync(path.join(tmpdir(), 'sim-setup-lifecycle-'))
+    try {
+      ensureProductionComposeFile({ kind: 'standalone', root, existing: false })
+      writeFileSync(path.join(root, '.env'), 'COMPOSE_PROJECT_NAME=sim-a1b2c3d4e5f6\n')
+
+      expect(composeInstallFromDirectory(root, [])).toEqual({
+        kind: 'compose',
+        file: path.join(root, 'docker-compose.prod.yml'),
+        dir: root,
+        project: 'sim-a1b2c3d4e5f6',
+      })
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it('does not duplicate a running install restored from its directory', () => {
+    const root = mkdtempSync(path.join(tmpdir(), 'sim-setup-lifecycle-'))
+    try {
+      const file = ensureProductionComposeFile({ kind: 'standalone', root, existing: false })
+      const active = [{ kind: 'compose', file, dir: root, project: 'sim-live' }] as const
+
+      expect(composeInstallFromDirectory(root, active)).toBeNull()
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
 })

packages/sim-setup/src/lifecycle.ts

@@ -1,10 +1,11 @@
 import { spawnSync } from 'node:child_process'
-import { readFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import path from 'node:path'
 import { ensureProductionComposeFile } from './compose-asset'
-import { resolveSetupContextAtRoot } from './context'
+import { legacyComposeProjectName } from './compose-project'
+import { directoryOverride, resolveSetupContextAtRoot, SETUP_CONTEXT } from './context'
 import { DB_CONTAINER, type Detection, REDIS_CONTAINER, runDetection } from './detect'
-import { archiveEnvFile, archiveFile, ROOT } from './env-files'
+import { archiveEnvFile, archiveFile, parseEnv, ROOT } from './env-files'
 import { SetupError } from './errors'
 import { forwardCommands, isLocalKubeContext } from './modes/k8s'
 import { httpHealth } from './probes'
@@ -67,7 +68,7 @@ function dockerRun(args: string[], failMessage: string, cwd: string = ROOT): voi
   }
 }
 
-interface ComposeInstall {
+export interface ComposeInstall {
   kind: 'compose'
   /** Absolute path to the compose file Docker recorded for the project. */
   file: string
@@ -158,6 +159,28 @@ function composeInstalls(): ComposeInstall[] {
   return installs
 }
 
+/** Restores a setup-managed Compose target from disk even when `down` removed every container. */
+export function composeInstallFromDirectory(
+  root: string,
+  activeInstalls: readonly ComposeInstall[]
+): ComposeInstall | null {
+  const file = path.join(root, 'docker-compose.prod.yml')
+  if (!isSimComposeFile(file)) return null
+  if (activeInstalls.some((install) => path.resolve(install.file) === path.resolve(file)))
+    return null
+
+  const envFile = path.join(root, '.env')
+  const configuredProject = existsSync(envFile)
+    ? parseEnv(readFileSync(envFile, 'utf8')).get('COMPOSE_PROJECT_NAME')
+    : undefined
+  return {
+    kind: 'compose',
+    file,
+    dir: root,
+    project: configuredProject || legacyComposeProjectName(root),
+  }
+}
+
 /**
  * Compose args for an op on a detected install. `-p` is not optional: without it
  * Compose re-derives the project from the working directory, and that name is
@@ -203,14 +226,29 @@ function k8sInstall(detection: Detection): K8sInstall | null {
 }
 
 function detectInstalls(detection: Detection): Install[] {
-  const installs: Install[] = [...composeInstalls()]
+  const compose = composeInstalls()
+  if (SETUP_CONTEXT.kind === 'standalone' && SETUP_CONTEXT.existing) {
+    const fromDirectory = composeInstallFromDirectory(SETUP_CONTEXT.root, compose)
+    if (fromDirectory) compose.push(fromDirectory)
+  }
+  const installs: Install[] = [...compose]
   const dev = devInstall(detection)
   if (dev) installs.push(dev)
   const k8s = k8sInstall(detection)
   if (k8s) installs.push(k8s)
   return installs
 }
 
+/** Limits an explicit standalone `--dir` command to that installation. */
+function scopeInstallsToInvocation(installs: Install[]): Install[] {
+  if (SETUP_CONTEXT.kind !== 'standalone' || directoryOverride(process.argv.slice(2)) === null) {
+    return installs
+  }
+  return installs.filter(
+    (install) => install.kind === 'compose' && path.resolve(install.dir) === SETUP_CONTEXT.root
+  )
+}
+
 function describeInstall(install: Install): string {
   if (install.kind === 'compose')
     return `Docker Compose (project ${install.project} in ${install.dir})`
@@ -501,7 +539,7 @@ async function reset(install: Install | null): Promise<void> {
 
 async function status(): Promise<void> {
   const detection = await runDetection()
-  const installs = detectInstalls(detection)
+  const installs = scopeInstallsToInvocation(detectInstalls(detection))
   const docker = dockerReachable()
   console.log(`\n${theme.heading('◆ Sim status')}\n`)
   // Every container probe goes through Docker, so when the daemon is down the
@@ -540,7 +578,7 @@ async function status(): Promise<void> {
 export async function runLifecycle(command: LifecycleCommand): Promise<void> {
   if (command === 'status') return status()
 
-  const installs = detectInstalls(await runDetection())
+  const installs = scopeInstallsToInvocation(detectInstalls(await runDetection()))
 
   // Reset stays useful with nothing running — it still archives stray .env files.
   if (command === 'reset') return reset(await resolveInstall(installs))