ethan-skill 1.5.4 → 1.5.6

package/dist/cli/index.js

@@ -910,7 +910,7 @@ program
 const workflowCmd = program.command('workflow').description('有状态工作流执行：一键推进各阶段任务');
 workflowCmd
     .command('start [pipelineId]')
-    .description('启动工作流会话（默认 dev-workflow），输出第一步提示词')
+    .description('启动工作流会话，输出第一步提示词（无参数时显示 Pipeline 选择菜单）')
     .option('-c, --context <context>', '初始任务上下文', '')
     .option('-n, --name <name>', '具名会话（存至 .ethan/sessions/<name>.json，可并行多个工作流）')
     .action(async (pipelineId, options) => {
@@ -928,7 +928,39 @@ workflowCmd
         console.log('   使用 ethan workflow reset 重置后再启动新工作流\n');
         return;
     }
-    const id = pipelineId ?? 'dev-workflow';
+    let id = pipelineId;
+    // 无参数时，显示交互式 Pipeline 选择菜单
+    if (!id) {
+        const customPipelines = loadCustomPipelines(process.cwd());
+        const allPipelines = [
+            ...PIPELINES,
+            ...customPipelines.map((p) => ({ id: p.id, name: p.name, description: p.description, skillIds: p.skillIds })),
+        ];
+        const readline = await Promise.resolve().then(() => __importStar(require('readline')));
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        const ask = (q) => new Promise((resolve) => rl.question(q, (a) => resolve(a.trim())));
+        console.log('\n🔄 可用工作流 Pipeline\n');
+        console.log('─'.repeat(60));
+        allPipelines.forEach((p, i) => {
+            console.log(`  ${i + 1}. ${p.name}  [${p.id}]`);
+            console.log(`     ${p.description}`);
+            console.log(`     步骤: ${p.skillIds.join(' → ')}`);
+            console.log('');
+        });
+        const choice = await ask(`选择 Pipeline（输入序号 1-${allPipelines.length}，或直接输入 ID）：\n> `);
+        rl.close();
+        if (!choice) {
+            console.error('\n❌ 未选择 Pipeline\n');
+            process.exit(1);
+        }
+        const num = parseInt(choice, 10);
+        if (!isNaN(num) && num >= 1 && num <= allPipelines.length) {
+            id = allPipelines[num - 1].id;
+        }
+        else {
+            id = choice;
+        }
+    }
     let resolved = resolvePipeline(id);
     // 尝试从自定义 YAML pipeline 加载
     if (!resolved) {
@@ -990,15 +1022,56 @@ workflowCmd
     if (copyToClipboard(prompt)) {
         console.log('\n✅ 提示词已复制到剪贴板！粘贴到你的 AI 编辑器中执行。');
     }
-    console.log(`\n💡 完成本步后，运行：ethan workflow done "你的本步摘要"${session.name ? ` --name ${session.name}` : ''}\n`);
+    console.log(`\n💡 完成本步后，运行：ethan workflow done${session.name ? ` --name ${session.name}` : ''}\n`);
     // 记录使用统计
     const stats = readStats();
     stats[firstSkill.id] = (stats[firstSkill.id] || 0) + 1;
     writeStats(stats);
 });
+workflowCmd
+    .command('use [name]')
+    .description('设置当前工作目录的活跃会话（后续命令无需 --name）；不传 name 则显示当前激活会话')
+    .action(async (name) => {
+    const { getCurrentSessionName, setCurrentSessionName, clearCurrentSessionName, loadSession } = await Promise.resolve().then(() => __importStar(require('../workflow/state')));
+    if (!name) {
+        const current = getCurrentSessionName(process.cwd());
+        if (!current) {
+            console.log('\n📌 当前无激活会话（使用默认 workflow.json）');
+            console.log('   运行 ethan workflow use <name> 激活一个具名会话\n');
+        }
+        else {
+            const session = loadSession(process.cwd(), current);
+            console.log(`\n📌 当前激活会话：${current}`);
+            if (session) {
+                const { calcProgress } = await Promise.resolve().then(() => __importStar(require('../workflow/state')));
+                console.log(`   Pipeline: ${session.pipelineName}`);
+                console.log(`   进度: ${calcProgress(session)}%`);
+            }
+            console.log('\n   运行 ethan workflow use （不带参数）可查看，ethan workflow use default 可切回默认\n');
+        }
+        return;
+    }
+    if (name === 'default' || name === '-') {
+        clearCurrentSessionName(process.cwd());
+        console.log('\n✅ 已切换回默认会话（workflow.json）\n');
+        return;
+    }
+    const session = loadSession(process.cwd(), name);
+    if (!session) {
+        console.error(`\n❌ 未找到具名会话：${name}`);
+        console.error('   使用 ethan workflow list 查看所有会话\n');
+        process.exit(1);
+    }
+    setCurrentSessionName(process.cwd(), name);
+    const { calcProgress } = await Promise.resolve().then(() => __importStar(require('../workflow/state')));
+    console.log(`\n✅ 已激活会话：${name}`);
+    console.log(`   Pipeline: ${session.pipelineName}`);
+    console.log(`   进度: ${calcProgress(session)}%`);
+    console.log('\n   后续 workflow done/status/reset 将自动使用此会话（无需 --name）\n');
+});
 workflowCmd
     .command('done [summary]')
