openpalm 0.11.0-beta.3 → 0.11.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openpalm",
-  "version": "0.11.0-beta.3",
+  "version": "0.11.0-beta.6",
   "type": "module",
   "license": "MPL-2.0",
   "description": "OpenPalm CLI — install and manage a self-hosted OpenPalm stack",
@@ -16,8 +16,8 @@
     "start": "bun run src/main.ts",
     "test": "bun test",
     "test:e2e": "npx playwright test",
-    "wizard:dev": "bun run src/main.ts install --no-start --force",
-    "_build_note": "Run 'bun run ui:build:tar' from repo root before any build:* target (Bun does not run prebuild hooks)",
+    "wizard:local": "bun run src/main.ts install --no-start --force",
+    "_build_note": "CI runs 'bun run ui:build:tar' from repo root before any build:* target. The prebuild hook below is npm-only; Bun does not run lifecycle hooks.",
     "prebuild": "cd ../ui && npm run build && npm run build:tar",
     "build": "bun build src/main.ts --compile --outfile dist/openpalm-cli",
     "build:linux-x64": "bun build src/main.ts --compile --target=bun-linux-x64 --outfile dist/openpalm-cli-linux-x64",
@@ -27,8 +27,11 @@
     "build:windows-x64": "bun build src/main.ts --compile --target=bun-windows-x64 --outfile dist/openpalm-cli-windows-x64.exe",
     "build:windows-arm64": "bun build src/main.ts --compile --target=bun-windows-arm64 --outfile dist/openpalm-cli-windows-arm64.exe"
   },
+  "engines": {
+    "bun": ">=1.0.0"
+  },
   "dependencies": {
-    "@openpalm/lib": "0.11.0-beta.1",
+    "@openpalm/lib": ">=0.11.0-beta.5 <1.0.0",
     "citty": "^0.2.1",
     "yaml": "^2.8.0"
   }

package/src/lib/env.ts

@@ -1,6 +1,6 @@
 import { join } from 'node:path';
