@bicorne/task-flow 0.1.0 → 0.2.1

package/dist/commands/merge/merger.js

@@ -1,151 +1,129 @@
-"use strict";
-/**
- * commands/merge/merger.ts
- * Merge execution utilities
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
+function e(r) {
+    return "function" != typeof WeakMap ? null : (e = function(e) {
+        return new WeakMap();
+    })(r);
+}
+function r(r, t) {
+    var o, n, s;
+    if (!t && r && r.__esModule) return r;
+    if (null === r || "object" != typeof r && "function" != typeof r) return {
+        default: r
     };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMergeConflict = handleMergeConflict;
-exports.performMerge = performMerge;
-exports.cleanupWorktreeAndBranch = cleanupWorktreeAndBranch;
-const child_process_1 = require("child_process");
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-/**
- * Handle merge conflicts
- */
-function handleMergeConflict() {
-    try {
-        const conflicted = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', { encoding: 'utf8' });
-        if (conflicted.trim()) {
-            console.error('[MERGE] Merge conflicts detected:');
-            console.error(conflicted);
-            (0, child_process_1.execSync)('git merge --abort 2>/dev/null || git reset --merge 2>/dev/null || true');
-            return true;
-        }
+    if ((o = e(t)) && o.has(r)) return o.get(r);
+    for(var i in n = {
+        __proto__: null
+    }, s = Object.defineProperty && Object.getOwnPropertyDescriptor, r)if ("default" !== i && Object.prototype.hasOwnProperty.call(r, i)) {
+        var c = s ? Object.getOwnPropertyDescriptor(r, i) : null;
+        c && (c.get || c.set) ? Object.defineProperty(n, i, c) : n[i] = r[i];
     }
-    catch {
-        // no conflicts
-    }
-    return false;
+    return n.default = r, o && o.set(r, n), n;
 }
-/**
- * Perform the actual merge
- */
-function performMerge(branch, mergeType, dryRun) {
-    if (dryRun) {
-        console.log(`[DRY-RUN] Would merge ${branch} using ${mergeType}`);
-        return true;
-    }
+function t() {
     try {
-        if (mergeType === 'squash') {
-            const squashResult = (0, child_process_1.spawnSync)('git', ['merge', '--squash', branch], { stdio: 'inherit' });
-            if (squashResult.status !== 0) {
-                console.error('[MERGE] Squash merge failed');
-                return false;
-            }
-            if (handleMergeConflict()) {
-                return false;
-            }
+        let e = (0, a.execSync)('git diff --name-only --diff-filter=U', {
+            encoding: 'utf8'
+        });
+        if (e.trim()) return console.error('[MERGE] Merge conflicts detected:'), console.error(e), (0, a.execSync)('git merge --abort 2>/dev/null || git reset --merge 2>/dev/null || true'), !0;
+    } catch  {}
+    return !1;
+}
+function o(e, r, o) {
+    if (o) return console.log(`[DRY-RUN] Would merge ${e} using ${r}`), !0;
+    try {
+        if ('squash' === r) {
+            let r = (0, a.spawnSync)('git', [
+                'merge',
+                '--squash',
+                e
+            ], {
+                stdio: 'inherit'
+            });
+            if (0 !== r.status) return console.error('[MERGE] Squash merge failed'), !1;
+            if (t()) return !1;
             try {
-                const commitResult = (0, child_process_1.spawnSync)('git', ['commit', '-m', `feat: merged from harness worktree ${branch}`], { stdio: 'inherit' });
-                if (commitResult.status !== 0) {
-                    console.warn('[MERGE] No changes to commit');
-                }
-            }
-            catch {
+                let r = (0, a.spawnSync)('git', [
+                    'commit',
+                    '-m',
+                    `feat: merged from harness worktree ${e}`
+                ], {
+                    stdio: 'inherit'
+                });
+                0 !== r.status && console.warn('[MERGE] No changes to commit');
+            } catch  {
                 console.warn('[MERGE] No changes to commit');
             }
-        }
-        else if (mergeType === 'merge') {
-            const mergeResult = (0, child_process_1.spawnSync)('git', ['merge', '--no-ff', branch, '-m', `feat: merged from harness worktree ${branch}`], { stdio: 'inherit' });
-            if (mergeResult.status !== 0) {
-                console.error('[MERGE] Merge failed');
-                return false;
-            }
-            if (handleMergeConflict()) {
-                return false;
-            }
-        }
-        else if (mergeType === 'rebase') {
-            console.error('[MERGE] Rebase strategy requires worktree rebase - use manual merge for now');
-            return false;
-        }
-        else {
-            console.error(`[MERGE] Unsupported merge strategy: ${mergeType}`);
-            return false;
-        }
-        return true;
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-        console.error('[MERGE] Merge failed:', errorMessage);
-        return false;
+        } else if ('merge' === r) {
+            let r = (0, a.spawnSync)('git', [
+                'merge',
+                '--no-ff',
+                e,
+                '-m',
+                `feat: merged from harness worktree ${e}`
+            ], {
+                stdio: 'inherit'
+            });
+            if (0 !== r.status) return console.error('[MERGE] Merge failed'), !1;
+            if (t()) return !1;
+        } else if ('rebase' === r) return console.error('[MERGE] Rebase strategy requires worktree rebase - use manual merge for now'), !1;
+        else return console.error(`[MERGE] Unsupported merge strategy: ${r}`), !1;
+        return !0;
+    } catch (e) {
+        return console.error('[MERGE] Merge failed:', e instanceof Error ? e.message : 'Unknown error'), !1;
     }
 }
-/**
- * Cleanup worktree and branch
- */
-function cleanupWorktreeAndBranch(config, worktree, branch, deleteWorktree, deleteBranch) {
-    if (deleteWorktree && worktree.path) {
-        const worktreePath = path.resolve(config.projectRoot, worktree.path);
-        if (fs.existsSync(worktreePath)) {
-            console.log(`[MERGE] Removing worktree: ${worktree.name}`);
+function n(e, r, t, o, n) {
+    if (o && r.path) {
+        let t = u.resolve(e.projectRoot, r.path);
+        if (l.existsSync(t)) {
+            console.log(`[MERGE] Removing worktree: ${r.name}`);
             try {
-                const result = (0, child_process_1.spawnSync)('git', ['worktree', 'remove', worktreePath, '--force'], { stdio: 'inherit' });
-                if (result.status !== 0) {
-                    console.warn('[MERGE] Failed to remove worktree');
-                }
-            }
-            catch (error) {
-                const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-                console.warn('[MERGE] Failed to remove worktree:', errorMessage);
+                let e = (0, a.spawnSync)('git', [
+                    'worktree',
+                    'remove',
+                    t,
+                    '--force'
+                ], {
+                    stdio: 'inherit'
+                });
+                0 !== e.status && console.warn('[MERGE] Failed to remove worktree');
+            } catch (e) {
+                console.warn('[MERGE] Failed to remove worktree:', e instanceof Error ? e.message : 'Unknown error');
             }
         }
     }
-    if (deleteBranch) {
-        console.log(`[MERGE] Deleting branch: ${branch}`);
+    if (n) {
+        console.log(`[MERGE] Deleting branch: ${t}`);
         try {
-            const result = (0, child_process_1.spawnSync)('git', ['branch', '-D', branch], { stdio: 'inherit' });
-            if (result.status !== 0) {
-                console.warn('[MERGE] Failed to delete branch');
-            }
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            console.warn('[MERGE] Failed to delete branch:', errorMessage);
+            let e = (0, a.spawnSync)('git', [
+                'branch',
+                '-D',
+                t
+            ], {
+                stdio: 'inherit'
+            });
+            0 !== e.status && console.warn('[MERGE] Failed to delete branch');
+        } catch (e) {
+            console.warn('[MERGE] Failed to delete branch:', e instanceof Error ? e.message : 'Unknown error');
         }
     }
 }
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+var s = exports, i = {
+    get cleanupWorktreeAndBranch () {
+        return n;
+    },
+    get handleMergeConflict () {
+        return t;
+    },
+    get performMerge () {
+        return o;
+    }
+};
+for(var c in i)Object.defineProperty(s, c, {
+    enumerable: !0,
+    get: Object.getOwnPropertyDescriptor(i, c).get
+});
+let a = require("child_process"), l = /*#__PURE__*/ r(require("fs")), u = /*#__PURE__*/ r(require("path"));

package/dist/commands/merge/types.js

@@ -1,6 +1,4 @@
 "use strict";
-/**
- * commands/merge/types.ts
- * Type definitions for merge command
- */
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});

package/dist/commands/merge/validators.js

@@ -1,147 +1,130 @@
-"use strict";
-/**
- * commands/merge/validators.ts
- * Validation utilities for merge command
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
+function e(r) {
+    return "function" != typeof WeakMap ? null : (e = function(e) {
+        return new WeakMap();
+    })(r);
+}
+function r(e, r) {
+    if (r) return {
+        valid: !0
     };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
+    if (!o.existsSync(e)) return {
+        valid: !1,
+        reason: 'missing-review',
+        message: `Review report not found: ${e}. Use --skip-review-check to override.`
     };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateReview = validateReview;
-exports.validateWorktreeAndBranch = validateWorktreeAndBranch;
-const fs = __importStar(require("fs"));
-const child_process_1 = require("child_process");
-/**
- * Parse review conclusion from file content
- */
-function parseReviewConclusion(file) {
-    try {
-        const content = fs.readFileSync(file, 'utf8');
-        const patterns = [
-            /^\s*(?:结论|Conclusion)\s*:\s*(PASS|NEEDS_WORK|FAIL)\s*$/m,
-            /^##\s*结论\s*:\s*(PASS|NEEDS_WORK|FAIL)\s*$/m,
-            /\*\*(PASS|NEEDS_WORK|FAIL)\*\*/,
-        ];
-        for (const pattern of patterns) {
-            const match = content.match(pattern);
-            if (match) {
-                return match[1] || match[0];
+    let t = function(e) {
+        try {
+            let r = o.readFileSync(e, 'utf8');
+            for (let e of [
+                /^\s*(?:结论|Conclusion)\s*:\s*(PASS|NEEDS_WORK|FAIL)\s*$/m,
+                /^##\s*结论\s*:\s*(PASS|NEEDS_WORK|FAIL)\s*$/m,
+                /\*\*(PASS|NEEDS_WORK|FAIL)\*\*/
+            ]){
+                let t = r.match(e);
+                if (t) return t[1] || t[0];
             }
-        }
-    }
-    catch {
-        // ignore
-    }
-    return null;
-}
-/**
- * Validate review report
- */
-function validateReview(reviewPath, skipReviewCheck) {
-    if (skipReviewCheck) {
-        return { valid: true };
-    }
-    if (!fs.existsSync(reviewPath)) {
-        return {
-            valid: false,
-            reason: 'missing-review',
-            message: `Review report not found: ${reviewPath}. Use --skip-review-check to override.`,
-        };
-    }
-    const conclusion = parseReviewConclusion(reviewPath);
-    if (conclusion !== 'PASS') {
-        return {
-            valid: false,
-            reason: 'review-not-passed',
-            message: `Review conclusion is ${conclusion}, not PASS. Use --skip-review-check to override.`,
-            conclusion,
-        };
-    }
-    return { valid: true, conclusion };
+        } catch  {}
+        return null;
+    }(e);
+    return 'PASS' !== t ? {
+        valid: !1,
+        reason: 'review-not-passed',
+        message: `Review conclusion is ${t}, not PASS. Use --skip-review-check to override.`,
+        conclusion: t
+    } : {
+        valid: !0,
+        conclusion: t
+    };
 }
-/**
- * Validate worktree and branch
- */
-function validateWorktreeAndBranch(state, taskId) {
-    const worktree = (state.worktrees || []).find((wt) => wt?.task === taskId);
-    if (!worktree) {
-        return {
-            valid: false,
-            reason: 'missing-worktree',
-            message: 'Worktree info not found in state.json',
-        };
-    }
-    const branch = worktree.branch;
-    if (!branch) {
-        return {
-            valid: false,
-            reason: 'missing-branch-info',
-            message: 'Branch info not found in worktree state',
-        };
-    }
+function t(e, r) {
+    let t = (e.worktrees || []).find((e)=>e?.task === r);
+    if (!t) return {
+        valid: !1,
+        reason: 'missing-worktree',
+        message: 'Worktree info not found in state.json'
+    };
+    let n = t.branch;
+    if (!n) return {
+        valid: !1,
+        reason: 'missing-branch-info',
+        message: 'Branch info not found in worktree state'
+    };
     try {
-        const showRefResult = (0, child_process_1.spawnSync)('git', ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`], { stdio: 'ignore' });
-        if (showRefResult.status !== 0) {
-            return {
-                valid: false,
-                reason: 'missing-branch',
-                message: `Branch does not exist: ${branch}`,
-            };
-        }
-    }
-    catch {
+        let e = (0, a.spawnSync)('git', [
+            'show-ref',
+            '--verify',
+            '--quiet',
+            `refs/heads/${n}`
+        ], {
+            stdio: 'ignore'
+        });
+        if (0 !== e.status) return {
+            valid: !1,
+            reason: 'missing-branch',
+            message: `Branch does not exist: ${n}`
+        };
+    } catch  {
         return {
-            valid: false,
+            valid: !1,
             reason: 'missing-branch',
-            message: `Branch does not exist: ${branch}`,
+            message: `Branch does not exist: ${n}`
         };
     }
     try {
-        const diffResult = (0, child_process_1.spawnSync)('git', ['diff-index', '--quiet', 'HEAD', '--'], { stdio: 'ignore' });
-        if (diffResult.status !== 0) {
-            return {
-                valid: false,
-                reason: 'dirty-worktree',
-                message: 'Main worktree has uncommitted changes',
-            };
-        }
-    }
-    catch {
+        let e = (0, a.spawnSync)('git', [
+            'diff-index',
+            '--quiet',
+            'HEAD',
+            '--'
+        ], {
+            stdio: 'ignore'
+        });
+        if (0 !== e.status) return {
+            valid: !1,
+            reason: 'dirty-worktree',
+            message: 'Main worktree has uncommitted changes'
+        };
+    } catch  {
         return {
-            valid: false,
+            valid: !1,
             reason: 'dirty-worktree',
-            message: 'Main worktree has uncommitted changes',
+            message: 'Main worktree has uncommitted changes'
         };
     }
-    return { valid: true, worktree, branch };
+    return {
+        valid: !0,
+        worktree: t,
+        branch: n
+    };
 }
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+var n = exports, i = {
+    get validateReview () {
+        return r;
+    },
+    get validateWorktreeAndBranch () {
+        return t;
+    }
+};
+for(var s in i)Object.defineProperty(n, s, {
+    enumerable: !0,
+    get: Object.getOwnPropertyDescriptor(i, s).get
+});
+let o = /*#__PURE__*/ function(r) {
+    var t, n, i;
+    if (r && r.__esModule) return r;
+    if (null === r || "object" != typeof r && "function" != typeof r) return {
+        default: r
+    };
+    if ((t = e(void 0)) && t.has(r)) return t.get(r);
+    for(var s in n = {
+        __proto__: null
+    }, i = Object.defineProperty && Object.getOwnPropertyDescriptor, r)if ("default" !== s && Object.prototype.hasOwnProperty.call(r, s)) {
+        var o = i ? Object.getOwnPropertyDescriptor(r, s) : null;
+        o && (o.get || o.set) ? Object.defineProperty(n, s, o) : n[s] = r[s];
+    }
+    return n.default = r, t && t.set(r, n), n;
+}(require("fs")), a = require("child_process");

package/dist/commands/merge.js

@@ -1,15 +1,48 @@
+function e(r) {
+    return "function" != typeof WeakMap ? null : (e = function(e) {
+        return new WeakMap();
+    })(r);
+}
 "use strict";
-/**
- * commands/merge.ts
- * Backward-compatible re-export from merge/ module
- * @deprecated Import from './merge/index' directly
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+var r = exports, t = {
+    get MergeConfig () {
+        return u.MergeConfig;
+    },
+    get MergeOptions () {
+        return u.MergeOptions;
+    },
+    get MergeResult () {
+        return u.MergeResult;
+    },
+    get default () {
+        return o.default;
+    },
+    get main () {
+        return o.main;
+    },
+    get mergeTask () {
+        return o.mergeTask;
+    }
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = exports.main = exports.mergeTask = void 0;
-var index_1 = require("./merge/index");
-Object.defineProperty(exports, "mergeTask", { enumerable: true, get: function () { return index_1.mergeTask; } });
-Object.defineProperty(exports, "main", { enumerable: true, get: function () { return index_1.main; } });
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(index_1).default; } });
+for(var n in t)Object.defineProperty(r, n, {
+    enumerable: !0,
+    get: Object.getOwnPropertyDescriptor(t, n).get
+});
+let o = /*#__PURE__*/ function(r) {
+    var t, n, o;
+    if (r && r.__esModule) return r;
+    if (null === r || "object" != typeof r && "function" != typeof r) return {
+        default: r
+    };
+    if ((t = e(void 0)) && t.has(r)) return t.get(r);
+    for(var u in n = {
+        __proto__: null
+    }, o = Object.defineProperty && Object.getOwnPropertyDescriptor, r)if ("default" !== u && Object.prototype.hasOwnProperty.call(r, u)) {
+        var i = o ? Object.getOwnPropertyDescriptor(r, u) : null;
+        i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = r[u];
+    }
+    return n.default = r, t && t.set(r, n), n;
+}(require("./merge/index")), u = require("./merge/types");