@meith/cli 0.23.1 → 0.23.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/cli",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "description": "The operator CLI: migrations, backup and restore, imports, users and settings — and the community bin that runs it against an external board workspace.",
   "license": "MIT",
   "repository": {
@@ -23,18 +23,18 @@
   },
   "dependencies": {
     "tsx": "^4.23.12",
-    "@meith/accounts": "0.23.1",
-    "@meith/core": "0.23.1",
-    "@meith/db": "0.23.1",
-    "@meith/demo": "0.23.1",
-    "@meith/drivers": "0.23.1",
-    "@meith/forums": "0.23.1",
-    "@meith/plugin-kit": "0.23.1",
-    "@meith/profile-fields": "0.23.1",
-    "@meith/runtime": "0.23.1",
-    "@meith/settings": "0.23.1",
-    "@meith/tasks": "0.23.1",
-    "create-meith": "0.23.1"
+    "@meith/accounts": "0.23.3",
+    "@meith/db": "0.23.3",
+    "@meith/core": "0.23.3",
+    "@meith/demo": "0.23.3",
+    "@meith/drivers": "0.23.3",
+    "@meith/forums": "0.23.3",
+    "@meith/plugin-kit": "0.23.3",
+    "@meith/profile-fields": "0.23.3",
+    "@meith/runtime": "0.23.3",
+    "@meith/settings": "0.23.3",
+    "@meith/tasks": "0.23.3",
+    "create-meith": "0.23.3"
   },
   "devDependencies": {
     "esbuild": "^0.28.2"

package/src/backup.ts

@@ -21,6 +21,7 @@ import { BlobFileStore, S3FileStore, unusableKeyReason } from '@meith/drivers'
 import { optional, parseFlags } from './args'
 import { requirePostgres } from './context'
 import { CODE_VERSION } from './upgrade'
+import { translateWriteError } from './write-errors'
 
 export type UploadsMode = 'include' | 'skip'
 
@@ -382,6 +383,27 @@ export async function reserveBackupDestination(destination: string): Promise<voi
   await file.close()
 }
 
+export async function claimBackupDestination(destination: string): Promise<void> {
+  try {
+    await reserveBackupDestination(destination)
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException | undefined)?.code === 'EEXIST') {
+      throw new ValidationError(
+        `backup will not write over ${destination}: something is already there. Move it aside ` +
+          'or pass a different --out. A previous run killed part-way through can leave an ' +
+          'empty or truncated bundle at the path it had claimed; that file is not a backup ' +
+          'and is safe to delete.',
+      )
+    }
+    translateWriteError(error, {
+      command: 'backup',
+      path: destination,
+      target: path.dirname(destination),
+      reference: 'docs/guides/operations/operating.md, "Backup"',
+    })
+  }
+}
+
 interface StagedUploads {
   readonly uploads: 'included' | 'skipped'
   readonly skippedKeys: readonly string[]
@@ -521,6 +543,9 @@ export async function backupCommand(args: readonly string[]): Promise<number> {
   const stage = await mkdtemp(path.join(tmpdir(), 'meith-backup-'))
   let destinationCreated = false
   try {
+    await claimBackupDestination(out)
+    destinationCreated = true
+
     console.log(
       env.DIRECT_DATABASE_URL === undefined
         ? 'Dumping the database…'
@@ -550,8 +575,6 @@ export async function backupCommand(args: readonly string[]): Promise<number> {
 
     const members = ['manifest.json', 'db.dump']
     if (uploads === 'included') members.push('uploads.tar.gz')
-    await reserveBackupDestination(out)
-    destinationCreated = true
     await run('tar', ['czf', out, '-C', stage, ...members])
     await chmod(out, 0o600)
 

package/src/board-eject.ts

@@ -7,6 +7,7 @@ import { DEFAULT_REPOSITORY_URL, scaffold, validateName } from 'create-meith'
 import { ValidationError } from '@meith/core'
 
 import { CODE_VERSION } from './upgrade'
+import { translateWriteError } from './write-errors'
 
 function defaultManifestPath(): string {
   return join(
@@ -173,24 +174,6 @@ export function installedPluginDefinitions() {
 `
 }
 
-function isFsPermissionError(error: unknown): error is NodeJS.ErrnoException {
-  const code = (error as NodeJS.ErrnoException | undefined)?.code
-  return code === 'EACCES' || code === 'EPERM'
-}
-
-function translateWriteError(error: unknown, target: string, path: string): never {
-  if (isFsPermissionError(error)) {
-    throw new ValidationError(
-      `board:eject could not write to ${path}: permission denied. The account running this ` +
-        `command needs write access to ${target} — inside the official image that account is ` +
-        'a fixed, non-root user, so a bind-mounted target directory has to already be owned by ' +
-        '(or writable by) that same account before eject runs. See docs/customization/marketplace.md, ' +
-        '"Moving to a custom board", for the exact invocation.',
-    )
-  }
-  throw error
-}
-
 export async function boardEject(args: readonly string[]): Promise<number> {
   const positional = args.filter((arg) => !arg.startsWith('-'))
   const [dir] = positional
@@ -233,7 +216,12 @@ export async function boardEject(args: readonly string[]): Promise<number> {
       await mkdir(dirname(path), { recursive: true })
       await writeFile(path, contents, 'utf8')
     } catch (error) {
-      translateWriteError(error, target, path)
+      translateWriteError(error, {
+        command: 'board:eject',
+        path,
+        target,
+        reference: 'docs/customization/marketplace.md, "Moving to a custom board"',
+      })
     }
   }
 

package/src/upgrade.ts

@@ -11,7 +11,7 @@ import { type PluginDefinition, pluginNavigationPlacements } from '@meith/plugin
 import { runPluginLifecycle } from '@meith/runtime'
 import { type PluginUpgrade, planUpgrade, upgradeNotice } from '@meith/upgrade'
 
-export const CODE_VERSION = '0.23.1'
+export const CODE_VERSION = '0.23.3'
 
 export function pluginUpgrades(plugins: readonly PluginDefinition[]): readonly PluginUpgrade[] {
   return plugins.map((plugin) => ({

package/src/write-errors.ts

@@ -0,0 +1,26 @@
+import { ValidationError } from '@meith/core'
+
+export interface WriteFailure {
+  readonly command: string
+  readonly path: string
+  readonly target: string
+  readonly reference: string
+}
+
+export function isFsPermissionError(error: unknown): error is NodeJS.ErrnoException {
+  const code = (error as NodeJS.ErrnoException | undefined)?.code
+  return code === 'EACCES' || code === 'EPERM'
+}
+
+export function translateWriteError(error: unknown, failure: WriteFailure): never {
+  if (isFsPermissionError(error)) {
+    throw new ValidationError(
+      `${failure.command} could not write to ${failure.path}: permission denied. The account ` +
+        `running this command needs write access to ${failure.target} — inside the official ` +
+        'image that account is a fixed, non-root user, so a bind-mounted target directory has ' +
+        `to already be owned by (or writable by) that same account before ${failure.command} ` +
+        `runs. See ${failure.reference} for the exact invocation.`,
+    )
+  }
+  throw error
+}