@wayai/cli 0.3.165 → 0.3.166

package/dist/index.js

@@ -17528,11 +17528,33 @@ function ensureRealSubdirNoSymlink(root, target, create) {
   }
   return true;
 }
+function isUnder(parent, child) {
+  const rel = path.relative(parent, child);
+  return rel === "" || rel !== ".." && !rel.startsWith(`..${path.sep}`) && !path.isAbsolute(rel);
+}
+function isSymlink(p) {
+  try {
+    return fs.lstatSync(p).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+function workspaceRefusal(message) {
+  const err = expected(message);
+  err.isWorkspaceRefusal = true;
+  return err;
+}
+function isWorkspaceRefusal(err) {
+  return err?.isWorkspaceRefusal === true;
+}
+function symlinkRefusal(rel, kind) {
+  return workspaceRefusal(
+    `${rel} is a symlink, is reached through one, or is not a ${kind}. The CLI never reads or writes workspace config through a symlink \u2014 make it a real ${kind}.`
+  );
+}
 function requireRealSubdirNoSymlink(root, target, create) {
   if (ensureRealSubdirNoSymlink(root, target, create)) return;
-  throw expected(
-    `${path.relative(path.dirname(root), target)} is reached through a symlink (or a file is in the way). The CLI never reads or writes workspace config through a symlink \u2014 make it a real directory.`
-  );
+  throw symlinkRefusal(path.relative(path.dirname(root), target), "directory");
 }
 function requireRealHubFolder(hubFolder, create) {
   if (!create) {
@@ -17553,11 +17575,7 @@ function requireRealHubFolder(hubFolder, create) {
     } catch {
       continue;
     }
-    if (!st.isFile()) {
-      throw expected(
-        `${path.join(path.basename(hubFolder), name)} is a symlink (or not a file). The CLI never reads or writes workspace config through a symlink \u2014 make it a real file.`
-      );
-    }
+    if (!st.isFile()) throw symlinkRefusal(path.join(path.basename(hubFolder), name), "file");
   }
 }
 function readRealFileOrThrow(root, abs) {
@@ -17568,11 +17586,7 @@ function readRealFileOrThrow(root, abs) {
     return null;
   }
   const bytes = st.isFile() ? readFileNoFollow(root, abs) : null;
-  if (!bytes) {
-    throw expected(
-      `${path.relative(path.dirname(root), abs)} is a symlink (or reached through one). The CLI never reads or writes workspace config through a symlink \u2014 make it a real file.`
-    );
-  }
+  if (!bytes) throw symlinkRefusal(path.relative(path.dirname(root), abs), "file");
   return bytes.toString("utf-8");
 }
 function readFileNoFollow(root, abs) {
@@ -17767,10 +17781,9 @@ function resolveWorkspaceDir() {
   return resolveLayout(gitRoot).hubsDir;
 }
 function readHubYaml(yamlPath) {
-  if (!fs3.existsSync(yamlPath)) return null;
+  if (!fs3.existsSync(yamlPath) || isSymlink(yamlPath)) return null;
   try {
-    const content = fs3.readFileSync(yamlPath, "utf-8");
-    const config = yaml.load(content);
+    const config = yaml.load(fs3.readFileSync(yamlPath, "utf-8"));
     if (!config?.hub_id || !config.hub_environment) return null;
     return { hubId: config.hub_id, hubEnvironment: config.hub_environment };
   } catch {
@@ -17796,10 +17809,9 @@ function filterPreviewHubs(hubs) {
   return hubs.filter(isPreviewHub);
 }
 function readNewHubYaml(yamlPath) {
-  if (!fs3.existsSync(yamlPath)) return null;
+  if (!fs3.existsSync(yamlPath) || isSymlink(yamlPath)) return null;
   try {
-    const content = fs3.readFileSync(yamlPath, "utf-8");
-    const config = yaml.load(content);
+    const config = yaml.load(fs3.readFileSync(yamlPath, "utf-8"));
     if (config?.hub_id) return null;
     if (!config?.hub?.name) return null;
     return { hubName: config.hub.name, hubType: config.hub.hub_type };
@@ -17882,6 +17894,7 @@ function getChangedHubs(workspaceDir) {
   }
   const hubs = [];
   for (const hubFolder of hubFolders) {
+    if (!isRealDirectory(hubFolder)) continue;
     const meta = readHubYaml(path3.join(hubFolder, "hub.yaml")) || readHubYaml(path3.join(hubFolder, "wayai.yaml"));
     if (meta) {
       hubs.push({ hubFolder, hubId: meta.hubId, hubEnvironment: meta.hubEnvironment });
@@ -17941,30 +17954,28 @@ function autoRenameHubFolder(currentFolder, hubName, hubEnvironment, hubId, prev
 function findEnclosingHubFolder(workspaceDir) {
   let current = process.cwd();
   const stop = path3.resolve(workspaceDir);
-  while (true) {
+  while (isUnder(stop, current)) {
     const meta = readHubYaml(path3.join(current, "hub.yaml")) || readHubYaml(path3.join(current, "wayai.yaml"));
     if (meta) {
       return { hubFolder: current, hubId: meta.hubId, hubEnvironment: meta.hubEnvironment };
     }
     if (current === stop) return null;
-    const parent = path3.dirname(current);
-    if (parent === current) return null;
-    current = parent;
+    current = path3.dirname(current);
   }
+  return null;
 }
 function findEnclosingNewHubFolder(workspaceDir) {
   let current = process.cwd();
   const stop = path3.resolve(workspaceDir);
-  while (true) {
+  while (isUnder(stop, current)) {
     const meta = readNewHubYaml(path3.join(current, "hub.yaml")) || readNewHubYaml(path3.join(current, "wayai.yaml"));
     if (meta) {
       return { hubFolder: current, hubName: meta.hubName, hubType: meta.hubType };
     }
     if (current === stop) return null;
-    const parent = path3.dirname(current);
-    if (parent === current) return null;
-    current = parent;
+    current = path3.dirname(current);
   }
+  return null;
 }
 function resolvePushTarget(workspaceDir, existingHubs, newHubs, selector) {
   if (selector) {
@@ -18066,6 +18077,7 @@ var init_workspace = __esm({
     "use strict";
     init_utils();
     init_layout();
+    init_fs_safety();
   }
 });
 
@@ -18080,6 +18092,11 @@ function rootConfigPath(gitRoot) {
   return path4.join(gitRoot, ROOT_CONFIG_FILE);
 }
 function loadYamlMapping(file) {
+  for (const p of [file, path4.dirname(file)]) {
+    if (isSymlink(p)) {
+      return { kind: "malformed", reason: `${path4.basename(p)} is a symlink \u2014 make it a real ${p === file ? "file" : "directory"}` };
+    }
+  }
   let raw;
   try {
     raw = fs4.readFileSync(file, "utf-8");
@@ -18107,6 +18124,7 @@ var init_workspace_manifest = __esm({
   "src/lib/workspace-manifest.ts"() {
     "use strict";
     init_layout();
+    init_fs_safety();
     WORKSPACE_MANIFEST_FILE = "wayai.yaml";
     WORKSPACE_MANIFEST_LABEL = `${WAYAI_LAYOUT.wsDir}/${WORKSPACE_MANIFEST_FILE}`;
     ROOT_CONFIG_FILE = ".wayai.yaml";
@@ -18903,7 +18921,7 @@ var init_registry = __esm({
 
 // src/lib/version-cache.ts
 import { existsSync as existsSync3, readFileSync as readFileSync6, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
-import { dirname as dirname5, join as join7 } from "path";
+import { dirname as dirname6, join as join7 } from "path";
 import { homedir as homedir2 } from "os";
 function getVersionCachePath(filename = CLI_CACHE_FILE) {
   return join7(homedir2(), ".wayai", filename);
@@ -18933,7 +18951,7 @@ function isVersionCacheStale(filename = CLI_CACHE_FILE, maxAgeMs = MAX_AGE_24H_M
 }
 function writeVersionCache(filename, cache) {
   const path35 = getVersionCachePath(filename);
-  const dir = dirname5(path35);
+  const dir = dirname6(path35);
   if (!existsSync3(dir)) mkdirSync2(dir, { recursive: true });
   writeFileSync2(path35, JSON.stringify(cache));
 }
@@ -20583,7 +20601,9 @@ function scanResourceFiles(dir, prefix = "") {
   const entries = fs9.readdirSync(dir, { withFileTypes: true });
   for (const entry of entries) {
     const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
-    if (entry.isDirectory()) {
+    if (entry.isSymbolicLink()) {
+      throw symlinkRefusal(relPath, "file or folder");
+    } else if (entry.isDirectory()) {
       files.push(...scanResourceFiles(path11.join(dir, entry.name), relPath));
     } else if (entry.isFile()) {
       const fullPath = path11.join(dir, entry.name);
@@ -20963,6 +20983,18 @@ var init_eval_attachments = __esm({
 import * as fs11 from "fs";
 import * as path13 from "path";
 import * as yaml6 from "js-yaml";
+function refuseConsumedLink(hubFolder, dir, entry) {
+  if (!entry.isSymbolicLink()) return;
+  const abs = path13.join(dir, entry.name);
+  let toDir = false;
+  try {
+    toDir = fs11.statSync(abs).isDirectory();
+  } catch {
+  }
+  if (toDir || entry.name.endsWith(".yaml")) {
+    throw symlinkRefusal(path13.relative(hubFolder, abs), "file or folder");
+  }
+}
 function parseHubFolder(hubFolder, opts) {
   requireRealHubFolder(hubFolder, false);
   const yamlPath = resolveHubYamlPath(hubFolder);
@@ -20997,8 +21029,14 @@ function parseHubFolder(hubFolder, opts) {
     if (typeof resolved.instructions === "string" && resolved.instructions.endsWith(".md")) {
       const instrValue = resolved.instructions;
       const instructionsPath = instrValue.startsWith("agents/") ? path13.join(hubFolder, instrValue) : path13.join(hubFolder, "agents", instrValue);
-      if (fs11.existsSync(instructionsPath)) {
-        resolved.instructions = fs11.readFileSync(instructionsPath, "utf-8");
+      if (!isUnder(path13.join(hubFolder, "agents"), instructionsPath)) {
+        throw workspaceRefusal(
+          `Agent instructions path "${instrValue}" (agent "${agent.name}") must stay inside agents/.`
+        );
+      }
+      const instructions = readRealFileOrThrow(hubFolder, instructionsPath);
+      if (instructions !== null) {
+        resolved.instructions = instructions;
       } else {
         throw expected(
           `Agent instructions file not found: ${instructionsPath} (referenced by agent "${agent.name}")`
@@ -21006,9 +21044,8 @@ function parseHubFolder(hubFolder, opts) {
       }
     } else if (resolved.instructions === void 0 && typeof agent.name === "string") {
       const conventionPath = path13.join(hubFolder, "agents", `${slugify(agent.name)}.md`);
-      if (fs11.existsSync(conventionPath)) {
-        resolved.instructions = fs11.readFileSync(conventionPath, "utf-8");
-      }
+      const instructions = readRealFileOrThrow(hubFolder, conventionPath);
+      if (instructions !== null) resolved.instructions = instructions;
     }
     return resolved;
   });
@@ -21067,6 +21104,7 @@ function scanEvalYamlFiles(hubFolder, bytesByHash) {
   const seen = /* @__PURE__ */ new Set();
   const topEntries = fs11.readdirSync(evalsDir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
   for (const entry of topEntries) {
+    refuseConsumedLink(hubFolder, evalsDir, entry);
     if (entry.isFile() && entry.name.endsWith(".yaml")) {
       collectEval(evals, seen, path13.join(evalsDir, entry.name), `evals/${entry.name}`, null, hubFolder, bytesByHash);
     } else if (entry.isDirectory()) {
@@ -21074,6 +21112,7 @@ function scanEvalYamlFiles(hubFolder, bytesByHash) {
       const setDir = path13.join(evalsDir, setName);
       const setEntries = fs11.readdirSync(setDir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
       for (const sub of setEntries) {
+        refuseConsumedLink(hubFolder, setDir, sub);
         if (sub.isDirectory()) {
           throw expected(
             `Nested scenario sets are not supported: ${path13.relative(hubFolder, path13.join(setDir, sub.name))}. Move scenarios up to evals/${setName}/.`
@@ -21209,6 +21248,7 @@ function scanJourneyYamlFiles(hubFolder, bytesByHash) {
   const seen = /* @__PURE__ */ new Set();
   const entries = fs11.readdirSync(journeysDir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
   for (const entry of entries) {
+    refuseConsumedLink(hubFolder, journeysDir, entry);
     if (entry.isDirectory()) {
       throw expected(
         `Subfolders are not supported under journeys/: ${path13.relative(hubFolder, path13.join(journeysDir, entry.name))}. A journey owns its own managed scenario set \u2014 put each journey in a single journeys/<slug>.yaml file.`
@@ -21290,7 +21330,7 @@ function scanAgentYamlFiles(hubFolder) {
   const agents = [];
   for (const file of yamlFiles) {
     const filePath = path13.join(agentsDir, file);
-    const content = fs11.readFileSync(filePath, "utf-8");
+    const content = readRealFileOrThrow(hubFolder, filePath) ?? "";
     let agent;
     try {
       agent = yaml6.load(content);
@@ -21325,6 +21365,7 @@ function parseResources(hubFolder, configResources) {
     if (res.skill_name) resource.skill_name = res.skill_name;
     const resSlug = slugify(resource.name);
     const resDir = path13.join(resourcesDir, resSlug);
+    requireRealSubdirNoSymlink(hubFolder, resDir, false);
     if (fs11.existsSync(resDir)) {
       const files = scanResourceFiles(resDir, "");
       if (files.length > 0) {
@@ -21842,10 +21883,6 @@ function isProductionFolder(meta) {
 function filterEditableBases(bases) {
   return bases.filter((b) => !isProductionFolder(b.meta));
 }
-function isUnder(parent, child) {
-  const rel = path17.relative(parent, child);
-  return rel === "" || !rel.startsWith("..") && !path17.isAbsolute(rel);
-}
 function findEnclosingBaseFolder(basesDir, cwd) {
   let dir = path17.resolve(cwd);
   const stop = path17.resolve(basesDir);
@@ -21923,6 +21960,7 @@ var init_base_workspace = __esm({
     init_expected();
     init_base_id();
     init_fs_safety();
+    init_fs_safety();
     BASE_META_FILE = "base.yaml";
   }
 });
@@ -23122,8 +23160,8 @@ async function autoRenameAgentFiles(client, hubId, hubFolder, organizationId, re
   if (fs16.existsSync(agentsDir)) {
     const yamlFiles = fs16.readdirSync(agentsDir).filter((f) => f.endsWith(".yaml"));
     for (const file of yamlFiles) {
+      const content = readRealFileOrThrow(hubFolder, path22.join(agentsDir, file)) ?? "";
       try {
-        const content = fs16.readFileSync(path22.join(agentsDir, file), "utf-8");
         const agent = yaml11.load(content);
         if (agent?.id && agent.name) {
           agentsWithIds.push({ id: agent.id, name: agent.name });
@@ -23568,7 +23606,8 @@ async function pullCommand(args2) {
         }
         action = "apply";
       }
-    } catch {
+    } catch (err) {
+      if (isWorkspaceRefusal(err)) throw err;
       action = "overwrite";
     }
     if (action === "overwrite") console.log("Writing hub configuration...");
@@ -23643,6 +23682,7 @@ var init_pull = __esm({
     init_utils();
     init_resource_files();
     init_hub_materializer();
+    init_fs_safety();
     init_push();
     init_workspace();
     init_layout();
@@ -28230,6 +28270,7 @@ function parseOrgResources(orgDir) {
     if (Array.isArray(res.tags)) resource.tags = res.tags;
     if (Array.isArray(res.folders)) resource.folders = res.folders;
     const resDir = path32.join(resourcesDir, slugify(resource.name));
+    requireRealSubdirNoSymlink(orgDir, resDir, false);
     if (fs23.existsSync(resDir)) {
       const files = scanResourceFiles(resDir, "");
       if (files.length > 0) resource.files = files;
@@ -30617,7 +30658,7 @@ var init_actions = __esm({
 
 // src/data/commands/attachments.ts
 import { Command as Command2 } from "commander";
-import { readFileSync as readFileSync18 } from "fs";
+import { readFileSync as readFileSync17 } from "fs";
 function findAttachmentByFilename(attachments, filename) {
   return attachments.find((a) => a.key.endsWith(`/${filename}`)) ?? null;
 }
@@ -30658,7 +30699,7 @@ function buildAttachmentsCommand() {
       printOutput(data, outputFormat(this));
       return;
     }
-    const body = readFileSync18(opts.file);
+    const body = readFileSync17(opts.file);
     await client.upload(uploadPathFrom(data?.upload_url), body, opts.contentType);
     printOutput({ ...data, uploaded: true }, outputFormat(this));
   });
@@ -31138,8 +31179,8 @@ var init_providers = __esm({
 
 // src/data/commands/report.ts
 import { Command as Command6 } from "commander";
-import { readFileSync as readFileSync19 } from "fs";
-import { dirname as dirname12, join as join30 } from "path";
+import { readFileSync as readFileSync18 } from "fs";
+import { dirname as dirname13, join as join30 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function resolveCliVersion() {
   for (const candidate of [
@@ -31147,7 +31188,7 @@ function resolveCliVersion() {
     join30(here, "..", "..", "..", "package.json")
   ]) {
     try {
-      const version = JSON.parse(readFileSync19(candidate, "utf-8")).version;
+      const version = JSON.parse(readFileSync18(candidate, "utf-8")).version;
       if (typeof version === "string" && version) return version;
     } catch {
     }
@@ -31343,13 +31384,13 @@ var init_report2 = __esm({
     init_terminal_output();
     init_workspace();
     init_skill_version();
-    here = dirname12(fileURLToPath2(import.meta.url));
+    here = dirname13(fileURLToPath2(import.meta.url));
   }
 });
 
 // src/data/commands/credentials.ts
 import { Command as Command7 } from "commander";
-import { readFileSync as readFileSync20 } from "fs";
+import { readFileSync as readFileSync19 } from "fs";
 function withValueSourceOptions(cmd, what) {
   return cmd.option(
     "--file <path>",
@@ -31362,7 +31403,7 @@ async function resolveValue(opts, label) {
       throw expected("--file cannot be combined with --value-stdin or --value-prompt \u2014 pass one.");
     }
     try {
-      return readFileSync20(opts.file).toString("base64");
+      return readFileSync19(opts.file).toString("base64");
     } catch (e) {
       throw expected(`--file ${opts.file}: ${e instanceof Error ? e.message : "could not be read"}`);
     }
@@ -31511,7 +31552,7 @@ var init_credentials = __esm({
 
 // src/data/commands/sql.ts
 import { Command as Command8 } from "commander";
-import { readFileSync as readFileSync21 } from "fs";
+import { readFileSync as readFileSync20 } from "fs";
 function buildBasesSqlCommand() {
   return withBaseOption(new Command8("sql")).description("Execute a read-only SQL query against base data").argument("[query]", "SQL query (SELECT only)").option("--file <path>", "Read SQL from a file instead of the argument").option(
     "--param <kv...>",
@@ -31521,7 +31562,7 @@ function buildBasesSqlCommand() {
     let query;
     if (opts.file) {
       try {
-        query = readFileSync21(opts.file, "utf-8").trim();
+        query = readFileSync20(opts.file, "utf-8").trim();
       } catch (e) {
         throw expected(`--file ${opts.file}: ${e instanceof Error ? e.message : "could not be read"}`);
       }
@@ -32176,8 +32217,8 @@ var init_file_types = __esm({
 
 // src/data/commands/files.ts
 import { Command as Command12 } from "commander";
-import { readFileSync as readFileSync22, writeFileSync as writeFileSync10 } from "fs";
-import { basename as basename19 } from "path";
+import { readFileSync as readFileSync21, writeFileSync as writeFileSync10 } from "fs";
+import { basename as basename20 } from "path";
 function renderFileDiff(fileType, filePath, from, to, d) {
   console.log(sanitizeTerminalText(`${fileType}/${filePath}: v${from} \u2192 v${to}`));
   const md = d.metadata_delta;
@@ -32209,7 +32250,7 @@ function renderFileDiff(fileType, filePath, from, to, d) {
 }
 function downloadTarget(remotePath, to) {
   if (to) return to;
-  const derived = basename19(remotePath);
+  const derived = basename20(remotePath);
   if (derived === "" || derived === "." || derived === "..") {
     throw expected(
       `Cannot derive a local filename from "${remotePath}" \u2014 pass --to <local> to name it.`
@@ -32225,7 +32266,7 @@ function buildFilesCommand() {
     "Upload a local file to a path (e.g. wayai files put reports q3/summary.pdf --file ./summary.pdf)"
   ).requiredOption("--file <local>", "Local file to upload").option("--content-type <type>", "MIME type", "application/octet-stream").action(async function(fileType, filePath, opts) {
     const base = pathSegment(requireBase(this), "--base");
-    const body = readFileSync22(opts.file);
+    const body = readFileSync21(opts.file);
     const client = await createDataClient();
     printOutput(
       await client.upload(
@@ -33274,9 +33315,9 @@ init_errors2();
 init_mask_secrets();
 init_utils();
 init_registry();
-import { readFileSync as readFileSync23 } from "fs";
+import { readFileSync as readFileSync22 } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { dirname as dirname13, join as join31 } from "path";
+import { dirname as dirname14, join as join31 } from "path";
 
 // src/lib/version-refresh.ts
 init_version_cache();
@@ -33431,8 +33472,8 @@ Run \`wayai admin skill install\` to update.`);
 }
 
 // src/index.ts
-var __dirname = dirname13(fileURLToPath3(import.meta.url));
-var pkg = JSON.parse(readFileSync23(join31(__dirname, "..", "package.json"), "utf-8"));
+var __dirname = dirname14(fileURLToPath3(import.meta.url));
+var pkg = JSON.parse(readFileSync22(join31(__dirname, "..", "package.json"), "utf-8"));
 var [, , command, ...args] = process.argv;
 var isBackgroundRefresh = command === REFRESH_COMMAND;
 if (!isBackgroundRefresh) initSentry(command, pkg.version);