@wayai/cli 0.3.206 → 0.3.208

package/dist/index.js

@@ -15031,6 +15031,21 @@ var init_expected = __esm({
   }
 });
 
+// src/lib/terminal-output.ts
+import { stripVTControlCharacters } from "util";
+function sanitizeTerminalText(value) {
+  const normalizedNewlines = value.replace(/\r\n?/g, "\n");
+  return stripVTControlCharacters(normalizedNewlines).replace(
+    /[\u0000-\u0009\u000b-\u001f\u007f-\u009f]/g,
+    ""
+  );
+}
+var init_terminal_output = __esm({
+  "src/lib/terminal-output.ts"() {
+    "use strict";
+  }
+});
+
 // src/lib/fs-safety.ts
 import * as fs from "fs";
 import * as path from "path";
@@ -15490,7 +15505,7 @@ function findEnclosingNewHubFolder(workspaceDir) {
   return null;
 }
 function resolvePushTarget(workspaceDir, existingHubs, newHubs, selector) {
-  if (selector) {
+  if (selector !== void 0) {
     const existingMatch = existingHubs.find(
       (h) => h.hubId === selector || path3.basename(h.hubFolder) === selector
     );
@@ -15510,7 +15525,7 @@ function resolvePushTarget(workspaceDir, existingHubs, newHubs, selector) {
   return previewHubs.length === 1 ? { ok: true, target: { kind: "existing", hub: previewHubs[0] } } : { ok: true, target: { kind: "new", hub: newHubs[0] } };
 }
 function resolveNewHubForCreate(workspaceDir, existingHubs, newHubs, selector) {
-  if (selector) {
+  if (selector !== void 0) {
     const newMatch = newHubs.find((h) => path3.basename(h.hubFolder) === selector);
     if (newMatch) return { ok: true, hub: newMatch };
     const existingMatch = existingHubs.find(
@@ -16084,6 +16099,38 @@ function shouldInterceptHelp(command2, args2, ownHelpCommands) {
   if (ownHelpCommands.has(command2)) return false;
   return wantsHelp(args2);
 }
+function isDryRunToken(arg) {
+  return /^--dry-run(=\S*)?$/.test(arg);
+}
+function unreadDryRunRefusal(invocation, token, readsBare) {
+  const only = readsBare ? " (only a bare `--dry-run`)" : "";
+  return `\`${invocation}\` does not read \`${sanitizeTerminalText(token)}\`${only}, so it is refused rather than run without it.`;
+}
+function entryFlagRefusal(command2, args2, dataNamespaces) {
+  if (command2 === void 0 || ["help", "--help", "-h", "--version", "-v"].includes(command2)) return null;
+  if (dataNamespaces.has(command2)) return null;
+  const words = [command2];
+  for (const arg of args2.slice(0, 2)) {
+    if (!/^[a-z][a-z-]*$/.test(arg)) break;
+    words.push(arg);
+  }
+  const invocation = `wayai ${words.join(" ")}`;
+  let parsed;
+  for (let n = words.length; n > 0 && parsed === void 0; n--) {
+    parsed = PARSED_BY_THE_COMMAND.get(words.slice(0, n).join(" "));
+  }
+  if (parsed === "all") return null;
+  const dryRuns = args2.filter(isDryRunToken);
+  const readsBare = parsed === "bare --dry-run";
+  const refused = readsBare ? dryRuns.find((token) => token !== "--dry-run") : dryRuns[0];
+  if (refused !== void 0) return unreadDryRunRefusal(invocation, refused, readsBare);
+  if (parsed === "selectors") return null;
+  for (const { flag, noun } of SELECTOR_FLAGS) {
+    const empty = args2.some((arg, i) => arg === `${flag}=` || arg === flag && (args2[i + 1] ?? "") === "");
+    if (empty) return `\`${invocation} ${flag}\` needs ${noun}, and none followed it.`;
+  }
+  return null;
+}
 function isNewerVersion(latest, current) {
   const strip = (v) => v.replace(/[-+].*$/, "");
   const l = strip(latest).split(".").map(Number);
@@ -16115,12 +16162,13 @@ function resolveSecretSource(source) {
   }
   return "prompt";
 }
-var UUID_RE3, slugify2, OWN_HELP_COMMANDS;
+var UUID_RE3, slugify2, OWN_HELP_COMMANDS, PARSED_BY_THE_COMMAND, SELECTOR_FLAGS;
 var init_utils = __esm({
   "src/lib/utils.ts"() {
     "use strict";
     init_dist();
     init_expected();
+    init_terminal_output();
     UUID_RE3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     slugify2 = slugifySkillName;
     OWN_HELP_COMMANDS = /* @__PURE__ */ new Set([
@@ -16131,6 +16179,23 @@ var init_utils = __esm({
       "alerts",
       "communities"
     ]);
+    PARSED_BY_THE_COMMAND = /* @__PURE__ */ new Map([
+      ["pull", "all"],
+      ["push", "all"],
+      ["communities", "all"],
+      ["sync-mcp", "bare --dry-run"],
+      ["admin hubs repair-team-orphans", "bare --dry-run"],
+      ["admin hubs repair-branching-orphans", "bare --dry-run"],
+      ["admin orgs repair-legacy-grants", "bare --dry-run"],
+      ["admin harness mass-destroy", "bare --dry-run"],
+      ["use", "selectors"],
+      ["unbind", "selectors"],
+      ["unlock", "selectors"]
+    ]);
+    SELECTOR_FLAGS = [
+      { flag: "--hub", noun: "a hub" },
+      { flag: "--org", noun: "an organization" }
+    ];
   }
 });
 
@@ -19559,21 +19624,6 @@ var init_hub_materializer = __esm({
   }
 });
 
-// src/lib/terminal-output.ts
-import { stripVTControlCharacters } from "util";
-function sanitizeTerminalText(value) {
-  const normalizedNewlines = value.replace(/\r\n?/g, "\n");
-  return stripVTControlCharacters(normalizedNewlines).replace(
-    /[\u0000-\u0009\u000b-\u001f\u007f-\u009f]/g,
-    ""
-  );
-}
-var init_terminal_output = __esm({
-  "src/lib/terminal-output.ts"() {
-    "use strict";
-  }
-});
-
 // src/lib/base-workspace.ts
 import * as fs15 from "fs";
 import * as path19 from "path";
@@ -19637,7 +19687,7 @@ function assertValidBaseSelector(selector, source = "base") {
 }
 function resolveBaseTarget(gitRoot, selector, cwd = process.cwd()) {
   const basesDir = resolveBasesDir(gitRoot);
-  if (selector) {
+  if (selector !== void 0) {
     const folder = folderForSelector(basesDir, selector);
     if (!isUnder(basesDir, folder)) {
       throw expected(`Refusing to target ${folder}: it is outside ${basesDir}.`);
@@ -19837,7 +19887,7 @@ function routeToSubtree(options) {
   const cwd = options.cwd ?? process.cwd();
   const tokens2 = parseRoutingTokens(args2);
   const { hubFlag, baseFlag, communityFlag, positional, orgFlag } = tokens2;
-  if (orgFlag !== void 0) {
+  if (orgFlag !== void 0 || args2.includes("--org")) {
     return {
       ok: false,
       refusal: [
@@ -19849,6 +19899,10 @@ function routeToSubtree(options) {
       ].join("\n")
     };
   }
+  const valuedDryRun = args2.find((arg) => isDryRunToken(arg) && arg !== "--dry-run");
+  if (valuedDryRun !== void 0) {
+    return { ok: false, refusal: unreadDryRunRefusal(`wayai ${verb}`, valuedDryRun, true) };
+  }
   if (tokens2.takenAsValue) {
     const { flag: flag2, by } = tokens2.takenAsValue;
     return {
@@ -19869,7 +19923,23 @@ function routeToSubtree(options) {
   if (flagged.length > 1) {
     return { ok: false, refusal: mixedInvocationRefusal(verb, flagged) };
   }
+  if (positional === "") {
+    return {
+      ok: false,
+      refusal: `\`wayai ${verb} ""\` names nothing, so it is refused rather than run on a folder it did not name.`
+    };
+  }
   const fromPositional = positional !== void 0 ? resolveSelectorSubtree(layout, positional, cwd) : void 0;
+  if (positional !== void 0 && fromPositional && fromPositional.kind !== "both" && fromPositional.kind !== "unknown" && fromPositional.target === "") {
+    const { kind } = fromPositional;
+    const { target, value } = SUBTREE_FLAGS.find(({ subtree }) => subtree === kind);
+    const dir = `${SUBDIR[kind]}/`;
+    return {
+      ok: false,
+      refusal: `\`wayai ${verb} ${sanitizeTerminalText(positional)}\` names ${dir}, not ${target} in it, so it is refused rather than run on a folder it did not name.
+  wayai ${verb} ${dir}${value}`
+    };
+  }
   if (fromPositional?.kind === "both") {
     return {
       ok: false,
@@ -19933,6 +20003,7 @@ var init_subtree_routing = __esm({
     "use strict";
     init_layout();
     init_terminal_output();
+    init_utils();
     init_workspace_manifest();
     init_workspace();
     init_base_workspace();
@@ -24102,7 +24173,7 @@ async function pushSingleHub(client, hubId, hubFolder, autoConfirm, organization
   return true;
 }
 function selectExistingHub(workspaceDir, allHubs, selector, wsLabel) {
-  if (selector) {
+  if (selector !== void 0) {
     const match = allHubs.find(
       (h) => h.hubId === selector || path28.basename(h.hubFolder) === selector
     );
@@ -24287,7 +24358,7 @@ function resolveHubTarget(workspaceDir, selector) {
   const gitRoot = findGitRoot();
   const wsLabel = hubsDirLabel(gitRoot);
   const allHubs = scanWorkspaceHubs(workspaceDir);
-  if (selector) {
+  if (selector !== void 0) {
     const match = allHubs.find(
       (h) => h.hubId === selector || path29.basename(h.hubFolder) === selector
     );
@@ -24510,7 +24581,8 @@ var init_pull = __esm({
 // src/commands/create.ts
 var create_exports = {};
 __export(create_exports, {
-  createCommand: () => createCommand
+  createCommand: () => createCommand,
+  parseArgs: () => parseArgs8
 });
 import * as path30 from "path";
 import * as fs22 from "fs";
@@ -24522,7 +24594,7 @@ function parseArgs8(args2) {
     const arg = args2[i];
     if (arg === "--yes" || arg === "-y") {
       autoConfirm = true;
-    } else if (arg === "--label" && args2[i + 1]) {
+    } else if (arg === "--label") {
       label = args2[++i];
     } else if (!arg.startsWith("-") && folderSelector === void 0) {
       folderSelector = arg;
@@ -24672,6 +24744,7 @@ var init_diff = __esm({
 // src/commands/replicate.ts
 var replicate_exports = {};
 __export(replicate_exports, {
+  parseArgs: () => parseArgs10,
   replicateCommand: () => replicateCommand
 });
 import * as fs23 from "fs";
@@ -24681,7 +24754,7 @@ function parseArgs10(args2) {
   let hubSelector;
   for (let i = 0; i < args2.length; i++) {
     const arg = args2[i];
-    if (arg === "--label" && args2[i + 1]) {
+    if (arg === "--label") {
       label = args2[++i];
     } else if (arg === "--hub" && args2[i + 1]) {
       hubSelector = args2[++i];
@@ -37258,6 +37331,11 @@ async function main() {
     await printHelp3();
     return;
   }
+  const flagRefusal = entryFlagRefusal(command, args, new Set(DATA_NAMESPACES));
+  if (flagRefusal) {
+    console.error(flagRefusal);
+    process.exit(1);
+  }
   if (command && !wantsHelp(args)) {
     const { findGitRoot: findGitRoot2 } = await Promise.resolve().then(() => (init_workspace(), workspace_exports));
     const { healSkillLinkForCommand: healSkillLinkForCommand2 } = await Promise.resolve().then(() => (init_skill_symlink(), skill_symlink_exports));