@clawops/cli 2.0.0 → 2.0.1

package/dist/{chunk-AX74VXTV.js → chunk-KC3GC3PE.js}

@@ -1,42 +1,50 @@
 #!/usr/bin/env node
 import {
   applyPlan
-} from "./chunk-UFRO4H5W.js";
+} from "./chunk-LBE6COC4.js";
+import {
+  extractBaseOutputs
+} from "./chunk-3QJBNAHW.js";
 import {
   atomicWriteConfig,
   readRemoteConfig,
   restartGateway
-} from "./chunk-N44K3LHE.js";
-import {
-  extractBaseOutputs
-} from "./chunk-3QJBNAHW.js";
+} from "./chunk-2I7KCMXZ.js";
 import {
   generatePlan
-} from "./chunk-WHJMKDV7.js";
+} from "./chunk-STLRHLLV.js";
 import {
   validatePlan
-} from "./chunk-YR3O2I3S.js";
+} from "./chunk-BSLIYB5Q.js";
 import {
   acquireSession,
   drainPool
-} from "./chunk-3WYA2QDM.js";
+} from "./chunk-2Z7J3ERQ.js";
 import {
   buildContext
-} from "./chunk-LU2V3LXA.js";
+} from "./chunk-5XT5IAJK.js";
 import {
   formatUptime,
   gatherSnapshot,
   runDiagnostics
-} from "./chunk-GYV4KNW7.js";
+} from "./chunk-IVWP4QUJ.js";
 import {
   GATEWAY_LOGS_PROBE,
   chooseLogSource,
   containerLogsCommand,
   gatewayLogsCommand
-} from "./chunk-SBLQH2TJ.js";
+} from "./chunk-NUL5F6YV.js";
 import {
   execPrivileged
 } from "./chunk-NUDIHZEH.js";
