@git.zone/cli 3.2.1 → 4.0.0

package/ts/mod_services/index.ts

@@ -3,6 +3,13 @@ import * as helpers from "./helpers.js";
 import { ServiceManager } from "./classes.servicemanager.js";
 import { GlobalRegistry } from "./classes.globalregistry.js";
 import { getServiceDataDirectory } from "./classes.servicedatamarker.js";
+import {
+  allowedServiceNames,
+  normalizeUserServiceName,
+  normalizeUserServiceNames,
+  readPersistedServiceConfiguration,
+} from "./classes.servicenames.js";
+import { runServiceMigrations } from "../../ts_migration/index.js";
 import {
   ServicePruner,
   defaultStaleDays,
@@ -34,6 +41,7 @@ export const run = async (argvArg: any) => {
 
   // Handle global commands first
   if (isGlobal) {
+    await runServiceMigrations({ scopes: ["global-registry"] });
     await handleGlobalCommand(command, argvArg, mode);
     return;
   }
@@ -44,26 +52,43 @@ export const run = async (argvArg: any) => {
     case "config":
       if (service === "services" || argvArg._[2] === "services") {
         const serviceManager = new ServiceManager();
-        await serviceManager.init();
+        await serviceManager.init("config");
         await handleConfigureServices(serviceManager);
       } else {
+        await runServiceMigrations({
+          projectPath: process.cwd(),
+          scopes: ["service-selection", "runtime-config"],
+        });
         await handleShowConfig(mode);
       }
       break;
 
     case "set":
+      await runServiceMigrations({
+        projectPath: process.cwd(),
+        scopes: ["service-selection"],
+      });
       await handleSetServices(argvArg._[2], mode);
       break;
 
     case "enable":
+      await runServiceMigrations({
+        projectPath: process.cwd(),
+        scopes: ["service-selection"],
+      });
       await handleEnableServices(argvArg._.slice(2), mode);
       break;
 
     case "disable":
+      await runServiceMigrations({
+        projectPath: process.cwd(),
+        scopes: ["service-selection"],
+      });
       await handleDisableServices(argvArg._.slice(2), mode);
       break;
 
     case "prune":
+      await runServiceMigrations({ scopes: ["global-registry"] });
       await handlePrune(argvArg, mode);
       break;
 
@@ -83,7 +108,7 @@ export const run = async (argvArg: any) => {
       const serviceManager = new ServiceManager();
       // Initialisation is chatty. In JSON mode that chatter would land on stdout
       // ahead of the payload and make the output unparseable.
-      await withJsonSafeOutput(mode, () => serviceManager.init());
+      await withJsonSafeOutput(mode, () => serviceManager.init(command));
 
       switch (command) {
         case "start":
@@ -152,34 +177,11 @@ async function withJsonSafeOutput<T>(
   return runWithSuppressedOutput(work);
 }
 
-const allowedServices = ["mongodb", "minio", "elasticsearch"];
-
-const normalizeServiceName = (service: string): string => {
-  switch (service) {
-    case "mongo":
-    case "mongodb":
-      return "mongodb";
-    case "minio":
-    case "s3":
-      return "minio";
-    case "elastic":
-    case "elasticsearch":
-    case "es":
-      return "elasticsearch";
-    default:
-      return service;
-  }
-};
-
 async function readServicesConfig(): Promise<{
   enabledServices: string[];
   environment: Record<string, any> | null;
 }> {
-  const smartconfigData = await readSmartconfigFile();
-  const enabledServices = getCliConfigValueFromData(
-    smartconfigData,
-    "services",
-  );
+  const enabledServices = await readPersistedServiceConfiguration();
   let environment: Record<string, any> | null = null;
   const envPath = plugins.path.join(process.cwd(), ".nogit", "env.json");
   if (await plugins.smartfs.file(envPath).exists()) {
@@ -191,7 +193,7 @@ async function readServicesConfig(): Promise<{
   }
 
   return {
-    enabledServices: Array.isArray(enabledServices) ? enabledServices : [],
+    enabledServices,
     environment,
   };
 }
@@ -206,7 +208,15 @@ async function handleShowConfig(mode: ICliMode) {
   const configData = await readServicesConfig();
 
   if (mode.json) {
-    printJson(configData);
+    const environment = configData.environment
+      ? {
+          ...configData.environment,
+          S3_ACCESSKEY: "***",
+          S3_SECRETKEY: "***",
+          S3_ADMIN_PASSWORD: "***",
+        }
+      : null;
+    printJson({ ...configData, environment });
     return;
   }
 
@@ -242,15 +252,15 @@ async function handleShowConfig(mode: ICliMode) {
   logger.log("info", `  Connection: ${env.MONGODB_URL}`);
   console.log();
 
-  logger.log("note", "S3/MinIO:");
+  logger.log("note", "S3/ObjectStorage:");
   logger.log("info", `  Host: ${env.S3_HOST}`);
   logger.log("info", `  API Port: ${env.S3_PORT}`);
-  logger.log("info", `  Console Port: ${env.S3_CONSOLE_PORT}`);
+  logger.log("info", `  Management UI Port: ${env.S3_UI_PORT}`);
   logger.log("info", `  Bucket: ${env.S3_BUCKET}`);
-  logger.log("info", `  Container: ${env.PROJECT_NAME}-minio`);
+  logger.log("info", `  Container: ${env.PROJECT_NAME}-objectstorage`);
   logger.log(
     "info",
-    `  Data: ${getServiceDataDirectory(process.cwd(), "minio")}`,
+    `  Data: ${getServiceDataDirectory(process.cwd(), "objectstorage")}`,
   );
   logger.log("info", `  Endpoint: ${env.S3_ENDPOINT}`);
   console.log();
@@ -274,10 +284,7 @@ async function handleSetServices(rawValue: string | undefined, mode: ICliMode) {
     throw new Error("Specify a comma-separated list of services");
   }
 
-  const requestedServices = rawValue
-    .split(",")
-    .map((service) => normalizeServiceName(service.trim()))
-    .filter(Boolean);
+  const requestedServices = normalizeUserServiceNames(rawValue.split(","));
   validateRequestedServices(requestedServices);
   await updateEnabledServices(requestedServices);
 
@@ -294,7 +301,7 @@ async function handleEnableServices(
   mode: ICliMode,
 ) {
   const normalizedServices = requestedServices.map((service) =>
-    normalizeServiceName(service),
+    normalizeUserServiceName(service),
   );
   validateRequestedServices(normalizedServices);
 
@@ -317,7 +324,7 @@ async function handleDisableServices(
   mode: ICliMode,
 ) {
   const normalizedServices = requestedServices.map((service) =>
-    normalizeServiceName(service),
+    normalizeUserServiceName(service),
   );
   validateRequestedServices(normalizedServices);
 
@@ -341,7 +348,7 @@ function validateRequestedServices(services: string[]): void {
   }
 
   const invalidServices = services.filter(
-    (service) => !allowedServices.includes(service),
+    (service) => !allowedServiceNames.some((allowed) => allowed === service),
   );
   if (invalidServices.length > 0) {
     throw new Error(`Unknown service(s): ${invalidServices.join(", ")}`);
@@ -360,9 +367,9 @@ async function handleStart(
         await serviceManager.startMongoDB();
         break;
 
-      case "minio":
+      case "objectstorage":
       case "s3":
-        await serviceManager.startMinIO();
+        await serviceManager.startObjectStorage();
         break;
 
       case "elasticsearch":
@@ -389,7 +396,7 @@ async function handleStart(
     const started = await runWithSuppressedOutput(startService);
     if (!started) {
       throw new Error(
-        `Unknown service: ${service}. Use: mongo, s3, elasticsearch, or all`,
+        `Unknown service: ${service}. Use: mongo, objectstorage, s3, elasticsearch, or all`,
       );
     }
     printJson(await serviceManager.collectStatus());
@@ -399,7 +406,7 @@ async function handleStart(
   helpers.printHeader("Starting Services");
   if (!(await startService())) {
     logger.log("error", `Unknown service: ${service}`);
-    logger.log("note", "Use: mongo, s3, elasticsearch, or all");
+    logger.log("note", "Use: mongo, objectstorage, s3, elasticsearch, or all");
     return;
   }
   await printStaleHint();
@@ -447,9 +454,9 @@ async function handleStop(serviceManager: ServiceManager, service: string) {
       await serviceManager.stopMongoDB();
       break;
 
-    case "minio":
+    case "objectstorage":
     case "s3":
-      await serviceManager.stopMinIO();
+      await serviceManager.stopObjectStorage();
       break;
 
     case "elasticsearch":
@@ -464,13 +471,14 @@ async function handleStop(serviceManager: ServiceManager, service: string) {
 
     default:
       logger.log("error", `Unknown service: ${service}`);
-      logger.log("note", "Use: mongo, s3, elasticsearch, or all");
+      logger.log("note", "Use: mongo, objectstorage, s3, elasticsearch, or all");
       break;
   }
 }
 
-async function handleRestart(serviceManager: ServiceManager, service: string) {
+export async function handleRestart(serviceManager: ServiceManager, service: string) {
   helpers.printHeader("Restarting Services");
+  let restarted = false;
 
   switch (service) {
     case "mongo":
@@ -478,13 +486,16 @@ async function handleRestart(serviceManager: ServiceManager, service: string) {
       await serviceManager.stopMongoDB();
       await plugins.smartdelay.delayFor(2000);
       await serviceManager.startMongoDB();
+      restarted = true;
       break;
 
-    case "minio":
+    case "objectstorage":
     case "s3":
-      await serviceManager.stopMinIO();
+      await serviceManager.assertObjectStorageStartupAllowed();
+      await serviceManager.stopObjectStorage();
       await plugins.smartdelay.delayFor(2000);
-      await serviceManager.startMinIO();
+      await serviceManager.startObjectStorage();
+      restarted = true;
       break;
 
     case "elasticsearch":
@@ -492,19 +503,28 @@ async function handleRestart(serviceManager: ServiceManager, service: string) {
       await serviceManager.stopElasticsearch();
       await plugins.smartdelay.delayFor(2000);
       await serviceManager.startElasticsearch();
+      restarted = true;
       break;
 
     case "all":
     case "":
+      if (serviceManager.isServiceEnabled("objectstorage")) {
+        await serviceManager.assertObjectStorageStartupAllowed();
+      }
       await serviceManager.stopAll();
       await plugins.smartdelay.delayFor(2000);
       await serviceManager.startAll();
+      restarted = true;
       break;
 
     default:
       logger.log("error", `Unknown service: ${service}`);
       break;
   }
+
+  if (restarted) {
+    await serviceManager.registerWithGlobalRegistry();
+  }
 }
 
 async function handleRemove(serviceManager: ServiceManager, mode: ICliMode) {
@@ -574,7 +594,7 @@ async function handleAuth(
   rawValue: string | undefined,
   mode: ICliMode,
 ) {
-  const service = normalizeServiceName((rawService || "").trim());
+  const service = normalizeUserServiceName((rawService || "").trim());
   if (service !== "mongodb") {
     throw new Error(
       "Only `mongodb` supports an auth toggle. Usage: gitzone services auth mongodb <on|off>",
@@ -588,7 +608,7 @@ async function handleAuth(
 
   const serviceManager = new ServiceManager();
   const configuration = await withJsonSafeOutput(mode, async () => {
-    await serviceManager.init();
+    await serviceManager.init("auth");
     const resolvedConfiguration = serviceManager.getConfiguration();
     await resolvedConfiguration.setMongoAuthEnabled(value === "on");
     return resolvedConfiguration;
@@ -821,7 +841,7 @@ export function showHelp(mode?: ICliMode) {
       examples: [
         "gitzone services config --json",
         "gitzone services status --json",
-        "gitzone services set mongodb,minio",
+        "gitzone services set mongodb,objectstorage",
         "gitzone services enable elasticsearch",
         "gitzone services auth mongodb off",
         "gitzone services prune",
@@ -839,15 +859,15 @@ export function showHelp(mode?: ICliMode) {
   logger.log("note", "Commands:");
   logger.log(
     "info",
-    "  start [service]   Start services (mongo|s3|elasticsearch|all)",
+    "  start [service]   Start services (mongo|objectstorage|s3|elasticsearch|all)",
   );
   logger.log(
     "info",
-    "  stop [service]    Stop services (mongo|s3|elasticsearch|all)",
+    "  stop [service]    Stop services (mongo|objectstorage|s3|elasticsearch|all)",
   );
   logger.log(
     "info",
-    "  restart [service] Restart services (mongo|s3|elasticsearch|all)",
+    "  restart [service] Restart services (mongo|objectstorage|s3|elasticsearch|all)",
   );
   logger.log("info", "  status            Show service status");
   logger.log("info", "  config            Show current configuration");
@@ -867,7 +887,7 @@ export function showHelp(mode?: ICliMode) {
   );
   logger.log(
     "info",
-    "  logs [service]    Show logs (mongo|s3|elasticsearch|all) [lines]",
+    "  logs [service]    Show logs (mongo|objectstorage|s3|elasticsearch|all) [lines]",
   );
   logger.log("info", "  reconfigure       Reassign ports and restart services");
   logger.log(
@@ -898,7 +918,7 @@ export function showHelp(mode?: ICliMode) {
 
   logger.log("note", "Available Services:");
   logger.log("info", "  • MongoDB (mongo) - Document database");
-  logger.log("info", "  • MinIO (s3) - S3-compatible object storage");
+  logger.log("info", "  • ObjectStorage (s3) - S3-compatible object storage");
   logger.log(
     "info",
     "  • Elasticsearch (elasticsearch) - Search and analytics engine",
@@ -909,7 +929,7 @@ export function showHelp(mode?: ICliMode) {
   logger.log("info", "  • Auto-creates .nogit/env.json with smart defaults");
   logger.log(
     "info",
-    "  • Random ports (20000-30000) for MongoDB/MinIO to avoid conflicts",
+    "  • Random ports (20000-30000) for MongoDB/ObjectStorage to avoid conflicts",
   );
   logger.log("info", "  • Elasticsearch uses standard port 9200");
   logger.log(
@@ -951,7 +971,7 @@ export function showHelp(mode?: ICliMode) {
   );
   logger.log(
     "info",
-    "  gitzone services set mongodb,minio   # Configure services without prompts",
+    "  gitzone services set mongodb,objectstorage # Configure services without prompts",
   );
   logger.log(
     "info",
@@ -1077,6 +1097,13 @@ async function handleGlobalStatus(globalRegistry: GlobalRegistry) {
 
     for (const container of project.containers) {
       totalContainers++;
+      if (container.ownership === "conflict") {
+        logger.log(
+          "error",
+          `   ❓ ${container.name}: ownership conflict (not managed)`,
+        );
+        continue;
+      }
       const statusIcon =
         container.status === "running"
           ? "🟢"
@@ -1107,7 +1134,7 @@ async function handleGlobalStop(globalRegistry: GlobalRegistry) {
   let runningCount = 0;
   for (const project of statuses) {
     for (const container of project.containers) {
-      if (container.status === "running") runningCount++;
+      if (container.status === "running" && container.ownership !== "conflict") runningCount++;
     }
   }
 
@@ -1125,7 +1152,7 @@ async function handleGlobalStop(globalRegistry: GlobalRegistry) {
   // Show what will be stopped
   for (const project of statuses) {
     const runningContainers = project.containers.filter(
-      (c) => c.status === "running",
+      (c) => c.status === "running" && c.ownership !== "conflict",
     );
     if (runningContainers.length > 0) {
       logger.log("info", `${project.projectName}:`);

package/ts/mod_standard/index.ts

@@ -206,7 +206,7 @@ export async function showHelp(
   console.log("  gitzone release --plan");
   console.log("  gitzone format plan --json");
   console.log("  gitzone format check");
-  console.log("  gitzone services set mongodb,minio");
+  console.log("  gitzone services set mongodb,objectstorage");
   console.log("  gitzone tools update");
   console.log("");
   console.log("Run gitzone <command> --help for command-specific usage.");

package/ts/plugins.ts

@@ -15,6 +15,8 @@ import * as smartfile from '@push.rocks/smartfile';
 import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs';
 import * as smartinteract from '@push.rocks/smartinteract';
 import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartbucket from '@push.rocks/smartbucket';
+import * as s3 from '@aws-sdk/client-s3';
 
 // Create smartfs instance for filesystem operations
 export const smartfs = new SmartFs(new SmartFsProviderNode());
@@ -36,4 +38,6 @@ export {
   smartfile,
   smartinteract,
   smartdelay,
+  smartbucket,
+  s3,
 };

package/ts_migration/001.service-selection.ts

@@ -0,0 +1,77 @@
+import {
+  getCliConfigValueFromData,
+  getCliNamespaceConfig,
+  readSmartconfigFile,
+  setCliConfigValueInData,
+  writeSmartconfigFile,
+} from '../ts/helpers.smartconfig.js';
+import {
+  allowedServiceNames,
+  assertSupportedCliSchema,
+  normalizeUserServiceName,
+} from '../ts/mod_services/classes.servicenames.js';
+
+export interface IServiceSelectionMigrationResult {
+  services: string[];
+  migrated: boolean;
+}
+
+/** Normalize only persisted values, including the exact shipped legacy identifier. */
+export const migratePersistedServiceNamesValue = (
+  servicesArg: unknown,
+): IServiceSelectionMigrationResult => {
+  if (servicesArg === undefined) {
+    return { services: [], migrated: false };
+  }
+  if (!Array.isArray(servicesArg)) {
+    throw new Error('Persisted services configuration must be an array of service names.');
+  }
+  if (!servicesArg.every((service) => typeof service === 'string')) {
+    throw new Error('Persisted services configuration must contain only service names.');
+  }
+
+  const services: string[] = [];
+  let migrated = false;
+  for (const rawService of servicesArg) {
+    const canonical =
+      rawService === 'minio' ? 'objectstorage' : normalizeUserServiceName(rawService);
+    if (!allowedServiceNames.some((allowedService) => allowedService === canonical)) {
+      throw new Error('Persisted services configuration contains an unsupported service name.');
+    }
+    if (canonical !== rawService) {
+      migrated = true;
+    }
+    if (!services.includes(canonical)) {
+      services.push(canonical);
+    } else {
+      migrated = true;
+    }
+  }
+  return { services, migrated };
+};
+
+/** Persist canonical service identifiers while retaining the flat tsdeploy input shape. */
+export const preflightServiceSelectionMigration = async (
+  cwdArg: string = process.cwd(),
+): Promise<string[]> => {
+  const smartconfigData = await readSmartconfigFile(cwdArg);
+  assertSupportedCliSchema(getCliNamespaceConfig(smartconfigData));
+  return migratePersistedServiceNamesValue(
+    getCliConfigValueFromData(smartconfigData, 'services'),
+  ).services;
+};
+
+export const runServiceSelectionMigration = async (
+  cwdArg: string = process.cwd(),
+): Promise<string[]> => {
+  await preflightServiceSelectionMigration(cwdArg);
+  const smartconfigData = await readSmartconfigFile(cwdArg);
+  assertSupportedCliSchema(getCliNamespaceConfig(smartconfigData));
+  const rawServices = getCliConfigValueFromData(smartconfigData, 'services');
+  const migration = migratePersistedServiceNamesValue(rawServices);
+  if (migration.migrated) {
+    setCliConfigValueInData(smartconfigData, 'services', migration.services);
+    await writeSmartconfigFile(smartconfigData, cwdArg);
+  }
+  return migration.services;
+};