microfox 1.1.7 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @microfox/cli
 
+## 1.2.0
+
+### Minor Changes
+
+- f81596c: grouped deployments of project
+
 ## 1.1.7
 
 ### Patch Changes

package/dist/cli.js

@@ -30813,14 +30813,14 @@ var require_path_arg = __commonJS({
 var require_find_made = __commonJS({
   "../../node_modules/mkdirp/lib/find-made.js"(exports2, module2) {
     "use strict";
-    var { dirname: dirname2 } = require("path");
+    var { dirname: dirname3 } = require("path");
     var findMade = (opts, parent2, path18 = void 0) => {
       if (path18 === parent2)
         return Promise.resolve();
       return opts.statAsync(parent2).then(
         (st) => st.isDirectory() ? path18 : void 0,
         // will fail later
-        (er) => er.code === "ENOENT" ? findMade(opts, dirname2(parent2), parent2) : void 0
+        (er) => er.code === "ENOENT" ? findMade(opts, dirname3(parent2), parent2) : void 0
       );
     };
     var findMadeSync = (opts, parent2, path18 = void 0) => {
@@ -30829,7 +30829,7 @@ var require_find_made = __commonJS({
       try {
         return opts.statSync(parent2).isDirectory() ? path18 : void 0;
       } catch (er) {
-        return er.code === "ENOENT" ? findMadeSync(opts, dirname2(parent2), parent2) : void 0;
+        return er.code === "ENOENT" ? findMadeSync(opts, dirname3(parent2), parent2) : void 0;
       }
     };
     module2.exports = { findMade, findMadeSync };
@@ -30840,10 +30840,10 @@ var require_find_made = __commonJS({
 var require_mkdirp_manual = __commonJS({
   "../../node_modules/mkdirp/lib/mkdirp-manual.js"(exports2, module2) {
     "use strict";
-    var { dirname: dirname2 } = require("path");
+    var { dirname: dirname3 } = require("path");
     var mkdirpManual = (path18, opts, made) => {
       opts.recursive = false;
-      const parent2 = dirname2(path18);
+      const parent2 = dirname3(path18);
       if (parent2 === path18) {
         return opts.mkdirAsync(path18, opts).catch((er) => {
           if (er.code !== "EISDIR")
@@ -30866,7 +30866,7 @@ var require_mkdirp_manual = __commonJS({
       });
     };
     var mkdirpManualSync = (path18, opts, made) => {
-      const parent2 = dirname2(path18);
+      const parent2 = dirname3(path18);
       opts.recursive = false;
       if (parent2 === path18) {
         try {
@@ -30902,12 +30902,12 @@ var require_mkdirp_manual = __commonJS({
 var require_mkdirp_native = __commonJS({
   "../../node_modules/mkdirp/lib/mkdirp-native.js"(exports2, module2) {
     "use strict";
-    var { dirname: dirname2 } = require("path");
+    var { dirname: dirname3 } = require("path");
     var { findMade, findMadeSync } = require_find_made();
     var { mkdirpManual, mkdirpManualSync } = require_mkdirp_manual();
     var mkdirpNative = (path18, opts) => {
       opts.recursive = true;
-      const parent2 = dirname2(path18);
+      const parent2 = dirname3(path18);
       if (parent2 === path18)
         return opts.mkdirAsync(path18, opts);
       return findMade(opts, path18).then((made) => opts.mkdirAsync(path18, opts).then(() => made).catch((er) => {
@@ -30919,7 +30919,7 @@ var require_mkdirp_native = __commonJS({
     };
     var mkdirpNativeSync = (path18, opts) => {
       opts.recursive = true;
-      const parent2 = dirname2(path18);
+      const parent2 = dirname3(path18);
       if (parent2 === path18)
         return opts.mkdirSync(path18, opts);
       const made = findMadeSync(opts, path18);
@@ -31021,7 +31021,7 @@ var require_chownr = __commonJS({
     } : (path19, uid, gid) => lchownSync(path19, uid, gid);
     var nodeVersion = process.version;
     var readdir2 = (path19, options, cb) => fs12.readdir(path19, options, cb);
-    var readdirSync3 = (path19, options) => fs12.readdirSync(path19, options);
+    var readdirSync4 = (path19, options) => fs12.readdirSync(path19, options);
     if (/^v4\./.test(nodeVersion))
       readdir2 = (path19, options, cb) => fs12.readdir(path19, cb);
     var chown = (cpath, uid, gid, cb) => {
@@ -31092,7 +31092,7 @@ var require_chownr = __commonJS({
     var chownrSync = (p, uid, gid) => {
       let children;
       try {
-        children = readdirSync3(p, { withFileTypes: true });
+        children = readdirSync4(p, { withFileTypes: true });
       } catch (er) {
         if (er.code === "ENOENT")
           return;
@@ -110117,21 +110117,98 @@ function getLatestDeploymentId(cwd, n = 1) {
   const sorted = [...records].sort((a, b) => b.timestamp - a.timestamp);
   return sorted.slice(0, n).map((r) => r.deploymentId);
 }
+function getDeploymentsPathAtRoot(serverlessRoot) {
+  return path8.join(serverlessRoot, DEPLOYMENTS_FILE);
+}
+function saveDeploymentRecordToRoot(serverlessRoot, deploymentId, group) {
+  const filePath = getDeploymentsPathAtRoot(serverlessRoot);
+  const records = getDeploymentRecordsFromRoot(serverlessRoot);
+  const newRecord = {
+    deploymentId,
+    timestamp: Date.now(),
+    date: (/* @__PURE__ */ new Date()).toISOString(),
+    ...group != null && group !== "" ? { group } : {}
+  };
+  records.push(newRecord);
+  fs4.writeFileSync(filePath, JSON.stringify(records, null, 2));
+}
+function getDeploymentRecordsFromRoot(serverlessRoot) {
+  const filePath = getDeploymentsPathAtRoot(serverlessRoot);
+  if (!fs4.existsSync(filePath)) {
+    return [];
+  }
+  try {
+    const content = fs4.readFileSync(filePath, "utf-8");
+    return JSON.parse(content);
+  } catch (e) {
+    return [];
+  }
+}
+function getLatestDeploymentIdFromRoot(serverlessRoot, n = 1, group) {
+  let records = getDeploymentRecordsFromRoot(serverlessRoot);
+  if (group != null && group !== "") {
+    records = records.filter((r) => {
+      var _a4;
+      return ((_a4 = r.group) != null ? _a4 : "") === group;
+    });
+  }
+  if (records.length === 0) {
+    return [];
+  }
+  const sorted = [...records].sort((a, b) => b.timestamp - a.timestamp);
+  return sorted.slice(0, n).map((r) => r.deploymentId);
+}
 function findServerlessWorkersDir(startDir) {
   const resolvedStart = path8.resolve(startDir);
+  const looksLikeServerlessWorkersDir = (dir2) => {
+    if (!fs4.existsSync(dir2)) return false;
+    try {
+      if (!fs4.statSync(dir2).isDirectory()) return false;
+    } catch (e) {
+      return false;
+    }
+    if (fs4.existsSync(path8.join(dir2, "serverless.yml"))) return true;
+    try {
+      const entries = fs4.readdirSync(dir2, { withFileTypes: true });
+      for (const e of entries) {
+        if (e.isDirectory() && !e.name.startsWith(".")) {
+          if (fs4.existsSync(path8.join(dir2, e.name, "serverless.yml"))) {
+            return true;
+          }
+        }
+      }
+    } catch (e) {
+    }
+    return false;
+  };
   const serverlessDirInCurrent = path8.join(resolvedStart, DEPLOYMENTS_DIR);
-  const configPathInCurrent = path8.join(serverlessDirInCurrent, "microfox.json");
-  if (fs4.existsSync(serverlessDirInCurrent) && fs4.existsSync(configPathInCurrent)) {
+  if (looksLikeServerlessWorkersDir(serverlessDirInCurrent)) {
     return serverlessDirInCurrent;
   }
   const parentDir = path8.dirname(resolvedStart);
   const serverlessDirInParent = path8.join(parentDir, DEPLOYMENTS_DIR);
-  const configPathInParent = path8.join(serverlessDirInParent, "microfox.json");
-  if (fs4.existsSync(serverlessDirInParent) && fs4.existsSync(configPathInParent)) {
+  if (looksLikeServerlessWorkersDir(serverlessDirInParent)) {
     return serverlessDirInParent;
   }
   return null;
 }
+function getPerGroupNames(serverlessRoot) {
+  const rootServerlessYml = path8.join(serverlessRoot, "serverless.yml");
+  if (fs4.existsSync(rootServerlessYml)) {
+    return null;
+  }
+  const entries = fs4.readdirSync(serverlessRoot, { withFileTypes: true });
+  const groups = [];
+  for (const e of entries) {
+    if (e.isDirectory() && !e.name.startsWith(".")) {
+      const groupServerlessYml = path8.join(serverlessRoot, e.name, "serverless.yml");
+      if (fs4.existsSync(groupServerlessYml)) {
+        groups.push(e.name);
+      }
+    }
+  }
+  return groups.length > 0 ? groups : null;
+}
 
 // src/commands/push.ts
 var FormData3 = require_form_data();
@@ -110198,18 +110275,28 @@ async function createZipArchive(sourceDir, ignorePatterns) {
   await finalizePromise;
   return zipPath;
 }
-async function pushAction() {
-  var _a4, _b3, _c2, _d2, _e2;
+async function pushAction(groupname, skipGroup) {
+  var _a4, _b3;
   let cwd = process.cwd();
   const serverlessDir = findServerlessWorkersDir(cwd);
   if (serverlessDir) {
     cwd = serverlessDir;
     process.chdir(cwd);
   }
-  const microfoxConfigPath = path9.join(cwd, "microfox.json");
+  let microfoxConfigPath = path9.join(cwd, "microfox.json");
   if (!fs5.existsSync(microfoxConfigPath)) {
-    console.error(source_default.red("\u274C Error: `microfox.json` not found in the current directory."));
-    console.log(source_default.yellow("This command must be run from the root of an agent project."));
+    const parentConfigPath = path9.join(path9.dirname(cwd), "microfox.json");
+    if (fs5.existsSync(parentConfigPath)) {
+      try {
+        fs5.copyFileSync(parentConfigPath, microfoxConfigPath);
+      } catch (e) {
+      }
+      microfoxConfigPath = fs5.existsSync(microfoxConfigPath) ? microfoxConfigPath : parentConfigPath;
+    }
+  }
+  if (!fs5.existsSync(microfoxConfigPath)) {
+    console.error(source_default.red("\u274C Error: `microfox.json` not found in the current directory or its parent."));
+    console.log(source_default.yellow("Run this command from the root of an agent project, or from its `.serverless-workers` directory."));
     process.exit(1);
   }
   console.log(source_default.cyan("\u{1F680} Pushing your agent to Microfox..."));
@@ -110221,54 +110308,92 @@ async function pushAction() {
   const isV2 = typeof apiVersion === "string" ? apiVersion.toLowerCase() === "v2" : false;
   try {
     if (isV2) {
-      const ignorePatterns = ["node_modules/**", ".git/**", ...deploymentConfig.ignorePatterns || microfoxConfig.ignorePatterns || []];
-      console.log(source_default.blue("\u{1F4E6} Bundling your agent as a ZIP archive..."));
-      const zipPath = await createZipArchive(cwd, ignorePatterns);
-      console.log(source_default.blue("\u{1F69A} Uploading archive to Microfox..."));
-      const form = new FormData3();
-      form.append("archive", fs5.createReadStream(zipPath), {
-        filename: "archive.zip",
-        contentType: "application/zip"
-      });
-      if (microfoxConfig.publish) {
-        form.append("publish", JSON.stringify(microfoxConfig.publish));
-      }
       const projectId = microfoxConfig.projectId || process.env.PROJECT_ID;
       if (!projectId) {
         console.error(source_default.red("\u274C Error: `projectId` is required. Add `projectId` to your microfox.json."));
         process.exit(1);
       }
-      const headers = {
-        ...form.getHeaders(),
-        "x-project-id": projectId
-      };
-      const response = await axios_default.post(
-        API_ENDPOINT_MAPPER({ mode: apiMode, version: "v2", port: apiLocalPort }),
-        form,
-        {
-          headers,
-          maxBodyLength: Infinity,
-          maxContentLength: Infinity
+      const perGroupNames = getPerGroupNames(cwd);
+      const skipSet = skipGroup ? new Set(skipGroup.split(",").map((g) => g.trim()).filter(Boolean)) : null;
+      let groupsToPush;
+      if (perGroupNames !== null) {
+        groupsToPush = groupname ? perGroupNames.includes(groupname) ? [groupname] : [] : perGroupNames.filter((g) => !(skipSet == null ? void 0 : skipSet.has(g)));
+        if (groupsToPush.length === 0) {
+          if (groupname) {
+            console.error(source_default.red(`\u274C No such group: ${groupname}. Available: ${perGroupNames.join(", ")}`));
+          } else {
+            console.error(source_default.red("\u274C No groups to push (all skipped or none match)."));
+          }
+          process.exit(1);
         }
-      );
-      if (response.status >= 200 && response.status < 300) {
-        console.log(source_default.green("\u2705 Deployment request accepted!"));
-        if ((_a4 = response.data) == null ? void 0 : _a4.deploymentId) {
-          const deploymentId = response.data.deploymentId;
-          console.log(source_default.green(`   Deployment ID: ${deploymentId}`));
-          saveDeploymentRecord(cwd, deploymentId);
-        } else if ((_b3 = response.data) == null ? void 0 : _b3.runId) {
-          const runId = response.data.runId;
-          console.log(source_default.green(`   Run ID: ${runId}`));
-          saveDeploymentRecord(cwd, runId);
+      } else {
+        groupsToPush = [];
+      }
+      const ignorePatterns = ["node_modules/**", ".git/**", ...deploymentConfig.ignorePatterns || microfoxConfig.ignorePatterns || []];
+      const serverlessRoot = cwd;
+      const doOnePush = async (archiveCwd, group) => {
+        var _a5, _b4, _c2;
+        console.log(source_default.blue(group ? `\u{1F4E6} Bundling group "${group}" as a ZIP archive...` : "\u{1F4E6} Bundling your agent as a ZIP archive..."));
+        const zipPath = await createZipArchive(archiveCwd, ignorePatterns);
+        console.log(source_default.blue(group ? `\u{1F69A} Uploading archive for group "${group}" to Microfox...` : "\u{1F69A} Uploading archive to Microfox..."));
+        const form = new FormData3();
+        form.append("archive", fs5.createReadStream(zipPath), {
+          filename: "archive.zip",
+          contentType: "application/zip"
+        });
+        const publish = microfoxConfig.publish ? { ...microfoxConfig.publish, ...group ? { group } : {} } : group ? { group } : void 0;
+        if (publish) {
+          form.append("publish", JSON.stringify(publish));
+        }
+        const headers = {
+          ...form.getHeaders(),
+          "x-project-id": projectId,
+          ...group ? { "x-deployment-group": group } : {}
+        };
+        const response = await axios_default.post(
+          API_ENDPOINT_MAPPER({ mode: apiMode, version: "v2", port: apiLocalPort }),
+          form,
+          {
+            headers,
+            maxBodyLength: Infinity,
+            maxContentLength: Infinity
+          }
+        );
+        if (response.status >= 200 && response.status < 300) {
+          console.log(source_default.green(group ? `\u2705 Deployment request accepted for group "${group}"!` : "\u2705 Deployment request accepted!"));
+          if ((_a5 = response.data) == null ? void 0 : _a5.deploymentId) {
+            const deploymentId = response.data.deploymentId;
+            console.log(source_default.green(`   Deployment ID: ${deploymentId}`));
+            if (group != null && group !== "") {
+              saveDeploymentRecordToRoot(serverlessRoot, deploymentId, group);
+            } else {
+              saveDeploymentRecord(archiveCwd, deploymentId);
+            }
+          } else if ((_b4 = response.data) == null ? void 0 : _b4.runId) {
+            const runId = response.data.runId;
+            console.log(source_default.green(`   Run ID: ${runId}`));
+            if (group != null && group !== "") {
+              saveDeploymentRecordToRoot(serverlessRoot, runId, group);
+            } else {
+              saveDeploymentRecord(archiveCwd, runId);
+            }
+          }
+          if ((_c2 = response.data) == null ? void 0 : _c2.message) {
+            console.log(source_default.green(`   Message: ${response.data.message}`));
+          }
+        } else {
+          console.error(source_default.red(`\u274C Deployment failed with status: ${response.status}`));
+          console.error(response.data);
+          throw new Error(`Deployment failed: ${response.status}`);
         }
-        if ((_c2 = response.data) == null ? void 0 : _c2.message) {
-          console.log(source_default.green(`   Message: ${response.data.message}`));
+      };
+      if (groupsToPush.length > 0) {
+        for (const group of groupsToPush) {
+          const groupDir = path9.join(cwd, group);
+          await doOnePush(groupDir, group);
         }
       } else {
-        console.error(source_default.red(`\u274C Deployment failed with status: ${response.status}`));
-        console.error(response.data);
-        process.exit(1);
+        await doOnePush(cwd);
       }
     } else {
       let agentApiKey;
@@ -110312,12 +110437,12 @@ async function pushAction() {
       );
       if (response.status >= 200 && response.status < 300) {
         console.log(source_default.green("\u2705 Deployment successful!"));
-        if ((_d2 = response.data) == null ? void 0 : _d2.runId) {
+        if ((_a4 = response.data) == null ? void 0 : _a4.runId) {
           const runId = response.data.runId;
           console.log(source_default.green(`   Run ID: ${runId}`));
           saveDeploymentRecord(cwd, runId);
         }
-        if ((_e2 = response.data) == null ? void 0 : _e2.message) {
+        if ((_b3 = response.data) == null ? void 0 : _b3.message) {
           console.log(source_default.green(`   Message: ${response.data.message}`));
         }
       } else {
@@ -110337,9 +110462,9 @@ async function pushAction() {
     process.exit(1);
   }
 }
-var pushCommand = new Command("push").description("Deploy your agent to the Microfox platform").action(async () => {
+var pushCommand = new Command("push").description("Deploy your agent to the Microfox platform").argument("[groupname]", "Deploy only this group (when using per-group layout, e.g. core, default, workflows)").option("--skip-group <groups>", 'Comma-separated list of groups to skip (e.g. "core,workflows")').action(async (groupname, options = {}) => {
   try {
-    await pushAction();
+    await pushAction(groupname, options.skipGroup);
   } catch (error2) {
     console.error(source_default.red("\u274C Error:"), error2 instanceof Error ? error2.message : String(error2));
     process.exit(1);
@@ -110419,7 +110544,7 @@ async function fetchV2Deployment(deploymentId, cfg) {
   return axios_default.get(url2, { headers: { "x-project-id": projectId } });
 }
 async function statusAction(idArg, options) {
-  var _a4;
+  var _a4, _b3;
   let cwd = process.cwd();
   const serverlessDir = findServerlessWorkersDir(cwd);
   if (serverlessDir) {
@@ -110430,22 +110555,30 @@ async function statusAction(idArg, options) {
   const apiVersion = deploymentConfig.apiVersion || cfg.apiVersion || cfg.API_VERSION;
   const isV2 = ((_a4 = apiVersion == null ? void 0 : apiVersion.toLowerCase) == null ? void 0 : _a4.call(apiVersion)) === "v2";
   let idsToProcess = [];
+  let latestRecords = null;
   if (idArg === "latest" || !idArg) {
     const n = (options == null ? void 0 : options.number) || 1;
-    const latestIds = getLatestDeploymentId(cwd, n);
-    if (latestIds.length === 0) {
+    if (serverlessDir) {
+      const records = getDeploymentRecordsFromRoot(serverlessDir);
+      const sorted = [...records].sort((a, b) => b.timestamp - a.timestamp);
+      latestRecords = sorted.slice(0, n);
+      idsToProcess = latestRecords.map((r) => r.deploymentId);
+    } else {
+      idsToProcess = getLatestDeploymentId(cwd, n);
+    }
+    if (idsToProcess.length === 0) {
       console.error(source_default.red("\u274C Error: No deployment records found. Run `npx microfox push` first."));
       process.exit(1);
     }
-    idsToProcess = latestIds;
   } else {
     idsToProcess = [idArg];
   }
   if (idsToProcess.length > 1) {
     for (let i = 0; i < idsToProcess.length; i++) {
       const id = idsToProcess[i];
+      const groupLabel = ((_b3 = latestRecords == null ? void 0 : latestRecords[i]) == null ? void 0 : _b3.group) ? ` (group: ${latestRecords[i].group})` : "";
       console.log(source_default.cyan(`
-[${i + 1}/${idsToProcess.length}] Deployment: ${id}`));
+[${i + 1}/${idsToProcess.length}] Deployment: ${id}${groupLabel}`));
       console.log(source_default.gray("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
       await processSingleStatus(id, cwd, cfg, isV2);
       if (i < idsToProcess.length - 1) {
@@ -110483,6 +110616,9 @@ async function processSingleStatus(idArg, cwd, cfg, isV2) {
     console.log(source_default.gray("----------------------------------------"));
     console.log(`${source_default.bold("Deployment ID:")} ${dep._id || deploymentId}`);
     console.log(`${source_default.bold("Project ID:")}    ${dep.projectId || "N/A"}`);
+    if (dep.group != null && dep.group !== "") {
+      console.log(`${source_default.bold("Group:")}         ${dep.group}`);
+    }
     console.log(`${source_default.bold("Status:")}        ${source_default.green(dep.status)}`);
     if ((_a4 = dep.error) == null ? void 0 : _a4.message) console.log(`${source_default.bold("Error:")}         ${dep.error.message}`);
     const start = ((_c2 = (_b3 = dep.metrics) == null ? void 0 : _b3.timing) == null ? void 0 : _c2.startTime) ? new Date(dep.metrics.timing.startTime).toLocaleString() : "N/A";
@@ -110515,7 +110651,7 @@ async function logsAction(idArg, options = {}) {
   let idsToProcess = [];
   if (idArg === "latest" || !idArg) {
     const n = (options == null ? void 0 : options.number) || 1;
-    const latestIds = getLatestDeploymentId(cwd, n);
+    const latestIds = serverlessDir ? getLatestDeploymentIdFromRoot(serverlessDir, n) : getLatestDeploymentId(cwd, n);
     if (latestIds.length === 0) {
       console.error(source_default.red("\u274C Error: No deployment records found. Run `npx microfox push` first."));
       process.exit(1);
@@ -111507,7 +111643,7 @@ var kickstartCommand = new Command("kickstart").description("Kickstart a new Mic
 });
 
 // package.json
-var version = "1.1.7";
+var version = "1.2.0";
 
 // src/commands/track.ts
 var track = new Command("track").description("Run tracker scripts locally.").option("--file <path>", "Run a single tracker file instead of all.").action(async (options) => {