miravo 0.6.0 → 0.6.2

package/src/commands/start/catalog-model-schema.ts

@@ -1,89 +0,0 @@
-/**
- * Builds a ModelSchema from raw YAML without the engine runtime.
- * Used by the catalog endpoints to serve model details for models
- * that may not be loaded into the current simulation.
- */
-
-import type { ModelSchema } from "@miravo/shared";
-import { TwinModelSchema } from "@miravo/shared";
-import { parse as parseYAML } from "yaml";
-
-/**
- * Parse a .twin.yaml file and return a ModelSchema.
- * Mirrors the logic in engine-introspection.ts getModelSchema()
- * but operates on the raw parsed YAML instead of runtime objects.
- */
-export async function buildModelSchemaFromYaml(modelPath: string): Promise<ModelSchema> {
-  const text = await Bun.file(modelPath).text();
-  const raw = TwinModelSchema.parse(parseYAML(text));
-
-  const parameters: Record<
-    string,
-    { type: string; default: number | string | boolean; unit?: string }
-  > = {};
-  if (raw.parameters) {
-    for (const [name, def] of Object.entries(raw.parameters)) {
-      parameters[name] = {
-        type: def.type,
-        default: def.default,
-        ...(def.unit ? { unit: def.unit } : {}),
-      };
-    }
-  }
-
-  const members: Record<string, ModelSchema["members"][string]> = {};
-  for (const [name, def] of Object.entries(raw.members)) {
-    const rawDefault = def.default;
-    members[name] = {
-      kind: def.kind,
-      dataType: def.data_type,
-      access: def.access,
-      unit: def.unit ?? null,
-      euRange: "eu_range" in def ? (def.eu_range ?? null) : null,
-      default:
-        typeof rawDefault === "number" ||
-        typeof rawDefault === "string" ||
-        typeof rawDefault === "boolean"
-          ? rawDefault
-          : null,
-    };
-  }
-
-  const methods: Record<string, ModelSchema["methods"][string]> = {};
-  if (raw.methods) {
-    for (const [name, def] of Object.entries(raw.methods)) {
-      methods[name] = {
-        description: def.description ?? null,
-        inputArguments: def.input_arguments
-          ? Object.entries(def.input_arguments).map(([argName, arg]) => ({
-              name: argName,
-              dataType: arg.data_type,
-              description: arg.description ?? null,
-            }))
-          : [],
-        outputArguments: def.output_arguments
-          ? Object.entries(def.output_arguments).map(([argName, arg]) => ({
-              name: argName,
-              dataType: arg.data_type,
-              description: arg.description ?? null,
-            }))
-          : [],
-      };
-    }
-  }
-
-  return {
-    name: raw.model.name,
-    description: raw.model.description ?? null,
-    parameters,
-    members,
-    methods,
-    faults: raw.faults?.map((f) => f.name) ?? [],
-    lifecycle: raw.lifecycle
-      ? {
-          stages: raw.lifecycle.stages.map((s) => s.name),
-          totalHours: raw.lifecycle.stages.reduce((sum, s) => sum + s.duration_hours[1], 0),
-        }
-      : null,
-  };
-}

package/src/commands/start/catalog-template-detail.ts