-    .description('完成当前步骤，传入本步摘要，自动推进到下一步')
+    .description('完成当前步骤，自动推进到下一步（摘要可选）')
     .option('-n, --name <name>', '具名会话名称')
     .action(async (summary, options) => {
     const { loadSession, markStepDone, buildStepPrompt, getCurrentStep, getCurrentStepIndex, calcProgress, } = await Promise.resolve().then(() => __importStar(require('../workflow/state')));
@@ -1017,21 +1090,8 @@ workflowCmd
         console.error('\n❌ 未找到当前步骤，工作流状态异常。\n');
         process.exit(1);
     }
-    // 获取摘要（命令行参数 or 交互输入）
-    let stepSummary = summary?.trim() ?? '';
-    if (!stepSummary) {
-        const readline = await Promise.resolve().then(() => __importStar(require('readline')));
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        const ask = (q) => new Promise((resolve) => rl.question(q, (a) => resolve(a.trim())));
-        const currentIdx = getCurrentStepIndex(session);
-        console.log(`\n✅ 完成第 ${currentIdx + 1} 步：${currentStep.skillId}`);
-        stepSummary = await ask('请输入本步执行摘要（将作为下一步的上下文）：\n> ');
-        rl.close();
-        if (!stepSummary) {
-            console.error('\n❌ 摘要不能为空\n');
-            process.exit(1);
-        }
-    }
+    // 获取摘要（命令行参数，可选）
+    const stepSummary = summary?.trim() ?? '';
     const nextStep = markStepDone(session, stepSummary, process.cwd());
     const progress = calcProgress(session);
     // 自动归档到 Skill Memory（T16）
@@ -1064,7 +1124,7 @@ workflowCmd
     if (copyToClipboard(prompt)) {
         console.log('\n✅ 下一步提示词已复制到剪贴板！');
     }
-    console.log(`\n💡 完成本步后，运行：ethan workflow done "你的本步摘要"${session.name ? ` --name ${session.name}` : ''}\n`);
+    console.log(`\n💡 完成本步后，运行：ethan workflow done${session.name ? ` --name ${session.name}` : ''}\n`);
     // 记录使用统计
     const stats = readStats();
     stats[nextSkill.id] = (stats[nextSkill.id] || 0) + 1;
@@ -1121,7 +1181,7 @@ workflowCmd
     }
     else {
         console.log(`\n💡 当前任务背景：${session.initialContext}`);
-        console.log(`   完成当前步骤后运行：ethan workflow done "你的摘要"${session.name ? ` --name ${session.name}` : ''}\n`);
+        console.log(`   完成当前步骤后运行：ethan workflow done${session.name ? ` --name ${session.name}` : ''}\n`);
     }
 });
 workflowCmd
@@ -1152,47 +1212,44 @@ workflowCmd
 });
 workflowCmd
     .command('list')
