@jvittechs/j 1.0.35 → 1.0.37

package/dist/{chunk-3XLJNHC6.js → chunk-NBOT35QM.js}

@@ -48,6 +48,7 @@ var PRIORITY_LABELS = {
 
 // src/services/task.service.ts
 var TASKS_FILE = ".jai1/tasks.jsonl";
+var SYNC_BRANCH = "jai1";
 var TaskService = class {
   tasksPath;
   constructor(cwd) {
@@ -111,18 +112,18 @@ var TaskService = class {
   }
   /**
    * Get tasks that are ready to pick:
-   * status=todo, all depends_on done, assigned_to empty
+   * status=todo, all depends_on done or cancelled, assigned_to empty
    */
   async getReady(parent) {
     const tasks = await this.readAll();
-    const doneIds = new Set(
-      tasks.filter((t) => t.status === "done").map((t) => t.id)
+    const resolvedIds = new Set(
+      tasks.filter((t) => t.status === "done" || t.status === "cancelled").map((t) => t.id)
     );
     return tasks.filter((t) => {
       if (t.status !== "todo") return false;
       if (t.assigned_to) return false;
       if (parent && t.parent !== parent) return false;
-      if (t.depends_on.length > 0 && !t.depends_on.every((depId) => doneIds.has(depId))) {
+      if (t.depends_on.length > 0 && !t.depends_on.every((depId) => resolvedIds.has(depId))) {
         return false;
       }
       return true;
@@ -136,10 +137,10 @@ var TaskService = class {
       return { blocked: false, blockedBy: [] };
     }
     const tasks = await this.readAll();
-    const doneIds = new Set(
-      tasks.filter((t) => t.status === "done").map((t) => t.id)
+    const resolvedIds = new Set(
+      tasks.filter((t) => t.status === "done" || t.status === "cancelled").map((t) => t.id)
     );
-    const blockedBy = task.depends_on.filter((id) => !doneIds.has(id));
+    const blockedBy = task.depends_on.filter((id) => !resolvedIds.has(id));
     return { blocked: blockedBy.length > 0, blockedBy };
   }
   /**
@@ -147,12 +148,12 @@ var TaskService = class {
    */
   async getStats() {
     const tasks = await this.readAll();
-    const doneIds = new Set(
-      tasks.filter((t) => t.status === "done").map((t) => t.id)
+    const resolvedIds = new Set(
+      tasks.filter((t) => t.status === "done" || t.status === "cancelled").map((t) => t.id)
     );
     let blocked = 0;
     for (const t of tasks) {
-      if (t.status === "todo" && t.depends_on.length > 0 && !t.depends_on.every((id) => doneIds.has(id))) {
+      if (t.status === "todo" && t.depends_on.length > 0 && !t.depends_on.every((id) => resolvedIds.has(id))) {
         blocked++;
       }
     }
@@ -260,51 +261,178 @@ var TaskService = class {
   // GIT SYNC
   // ============================================
   /**
-   * Commit and push only the tasks file
+   * Get the sync branch name
+   */
+  getSyncBranch() {
+    return SYNC_BRANCH;
+  }
+  /**
+   * Check if a remote branch exists
+   */
+  remoteBranchExists(cwd, branch) {
+    try {
+      const output = execSync(`git ls-remote --heads origin ${branch}`, { cwd, encoding: "utf-8" }).trim();
+      return output.length > 0;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Check if a local branch exists
+   */
+  localBranchExists(cwd, branch) {
+    try {
+      execSync(`git rev-parse --verify ${branch}`, { cwd, stdio: "pipe" });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Stash changes if working tree is dirty, returns true if stash was created
+   */
+  stashIfDirty(cwd) {
+    try {
+      execSync("git diff --quiet && git diff --cached --quiet", { cwd, stdio: "pipe" });
+      return false;
+    } catch {
+      execSync('git stash push -m "jai1-task-sync-auto-stash"', { cwd, stdio: "pipe" });
+      return true;
+    }
+  }
+  /**
+   * Pop stash if it was created by us
+   */
+  stashPopIfNeeded(cwd, didStash) {
+    if (!didStash) return;
+    try {
+      execSync("git stash pop", { cwd, stdio: "pipe" });
+    } catch {
+    }
+  }
+  /**
+   * Create the jai1 orphan branch with just the tasks file.
+   * An orphan branch has no shared history with code branches.
+   */
+  createOrphanBranch(cwd, branch) {
+    const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+      cwd,
+      encoding: "utf-8"
+    }).trim();
+    const didStash = this.stashIfDirty(cwd);
+    try {
+      execSync(`git checkout --orphan ${branch}`, { cwd, stdio: "pipe" });
+      execSync("git rm -rf .", { cwd, stdio: "pipe" });
+      execSync(`git checkout ${currentBranch} -- ${TASKS_FILE}`, { cwd, stdio: "pipe" });
+      execSync(`git add ${TASKS_FILE}`, { cwd, stdio: "pipe" });
+      execSync(`git commit -m "chore(tasks): init task sync branch"`, { cwd, stdio: "pipe" });
+      execSync(`git push -u origin ${branch}`, { cwd, stdio: "pipe" });
+    } finally {
+      execSync(`git checkout ${currentBranch}`, { cwd, stdio: "pipe" });
+      this.stashPopIfNeeded(cwd, didStash);
+    }
+  }
+  /**
+   * Commit and push only the tasks file to the sync branch.
+   * Works from any branch — pushes only the tasks commit to origin/<SYNC_BRANCH>.
+   *
+   * Edge cases handled:
+   * - jai1 branch doesn't exist → creates orphan branch
+   * - On feature branch → cherry-pick onto jai1
+   * - Dirty working tree → stash/unstash automatically
    */
   async syncPush() {
     const cwd = process.cwd();
+    const branch = SYNC_BRANCH;
     execSync(`git add ${TASKS_FILE}`, { cwd, stdio: "pipe" });
     try {
       execSync("git diff --cached --quiet", { cwd, stdio: "pipe" });
       return;
     } catch {
     }
+    const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+      cwd,
+      encoding: "utf-8"
+    }).trim();
+    if (!this.remoteBranchExists(cwd, branch) && !this.localBranchExists(cwd, branch)) {
+      execSync(`git commit -m "chore(tasks): sync task status"`, { cwd, stdio: "pipe" });
+      this.createOrphanBranch(cwd, branch);
+      return;
+    }
     execSync(`git commit -m "chore(tasks): sync task status"`, {
       cwd,
       stdio: "pipe"
     });
-    execSync("git push", { cwd, stdio: "pipe" });
+    if (currentBranch === branch) {
+      execSync(`git push origin ${branch}`, { cwd, stdio: "pipe" });
+    } else {
+      const commitHash = execSync("git rev-parse HEAD", {
+        cwd,
+        encoding: "utf-8"
+      }).trim();
+      const didStash = this.stashIfDirty(cwd);
+      try {
+        if (this.localBranchExists(cwd, branch)) {
+          execSync(`git checkout ${branch}`, { cwd, stdio: "pipe" });
+          execSync(`git pull origin ${branch}`, { cwd, stdio: "pipe" });
+        } else {
+          execSync(`git checkout -b ${branch} origin/${branch}`, { cwd, stdio: "pipe" });
+        }
+        try {
+          execSync(`git cherry-pick ${commitHash}`, { cwd, stdio: "pipe" });
+        } catch {
+          execSync(`git checkout ${commitHash} -- ${TASKS_FILE}`, { cwd, stdio: "pipe" });
+          execSync("git add .", { cwd, stdio: "pipe" });
+          try {
+            execSync("git cherry-pick --continue", { cwd, stdio: "pipe" });
+          } catch {
+            execSync(`git commit --allow-empty -m "chore(tasks): sync task status"`, { cwd, stdio: "pipe" });
+          }
+        }
+        execSync(`git push origin ${branch}`, { cwd, stdio: "pipe" });
+      } finally {
+        execSync(`git checkout ${currentBranch}`, { cwd, stdio: "pipe" });
+        this.stashPopIfNeeded(cwd, didStash);
+      }
+    }
   }
   /**
-   * Pull tasks from main branch and merge
+   * Pull tasks from sync branch and merge by timestamp.
+   *
+   * Edge cases handled:
+   * - jai1 branch doesn't exist on remote → returns empty (no-op)
+   * - tasks.jsonl doesn't exist on remote branch → returns empty
    */
   async syncPull() {
     const cwd = process.cwd();
+    const branch = SYNC_BRANCH;
     let merged = 0;
     let conflicts = 0;
+    if (!this.remoteBranchExists(cwd, branch)) {
+      return { merged: 0, conflicts: 0 };
+    }
     try {
-      execSync("git fetch origin main", { cwd, stdio: "pipe" });
-      let mainContent;
+      execSync(`git fetch origin ${branch}`, { cwd, stdio: "pipe" });
+      let remoteContent;
       try {
-        mainContent = execSync(`git show origin/main:${TASKS_FILE}`, {
+        remoteContent = execSync(`git show origin/${branch}:${TASKS_FILE}`, {
           cwd,
           encoding: "utf-8"
         });
       } catch {
         return { merged: 0, conflicts: 0 };
       }
-      const mainTasksRaw = mainContent.trim().split("\n").filter(Boolean).map((line) => TaskSchema.parse(JSON.parse(line)));
+      const remoteTasks = remoteContent.trim().split("\n").filter(Boolean).map((line) => TaskSchema.parse(JSON.parse(line)));
       const localTasks = await this.readAll();
       const localMap = new Map(localTasks.map((t) => [t.id, t]));
-      for (const mainTask of mainTasksRaw) {
-        const local = localMap.get(mainTask.id);
+      for (const remoteTask of remoteTasks) {
+        const local = localMap.get(remoteTask.id);
         if (!local) {
-          localTasks.push(mainTask);
+          localTasks.push(remoteTask);
           merged++;
-        } else if (mainTask.updated > local.updated) {
-          const idx = localTasks.findIndex((t) => t.id === mainTask.id);
-          localTasks[idx] = mainTask;
+        } else if (remoteTask.updated > local.updated) {
+          const idx = localTasks.findIndex((t) => t.id === remoteTask.id);
+          localTasks[idx] = remoteTask;
           merged++;
         }
       }
@@ -434,4 +562,4 @@ export {
   handleTaskSummary,
   createTaskSummaryCommand
 };
-//# sourceMappingURL=chunk-3XLJNHC6.js.map
+//# sourceMappingURL=chunk-NBOT35QM.js.map

package/dist/chunk-NBOT35QM.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/commands/tasks/summary.ts","../src/services/task.service.ts","../src/types/task.types.ts"],"sourcesContent":["/**\n * jai1 tasks summary [-j]\n */\nimport { Command } from 'commander';\nimport chalk from 'chalk';\nimport boxen from 'boxen';\nimport { TaskService } from '../../services/task.service.js';\nimport type { TaskSummaryOptions } from '../../types/task.types.js';\n\nexport async function handleTaskSummary(options: TaskSummaryOptions): Promise<void> {\n    const service = new TaskService();\n    const stats = await service.getStats();\n    const tasks = await service.readAll();\n\n    if (options.json) {\n        console.log(JSON.stringify(stats, null, 2));\n        return;\n    }\n\n    console.log(\n        boxen(chalk.cyan.bold('📊 Task Summary'), {\n            padding: { left: 1, right: 1, top: 0, bottom: 0 },\n            borderStyle: 'round',\n            borderColor: 'cyan',\n        })\n    );\n\n    console.log();\n    console.log(`  🔵 In Progress: ${chalk.bold(String(stats.in_progress))}`);\n    console.log(`  📋 Todo:        ${chalk.bold(String(stats.todo))}`);\n    console.log(`  🔴 Blocked:     ${chalk.bold(String(stats.blocked))}`);\n    console.log(`  ✅ Done:        ${chalk.bold(String(stats.done))}`);\n    console.log(`  ⚫ Cancelled:   ${chalk.bold(String(stats.cancelled))}`);\n    console.log(chalk.dim(`  ── Total:       ${stats.total}`));\n\n    // Show in-progress tasks\n    const inProgress = tasks.filter((t) => t.status === 'in_progress');\n    if (inProgress.length > 0) {\n        console.log(chalk.bold('\\n  🔵 Currently working:'));\n        for (const t of inProgress) {\n            let line = `     ${chalk.dim(t.id)} ${t.title}`;\n            if (t.assigned_to) line += chalk.cyan(` @${t.assigned_to}`);\n            console.log(line);\n        }\n    }\n\n    // Show ready count\n    const ready = await service.getReady();\n    if (ready.length > 0) {\n        console.log(chalk.dim(`\\n  💡 ${ready.length} tasks ready to pick: jai1 t pick`));\n    }\n\n    console.log();\n}\n\nexport function createTaskSummaryCommand(): Command {\n    return new Command('summary')\n        .description('Show task dashboard')\n        .option('-j, --json', 'Output JSON')\n        .action(async (options: TaskSummaryOptions) => {\n            await handleTaskSummary(options);\n        });\n}\n","/**\n * Task Service\n * CRUD operations on .jai1/tasks.jsonl\n */\nimport { promises as fs, existsSync } from 'fs';\nimport { join, dirname } from 'path';\nimport { execSync } from 'child_process';\nimport chalk from 'chalk';\nimport { TaskSchema, type Task, type TaskStatusType } from '../types/task.types.js';\n\nconst TASKS_FILE = '.jai1/tasks.jsonl';\nconst SYNC_BRANCH = 'jai1';\n\nexport class TaskService {\n    private readonly tasksPath: string;\n\n    constructor(cwd?: string) {\n        this.tasksPath = join(cwd || process.cwd(), TASKS_FILE);\n    }\n\n    /**\n     * Check if .jai1 directory exists in CWD.\n     * If not, print a helpful message and exit.\n     */\n    static ensureJai1Dir(cwd?: string): void {\n        const dir = join(cwd || process.cwd(), '.jai1');\n        if (!existsSync(dir)) {\n            console.error(chalk.red('❌ Thư mục .jai1 không tồn tại trong project này.'));\n            console.error('');\n            console.error(chalk.dim('  Bạn cần khởi tạo Jai1 framework trước khi sử dụng task management.'));\n            console.error('');\n            console.error(`  ${chalk.bold('Hướng dẫn:')}`);\n            console.error(`    ${chalk.cyan('jai1 doctor')}    Kiểm tra trạng thái cài đặt`);\n            console.error(`    ${chalk.cyan('jai1 guide')}     Hướng dẫn sử dụng đầy đủ`);\n            console.error('');\n            process.exit(1);\n        }\n    }\n\n    // ============================================\n    // READ\n    // ============================================\n\n    /**\n     * Read all tasks from JSONL file\n     */\n    async readAll(): Promise<Task[]> {\n        try {\n            await this.ensureTasksFileNotDirectory();\n            const content = await fs.readFile(this.tasksPath, 'utf-8');\n            const lines = content.trim().split('\\n').filter(Boolean);\n            return lines.map((line) => TaskSchema.parse(JSON.parse(line)));\n        } catch (error: unknown) {\n            if (error && typeof error === 'object' && 'code' in error && (error as { code: string }).code === 'ENOENT') {\n                return [];\n            }\n            throw error;\n        }\n    }\n\n    /**\n     * Find task by ID\n     */\n    async findById(id: string): Promise<Task | null> {\n        const tasks = await this.readAll();\n        return tasks.find((t) => t.id === id) || null;\n    }\n\n    /**\n     * Filter tasks by criteria\n     */\n    async filter(criteria: {\n        status?: TaskStatusType;\n        parent?: string;\n        assignee?: string;\n    }): Promise<Task[]> {\n        const tasks = await this.readAll();\n        return tasks.filter((t) => {\n            if (criteria.status && t.status !== criteria.status) return false;\n            if (criteria.parent && t.parent !== criteria.parent) return false;\n            if (criteria.assignee && t.assigned_to !== criteria.assignee) return false;\n            return true;\n        });\n    }\n\n    /**\n     * Get tasks that are ready to pick:\n     * status=todo, all depends_on done or cancelled, assigned_to empty\n     */\n    async getReady(parent?: string): Promise<Task[]> {\n        const tasks = await this.readAll();\n        const resolvedIds = new Set(\n            tasks.filter((t) => t.status === 'done' || t.status === 'cancelled').map((t) => t.id)\n        );\n\n        return tasks\n            .filter((t) => {\n                if (t.status !== 'todo') return false;\n                if (t.assigned_to) return false;\n                if (parent && t.parent !== parent) return false;\n                // All dependencies must be done or cancelled\n                if (t.depends_on.length > 0 && !t.depends_on.every((depId) => resolvedIds.has(depId))) {\n                    return false;\n                }\n                return true;\n            })\n            .sort((a, b) => a.priority - b.priority || a.created.localeCompare(b.created));\n    }\n\n    /**\n     * Check if a task is blocked (has unfinished dependencies)\n     */\n    async isBlocked(task: Task): Promise<{ blocked: boolean; blockedBy: string[] }> {\n        if (task.depends_on.length === 0) {\n            return { blocked: false, blockedBy: [] };\n        }\n        const tasks = await this.readAll();\n        const resolvedIds = new Set(\n            tasks.filter((t) => t.status === 'done' || t.status === 'cancelled').map((t) => t.id)\n        );\n        const blockedBy = task.depends_on.filter((id) => !resolvedIds.has(id));\n        return { blocked: blockedBy.length > 0, blockedBy };\n    }\n\n    /**\n     * Get stats by status\n     */\n    async getStats(): Promise<{\n        total: number;\n        todo: number;\n        in_progress: number;\n        done: number;\n        cancelled: number;\n        blocked: number;\n    }> {\n        const tasks = await this.readAll();\n        const resolvedIds = new Set(\n            tasks.filter((t) => t.status === 'done' || t.status === 'cancelled').map((t) => t.id)\n        );\n\n        let blocked = 0;\n        for (const t of tasks) {\n            if (\n                t.status === 'todo' &&\n                t.depends_on.length > 0 &&\n                !t.depends_on.every((id) => resolvedIds.has(id))\n            ) {\n                blocked++;\n            }\n        }\n\n        return {\n            total: tasks.length,\n            todo: tasks.filter((t) => t.status === 'todo').length,\n            in_progress: tasks.filter((t) => t.status === 'in_progress').length,\n            done: tasks.filter((t) => t.status === 'done').length,\n            cancelled: tasks.filter((t) => t.status === 'cancelled').length,\n            blocked,\n        };\n    }\n\n    // ============================================\n    // WRITE\n    // ============================================\n\n    /**\n     * Generate next task ID\n     */\n    async nextId(): Promise<string> {\n        const tasks = await this.readAll();\n        if (tasks.length === 0) return 'T-001';\n\n        const maxNum = Math.max(\n            ...tasks.map((t) => parseInt(t.id.replace('T-', ''), 10))\n        );\n        return `T-${String(maxNum + 1).padStart(3, '0')}`;\n    }\n\n    /**\n     * Add a new task\n     */\n    async add(data: {\n        title: string;\n        parent?: string;\n        priority?: number;\n        tags?: string[];\n    }): Promise<Task> {\n        const id = await this.nextId();\n        const now = new Date().toISOString().split('T')[0]!;\n\n        const task = TaskSchema.parse({\n            id,\n            parent: data.parent || '',\n            title: data.title,\n            status: 'todo',\n            assigned_to: '',\n            claimed_at: '',\n            priority: data.priority ?? 2,\n            depends_on: [],\n            created: now,\n            updated: now,\n            tags: data.tags || [],\n            branch: '',\n            notes: '',\n        });\n\n        await this.appendTask(task);\n        return task;\n    }\n\n    /**\n     * Update a task by ID\n     */\n    async update(\n        id: string,\n        changes: Partial<Pick<Task, 'status' | 'assigned_to' | 'claimed_at' | 'notes' | 'branch'>>\n    ): Promise<Task> {\n        const tasks = await this.readAll();\n        const index = tasks.findIndex((t) => t.id === id);\n\n        if (index === -1) {\n            throw new Error(`Task ${id} not found`);\n        }\n\n        const now = new Date().toISOString().split('T')[0]!;\n        const existing = tasks[index]!;\n        tasks[index] = { ...existing, ...changes, updated: now };\n\n        await this.writeAll(tasks);\n        return tasks[index]!;\n    }\n\n    /**\n     * Add dependency: child depends on parent\n     */\n    async addDependency(childId: string, parentId: string): Promise<Task> {\n        const tasks = await this.readAll();\n        const child = tasks.find((t) => t.id === childId);\n        const parent = tasks.find((t) => t.id === parentId);\n\n        if (!child) throw new Error(`Task ${childId} not found`);\n        if (!parent) throw new Error(`Task ${parentId} not found`);\n\n        if (child.depends_on.includes(parentId)) {\n            throw new Error(`${childId} already depends on ${parentId}`);\n        }\n\n        // Circular dependency check\n        if (await this.wouldCreateCycle(childId, parentId)) {\n            throw new Error(`Adding dependency would create a cycle: ${parentId} → ... → ${childId}`);\n        }\n\n        child.depends_on.push(parentId);\n        child.updated = new Date().toISOString().split('T')[0]!;\n\n        await this.writeAll(tasks);\n        return child;\n    }\n\n    /**\n     * Mark task as done\n     */\n    async markDone(id: string): Promise<Task> {\n        return this.update(id, { status: 'done' });\n    }\n\n    /**\n     * Pick next task: claim for current user\n     */\n    async pick(taskId: string): Promise<Task> {\n        const username = this.getCurrentUser();\n        const now = new Date().toISOString();\n\n        return this.update(taskId, {\n            status: 'in_progress',\n            assigned_to: username,\n            claimed_at: now,\n        });\n    }\n\n    // ============================================\n    // GIT SYNC\n    // ============================================\n\n    /**\n     * Get the sync branch name\n     */\n    getSyncBranch(): string {\n        return SYNC_BRANCH;\n    }\n\n    /**\n     * Check if a remote branch exists\n     */\n    private remoteBranchExists(cwd: string, branch: string): boolean {\n        try {\n            const output = execSync(`git ls-remote --heads origin ${branch}`, { cwd, encoding: 'utf-8' }).trim();\n            return output.length > 0;\n        } catch {\n            return false;\n        }\n    }\n\n    /**\n     * Check if a local branch exists\n     */\n    private localBranchExists(cwd: string, branch: string): boolean {\n        try {\n            execSync(`git rev-parse --verify ${branch}`, { cwd, stdio: 'pipe' });\n            return true;\n        } catch {\n            return false;\n        }\n    }\n\n    /**\n     * Stash changes if working tree is dirty, returns true if stash was created\n     */\n    private stashIfDirty(cwd: string): boolean {\n        try {\n            execSync('git diff --quiet && git diff --cached --quiet', { cwd, stdio: 'pipe' });\n            return false; // clean\n        } catch {\n            execSync('git stash push -m \"jai1-task-sync-auto-stash\"', { cwd, stdio: 'pipe' });\n            return true;\n        }\n    }\n\n    /**\n     * Pop stash if it was created by us\n     */\n    private stashPopIfNeeded(cwd: string, didStash: boolean): void {\n        if (!didStash) return;\n        try {\n            execSync('git stash pop', { cwd, stdio: 'pipe' });\n        } catch {\n            // stash pop conflict — leave in stash list, user can resolve\n        }\n    }\n\n    /**\n     * Create the jai1 orphan branch with just the tasks file.\n     * An orphan branch has no shared history with code branches.\n     */\n    private createOrphanBranch(cwd: string, branch: string): void {\n        const currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {\n            cwd, encoding: 'utf-8',\n        }).trim();\n\n        const didStash = this.stashIfDirty(cwd);\n\n        try {\n            // Create orphan branch (no parent commits)\n            execSync(`git checkout --orphan ${branch}`, { cwd, stdio: 'pipe' });\n            // Remove all files from staging\n            execSync('git rm -rf .', { cwd, stdio: 'pipe' });\n            // Add only the tasks file\n            execSync(`git checkout ${currentBranch} -- ${TASKS_FILE}`, { cwd, stdio: 'pipe' });\n            execSync(`git add ${TASKS_FILE}`, { cwd, stdio: 'pipe' });\n            execSync(`git commit -m \"chore(tasks): init task sync branch\"`, { cwd, stdio: 'pipe' });\n            execSync(`git push -u origin ${branch}`, { cwd, stdio: 'pipe' });\n        } finally {\n            execSync(`git checkout ${currentBranch}`, { cwd, stdio: 'pipe' });\n            this.stashPopIfNeeded(cwd, didStash);\n        }\n    }\n\n    /**\n     * Commit and push only the tasks file to the sync branch.\n     * Works from any branch — pushes only the tasks commit to origin/<SYNC_BRANCH>.\n     *\n     * Edge cases handled:\n     * - jai1 branch doesn't exist → creates orphan branch\n     * - On feature branch → cherry-pick onto jai1\n     * - Dirty working tree → stash/unstash automatically\n     */\n    async syncPush(): Promise<void> {\n        const cwd = process.cwd();\n        const branch = SYNC_BRANCH;\n\n        // Stage the tasks file\n        execSync(`git add ${TASKS_FILE}`, { cwd, stdio: 'pipe' });\n\n        try {\n            execSync('git diff --cached --quiet', { cwd, stdio: 'pipe' });\n            // No changes staged — nothing to push\n            return;\n        } catch {\n            // Changes exist, continue\n        }\n\n        // Detect current branch\n        const currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {\n            cwd,\n            encoding: 'utf-8',\n        }).trim();\n\n        // If jai1 branch doesn't exist anywhere, create it as orphan\n        if (!this.remoteBranchExists(cwd, branch) && !this.localBranchExists(cwd, branch)) {\n            // Commit first on current branch so we have the file\n            execSync(`git commit -m \"chore(tasks): sync task status\"`, { cwd, stdio: 'pipe' });\n            this.createOrphanBranch(cwd, branch);\n            return;\n        }\n\n        // Commit on current branch\n        execSync(`git commit -m \"chore(tasks): sync task status\"`, {\n            cwd,\n            stdio: 'pipe',\n        });\n\n        if (currentBranch === branch) {\n            // Already on sync branch → push normally\n            execSync(`git push origin ${branch}`, { cwd, stdio: 'pipe' });\n        } else {\n            // On a different branch → cherry-pick the commit onto sync branch\n            const commitHash = execSync('git rev-parse HEAD', {\n                cwd,\n                encoding: 'utf-8',\n            }).trim();\n\n            const didStash = this.stashIfDirty(cwd);\n\n            try {\n                // Ensure local jai1 branch exists\n                if (this.localBranchExists(cwd, branch)) {\n                    execSync(`git checkout ${branch}`, { cwd, stdio: 'pipe' });\n                    execSync(`git pull origin ${branch}`, { cwd, stdio: 'pipe' });\n                } else {\n                    // Remote exists but no local — track it\n                    execSync(`git checkout -b ${branch} origin/${branch}`, { cwd, stdio: 'pipe' });\n                }\n\n                // Cherry-pick the tasks commit\n                try {\n                    execSync(`git cherry-pick ${commitHash}`, { cwd, stdio: 'pipe' });\n                } catch {\n                    // Cherry-pick conflict — accept theirs for non-tasks files, ours for tasks\n                    execSync(`git checkout ${commitHash} -- ${TASKS_FILE}`, { cwd, stdio: 'pipe' });\n                    execSync('git add .', { cwd, stdio: 'pipe' });\n                    try {\n                        execSync('git cherry-pick --continue', { cwd, stdio: 'pipe' });\n                    } catch {\n                        execSync(`git commit --allow-empty -m \"chore(tasks): sync task status\"`, { cwd, stdio: 'pipe' });\n                    }\n                }\n\n                execSync(`git push origin ${branch}`, { cwd, stdio: 'pipe' });\n            } finally {\n                // Always switch back to original branch\n                execSync(`git checkout ${currentBranch}`, { cwd, stdio: 'pipe' });\n                this.stashPopIfNeeded(cwd, didStash);\n            }\n        }\n    }\n\n    /**\n     * Pull tasks from sync branch and merge by timestamp.\n     *\n     * Edge cases handled:\n     * - jai1 branch doesn't exist on remote → returns empty (no-op)\n     * - tasks.jsonl doesn't exist on remote branch → returns empty\n     */\n    async syncPull(): Promise<{ merged: number; conflicts: number }> {\n        const cwd = process.cwd();\n        const branch = SYNC_BRANCH;\n        let merged = 0;\n        let conflicts = 0;\n\n        // Check if remote branch exists first\n        if (!this.remoteBranchExists(cwd, branch)) {\n            return { merged: 0, conflicts: 0 };\n        }\n\n        try {\n            // Fetch latest from sync branch\n            execSync(`git fetch origin ${branch}`, { cwd, stdio: 'pipe' });\n\n            // Read sync branch's tasks\n            let remoteContent: string;\n            try {\n                remoteContent = execSync(`git show origin/${branch}:${TASKS_FILE}`, {\n                    cwd,\n                    encoding: 'utf-8',\n                });\n            } catch {\n                // File doesn't exist on sync branch\n                return { merged: 0, conflicts: 0 };\n            }\n\n            const remoteTasks = remoteContent\n                .trim()\n                .split('\\n')\n                .filter(Boolean)\n                .map((line: string) => TaskSchema.parse(JSON.parse(line)));\n\n            const localTasks = await this.readAll();\n            const localMap = new Map(localTasks.map((t) => [t.id, t]));\n\n            for (const remoteTask of remoteTasks) {\n                const local = localMap.get(remoteTask.id);\n                if (!local) {\n                    // New task from remote → add\n                    localTasks.push(remoteTask);\n                    merged++;\n                } else if (remoteTask.updated > local.updated) {\n                    // Remote is newer → replace\n                    const idx = localTasks.findIndex((t) => t.id === remoteTask.id);\n                    localTasks[idx] = remoteTask;\n                    merged++;\n                }\n                // If local is newer or same → keep local\n            }\n\n            await this.writeAll(localTasks);\n            return { merged, conflicts };\n        } catch (error) {\n            throw new Error(\n                `Sync pull failed: ${error instanceof Error ? error.message : String(error)}`\n            );\n        }\n    }\n\n    // ============================================\n    // INTERNAL HELPERS\n    // ============================================\n\n    private async appendTask(task: Task): Promise<void> {\n        await this.ensureTasksFileNotDirectory();\n        const dir = dirname(this.tasksPath);\n        await fs.mkdir(dir, { recursive: true });\n\n        const line = JSON.stringify(task) + '\\n';\n        await fs.appendFile(this.tasksPath, line, 'utf-8');\n    }\n\n    private async writeAll(tasks: Task[]): Promise<void> {\n        await this.ensureTasksFileNotDirectory();\n        const dir = dirname(this.tasksPath);\n        await fs.mkdir(dir, { recursive: true });\n\n        const content = tasks.map((t) => JSON.stringify(t)).join('\\n') + '\\n';\n        await fs.writeFile(this.tasksPath, content, 'utf-8');\n    }\n\n    private getCurrentUser(): string {\n        try {\n            return execSync('git config user.name', { encoding: 'utf-8' }).trim();\n        } catch {\n            return 'unknown';\n        }\n    }\n\n    private async wouldCreateCycle(childId: string, newDepId: string): Promise<boolean> {\n        const tasks = await this.readAll();\n        const taskMap = new Map(tasks.map((t) => [t.id, t]));\n\n        // BFS from newDepId's dependencies to see if we reach childId\n        const visited = new Set<string>();\n        const queue = [newDepId];\n\n        while (queue.length > 0) {\n            const current = queue.shift()!;\n            if (current === childId) return true;\n            if (visited.has(current)) continue;\n            visited.add(current);\n\n            const task = taskMap.get(current);\n            if (task) {\n                queue.push(...task.depends_on);\n            }\n        }\n        return false;\n    }\n\n    private async ensureTasksFileNotDirectory(): Promise<void> {\n        try {\n            const stat = await fs.stat(this.tasksPath);\n            if (stat.isDirectory()) {\n                throw new Error(\n                    `Invalid tasks path: expected file at ${TASKS_FILE} but found a directory. ` +\n                    `Please remove the directory and re-run the command.`\n                );\n            }\n        } catch (error: unknown) {\n            if (error && typeof error === 'object' && 'code' in error && (error as { code: string }).code === 'ENOENT') {\n                return;\n            }\n            throw error;\n        }\n    }\n\n    /**\n     * Get tasks file path\n     */\n    getTasksPath(): string {\n        return this.tasksPath;\n    }\n}\n","/**\n * Task Management Types\n * Schema for .jai1/tasks.jsonl\n */\nimport { z } from 'zod';\n\n// ============================================\n// ENUMS\n// ============================================\n\nexport const TaskStatus = {\n    TODO: 'todo',\n    IN_PROGRESS: 'in_progress',\n    DONE: 'done',\n    CANCELLED: 'cancelled',\n} as const;\n\nexport type TaskStatusType = (typeof TaskStatus)[keyof typeof TaskStatus];\n\nexport const TaskPriority = {\n    CRITICAL: 0,\n    HIGH: 1,\n    MEDIUM: 2,\n    LOW: 3,\n} as const;\n\nexport type TaskPriorityType = (typeof TaskPriority)[keyof typeof TaskPriority];\n\n// ============================================\n// ZOD SCHEMAS\n// ============================================\n\nexport const TaskSchema = z.object({\n    id: z.string().regex(/^T-\\d+$/),\n    parent: z.string().default(''),\n    title: z.string().min(1).max(500),\n    status: z.enum(['todo', 'in_progress', 'done', 'cancelled']),\n    assigned_to: z.string().default(''),\n    claimed_at: z.string().default(''),\n    priority: z.number().int().min(0).max(3).default(2),\n    depends_on: z.array(z.string()).default([]),\n    created: z.string(),\n    updated: z.string(),\n    tags: z.array(z.string()).default([]),\n    branch: z.string().default(''),\n    notes: z.string().default(''),\n});\n\nexport type Task = z.infer<typeof TaskSchema>;\n\n// ============================================\n// DISPLAY HELPERS\n// ============================================\n\nexport const STATUS_ICONS: Record<TaskStatusType, string> = {\n    todo: '📋',\n    in_progress: '🔵',\n    done: '✅',\n    cancelled: '⚫',\n};\n\nexport const BLOCKED_ICON = '🔴';\n\nexport const PRIORITY_ICONS: Record<number, string> = {\n    0: '🔥',\n    1: '🔴',\n    2: '🟡',\n    3: '🟢',\n};\n\nexport const PRIORITY_LABELS: Record<number, string> = {\n    0: 'Critical',\n    1: 'High',\n    2: 'Medium',\n    3: 'Low',\n};\n\n// ============================================\n// COMMAND OPTION TYPES\n// ============================================\n\nexport interface TaskListOptions {\n    status?: TaskStatusType;\n    parent?: string;\n    json?: boolean;\n}\n\nexport interface TaskAddOptions {\n    priority?: number;\n    parent?: string;\n    tags?: string;\n    json?: boolean;\n}\n\nexport interface TaskUpdateOptions {\n    status: TaskStatusType;\n    json?: boolean;\n}\n\nexport interface TaskShowOptions {\n    json?: boolean;\n}\n\nexport interface TaskPickOptions {\n    json?: boolean;\n}\n\nexport interface TaskDoneOptions {\n    json?: boolean;\n}\n\nexport interface TaskDepOptions {\n    json?: boolean;\n}\n\nexport interface TaskReadyOptions {\n    parent?: string;\n    json?: boolean;\n}\n\nexport interface TaskSyncOptions {\n    pull?: boolean;\n    push?: boolean;\n}\n\nexport interface TaskSummaryOptions {\n    json?: boolean;\n}\n"],"mappings":"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","names":["chalk","chalk"]}

package/dist/cli.js

@@ -13,7 +13,7 @@ import {
   STATUS_ICONS,
   TaskService,
   createTaskSummaryCommand
-} from "./chunk-3XLJNHC6.js";
+} from "./chunk-NBOT35QM.js";
 
 // src/utils/node-version-check.ts
 import chalk from "chalk";
@@ -149,7 +149,7 @@ import { basename as basename5 } from "path";
 // package.json
 var package_default = {
   name: "@jvittechs/j",
-  version: "1.0.35",
+  version: "1.0.37",
   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: {
@@ -10679,16 +10679,16 @@ async function handleTaskList(options) {
     console.log(chalk21.dim("No tasks found."));
     return;
   }
-  const doneIds = new Set(allTasks.filter((t) => t.status === "done").map((t) => t.id));
+  const resolvedIds = new Set(allTasks.filter((t) => t.status === "done" || t.status === "cancelled").map((t) => t.id));
   const header = options.parent ? `\u{1F4CB} ${options.parent} (${tasks.length} tasks)` : `\u{1F4CB} All tasks (${tasks.length})`;
   console.log(chalk21.bold(header));
   console.log();
   for (const task of tasks) {
-    printTaskLine(task, doneIds);
+    printTaskLine(task, resolvedIds);
   }
 }
-function printTaskLine(task, doneIds) {
-  const isBlocked = task.status === "todo" && task.depends_on.length > 0 && !task.depends_on.every((id) => doneIds.has(id));
+function printTaskLine(task, resolvedIds) {
+  const isBlocked = task.status === "todo" && task.depends_on.length > 0 && !task.depends_on.every((id) => resolvedIds.has(id));
   const statusIcon = isBlocked ? BLOCKED_ICON : STATUS_ICONS[task.status] || "\u{1F4CB}";
   const priorityIcon = PRIORITY_ICONS[task.priority] || "\u{1F7E1}";
   let line = `  ${statusIcon}  ${chalk21.dim(task.id)}  P${task.priority}${priorityIcon}  ${task.title}`;
@@ -10696,7 +10696,7 @@ function printTaskLine(task, doneIds) {
     line += chalk21.cyan(` @${task.assigned_to}`);
   }
   if (isBlocked) {
-    const blockedBy = task.depends_on.filter((id) => !doneIds.has(id));
+    const blockedBy = task.depends_on.filter((id) => !resolvedIds.has(id));
     line += chalk21.red(` (blocked: ${blockedBy.join(", ")})`);
   }
   if (task.parent) {
@@ -10752,6 +10752,16 @@ function createTaskUpdateCommand() {
     }
     const service = new TaskService();
     try {
+      if (options.status === "in_progress") {
+        const existingTask = await service.findById(id);
+        if (existingTask) {
+          const { blocked, blockedBy } = await service.isBlocked(existingTask);
+          if (blocked) {
+            console.log(chalk23.yellow(`\u26A0\uFE0F  Task ${id} is blocked by: ${blockedBy.join(", ")}`));
+            console.log(chalk23.yellow(`   Dependencies ch\u01B0a done. Ti\u1EBFp t\u1EE5c update...`));
+          }
+        }
+      }
       const changes = {};
       if (options.status) changes.status = options.status;
       if (options.notes) changes.notes = options.notes;
@@ -10948,27 +10958,36 @@ function createTaskDepCommand() {
 import { Command as Command55 } from "commander";
 import chalk28 from "chalk";
 function createTaskSyncCommand() {
-  return new Command55("sync").description("Sync tasks with git (commit & push only tasks file)").option("--pull", "Pull and merge tasks from origin/main").option("--push", "Commit and push tasks file").action(async (options) => {
+  return new Command55("sync").description("Sync tasks via git (default: pull \u2192 push)").option("--pull", "Pull only: merge tasks from origin/jai1").option("--push", "Push only: commit and push tasks to origin/jai1").action(async (options) => {
     const service = new TaskService();
-    if (options.pull) {
-      console.log(chalk28.dim("\u23F3 Pulling tasks from origin/main..."));
+    const branch = service.getSyncBranch();
+    const doPull = options.pull || !options.pull && !options.push;
+    const doPush = options.push || !options.pull && !options.push;
+    if (doPull) {
+      console.log(chalk28.dim(`\u23F3 Pulling tasks from origin/${branch}...`));
       try {
         const result = await service.syncPull();
-        console.log(chalk28.green(`\u2705 Sync pull complete: ${result.merged} tasks merged`));
+        if (result.merged > 0) {
+          console.log(chalk28.green(`  \u2193 ${result.merged} tasks merged`));
+        } else {
+          console.log(chalk28.dim(`  \u2193 Already up to date`));
+        }
       } catch (error) {
-        console.error(chalk28.red(`\u274C ${error instanceof Error ? error.message : String(error)}`));
+        console.error(chalk28.red(`\u274C Pull failed: ${error instanceof Error ? error.message : String(error)}`));
         process.exit(1);
       }
-      return;
     }
-    console.log(chalk28.dim("\u23F3 Syncing tasks to git..."));
-    try {
-      await service.syncPush();
-      console.log(chalk28.green("\u2705 Tasks synced to git"));
-    } catch (error) {
-      console.error(chalk28.red(`\u274C ${error instanceof Error ? error.message : String(error)}`));
-      process.exit(1);
+    if (doPush) {
+      console.log(chalk28.dim(`\u23F3 Pushing tasks to origin/${branch}...`));
+      try {
+        await service.syncPush();
+        console.log(chalk28.green(`  \u2191 Tasks pushed to origin/${branch}`));
+      } catch (error) {
+        console.error(chalk28.red(`\u274C Push failed: ${error instanceof Error ? error.message : String(error)}`));
+        process.exit(1);
+      }
     }
+    console.log(chalk28.green("\u2705 Sync complete"));
   });
 }
 
@@ -11101,7 +11120,7 @@ function createTasksCommand() {
   cmd.addCommand(createTaskSummaryCommand());
   cmd.addCommand(createTaskGuideCommand());
   cmd.action(async () => {
-    const { handleTaskSummary } = await import("./summary-3BGB4JQH.js");
+    const { handleTaskSummary } = await import("./summary-KPCAN522.js");
     await handleTaskSummary({ json: false });
   });
   return cmd;
@@ -11473,7 +11492,7 @@ function createKitCreateCommand() {
         selectedIdes = answer;
       }
       if (selectedIdes.length > 0) {
-        await execa2("jai1", ["ide", "sync", "--ide", ...selectedIdes, "--type", "rules", "workflows", "commands"], {
+        await execa2("jai1", ["ide", "sync", "--ides", ...selectedIdes, "--type", "rules", "workflows", "commands"], {
           cwd: targetDir,
           stdio: "inherit"
         });