@wayai/cli 0.3.87 → 0.3.89

package/dist/index.js

@@ -82,8 +82,8 @@ import { fileURLToPath } from "url";
 import { homedir, platform, arch } from "os";
 function getVersion() {
   try {
-    const __dirname3 = dirname(fileURLToPath(import.meta.url));
-    const pkg2 = JSON.parse(readFileSync(join(__dirname3, "..", "..", "package.json"), "utf-8"));
+    const __dirname2 = dirname(fileURLToPath(import.meta.url));
+    const pkg2 = JSON.parse(readFileSync(join(__dirname2, "..", "..", "package.json"), "utf-8"));
     return pkg2.version || "0.0.0";
   } catch {
     return "0.0.0";
@@ -96,16 +96,16 @@ function isInstalledPackage() {
     return false;
   }
 }
-function initSentry(command2) {
+function initSentry(command2, version) {
   if (initialized) return;
   if (process.env.WAYAI_TELEMETRY_DISABLED === "1") return;
   const dsn = process.env.SENTRY_DSN || HARDCODED_DSN;
   if (!process.env.SENTRY_DSN && !isInstalledPackage()) return;
-  const version = getVersion();
+  const resolvedVersion = version ?? getVersion();
   Sentry.init({
     dsn,
     tracesSampleRate: 0,
-    release: `wayai-cli@${version}`,
+    release: `wayai-cli@${resolvedVersion}`,
     environment: "production",
     defaultIntegrations: false,
     beforeSend(event) {
@@ -165,11 +165,11 @@ function captureException2(error, context) {
     Sentry.captureException(error);
   });
 }
-function addApiBreadcrumb(method, path25) {
+function addApiBreadcrumb(method, path26) {
   if (!initialized) return;
   Sentry.addBreadcrumb({
     category: "http",
-    message: `${method} ${path25}`,
+    message: `${method} ${path26}`,
     level: "info"
   });
 }
@@ -227,13 +227,13 @@ var init_api_client = __esm({
     init_sentry();
     init_redact();
     RETRYABLE_BACKOFF_MS = [500, 1e3, 2e3];
-    delay = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
+    delay = (ms) => new Promise((resolve4) => setTimeout(resolve4, ms));
     ApiError = class extends Error {
       status;
       body;
-      constructor(method, path25, status, body) {
+      constructor(method, path26, status, body) {
         const safeBody = redactSecrets(body);
-        super(`API request failed: ${method} ${path25} (${status}): ${safeBody}`);
+        super(`API request failed: ${method} ${path26} (${status}): ${safeBody}`);
         this.name = "ApiError";
         this.status = status;
         this.body = safeBody;
@@ -376,8 +376,8 @@ var init_api_client = __esm({
           ...organizationId && { organization_id: organizationId }
         });
       }
-      async lookup(path25, opts) {
-        const params = new URLSearchParams({ path: path25 });
+      async lookup(path26, opts) {
+        const params = new URLSearchParams({ path: path26 });
         if (opts?.organizationId) params.set("organization_id", opts.organizationId);
         return this.request("GET", `/api/ci/lookup?${params.toString()}`);
       }
@@ -765,9 +765,9 @@ var init_api_client = __esm({
        * sandbox for this conversation, or the blob was purged).
        */
       async downloadArchiveSandboxFs(hubId, conversationId) {
-        const path25 = `/api/archive/${encodeURIComponent(hubId)}/conversations/${encodeURIComponent(conversationId)}/sandbox`;
-        addApiBreadcrumb("GET", path25);
-        const url = `${this.apiUrl}${path25}`;
+        const path26 = `/api/archive/${encodeURIComponent(hubId)}/conversations/${encodeURIComponent(conversationId)}/sandbox`;
+        addApiBreadcrumb("GET", path26);
+        const url = `${this.apiUrl}${path26}`;
         let response = await this.send(url, "GET");
         if (response.status === 401 && this.onUnauthorized) {
           let refreshed;
@@ -781,7 +781,7 @@ var init_api_client = __esm({
           }
         }
         if (!response.ok) {
-          throw new ApiError("GET", path25, response.status, await response.text());
+          throw new ApiError("GET", path26, response.status, await response.text());
         }
         return new Uint8Array(await response.arrayBuffer());
       }
@@ -821,9 +821,9 @@ var init_api_client = __esm({
           `/api/admin/data-explorer/debug/observability/${encodeURIComponent(hubId)}/conversations/${encodeURIComponent(conversationId)}${qs}`
         );
       }
-      async request(method, path25, body) {
-        addApiBreadcrumb(method, path25);
-        const url = `${this.apiUrl}${path25}`;
+      async request(method, path26, body) {
+        addApiBreadcrumb(method, path26);
+        const url = `${this.apiUrl}${path26}`;
         let refreshedOn401 = false;
         for (let retry = 0; ; retry++) {
           let response = await this.send(url, method, body);
@@ -847,7 +847,7 @@ var init_api_client = __esm({
             await delay(RETRYABLE_BACKOFF_MS[retry]);
             continue;
           }
-          throw new ApiError(method, path25, response.status, errorBody);
+          throw new ApiError(method, path26, response.status, errorBody);
         }
       }
       /** Issue a single authenticated request with the client's current token. */
@@ -1282,8 +1282,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path25, errorMaps, issueData } = params;
-      const fullPath = [...path25, ...issueData.path || []];
+      const { data, path: path26, errorMaps, issueData } = params;
+      const fullPath = [...path26, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -1594,11 +1594,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path25, key) {
+      constructor(parent, value, path26, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path25;
+        this._path = path26;
         this._key = key;
       }
       get path() {
@@ -5052,12 +5052,12 @@ function typeMatches(typeField, allowed) {
   if (Array.isArray(typeField)) return typeField.every((t) => typeof t === "string" && allowed.has(t));
   return false;
 }
-function validateSchema(schema, path25, errors, opts = {}) {
+function validateSchema(schema, path26, errors, opts = {}) {
   if (typeof schema === "boolean") return;
   const depth = opts.depth ?? 0;
   if (depth > MAX_SCHEMA_DEPTH) {
     errors.push({
-      path: path25 || "<root>",
+      path: path26 || "<root>",
       message: `schema nesting exceeds ${MAX_SCHEMA_DEPTH} levels`,
       suggestion: "Flatten the schema; LLM providers reject deeply nested tool input_schemas."
     });
@@ -5065,7 +5065,7 @@ function validateSchema(schema, path25, errors, opts = {}) {
   }
   if (!isRecord(schema)) {
     errors.push({
-      path: path25,
+      path: path26,
       message: `expected object, got ${schema === null ? "null" : typeof schema}`
     });
     return;
@@ -5073,14 +5073,14 @@ function validateSchema(schema, path25, errors, opts = {}) {
   if (opts.isRoot) {
     if ("type" in schema && schema.type !== "object") {
       errors.push({
-        path: path25 ? `${path25}.type` : "type",
+        path: path26 ? `${path26}.type` : "type",
         message: `root type must be 'object', got ${JSON.stringify(schema.type)}`,
         suggestion: "Tool parameters at the root must be an object: `{ type: 'object', properties: { ... } }`."
       });
     }
   } else if ("type" in schema && !typeMatches(schema.type, ALLOWED_TYPES)) {
     errors.push({
-      path: `${path25}.type`,
+      path: `${path26}.type`,
       message: `type must be one of ${[...ALLOWED_TYPES].join("/")} or an array of those, got ${JSON.stringify(schema.type)}`
     });
   }
@@ -5089,25 +5089,25 @@ function validateSchema(schema, path25, errors, opts = {}) {
     if (typeof e === "string") {
       const isPlaceholder = PLACEHOLDER_TOKENS.includes(e);
       errors.push({
-        path: `${path25}.enum`,
+        path: `${path26}.enum`,
         message: `enum must be a non-empty array of primitives, got string ${JSON.stringify(e)}`,
         suggestion: isPlaceholder ? "Set `operation: 'update_kanban_status'` on the tool and ensure at least one hub.kanban_status has `allowsAgentUpdate: true` so the platform can render the placeholder into a valid array." : 'Wrap the value in an array: `enum: ["value"]`.'
       });
     } else if (!Array.isArray(e)) {
       errors.push({
-        path: `${path25}.enum`,
+        path: `${path26}.enum`,
         message: `enum must be a non-empty array of primitives, got ${typeof e}`
       });
     } else if (e.length === 0) {
       errors.push({
-        path: `${path25}.enum`,
+        path: `${path26}.enum`,
         message: "enum must not be empty"
       });
     } else {
       for (let i = 0; i < e.length; i++) {
         if (!isPrimitive(e[i])) {
           errors.push({
-            path: `${path25}.enum[${i}]`,
+            path: `${path26}.enum[${i}]`,
             message: `enum entry must be a primitive (string/number/boolean/null), got ${typeof e[i]}`
           });
         }
@@ -5117,7 +5117,7 @@ function validateSchema(schema, path25, errors, opts = {}) {
   for (const key of ["exclusiveMinimum", "exclusiveMaximum"]) {
     if (key in schema && typeof schema[key] === "boolean") {
       errors.push({
-        path: `${path25}.${key}`,
+        path: `${path26}.${key}`,
         message: `${key} as boolean is draft-04 syntax; draft 2020-12 requires a numeric value`,
         suggestion: `Replace with the numeric bound, e.g. \`${key}: 0\`.`
       });
@@ -5126,45 +5126,45 @@ function validateSchema(schema, path25, errors, opts = {}) {
   if ("properties" in schema) {
     if (!isRecord(schema.properties)) {
       errors.push({
-        path: `${path25}.properties`,
+        path: `${path26}.properties`,
         message: `properties must be an object, got ${Array.isArray(schema.properties) ? "array" : typeof schema.properties}`
       });
     } else {
       for (const [propName, propSchema] of Object.entries(schema.properties)) {
-        validateSchema(propSchema, `${path25}.properties.${propName}`, errors, { depth: depth + 1 });
+        validateSchema(propSchema, `${path26}.properties.${propName}`, errors, { depth: depth + 1 });
       }
     }
   }
   if (schemaTypeIncludes(schema, "array") && "items" in schema) {
     if (Array.isArray(schema.items)) {
-      schema.items.forEach((sub, i) => validateSchema(sub, `${path25}.items[${i}]`, errors, { depth: depth + 1 }));
+      schema.items.forEach((sub, i) => validateSchema(sub, `${path26}.items[${i}]`, errors, { depth: depth + 1 }));
     } else {
-      validateSchema(schema.items, `${path25}.items`, errors, { depth: depth + 1 });
+      validateSchema(schema.items, `${path26}.items`, errors, { depth: depth + 1 });
     }
   }
   for (const key of SUBSCHEMA_OBJECT_KEYWORDS) {
     if (key in schema && isRecord(schema[key])) {
-      validateSchema(schema[key], `${path25}.${key}`, errors, { depth: depth + 1 });
+      validateSchema(schema[key], `${path26}.${key}`, errors, { depth: depth + 1 });
     }
   }
   for (const key of SUBSCHEMA_LIST_KEYWORDS) {
     const list = schema[key];
     if (Array.isArray(list)) {
-      list.forEach((sub, i) => validateSchema(sub, `${path25}.${key}[${i}]`, errors, { depth: depth + 1 }));
+      list.forEach((sub, i) => validateSchema(sub, `${path26}.${key}[${i}]`, errors, { depth: depth + 1 }));
     }
   }
   for (const key of SUBSCHEMA_MAP_KEYWORDS) {
     const map = schema[key];
     if (isRecord(map)) {
       for (const [name, sub] of Object.entries(map)) {
-        validateSchema(sub, `${path25}.${key}.${name}`, errors, { depth: depth + 1 });
+        validateSchema(sub, `${path26}.${key}.${name}`, errors, { depth: depth + 1 });
       }
     }
   }
   const reportedPaths = new Set(errors.map((e) => e.path));
   for (const [k, v] of Object.entries(schema)) {
     if (typeof v !== "string") continue;
-    const fieldPath = `${path25}.${k}`;
+    const fieldPath = `${path26}.${k}`;
     if (reportedPaths.has(fieldPath)) continue;
     for (const token of PLACEHOLDER_TOKENS) {
       if (v === token) {
@@ -5320,10 +5320,10 @@ function refineHubAsCodeLanes(config, ctx) {
     }
   }
 }
-function isSafeTemplatePath(path25) {
-  if (path25.length === 0 || path25.length > 300) return false;
-  if (path25.startsWith("/") || path25.includes("\\")) return false;
-  const segments = path25.split("/");
+function isSafeTemplatePath(path26) {
+  if (path26.length === 0 || path26.length > 300) return false;
+  if (path26.startsWith("/") || path26.includes("\\")) return false;
+  const segments = path26.split("/");
   return segments.every(
     (seg) => seg.length > 0 && seg !== "." && seg !== ".." && /^[A-Za-z0-9._-]+$/.test(seg)
   );
@@ -5916,7 +5916,7 @@ var init_dist = __esm({
       // at fallback time in the turn seam (a stale/missing id simply no-ops). Nullable to clear it.
       fallback_connection_id: uuidSchema.nullable().optional(),
       // Rekor API connection used to reset/clear eval seed fixtures (gh #3090). A
-      // connection id on this hub (a REST API / `Tool - Custom` connection whose base_url
+      // connection id on this hub (a REST API (custom tool) connection whose base_url
       // is the Rekor API origin + a bearer/api_key `write:seeds` token). Validated at
       // set-time on the REST PATCH (setup/hubs.ts). Nullable to clear it.
       seed_connection_id: uuidSchema.nullable().optional()
@@ -8129,6 +8129,7 @@ __export(workspace_exports, {
   detectWorkspace: () => detectWorkspace,
   filterPreviewHubs: () => filterPreviewHubs,
   findEnclosingHubFolder: () => findEnclosingHubFolder,
+  findEnclosingNewHubFolder: () => findEnclosingNewHubFolder,
   findGitRoot: () => findGitRoot,
   findHubByFolderName: () => findHubByFolderName,
   findLocalHubFolder: () => findLocalHubFolder,
@@ -8141,6 +8142,8 @@ __export(workspace_exports, {
   resolveExplicitHubPath: () => resolveExplicitHubPath,
   resolveHubFolder: () => resolveHubFolder,
   resolveHubFolderBySelector: () => resolveHubFolderBySelector,
+  resolveNewHubForCreate: () => resolveNewHubForCreate,
+  resolvePushTarget: () => resolvePushTarget,
   resolveWorkspaceDir: () => resolveWorkspaceDir,
   scanNewHubs: () => scanNewHubs,
   scanWorkspaceHubs: () => scanWorkspaceHubs
@@ -8383,6 +8386,56 @@ function findEnclosingHubFolder(workspaceDir) {
     current = parent;
   }
 }
+function findEnclosingNewHubFolder(workspaceDir) {
+  let current = process.cwd();
+  const stop = path2.resolve(workspaceDir);
+  while (true) {
+    const meta = readNewHubYaml(path2.join(current, "hub.yaml")) || readNewHubYaml(path2.join(current, "wayai.yaml"));
+    if (meta) {
+      return { hubFolder: current, hubName: meta.hubName, hubType: meta.hubType };
+    }
+    if (current === stop) return null;
+    const parent = path2.dirname(current);
+    if (parent === current) return null;
+    current = parent;
+  }
+}
+function resolvePushTarget(workspaceDir, existingHubs, newHubs, selector) {
+  if (selector) {
+    const existingMatch = existingHubs.find(
+      (h) => h.hubId === selector || path2.basename(h.hubFolder) === selector
+    );
+    if (existingMatch) return { ok: true, target: { kind: "existing", hub: existingMatch } };
+    const newMatch = newHubs.find((h) => path2.basename(h.hubFolder) === selector);
+    if (newMatch) return { ok: true, target: { kind: "new", hub: newMatch } };
+    return { ok: false, reason: "selector_miss" };
+  }
+  const enclosingExisting = findEnclosingHubFolder(workspaceDir);
+  if (enclosingExisting) return { ok: true, target: { kind: "existing", hub: enclosingExisting } };
+  const enclosingNew = findEnclosingNewHubFolder(workspaceDir);
+  if (enclosingNew) return { ok: true, target: { kind: "new", hub: enclosingNew } };
+  const previewHubs = filterPreviewHubs(existingHubs);
+  const total = previewHubs.length + newHubs.length;
+  if (total === 0) return { ok: false, reason: "none" };
+  if (total > 1) return { ok: false, reason: "ambiguous" };
+  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) {
+    const newMatch = newHubs.find((h) => path2.basename(h.hubFolder) === selector);
+    if (newMatch) return { ok: true, hub: newMatch };
+    const existingMatch = existingHubs.find(
+      (h) => h.hubId === selector || path2.basename(h.hubFolder) === selector
+    );
+    if (existingMatch) return { ok: false, reason: "exists", existing: existingMatch };
+    return { ok: false, reason: "selector_miss" };
+  }
+  const enclosingNew = findEnclosingNewHubFolder(workspaceDir);
+  if (enclosingNew) return { ok: true, hub: enclosingNew };
+  if (newHubs.length === 1) return { ok: true, hub: newHubs[0] };
+  if (newHubs.length === 0) return { ok: false, reason: "none" };
+  return { ok: false, reason: "ambiguous" };
+}
 function resolveActiveHubId(args2) {
   let selector;
   const hubIdx = args2.indexOf("--hub");
@@ -8537,24 +8590,24 @@ import * as path4 from "path";
 import * as readline from "readline";
 function prompt(question) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve5) => {
+  return new Promise((resolve4) => {
     rl.question(question, (answer) => {
       rl.close();
-      resolve5(answer.trim());
+      resolve4(answer.trim());
     });
   });
 }
 function confirm(question) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve5) => {
+  return new Promise((resolve4) => {
     rl.question(`${question} [y/N]: `, (answer) => {
       rl.close();
-      resolve5(answer.trim().toLowerCase() === "y");
+      resolve4(answer.trim().toLowerCase() === "y");
     });
   });
 }
 function promptSecret(question) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve4) => {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const originalWrite = rl._writeToOutput;
     let firstWrite = true;
@@ -8570,18 +8623,18 @@ function promptSecret(question) {
       rl._writeToOutput = originalWrite;
       process.stdout.write("\n");
       rl.close();
-      resolve5(answer);
+      resolve4(answer);
     });
   });
 }
 function readStdin() {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve4, reject) => {
     let data = "";
     process.stdin.setEncoding("utf-8");
     process.stdin.on("data", (chunk) => {
       data += chunk;
     });
-    process.stdin.on("end", () => resolve5(data.trim()));
+    process.stdin.on("end", () => resolve4(data.trim()));
     process.stdin.on("error", reject);
   });
 }
@@ -8742,9 +8795,9 @@ function getVersionCachePath(filename = CLI_CACHE_FILE) {
 }
 function readVersionCache(filename = CLI_CACHE_FILE) {
   try {
-    const path25 = getVersionCachePath(filename);
-    if (!existsSync4(path25)) return null;
-    const parsed = JSON.parse(readFileSync5(path25, "utf-8"));
+    const path26 = getVersionCachePath(filename);
+    if (!existsSync4(path26)) return null;
+    const parsed = JSON.parse(readFileSync5(path26, "utf-8"));
     if (typeof parsed.lastCheck !== "number") return null;
     if (parsed.latest !== null && typeof parsed.latest !== "string") return null;
     return parsed;
@@ -8764,10 +8817,10 @@ function isVersionCacheStale(filename = CLI_CACHE_FILE, maxAgeMs = MAX_AGE_24H_M
   return Date.now() - cache.lastCheck > maxAgeMs;
 }
 function writeVersionCache(filename, cache) {
-  const path25 = getVersionCachePath(filename);
-  const dir = dirname3(path25);
+  const path26 = getVersionCachePath(filename);
+  const dir = dirname3(path26);
   if (!existsSync4(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync2(path25, JSON.stringify(cache));
+  writeFileSync2(path26, JSON.stringify(cache));
 }
 function touchVersionCache(filename) {
   writeVersionCache(filename, { lastCheck: Date.now(), latest: readVersionCache(filename)?.latest ?? null });
@@ -8806,14 +8859,14 @@ function parseFrontmatterVersion(content) {
 function findInstalledSkills(projectRoot, paths = SKILL_INSTALL_PATHS) {
   const found = [];
   for (const rel of paths) {
-    const path25 = join7(projectRoot, rel);
-    if (!existsSync5(path25)) continue;
+    const path26 = join7(projectRoot, rel);
+    if (!existsSync5(path26)) continue;
     let version = null;
     try {
-      version = parseFrontmatterVersion(readFileSync6(path25, "utf-8"));
+      version = parseFrontmatterVersion(readFileSync6(path26, "utf-8"));
     } catch {
     }
-    found.push({ path: path25, version });
+    found.push({ path: path26, version });
   }
   return found;
 }
@@ -9274,7 +9327,7 @@ async function validateToken(apiUrl, token) {
   }
 }
 function startCallbackServer(port, expectedState, timeoutMs = 12e4) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve4, reject) => {
     const server = http.createServer((req, res) => {
       const url = new URL(req.url || "/", `http://127.0.0.1:${port}`);
       if (url.pathname === "/callback") {
@@ -9300,7 +9353,7 @@ function startCallbackServer(port, expectedState, timeoutMs = 12e4) {
           res.writeHead(200, { "Content-Type": "text/html" });
           res.end("<html><body><h2>Login successful!</h2><p>You can close this tab and return to your terminal.</p></body></html>");
           server.close();
-          resolve5({ code, port });
+          resolve4({ code, port });
         } else {
           res.writeHead(400, { "Content-Type": "text/html" });
           res.end("<html><body><h2>Login failed</h2><p>No authorization code received</p></body></html>");
@@ -9510,10 +9563,10 @@ import * as readline2 from "readline";
 function prompt2(question, defaultValue) {
   const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
   const display = defaultValue ? `${question} [${defaultValue}]: ` : `${question}: `;
-  return new Promise((resolve5) => {
+  return new Promise((resolve4) => {
     rl.question(display, (answer) => {
       rl.close();
-      resolve5(answer.trim() || defaultValue || "");
+      resolve4(answer.trim() || defaultValue || "");
     });
   });
 }
@@ -9631,8 +9684,8 @@ async function tryOpenBrowser(url) {
       cmd = "xdg-open";
       args2 = [url];
     }
-    return new Promise((resolve5) => {
-      execFile(cmd, args2, (err) => resolve5(!err));
+    return new Promise((resolve4) => {
+      execFile(cmd, args2, (err) => resolve4(!err));
     });
   } catch {
     return false;
@@ -11270,9 +11323,11 @@ var init_pull = __esm({
 var push_exports = {};
 __export(push_exports, {
   autoRenameAgentFiles: () => autoRenameAgentFiles,
+  createAndPushNewHub: () => createAndPushNewHub,
   printSyncResult: () => printSyncResult,
   printWarnings: () => printWarnings,
   pushCommand: () => pushCommand,
+  reportUnresolvedPushTarget: () => reportUnresolvedPushTarget,
   selectExistingHub: () => selectExistingHub,
   shouldWarnIgnoredPreviewLabel: () => shouldWarnIgnoredPreviewLabel
 });
@@ -11558,67 +11613,11 @@ function selectExistingHub(workspaceDir, allHubs, selector, wsLabel) {
   if (previewHubs.length === 1) return previewHubs[0];
   return null;
 }
-function selectNewHub(newHubs, selector) {
-  if (selector) {
-    const match = newHubs.find((h) => path14.basename(h.hubFolder) === selector);
-    if (!match) return null;
-    return match;
-  }
-  const cwd = process.cwd();
-  const cwdMatch = newHubs.find((h) => path14.resolve(h.hubFolder) === path14.resolve(cwd));
-  if (cwdMatch) return cwdMatch;
-  if (newHubs.length === 1) return newHubs[0];
-  return null;
-}
-async function pushCommand(args2) {
-  const { autoConfirm, hubSelector, label } = parseArgs5(args2);
-  const repoConfig = requireRepoConfig();
-  const { organization_id: organizationId } = repoConfig;
-  const { config, accessToken } = await requireAuth();
-  const client = new ApiClient({ apiUrl: config.api_url, accessToken });
-  const workspaceDir = resolveWorkspaceDir();
-  const gitRoot = findGitRoot();
-  const wsLabel = hubsDirLabel(gitRoot);
-  if (gitRoot) warnLayoutOnce(gitRoot);
-  if (!fs12.existsSync(workspaceDir)) {
-    console.error(`No ${wsLabel}/ directory found. Run \`wayai pull\` first or create hub files in ${wsLabel}/<hub>/hub.yaml.`);
-    process.exit(1);
-  }
-  const existingHubs = scanWorkspaceHubs(workspaceDir);
-  const newHubs = scanNewHubs(workspaceDir);
-  const existing = selectExistingHub(workspaceDir, existingHubs, hubSelector, wsLabel);
-  if (existing) {
-    if (existing.hubEnvironment === "production") {
-      console.log("This is a read-only production mirror \u2014 production hubs cannot be pushed. Edit the linked preview hub instead.");
-      return;
-    }
-    if (label) {
-      console.warn("Note: --label is only used when creating a new hub. To change an existing hub's label, use `wayai relabel`.");
-    }
-    assertHubMatchesBinding(existing.hubId, path14.basename(existing.hubFolder));
-    await pushSingleHub(client, existing.hubId, existing.hubFolder, autoConfirm, organizationId);
-    return;
-  }
-  const newHub = selectNewHub(newHubs, hubSelector);
-  if (!newHub) {
-    if (existingHubs.length === 0 && newHubs.length === 0) {
-      console.error(`No hub folders found. Create hub files in ${wsLabel}/<hub>/hub.yaml with \`hub: { name: ... }\` and run \`wayai push\`.`);
-      process.exit(1);
-    }
-    console.error(`Multiple hub folders found in ${wsLabel}/. Pass --hub <uuid|folder-name> to choose, or run from inside a hub folder:`);
-    for (const h of existingHubs) {
-      console.error(`  ${path14.basename(h.hubFolder)} (${h.hubId})`);
-    }
-    for (const h of newHubs) {
-      console.error(`  ${path14.basename(h.hubFolder)} (new \u2014 "${h.hubName}")`);
-    }
-    process.exit(1);
-  }
-  assertNoBindingBlocksHubCreation(newHub.hubName);
+async function createAndPushNewHub(client, newHub, opts) {
   const hubType = newHub.hubType || "chat";
   console.log(`
-New hub detected: "${newHub.hubName}" (${hubType})`);
-  if (!autoConfirm) {
+New hub: "${newHub.hubName}" (${hubType})`);
+  if (!opts.autoConfirm) {
     const ok = await confirm("Create this hub on the platform?");
     if (!ok) {
       console.log("Cancelled.");
@@ -11631,10 +11630,10 @@ New hub detected: "${newHub.hubName}" (${hubType})`);
     process.exit(1);
   }
   console.log("Creating hub...");
-  const createResult = await client.createHub(organizationId, {
+  const createResult = await client.createHub(opts.organizationId, {
     hubName: newHub.hubName,
     hubType,
-    previewLabel: label?.trim() || void 0
+    previewLabel: opts.label?.trim() || void 0
   });
   const createdHub = createResult.data[0];
   const hubId = createdHub.hub_id;
@@ -11661,7 +11660,69 @@ ${content}`;
   }
   fs12.writeFileSync(hubYamlPath, updated, "utf-8");
   autoBindIfUnbound(hubId);
-  await pushSingleHub(client, hubId, newHub.hubFolder, autoConfirm, organizationId, { skipAgentRename: true });
+  await pushSingleHub(client, hubId, newHub.hubFolder, opts.autoConfirm, opts.organizationId, { skipAgentRename: true });
+}
+function reportUnresolvedPushTarget(reason, existingHubs, newHubs, selector, wsLabel) {
+  if (reason === "none") {
+    if (existingHubs.length > 0) {
+      console.error(`No pushable hub found in ${wsLabel}/ \u2014 only read-only production mirror folder(s). Edit the linked preview hub, pull one, or create a new hub with \`wayai create\`:`);
+      for (const h of existingHubs) {
+        console.error(`  ${path14.basename(h.hubFolder)} (${h.hubId}, production mirror)`);
+      }
+    } else {
+      console.error(`No hub folders found. Create hub files in ${wsLabel}/<hub>/hub.yaml with \`hub: { name: ... }\` and run \`wayai push\` (or \`wayai create\`).`);
+    }
+    process.exit(1);
+  }
+  if (reason === "selector_miss") {
+    console.error(`No hub matching --hub ${selector} found in ${wsLabel}/. Available:`);
+  } else {
+    console.error(`Multiple hub folders found in ${wsLabel}/. Pass --hub <uuid|folder-name> to choose, or run from inside a hub folder:`);
+  }
+  for (const h of existingHubs) {
+    console.error(`  ${path14.basename(h.hubFolder)} (${h.hubId})`);
+  }
+  for (const h of newHubs) {
+    console.error(`  ${path14.basename(h.hubFolder)} (new \u2014 "${h.hubName}")`);
+  }
+  process.exit(1);
+}
+async function pushCommand(args2) {
+  const { autoConfirm, hubSelector, label } = parseArgs5(args2);
+  const repoConfig = requireRepoConfig();
+  const { organization_id: organizationId } = repoConfig;
+  const { config, accessToken } = await requireAuth();
+  const client = new ApiClient({ apiUrl: config.api_url, accessToken });
+  const workspaceDir = resolveWorkspaceDir();
+  const gitRoot = findGitRoot();
+  const wsLabel = hubsDirLabel(gitRoot);
+  if (gitRoot) warnLayoutOnce(gitRoot);
+  if (!fs12.existsSync(workspaceDir)) {
+    console.error(`No ${wsLabel}/ directory found. Run \`wayai pull\` first or create hub files in ${wsLabel}/<hub>/hub.yaml.`);
+    process.exit(1);
+  }
+  const existingHubs = scanWorkspaceHubs(workspaceDir);
+  const newHubs = scanNewHubs(workspaceDir);
+  const resolution = resolvePushTarget(workspaceDir, existingHubs, newHubs, hubSelector);
+  if (!resolution.ok) {
+    reportUnresolvedPushTarget(resolution.reason, existingHubs, newHubs, hubSelector, wsLabel);
+  }
+  if (resolution.target.kind === "existing") {
+    const existing = resolution.target.hub;
+    if (existing.hubEnvironment === "production") {
+      console.log("This is a read-only production mirror \u2014 production hubs cannot be pushed. Edit the linked preview hub instead.");
+      return;
+    }
+    if (label) {
+      console.warn("Note: --label is only used when creating a new hub. To change an existing hub's label, use `wayai relabel`.");
+    }
+    console.log(`Target hub: ${path14.basename(existing.hubFolder)} (${existing.hubId})`);
+    assertHubMatchesBinding(existing.hubId, path14.basename(existing.hubFolder));
+    await pushSingleHub(client, existing.hubId, existing.hubFolder, autoConfirm, organizationId);
+    return;
+  }
+  assertNoBindingBlocksHubCreation(resolution.target.hub.hubName);
+  await createAndPushNewHub(client, resolution.target.hub, { autoConfirm, label, organizationId });
 }
 var init_push = __esm({
   "src/commands/push.ts"() {
@@ -11680,13 +11741,89 @@ var init_push = __esm({
   }
 });
 
+// src/commands/create.ts
+var create_exports = {};
+__export(create_exports, {
+  createCommand: () => createCommand
+});
+import * as path15 from "path";
+import * as fs13 from "fs";
+function parseArgs6(args2) {
+  let autoConfirm = false;
+  let folderSelector;
+  let label;
+  for (let i = 0; i < args2.length; i++) {
+    const arg = args2[i];
+    if (arg === "--yes" || arg === "-y") {
+      autoConfirm = true;
+    } else if (arg === "--label" && args2[i + 1]) {
+      label = args2[++i];
+    } else if (!arg.startsWith("-") && folderSelector === void 0) {
+      folderSelector = arg;
+    }
+  }
+  return { autoConfirm, folderSelector, label };
+}
+async function createCommand(args2) {
+  const { autoConfirm, folderSelector, label } = parseArgs6(args2);
+  const repoConfig = requireRepoConfig();
+  const { organization_id: organizationId } = repoConfig;
+  const { config, accessToken } = await requireAuth();
+  const client = new ApiClient({ apiUrl: config.api_url, accessToken });
+  const workspaceDir = resolveWorkspaceDir();
+  const gitRoot = findGitRoot();
+  const wsLabel = hubsDirLabel(gitRoot);
+  if (gitRoot) warnLayoutOnce(gitRoot);
+  if (!fs13.existsSync(workspaceDir)) {
+    console.error(`No ${wsLabel}/ directory found. Create hub files in ${wsLabel}/<hub>/hub.yaml with \`hub: { name: ... }\` first.`);
+    process.exit(1);
+  }
+  const existingHubs = scanWorkspaceHubs(workspaceDir);
+  const newHubs = scanNewHubs(workspaceDir);
+  const resolution = resolveNewHubForCreate(workspaceDir, existingHubs, newHubs, folderSelector);
+  if (!resolution.ok) {
+    if (resolution.reason === "exists") {
+      const folder = path15.basename(resolution.existing.hubFolder);
+      console.error(`Hub "${folder}" already exists (${resolution.existing.hubId}). Use \`wayai push --hub ${folder}\` to update it.`);
+      process.exit(1);
+    }
+    if (resolution.reason === "selector_miss") {
+      console.error(`No new (uncreated) hub folder "${folderSelector}" found in ${wsLabel}/. A new hub folder needs a hub.yaml with \`hub: { name: ... }\` and no hub_id.`);
+      process.exit(1);
+    }
+    if (resolution.reason === "none") {
+      console.error(`No new (uncreated) hub folders found in ${wsLabel}/. Create ${wsLabel}/<hub>/hub.yaml with \`hub: { name: ... }\` first, then run \`wayai create\`.`);
+      process.exit(1);
+    }
+    console.error(`Multiple new hub folders found in ${wsLabel}/. Pass the folder name (\`wayai create <folder>\`) or run from inside one:`);
+    for (const h of newHubs) {
+      console.error(`  ${path15.basename(h.hubFolder)} (new \u2014 "${h.hubName}")`);
+    }
+    process.exit(1);
+  }
+  assertNoBindingBlocksHubCreation(resolution.hub.hubName);
+  await createAndPushNewHub(client, resolution.hub, { autoConfirm, label, organizationId });
+}
+var init_create = __esm({
+  "src/commands/create.ts"() {
+    "use strict";
+    init_auth();
+    init_api_client();
+    init_push();
+    init_workspace();
+    init_layout();
+    init_repo_config();
+    init_hub_binding();
+  }
+});
+
 // src/commands/diff.ts
 var diff_exports = {};
 __export(diff_exports, {
   diffCommand: () => diffCommand,
-  parseArgs: () => parseArgs6
+  parseArgs: () => parseArgs7
 });
-function parseArgs6(args2) {
+function parseArgs7(args2) {
   let production = false;
   let hubSelector;
   for (let i = 0; i < args2.length; i++) {
@@ -11700,7 +11837,7 @@ function parseArgs6(args2) {
   return { production, hubSelector };
 }
 async function diffCommand(args2) {
-  const { production, hubSelector } = parseArgs6(args2);
+  const { production, hubSelector } = parseArgs7(args2);
   const repoConfig = requireRepoConfig();
   const { organization_id: organizationId } = repoConfig;
   const { config, accessToken } = await requireAuth();
@@ -11830,12 +11967,12 @@ function typeMatches2(typeField, allowed) {
   if (Array.isArray(typeField)) return typeField.every((t) => typeof t === "string" && allowed.has(t));
   return false;
 }
-function validateSchema2(schema, path25, errors, opts = {}) {
+function validateSchema2(schema, path26, errors, opts = {}) {
   if (typeof schema === "boolean") return;
   const depth = opts.depth ?? 0;
   if (depth > MAX_SCHEMA_DEPTH2) {
     errors.push({
-      path: path25 || "<root>",
+      path: path26 || "<root>",
       message: `schema nesting exceeds ${MAX_SCHEMA_DEPTH2} levels`,
       suggestion: "Flatten the schema; LLM providers reject deeply nested tool input_schemas."
     });
@@ -11843,7 +11980,7 @@ function validateSchema2(schema, path25, errors, opts = {}) {
   }
   if (!isRecord2(schema)) {
     errors.push({
-      path: path25,
+      path: path26,
       message: `expected object, got ${schema === null ? "null" : typeof schema}`
     });
     return;
@@ -11851,14 +11988,14 @@ function validateSchema2(schema, path25, errors, opts = {}) {
   if (opts.isRoot) {
     if ("type" in schema && schema.type !== "object") {
       errors.push({
-        path: path25 ? `${path25}.type` : "type",
+        path: path26 ? `${path26}.type` : "type",
         message: `root type must be 'object', got ${JSON.stringify(schema.type)}`,
         suggestion: "Tool parameters at the root must be an object: `{ type: 'object', properties: { ... } }`."
       });
     }
   } else if ("type" in schema && !typeMatches2(schema.type, ALLOWED_TYPES2)) {
     errors.push({
-      path: `${path25}.type`,
+      path: `${path26}.type`,
       message: `type must be one of ${[...ALLOWED_TYPES2].join("/")} or an array of those, got ${JSON.stringify(schema.type)}`
     });
   }
@@ -11867,25 +12004,25 @@ function validateSchema2(schema, path25, errors, opts = {}) {
     if (typeof e === "string") {
       const isPlaceholder = PLACEHOLDER_TOKENS2.includes(e);
       errors.push({
-        path: `${path25}.enum`,
+        path: `${path26}.enum`,
         message: `enum must be a non-empty array of primitives, got string ${JSON.stringify(e)}`,
         suggestion: isPlaceholder ? "Set `operation: 'update_kanban_status'` on the tool and ensure at least one hub.kanban_status has `allowsAgentUpdate: true` so the platform can render the placeholder into a valid array." : 'Wrap the value in an array: `enum: ["value"]`.'
       });
     } else if (!Array.isArray(e)) {
       errors.push({
-        path: `${path25}.enum`,
+        path: `${path26}.enum`,
         message: `enum must be a non-empty array of primitives, got ${typeof e}`
       });
     } else if (e.length === 0) {
       errors.push({
-        path: `${path25}.enum`,
+        path: `${path26}.enum`,
         message: "enum must not be empty"
       });
     } else {
       for (let i = 0; i < e.length; i++) {
         if (!isPrimitive2(e[i])) {
           errors.push({
-            path: `${path25}.enum[${i}]`,
+            path: `${path26}.enum[${i}]`,
             message: `enum entry must be a primitive (string/number/boolean/null), got ${typeof e[i]}`
           });
         }
@@ -11895,7 +12032,7 @@ function validateSchema2(schema, path25, errors, opts = {}) {
   for (const key of ["exclusiveMinimum", "exclusiveMaximum"]) {
     if (key in schema && typeof schema[key] === "boolean") {
       errors.push({
-        path: `${path25}.${key}`,
+        path: `${path26}.${key}`,
         message: `${key} as boolean is draft-04 syntax; draft 2020-12 requires a numeric value`,
         suggestion: `Replace with the numeric bound, e.g. \`${key}: 0\`.`
       });
@@ -11904,45 +12041,45 @@ function validateSchema2(schema, path25, errors, opts = {}) {
   if ("properties" in schema) {
     if (!isRecord2(schema.properties)) {
       errors.push({
-        path: `${path25}.properties`,
+        path: `${path26}.properties`,
         message: `properties must be an object, got ${Array.isArray(schema.properties) ? "array" : typeof schema.properties}`
       });
     } else {
       for (const [propName, propSchema] of Object.entries(schema.properties)) {
-        validateSchema2(propSchema, `${path25}.properties.${propName}`, errors, { depth: depth + 1 });
+        validateSchema2(propSchema, `${path26}.properties.${propName}`, errors, { depth: depth + 1 });
       }
     }
   }
   if (schemaTypeIncludes2(schema, "array") && "items" in schema) {
     if (Array.isArray(schema.items)) {
-      schema.items.forEach((sub, i) => validateSchema2(sub, `${path25}.items[${i}]`, errors, { depth: depth + 1 }));
+      schema.items.forEach((sub, i) => validateSchema2(sub, `${path26}.items[${i}]`, errors, { depth: depth + 1 }));
     } else {
-      validateSchema2(schema.items, `${path25}.items`, errors, { depth: depth + 1 });
+      validateSchema2(schema.items, `${path26}.items`, errors, { depth: depth + 1 });
     }
   }
   for (const key of SUBSCHEMA_OBJECT_KEYWORDS2) {
     if (key in schema && isRecord2(schema[key])) {
-      validateSchema2(schema[key], `${path25}.${key}`, errors, { depth: depth + 1 });
+      validateSchema2(schema[key], `${path26}.${key}`, errors, { depth: depth + 1 });
     }
   }
   for (const key of SUBSCHEMA_LIST_KEYWORDS2) {
     const list = schema[key];
     if (Array.isArray(list)) {
-      list.forEach((sub, i) => validateSchema2(sub, `${path25}.${key}[${i}]`, errors, { depth: depth + 1 }));
+      list.forEach((sub, i) => validateSchema2(sub, `${path26}.${key}[${i}]`, errors, { depth: depth + 1 }));
     }
   }
   for (const key of SUBSCHEMA_MAP_KEYWORDS2) {
     const map = schema[key];
     if (isRecord2(map)) {
       for (const [name, sub] of Object.entries(map)) {
-        validateSchema2(sub, `${path25}.${key}.${name}`, errors, { depth: depth + 1 });
+        validateSchema2(sub, `${path26}.${key}.${name}`, errors, { depth: depth + 1 });
       }
     }
   }
   const reportedPaths = new Set(errors.map((e) => e.path));
   for (const [k, v] of Object.entries(schema)) {
     if (typeof v !== "string") continue;
-    const fieldPath = `${path25}.${k}`;
+    const fieldPath = `${path26}.${k}`;
     if (reportedPaths.has(fieldPath)) continue;
     for (const token of PLACEHOLDER_TOKENS2) {
       if (v === token) {
@@ -12098,10 +12235,10 @@ function refineHubAsCodeLanes2(config, ctx) {
     }
   }
 }
-function isSafeTemplatePath2(path25) {
-  if (path25.length === 0 || path25.length > 300) return false;
-  if (path25.startsWith("/") || path25.includes("\\")) return false;
-  const segments = path25.split("/");
+function isSafeTemplatePath2(path26) {
+  if (path26.length === 0 || path26.length > 300) return false;
+  if (path26.startsWith("/") || path26.includes("\\")) return false;
+  const segments = path26.split("/");
   return segments.every(
     (seg) => seg.length > 0 && seg !== "." && seg !== ".." && /^[A-Za-z0-9._-]+$/.test(seg)
   );
@@ -12129,9 +12266,9 @@ function isPlainObject(value) {
   const proto = Object.getPrototypeOf(value);
   return proto === Object.prototype || proto === null;
 }
-function isSanitizableSliceFile(path25) {
-  if (!/\.ya?ml$/i.test(path25)) return false;
-  return path25 !== "resources" && !path25.startsWith("resources/");
+function isSanitizableSliceFile(path26) {
+  if (!/\.ya?ml$/i.test(path26)) return false;
+  return path26 !== "resources" && !path26.startsWith("resources/");
 }
 function distinctUsesBackends(uses) {
   return [...new Set((uses ?? []).map((u) => u.backend))];
@@ -12575,7 +12712,7 @@ var init_contracts = __esm({
       // at fallback time in the turn seam (a stale/missing id simply no-ops). Nullable to clear it.
       fallback_connection_id: uuidSchema2.nullable().optional(),
       // Rekor API connection used to reset/clear eval seed fixtures (gh #3090). A
-      // connection id on this hub (a REST API / `Tool - Custom` connection whose base_url
+      // connection id on this hub (a REST API (custom tool) connection whose base_url
       // is the Rekor API origin + a bearer/api_key `write:seeds` token). Validated at
       // set-time on the REST PATCH (setup/hubs.ts). Nullable to clear it.
       seed_connection_id: uuidSchema2.nullable().optional()
@@ -14751,9 +14888,9 @@ var replicate_exports = {};
 __export(replicate_exports, {
   replicateCommand: () => replicateCommand
 });
-import * as fs13 from "fs";
-import * as path15 from "path";
-function parseArgs7(args2) {
+import * as fs14 from "fs";
+import * as path16 from "path";
+function parseArgs8(args2) {
   let label;
   let hubSelector;
   for (let i = 0; i < args2.length; i++) {
@@ -14769,7 +14906,7 @@ function parseArgs7(args2) {
   return { label, hubSelector };
 }
 async function replicateCommand(args2) {
-  const { label, hubSelector } = parseArgs7(args2);
+  const { label, hubSelector } = parseArgs8(args2);
   const normalizedLabel = label?.trim() || void 0;
   if (normalizedLabel && normalizedLabel.length > PREVIEW_LABEL_MAX_LENGTH2) {
     console.error(`--label must be ${PREVIEW_LABEL_MAX_LENGTH2} characters or fewer.`);
@@ -14798,7 +14935,7 @@ async function replicateCommand(args2) {
     payload.preview_label,
     payload.branch_name
   );
-  fs13.mkdirSync(path15.dirname(hubFolder), { recursive: true });
+  fs14.mkdirSync(path16.dirname(hubFolder), { recursive: true });
   writeHubFolder(hubFolder, payload);
   await downloadBinaryResourceFiles(hubFolder, payload);
   hubFolder = autoRenameHubFolder(
@@ -14810,8 +14947,8 @@ async function replicateCommand(args2) {
     payload.branch_name
   );
   autoBindIfUnbound(previewHubId);
-  console.log(`Preview written to ${path15.basename(hubFolder)}`);
-  console.log(`  Switch to it with: wayai use ${path15.basename(hubFolder)}`);
+  console.log(`Preview written to ${path16.basename(hubFolder)}`);
+  console.log(`  Switch to it with: wayai use ${path16.basename(hubFolder)}`);
 }
 var init_replicate = __esm({
   "src/commands/replicate.ts"() {
@@ -14833,8 +14970,8 @@ var relabel_exports = {};
 __export(relabel_exports, {
   relabelCommand: () => relabelCommand
 });
-import * as path16 from "path";
-function parseArgs8(args2) {
+import * as path17 from "path";
+function parseArgs9(args2) {
   let label;
   let clear = false;
   let hubSelector;
@@ -14851,7 +14988,7 @@ function parseArgs8(args2) {
   return { label, clear, hubSelector };
 }
 async function relabelCommand(args2) {
-  const { label, clear, hubSelector } = parseArgs8(args2);
+  const { label, clear, hubSelector } = parseArgs9(args2);
   if (!clear && (label === void 0 || label.trim() === "")) {
     console.error("Usage: wayai relabel <label> [--hub <uuid|folder>]   (or --clear to remove the label)");
     process.exit(1);
@@ -14877,7 +15014,7 @@ async function relabelCommand(args2) {
     } else {
       console.error(`Multiple hubs found in ${wsLabel}/. Pass --hub <uuid|folder-name> to choose, or run from inside a hub folder:`);
       for (const h of previewHubs) {
-        console.error(`  ${path16.basename(h.hubFolder)} (${h.hubId})`);
+        console.error(`  ${path17.basename(h.hubFolder)} (${h.hubId})`);
       }
     }
     process.exit(1);
@@ -14886,7 +15023,7 @@ async function relabelCommand(args2) {
     console.log("This is a read-only production mirror \u2014 production hubs have no preview label. Relabel the linked preview hub instead.");
     return;
   }
-  assertHubMatchesBinding(target.hubId, path16.basename(target.hubFolder));
+  assertHubMatchesBinding(target.hubId, path17.basename(target.hubFolder));
   console.log(normalizedLabel ? `Setting preview label to "${normalizedLabel}"...` : "Clearing preview label...");
   const { data } = await client.relabelPreview(target.hubId, normalizedLabel);
   const row = data[0];
@@ -14902,7 +15039,7 @@ async function relabelCommand(args2) {
   );
   console.log(serverLabel ? `Preview label set to "${serverLabel}".` : "Preview label cleared.");
   if (finalFolder !== target.hubFolder) {
-    console.log(`Hub folder is now ${path16.basename(finalFolder)}`);
+    console.log(`Hub folder is now ${path17.basename(finalFolder)}`);
   }
 }
 var init_relabel = __esm({
@@ -14923,13 +15060,13 @@ var init_relabel = __esm({
 // src/commands/publish.ts
 var publish_exports = {};
 __export(publish_exports, {
-  parseArgs: () => parseArgs9,
+  parseArgs: () => parseArgs10,
   publishCommand: () => publishCommand,
   renderHubDiff: () => renderHubDiff,
   runPublish: () => runPublish
 });
-import * as path17 from "path";
-function parseArgs9(args2) {
+import * as path18 from "path";
+function parseArgs10(args2) {
   let autoConfirm = false;
   let hubSelector;
   for (let i = 0; i < args2.length; i++) {
@@ -15015,7 +15152,7 @@ Published. Production hub: ${data.production_hub_id}`);
   return "synced";
 }
 async function publishCommand(args2) {
-  const { autoConfirm, hubSelector } = parseArgs9(args2);
+  const { autoConfirm, hubSelector } = parseArgs10(args2);
   const repoConfig = requireRepoConfig();
   const { organization_id: organizationId } = repoConfig;
   const { config, accessToken } = await requireAuth();
@@ -15034,7 +15171,7 @@ async function publishCommand(args2) {
       return;
     }
   }
-  assertHubMatchesBinding(hubId, hubFolder ? path17.basename(hubFolder) : void 0);
+  assertHubMatchesBinding(hubId, hubFolder ? path18.basename(hubFolder) : void 0);
   await runPublish(client, { hubId, localConfig, organizationId, autoConfirm });
 }
 var STATUS_STYLE;
@@ -15066,7 +15203,7 @@ var use_exports = {};
 __export(use_exports, {
   useCommand: () => useCommand
 });
-import * as path18 from "path";
+import * as path19 from "path";
 async function useCommand(args2) {
   const target = args2[0];
   if (!target || target.startsWith("-")) {
@@ -15087,9 +15224,22 @@ async function useCommand(args2) {
     const wsLabel = hubsDirLabel(gitRoot);
     const match = findHubByFolderName(workspaceDir, target);
     if (!match) {
+      const newHubs = scanNewHubs(workspaceDir);
+      const pending = newHubs.find((h) => path19.basename(h.hubFolder) === target);
+      if (pending) {
+        console.error(
+          `"${target}" is a new hub that hasn't been created on the platform yet, so it has no id to bind to.
+Create it first \u2014 the worktree binds automatically afterward:
+  wayai create ${target}`
+        );
+        process.exit(1);
+      }
       console.error(`No hub matching "${target}" found in ${wsLabel}/. Pass a UUID or a folder name from:`);
       for (const h of scanWorkspaceHubs(workspaceDir)) {
-        console.error(`  ${path18.basename(h.hubFolder)} (${h.hubId})`);
+        console.error(`  ${path19.basename(h.hubFolder)} (${h.hubId})`);
+      }
+      for (const h of newHubs) {
+        console.error(`  ${path19.basename(h.hubFolder)} (new \u2014 "${h.hubName}", run \`wayai create ${path19.basename(h.hubFolder)}\`)`);
       }
       process.exit(1);
     }
@@ -15128,11 +15278,11 @@ __export(migrate_exports, {
   migrateCommand: () => migrateCommand
 });
 import { execFileSync as execFileSync3 } from "child_process";
-import * as fs14 from "fs";
-import * as path19 from "path";
+import * as fs15 from "fs";
+import * as path20 from "path";
 function isTracked(gitRoot, p) {
   try {
-    execFileSync3("git", ["ls-files", "--error-unmatch", "--", path19.relative(gitRoot, p)], {
+    execFileSync3("git", ["ls-files", "--error-unmatch", "--", path20.relative(gitRoot, p)], {
       cwd: gitRoot,
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -15142,10 +15292,10 @@ function isTracked(gitRoot, p) {
   }
 }
 function moveDir(gitRoot, from, to) {
-  fs14.mkdirSync(path19.dirname(to), { recursive: true });
+  fs15.mkdirSync(path20.dirname(to), { recursive: true });
   if (isTracked(gitRoot, from)) {
     try {
-      execFileSync3("git", ["mv", path19.relative(gitRoot, from), path19.relative(gitRoot, to)], {
+      execFileSync3("git", ["mv", path20.relative(gitRoot, from), path20.relative(gitRoot, to)], {
         cwd: gitRoot,
         stdio: ["pipe", "pipe", "pipe"]
       });
@@ -15153,7 +15303,7 @@ function moveDir(gitRoot, from, to) {
     } catch {
     }
   }
-  fs14.renameSync(from, to);
+  fs15.renameSync(from, to);
   return "fs";
 }
 async function migrateCommand(_args) {
@@ -15162,12 +15312,12 @@ async function migrateCommand(_args) {
     console.error("Not inside a git repository.");
     process.exit(1);
   }
-  const rel = (p) => path19.relative(gitRoot, p);
-  const newWs = path19.join(gitRoot, WAYAI_LAYOUT.wsDir);
-  const legacyWs = path19.join(gitRoot, WAYAI_LAYOUT.legacy.wsDir);
-  const legacyOrg = path19.join(gitRoot, WAYAI_LAYOUT.legacy.orgAtRoot);
-  const newHubs = path19.join(newWs, WAYAI_LAYOUT.hubsSubdir);
-  const newOrg = path19.join(newWs, WAYAI_LAYOUT.orgSubdir);
+  const rel = (p) => path20.relative(gitRoot, p);
+  const newWs = path20.join(gitRoot, WAYAI_LAYOUT.wsDir);
+  const legacyWs = path20.join(gitRoot, WAYAI_LAYOUT.legacy.wsDir);
+  const legacyOrg = path20.join(gitRoot, WAYAI_LAYOUT.legacy.orgAtRoot);
+  const newHubs = path20.join(newWs, WAYAI_LAYOUT.hubsSubdir);
+  const newOrg = path20.join(newWs, WAYAI_LAYOUT.orgSubdir);
   const hasLegacyWs = isDirectory(legacyWs);
   const hasLegacyOrg = isDirectory(legacyOrg);
   if (!hasLegacyWs && !hasLegacyOrg) {
@@ -15801,10 +15951,10 @@ var init_delete_history = __esm({
 // src/commands/sync-skills.ts
 var sync_skills_exports = {};
 __export(sync_skills_exports, {
-  parseArgs: () => parseArgs10,
+  parseArgs: () => parseArgs11,
   syncSkillsCommand: () => syncSkillsCommand
 });
-function parseArgs10(args2) {
+function parseArgs11(args2) {
   let connectionId;
   const idx = args2.indexOf("--connection-id");
   if (idx !== -1 && args2[idx + 1]) {
@@ -15827,7 +15977,7 @@ function printSyncResults(response) {
 }
 async function syncSkillsCommand(args2) {
   const hubId = resolveActiveHubId(args2);
-  const { connectionId } = parseArgs10(args2);
+  const { connectionId } = parseArgs11(args2);
   requireRepoConfig();
   const { config, accessToken } = await requireAuth();
   const client = new ApiClient({ apiUrl: config.api_url, accessToken });
@@ -15852,10 +16002,10 @@ var init_sync_skills = __esm({
 // src/commands/sync-mcp.ts
 var sync_mcp_exports = {};
 __export(sync_mcp_exports, {
-  parseArgs: () => parseArgs11,
+  parseArgs: () => parseArgs12,
   syncMcpCommand: () => syncMcpCommand
 });
-function parseArgs11(args2) {
+function parseArgs12(args2) {
   let connection;
   for (let i = 0; i < args2.length; i++) {
     const arg = args2[i];
@@ -15867,7 +16017,7 @@ function parseArgs11(args2) {
 }
 async function syncMcpCommand(args2) {
   const hubId = resolveActiveHubId(args2);
-  const { connection } = parseArgs11(args2);
+  const { connection } = parseArgs12(args2);
   if (!connection) {
     console.error("Usage: wayai sync-mcp --connection <name> [--hub <uuid|folder-name>]");
     console.error("");
@@ -16279,7 +16429,7 @@ Timeout after ${timeoutSeconds}s. Session is still running.`);
   console.log(`Check results: wayai eval-results --session ${sessionId}`);
 }
 function sleep(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 function parsePacing(raw) {
   const NAMED = EVAL_PACING_PRESET_NAMES.filter((p) => p !== "custom");
@@ -16504,15 +16654,15 @@ var eval_capture_exports = {};
 __export(eval_capture_exports, {
   evalCaptureCommand: () => evalCaptureCommand
 });
-import * as fs15 from "fs";
-import * as path20 from "path";
+import * as fs16 from "fs";
+import * as path21 from "path";
 import * as yaml7 from "js-yaml";
 function isValidSetName(name) {
   if (name.length === 0 || name === "." || name === "..") return false;
   if (name.startsWith(".")) return false;
   return !/[\/\\\0]/.test(name);
 }
-function parseArgs12(args2) {
+function parseArgs13(args2) {
   if (args2.length === 0 || args2[0].startsWith("-")) {
     console.error("Usage: wayai eval capture <conversation_id> [--set <name>] [--name <eval_name>] [--instructions <text>]");
     process.exit(1);
@@ -16558,7 +16708,7 @@ function parseArgs12(args2) {
 }
 async function evalCaptureCommand(args2) {
   const hubId = resolveActiveHubId(args2);
-  const parsed = parseArgs12(args2);
+  const parsed = parseArgs13(args2);
   const { config, accessToken } = await requireAuth();
   requireRepoConfig();
   const client = new ApiClient({ apiUrl: config.api_url, accessToken });
@@ -16571,15 +16721,15 @@ async function evalCaptureCommand(args2) {
   const setFolderName = targetSetName;
   const scenarioName = parsed.evalName ?? `Capture ${parsed.conversationId.slice(0, 8)}`;
   const slug = slugify(scenarioName);
-  const evalsDir = path20.join(hubFolder, "evals");
-  const targetDir = path20.join(evalsDir, setFolderName);
-  const targetPath = path20.join(targetDir, `${slug}.yaml`);
-  if (!targetPath.startsWith(evalsDir + path20.sep)) {
-    console.error(`Resolved path "${path20.relative(hubFolder, targetPath)}" escapes evals/. Aborting.`);
+  const evalsDir = path21.join(hubFolder, "evals");
+  const targetDir = path21.join(evalsDir, setFolderName);
+  const targetPath = path21.join(targetDir, `${slug}.yaml`);
+  if (!targetPath.startsWith(evalsDir + path21.sep)) {
+    console.error(`Resolved path "${path21.relative(hubFolder, targetPath)}" escapes evals/. Aborting.`);
     process.exit(1);
   }
-  if (fs15.existsSync(targetPath)) {
-    console.error(`File already exists: ${path20.relative(hubFolder, targetPath)}. Use --name to choose a different name.`);
+  if (fs16.existsSync(targetPath)) {
+    console.error(`File already exists: ${path21.relative(hubFolder, targetPath)}. Use --name to choose a different name.`);
     process.exit(1);
   }
   console.log("Resolving scenario set...");
@@ -16611,9 +16761,9 @@ async function evalCaptureCommand(args2) {
     ...captured.evaluator_instructions ? { evaluator_instructions: captured.evaluator_instructions } : {}
   };
   const yamlObj = buildEvalYamlObject(evalEntry, slug);
-  fs15.mkdirSync(targetDir, { recursive: true });
-  fs15.writeFileSync(targetPath, yaml7.dump(yamlObj, YAML_DUMP_OPTIONS), "utf-8");
-  const relPath = path20.relative(process.cwd(), targetPath);
+  fs16.mkdirSync(targetDir, { recursive: true });
+  fs16.writeFileSync(targetPath, yaml7.dump(yamlObj, YAML_DUMP_OPTIONS), "utf-8");
+  const relPath = path21.relative(process.cwd(), targetPath);
   console.log(`
 Wrote ${relPath}`);
   console.log("Run `wayai pull` to refresh the agent display name, then commit. The scenario is already on the platform.");
@@ -16635,7 +16785,7 @@ var journey_capture_exports = {};
 __export(journey_capture_exports, {
   journeyCaptureCommand: () => journeyCaptureCommand
 });
-function parseArgs13(args2) {
+function parseArgs14(args2) {
   if (args2.length === 0 || args2[0].startsWith("-")) {
     console.error("Usage: wayai eval journey capture <conversation_id> [--name <journey_name>] [--instructions <text>]");
     process.exit(1);
@@ -16670,7 +16820,7 @@ function parseArgs13(args2) {
 }
 async function journeyCaptureCommand(args2) {
   const hubId = resolveActiveHubId(args2);
-  const parsed = parseArgs13(args2);
+  const parsed = parseArgs14(args2);
   const { config, accessToken } = await requireAuth();
   requireRepoConfig();
   const client = new ApiClient({ apiUrl: config.api_url, accessToken });
@@ -17467,9 +17617,9 @@ var init_credential_utils = __esm({
 var create_credential_exports = {};
 __export(create_credential_exports, {
   createCredentialCommand: () => createCredentialCommand,
-  parseArgs: () => parseArgs14
+  parseArgs: () => parseArgs15
 });
-function parseArgs14(args2) {
+function parseArgs15(args2) {
   let name;
   let type;
   let orgId;
@@ -17497,7 +17647,7 @@ function parseArgs14(args2) {
   return { name, type, orgId, description, tags: splitTagRefs(tags), environment, stdin };
 }
 async function createCredentialCommand(args2) {
-  const parsed = parseArgs14(args2);
+  const parsed = parseArgs15(args2);
   if (!parsed.name) {
     console.error("Missing required flag: --name <credential-name>");
     console.error('Usage: wayai create-credential --name "openai-key" --type "Bearer Token"');
@@ -17604,10 +17754,10 @@ var init_create_credential = __esm({
 // src/commands/update-credential.ts
 var update_credential_exports = {};
 __export(update_credential_exports, {
-  parseArgs: () => parseArgs15,
+  parseArgs: () => parseArgs16,
   updateCredentialCommand: () => updateCredentialCommand
 });
-function parseArgs15(args2) {
+function parseArgs16(args2) {
   let name;
   let rename;
   let orgId;
@@ -17640,7 +17790,7 @@ function parseArgs15(args2) {
   return { name, rename, orgId, description, tags: splitTagRefs(tags), hasTagFlag, environment, stdin, secretPrompt };
 }
 async function updateCredentialCommand(args2) {
-  const parsed = parseArgs15(args2);
+  const parsed = parseArgs16(args2);
   if (!parsed.name) {
     console.error("Missing required flag: --name <credential-name>");
     console.error('Usage: wayai update-credential --name "my-key" --stdin');
@@ -17745,10 +17895,10 @@ var init_update_credential = __esm({
 // src/commands/set-connection-credential.ts
 var set_connection_credential_exports = {};
 __export(set_connection_credential_exports, {
-  parseArgs: () => parseArgs16,
+  parseArgs: () => parseArgs17,
   setConnectionCredentialCommand: () => setConnectionCredentialCommand
 });
-function parseArgs16(args2) {
+function parseArgs17(args2) {
   let connection;
   let orgCredential;
   let field;
@@ -17771,7 +17921,7 @@ function usage(msg) {
 }
 async function setConnectionCredentialCommand(args2) {
   const hubId = resolveActiveHubId(args2);
-  const parsed = parseArgs16(args2);
+  const parsed = parseArgs17(args2);
   if (!parsed.connection) usage("Missing required flag: --connection <name|id>");
   const orgMode = !!parsed.orgCredential;
   const directMode = !!parsed.field;
@@ -17840,23 +17990,23 @@ var init_set_connection_credential = __esm({
 });
 
 // src/lib/org-workspace.ts
-import * as fs16 from "fs";
-import * as path21 from "path";
+import * as fs17 from "fs";
+import * as path22 from "path";
 import * as yaml8 from "js-yaml";
 function getOrgDir(gitRoot) {
   return resolveLayout(gitRoot).orgDir;
 }
 function orgManifestExists(orgDir) {
-  return fs16.existsSync(path21.join(orgDir, ORG_MANIFEST_NAME));
+  return fs17.existsSync(path22.join(orgDir, ORG_MANIFEST_NAME));
 }
 function parseOrgResources(orgDir) {
-  const manifestPath = path21.join(orgDir, ORG_MANIFEST_NAME);
+  const manifestPath = path22.join(orgDir, ORG_MANIFEST_NAME);
   let manifest = {};
-  if (fs16.existsSync(manifestPath)) {
-    manifest = yaml8.load(fs16.readFileSync(manifestPath, "utf-8")) ?? {};
+  if (fs17.existsSync(manifestPath)) {
+    manifest = yaml8.load(fs17.readFileSync(manifestPath, "utf-8")) ?? {};
   }
   const rawResources = Array.isArray(manifest.resources) ? manifest.resources : [];
-  const resourcesDir = path21.join(orgDir, "resources");
+  const resourcesDir = path22.join(orgDir, "resources");
   const resources = rawResources.map((res) => {
     const resource = { name: res.name };
     if (res.id) resource.id = res.id;
@@ -17868,8 +18018,8 @@ function parseOrgResources(orgDir) {
     if (res.environment) resource.environment = res.environment;
     if (Array.isArray(res.tags)) resource.tags = res.tags;
     if (Array.isArray(res.folders)) resource.folders = res.folders;
-    const resDir = path21.join(resourcesDir, slugify(resource.name));
-    if (fs16.existsSync(resDir)) {
+    const resDir = path22.join(resourcesDir, slugify(resource.name));
+    if (fs17.existsSync(resDir)) {
       const files = scanResourceFiles(resDir, "");
       if (files.length > 0) resource.files = files;
     }
@@ -17878,28 +18028,28 @@ function parseOrgResources(orgDir) {
   return { version: 1, resources };
 }
 function writeOrgResources(orgDir, payload) {
-  fs16.mkdirSync(orgDir, { recursive: true });
+  fs17.mkdirSync(orgDir, { recursive: true });
   const resources = payload.resources ?? [];
   const manifestResources = resources.map((r) => {
     const { files: _files, ...rest } = r;
     return rest;
   });
-  fs16.writeFileSync(
-    path21.join(orgDir, ORG_MANIFEST_NAME),
+  fs17.writeFileSync(
+    path22.join(orgDir, ORG_MANIFEST_NAME),
     yaml8.dump({ version: 1, resources: manifestResources }, YAML_DUMP_OPTIONS),
     "utf-8"
   );
-  const resourcesDir = path21.join(orgDir, "resources");
+  const resourcesDir = path22.join(orgDir, "resources");
   const currentSlugs = /* @__PURE__ */ new Set();
   for (const resource of resources) {
     const resSlug = slugify(resource.name);
     currentSlugs.add(resSlug);
-    writeResourceFileTree(path21.join(resourcesDir, resSlug), resource.files || []);
+    writeResourceFileTree(path22.join(resourcesDir, resSlug), resource.files || []);
   }
-  if (fs16.existsSync(resourcesDir)) {
-    for (const entry of fs16.readdirSync(resourcesDir, { withFileTypes: true })) {
+  if (fs17.existsSync(resourcesDir)) {
+    for (const entry of fs17.readdirSync(resourcesDir, { withFileTypes: true })) {
       if (entry.isDirectory() && !currentSlugs.has(entry.name)) {
-        fs16.rmSync(path21.join(resourcesDir, entry.name), { recursive: true, force: true });
+        fs17.rmSync(path22.join(resourcesDir, entry.name), { recursive: true, force: true });
       }
     }
   }
@@ -17908,7 +18058,7 @@ async function downloadOrgBinaryFiles(orgDir, payload) {
   let count = 0;
   for (const resource of payload.resources ?? []) {
     if (!resource.files) continue;
-    const resDir = path21.join(orgDir, "resources", slugify(resource.name));
+    const resDir = path22.join(orgDir, "resources", slugify(resource.name));
     count += await downloadBinaryFiles(resDir, resource.files);
   }
   if (count > 0) console.log(`Downloaded ${count} binary resource file(s).`);
@@ -18096,9 +18246,9 @@ var init_org = __esm({
 var list_exports = {};
 __export(list_exports, {
   listCommand: () => listCommand,
-  parseArgs: () => parseArgs17
+  parseArgs: () => parseArgs18
 });
-function parseArgs17(args2) {
+function parseArgs18(args2) {
   let orgId;
   let json = false;
   for (let i = 0; i < args2.length; i++) {
@@ -18111,7 +18261,7 @@ function parseArgs17(args2) {
   return { orgId, json };
 }
 async function listCommand(args2) {
-  const { orgId, json } = parseArgs17(args2);
+  const { orgId, json } = parseArgs18(args2);
   const { config, accessToken } = await requireAuth();
   const client = new ApiClient({ apiUrl: config.api_url, accessToken });
   const { organizations } = await client.organizations();
@@ -18164,20 +18314,20 @@ var init_list = __esm({
 });
 
 // src/lib/template-files.ts
-import * as fs17 from "fs";
-import * as path22 from "path";
+import * as fs18 from "fs";
+import * as path23 from "path";
 function readDirToFileMap(rootDir) {
   const out = {};
   function walk(dir, prefix) {
-    const entries = fs17.readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    const entries = fs18.readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
     for (const entry of entries) {
-      const abs = path22.join(dir, entry.name);
+      const abs = path23.join(dir, entry.name);
       const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
       if (entry.isDirectory()) walk(abs, rel);
-      else if (entry.isFile()) out[rel] = fs17.readFileSync(abs, "utf-8");
+      else if (entry.isFile()) out[rel] = fs18.readFileSync(abs, "utf-8");
     }
   }
-  if (fs17.existsSync(rootDir)) walk(rootDir, "");
+  if (fs18.existsSync(rootDir)) walk(rootDir, "");
   return out;
 }
 function detectCollisions(targetDir, files) {
@@ -18186,7 +18336,7 @@ function detectCollisions(targetDir, files) {
     if (!isSafeTemplatePath2(rel)) {
       throw new Error(`Refusing to inspect unsafe template path: ${rel}`);
     }
-    if (fs17.existsSync(path22.join(targetDir, rel))) collisions.push(rel);
+    if (fs18.existsSync(path23.join(targetDir, rel))) collisions.push(rel);
   }
   return collisions.sort((a, b) => a.localeCompare(b));
 }
@@ -18196,9 +18346,9 @@ function writeFileMap(targetDir, files) {
     if (!isSafeTemplatePath2(rel)) {
       throw new Error(`Refusing to write unsafe template path: ${rel}`);
     }
-    const abs = path22.join(targetDir, rel);
-    fs17.mkdirSync(path22.dirname(abs), { recursive: true });
-    fs17.writeFileSync(abs, body, "utf-8");
+    const abs = path23.join(targetDir, rel);
+    fs18.mkdirSync(path23.dirname(abs), { recursive: true });
+    fs18.writeFileSync(abs, body, "utf-8");
     written.push(rel);
   }
   return written;
@@ -18206,20 +18356,20 @@ function writeFileMap(targetDir, files) {
 function listDirRelFiles(dir) {
   const out = [];
   function walk(d, prefix) {
-    for (const entry of fs17.readdirSync(d, { withFileTypes: true })) {
+    for (const entry of fs18.readdirSync(d, { withFileTypes: true })) {
       const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
-      if (entry.isDirectory()) walk(path22.join(d, entry.name), rel);
+      if (entry.isDirectory()) walk(path23.join(d, entry.name), rel);
       else if (entry.isFile()) out.push(rel);
     }
   }
-  if (fs17.existsSync(dir)) walk(dir, "");
+  if (fs18.existsSync(dir)) walk(dir, "");
   return out;
 }
 function writeSliceSnapshot(targetDir, files) {
   const keep = new Set(Object.keys(files));
   const removed = listDirRelFiles(targetDir).filter((rel) => !keep.has(rel)).sort((a, b) => a.localeCompare(b));
   const written = writeFileMap(targetDir, files).sort((a, b) => a.localeCompare(b));
-  if (fs17.existsSync(targetDir)) cleanOrphanFiles(targetDir, "", keep);
+  if (fs18.existsSync(targetDir)) cleanOrphanFiles(targetDir, "", keep);
   return { written, removed };
 }
 var init_template_files = __esm({
@@ -18235,7 +18385,7 @@ var templates_exports = {};
 __export(templates_exports, {
   templateCommand: () => templateCommand
 });
-import * as path23 from "path";
+import * as path24 from "path";
 async function templateCommand(args2) {
   const [sub, ...rest] = args2;
   switch (sub) {
@@ -18351,8 +18501,8 @@ async function runTemplatePull(rest) {
     console.log(`Template "${slug}" has no WayAI slice${hint}`);
     return;
   }
-  const targetDir = path23.join(resolveLayout(gitRoot).hubsDir, slug);
-  const relTarget = path23.relative(gitRoot, targetDir);
+  const targetDir = path24.join(resolveLayout(gitRoot).hubsDir, slug);
+  const relTarget = path24.relative(gitRoot, targetDir);
   const collisions = detectCollisions(targetDir, detail.files);
   if (dryRun) {
     const planned = Object.keys(detail.files).sort((a, b) => a.localeCompare(b));
@@ -18526,8 +18676,8 @@ var admin_exports = {};
 __export(admin_exports, {
   adminCommand: () => adminCommand
 });
-import * as fs18 from "fs";
-import * as path24 from "path";
+import * as fs19 from "fs";
+import * as path25 from "path";
 import * as yaml10 from "js-yaml";
 async function adminCommand(args2) {
   const [group, ...afterGroup] = args2;
@@ -18835,7 +18985,7 @@ async function runArchiveRead(positional, flagArgs) {
       exitOnApiError(err);
       throw err;
     }
-    fs18.writeFileSync(outPath, zip);
+    fs19.writeFileSync(outPath, zip);
     console.log(`Wrote ${zip.byteLength} bytes to ${outPath}`);
     return;
   }
@@ -18967,15 +19117,15 @@ function loadTemplateManifest(slug) {
     console.error("Not in a git repository. Run from the tutorials/ authoring repo.");
     process.exit(1);
   }
-  const templateDir = path24.join(resolveTemplatesDir(gitRoot), slug);
-  const manifestPath = path24.join(templateDir, "template.yaml");
-  if (!fs18.existsSync(manifestPath)) {
-    console.error(`template.yaml not found at ${path24.relative(gitRoot, manifestPath)}`);
+  const templateDir = path25.join(resolveTemplatesDir(gitRoot), slug);
+  const manifestPath = path25.join(templateDir, "template.yaml");
+  if (!fs19.existsSync(manifestPath)) {
+    console.error(`template.yaml not found at ${path25.relative(gitRoot, manifestPath)}`);
     process.exit(1);
   }
   let manifest;
   try {
-    manifest = templateYamlSchema2.parse(yaml10.load(fs18.readFileSync(manifestPath, "utf-8")));
+    manifest = templateYamlSchema2.parse(yaml10.load(fs19.readFileSync(manifestPath, "utf-8")));
   } catch (err) {
     console.error(`Invalid template.yaml: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
@@ -19005,20 +19155,20 @@ async function runTemplatePush(positional) {
     const wayaiEntry = manifest.wayai.locales[locale];
     let wayaiFiles;
     if (wayaiEntry) {
-      const sliceDir = path24.resolve(templateDir, wayaiEntry.source);
-      if (!fs18.existsSync(sliceDir)) {
+      const sliceDir = path25.resolve(templateDir, wayaiEntry.source);
+      if (!fs19.existsSync(sliceDir)) {
         console.error(`wayai source not found for ${locale}: ${wayaiEntry.source} (resolved ${sliceDir})`);
         process.exit(1);
       }
       if (!isInsideTemplateDir(sliceDir, templateDir)) {
         console.warn(
-          `Note: ${locale} source points at a live hub (${wayaiEntry.source}); it can go stale on a hub recreate. Run \`wayai admin template freeze ${slug} --locale ${locale} --from ${path24.basename(sliceDir)}\` to commit a stable frozen slice.`
+          `Note: ${locale} source points at a live hub (${wayaiEntry.source}); it can go stale on a hub recreate. Run \`wayai admin template freeze ${slug} --locale ${locale} --from ${path25.basename(sliceDir)}\` to commit a stable frozen slice.`
         );
       }
       wayaiFiles = readDirToFileMap(sliceDir);
     }
-    const readmePath = path24.join(templateDir, `README.${locale}.md`);
-    const readmeMarkdown = fs18.existsSync(readmePath) ? fs18.readFileSync(readmePath, "utf-8") : "";
+    const readmePath = path25.join(templateDir, `README.${locale}.md`);
+    const readmeMarkdown = fs19.existsSync(readmePath) ? fs19.readFileSync(readmePath, "utf-8") : "";
     locales[locale] = {
       readmeMarkdown,
       ...wayaiFiles && { wayaiFiles },
@@ -19029,9 +19179,9 @@ async function runTemplatePush(positional) {
   }
   let hero;
   if (manifest.hero) {
-    const heroPath = path24.resolve(templateDir, manifest.hero);
-    if (fs18.existsSync(heroPath)) {
-      hero = { filename: path24.basename(heroPath), dataBase64: fs18.readFileSync(heroPath).toString("base64") };
+    const heroPath = path25.resolve(templateDir, manifest.hero);
+    if (fs19.existsSync(heroPath)) {
+      hero = { filename: path25.basename(heroPath), dataBase64: fs19.readFileSync(heroPath).toString("base64") };
     } else {
       console.error(`Warning: hero not found at ${manifest.hero}; skipping.`);
     }
@@ -19057,7 +19207,7 @@ async function runTemplatePush(positional) {
   }
 }
 function isInsideTemplateDir(dest, templateDir) {
-  return dest === templateDir || dest.startsWith(templateDir + path24.sep);
+  return dest === templateDir || dest.startsWith(templateDir + path25.sep);
 }
 async function runTemplateFreeze(positional, flagArgs) {
   const slug = positional[0];
@@ -19118,7 +19268,7 @@ async function runTemplateFreeze(positional, flagArgs) {
     process.exit(1);
   }
   const entry = manifest.wayai.locales[targetLocale];
-  const dest = path24.resolve(templateDir, entry.source);
+  const dest = path25.resolve(templateDir, entry.source);
   if (!isInsideTemplateDir(dest, templateDir) || dest === templateDir) {
     console.error(
       `source for "${targetLocale}" must be a committed path inside ${slug}/ (e.g. "./${targetLocale}/slice"), but resolved to:
@@ -19137,7 +19287,7 @@ Set it to a subdir of the template folder and re-run freeze.`
     const hubs = scanWorkspaceHubs(hubsDir);
     if (hubs.length) {
       console.error("Available hubs:");
-      for (const h of hubs) console.error(`  ${path24.basename(h.hubFolder)} (${h.hubId})`);
+      for (const h of hubs) console.error(`  ${path25.basename(h.hubFolder)} (${h.hubId})`);
     }
     console.error(`
 Pass --from <folder|uuid>${selector ? "." : " or run `wayai use <hub>` first."}`);
@@ -19145,12 +19295,12 @@ Pass --from <folder|uuid>${selector ? "." : " or run `wayai use <hub>` first."}`
   }
   const liveFiles = readDirToFileMap(hubFolder);
   if (Object.keys(liveFiles).length === 0) {
-    console.error(`Source hub folder has no files to freeze: ${path24.relative(gitRoot, hubFolder)}`);
+    console.error(`Source hub folder has no files to freeze: ${path25.relative(gitRoot, hubFolder)}`);
     process.exit(1);
   }
   const sanitized = sanitizeWayaiSliceFiles(liveFiles);
-  const relDest = path24.relative(gitRoot, dest);
-  const relSrc = path24.relative(gitRoot, hubFolder);
+  const relDest = path25.relative(gitRoot, dest);
+  const relSrc = path25.relative(gitRoot, hubFolder);
   if (dryRun) {
     const existing = new Set(listDirRelFiles(dest));
     const nextKeys = new Set(Object.keys(sanitized));
@@ -19210,7 +19360,7 @@ async function runTemplatePull2(positional, flagArgs) {
     console.log(JSON.stringify(detail, null, 2));
     return;
   }
-  const target = outDir ? path24.resolve(outDir) : path24.join(process.cwd(), "template-store-pull", slug);
+  const target = outDir ? path25.resolve(outDir) : path25.join(process.cwd(), "template-store-pull", slug);
   const written = writeFileMap(target, detail.files);
   console.log(`Pulled "${slug}" from the store \u2192 ${target} (${written.length} file${written.length === 1 ? "" : "s"}).`);
   const uses = detail.uses ?? [];
@@ -19233,13 +19383,13 @@ async function runSkillInstall(positional) {
     throw err;
   }
   const root = findGitRoot() ?? process.cwd();
-  const present = HARNESS_SKILL_DIRS.filter((dir) => fs18.existsSync(path24.join(root, dir)));
+  const present = HARNESS_SKILL_DIRS.filter((dir) => fs19.existsSync(path25.join(root, dir)));
   const targets = present.length > 0 ? present : HARNESS_SKILL_DIRS;
   const fileCount = Object.keys(res.files).length;
   const relDirs = targets.map((harness) => {
-    const targetDir = path24.join(root, harness, "skills", name);
+    const targetDir = path25.join(root, harness, "skills", name);
     writeFileMap(targetDir, res.files);
-    return `${path24.relative(root, targetDir)}/`;
+    return `${path25.relative(root, targetDir)}/`;
   });
   console.log(`Installed skill "${name}" (${fileCount} file${fileCount === 1 ? "" : "s"}) \u2192 ${relDirs.join(", ")}`);
   console.log("Reload your agent (e.g. restart Claude Code) to pick up the skill.");
@@ -20072,19 +20222,58 @@ var init_admin = __esm({
   }
 });
 
-// src/commands/report-create.ts
-import { readFileSync as readFileSync18 } from "fs";
-import { dirname as dirname9, join as join24 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-function getCliVersion() {
-  try {
-    const pkg2 = JSON.parse(readFileSync18(join24(__dirname, "..", "..", "package.json"), "utf-8"));
-    return `cli@${pkg2.version}`;
-  } catch {
-    return "cli@unknown";
+// src/lib/version-status.ts
+function componentStatus(current, latest) {
+  return { current, latest, behind: Boolean(current && latest && isNewerVersion(latest, current)) };
+}
+function resolveVersionStatus(cliVersion) {
+  const cliLatest = readVersionCache(CLI_CACHE_FILE)?.latest ?? null;
+  const repoRoot = findRepoRootSync() ?? process.cwd();
+  const skillCurrent = lowestInstalledVersion(findInstalledSkills(repoRoot));
+  const skillLatest = skillCurrent ? readVersionCache(SKILL_CACHE_FILE)?.latest ?? null : null;
+  return { cli: componentStatus(cliVersion, cliLatest), skill: componentStatus(skillCurrent, skillLatest) };
+}
+function isVersionBehind(status) {
+  return status.cli.behind || status.skill.behind;
+}
+function formatClientVersion(status) {
+  const cli = `cli@${status.cli.current ?? "unknown"}`;
+  if (!status.skill.current) return cli.slice(0, 64);
+  const withSkill = `${cli} skill@${status.skill.current}`;
+  return withSkill.length <= 64 ? withSkill : cli.slice(0, 64);
+}
+function buildStaleToolingWarning(status) {
+  const lines = [];
+  if (status.cli.behind) {
+    lines.push(`  CLI    ${status.cli.current} \u2192 ${status.cli.latest}   (run: wayai update)`);
+  }
+  if (status.skill.behind) {
+    lines.push(`  Skill  ${status.skill.current} \u2192 ${status.skill.latest}   (run: npx skills add wayai-pro/wayai-skill -y)`);
+  }
+  if (lines.length === 0) return null;
+  return [
+    "Your WayAI tooling is behind the latest release:",
+    ...lines,
+    "",
+    "A stale CLI or skill is the most common cause of a false bug report \u2014 the issue may",
+    "already be fixed upstream. Update, then reproduce before reporting."
+  ].join("\n");
+}
+var init_version_status = __esm({
+  "src/lib/version-status.ts"() {
+    "use strict";
+    init_version_cache();
+    init_skill_version();
+    init_workspace();
+    init_utils();
   }
+});
+
+// src/commands/report-create.ts
+function isVersionGateDisabled() {
+  return Boolean(process.env.NO_UPDATE_NOTIFIER || process.env.WAYAI_NO_UPDATE_CHECK);
 }
-async function reportCreateCommand(args2) {
+async function reportCreateCommand(args2, cliVersion = null) {
   let title;
   let description;
   let source;
@@ -20095,9 +20284,12 @@ async function reportCreateCommand(args2) {
   let errorMessage;
   let steps;
   let context;
+  let skipVersionCheck = false;
   for (let i = 0; i < args2.length; i++) {
     const arg = args2[i];
-    if (arg === "--title" || arg === "-t") {
+    if (arg === "--skip-version-check") {
+      skipVersionCheck = true;
+    } else if (arg === "--title" || arg === "-t") {
       title = args2[++i];
     } else if (arg === "--description" || arg === "-d") {
       description = args2[++i];
@@ -20135,8 +20327,23 @@ async function reportCreateCommand(args2) {
     console.error("  -e, --error <text>         Error message or stack trace");
     console.error("  -s, --steps <text>         Steps to reproduce");
     console.error("  --context <text>           Additional context");
+    console.error("  --skip-version-check       File even when the CLI/skill is behind the latest release");
     process.exit(1);
   }
+  const versionStatus = resolveVersionStatus(cliVersion);
+  const clientVersion = formatClientVersion(versionStatus);
+  if (isVersionBehind(versionStatus) && !isVersionGateDisabled()) {
+    const warning = buildStaleToolingWarning(versionStatus);
+    if (!skipVersionCheck) {
+      console.error(warning);
+      console.error("");
+      console.error("To file this report anyway, re-run with --skip-version-check.");
+      process.exit(1);
+    }
+    console.error("Filing on stale tooling (--skip-version-check):");
+    console.error(warning);
+    console.error("");
+  }
   const { config, accessToken } = await requireAuth();
   const client = new ApiClient({ apiUrl: config.api_url, accessToken });
   const repoConfig = readRepoConfig();
@@ -20154,7 +20361,7 @@ async function reportCreateCommand(args2) {
       error_message: errorMessage,
       steps_to_reproduce: steps,
       additional_context: context,
-      client_version: getCliVersion()
+      client_version: clientVersion
     });
     if (result.created) {
       console.log(`Report submitted: ${result.report_id}`);
@@ -20178,14 +20385,13 @@ async function reportCreateCommand(args2) {
     throw err;
   }
 }
-var __dirname;
 var init_report_create = __esm({
   "src/commands/report-create.ts"() {
     "use strict";
     init_auth();
     init_repo_config();
     init_api_client();
-    __dirname = dirname9(fileURLToPath2(import.meta.url));
+    init_version_status();
   }
 });
 
@@ -20194,11 +20400,11 @@ var report_exports = {};
 __export(report_exports, {
   reportCommand: () => reportCommand
 });
-async function reportCommand(args2) {
+async function reportCommand(args2, cliVersion) {
   const sub = args2[0];
   switch (sub) {
     case "create":
-      await reportCreateCommand(args2.slice(1));
+      await reportCreateCommand(args2.slice(1), cliVersion ?? null);
       return;
     case "edit":
       await reportEditCommand(args2.slice(1));
@@ -20460,9 +20666,9 @@ var init_update = __esm({
 
 // src/index.ts
 init_sentry();
-import { readFileSync as readFileSync19 } from "fs";
-import { fileURLToPath as fileURLToPath3 } from "url";
-import { dirname as dirname10, join as join25 } from "path";
+import { readFileSync as readFileSync18 } from "fs";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { dirname as dirname9, join as join24 } from "path";
 
 // src/lib/errors.ts
 init_api_client();
@@ -20494,7 +20700,7 @@ init_skill_version();
 import { exec } from "child_process";
 var REFRESH_TIMEOUT_MS = 1e4;
 function refreshCliCache() {
-  return new Promise((resolve5) => {
+  return new Promise((resolve4) => {
     exec("npm view @wayai/cli version", { timeout: REFRESH_TIMEOUT_MS }, (err, stdout) => {
       if (!err) {
         const latest = stdout.trim();
@@ -20505,7 +20711,7 @@ function refreshCliCache() {
           }
         }
       }
-      resolve5();
+      resolve4();
     });
   });
 }
@@ -20531,8 +20737,8 @@ async function refreshSkillCache() {
 }
 async function refreshAdminSkillCache() {
   let timer;
-  const deadline = new Promise((resolve5) => {
-    timer = setTimeout(resolve5, REFRESH_TIMEOUT_MS);
+  const deadline = new Promise((resolve4) => {
+    timer = setTimeout(resolve4, REFRESH_TIMEOUT_MS);
   });
   await Promise.race([deadline, fetchAndCacheAdminSkillVersion().catch(() => {
   })]);
@@ -20641,11 +20847,11 @@ Run \`wayai admin skill install\` to update.`);
 }
 
 // src/index.ts
-var __dirname2 = dirname10(fileURLToPath3(import.meta.url));
-var pkg = JSON.parse(readFileSync19(join25(__dirname2, "..", "package.json"), "utf-8"));
+var __dirname = dirname9(fileURLToPath2(import.meta.url));
+var pkg = JSON.parse(readFileSync18(join24(__dirname, "..", "package.json"), "utf-8"));
 var [, , command, ...args] = process.argv;
 var isBackgroundRefresh = command === REFRESH_COMMAND;
-if (!isBackgroundRefresh) initSentry(command);
+if (!isBackgroundRefresh) initSentry(command, pkg.version);
 async function main() {
   if (shouldInterceptHelp(command, args, OWN_HELP_COMMANDS)) {
     printHelp3();
@@ -20696,6 +20902,11 @@ async function main() {
       await pushCommand2(args);
       break;
     }
+    case "create": {
+      const { createCommand: createCommand2 } = await Promise.resolve().then(() => (init_create(), create_exports));
+      await createCommand2(args);
+      break;
+    }
     case "diff": {
       const { diffCommand: diffCommand2 } = await Promise.resolve().then(() => (init_diff(), diff_exports));
       await diffCommand2(args);
@@ -20823,7 +21034,7 @@ async function main() {
     }
     case "report": {
       const { reportCommand: reportCommand2 } = await Promise.resolve().then(() => (init_report(), report_exports));
-      await reportCommand2(args);
+      await reportCommand2(args, pkg.version);
       break;
     }
     case "update": {
@@ -20866,6 +21077,7 @@ Commands:
   set-connection-credential  Set a connection's credential directly (org link or --field/--stdin), preview or production
   pull               Fetch hub config and write local files (also mirrors the linked production hub read-only)
   push               Parse local files, show diff, sync to preview (creates hub if new)
+  create [folder]    Explicitly create a new hub from an idless folder, then push (--label to name the preview)
   diff               Dry-run diff of local files vs the platform (--production diffs vs the linked production hub)
   replicate          Clone a hub into a new sibling preview (--label to name it)
   relabel            Set a preview hub's label (--clear to remove it)
@@ -20898,7 +21110,7 @@ Flags:
   --yes, -y              Skip confirmation prompts (useful for CI and scripting)
   --hub <uuid|name>      Target hub when the workspace has more than one (push, pull, diff, replicate, relabel, publish)
   --production           Diff local preview files against the linked production hub (diff)
-  --label <name>         Preview label \u2014 for the new sibling (replicate) or a brand-new hub (push on create)
+  --label <name>         Preview label \u2014 for the new sibling (replicate) or a brand-new hub (create, or push on create)
   --clear                Remove the preview label (relabel)
   --name <name>          Credential name (create-credential; target for update-credential)
   --type <auth-type>     Auth type: "api_key", "bearer", "basic_auth" (create-credential)
@@ -20959,7 +21171,7 @@ async function runForeground() {
   try {
     await main();
     if (command && !SKIP_UPDATE_CHECK.includes(command) && !wantsHelp(args)) {
-      showUpdateNudges(pkg.version, fileURLToPath3(import.meta.url));
+      showUpdateNudges(pkg.version, fileURLToPath2(import.meta.url));
     }
     await closeSentry();
   } catch (err) {