-    .description('列出所有可用的工作流 Pipeline 及进行中的具名会话')
-    .option('--sessions', '只列出所有具名会话（不列 Pipeline）')
-    .action(async (options) => {
-    const { PIPELINES } = await Promise.resolve().then(() => __importStar(require('../skills/pipeline')));
-    const { loadSession, calcProgress, listNamedSessions } = await Promise.resolve().then(() => __importStar(require('../workflow/state')));
-    // ── 列出具名会话 ─────────────────────────────────────────────────────────
+    .description('列出所有进行中的会话（具名 + 默认）')
+    .action(async () => {
+    const { loadSession, calcProgress, listNamedSessions, getCurrentSessionName } = await Promise.resolve().then(() => __importStar(require('../workflow/state')));
+    const currentActiveName = getCurrentSessionName(process.cwd());
+    const defaultSession = loadSession(process.cwd(), undefined);
     const namedSessions = listNamedSessions(process.cwd());
-    if (namedSessions.length > 0 || options.sessions) {
-        console.log('\n📂 具名会话\n');
-        console.log('─'.repeat(60));
-        if (namedSessions.length === 0) {
-            console.log('   暂无具名会话。使用 ethan workflow start --name <name> 创建。');
-        }
-        else {
-            for (const s of namedSessions) {
-                const pct = calcProgress(s);
-                const statusLabel = s.completed ? '🎉 已完成' : `${pct}% 进行中`;
-                console.log(`\n  📌 ${s.name || s.id}  [${statusLabel}]`);
-                console.log(`     Pipeline: ${s.pipelineName}`);
-                console.log(`     背景: ${s.initialContext.slice(0, 60)}${s.initialContext.length > 60 ? '…' : ''}`);
-                console.log(`     更新: ${s.updatedAt.slice(0, 19).replace('T', ' ')}`);
-            }
+    console.log('\n📂 工作流会话\n');
+    console.log('─'.repeat(60));
+    // 默认会话
+    if (defaultSession) {
+        const pct = calcProgress(defaultSession);
+        const statusLabel = defaultSession.completed ? '🎉 已完成' : `${pct}% 进行中`;
+        const activeTag = !currentActiveName ? ' ◀ 当前激活' : '';
+        console.log(`\n  📋 默认会话${activeTag}  [${statusLabel}]`);
+        console.log(`     Pipeline: ${defaultSession.pipelineName}`);
+        console.log(`     背景: ${defaultSession.initialContext.slice(0, 60)}${defaultSession.initialContext.length > 60 ? '…' : ''}`);
+        console.log(`     更新: ${defaultSession.updatedAt.slice(0, 19).replace('T', ' ')}`);
+    }
+    // 具名会话
+    if (namedSessions.length > 0) {
+        for (const s of namedSessions) {
+            const pct = calcProgress(s);
+            const statusLabel = s.completed ? '🎉 已完成' : `${pct}% 进行中`;
+            const isActive = s.name === currentActiveName;
+            const activeTag = isActive ? ' ◀ 当前激活' : '';
+            console.log(`\n  📌 ${s.name || s.id}${activeTag}  [${statusLabel}]`);
+            console.log(`     Pipeline: ${s.pipelineName}`);
+            console.log(`     背景: ${s.initialContext.slice(0, 60)}${s.initialContext.length > 60 ? '…' : ''}`);
+            console.log(`     更新: ${s.updatedAt.slice(0, 19).replace('T', ' ')}`);
         }
-        console.log('\n' + '─'.repeat(60));
-        if (options.sessions)
-            return;
     }
-    const current = loadSession(process.cwd());
-    console.log('\n🔄 可用工作流\n');
-    console.log('─'.repeat(60));
-    for (const p of PIPELINES) {
-        const isCurrent = current?.pipelineId === p.id && !current.completed;
-        const tag = isCurrent ? ` ◀ 进行中（${calcProgress(current)}%）` : '';
-        console.log(`\n  ${p.id}${tag}`);
-        console.log(`  名称：${p.name}`);
-        console.log(`  描述：${p.description}`);
-        console.log(`  步骤：${p.skillIds.join(' → ')}`);
+    if (!defaultSession && namedSessions.length === 0) {
+        console.log('   暂无工作流会话。');
     }
     console.log('\n' + '─'.repeat(60));
-    console.log('\n启动工作流：ethan workflow start <pipeline-id> -c "任务描述"');
-    console.log('具名会话：  ethan workflow start <pipeline-id> --name <name> -c "任务描述"\n');
+    console.log('\n💡 启动工作流：ethan workflow start');
+    console.log('   激活会话：  ethan workflow use <session-name>');
+    console.log('   查看 Pipeline：ethan pipeline list\n');
 });
 workflowCmd
     .command('report')