colyn-cli 3.1.4

package/dist/commands/merge.helpers.js

@@ -0,0 +1,307 @@
+import chalk from 'chalk';
+import ora from 'ora';
+import simpleGit from 'simple-git';
+import { ColynError } from '../types/index.js';
+import { getRelevantStatusFiles } from '../core/git.js';
+import { output, outputLine, outputSuccess, outputError, outputBold, outputStep } from '../utils/logger.js';
+import { discoverWorktrees, getCurrentWorktreeId } from '../core/discovery.js';
+import { t } from '../i18n/index.js';
+/**
+ * 判断目标参数类型
+ */
+export function identifyTargetType(target) {
+    if (!target) {
+        return 'auto';
+    }
+    // 纯数字视为 ID
+    if (/^\d+$/.test(target)) {
+        return 'id';
+    }
+    // 包含任何字符视为分支名
+    return 'branch';
+}
+/**
+ * 自动识别当前 worktree
+ * 使用 getCurrentWorktreeId 验证目录名与 .env.local 配置一致
+ */
+export async function autoDetectWorktree() {
+    return getCurrentWorktreeId();
+}
+/**
+ * 根据目标参数查找 worktree
+ */
+export async function findWorktreeTarget(target, mainDir, worktreesDir) {
+    const worktrees = await discoverWorktrees(mainDir, worktreesDir);
+    const targetType = identifyTargetType(target);
+    let worktree;
+    if (targetType === 'auto') {
+        // 自动识别当前 worktree
+        const worktreeId = await autoDetectWorktree();
+        if (worktreeId === null) {
+            throw new ColynError(t('commands.merge.cannotAutoDetect'), t('commands.merge.cannotAutoDetectHint'));
+        }
+        worktree = worktrees.find(w => w.id === worktreeId);
+        if (!worktree) {
+            throw new ColynError(t('commands.merge.worktreeNotFound', { id: worktreeId }), t('commands.merge.worktreeNotFoundHint'));
+        }
+    }
+    else if (targetType === 'id') {
+        // 按 ID 查找
+        const id = parseInt(target);
+        worktree = worktrees.find(w => w.id === id);
+        if (!worktree) {
+            throw new ColynError(t('commands.merge.worktreeNotFound', { id }), t('commands.merge.branchNotFoundHint'));
+        }
+    }
+    else {
+        // 按分支名查找
+        worktree = worktrees.find(w => w.branch === target);
+        if (!worktree) {
+            throw new ColynError(t('commands.merge.branchNotFound', { branch: target ?? '' }), t('commands.merge.branchNotFoundHint'));
+        }
+    }
+    return worktree;
+}
+/**
+ * 检查 git 工作目录状态是否干净
+ */
+export async function checkGitWorkingDirectory(dirPath, dirName) {
+    const git = simpleGit(dirPath);
+    const status = await git.status();
+    const changedFiles = getRelevantStatusFiles(status);
+    if (changedFiles.length > 0) {
+        const filesStr = changedFiles.slice(0, 5).map(f => `  - ${f}`).join('\n') +
+            (changedFiles.length > 5 ? `\n  ... ${t('commands.remove.moreFiles', { count: changedFiles.length - 5 })}` : '');
+        throw new ColynError(t('commands.merge.dirHasUncommitted', { name: dirName }), t('commands.merge.dirHasUncommittedHint', {
+            name: dirName,
+            path: dirPath,
+            count: changedFiles.length,
+            files: filesStr
+        }));
+    }
+}
+/**
+ * 在 worktree 中更新主分支代码（默认使用 rebase，可选 merge）
+ * 这一步确保 worktree 包含主分支的所有更改
+ */
+export async function mergeMainIntoWorktree(worktreePath, mainBranch, useRebase = true) {
+    const git = simpleGit(worktreePath);
+    try {
+        if (useRebase) {
+            // 使用 rebase
+            await git.rebase([mainBranch]);
+        }
+        else {
+            // 使用 merge（允许 fast-forward）
+            await git.merge([mainBranch]);
+        }
+        // 获取最新的 commit hash
+        const log = await git.log({ n: 1 });
+        const commitHash = log.latest?.hash?.substring(0, 7) || 'unknown';
+        return {
+            success: true,
+            commitHash
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        // 检查是否是冲突
+        if (useRebase) {
+            // rebase 冲突
+            if (errorMessage.includes('CONFLICT') || errorMessage.includes('could not apply')) {
+                const status = await git.status();
+                const conflictFiles = status.conflicted;
+                return {
+                    success: false,
+                    conflictFiles,
+                    error: 'rebase_conflict'
+                };
+            }
+        }
+        else {
+            // merge 冲突
+            if (errorMessage.includes('CONFLICT') || errorMessage.includes('Automatic merge failed')) {
+                const status = await git.status();
+                const conflictFiles = status.conflicted;
+                return {
+                    success: false,
+                    conflictFiles,
+                    error: 'merge_conflict'
+                };
+            }
+        }
+        return {
+            success: false,
+            error: errorMessage
+        };
+    }
+}
+/**
+ * 在主分支中合并 worktree 分支（使用 --no-ff）
+ * 此时 worktree 已经包含主分支的所有更改，理论上不会有冲突
+ */
+export async function mergeWorktreeIntoMain(mainDir, worktreeBranch) {
+    const git = simpleGit(mainDir);
+    try {
+        // 执行合并（使用 --no-ff 保持清晰的分支历史）
+        await git.merge([
+            '--no-ff',
+            worktreeBranch,
+            '-m',
+            `Merge branch '${worktreeBranch}'`
+        ]);
+        // 获取合并后的 commit hash
+        const log = await git.log({ n: 1 });
+        const commitHash = log.latest?.hash?.substring(0, 7) || 'unknown';
+        return {
+            success: true,
+            commitHash
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        // 检查是否是合并冲突（理论上不应该发生）
+        if (errorMessage.includes('CONFLICT') || errorMessage.includes('Automatic merge failed')) {
+            const status = await git.status();
+            const conflictFiles = status.conflicted;
+            return {
+                success: false,
+                conflictFiles,
+                error: 'merge_conflict'
+            };
+        }
+        return {
+            success: false,
+            error: errorMessage
+        };
+    }
+}
+/**
+ * 执行合并操作（保留用于向后兼容，但不推荐使用）
+ * @deprecated 请使用 mergeMainIntoWorktree 和 mergeWorktreeIntoMain
+ */
+export async function executeMerge(mainDir, branch, _mainBranch) {
+    return mergeWorktreeIntoMain(mainDir, branch);
+}
+/**
+ * 推送到远程仓库
+ */
+export async function pushToRemote(mainDir, mainBranch) {
+    const spinner = ora({ text: t('commands.merge.pushToRemote'), stream: process.stderr }).start();
+    try {
+        const git = simpleGit(mainDir);
+        await git.push('origin', mainBranch);
+        spinner.succeed(t('commands.merge.pushed'));
+        return { success: true };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        spinner.fail(t('commands.merge.pushFailed'));
+        return { success: false, error: errorMessage };
+    }
+}
+/**
+ * 显示检测到的 worktree 信息
+ */
+export function displayWorktreeInfo(worktree) {
+    outputLine();
+    outputBold(t('commands.merge.detectedWorktree'));
+    output(`  ID: ${worktree.id}`);
+    output(`  ${t('commands.merge.detectedBranchLabel')}: ${worktree.branch}`);
+    output(`  ${t('commands.merge.detectedPathLabel')}: ${worktree.path}`);
+    outputLine();
+}
+/**
+ * 显示前置检查结果
+ */
+export function displayCheckPassed() {
+    outputSuccess(t('commands.merge.preCheckPassed'));
+    output(chalk.gray(t('commands.merge.mainDirClean')));
+    output(chalk.gray(t('commands.merge.worktreeDirClean')));
+    outputLine();
+}
+/**
+ * 显示合并成功信息
+ */
+export function displayMergeSuccess(mainBranch, branch, commitHash, mainDir, worktreePath, worktreeId, pushed, verbose = false) {
+    outputLine();
+    outputSuccess(t('commands.merge.mergeSuccess'));
+    if (pushed) {
+        output(chalk.gray(t('commands.merge.mergeAndPushed')));
+    }
+    if (verbose) {
+        outputLine();
+        outputBold(t('commands.merge.mergeInfo'));
+        output(`  ${t('commands.merge.mainBranchLabel', { branch: mainBranch })}`);
+        output(`  ${t('commands.merge.mergeBranchLabel', { branch })}`);
+        output(`  ${t('commands.merge.commitLabel', { hash: commitHash, branch })}`);
+        outputLine();
+        if (!pushed) {
+            output(chalk.gray(t('commands.merge.pushLaterHint')));
+            output(chalk.gray(`  cd "${mainDir}" && git push`));
+            outputLine();
+        }
+        outputBold(t('commands.merge.nextSteps'));
+        outputStep(`  ${t('commands.merge.step1ViewCode')}`);
+        output(`     cd "${mainDir}"`);
+        outputLine();
+        outputStep(`  ${t('commands.merge.step2ContinueWorktree')}`);
+        output(`     cd "${worktreePath}"`);
+        outputLine();
+        outputStep(`  ${t('commands.merge.step3RemoveWorktree')}`);
+        output(`     colyn remove ${worktreeId}`);
+    }
+    outputLine();
+}
+/**
+ * 显示合并冲突信息（在 worktree 中解决）
+ */
+export function displayMergeConflict(conflictFiles, worktreePath, worktreeBranch, mainBranch, isRebase = false) {
+    outputLine();
+    outputError(t('commands.merge.conflictTitle', { main: mainBranch, branch: worktreeBranch }));
+    outputLine();
+    outputBold(t('commands.merge.conflictFiles'));
+    for (const file of conflictFiles) {
+        output(`  ${file}`);
+    }
+    outputLine();
+    outputBold(t('commands.merge.resolveSteps'));
+    outputStep(`  ${t('commands.merge.resolveStep1')}`);
+    output(`     cd "${worktreePath}"`);
+    outputLine();
+    outputStep(`  ${t('commands.merge.resolveStep2')}`);
+    outputLine();
+    outputStep(`  ${t('commands.merge.resolveStep3')}`);
+    output('     git add <file>');
+    outputLine();
+    if (isRebase) {
+        // rebase 冲突的解决步骤
+        outputStep(`  ${t('commands.merge.resolveStep4Rebase')}`);
+        output('     git rebase --continue');
+        outputLine();
+        outputStep(`  ${t('commands.merge.resolveStep4RebaseAbort')}`);
+        output('     git rebase --abort');
+    }
+    else {
+        // merge 冲突的解决步骤
+        outputStep(`  ${t('commands.merge.resolveStep4')}`);
+        output('     git commit');
+    }
+    outputLine();
+    outputStep(`  ${t('commands.merge.resolveStep5')}`);
+    output(`     colyn merge ${worktreeBranch}`);
+    outputLine();
+}
+/**
+ * 显示推送失败信息
+ */
+export function displayPushFailed(error, mainDir, mainBranch) {
+    outputLine();
+    outputError(t('commands.merge.pushFailedTitle'));
+    output(chalk.gray(t('commands.merge.pushFailedError', { error })));
+    outputLine();
+    output(t('commands.merge.pushFailedHint'));
+    output(`  cd "${mainDir}" && git push origin ${mainBranch}`);
+    outputLine();
+}
+//# sourceMappingURL=merge.helpers.js.map

package/dist/commands/merge.helpers.js.map

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

package/dist/commands/merge.js

@@ -0,0 +1,260 @@
+import Enquirer from 'enquirer';
+import ora from 'ora';
+import { getProjectPaths, validateProjectInitialized, executeInDirectory } from '../core/paths.js';
+import { getMainBranch, discoverWorktrees } from '../core/discovery.js';
+import { ColynError } from '../types/index.js';
+import { formatError, output, outputResult, outputSuccess } from '../utils/logger.js';
+import { checkIsGitRepo } from './add.helpers.js';
+import { findWorktreeTarget, checkGitWorkingDirectory, mergeMainIntoWorktree, mergeWorktreeIntoMain, pushToRemote, displayWorktreeInfo, displayCheckPassed, displayMergeSuccess, displayMergeConflict, displayPushFailed } from './merge.helpers.js';
+import { pluginManager } from '../plugins/index.js';
+import { resolveToolchains } from '../core/toolchain-resolver.js';
+import { pullMainBranch, updateAllWorktrees, displayBatchUpdateResult } from './update.helpers.js';
+import { t } from '../i18n/index.js';
+import { setWorktreeStatus } from '../core/worktree-status.js';
+/**
+ * Merge 命令：将 worktree 分支合并回主分支
+ *
+ * 流程：
+ * 1. 前置检查（主分支和 worktree 都干净）
+ * 2. 在 worktree 中 rebase 主分支（默认），确保 worktree 包含主分支的所有更改
+ * 3. 如果有冲突，提示用户在 worktree 中解决
+ * 4. 在主分支中合并 worktree 分支（--no-ff），此时不会有冲突
+ * 5. 推送处理
+ */
+async function mergeCommand(target, options) {
+    try {
+        // 步骤1: 获取项目路径并验证
+        const paths = await getProjectPaths();
+        await validateProjectInitialized(paths);
+        // 步骤2: 在主分支目录中检查 git 仓库
+        await executeInDirectory(paths.mainDir, async () => {
+            await checkIsGitRepo();
+        });
+        // 步骤3: 查找目标 worktree
+        const worktree = await findWorktreeTarget(target, paths.mainDir, paths.worktreesDir);
+        // 显示 worktree 信息
+        if (options.verbose) {
+            displayWorktreeInfo(worktree);
+        }
+        // 步骤4: 前置检查
+        const checkSpinner = ora({ text: t('commands.merge.preCheck'), stream: process.stderr }).start();
+        try {
+            // 检查主分支工作目录
+            await checkGitWorkingDirectory(paths.mainDir, t('commands.merge.mainDirClean').replace('✓ ', '').replace(' working directory clean', ''));
+            // 检查 worktree 工作目录
+            await checkGitWorkingDirectory(worktree.path, 'Worktree');
+            checkSpinner.succeed(t('commands.merge.preCheckPassed'));
+            if (options.verbose) {
+                displayCheckPassed();
+            }
+        }
+        catch (error) {
+            checkSpinner.fail(t('commands.merge.preCheckFailed'));
+            throw error;
+        }
+        // 解析工具链上下文
+        const contexts = await resolveToolchains(paths.rootDir, worktree.path);
+        // 步骤4.5: Lint 和 Build 检查（可通过 --skip-build 跳过）
+        if (options.skipBuild) {
+            output(t('commands.merge.skippingBuild'));
+        }
+        else {
+            for (const ctx of contexts) {
+                const lintSpinner = ora({ text: t('commands.merge.runningLint'), stream: process.stderr }).start();
+                try {
+                    await pluginManager.runLint(ctx.absolutePath, [ctx.toolchainName], options.verbose);
+                    lintSpinner.succeed(t('commands.merge.lintPassed'));
+                }
+                catch (error) {
+                    lintSpinner.fail(t('commands.merge.lintFailed'));
+                    throw error;
+                }
+                const buildSpinner = ora({ text: t('commands.merge.runningBuild'), stream: process.stderr }).start();
+                try {
+                    await pluginManager.runBuild(ctx.absolutePath, [ctx.toolchainName], options.verbose);
+                    buildSpinner.succeed(t('commands.merge.buildPassed'));
+                }
+                catch (error) {
+                    buildSpinner.fail(t('commands.merge.buildFailed'));
+                    throw error;
+                }
+            }
+        }
+        // 步骤5: 获取主分支名称
+        const mainBranch = await getMainBranch(paths.mainDir);
+        // 确定是否使用 rebase（默认 true）
+        const useRebase = !options.noRebase;
+        // 步骤6: 在 worktree 中更新主分支代码（确保 worktree 包含主分支的所有更改）
+        if (options.verbose) {
+            output(t('commands.merge.step1Title'));
+            output(t('commands.merge.step1Dir', { path: worktree.path }));
+            if (useRebase) {
+                output(t('commands.merge.step1CmdRebase', { branch: mainBranch }));
+            }
+            else {
+                output(t('commands.merge.step1Cmd', { branch: mainBranch }));
+            }
+        }
+        const step1Spinner = ora({ text: useRebase ? t('commands.merge.rebasingMain') : t('commands.merge.mergingMain'), stream: process.stderr }).start();
+        const step1Result = await executeInDirectory(worktree.path, async () => {
+            return await mergeMainIntoWorktree(worktree.path, mainBranch, useRebase);
+        });
+        if (!step1Result.success) {
+            step1Spinner.fail(useRebase ? t('commands.merge.mainRebaseFailed') : t('commands.merge.mainMergeFailed'));
+            if (step1Result.error === 'rebase_conflict' || step1Result.error === 'merge_conflict') {
+                // 冲突 - 在 worktree 中解决
+                displayMergeConflict(step1Result.conflictFiles || [], worktree.path, worktree.branch, mainBranch, useRebase);
+                outputResult({ success: false });
+                process.exit(1);
+            }
+            else {
+                throw new ColynError(useRebase ? t('commands.merge.mainRebaseFailed') : t('commands.merge.mainMergeFailed'), step1Result.error || t('common.unknownError'));
+            }
+        }
+        step1Spinner.succeed(useRebase ? t('commands.merge.mainRebased') : t('commands.merge.mainMerged'));
+        // 步骤7: 在主分支中合并 worktree 分支
+        if (options.verbose) {
+            output(t('commands.merge.step2Title'));
+            output(t('commands.merge.step2Dir', { path: paths.mainDir }));
+            output(t('commands.merge.step2Cmd', { branch: worktree.branch }));
+        }
+        const step2Spinner = ora({ text: t('commands.merge.mergingWorktree'), stream: process.stderr }).start();
+        const step2Result = await executeInDirectory(paths.mainDir, async () => {
+            return await mergeWorktreeIntoMain(paths.mainDir, worktree.branch);
+        });
+        if (!step2Result.success) {
+            step2Spinner.fail(t('commands.merge.worktreeMergeFailed'));
+            // 理论上不应该发生冲突，但还是处理一下
+            if (step2Result.error === 'merge_conflict') {
+                throw new ColynError(t('commands.merge.unexpectedConflict'), t('commands.merge.unexpectedConflictHint', { path: paths.mainDir }));
+            }
+            else {
+                throw new ColynError(t('commands.merge.mergeFailed'), step2Result.error || t('common.unknownError'));
+            }
+        }
+        step2Spinner.succeed(t('commands.merge.worktreeMerged'));
+        outputSuccess(t('commands.merge.mergeComplete'));
+        // 更新 worktree 状态为 idle
+        try {
+            await setWorktreeStatus(paths.configDir, `task-${worktree.id}`, paths.rootDir, 'idle');
+        }
+        catch { /* 状态更新失败不影响主流程 */ }
+        // 步骤8: 推送处理
+        let pushed = false;
+        // 检查用户是否显式指定了 --push 或 --no-push 参数
+        const explicitPush = process.argv.includes('--push');
+        const explicitNoPush = process.argv.includes('--no-push');
+        if (explicitPush) {
+            // --push: 自动推送
+            const pushResult = await pushToRemote(paths.mainDir, mainBranch);
+            if (pushResult.success) {
+                pushed = true;
+            }
+            else {
+                displayPushFailed(pushResult.error || t('common.unknownError'), paths.mainDir, mainBranch);
+            }
+        }
+        else if (!explicitNoPush) {
+            // 没有指定 --no-push：询问用户
+            const enquirer = new Enquirer({ stdout: process.stderr });
+            const response = await enquirer.prompt({
+                type: 'confirm',
+                name: 'shouldPush',
+                message: t('commands.merge.shouldPush'),
+                initial: false
+            });
+            if (response.shouldPush) {
+                const pushResult = await pushToRemote(paths.mainDir, mainBranch);
+                if (pushResult.success) {
+                    pushed = true;
+                }
+                else {
+                    displayPushFailed(pushResult.error || t('common.unknownError'), paths.mainDir, mainBranch);
+                }
+            }
+        }
+        // 指定了 --no-push: 不推送，不询问
+        // 步骤9: 显示成功信息
+        displayMergeSuccess(mainBranch, worktree.branch, step2Result.commitHash || 'unknown', paths.mainDir, worktree.path, worktree.id, pushed, options.verbose);
+        // 步骤10: 自动更新 worktrees
+        if (!options.noUpdate) {
+            output('');
+            // 拉取主分支最新代码（如果已经 push，则主分支已经是最新的）
+            if (!pushed) {
+                try {
+                    await pullMainBranch(paths.mainDir, options.fetch === false);
+                }
+                catch (error) {
+                    // 拉取失败不影响更新流程，因为本地已经有最新代码
+                }
+            }
+            if (options.updateAll) {
+                // --update-all: 更新所有 worktrees（包括当前的）
+                output(t('commands.merge.updatingAllWorktrees'));
+                const allWorktrees = await discoverWorktrees(paths.mainDir, paths.worktreesDir);
+                if (allWorktrees.length > 0) {
+                    const updateResult = await updateAllWorktrees(allWorktrees, mainBranch, true // 默认使用 rebase
+                    );
+                    displayBatchUpdateResult(updateResult);
+                    if (updateResult.failed > 0) {
+                        output('');
+                        output(t('commands.merge.updatePartialSuccess'));
+                    }
+                }
+            }
+            else {
+                // 默认：仅更新当前 worktree
+                output(t('commands.merge.updatingCurrentWorktree'));
+                const updateSpinner = ora({
+                    text: t('commands.update.updating', { strategy: 'rebase' }),
+                    stream: process.stderr
+                }).start();
+                const updateResult = await executeInDirectory(worktree.path, async () => {
+                    return await updateAllWorktrees([worktree], mainBranch, true);
+                });
+                if (updateResult.succeeded > 0) {
+                    updateSpinner.succeed(t('commands.update.updateSuccess'));
+                }
+                else if (updateResult.skipped > 0) {
+                    updateSpinner.warn(t('commands.update.dirtySkipped'));
+                }
+                else {
+                    updateSpinner.fail(t('commands.update.updateFailed'));
+                    if (updateResult.results[0]?.error) {
+                        output(t('common.hint') + ': ' + updateResult.results[0].error);
+                    }
+                }
+            }
+        }
+        // 步骤11: 输出 JSON 结果到 stdout（不设置 targetDir，保持在原目录）
+        const result = {
+            success: true
+        };
+        outputResult(result);
+    }
+    catch (error) {
+        formatError(error);
+        outputResult({ success: false });
+        process.exit(1);
+    }
+}
+/**
+ * 注册 merge 命令
+ */
+export function register(program) {
+    program
+        .command('merge [target]')
+        .description(t('commands.merge.description'))
+        .option('--no-rebase', t('commands.merge.noRebaseOption'))
+        .option('--push', t('commands.merge.pushOption'))
+        .option('--no-push', t('commands.merge.noPushOption'))
+        .option('--no-update', t('commands.merge.noUpdateOption'))
+        .option('--update-all', t('commands.merge.updateAllOption'))
+        .option('-v, --verbose', t('commands.merge.verboseOption'))
+        .option('--no-fetch', t('commands.merge.noFetchOption'))
+        .option('--skip-build', t('commands.merge.skipBuildOption'))
+        .action(async (target, options) => {
+        await mergeCommand(target, options);
+    });
+}
+//# sourceMappingURL=merge.js.map

package/dist/commands/merge.js.map

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

package/dist/commands/release.d.ts

@@ -0,0 +1,6 @@
+import type { Command } from 'commander';
+/**
+ * 注册 release 命令
+ */
+export declare function register(program: Command): void;
+//# sourceMappingURL=release.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/commands/release.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8JzC;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAS/C"}