@jvittechs/j 1.0.46 → 1.0.48

package/dist/cli.js

@@ -149,7 +149,7 @@ import { basename as basename5 } from "path";
 // package.json
 var package_default = {
   name: "@jvittechs/j",
-  version: "1.0.46",
+  version: "1.0.48",
   description: "A unified CLI tool for JV-IT TECHS developers to manage Jai1 Framework. Supports both `j` and `jai1` commands. Please contact TeamAI for usage instructions.",
   type: "module",
   bin: {
@@ -919,22 +919,18 @@ var MigrateIdeService = class {
     } catch {
       return items;
     }
-    const files = await fs4.readdir(dirPath);
-    for (const file of files) {
-      if (!file.endsWith(".md")) continue;
-      const filepath = path.join(dirPath, file);
-      const stat = await fs4.stat(filepath);
-      if (!stat.isFile()) continue;
+    const mdFiles = await this.collectMdFiles(dirPath, dirPath);
+    for (const { filepath, relativeName } of mdFiles) {
       const content = await fs4.readFile(filepath, "utf-8");
       let frontmatter = {};
       try {
         const { data } = matter(content);
         frontmatter = data;
       } catch (e) {
-        console.warn(`\u26A0\uFE0F  Skipping ${file}: Invalid YAML frontmatter`);
+        console.warn(`\u26A0\uFE0F  Skipping ${relativeName}: Invalid YAML frontmatter`);
         continue;
       }
-      const name = path.basename(file, ".md");
+      const name = relativeName;
       const trigger = this.extractTrigger(frontmatter);
       const alwaysApply = this.isAlwaysTrigger(trigger);
       items.push({
@@ -1124,6 +1120,34 @@ ${bodyContent}
     return path.join(this.projectPath, config.basePath, contentPath, filename);
   }
   // Helper methods
+  /**
+   * Recursively collect .md files from a directory.
+   * Supports both flat layout (core v1) and subdirectory layout (core v2).
+   * Returns relative name preserving subdirectory structure:
+   *   - Flat: 'commit-it' (from commit-it.md)
+   *   - Subdir: 'dev/feature' (from dev/feature.md)
+   */
+  async collectMdFiles(rootDir, currentDir) {
+    const results = [];
+    let entries;
+    try {
+      entries = await fs4.readdir(currentDir, { withFileTypes: true });
+    } catch {
+      return results;
+    }
+    for (const entry of entries) {
+      const fullPath = path.join(currentDir, entry.name);
+      if (entry.isDirectory()) {
+        const subResults = await this.collectMdFiles(rootDir, fullPath);
+        results.push(...subResults);
+      } else if (entry.isFile() && entry.name.endsWith(".md")) {
+        const relativePath = path.relative(rootDir, fullPath);
+        const relativeName = relativePath.replace(/\.md$/, "");
+        results.push({ filepath: fullPath, relativeName });
+      }
+    }
+    return results;
+  }
   /**
    * Extract trigger from frontmatter
    * Jai1 source format uses 'trigger' field (Windsurf/Antigravity compatible)
@@ -10937,8 +10961,10 @@ async function handleWatch(address, options) {
   const startTime = Date.now();
   if (!options.json) {
     console.log(chalk25.bold.cyan(`\u{1F440} Watching inbox: ${address}`));
-    console.log(chalk25.dim(`   Polling every ${intervalSec}s${timeoutSec ? ` \xB7 timeout ${timeoutSec}s` : ""} \xB7 Ctrl+C to stop
-`));
+    console.log(chalk25.dim(
+      `   Polling every ${intervalSec}s` + (timeoutSec ? ` \xB7 timeout ${timeoutSec}s` : "") + (options.keep ? " \xB7 keep watching" : " \xB7 stops after first email") + ` \xB7 Ctrl+C to stop
+`
+    ));
   }
   const init = await api.getInbox(address, 30);
   if (init.success && init.data) {
@@ -10986,6 +11012,10 @@ async function handleWatch(address, options) {
           }
         }
         console.log();
+        if (!options.keep) {
+          clearInterval(timer);
+          process.exit(0);
+        }
       }
     }
   };
@@ -11000,10 +11030,11 @@ async function handleWatch(address, options) {
   });
 }
 function createMailWatchCommand() {
-  return new Command52("watch").description("L\u1EAFng nghe email m\u1EDBi (polling)").argument("<address>", "\u0110\u1ECBa ch\u1EC9 email c\u1EA7n theo d\xF5i").option("-i, --interval <seconds>", "Kho\u1EA3ng th\u1EDDi gian poll (gi\xE2y, m\u1EB7c \u0111\u1ECBnh: 15)", "15").option("-t, --timeout <seconds>", "D\u1EEBng sau N gi\xE2y (m\u1EB7c \u0111\u1ECBnh: ch\u1EA1y m\xE3i)").option("-j, --json", "Output s\u1EF1 ki\u1EC7n email m\u1EDBi d\u1EA1ng JSON (m\u1ED7i d\xF2ng 1 event)").addHelpText("after", `
+  return new Command52("watch").description("L\u1EAFng nghe email m\u1EDBi (polling)").argument("<address>", "\u0110\u1ECBa ch\u1EC9 email c\u1EA7n theo d\xF5i").option("-i, --interval <seconds>", "Kho\u1EA3ng th\u1EDDi gian poll (gi\xE2y, m\u1EB7c \u0111\u1ECBnh: 15)", "15").option("-t, --timeout <seconds>", "D\u1EEBng sau N gi\xE2y (m\u1EB7c \u0111\u1ECBnh: ch\u1EA1y m\xE3i)").option("-k, --keep", "Ti\u1EBFp t\u1EE5c watch sau khi nh\u1EADn \u0111\u01B0\u1EE3c email (m\u1EB7c \u0111\u1ECBnh: d\u1EEBng sau email \u0111\u1EA7u ti\xEAn)").option("-j, --json", "Output s\u1EF1 ki\u1EC7n email m\u1EDBi d\u1EA1ng JSON (m\u1ED7i d\xF2ng 1 event)").addHelpText("after", `
 Examples:
-  $ j dev mail watch user@dollicons.com
-  $ j dev mail watch user@dollicons.com -i 30
+  $ j dev mail watch user@dollicons.com           # D\u1EEBng khi nh\u1EADn \u0111\u01B0\u1EE3c email \u0111\u1EA7u ti\xEAn
+  $ j dev mail watch user@dollicons.com -k        # Ti\u1EBFp t\u1EE5c watch
+  $ j dev mail watch user@dollicons.com -i 30 -k
   $ j dev mail watch user@dollicons.com -t 300
   $ j dev mail watch user@dollicons.com -j | jq .
 `).action(async (address, options) => {