+import {
+  STATE_DIR_HOST_LINUX,
+  gatewayRunCommand
+} from "./chunk-GIEVAGEK.js";
+import {
+  IMAGE_INSPECT_CMD,
+  imageForRestart
+} from "./chunk-VOEJYRIK.js";
 import {
   getConfig,
   getConfigDir
@@ -45,12 +53,6 @@ import {
   StateError,
   UsageError
 } from "./chunk-KGXPLI7W.js";
-import {
-  IMAGE_INSPECT_CMD,
-  STATE_DIR_HOST_LINUX,
-  gatewayRunCommand,
-  imageForRestart
-} from "./chunk-6TIYVHPX.js";
 
 // src/mcp/server.ts
 import { createServer } from "http";
@@ -222,7 +224,10 @@ var clawops_upSchema = z.object({
   stackName: z.string().optional(),
   provider: z.enum(["aws", "gcp", "azure", "local"]).optional(),
   region: z.string().optional(),
-  instanceType: z.enum(["micro", "small", "medium", "large", "gpu"]).optional().default("small"),
+  instanceType: z.string().optional().default("small"),
+  sshCidr: z.string().optional(),
+  gatewayCidr: z.string().optional(),
+  publishGateway: z.enum(["loopback", "all"]).optional(),
   openclawVersion: z.string().optional(),
   dryRun: z.boolean().optional().default(false)
 });
@@ -799,7 +804,6 @@ function makeProgressEmitter(server, progressToken) {
 }
 
 // src/mcp/tools/cli/up.ts
-var VALID_INSTANCE_TYPES = ["micro", "small", "medium", "large", "gpu"];
 async function handleUp(input, server) {
   if (!input.dryRun) {
     const elicit = await server.server.elicitInput({
@@ -824,7 +828,7 @@ async function handleUp(input, server) {
       );
     }
     const { localOpts } = stackConfig;
-    const { localBootstrap } = await import("./bootstrap-DMRPWJGN.js");
+    const { localBootstrap } = await import("./bootstrap-HNGKY6WW.js");
     const ac = new AbortController();
     const state = await localBootstrap({
       host: localOpts.host,
@@ -839,10 +843,6 @@ async function handleUp(input, server) {
     });
     return okText(JSON.stringify({ stack: ctx.stackName, ...state }, null, 2));
   }
-  const instanceAlias = input.instanceType ?? "small";
-  if (!VALID_INSTANCE_TYPES.includes(instanceAlias)) {
-    throw new UsageError(`Invalid instanceType: ${instanceAlias}`);
-  }
   const validation = await ctx.adapter.validateConfig();
   if (!validation.ok) {
     return errText(`Provider config invalid: ${validation.errors.join("; ")}`);
@@ -851,38 +851,47 @@ async function handleUp(input, server) {
   const progressToken = void 0;
   const emit = makeProgressEmitter(server, progressToken);
   startTask(taskId, `clawops_up stack=${ctx.stackName}`);
-  const stack = await ctx.getStack();
-  const region = input.region ?? ctx.adapter.defaultRegion();
-  const instanceType = ctx.adapter.normalizeInstanceType(instanceAlias);
-  await stack.setConfig("region", { value: region });
-  await stack.setConfig("instanceType", { value: instanceType });
-  await stack.setConfig("openclawVersion", { value: openclawVersion });
-  if (input.dryRun) {
-    const lines = [];
-    await stack.preview({ onOutput: (o) => {
-      emit(o.trim());
-      lines.push(o);
-    } });
-    const output = lines.join("");
-    updateTask(taskId, "completed", output);
-    const { content } = trimForMcp(output, ctx.stackName);
-    return okText(content);
-  }
+  const { generatePlan: generatePlan2 } = await import("./generate-I6YQ5V2T.js");
+  const { applyPlan: applyPlan2 } = await import("./apply-KYFPWI5U.js");
+  const { resolveNetworkFlags } = await import("./network-args-PYJRJBYO.js");
+  const { detectEgressIp } = await import("./firewall-5VKZ4WBH.js");
+  const network = await resolveNetworkFlags(
+    {
+      ...input.sshCidr ? { sshCidr: input.sshCidr } : {},
+      ...input.gatewayCidr ? { gatewayCidr: input.gatewayCidr } : {},
+      ...input.publishGateway ? { publishGateway: input.publishGateway } : {}
+    },
+    { detectEgressIp: () => detectEgressIp("https://ifconfig.me/ip") }
+  );
   try {
+    const plan = await generatePlan2({
+      stackName: ctx.stackName,
+      provider: ctx.adapter.name,
+      ...input.region ? { region: input.region } : {},
+      ...input.instanceType ? { instanceType: input.instanceType } : {},
+      openclawVersion,
+      network
+    });
+    if (input.dryRun) {
+      const summary2 = JSON.stringify(plan.diff ?? { totalChanges: 0 }, null, 2);
+      updateTask(taskId, "completed", summary2);
+      const { content } = trimForMcp(summary2, ctx.stackName);
+      return okText(content);
+    }
     const lines = [];
-    const result = await stack.up({
+    const result = await applyPlan2(plan, {
       onOutput: (o) => {
         emit(o.trim());
         lines.push(o);
-      }
+      },
+      onProgress: (o) => emit(o)
     });
     const summary = `Stack "${ctx.stackName}" deployed.
-` + (result.outputs["publicIp"] ? `Public IP: ${result.outputs["publicIp"].value}
-` : "") + (result.outputs["gatewayUrl"] ? `Gateway URL: ${result.outputs["gatewayUrl"].value}
+` + (result.outputs["publicIp"] ? `Public IP: ${String(result.outputs["publicIp"])}
+` : "") + (result.outputs["gatewayUrl"] ? `Gateway URL: ${String(result.outputs["gatewayUrl"])}
 ` : "");
     updateTask(taskId, "completed", summary);
-    const fullOutput = lines.join("");
-    trimForMcp(fullOutput, ctx.stackName);
+    trimForMcp(lines.join(""), ctx.stackName);
     return okText(summary);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -1047,7 +1056,7 @@ async function handleTaskStatus(input, _server) {
 
 // src/mcp/tools/cli/monitor.ts
 async function handleMonitor(input, _server) {
-  const { acquireSession: acquireSession2, drainPool: drainPool2 } = await import("./pool-EX4ZTA5P.js");
+  const { acquireSession: acquireSession2, drainPool: drainPool2 } = await import("./pool-PIIKJ4L2.js");
   const ctx = buildContext({ stack: input.stackName });
   const tailLines = input.tailLines ?? 5;
   let conn;
@@ -1523,7 +1532,7 @@ function bearerFrom(header) {
   return match?.[1]?.trim();
 }
 async function serveMcp(opts) {
-  const { version } = await import("./package-3HUW57XH.js");
+  const { version } = await import("./package-5BCMEBTE.js");
   const makeServer = () => {
     const server = new McpServer({ name: "clawops", version });
     registerTools(server, opts);

package/dist/{chunk-UFRO4H5W.js → chunk-LBE6COC4.js}

@@ -1,30 +1,34 @@
 #!/usr/bin/env node
+import {
+  resolveSecrets
+} from "./chunk-BOPSG2LI.js";
+import {
+  saveOverlay
+} from "./chunk-6ZFIFDBJ.js";
 import {
   atomicWriteConfig,
   deepMerge,
   readRemoteConfig,
   restartGateway
-} from "./chunk-N44K3LHE.js";
+} from "./chunk-2I7KCMXZ.js";
 import {
-  validatePlan
-} from "./chunk-YR3O2I3S.js";
+  writeStackConfig
+} from "./chunk-HSPHXG6W.js";
 import {
-  saveOverlay
-} from "./chunk-6ZFIFDBJ.js";
-import {
-  resolveSecrets
-} from "./chunk-BOPSG2LI.js";
+  validatePlan
+} from "./chunk-BSLIYB5Q.js";
 import {
   buildContext
-} from "./chunk-LU2V3LXA.js";
+} from "./chunk-5XT5IAJK.js";
+import {
+  GATEWAY_PORT
+} from "./chunk-VOEJYRIK.js";
 import {
   UsageError
 } from "./chunk-KGXPLI7W.js";
-import {
-  GATEWAY_PORT
-} from "./chunk-6TIYVHPX.js";
 
 // src/plan/apply.ts
+import process from "process";
 async function applyPlan(plan, opts) {
   const validation = validatePlan(plan);
   if (!validation.ok) {
@@ -38,28 +42,14 @@ ${validation.errors.join("\n")}`
       "plan/apply is not supported for the local provider. Use `clawops up` directly."
     );
   }
-  const { guardOpenclawVersion } = await import("./version-guard-GPSTCPT7.js");
+  const { guardOpenclawVersion } = await import("./version-guard-XVYW5WFJ.js");
   await guardOpenclawVersion(plan.spec.openclaw.version);
   const ctx = buildContext({
     stack: plan.spec.stackName,
     provider: plan.spec.provider
   });
   const stack = await ctx.getStack();
-  await stack.setConfig("instanceType", { value: plan.spec.instanceType });
-  if (plan.spec.region) {
-    await stack.setConfig("region", { value: plan.spec.region });
-  }
-  await stack.setConfig("openclawVersion", { value: plan.spec.openclaw.version });
-  await stack.setConfig("publishGateway", {
-    value: plan.spec.network?.publishGateway ?? "loopback"
-  });
-  await stack.setConfig("gatewayPort", {
-    value: String(plan.spec.network?.gatewayPort ?? GATEWAY_PORT)
-  });
-  const modelProvider = plan.spec.openclaw.config?.["models"]?.["provider"];
-  if (modelProvider === "bedrock") {
-    await stack.setConfig("bedrockEnabled", { value: "true" });
-  }
+  await writeStackConfig(stack, plan);
   if (plan.metadata.stackVersion !== void 0) {
     const currentInfo = await stack.info();
     if (currentInfo !== void 0 && currentInfo.version !== plan.metadata.stackVersion) {
@@ -86,6 +76,25 @@ The diff you reviewed may no longer reflect what will be applied.
       changeSummary[op] = count;
     }
   }
+  const { waitForSsh } = await import("./wait-WO72TRRQ.js");
+  const conn = await connectionInfoFor(ctx, outputs);
+  if (opts?.skipReadiness) {
+    return { outputs, changeSummary, durationMs: Date.now() - start };
+  }
+  const readySession = await waitForSsh(conn, {
+    signal: opts?.signal,
+    onProgress: (line) => reportProgress(opts, line)
+  });
+  const { waitForGateway } = await import("./ready-KDNRBNSU.js");
+  try {
+    await waitForGateway(readySession, {
+      signal: opts?.signal,
+      port: plan.spec.network?.gatewayPort ?? GATEWAY_PORT,
+      onProgress: (line) => reportProgress(opts, line)
+    });
+  } finally {
+    readySession.close();
+  }
   const hasOverlay = plan.spec.openclaw.config !== void 0 || plan.spec.openclaw.channels !== void 0;
   if (hasOverlay) {
     await applyConfigOverlay(plan, outputs, ctx, opts?.signal);
@@ -96,17 +105,24 @@ The diff you reviewed may no longer reflect what will be applied.
     durationMs: Date.now() - start
   };
 }
-async function applyConfigOverlay(plan, outputs, ctx, signal) {
-  const { connect } = await import("./ssh-B3NZAU4I.js");
-  const connInfo = ctx.adapter.getConnectionInfo(outputs);
-  const session = await connect({
-    host: connInfo.host,
-    port: connInfo.port,
-    user: connInfo.user,
-    privateKeyPath: connInfo.privateKeyPath,
-    knownHostsPath: connInfo.knownHostsPath,
-    signal
+function reportProgress(opts, line) {
+  if (opts?.onProgress) opts.onProgress(line);
+  else opts?.onOutput?.(line);
+}
+async function connectionInfoFor(ctx, outputs) {
+  const { extractBaseOutputs } = await import("./outputs-DJHBY7EE.js");
+  return ctx.adapter.getConnectionInfo({
+    ...extractBaseOutputs(outputs),
+    privateKeyPath: expandHome(ctx.config.ssh.keyPath),
+    knownHostsPath: expandHome(ctx.config.ssh.knownHostsPath)
   });
+}
+function expandHome(p) {
+  return p.replace(/^~/, process.env["HOME"] ?? "~");
+}
+async function applyConfigOverlay(plan, outputs, ctx, signal) {
+  const { connect } = await import("./ssh-VAI5DU5M.js");
+  const session = await connect({ ...await connectionInfoFor(ctx, outputs), signal });
   try {
     const remote = await readRemoteConfig(session, signal);
     const configOverlay = plan.spec.openclaw.config ?? {};
@@ -134,7 +150,7 @@ async function applyConfigOverlay(plan, outputs, ctx, signal) {
 async function installProviderPlugins(session, cfg, openclawVersion, signal) {
   const [{ requiredPlugins, installCommand }, { STATE_DIR_HOST_LINUX }, yaml, { readFileSync }, { join }, { resolveSpecDir }] = await Promise.all([
     import("./plugins-DTST3OER.js"),
-    import("./runtime-LZ7NA53V.js"),
+    import("./runtime-X3KW5TCP.js"),
     import("./js-yaml-PTEEG4FO.js"),
     import("fs"),
     import("path"),
@@ -189,7 +205,7 @@ async function loadChannelCatalog() {
   return yaml.load(readFileSync(join(resolveSpecDir(), "integrations.yaml"), "utf-8"));
 }
 async function installChannelPlugins(session, cfg, openclawVersion, signal) {
-  const [{ requiredChannelPlugins, channelInstallCommand }, { STATE_DIR_HOST_LINUX }] = await Promise.all([import("./channels-KBUR42IU.js"), import("./runtime-LZ7NA53V.js")]);
+  const [{ requiredChannelPlugins, channelInstallCommand }, { STATE_DIR_HOST_LINUX }] = await Promise.all([import("./channels-KBUR42IU.js"), import("./runtime-X3KW5TCP.js")]);
   const needed = requiredChannelPlugins(cfg, await loadChannelCatalog());
   if (needed.length === 0) return;
   const { execPrivileged } = await import("./privileged-JFA6LLTV.js");