-import { mkdirSync } from 'node:fs';
-import { reconcileStackEnvImageTag, resolveRequestedImageTag } from '@openpalm/lib';
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { reconcileStackEnvImageTag, resolveRequestedImageTag, resolveOperatorIds, hasUsableOperatorId } from '@openpalm/lib';
 import { defaultDockerSock } from './paths.ts';
 
 /**
@@ -32,21 +32,25 @@ export async function ensureStackEnv(
   const explicitImageTag = imageTagOverride ?? process.env.OP_IMAGE_TAG;
   const hasExplicitImageTag = explicitImageTag !== undefined && explicitImageTag !== '';
   mkdirSync(stackDir, { recursive: true });
+  // Operator UID/GID — auto-detect from OP_HOME owner (or process UID).
+  // Returns null on Windows; in that case we omit OP_UID/OP_GID and let
+  // compose fall back to its `${OP_UID:-1000}` default (containers run
+  // in WSL2 Linux where this doesn't matter).
+  const ids = resolveOperatorIds(homeDir);
   if (!(await Bun.file(systemEnvPath).exists())) {
     const defaultImageTag = hasExplicitImageTag
       ? explicitImageTag
       : (resolveRequestedImageTag(repoRef) || 'latest');
+    const idLines = ids ? `OP_UID=${ids.uid}\nOP_GID=${ids.gid}\n` : '';
     const content = `# OpenPalm System Environment — system-managed, do not edit
 OP_HOME=${homeDir}
 OP_WORK_DIR=${workDir}
-OP_UID=${process.getuid?.() ?? 1000}
-OP_GID=${process.getgid?.() ?? 1000}
-OP_IMAGE_NAMESPACE=${process.env.OP_IMAGE_NAMESPACE || 'openpalm'}
+${idLines}OP_IMAGE_NAMESPACE=${process.env.OP_IMAGE_NAMESPACE || 'openpalm'}
 OP_IMAGE_TAG=${defaultImageTag}
 `;
     await Bun.write(systemEnvPath, content);
   } else {
-    const current = await Bun.file(systemEnvPath).text();
+    let current = await Bun.file(systemEnvPath).text();
     const reconciled = reconcileStackEnvImageTag(
       current,
       repoRef,
@@ -54,6 +58,54 @@ OP_IMAGE_TAG=${defaultImageTag}
     );
     if (reconciled !== current) {
       await Bun.write(systemEnvPath, reconciled);
+      current = reconciled;
     }
+
+    // Backfill OP_UID/OP_GID for installs created by older CLI versions
+    // that hard-coded 1000. Only fill missing/zero values — never override
+    // a value the operator may have set explicitly.
+    if (ids) {
+      backfillOperatorIds(systemEnvPath, current, ids);
+    }
+  }
+}
+
+function readEnvKey(content: string, key: string): string | undefined {
+  // Minimal key=value reader for OP_UID/OP_GID. Stack.env is system-managed
+  // and these lines are always plain numerics (no quotes, no interpolation),
+  // so this avoids pulling in a full env parser.
+  const re = new RegExp(`^\\s*${key}\\s*=\\s*(.*?)\\s*$`, 'm');
+  const m = content.match(re);
+  return m?.[1];
+}
+
+function backfillOperatorIds(
+  path: string,
+  current: string,
+  ids: { uid: number; gid: number },
+): void {
+  const parsed: Record<string, string> = {};
+  const uidValue = readEnvKey(current, 'OP_UID');
+  const gidValue = readEnvKey(current, 'OP_GID');
+  if (uidValue !== undefined) parsed.OP_UID = uidValue;
+  if (gidValue !== undefined) parsed.OP_GID = gidValue;
+
+  const patches: Array<[string, string]> = [];
+  if (!hasUsableOperatorId(parsed, 'OP_UID')) patches.push(['OP_UID', String(ids.uid)]);
+  if (!hasUsableOperatorId(parsed, 'OP_GID')) patches.push(['OP_GID', String(ids.gid)]);
+  if (patches.length === 0) return;
+
+  let next = current;
+  for (const [key, value] of patches) {
+    const re = new RegExp(`^${key}=.*$`, 'm');
+    if (re.test(next)) {
+      next = next.replace(re, `${key}=${value}`);
+    } else {
+      next = (next.endsWith('\n') ? next : next + '\n') + `${key}=${value}\n`;
+    }
+  }
+  if (next !== current) {
+    writeFileSync(path, next);
   }
 }
+

package/src/main.ts

@@ -10,7 +10,7 @@ export type { HostInfo } from './lib/host-info.ts';
 
 const SUBCOMMAND_NAMES = new Set([
   'install', 'uninstall', 'update', 'self-update', 'addon',
-  'start', 'stop', 'restart', 'logs', 'status', 'service',
+  'start', 'stop', 'restart', 'logs', 'status',
   'validate', 'scan', 'rollback', 'automations',
   '--help', '-h', 'help',
 ]);
@@ -114,7 +114,6 @@ export const mainCommand = defineCommand({
     restart: () => import('./commands/restart.ts').then((m) => m.default),
     logs: () => import('./commands/logs.ts').then((m) => m.default),
     status: () => import('./commands/status.ts').then((m) => m.default),
-    service: () => import('./commands/service.ts').then((m) => m.default),
     validate: () => import('./commands/validate.ts').then((m) => m.default),
     scan: () => import('./commands/scan.ts').then((m) => m.default),
     rollback: () => import('./commands/rollback.ts').then((m) => m.default),

package/src/commands/service.ts

@@ -1,76 +0,0 @@
-import { defineCommand } from 'citty';
-import { buildManagedServices } from '@openpalm/lib';
-import { ensureValidState } from '../lib/cli-state.ts';
-import { runComposeWithPreflight, runComposeReadOnly } from '../lib/cli-compose.ts';
-import { runLogsAction } from './logs.ts';
-import { runStartAction } from './start.ts';
-import { runStopAction } from './stop.ts';
-import { runRestartAction } from './restart.ts';
-
-const startCmd = defineCommand({
-  meta: { name: 'start', description: 'Start services' },
-  args: {
-    services: { type: 'positional', description: 'Service names', required: false },
-  },
-  async run({ args }) { await runStartAction(args._ ?? []); },
-});
-
-const stopCmd = defineCommand({
-  meta: { name: 'stop', description: 'Stop services' },
-  args: {
-    services: { type: 'positional', description: 'Service names', required: false },
-  },
-  async run({ args }) { await runStopAction(args._ ?? []); },
-});
-
-const restartCmd = defineCommand({
-  meta: { name: 'restart', description: 'Restart services' },
-  args: {
-    services: { type: 'positional', description: 'Service names', required: false },
-  },
-  async run({ args }) { await runRestartAction(args._ ?? []); },
-});
-
-const logsCmd = defineCommand({
-  meta: { name: 'logs', description: 'View service logs' },
-  args: {
-    services: { type: 'positional', description: 'Service names', required: false },
-  },
-  async run({ args }) { await runLogsAction(args._ ?? []); },
-});
-
-const updateCmd = defineCommand({
-  meta: { name: 'update', description: 'Pull latest images' },
-  async run() {
-    const state = ensureValidState();
-    const managedServices = await buildManagedServices(state);
-    console.log('Pulling latest images...');
-    await runComposeWithPreflight(state, ['pull', ...managedServices]);
-    console.log('Recreating containers...');
-    await runComposeWithPreflight(state, ['up', '-d', '--force-recreate', ...managedServices]);
-    console.log('Update complete.');
-  },
-});
-
-const statusCmd = defineCommand({
-  meta: { name: 'status', description: 'Show container status' },
-  async run() {
-    const state = ensureValidState();
-    await runComposeReadOnly(state, ['ps', '--format', 'table']);
-  },
-});
-
-export default defineCommand({
-  meta: {
-    name: 'service',
-    description: 'Service lifecycle operations (start|stop|restart|logs|update|status)',
-  },
-  subCommands: {
-    start: startCmd,
-    stop: stopCmd,
-    restart: restartCmd,
-    logs: logsCmd,
-    update: updateCmd,
-    status: statusCmd,
-  },
-});