@bicorne/task-flow 0.2.0 → 0.2.1

package/dist/commands/merge/index.js

@@ -1,322 +1,211 @@
-"use strict";
-/**
- * commands/merge/index.ts
- * Merge completed worktree back to main
- */
-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 s, o, n;
+    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.mergeTask = mergeTask;
-exports.main = main;
-const child_process_1 = require("child_process");
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const readline = __importStar(require("readline"));
-const config_1 = require("../../lib/config");
-const state_1 = require("../../lib/state");
-const validators_1 = require("./validators");
-const merger_1 = require("./merger");
-/**
- * Parse CLI arguments
- */
-function parseArgs(argv) {
-    const args = {};
-    for (let i = 2; i < argv.length; i += 1) {
-        const token = argv[i] || '';
-        if (!token.startsWith('--')) {
-            continue;
-        }
-        const key = token.slice(2);
-        const next = argv[i + 1] || '';
-        if (!next || next.startsWith('--')) {
-            args[key] = true;
-            continue;
-        }
-        args[key] = next;
-        i += 1;
-    }
-    return args;
+    if ((s = e(t)) && s.has(r)) return s.get(r);
+    for(var c in o = {
+        __proto__: null
+    }, n = Object.defineProperty && Object.getOwnPropertyDescriptor, r)if ("default" !== c && Object.prototype.hasOwnProperty.call(r, c)) {
+        var l = n ? Object.getOwnPropertyDescriptor(r, c) : null;
+        l && (l.get || l.set) ? Object.defineProperty(o, c, l) : o[c] = r[c];
+    }
+    return o.default = r, s && s.set(r, o), o;
 }