@@ -1,54 +0,0 @@
-/**
- * Builds a CatalogTemplateDetail from raw YAML.
- * Used by the catalog endpoint to serve template topology
- * for the inspect side sheet.
- */
-
-import type { CatalogTemplate, CatalogTemplateDetail } from "@miravo/shared";
-import { MiravoTemplateSchema } from "@miravo/shared";
-import { parse as parseYAML } from "yaml";
-
-export async function buildTemplateDetail(
-  templatePath: string,
-  base: CatalogTemplate,
-): Promise<CatalogTemplateDetail> {
-  const text = await Bun.file(templatePath).text();
-  const raw = MiravoTemplateSchema.parse(parseYAML(text));
-
-  const topology = raw.areas.map((area) => ({
-    name: area.name,
-    ...(area.protocol_scope ? { protocol_scope: area.protocol_scope } : {}),
-    lines: area.lines.map((line) => ({
-      name: line.name,
-      ...(line.protocol_scope ? { protocol_scope: line.protocol_scope } : {}),
-      twins: line.twins.map((twin) => ({
-        model: twin.model,
-        count: twin.count,
-        variation: twin.variation,
-        ...(twin.parameters ? { parameters: twin.parameters } : {}),
-        ...(twin.protocol_scope ? { protocol_scope: twin.protocol_scope } : {}),
-      })),
-    })),
-  }));
-
-  // Extract namespace (ISA-95 or flat)
-  const namespace = raw.namespace
-    ? "enterprise" in raw.namespace
-      ? { enterprise: raw.namespace.enterprise, site: raw.namespace.site }
-      : { prefix: raw.namespace.prefix }
-    : undefined;
-
-  return {
-    ...base,
-    topology,
-    ...(namespace ? { namespace } : {}),
-    ...(raw.settings
-      ? {
-          settings: {
-            tickIntervalMs: raw.settings.tick_interval_ms,
-            timeMultiplier: raw.settings.time_multiplier,
-          },
-        }
-      : {}),
-  };
-}

package/src/commands/start/daemon.ts

