hostctl 0.1.61 → 0.1.63

package/README.md

@@ -113,7 +113,20 @@ Mount SSH keys or AGE identities as needed (for example `-v "$HOME/.ssh:/home/no
   ```
 
   - `-r/--remote` targets hosts selected by tags via SSH.
-  - `-t/--tag` is greedy; use `--` before positional args when needed.
+  - `-t/--tag` specifies a tag filter; repeat for multiple tags.
+
+  Tag selection uses disjunctive normal form (DNF). Each `-t/--tag` value is a clause. Within a clause, `+` requires every tag (intersection). Multiple `-t` values are OR (union). Commas are literal characters in tag names; use repeated `-t` flags for unions.
+
+  ```bash
+  # Intersection: host must have both tags
+  hostctl run -r -t web+prod core.net.interfaces
+
+  # Union: host may have either tag
+  hostctl run -r -t web -t prod core.net.interfaces
+
+  # Union of intersections
+  hostctl run -r -t web+prod -t api+prod core.net.interfaces
+  ```
 
 - **From npm or git**
   ```bash

package/dist/bin/hostctl.js

@@ -4043,7 +4043,7 @@ var ParamMap = class _ParamMap {
 import * as z from "zod";
 
 // src/version.ts
-var version = "0.1.61";
+var version = "0.1.63";
 
 // src/app.ts
 import { retryUntilDefined } from "ts-retry";
@@ -33576,6 +33576,9 @@ function shouldSkipConfig(envValue) {
 function collectConfigHeader(value, previous) {
   return previous.concat(value);
 }
+function collectTag(value, previous) {
+  return previous.concat(value);
+}
 function parseHeaderEntry(entry) {
   const index = entry.indexOf(":");
   if (index === -1) {
@@ -33644,7 +33647,7 @@ var Cli = class {
       'additional HTTP config header (repeatable, format: "Header-Name: value")',
       collectConfigHeader,
       []
-    ).option("--json", "output should be json formatted").option("-p, --password", "should prompt for sudo password?", false).option("-t, --tag <tags...>", "specify a tag (repeat for multiple tags)");
+    ).option("--json", "output should be json formatted").option("-p, --password", "should prompt for sudo password?", false).option("-t, --tag <tag>", "tag filter (repeatable; use + for intersection)", collectTag, []);
     this.program.command("exec").alias("e").argument(
       "<command...>",
       `the command string to run, with optional arguments (e.g. hostctl exec sudo sh -c 'echo "$(whoami)"')`
@@ -34251,27 +34254,42 @@ function unwrapSchema(schema) {
   }
   return { schema: current, optional, nullable };
 }
-function formatSchemaLines(schema) {
+function formatSchemaLines(schema, depth = 0) {
   if (!schema) return ["none"];
-  const def = schema._def ?? schema.def;
+  const { schema: base } = unwrapSchema(schema);
+  if (!base) return ["none"];
+  const def = base._def ?? base.def;
+  const typeName = def?.typeName || def?.type;
+  const indent = "  ".repeat(depth);
+  if (typeName === "ZodUnion" || typeName === "union") {
+    const options = def?.options ?? [];
+    if (!options.length) return [];
+    const lines = [];
+    lines.push(`${indent}- anyOf:`);
+    options.forEach((option, idx) => {
+      lines.push(`${indent}  - option ${idx + 1}:`);
+      lines.push(...formatSchemaLines(option, depth + 2));
+    });
+    return lines;
+  }
   const shapeSource = def?.shape || def?.shape_;
   const shape = shapeSource ? typeof shapeSource === "function" ? shapeSource.call(def) : shapeSource : void 0;
   if (shape && typeof shape === "object") {
     const lines = Object.entries(shape).map(([key, val]) => {
-      const summary2 = summarizeType(val);
-      const anyVal = val;
+      const { schema: fieldSchema, optional } = unwrapSchema(val);
+      const summary2 = summarizeType(fieldSchema);
+      const anyVal = fieldSchema ?? val;
       const tn = anyVal?._def?.typeName || anyVal?.def?.type;
       const typeString = summary2.type || (tn ? String(tn).replace(/^Zod/, "").toLowerCase() : void 0);
       const desc = summary2.desc;
-      const optional = ["ZodOptional", "optional", "ZodNullable", "nullable", "ZodDefault", "default"].includes(tn);
       const typePart = typeString ? `: ${typeString}` : "";
       const descPart = desc ? ` - ${desc}` : "";
-      return `- ${key}${optional ? "?" : ""}${typePart}${descPart}`;
+      return `${indent}- ${key}${optional ? "?" : ""}${typePart}${descPart}`;
     }).filter(Boolean);
     return lines;
   }
-  const summary = summarizeType(schema);
-  return summary.type ? [`- ${summary.type}${summary.desc ? ` - ${summary.desc}` : ""}`] : [];
+  const summary = summarizeType(base);
+  return summary.type ? [`${indent}- ${summary.type}${summary.desc ? ` - ${summary.desc}` : ""}`] : [];
 }
 
 // src/bin/hostctl.ts