@miosa/cli 1.0.52 → 1.0.53

package/dist/commands/sandbox.js

@@ -383,9 +383,6 @@ export function register(program) {
         .allowExcessArguments()
         .option("--cwd <path>", "Working directory inside the Sandbox")
         .option("--workdir <path>", "Alias for --cwd")
-        .option("--cmd <command>", "Explicit command string to run; avoids CLI parsing command flags")
-        .option("--command <command>", "Alias for --cmd")
-        .option("--shell-cmd <shell>", "Run --cmd through this shell, e.g. 'bash -lc'")
         .option("--env <pair>", "Environment variable KEY=VALUE. Repeatable.", collectOption, [])
         .option("--background", "Start the command in the background and return immediately")
         .option("--detached", "Create a durable backend command and return command_id immediately")
@@ -403,7 +400,7 @@ export function register(program) {
             await postAndPrint(`/sandboxes/${enc(id)}/exec`, opts, {});
             return;
         }
-        const cmd = resolveSandboxCommand(words, opts);
+        const cmd = joinCommandWords(words);
         const effectiveCommand = opts.background
             ? backgroundCommand(cmd)
             : cmd;
@@ -417,7 +414,7 @@ export function register(program) {
         }
         const env = parseEnvPairs(opts.env ?? []);
         if (opts.detached) {
-            const result = await createSandboxCommand(id, cmd, {
+            const result = await createSandboxCommand(id, words.join(" "), {
                 cwd,
                 env,
                 user: opts.user,
@@ -451,9 +448,6 @@ export function register(program) {
         .allowExcessArguments()
         .option("--cwd <path>", "Working directory inside the Sandbox")
         .option("--workdir <path>", "Alias for --cwd")
-        .option("--cmd <command>", "Explicit command string to run; avoids CLI parsing command flags")
-        .option("--command <command>", "Alias for --cmd")
-        .option("--shell-cmd <shell>", "Run --cmd through this shell, e.g. 'bash -lc'")
         .option("--env <pair>", "Environment variable KEY=VALUE. Repeatable.", collectOption, [])
         .option("--background", "Start the command in the background and return immediately")
         .option("--detached", "Create a durable backend command and return command_id immediately")
@@ -471,7 +465,7 @@ export function register(program) {
             await postAndPrint(`/sandboxes/${enc(id)}/exec`, opts, {});
             return;
         }
-        const cmd = resolveSandboxCommand(words, opts);
+        const cmd = joinCommandWords(words);
         const effectiveCommand = opts.background
             ? backgroundCommand(cmd)
             : cmd;
@@ -485,7 +479,7 @@ export function register(program) {
         }
         const env = parseEnvPairs(opts.env ?? []);
         if (opts.detached) {
-            const result = await createSandboxCommand(id, cmd, {
+            const result = await createSandboxCommand(id, words.join(" "), {
                 cwd,
                 env,
                 user: opts.user,
@@ -516,10 +510,12 @@ export function register(program) {
         .description("List listening TCP ports inside a Sandbox")
         .option("--json", "Output as JSON")
         .action((id, opts) => runAction(async () => {
-        const result = await client().apiGet(apiPath(`/sandboxes/${enc(id)}/ports`));
-        const ports = sandboxPortsFromResponse(result);
+        const c = client();
+        const result = await execSandboxRaw(c, id, "ss -ltnH 2>/dev/null || cat /proc/net/tcp /proc/net/tcp6 2>/dev/null");
+        const stdout = String(result["stdout"] ?? "");
+        const ports = parseListeningPorts(stdout);
         if (isJsonMode(opts)) {
-            console.log(JSON.stringify(result, null, 2));
+            console.log(JSON.stringify(ports, null, 2));
             return;
         }
         if (ports.length === 0) {
@@ -527,11 +523,6 @@ export function register(program) {
             return;
         }
         renderTable(ports, [
-            {
-                header: "PROTO",
-                key: (p) => p.protocol ?? "tcp",
-                width: 8,
-            },
             {
                 header: "PORT",
                 key: "port",
@@ -542,33 +533,8 @@ export function register(program) {
                 key: "address",
                 width: 24,
             },
-            {
-                header: "STATE",
-                key: (p) => p.state ?? "listen",
-                width: 10,
-            },
-            {
-                header: "PROCESS",
-                key: (p) => p.process?.name
-                    ? `${p.process.name}${p.process.pid ? `:${p.process.pid}` : ""}`
-                    : chalk.dim("-"),
-                width: 28,
-            },
         ]);
     }));
-    sandbox
-        .command("metrics <sandbox-id>")
-        .description("Show Sandbox resource, uptime, timeout, and readiness metrics")
-        .option("--window <window>", "Metrics window: 1h, 24h, or 7d", "1h")
-        .option("--json", "Output as JSON")
-        .action((id, opts) => runAction(async () => {
-        const result = await client().apiGet(apiPath(`/sandboxes/${enc(id)}/metrics?window=${enc(opts.window)}`));
-        if (isJsonMode(opts)) {
-            console.log(JSON.stringify(result, null, 2));
-            return;
-        }
-        renderResourceMetrics("Sandbox metrics", result);
-    }));
     sandbox
         .command("deploy [local-dir]")
         .description("Upload an app directory, start it in a sandbox, expose a preview URL, and wait for readiness")
@@ -679,9 +645,8 @@ export function register(program) {
         .option("--environment <name>", "Target environment label", "production")
         .option("--build-command <cmd>", "Build command to run before publishing")
         .option("--run-command <cmd>", "Run command for dynamic/server deployments")
+        .option("--docker-deploy", "Publish onto the workspace Docker Deploy runtime instead of standard app hosting")
         .option("--domain <domain>", "Custom domain to attach")
-        .option("--docker-deploy", "Publish through the workspace Docker Deploy runtime")
-        .option("--deployment-type <type>", "Deployment runtime type: miosa_deploy, docker_deploy, dynamic, static")
         .option("--database <mode>", "none, create:postgres, postgres, or existing:<db-id>")
         .option("--port <port>", "Runtime port for dynamic deployments", parseIntegerOption)
         .option("--wait", "Wait for the production URL to answer")
@@ -699,10 +664,6 @@ export function register(program) {
         console.log(`  ${chalk.bold("App")}      ${result.deployment_id ?? result.app_id ?? ""}`);
         if (result.release_id)
             console.log(`  ${chalk.bold("Release")}  ${result.release_id}`);
-        if (result.deployment_product)
-            console.log(`  ${chalk.bold("Product")}  ${String(result.deployment_product)}`);
-        if (result.docker_deploy_host_id)
-            console.log(`  ${chalk.bold("Docker")}   ${String(result.docker_deploy_host_id)}`);
         if (result.url)
             console.log(`  ${chalk.bold("URL")}      ${chalk.cyan(String(result.url))}`);
         console.log(`  ${chalk.bold("Ready")}    ${result.ready ? chalk.green("yes") : chalk.yellow("pending")}`);
@@ -1791,6 +1752,8 @@ async function publishSandbox(sandboxId, opts) {
             ? { environment: opts.environment, deployment_product: "docker_deploy" }
             : { environment: opts.environment },
     };
+    if (opts.dockerDeploy)
+        body["deployment_type"] = "docker-deploy";
     if (opts.app)
         body["deployment_id"] = opts.app;
     // Bug 9: avoid creating a duplicate deployment on retry. When publishing by
@@ -1815,11 +1778,6 @@ async function publishSandbox(sandboxId, opts) {
         body["domain"] = opts.domain;
     if (opts.port != null)
         body["port"] = opts.port;
-    const deploymentType = opts.dockerDeploy
-        ? "docker-deploy"
-        : opts.deploymentType;
-    if (deploymentType)
-        body["deployment_type"] = deploymentType;
     const database = parsePublishDatabase(opts.database);
     if (database !== undefined)
         body["database"] = database;
@@ -1840,29 +1798,11 @@ async function publishSandbox(sandboxId, opts) {
         extractUrl(deployment) ??
         stringField(data, "url") ??
         null;
-    let deploymentProduct = stringField(response, "deployment_product") ??
-        stringField(data, "deployment_product") ??
-        stringField(deployment, "deployment_product") ??
-        stringField(asRecord(deployment?.["metadata"]), "deployment_product") ??
-        null;
-    let dockerDeployHostId = stringField(response, "docker_deploy_host_id") ??
-        stringField(data, "docker_deploy_host_id") ??
-        stringField(deployment, "docker_deploy_host_id") ??
-        stringField(asRecord(deployment?.["metadata"]), "docker_deploy_host_id") ??
-        null;
     if (opts.wait && deploymentId) {
         deployStep(opts, "Waiting for durable deployment");
         const waited = await waitForDeploymentReady(c, deploymentId, opts.timeout);
         state = stringField(waited, "state") ?? state;
         url = extractUrl(waited) ?? url;
-        deploymentProduct =
-            stringField(waited, "deployment_product") ??
-                stringField(asRecord(waited["metadata"]), "deployment_product") ??
-                deploymentProduct;
-        dockerDeployHostId =
-            stringField(waited, "docker_deploy_host_id") ??
-                stringField(asRecord(waited["metadata"]), "docker_deploy_host_id") ??
-                dockerDeployHostId;
         response["state"] = state;
         if (url)
             response["url"] = url;
@@ -1888,8 +1828,6 @@ async function publishSandbox(sandboxId, opts) {
         version_id: versionId,
         url,
         state,
-        deployment_product: deploymentProduct,
-        docker_deploy_host_id: dockerDeployHostId,
         ready,
         probe,
         data: raw,
@@ -2129,93 +2067,37 @@ async function execSandboxRaw(c, sandboxId, command, cwd, timeout) {
         body["timeout"] = timeout;
     return unwrap(await c.apiPost(apiPath(`/sandboxes/${enc(sandboxId)}/exec`), body));
 }
-function sandboxPortsFromResponse(raw) {
-    const root = unwrap(raw);
-    if (Array.isArray(root))
-        return root;
-    if (root && typeof root === "object") {
-        const row = root;
-        if (Array.isArray(row["ports"]))
-            return row["ports"];
-        if (Array.isArray(row["data"]))
-            return row["data"];
-    }
-    return [];
-}
-function renderResourceMetrics(title, raw) {
-    const root = unwrap(raw);
-    if (!root || typeof root !== "object") {
-        printValue(root, {});
-        return;
-    }
-    const row = root;
-    const current = row["current"] && typeof row["current"] === "object"
-        ? row["current"]
-        : {};
-    printBanner({ subtitle: title });
-    console.log(kvPanel([
-        { label: "resource_id", value: String(row["resource_id"] ?? row["sandbox_id"] ?? "-") },
-        { label: "window", value: String(row["window"] ?? "1h") },
-        { label: "state", value: formatState(current["state"]) },
-        { label: "ready", value: formatBool(current["ready"]) },
-        { label: "cpu", value: formatMaybe(current["cpu_count"]) },
-        { label: "memory", value: formatMb(current["memory_mb"]) },
-        { label: "disk", value: formatMb(current["disk_size_mb"]) },
-        { label: "uptime", value: formatSeconds(current["uptime_sec"]) },
-        {
-            label: "timeout_remaining",
-            value: formatSecondsOrAlwaysOn(current["timeout_remaining_sec"]),
-        },
-        { label: "node", value: formatMaybe(current["node_id"]) },
-        { label: "ip", value: formatMaybe(current["ip_address"]) },
-        { label: "boot", value: formatMs(current["boot_ms"]) },
-        { label: "envd_ready", value: formatMs(current["envd_ready_ms"]) },
-    ]));
-}
-function formatState(value) {
-    const state = String(value ?? "unknown");
-    if (["running", "active", "healthy", "ready"].includes(state)) {
-        return chalk.green(state);
-    }
-    if (["provisioning", "starting", "building", "pending"].includes(state)) {
-        return chalk.yellow(state);
-    }
-    if (["failed", "error", "unhealthy"].includes(state)) {
-        return chalk.red(state);
+function parseListeningPorts(stdout) {
+    const lines = stdout.split("\n").map((l) => l.trim());
+    const seen = new Set();
+    const out = [];
+    // ss -ltnH columns: State Recv-Q Send-Q Local-Address:Port Peer-Address:Port
+    const ssLine = /^LISTEN\s+\d+\s+\d+\s+(\S+):(\d+)\s+/;
+    // /proc/net/tcp: sl local_address rem_address st ... (hex)
+    const procLine = /^\d+:\s+([0-9A-Fa-f]+):([0-9A-Fa-f]+)\s+\S+\s+([0-9A-Fa-f]+)/;
+    for (const line of lines) {
+        if (!line)
+            continue;
+        const ss = ssLine.exec(line);
+        if (ss && ss[2]) {
+            const port = Number(ss[2]);
+            if (!seen.has(port)) {
+                seen.add(port);
+                out.push({ port, address: ss[1] ?? "*" });
+            }
+            continue;
+        }
+        const proc = procLine.exec(line);
+        if (proc && proc[3] === "0A" && proc[2]) {
+            const port = parseInt(proc[2], 16);
+            if (!Number.isNaN(port) && !seen.has(port)) {
+                seen.add(port);
+                out.push({ port, address: "*" });
+            }
+        }
     }
-    return state;
-}
-function formatBool(value) {
-    if (value === true)
-        return chalk.green("true");
-    if (value === false)
-        return chalk.red("false");
-    return chalk.dim("-");
-}
-function formatMaybe(value) {
-    if (value === null || value === undefined || value === "")
-        return chalk.dim("-");
-    return String(value);
-}
-function formatMb(value) {
-    if (typeof value !== "number")
-        return formatMaybe(value);
-    return formatBytes(value * 1024 * 1024);
-}
-function formatMs(value) {
-    if (typeof value !== "number")
-        return formatMaybe(value);
-    return `${value}ms`;
-}
-function formatSeconds(value) {
-    if (typeof value !== "number")
-        return formatMaybe(value);
-    return formatDuration(value * 1000);
-}
-function formatSecondsOrAlwaysOn(value) {
-    if (value === null || value === undefined)
-        return chalk.dim("always-on/none");
-    return formatSeconds(value);
+    out.sort((a, b) => a.port - b.port);
+    return out;
 }
 // Stream exec output: run in background to a log file, poll-read new bytes
 // until the process exits, then print the final exit code.
@@ -2505,15 +2387,6 @@ function backgroundCommand(command) {
     const logPath = `/tmp/miosa-bg-${Date.now()}.log`;
     return `nohup sh -lc ${shellQuote(command)} > ${shellQuote(logPath)} 2>&1 & echo $!`;
 }
-function resolveSandboxCommand(words, opts) {
-    const positional = words.length === 1 ? (words[0] ?? "") : joinCommandWords(words);
-    const cmd = opts.cmd ?? opts.command ?? positional;
-    if (!opts.shellCmd)
-        return cmd;
-    if (!cmd.trim())
-        return opts.shellCmd;
-    return `${opts.shellCmd} ${shellQuote(cmd)}`;
-}
 function collectOption(value, previous) {
     return [...previous, value];
 }