microfox 1.1.7 → 1.2.0

package/dist/cli.mjs

@@ -59680,21 +59680,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 path.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);
+  fs.writeFileSync(filePath, JSON.stringify(records, null, 2));
+}
+function getDeploymentRecordsFromRoot(serverlessRoot) {
+  const filePath = getDeploymentsPathAtRoot(serverlessRoot);
+  if (!fs.existsSync(filePath)) {
+    return [];
+  }
+  try {
+    const content = fs.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 _a;
+      return ((_a = r.group) != null ? _a : "") === 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 = path.resolve(startDir);
+  const looksLikeServerlessWorkersDir = (dir2) => {
+    if (!fs.existsSync(dir2)) return false;
+    try {
+      if (!fs.statSync(dir2).isDirectory()) return false;
+    } catch (e) {
+      return false;
+    }
+    if (fs.existsSync(path.join(dir2, "serverless.yml"))) return true;
+    try {
+      const entries = fs.readdirSync(dir2, { withFileTypes: true });
+      for (const e of entries) {
+        if (e.isDirectory() && !e.name.startsWith(".")) {
+          if (fs.existsSync(path.join(dir2, e.name, "serverless.yml"))) {
+            return true;
+          }
+        }
+      }
+    } catch (e) {
+    }
+    return false;
+  };
   const serverlessDirInCurrent = path.join(resolvedStart, DEPLOYMENTS_DIR);
-  const configPathInCurrent = path.join(serverlessDirInCurrent, "microfox.json");
-  if (fs.existsSync(serverlessDirInCurrent) && fs.existsSync(configPathInCurrent)) {
+  if (looksLikeServerlessWorkersDir(serverlessDirInCurrent)) {
     return serverlessDirInCurrent;
   }
   const parentDir = path.dirname(resolvedStart);
   const serverlessDirInParent = path.join(parentDir, DEPLOYMENTS_DIR);
-  const configPathInParent = path.join(serverlessDirInParent, "microfox.json");
-  if (fs.existsSync(serverlessDirInParent) && fs.existsSync(configPathInParent)) {
+  if (looksLikeServerlessWorkersDir(serverlessDirInParent)) {
     return serverlessDirInParent;
   }
   return null;
 }
+function getPerGroupNames(serverlessRoot) {
+  const rootServerlessYml = path.join(serverlessRoot, "serverless.yml");
+  if (fs.existsSync(rootServerlessYml)) {
+    return null;
+  }
+  const entries = fs.readdirSync(serverlessRoot, { withFileTypes: true });
+  const groups = [];
+  for (const e of entries) {
+    if (e.isDirectory() && !e.name.startsWith(".")) {
+      const groupServerlessYml = path.join(serverlessRoot, e.name, "serverless.yml");
+      if (fs.existsSync(groupServerlessYml)) {
+        groups.push(e.name);
+      }
+    }
+  }
+  return groups.length > 0 ? groups : null;
+}
 
 // src/commands/push.ts
 var FormData3 = require_form_data();
@@ -59761,18 +59838,28 @@ async function createZipArchive(sourceDir, ignorePatterns) {
   await finalizePromise;
   return zipPath;
 }
-async function pushAction() {
-  var _a, _b, _c, _d, _e;
+async function pushAction(groupname, skipGroup) {
+  var _a, _b;
   let cwd = process.cwd();
   const serverlessDir = findServerlessWorkersDir(cwd);
   if (serverlessDir) {
     cwd = serverlessDir;
     process.chdir(cwd);
   }
-  const microfoxConfigPath = path2.join(cwd, "microfox.json");
+  let microfoxConfigPath = path2.join(cwd, "microfox.json");
   if (!fs2.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 = path2.join(path2.dirname(cwd), "microfox.json");
+    if (fs2.existsSync(parentConfigPath)) {
+      try {
+        fs2.copyFileSync(parentConfigPath, microfoxConfigPath);
+      } catch (e) {
+      }
+      microfoxConfigPath = fs2.existsSync(microfoxConfigPath) ? microfoxConfigPath : parentConfigPath;
+    }
+  }
+  if (!fs2.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..."));
@@ -59784,54 +59871,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", fs2.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 ((_a = response.data) == null ? void 0 : _a.deploymentId) {
-          const deploymentId = response.data.deploymentId;
-          console.log(source_default.green(`   Deployment ID: ${deploymentId}`));
-          saveDeploymentRecord(cwd, deploymentId);
-        } else if ((_b = response.data) == null ? void 0 : _b.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 _a2, _b2, _c;
+        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", fs2.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 ((_a2 = response.data) == null ? void 0 : _a2.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 ((_b2 = response.data) == null ? void 0 : _b2.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 ((_c = response.data) == null ? void 0 : _c.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 ((_c = response.data) == null ? void 0 : _c.message) {
-          console.log(source_default.green(`   Message: ${response.data.message}`));
+      };
+      if (groupsToPush.length > 0) {
+        for (const group of groupsToPush) {
+          const groupDir = path2.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;
@@ -59875,12 +60000,12 @@ async function pushAction() {
       );
       if (response.status >= 200 && response.status < 300) {
         console.log(source_default.green("\u2705 Deployment successful!"));
-        if ((_d = response.data) == null ? void 0 : _d.runId) {
+        if ((_a = response.data) == null ? void 0 : _a.runId) {
           const runId = response.data.runId;
           console.log(source_default.green(`   Run ID: ${runId}`));
           saveDeploymentRecord(cwd, runId);
         }
-        if ((_e = response.data) == null ? void 0 : _e.message) {
+        if ((_b = response.data) == null ? void 0 : _b.message) {
           console.log(source_default.green(`   Message: ${response.data.message}`));
         }
       } else {
@@ -59900,9 +60025,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);
@@ -59982,7 +60107,7 @@ async function fetchV2Deployment(deploymentId, cfg) {
   return axios_default.get(url2, { headers: { "x-project-id": projectId } });
 }
 async function statusAction(idArg, options) {
-  var _a;
+  var _a, _b;
   let cwd = process.cwd();
   const serverlessDir = findServerlessWorkersDir(cwd);
   if (serverlessDir) {
@@ -59993,22 +60118,30 @@ async function statusAction(idArg, options) {
   const apiVersion = deploymentConfig.apiVersion || cfg.apiVersion || cfg.API_VERSION;
   const isV2 = ((_a = apiVersion == null ? void 0 : apiVersion.toLowerCase) == null ? void 0 : _a.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 = ((_b = latestRecords == null ? void 0 : latestRecords[i]) == null ? void 0 : _b.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) {
@@ -60046,6 +60179,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 ((_a = dep.error) == null ? void 0 : _a.message) console.log(`${source_default.bold("Error:")}         ${dep.error.message}`);
     const start = ((_c = (_b = dep.metrics) == null ? void 0 : _b.timing) == null ? void 0 : _c.startTime) ? new Date(dep.metrics.timing.startTime).toLocaleString() : "N/A";
@@ -60078,7 +60214,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);
@@ -61070,7 +61206,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) => {