-/**
- * Extract merge setting from task file
- */
-function extractTaskMergeSetting(file, key) {
+function t(e, r) {
     try {
-        const content = fs.readFileSync(file, 'utf8');
-        const lines = content.split('\n');
-        let inMergeStrategy = false;
-        for (const line of lines) {
-            if (/^mergeStrategy:/.test(line)) {
-                inMergeStrategy = true;
+        let t = u.readFileSync(e, 'utf8').split('\n'), s = !1;
+        for (let e of t){
+            if (/^mergeStrategy:/.test(e)) {
+                s = !0;
                 continue;
             }
-            if (inMergeStrategy) {
-                if (/^[^\s]/.test(line)) {
-                    break;
-                }
-                const match = line.match(new RegExp(`^\\s+${key}:\\s*(.+)$`));
-                if (match) {
-                    return match?.[1]?.trim() || null;
-                }
+            if (s) {
+                if (/^[^\s]/.test(e)) break;
+                let t = e.match(RegExp(`^\\s+${r}:\\s*(.+)$`));
+                if (t) return t?.[1]?.trim() || null;
             }
         }
-    }
-    catch {
-        // ignore
-    }
+    } catch  {}
     return null;
 }
-/**
- * Get merge configuration from task file
- */
-function getMergeConfig(taskPath, options) {
-    const mergeType = extractTaskMergeSetting(taskPath, 'type') || 'squash';
-    let deleteBranch = extractTaskMergeSetting(taskPath, 'deleteBranch') !== 'false';
-    let deleteWorktree = extractTaskMergeSetting(taskPath, 'deleteWorktree') !== 'false';
-    if (options.deleteBranch === true) {
-        deleteBranch = true;
-    }
-    if (options.deleteWorktree === true) {
-        deleteWorktree = true;
-    }
-    return { mergeType, deleteBranch, deleteWorktree };
-}
-/**
- * Print merge summary
- */
-function printMergeSummary(params) {
-    console.log('');
-    console.log('╔════════════════════════════════════════════════════════╗');
-    console.log('║              Task Flow Merge Summary                   ║');
-    console.log('╚════════════════════════════════════════════════════════╝');
-    console.log('');
-    console.log(`Task ID:        ${params.taskId}`);
-    console.log(`Branch:         ${params.branch}`);
-    console.log(`Worktree:       ${params.worktreeName}`);
-    console.log(`Merge Type:     ${params.mergeType}`);
-    console.log(`Delete Branch:  ${params.deleteBranch}`);
-    console.log(`Delete Worktree: ${params.deleteWorktree}`);
-    console.log(`Dry Run:        ${params.dryRun || false}`);
-    console.log('');
-}
-/**
- * Update task state after merge
- */
-function updateTaskStateAfterMerge(config, taskId) {
-    (0, state_1.clearCurrentTask)(config);
-    (0, state_1.addTaskToHistory)({
-        taskId,
-        status: 'completed',
-        completedAt: new Date().toISOString(),
-    }, config);
-    const archiveScript = path.resolve(__dirname, '../../lib/archive.js');
-    (0, child_process_1.spawnSync)(process.execPath, [
-        archiveScript,
-        '--cwd', config.projectRoot,
-        '--task-id', taskId,
-        '--event', 'task_merged',
-        '--status', 'completed',
-        '--phase', 'merge',
-        '--phase-completed', 'review',
-        '--review-conclusion', 'PASS',
-        '--completed-at', new Date().toISOString(),
-    ], { stdio: 'inherit' });
-    const syncScript = path.resolve(__dirname, '../../spec/sync-task-to-openspec.js');
-    (0, child_process_1.spawnSync)(process.execPath, [
-        syncScript,
-        '--cwd', config.projectRoot,
-        '--task-id', taskId,
-    ], { stdio: 'inherit' });
-}
-/**
- * Execute merge operation
- */
-async function executeMerge(config, taskId, branch, worktree, mergeType, deleteBranch, deleteWorktree, dryRun) {
+async function s(e, r, t, s, o, n, c, l) {
+    let a, u;
     console.log('[MERGE] Pulling latest changes...');
     try {
-        const pullResult = (0, child_process_1.spawnSync)('git', ['pull', 'origin', 'main'], { stdio: 'inherit' });
-        if (pullResult.status !== 0) {
-            console.warn('[MERGE] Pull failed, continuing anyway...');
-        }
-    }
-    catch {
+        let e = (0, i.spawnSync)('git', [
+            'pull',
+            'origin',
+            'main'
+        ], {
+            stdio: 'inherit'
+        });
+        0 !== e.status && console.warn('[MERGE] Pull failed, continuing anyway...');
+    } catch  {
         console.warn('[MERGE] Pull failed, continuing anyway...');
     }
-    console.log(`[MERGE] Merging branch: ${branch}`);
-    if (!(0, merger_1.performMerge)(branch, mergeType, dryRun)) {
-        return {
-            success: false,
-            reason: 'merge-failed',
-            message: 'Merge failed',
-        };
-    }
-    (0, merger_1.cleanupWorktreeAndBranch)(config, worktree, branch, deleteWorktree, deleteBranch);
-    updateTaskStateAfterMerge(config, taskId);
-    return {
-        success: true,
-        taskId,
-        branch,
-        worktreeName: worktree.name,
+    return (console.log(`[MERGE] Merging branch: ${t}`), (0, y.performMerge)(t, o, l)) ? ((0, y.cleanupWorktreeAndBranch)(e, s, t, c, n), (0, f.clearCurrentTask)(e), (0, f.addTaskToHistory)({
+        taskId: r,
+        status: 'completed',
+        completedAt: new Date().toISOString()
+    }, e), a = d.resolve(__dirname, '../../lib/archive.js'), (0, i.spawnSync)(process.execPath, [
+        a,
+        '--cwd',
+        e.projectRoot,
+        '--task-id',
+        r,
+        '--event',
+        'task_merged',
+        '--status',
+        'completed',
+        '--phase',
+        'merge',
+        '--phase-completed',
+        'review',
+        '--review-conclusion',
+        'PASS',
+        '--completed-at',
+        new Date().toISOString()
+    ], {
+        stdio: 'inherit'
+    }), u = d.resolve(__dirname, '../../spec/sync-task-to-openspec.js'), (0, i.spawnSync)(process.execPath, [
+        u,
+        '--cwd',
+        e.projectRoot,
+        '--task-id',
+        r
+    ], {
+        stdio: 'inherit'
+    }), {
+        success: !0,
+        taskId: r,
+        branch: t,
+        worktreeName: s.name
+    }) : {
+        success: !1,
+        reason: 'merge-failed',
+        message: 'Merge failed'
     };
 }
-/**
- * Merge task
- */
-function mergeTask(options = {}) {
-    const config = (0, config_1.loadConfig)({ cwd: options.cwd });
-    const state = (0, state_1.loadState)(config);
-    const taskId = options.taskId || state.currentTask;
-    if (!taskId) {
-        return {
-            success: false,
-            reason: 'missing-task-id',
-            message: 'No current task in state.json. Please specify task-id.',
-        };
-    }
-    const taskPath = path.resolve(config.tasksDirAbs, `${taskId}.json`);
-    if (!fs.existsSync(taskPath)) {
-        return {
-            success: false,
-            reason: 'missing-task-file',
-            message: `Task file not found: ${taskPath}`,
-        };
-    }
-    const mergeConfig = getMergeConfig(taskPath, options);
-    const reviewPath = path.resolve(config.reportsDirAbs, `${taskId}-review.md`);
-    const reviewValidation = (0, validators_1.validateReview)(reviewPath, options.skipReviewCheck);
-    if (!reviewValidation.valid) {
-        return {
-            success: false,
-            reason: reviewValidation.reason,
-            message: reviewValidation.message,
-        };
-    }
-    const worktreeValidation = (0, validators_1.validateWorktreeAndBranch)(state, taskId);
-    if (!worktreeValidation.valid) {
-        return {
-            success: false,
-            reason: worktreeValidation.reason,
-            message: worktreeValidation.message,
-        };
-    }
-    const { worktree, branch } = worktreeValidation;
-    printMergeSummary({
-        taskId,
-        branch: branch,
-        worktreeName: worktree.name,
-        mergeType: mergeConfig.mergeType,
-        deleteBranch: mergeConfig.deleteBranch,
-        deleteWorktree: mergeConfig.deleteWorktree,
-        dryRun: options.dryRun,
-    });
-    if (!options.dryRun) {
-        const rl = readline.createInterface({
+function o(e = {}) {
+    var r;
+    let n, c, l, a = (0, p.loadConfig)({
+        cwd: e.cwd
+    }), i = (0, f.loadState)(a), y = e.taskId || i.currentTask;
+    if (!y) return {
+        success: !1,
+        reason: 'missing-task-id',
+        message: 'No current task in state.json. Please specify task-id.'
+    };
+    let k = d.resolve(a.tasksDirAbs, `${y}.json`);
+    if (!u.existsSync(k)) return {
+        success: !1,
+        reason: 'missing-task-file',
+        message: `Task file not found: ${k}`
+    };
+    let h = (n = t(k, 'type') || 'squash', c = 'false' !== t(k, 'deleteBranch'), l = 'false' !== t(k, 'deleteWorktree'), !0 === e.deleteBranch && (c = !0), !0 === e.deleteWorktree && (l = !0), {
+        mergeType: n,
+        deleteBranch: c,
+        deleteWorktree: l
+    }), w = d.resolve(a.reportsDirAbs, `${y}-review.md`), R = (0, m.validateReview)(w, e.skipReviewCheck);
+    if (!R.valid) return {
+        success: !1,
+        reason: R.reason,
+        message: R.message
+    };
+    let _ = (0, m.validateWorktreeAndBranch)(i, y);
+    if (!_.valid) return {
+        success: !1,
+        reason: _.reason,
+        message: _.message
+    };
+    let { worktree: v, branch: E } = _;
+    if (r = {
+        taskId: y,
+        branch: E,
+        worktreeName: v.name,
+        mergeType: h.mergeType,
+        deleteBranch: h.deleteBranch,
+        deleteWorktree: h.deleteWorktree,
+        dryRun: e.dryRun
+    }, console.log(''), console.log('╔════════════════════════════════════════════════════════╗'), console.log('║              Task Flow Merge Summary                   ║'), console.log('╚════════════════════════════════════════════════════════╝'), console.log(''), console.log(`Task ID:        ${r.taskId}`), console.log(`Branch:         ${r.branch}`), console.log(`Worktree:       ${r.worktreeName}`), console.log(`Merge Type:     ${r.mergeType}`), console.log(`Delete Branch:  ${r.deleteBranch}`), console.log(`Delete Worktree: ${r.deleteWorktree}`), console.log(`Dry Run:        ${r.dryRun || !1}`), console.log(''), !e.dryRun) {
+        let r = g.createInterface({
             input: process.stdin,
-            output: process.stdout,
+            output: process.stdout
         });
-        return new Promise((resolve) => {
-            rl.question('Proceed with merge? (y/N) ', (answer) => {
-                rl.close();
-                if (!/^[Yy]$/.test(answer)) {
-                    resolve({
-                        success: false,
-                        reason: 'cancelled',
-                        message: 'Merge cancelled',
-                    });
-                    return;
-                }
-                executeMerge(config, taskId, branch, worktree, mergeConfig.mergeType, mergeConfig.deleteBranch, mergeConfig.deleteWorktree, options.dryRun).then(resolve);
+        return new Promise((t)=>{
+            r.question('Proceed with merge? (y/N) ', (o)=>{
+                (r.close(), /^[Yy]$/.test(o)) ? s(a, y, E, v, h.mergeType, h.deleteBranch, h.deleteWorktree, e.dryRun).then(t) : t({
+                    success: !1,
+                    reason: 'cancelled',
+                    message: 'Merge cancelled'
+                });
             });
         });
     }
     return {
-        success: true,
-        taskId,
-        branch,
-        worktreeName: worktree.name,
-        dryRun: true,
+        success: !0,
+        taskId: y,
+        branch: E,
+        worktreeName: v.name,
+        dryRun: !0
     };
 }
-/**
- * Main entry point
- */
-function main() {
-    const args = parseArgs(process.argv);
-    const positionalArgs = Array.isArray(args._) ? args._ : [];
-    const result = mergeTask({
-        cwd: args.cwd,
-        taskId: positionalArgs[0] || args['task-id'],
-        skipReviewCheck: args['skip-review-check'] === true,
-        deleteBranch: args['no-delete-branch'] !== true,
-        deleteWorktree: args['no-delete-worktree'] !== true,
-        dryRun: args['dry-run'] === true,
-    });
-    if (result instanceof Promise) {
-        result.then((res) => {
-            if (!res.success) {
-                console.error(`[MERGE] ${res.message}`);
-                process.exit(1);
+function n() {
+    let e = function(e) {
+        let r = {};
+        for(let t = 2; t < e.length; t += 1){
+            let s = e[t] || '';
+            if (!s.startsWith('--')) continue;
+            let o = s.slice(2), n = e[t + 1] || '';
+            if (!n || n.startsWith('--')) {
+                r[o] = !0;
+                continue;
             }
-            console.log('');
-            console.log('[MERGE] Merge completed successfully!');
-            console.log(`  Task: ${res.taskId}`);
-            console.log(`  Status: completed`);
-            console.log('');
-            process.exit(0);
-        }).catch((error) => {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            console.error('[MERGE] Error:', errorMessage);
-            process.exit(1);
-        });
-    }
-    else {
-        if (!result.success) {
-            console.error(`[MERGE] ${result.message}`);
-            process.exit(1);
-        }
-        if (result.dryRun) {
-            console.log('[MERGE] Dry run completed. No changes made.');
-        }
-        else {
-            console.log('[MERGE] Merge completed successfully!');
+            r[o] = n, t += 1;
         }
-        process.exit(0);
-    }
-}
-if (require.main === module) {
-    main();
+        return r;
+    }(process.argv), r = Array.isArray(e._) ? e._ : [], t = o({
+        cwd: e.cwd,
+        taskId: r[0] || e['task-id'],
+        skipReviewCheck: !0 === e['skip-review-check'],
+        deleteBranch: !0 !== e['no-delete-branch'],
+        deleteWorktree: !0 !== e['no-delete-worktree'],
+        dryRun: !0 === e['dry-run']
+    });
+    t instanceof Promise ? t.then((e)=>{
+        e.success || (console.error(`[MERGE] ${e.message}`), process.exit(1)), console.log(''), console.log('[MERGE] Merge completed successfully!'), console.log(`  Task: ${e.taskId}`), console.log("  Status: completed"), console.log(''), process.exit(0);
+    }).catch((e)=>{
+        console.error('[MERGE] Error:', e instanceof Error ? e.message : 'Unknown error'), process.exit(1);
+    }) : (t.success || (console.error(`[MERGE] ${t.message}`), process.exit(1)), t.dryRun ? console.log('[MERGE] Dry run completed. No changes made.') : console.log('[MERGE] Merge completed successfully!'), process.exit(0));
 }
-exports.default = {
-    mergeTask,
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+var c = exports, l = {
+    get default () {
+        return k;
+    },
+    get main () {
+        return n;
+    },
+    get mergeTask () {
+        return o;
+    }
+};
+for(var a in l)Object.defineProperty(c, a, {
+    enumerable: !0,
+    get: Object.getOwnPropertyDescriptor(l, a).get
+});
+let i = require("child_process"), u = /*#__PURE__*/ r(require("fs")), d = /*#__PURE__*/ r(require("path")), g = /*#__PURE__*/ r(require("readline")), p = require("../../lib/config"), f = require("../../lib/state"), m = require("./validators"), y = require("./merger");
+require.main === module && n();
+let k = {
+    mergeTask: o
 };