@@ -1,255 +0,0 @@
-import { resolve } from "node:path";
-import {
-  DEFAULT_MODBUS_PORT,
-  DEFAULT_MQTT_PORT,
-  DEFAULT_OPCUA_PORT,
-  MiravoError,
-} from "@miravo/shared";
-import { colors } from "consola/utils";
-import type { DaemonRegistryEntry } from "../../lib/daemon-registry.ts";
-import {
-  acquireNameLock,
-  checkNameConflict,
-  checkPortConflicts,
-  displayHost,
-  isPidAlive,
-  writeEntry,
-} from "../../lib/daemon-registry.ts";
-import { controlLog, writeOutput } from "../../logger.ts";
-
-// ---------------------------------------------------------------------------
-// Detach mode — spawn background simulation
-// ---------------------------------------------------------------------------
-
-interface DetachOptions {
-  readonly simulationName: string;
-  readonly templatePath: string;
-  readonly seed: number;
-  readonly seedExplicit: boolean;
-  readonly adminHost: string;
-  readonly adminPort: number;
-  readonly mqttPort: number | undefined;
-  readonly mqttHost: string | undefined;
-  readonly mqttEmbedded: boolean;
-  readonly mqttEnabled: boolean;
-  readonly opcuaPort: number | undefined;
-  readonly opcuaHost: string | undefined;
-  readonly opcuaEnabled: boolean;
-  readonly modbusPort: number | undefined;
-  readonly modbusHost: string | undefined;
-  readonly modbusEnabled: boolean;
-}
-
-export async function detachAction(opts: DetachOptions): Promise<void> {
-  const { simulationName } = opts;
-
-  // 1. Acquire exclusive lock to prevent concurrent starts
-  const releaseLock = await acquireNameLock(simulationName);
-  try {
-    await detachActionLocked(opts, releaseLock);
-  } catch (error) {
-    await releaseLock();
-    throw error;
-  }
-}
-
-async function detachActionLocked(
-  opts: DetachOptions,
-  releaseLock: () => Promise<void>,
-): Promise<void> {
-  const { simulationName, adminHost, adminPort } = opts;
-
-  // 1. Check name conflict
-  const existing = await checkNameConflict(simulationName);
-  if (existing) {
-    throw new MiravoError(
-      `Simulation "${simulationName}" is already running (PID ${existing.pid}).`,
-      `Stop it first: miravo stop ${simulationName}`,
-    );
-  }
-
-  // 2. Check port conflicts
-  const ports = new Map<string, number>();
-  ports.set("admin", adminPort);
-  if (opts.mqttEnabled && opts.mqttEmbedded && opts.mqttPort !== undefined) {
-    ports.set("mqtt", opts.mqttPort);
-  }
-  if (opts.opcuaEnabled && opts.opcuaPort !== undefined) ports.set("opcua", opts.opcuaPort);
-  if (opts.modbusEnabled && opts.modbusPort !== undefined) ports.set("modbus", opts.modbusPort);
-
-  const conflicts = await checkPortConflicts(ports);
-  if (conflicts.length > 0) {
-    throw new MiravoError(
-      conflicts[0] ?? "Port conflict detected.",
-      "Use different port options or stop the conflicting simulation.",
-    );
-  }
-
-  // 3. Generate run ID and rebuild args
-  const runId = crypto.randomUUID();
-  const childArgs = rebuildArgsForDetach(opts);
-
-  // 4. Spawn child process
-  controlLog.info(`Starting simulation "${simulationName}" in background...`);
-  const proc = Bun.spawn({
-    cmd: [process.execPath, ...childArgs],
-    stdin: "ignore",
-    stdout: "ignore",
-    stderr: "ignore",
-    env: {
-      ...process.env,
-      MIRAVO_DAEMON_RUN_ID: runId,
-    },
-  });
-  proc.unref();
-
-  // 5. Poll for readiness
-  const adminUrl = `http://${adminHost}:${adminPort}`;
-  const ready = await pollReadiness(proc.pid, adminUrl, runId, 10, 1_000);
-
-  if (!ready) {
-    // Kill child if still alive
-    if (isPidAlive(proc.pid)) {
-      try {
-        process.kill(proc.pid, "SIGKILL");
-      } catch {
-        // Ignore kill errors
-      }
-    }
-
-    throw new MiravoError(
-      `Simulation "${simulationName}" failed to start within the readiness timeout.`,
-      "Check template and port availability. Run without -d to see full output.",
-    );
-  }
-
-  // 6. Write registry entry
-  const adapters: DaemonRegistryEntry["adapters"] = {};
-  if (opts.mqttEnabled) {
-    const mqttPort = opts.mqttPort ?? DEFAULT_MQTT_PORT;
-    adapters["mqtt"] = { port: mqttPort, host: opts.mqttHost ?? "0.0.0.0" };
-  }
-  if (opts.opcuaEnabled) {
-    const opcuaPort = opts.opcuaPort ?? DEFAULT_OPCUA_PORT;
-    adapters["opcua"] = { port: opcuaPort, host: opts.opcuaHost ?? "0.0.0.0" };
-  }
-  if (opts.modbusEnabled) {
-    const modbusPort = opts.modbusPort ?? DEFAULT_MODBUS_PORT;
-    adapters["modbus"] = { port: modbusPort, host: opts.modbusHost ?? "0.0.0.0" };
-  }
-
-  const entry: DaemonRegistryEntry = {
-    name: simulationName,
-    pid: proc.pid,
-    adminPort,
-    adminHost,
-    adapters,
-    templatePath: resolve(opts.templatePath),
-    startedAt: new Date().toISOString(),
-    seed: opts.seed,
-    runId,
-  };
-  try {
-    await writeEntry(entry);
-  } catch (err) {
-    // Registry write failed — kill the orphan child so it doesn't run invisible
-    // to miravo ps/stop/rm.
-    try {
-      process.kill(proc.pid, "SIGKILL");
-    } catch {
-      // Process may have already exited
-    }
-    throw err;
-  }
-  await releaseLock();
-
-  // 7. Print detach summary
-  printDetachSummary(entry);
-  process.exit(0);
-}
-
-function rebuildArgsForDetach(opts: DetachOptions): string[] {
-  // Start from the original argv, filtering out -d/--detach
-  const originalArgs = process.argv.slice(1); // skip bun/node executable
-  const filtered: string[] = [];
-  let hasName = false;
-  let hasSeed = false;
-
-  for (let i = 0; i < originalArgs.length; i++) {
-    const arg = originalArgs[i];
-    if (arg === undefined) continue;
-    if (arg === "-d" || arg === "--detach") continue;
-    if (arg === "-n" || arg === "--name") hasName = true;
-    if (arg === "--seed") hasSeed = true;
-    filtered.push(arg);
-  }
-
-  // Inject --name if not explicitly passed (ensures child uses same resolved name)
-  if (!hasName) {
-    filtered.push("--name", opts.simulationName);
-  }
-  // Inject --seed to freeze the seed (so child reproduces the same simulation)
-  if (!hasSeed) {
-    filtered.push("--seed", String(opts.seed));
-  }
-
-  return filtered;
-}
-
-async function pollReadiness(
-  pid: number,
-  adminUrl: string,
-  runId: string,
-  maxRetries: number,
-  intervalMs: number,
-): Promise<boolean> {
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
-    await Bun.sleep(intervalMs);
-
-    if (!isPidAlive(pid)) return false;
-
-    try {
-      // Use /readyz to verify identity via runId. Accept any status (not just "ok")
-      // so external-MQTT daemons with slow broker reconnect can still start.
-      const response = await fetch(`${adminUrl}/readyz`, {
-        signal: AbortSignal.timeout(2_000),
-      });
-      const body = (await response.json()) as Record<string, unknown>;
-      if (body["runId"] === runId) return true;
-    } catch {
-      // Not ready yet — retry
-    }
-  }
-  return false;
-}
-
-function printDetachSummary(entry: DaemonRegistryEntry): void {
-  const admin = `http://${displayHost(entry.adminHost)}:${entry.adminPort}`;
-  const lines = [
-    `Simulation "${entry.name}" started in background (PID ${entry.pid})`,
-    "",
-    `  Console   ${admin}`,
-  ];
-
-  for (const [name, adapter] of Object.entries(entry.adapters) as [
-    string,
-    { port: number; host: string },
-  ][]) {
-    const host = displayHost(adapter.host);
-    if (name === "mqtt") {
-      lines.push(`  MQTT      mqtt://${host}:${adapter.port}`);
-    } else if (name === "opcua") {
-      lines.push(`  OPC UA    opc.tcp://${host}:${adapter.port}`);
-    } else if (name === "modbus") {
-      lines.push(`  Modbus    modbus://${host}:${adapter.port}`);
-    } else {
-      lines.push(`  ${name}      ${host}:${adapter.port}`);
-    }
-  }
-
-  lines.push("");
-  lines.push(`  Use ${colors.cyan(`miravo logs ${entry.name}`)} to view events`);
-  lines.push(`  Use ${colors.cyan(`miravo stop ${entry.name}`)} to stop`);
-
-  writeOutput(lines.join("\n"));
-}

