takt 0.1.7 → 0.2.1

package/dist/commands/reviewTasks.js

@@ -0,0 +1,198 @@
+/**
+ * Review tasks command
+ *
+ * Interactive UI for reviewing worktree-based task results:
+ * try merge, merge & cleanup, or delete actions.
+ */
+import { execFileSync } from 'node:child_process';
+import chalk from 'chalk';
+import { removeWorktree, detectDefaultBranch, listTaktWorktrees, buildReviewItems, } from '../task/worktree.js';
+import { selectOption, confirm } from '../prompt/index.js';
+import { info, success, error as logError, warn } from '../utils/ui.js';
+import { createLogger } from '../utils/debug.js';
+const log = createLogger('review-tasks');
+/**
+ * Check if a branch has already been merged into HEAD.
+ */
+export function isBranchMerged(projectDir, branch) {
+    try {
+        execFileSync('git', ['merge-base', '--is-ancestor', branch, 'HEAD'], {
+            cwd: projectDir,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Show diff stat for a branch and prompt for an action.
+ */
+async function showDiffAndPromptAction(cwd, defaultBranch, item) {
+    console.log();
+    console.log(chalk.bold.cyan(`=== ${item.info.branch} ===`));
+    console.log();
+    // Show diff stat
+    try {
+        const stat = execFileSync('git', ['diff', '--stat', `${defaultBranch}...${item.info.branch}`], { cwd, encoding: 'utf-8', stdio: 'pipe' });
+        console.log(stat);
+    }
+    catch {
+        warn('Could not generate diff stat');
+    }
+    // Prompt action
+    const action = await selectOption(`Action for ${item.info.branch}:`, [
+        { label: 'Try merge', value: 'try', description: 'Merge without cleanup (keep worktree & branch)' },
+        { label: 'Merge & cleanup', value: 'merge', description: 'Merge (if needed) and remove worktree & branch' },
+        { label: 'Delete', value: 'delete', description: 'Discard changes, remove worktree and branch' },
+    ]);
+    return action;
+}
+/**
+ * Try-merge: merge the branch without cleanup.
+ * Keeps the worktree and branch intact for further review.
+ */
+export function tryMergeWorktreeBranch(projectDir, item) {
+    const { branch } = item.info;
+    try {
+        execFileSync('git', ['merge', branch], {
+            cwd: projectDir,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        success(`Merged ${branch} (worktree kept)`);
+        log.info('Try-merge completed', { branch });
+        return true;
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logError(`Merge failed: ${msg}`);
+        logError('You may need to resolve conflicts manually.');
+        log.error('Try-merge failed', { branch, error: msg });
+        return false;
+    }
+}
+/**
+ * Merge & cleanup: if already merged, skip merge and just cleanup.
+ * Otherwise merge first, then cleanup (remove worktree + delete branch).
+ */
+export function mergeWorktreeBranch(projectDir, item) {
+    const { branch } = item.info;
+    const alreadyMerged = isBranchMerged(projectDir, branch);
+    try {
+        // 1. Remove worktree (must happen before merge to unlock branch)
+        removeWorktree(projectDir, item.info.path);
+        // 2. Merge only if not already merged
+        if (alreadyMerged) {
+            info(`${branch} is already merged, skipping merge.`);
+            log.info('Branch already merged, cleanup only', { branch });
+        }
+        else {
+            execFileSync('git', ['merge', branch], {
+                cwd: projectDir,
+                encoding: 'utf-8',
+                stdio: 'pipe',
+            });
+        }
+        // 3. Delete the branch
+        try {
+            execFileSync('git', ['branch', '-d', branch], {
+                cwd: projectDir,
+                encoding: 'utf-8',
+                stdio: 'pipe',
+            });
+        }
+        catch {
+            warn(`Could not delete branch ${branch}. You may delete it manually.`);
+        }
+        success(`Merged & cleaned up ${branch}`);
+        log.info('Worktree merged & cleaned up', { branch, alreadyMerged });
+        return true;
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logError(`Merge failed: ${msg}`);
+        logError('You may need to resolve conflicts manually.');
+        log.error('Merge & cleanup failed', { branch, error: msg });
+        return false;
+    }
+}
+/**
+ * Delete a worktree and its branch (discard changes).
+ */
+export function deleteWorktreeBranch(projectDir, item) {
+    const { branch } = item.info;
+    try {
+        // 1. Remove worktree
+        removeWorktree(projectDir, item.info.path);
+        // 2. Force-delete the branch
+        execFileSync('git', ['branch', '-D', branch], {
+            cwd: projectDir,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        success(`Deleted ${branch}`);
+        log.info('Worktree deleted', { branch });
+        return true;
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logError(`Delete failed: ${msg}`);
+        log.error('Delete failed', { branch, error: msg });
+        return false;
+    }
+}
+/**
+ * Main entry point: review worktree tasks interactively.
+ */
+export async function reviewTasks(cwd) {
+    log.info('Starting review-tasks');
+    const defaultBranch = detectDefaultBranch(cwd);
+    let worktrees = listTaktWorktrees(cwd);
+    if (worktrees.length === 0) {
+        info('No tasks to review.');
+        return;
+    }
+    // Interactive loop
+    while (worktrees.length > 0) {
+        const items = buildReviewItems(cwd, worktrees, defaultBranch);
+        // Build selection options
+        const options = items.map((item, idx) => ({
+            label: item.info.branch,
+            value: String(idx),
+            description: `${item.filesChanged} file${item.filesChanged !== 1 ? 's' : ''} changed`,
+        }));
+        const selected = await selectOption('Review Tasks (Worktrees)', options);
+        if (selected === null) {
+            return;
+        }
+        const selectedIdx = parseInt(selected, 10);
+        const item = items[selectedIdx];
+        if (!item)
+            continue;
+        const action = await showDiffAndPromptAction(cwd, defaultBranch, item);
+        if (action === null)
+            continue;
+        switch (action) {
+            case 'try':
+                tryMergeWorktreeBranch(cwd, item);
+                break;
+            case 'merge':
+                mergeWorktreeBranch(cwd, item);
+                break;
+            case 'delete': {
+                const confirmed = await confirm(`Delete ${item.info.branch}? This will discard all changes.`, false);
+                if (confirmed) {
+                    deleteWorktreeBranch(cwd, item);
+                }
+                break;
+            }
+        }
+        // Refresh worktree list after action
+        worktrees = listTaktWorktrees(cwd);
+    }
+    info('All tasks reviewed.');
+}
+//# sourceMappingURL=reviewTasks.js.map

package/dist/commands/reviewTasks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reviewTasks.js","sourceRoot":"","sources":["../../src/commands/reviewTasks.ts"],"names":[],"mappings":"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"}

package/dist/commands/taskExecution.d.ts

@@ -1,10 +1,24 @@
 /**
  * Task execution logic
  */
+import { TaskRunner, type TaskInfo } from '../task/index.js';
 /**
  * Execute a single task with workflow
+ * @param task - Task content
+ * @param cwd - Working directory (may be a worktree path)
+ * @param workflowName - Workflow to use
+ * @param projectCwd - Project root (where .takt/ lives). Defaults to cwd.
  */
-export declare function executeTask(task: string, cwd: string, workflowName?: string): Promise<boolean>;
+export declare function executeTask(task: string, cwd: string, workflowName?: string, projectCwd?: string): Promise<boolean>;
+/**
+ * Execute a task: resolve worktree → run workflow → auto-commit → record completion.
+ *
+ * Shared by runAllTasks() and watchTasks() to avoid duplicated
+ * resolve → execute → autoCommit → complete logic.
+ *
+ * @returns true if the task succeeded
+ */
+export declare function executeAndCompleteTask(task: TaskInfo, taskRunner: TaskRunner, cwd: string, workflowName: string): Promise<boolean>;
 /**
  * Run all pending tasks from .takt/tasks/
  *
@@ -12,4 +26,13 @@ export declare function executeTask(task: string, cwd: string, workflowName?: st
  * 実行中にタスクファイルが追加・削除されても反映される。
  */
 export declare function runAllTasks(cwd: string, workflowName?: string): Promise<void>;
+/**
+ * Resolve execution directory and workflow from task data.
+ * If the task has worktree settings, create a worktree and use it as cwd.
+ */
+export declare function resolveTaskExecution(task: TaskInfo, defaultCwd: string, defaultWorkflow: string): {
+    execCwd: string;
+    execWorkflow: string;
+    isWorktree: boolean;
+};
 //# sourceMappingURL=taskExecution.d.ts.map

package/dist/commands/taskExecution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskExecution.d.ts","sourceRoot":"","sources":["../../src/commands/taskExecution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAkBH;;GAEG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,OAAO,CAAC,CAiBlB;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,IAAI,CAAC,CAyEf"}
+{"version":3,"file":"taskExecution.d.ts","sourceRoot":"","sources":["../../src/commands/taskExecution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAiB7D;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,YAAY,GAAE,MAA8B,EAC5C,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAqBlB;AAED;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC,CAmDlB;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,GACtB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CA2BhE"}

package/dist/commands/taskExecution.js

@@ -1,8 +1,10 @@
 /**
  * Task execution logic
  */
-import { loadWorkflow } from '../config/index.js';
+import { loadWorkflow, loadGlobalConfig } from '../config/index.js';
 import { TaskRunner } from '../task/index.js';
+import { createWorktree } from '../task/worktree.js';
+import { autoCommitWorktree } from '../task/autoCommit.js';
 import { header, info, error, success, status, } from '../utils/ui.js';
 import { createLogger } from '../utils/debug.js';
 import { getErrorMessage } from '../utils/error.js';
@@ -11,8 +13,12 @@ import { DEFAULT_WORKFLOW_NAME } from '../constants.js';
 const log = createLogger('task');
 /**
  * Execute a single task with workflow
+ * @param task - Task content
+ * @param cwd - Working directory (may be a worktree path)
+ * @param workflowName - Workflow to use
+ * @param projectCwd - Project root (where .takt/ lives). Defaults to cwd.
  */
-export async function executeTask(task, cwd, workflowName = DEFAULT_WORKFLOW_NAME) {
+export async function executeTask(task, cwd, workflowName = DEFAULT_WORKFLOW_NAME, projectCwd) {
     const workflowConfig = loadWorkflow(workflowName);
     if (!workflowConfig) {
         error(`Workflow "${workflowName}" not found.`);
@@ -24,9 +30,68 @@ export async function executeTask(task, cwd, workflowName = DEFAULT_WORKFLOW_NAM
         name: workflowConfig.name,
         steps: workflowConfig.steps.map(s => s.name),
     });
-    const result = await executeWorkflow(workflowConfig, task, cwd);
+    const globalConfig = loadGlobalConfig();
+    const result = await executeWorkflow(workflowConfig, task, cwd, {
+        projectCwd,
+        language: globalConfig.language,
+    });
     return result.success;
 }
+/**
+ * Execute a task: resolve worktree → run workflow → auto-commit → record completion.
+ *
+ * Shared by runAllTasks() and watchTasks() to avoid duplicated
+ * resolve → execute → autoCommit → complete logic.
+ *
+ * @returns true if the task succeeded
+ */
+export async function executeAndCompleteTask(task, taskRunner, cwd, workflowName) {
+    const startedAt = new Date().toISOString();
+    const executionLog = [];
+    try {
+        const { execCwd, execWorkflow, isWorktree } = resolveTaskExecution(task, cwd, workflowName);
+        // cwd is always the project root; pass it as projectCwd so reports/sessions go there
+        const taskSuccess = await executeTask(task.content, execCwd, execWorkflow, cwd);
+        const completedAt = new Date().toISOString();
+        if (taskSuccess && isWorktree) {
+            const commitResult = autoCommitWorktree(execCwd, task.name);
+            if (commitResult.success && commitResult.commitHash) {
+                info(`Auto-committed: ${commitResult.commitHash}`);
+            }
+            else if (!commitResult.success) {
+                error(`Auto-commit failed: ${commitResult.message}`);
+            }
+        }
+        taskRunner.completeTask({
+            task,
+            success: taskSuccess,
+            response: taskSuccess ? 'Task completed successfully' : 'Task failed',
+            executionLog,
+            startedAt,
+            completedAt,
+        });
+        if (taskSuccess) {
+            success(`Task "${task.name}" completed`);
+        }
+        else {
+            error(`Task "${task.name}" failed`);
+        }
+        return taskSuccess;
+    }
+    catch (err) {
+        const completedAt = new Date().toISOString();
+        taskRunner.completeTask({
+            task,
+            success: false,
+            response: getErrorMessage(err),
+            executionLog,
+            startedAt,
+            completedAt,
+        });
+        error(`Task "${task.name}" error: ${getErrorMessage(err)}`);
+        return false;
+    }
+}
 /**
  * Run all pending tasks from .takt/tasks/
  *
@@ -39,7 +104,7 @@ export async function runAllTasks(cwd, workflowName = DEFAULT_WORKFLOW_NAME) {
     let task = taskRunner.getNextTask();
     if (!task) {
         info('No pending tasks in .takt/tasks/');
-        info('Create task files as .takt/tasks/*.md');
+        info('Create task files as .takt/tasks/*.yaml or use takt /add-task');
         return;
     }
     header('Running tasks');
@@ -49,40 +114,12 @@ export async function runAllTasks(cwd, workflowName = DEFAULT_WORKFLOW_NAME) {
         console.log();
         info(`=== Task: ${task.name} ===`);
         console.log();
-        const startedAt = new Date().toISOString();
-        const executionLog = [];
-        try {
-            const taskSuccess = await executeTask(task.content, cwd, workflowName);
-            const completedAt = new Date().toISOString();
-            taskRunner.completeTask({
-                task,
-                success: taskSuccess,
-                response: taskSuccess ? 'Task completed successfully' : 'Task failed',
-                executionLog,
-                startedAt,
-                completedAt,
-            });
-            if (taskSuccess) {
-                successCount++;
-                success(`Task "${task.name}" completed`);
-            }
-            else {
-                failCount++;
-                error(`Task "${task.name}" failed`);
-            }
+        const taskSuccess = await executeAndCompleteTask(task, taskRunner, cwd, workflowName);
+        if (taskSuccess) {
+            successCount++;
         }
-        catch (err) {
+        else {
             failCount++;
-            const completedAt = new Date().toISOString();
-            taskRunner.completeTask({
-                task,
-                success: false,
-                response: getErrorMessage(err),
-                executionLog,
-                startedAt,
-                completedAt,
-            });
-            error(`Task "${task.name}" error: ${getErrorMessage(err)}`);
         }
         // 次のタスクを動的に取得（新しく追加されたタスクも含む）
         task = taskRunner.getNextTask();
@@ -96,4 +133,31 @@ export async function runAllTasks(cwd, workflowName = DEFAULT_WORKFLOW_NAME) {
         status('Failed', String(failCount), 'red');
     }
 }
+/**
+ * Resolve execution directory and workflow from task data.
+ * If the task has worktree settings, create a worktree and use it as cwd.
+ */
+export function resolveTaskExecution(task, defaultCwd, defaultWorkflow) {
+    const data = task.data;
+    // No structured data: use defaults
+    if (!data) {
+        return { execCwd: defaultCwd, execWorkflow: defaultWorkflow, isWorktree: false };
+    }
+    let execCwd = defaultCwd;
+    let isWorktree = false;
+    // Handle worktree
+    if (data.worktree) {
+        const result = createWorktree(defaultCwd, {
+            worktree: data.worktree,
+            branch: data.branch,
+            taskSlug: task.name,
+        });
+        execCwd = result.path;
+        isWorktree = true;
+        info(`Worktree created: ${result.path} (branch: ${result.branch})`);
+    }
+    // Handle workflow override
+    const execWorkflow = data.workflow || defaultWorkflow;
+    return { execCwd, execWorkflow, isWorktree };
+}
 //# sourceMappingURL=taskExecution.js.map

package/dist/commands/taskExecution.js.map

@@ -1 +1 @@
-{"version":3,"file":"taskExecution.js","sourceRoot":"","sources":["../../src/commands/taskExecution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"taskExecution.js","sourceRoot":"","sources":["../../src/commands/taskExecution.ts"],"names":[],"mappings":"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"}

package/dist/commands/watchTasks.d.ts

@@ -0,0 +1,12 @@
+/**
+ * /watch command implementation
+ *
+ * Watches .takt/tasks/ for new task files and executes them automatically.
+ * Stays resident until Ctrl+C (SIGINT).
+ */
+/**
+ * Watch for tasks and execute them as they appear.
+ * Runs until Ctrl+C.
+ */
+export declare function watchTasks(cwd: string): Promise<void>;
+//# sourceMappingURL=watchTasks.d.ts.map

package/dist/commands/watchTasks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"watchTasks.d.ts","sourceRoot":"","sources":["../../src/commands/watchTasks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH;;;GAGG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyD3D"}

package/dist/commands/watchTasks.js

@@ -0,0 +1,68 @@
+/**
+ * /watch command implementation
+ *
+ * Watches .takt/tasks/ for new task files and executes them automatically.
+ * Stays resident until Ctrl+C (SIGINT).
+ */
+import { TaskRunner } from '../task/index.js';
+import { TaskWatcher } from '../task/watcher.js';
+import { getCurrentWorkflow } from '../config/paths.js';
+import { header, info, success, status, } from '../utils/ui.js';
+import { executeAndCompleteTask } from './taskExecution.js';
+import { DEFAULT_WORKFLOW_NAME } from '../constants.js';
+/**
+ * Watch for tasks and execute them as they appear.
+ * Runs until Ctrl+C.
+ */
+export async function watchTasks(cwd) {
+    const workflowName = getCurrentWorkflow(cwd) || DEFAULT_WORKFLOW_NAME;
+    const taskRunner = new TaskRunner(cwd);
+    const watcher = new TaskWatcher(cwd);
+    let taskCount = 0;
+    let successCount = 0;
+    let failCount = 0;
+    header('TAKT Watch Mode');
+    info(`Workflow: ${workflowName}`);
+    info(`Watching: ${taskRunner.getTasksDir()}`);
+    info('Waiting for tasks... (Ctrl+C to stop)');
+    console.log();
+    // Graceful shutdown on SIGINT
+    const onSigInt = () => {
+        console.log();
+        info('Stopping watch...');
+        watcher.stop();
+    };
+    process.on('SIGINT', onSigInt);
+    try {
+        await watcher.watch(async (task) => {
+            taskCount++;
+            console.log();
+            info(`=== Task ${taskCount}: ${task.name} ===`);
+            console.log();
+            const taskSuccess = await executeAndCompleteTask(task, taskRunner, cwd, workflowName);
+            if (taskSuccess) {
+                successCount++;
+            }
+            else {
+                failCount++;
+            }
+            console.log();
+            info('Waiting for tasks... (Ctrl+C to stop)');
+        });
+    }
+    finally {
+        process.removeListener('SIGINT', onSigInt);
+    }
+    // Summary on exit
+    if (taskCount > 0) {
+        console.log();
+        header('Watch Summary');
+        status('Total', String(taskCount));
+        status('Success', String(successCount), successCount === taskCount ? 'green' : undefined);
+        if (failCount > 0) {
+            status('Failed', String(failCount), 'red');
+        }
+    }
+    success('Watch stopped.');
+}
+//# sourceMappingURL=watchTasks.js.map

package/dist/commands/watchTasks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watchTasks.js","sourceRoot":"","sources":["../../src/commands/watchTasks.ts"],"names":[],"mappings":"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"}

package/dist/commands/workflowExecution.d.ts

@@ -1,7 +1,7 @@
 /**
  * Workflow execution logic
  */
-import type { WorkflowConfig } from '../models/types.js';
+import type { WorkflowConfig, Language } from '../models/types.js';
 /** Result of workflow execution */
 export interface WorkflowExecutionResult {
     success: boolean;
@@ -11,6 +11,10 @@ export interface WorkflowExecutionResult {
 export interface WorkflowExecutionOptions {
     /** Header prefix for display */
     headerPrefix?: string;
+    /** Project root directory (where .takt/ lives). Defaults to cwd. */
+    projectCwd?: string;
+    /** Language for instruction metadata */
+    language?: Language;
 }
 /**
  * Execute a workflow and handle all events

package/dist/commands/workflowExecution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflowExecution.d.ts","sourceRoot":"","sources":["../../src/commands/workflowExecution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AA2CzD,mCAAmC;AACnC,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qCAAqC;AACrC,MAAM,WAAW,wBAAwB;IACvC,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAyJlC"}
+{"version":3,"file":"workflowExecution.d.ts","sourceRoot":"","sources":["../../src/commands/workflowExecution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AA4CnE,mCAAmC;AACnC,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qCAAqC;AACrC,MAAM,WAAW,wBAAwB;IACvC,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAmLlC"}