package/src/commands/start/display.ts

@@ -1,150 +0,0 @@
-import { basename } from "node:path";
-import type { Engine } from "@miravo/core";
-import type { MiravoTemplate, TwinModel } from "@miravo/shared";
-import { MIRAVO_VERSION } from "@miravo/shared";
-import { box, colors } from "consola/utils";
-import { forEachTwin } from "../../lib/template-utils.ts";
-import { configLog, engineLog, isPlain, writeOutput } from "../../logger.ts";
-import { formatKeyValue, formatTable, sep } from "../../output.ts";
-
-// ---------------------------------------------------------------------------
-// Step 6: Startup banner
-// ---------------------------------------------------------------------------
-
-export function printStartupBanner(
-  templatePath: string,
-  engine: Engine,
-  seed: number,
-  seedExplicit: boolean,
-  mqttEndpoint: string | null,
-  opcuaEndpoint: string | null,
-  modbusEndpoint: string | null,
-  simulationName: string,
-  adminEndpoint: string,
-): void {
-  const state = engine.getState();
-  // Tier 1: identity — name, instance count, model count
-  const identity =
-    `    ${colors.bold(simulationName)}` +
-    `${sep}${colors.bold(String(state.instances.length))} instances` +
-    `${sep}${colors.bold(String(state.models.length))} models`;
-
-  // Tier 2: active endpoints only — disabled adapters are omitted
-  const endpointEntries: Array<readonly [string, string]> = [
-    [colors.dim("Admin"), colors.cyan(adminEndpoint)],
-  ];
-  if (mqttEndpoint) endpointEntries.push([colors.dim("MQTT"), colors.cyan(mqttEndpoint)]);
-  if (opcuaEndpoint) endpointEntries.push([colors.dim("OPC UA"), colors.cyan(opcuaEndpoint)]);
-  if (modbusEndpoint) endpointEntries.push([colors.dim("Modbus"), colors.cyan(modbusEndpoint)]);
-
-  // Tier 3: config footer — compact, all dimmed, one line
-  const seedStr = seedExplicit ? `seed ${seed}` : `seed ${seed} (random)`;
-  const configFooter = colors.dim(
-    `    ${basename(templatePath)} · ${state.config.tickIntervalMs}ms · ${state.config.timeMultiplier}x · ${seedStr}`,
-  );
-
-  const content = [identity, "", formatKeyValue(endpointEntries), "", configFooter].join("\n");
-  const header = `${colors.cyan(colors.bold("Miravo"))} ${colors.dim(`v${MIRAVO_VERSION}`)}`;
-
-  if (isPlain()) {
-    writeOutput(header);
-    writeOutput(content);
-    writeOutput();
-    engineLog.start("Press Ctrl+C to stop.");
-    return;
-  }
-
-  writeOutput(
-    box(content, {
-      title: header,
-      style: { borderColor: "cyan", borderStyle: "rounded" },
-    }),
-  );
-  engineLog.start("Press Ctrl+C to stop.");
-}
-
-// ---------------------------------------------------------------------------
-// Step 3: Dry-run summary
-// ---------------------------------------------------------------------------
-
-export function printDryRunSummary(
-  template: MiravoTemplate,
-  models: Map<string, TwinModel>,
-  seed: number,
-  seedExplicit: boolean,
-  templatePath: string,
-): void {
-  configLog.success("Dry-run validation passed.");
-
-  const seedValue = seedExplicit
-    ? colors.bold(String(seed))
-    : `${colors.bold(String(seed))} ${colors.gray("(random — add seed to config to reproduce)")}`;
-
-  const lines: string[] = [];
-
-  lines.push(
-    formatKeyValue([
-      [colors.dim("Template"), templatePath],
-      [colors.dim("Seed"), seedValue],
-    ]),
-  );
-
-  // Model table
-  const modelRows = [...models.values()].map((m) => ({
-    name: colors.cyan(m.model.name),
-    members: String(Object.keys(m.members).length),
-    faults: String(m.faults?.length ?? 0),
-    lifecycle: m.lifecycle ? `${m.lifecycle.stages.length} stages` : colors.dim("none"),
-  }));
-
-  if (modelRows.length > 0) {
-    lines.push("");
-    lines.push(`  ${colors.bold("Models:")}`);
-    lines.push(
-      formatTable(
-        {
-          name: colors.dim("Name"),
-          members: colors.dim("Members"),
-          faults: colors.dim("Faults"),
-          lifecycle: colors.dim("Lifecycle"),
-        },
-        modelRows,
-      ),
-    );
-  }
-
-  // Instance summary
-  let totalInstances = 0;
-  let totalMembers = 0;
-  forEachTwin(template, (_area, _line, twin) => {
-    totalInstances += twin.count;
-    const model = models.get(twin.model);
-    if (model) {
-      totalMembers += twin.count * Object.keys(model.members).length;
-    }
-  });
-
-  lines.push("");
-  lines.push(
-    formatKeyValue([
-      [colors.dim("Total instances"), colors.bold(String(totalInstances))],
-      [colors.dim("Total members"), colors.bold(String(totalMembers))],
-    ]),
-  );
-
-  if (isPlain()) {
-    writeOutput("Summary");
-    for (const line of lines) {
-      writeOutput(line);
-    }
-    writeOutput();
-    return;
-  }
-
-  writeOutput(
-    box(lines.join("\n"), {
-      title: " Summary ",
-      style: { borderColor: "cyan", borderStyle: "rounded" },
-    }),
-  );
-}