@yanglaofish/fishtools 0.5.2 → 0.5.3

package/node_modules/@mytools/fst-cli/src/terminal/session-history.js

@@ -0,0 +1,82 @@
+import path from 'node:path';
+import {randomUUID} from 'node:crypto';
+import {createSessionHistory} from '@mytools/fst-logs/sessions';
+import {readableValue,readableError,runCategory,runCategoryNames} from './run-presentation.js';
+
+// 完整交互追加落盘，快照只保存可立即恢复的近期窗口，不重复保存运行日志全文。
+export class TerminalHistory{
+  constructor(app,ui){
+    this.app=app;this.ui=ui;this.id=app.sessionId??randomUUID();this.startedAt=new Date().toISOString();this.pending=Promise.resolve();
+    const directory=app.project.readOnly?path.join(app.outputDir,'sessions'):path.join(app.projectDir,'.flow','sessions');
+    this.store=createSessionHistory(directory,{projectDir:app.projectDir});
+  }
+  snapshot(){
+    const commands=[];let bytes=0;
+    for(const command of [...this.ui.commandHistory].reverse()){
+      const size=Buffer.byteLength(JSON.stringify(command));if(bytes+size>256*1024)continue;
+      commands.unshift(command);bytes+=size;if(commands.length===100)break;
+    }
+    return {schemaVersion:1,id:this.id,startedAt:this.startedAt,updatedAt:new Date().toISOString(),...(this.resumedFrom?{resumedFrom:this.resumedFrom}:{}),commandHistory:commands,feed:this.ui.feed.exportState()};
+  }
+  report(error){
+    if(this.reported)return;this.reported=true;this.reporting=true;
+    try{this.ui.show(`历史会话保存失败：${error.message}。当前操作可继续，退出前的会话可能无法完整恢复。`);}
+    finally{this.reporting=false;}
+  }
+  async start(){
+    await this.store.save(this.snapshot());
+    this.ui.feed.onEntry=entry=>this.append(entry);
+    this.ui.onHistoryChange=()=>this.schedule();
+  }
+  append(entry){
+    if(this.reporting||this.closed)return;
+    const entries=[];
+    if(entry.type==='message'){
+      // 按字符切分完整命令及反馈，避免单条 JSON 或待写内存无限增长。
+      for(let offset=0;offset<entry.text.length;){
+        let end=Math.min(offset+8192,entry.text.length);
+        if(end<entry.text.length&&entry.text.charCodeAt(end-1)>=0xd800&&entry.text.charCodeAt(end-1)<=0xdbff&&entry.text.charCodeAt(end)>=0xdc00&&entry.text.charCodeAt(end)<=0xdfff)end--;
+        entries.push({...entry,text:entry.text.slice(offset,end),continuation:offset>0});offset=end;
+      }
+    }else entries.push(entry);
+    for(const value of entries){
+      const saved={...value,time:new Date().toISOString()};
+      // 直接进入 logs 的有界队列，不能在界面层用无限 Promise 链藏住待写数据。
+      const job=this.store.append(this.id,saved).catch(error=>this.report(error));this.pending=Promise.all([this.pending,job]).then(()=>{});
+    }
+    this.schedule();
+  }
+  schedule(){
+    if(this.closed||this.reporting||this.timer)return;
+    this.timer=setTimeout(()=>{this.timer=null;void this.flush();},250);this.timer.unref?.();
+  }
+  async flush(){
+    if(this.timer){clearTimeout(this.timer);this.timer=null;}
+    // 快照在调用时复制，保存排在已收到的交互之后；关闭时可等待同一条队列。
+    const snapshot=this.snapshot(),job=this.store.save(snapshot).catch(error=>this.report(error));this.pending=Promise.all([this.pending,job]).then(()=>{});await this.pending;
+  }
+  async restore(record){
+    if(this.app.listRuns().some(run=>run.status==='running'))throw new Error('当前有运行中的任务，完成后再恢复历史会话。');
+    await this.flush();this.resumedFrom=record.id;
+    this.ui.commandHistory=[...record.commandHistory];this.ui.commandHistoryIndex=null;
+    this.ui.feed.restoreState(record.feed,{catalog:this.app.catalog?.()??[]});
+    this.append({type:'restored',sessionId:record.id});await this.flush();
+  }
+  async close(){await this.flush();this.closed=true;this.ui.feed.onEntry=null;this.ui.onHistoryChange=null;}
+}
+
+export function sessionPageText(entries){
+  const joined=[];
+  for(const entry of entries){
+    const previous=joined.at(-1);
+    if(entry.type==='message'&&entry.continuation&&previous?.type==='message')previous.text+=entry.text;
+    else joined.push({...entry});
+  }
+  return joined.map(entry=>{
+    if(entry.type==='message')return entry.text;
+    if(entry.type==='restored')return `恢复并继续会话：${entry.sessionId}`;
+    const run=entry.run;if(!run)return '';
+    const header=`${entry.type==='start'?'开始':'结果'} · ${runCategoryNames[runCategory(run)]} · ${run.title??run.workflowId} · ${run.id}`;
+    return [header,run.input!==undefined?'输入\n'+readableValue(run.input):'',run.output!==undefined?'输出\n'+readableValue(run.output):'',run.error&&readableError(run.error),`/logs 可查看该次运行的完整日志和步骤详情`].filter(Boolean).join('\n');
+  }).filter(Boolean).join('\n\n');
+}

package/node_modules/@mytools/fst-cli/src/terminal/session.js

@@ -6,15 +6,16 @@ import { editCondition } from './conditions.js';
 import { runStatuses } from './run-viewer.js';
 import { editValue, needsJsonEditor } from './schema.js';
 import {gettingStarted,pluginStatus,pluginDetails} from './presentation.js';
-import {readableValue,readableError} from './run-presentation.js';
+import {readableValue,readableError,runCategory,runCategoryNames} from './run-presentation.js';
 import {commandMenu} from './navigation.js';
 import {workflowMenu} from './workflow-menu.js';
 import {commandPresetsMenu,shortcutsMenu,runShortcut} from './command-menu.js';
 import {validate} from '@mytools/sdk/schema';
 import {resolvePrivilegeRequirement,checkStaticPrivilege} from '@mytools/fst-plugin/privileges';
+import {TerminalHistory,sessionPageText} from './session-history.js';
 
 export class TerminalSession{
-  constructor(app,ui,{baseDir=process.cwd(),webOptions={}}={}){this.app=app;this.ui=ui;this.baseDir=baseDir;this.webOptions=webOptions;this.flow=null;this.dirty=false;this.exiting=false;this.web=null;ui.activeRuns=()=>app.listRuns().filter(run=>run.status==='running').length;}
+  constructor(app,ui,{baseDir=process.cwd(),webOptions={}}={}){this.app=app;this.ui=ui;this.baseDir=baseDir;this.webOptions=webOptions;this.flow=null;this.savedFlow=null;this.dirty=false;this.exiting=false;this.web=null;ui.activeRuns=()=>app.listRuns().filter(run=>run.status==='running').length;}
   writable(){if(this.app.project.readOnly)throw new Error('这是只读运行包，请在完整工作区中编排、安装或打包');}
   async withMaintenance(operation,options={}){
     try{return await operation(options);}
@@ -26,6 +27,8 @@ export class TerminalSession{
     }
   }
   current(){if(!this.flow)throw new Error('先用 /workflows 打开或新建工作流');return this.flow;}
+  loadWorkflow(flow){this.flow=structuredClone(flow);this.savedFlow=structuredClone(flow);this.dirty=false;}
+  updateWorkflow(flow){this.flow=flow;this.dirty=!isDeepStrictEqual(flow,this.savedFlow);}
   commands(){return commandMenu(this.app.listPlugins?.()??[],this.app.listCommands(),this.app.listShortcuts?.()??[]);}
   async discard(){return !this.dirty||await this.ui.confirm('当前修改未保存，是否放弃修改？');}
   async mayExit(){
@@ -38,7 +41,9 @@ export class TerminalSession{
     return true;
   }
   async run(){
+    await this.startHistory();
     this.ui.show(gettingStarted(await this.app.listWorkflows(),this.app.project),{kind:'welcome'});
+    for(const warning of this.app.host?.warnings??[])this.ui.show(`声明提示：${warning.message}`);
     try{
       while(!this.exiting){
         this.ui.summary(`欢迎使用 Fishtools · 插件编排工作台\n当前工作区：${this.app.projectDir}\n${this.app.listPlugins().length} 个插件 · ${(await this.app.listWorkflows()).length} 个工作流${this.flow?` · ${this.flow.title??this.flow.id} · ${this.dirty?'未保存':'已保存'}`:''}`);
@@ -48,7 +53,39 @@ export class TerminalSession{
         if(!text.trim())continue;
         try{await this.execute(text);}catch(e){if(e.code!=='PROMPT_CANCELLED'||!this.ui.endCommand)this.ui.show(e.code==='PROMPT_CANCELLED'?'已返回主面板。':`${e.code==='COMMAND_INPUT'?'输入提示':'操作失败'}：${e.message}`);}
       }
-    }finally{if(this.web)await this.web.close();}
+    }finally{
+      if(this.web)await this.web.close();
+      await Promise.allSettled([...this.ui.feed?.runs.values()??[]].map(item=>item.done).filter(Boolean));
+      await this.history?.close();
+    }
+  }
+  async startHistory(){
+    if(!this.ui.feed?.exportState||this.history)return;
+    try{this.history=new TerminalHistory(this.app,this.ui);await this.history.start();}
+    catch(error){this.history=null;this.ui.show(`历史会话暂不可用：${error.message}`);}
+  }
+  async sessions(){
+    if(!this.history)throw new Error('历史会话保存尚未启用，请重开终端工作台。');
+    await this.history.flush();const records=(await this.history.store.list()).filter(record=>record.id!==this.history.id);
+    if(!records.length){this.ui.show('还没有旧会话。本次输入、反馈和执行结果会自动保存，下次可从 /history 恢复。');return;}
+    const choice=await this.ui.select('历史会话 · 恢复不会重新执行旧命令',[
+      ...records.map(record=>({value:'session:'+record.id,label:new Date(record.startedAt).toLocaleString(),description:`${record.commandCount} 条近期输入 · ${record.id.slice(0,8)} · 更新于 ${new Date(record.updatedAt).toLocaleString()}`})),{value:'back',label:'返回'},
+    ]);
+    if(choice==='back')return;const record=await this.history.store.read(choice.slice(8));
+    const action=await this.ui.select('历史会话操作',[{value:'restore',label:'恢复完整会话并继续',description:'恢复近期面板和输入；完整交互可分页查看'},{value:'read',label:'查看完整交互记录'},{value:'back',label:'返回'}]);
+    if(action==='restore'){await this.history.restore(record);this.ui.show('历史会话已恢复，可继续输入。较早的交互在 /history → 查看完整交互记录；/logs 查看各次执行详情。');}
+    if(action==='read')await this.sessionPages(record.id);
+  }
+  async sessionPages(id){
+    let cursor=0;const previous=[];
+    for(;;){
+      const page=await this.history.store.page(id,{cursor,limit:100});
+      await this.ui.viewMarkdown(`完整会话 · ${cursor}–${page.nextCursor} / ${page.totalBytes} 字节`,sessionPageText(page.entries)||'暂无交互记录');
+      const choice=await this.ui.select('会话分页',[
+        ...(page.hasMore?[{value:'next',label:'下一页'}]:[]),...(previous.length?[{value:'previous',label:'上一页'}]:[]),{value:'back',label:'返回'},
+      ]);
+      if(choice==='back')return;if(choice==='next'){previous.push(cursor);cursor=page.nextCursor;}if(choice==='previous')cursor=previous.pop()??0;
+    }
   }
   async execute(text){
     // 只记录用户提交的入口；菜单内部调用 /save 等动作不制造伪命令。
@@ -78,11 +115,11 @@ export class TerminalSession{
         `文件路径起点：${this.baseDir}`,
         '## 常用操作',gettingStarted(await this.app.listWorkflows(),this.app.project),
         '## 系统命令与快捷名称','输入 ! 后接系统命令可直接执行，输出和状态保留在主面板；/commands 注册常用命令供快捷执行与工作流编排，/shortcuts 给任意插件动作或命令设置中文快捷名称。主输入框和命令编辑框使用 Shift+Enter 换行、Enter 提交，Alt+Enter 为备用换行；支持多行粘贴。系统命令按当前 Shell 语法执行，目标机器需要已安装相应外部程序。',
-        '## 编排工作流','/workflows 浏览、新建、打开工作流，进入后添加步骤、编辑参数、设置输出、保存或删除。删除会保留备份，仍被其他流程引用时不能删除。/run 选择已保存的工作流，或补全工作流 ID/中文标题后执行已保存版本，不会要求保存编辑草稿。要执行未保存修改，在工作流编辑菜单选择运行，再选择保存并运行；返回编辑会保留草稿。',
-        '## 主面板','运行期间可以继续输入命令，打开配置、管理插件或执行其他工作流。↑/↓ 回看本次启动已提交的命令，回到底部恢复草稿；补全菜单打开时仍用于选择候选。Ctrl+O 展开或收起执行详情，PgUp/PgDn 或滚轮浏览执行过程；/logs 回看各次执行的步骤、输入输出和日志。关闭菜单不会清空运行内容。',
+        '## 编排工作流','/workflows 浏览、新建、打开工作流，进入后添加步骤、编辑参数、设置输出、保存或删除。删除时选择备份后删除、直接删除或取消；仍被其他流程引用时不能删除。/run 选择已保存的工作流，或补全工作流 ID/中文标题后执行已保存版本，不会要求保存编辑草稿。要执行未保存修改，在工作流编辑菜单选择运行，再选择保存并运行；返回编辑会保留草稿。',
+        '## 主面板','运行期间可以继续输入命令，打开配置、管理插件或执行其他工作流。↑/↓ 回看已提交和已恢复的命令，回到底部恢复草稿；补全菜单打开时仍用于选择候选。Ctrl+O 展开或收起执行详情，PgUp/PgDn 或滚轮浏览执行过程；/logs 回看各次执行的步骤、输入输出和日志。关闭菜单不会清空运行内容。/history 恢复旧会话并继续输入，也可从 /tools 打开；恢复不重跑旧指令。',
         '## 命令分层','/config 配置 Fishtools，/plugin 管理插件及各插件配置。输入 /插件入口名 后进入该插件的能力菜单；补全列表标明 [内置] 或 [插件]。/tools 包含 Web 与离线文档。旧 /new、/add、/steps、/outputs、/save、/plugins 以及插件的原始命令仍可直接输入。',
         '## 观察运行','输入 /logs 打开执行记录。列表包含多个工作流的每次执行，运行中任务排在前面；选择后查看进度、结果和日志。从详情返回后可选择另一条记录，本次启动期间每条记录分别保留阅读位置。重启后仍可查看保留下来的执行记录。',
-        '1 / 2 / 3 切换总览、输入输出和日志，Enter 查看步骤详情，[ / ] 切换步骤，j 查看原始诊断数据。↑↓、PgUp/PgDn 或滚轮浏览；End 恢复尾部跟随。q / Esc 返回，正在执行的任务在后台继续，x 后 y 明确取消。',
+        '1 / 2 / 3 切换总览、输入输出和日志，Enter 查看步骤详情，[ / ] 切换步骤，j 查看原始诊断数据，m 单独格式化阅读输出。↑↓、PgUp/PgDn 或滚轮浏览；End 恢复尾部跟随。q / Esc 返回，正在执行的任务在后台继续，x 后 y 明确取消。',
         '## 文件与运行参数','输入 @ 后按 Tab 选择文件；@@ 表示字面量 @。运行命令的 @参数.json 会读取 JSON 对象作为输入。',
         '/run 工作流ID @"参数 文件.json"',
         '## 离线文档','输入 /docs 阅读插件开发、部署、控制流与服务文档。独立命令 fst docs --path 查看资料位置，fst docs --export 目标目录 导出资料。',
@@ -101,20 +138,25 @@ export class TerminalSession{
         this.writable();if(!await this.discard())return false;
         const title=(await this.ui.input('工作流名称',{files:false})).trim();if(!title)throw new Error('名称不能为空');
         const description=await this.ui.input('用途说明（可留空）',{files:false});
-        this.flow=newWorkflow(title,description);this.dirty=true;this.ui.show('工作流草稿已创建，可以在编辑菜单添加步骤。');return true;
+        this.savedFlow=null;this.updateWorkflow(newWorkflow(title,description));this.ui.show('工作流草稿已创建，可以在编辑菜单添加步骤。');return true;
       }
       case 'add':return this.add();
       case 'steps':return this.steps();
       case 'outputs':return this.outputs();
-      case 'save':this.writable();await this.app.saveWorkflow(this.current());this.dirty=false;this.ui.show(`已保存：${this.flow.title}`);return;
+      case 'save':{
+        this.writable();const flow=this.current();
+        if(isDeepStrictEqual(flow,this.savedFlow)){this.ui.show('工作流未修改。');return;}
+        await this.app.saveWorkflow(flow);this.loadWorkflow(flow);this.ui.show(`已保存：${this.flow.title}`);return;
+      }
       case 'run':return this.startRun(args);
       case 'runs':return this.logs();
       case 'logs':return this.logs();
+      case 'history':return this.sessions();
       case 'plugin':case 'plugins':return this.plugins();
       case 'config':return this.toolConfig();
       case 'tools':{
-        const choice=await this.ui.select('工具',[{value:'web',label:'启动 Web 工作台'},{value:'docs',label:'阅读离线文档'},{value:'back',label:'返回主面板'}]);
-        if(choice!=='back')await this.execute('/'+choice);return;
+        const choice=await this.ui.select('工具',[{value:'history',label:'历史会话：恢复输入、反馈与结果'},{value:'web',label:'启动 Web 工作台'},{value:'docs',label:'阅读离线文档'},{value:'back',label:'返回主面板'}]);
+        if(choice==='history')await this.sessions();else if(choice!=='back')await this.execute('/'+choice);return;
       }
       case 'pack':return this.pack();
       case 'web':{
@@ -147,7 +189,7 @@ export class TerminalSession{
     if(!command.actionId&&!this.app.listCommands().some(current=>current.name===targetName&&current.plugin===command.plugin))throw new Error('命令目标插件已变更，请重新选择目标后执行');
     const run=command.actionId?await this.app.startAction(command.actionId,input,{ui,allowUnknownPrivileges}):await this.app.startCommand(targetName,input,{ui,allowUnknownPrivileges,expectedPlugin:command.plugin});
     if(this.ui.trackRun){
-      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:command.description??command.name,input});
+      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:command.description??command.name,input,done:run.done});
       if(command.action){void run.done.catch(error=>{if(!this.ui.closed)this.ui.show(`运行记录保存失败：${error.message}`);});return;}
     }
     const unsubscribe=this.ui.trackRun?()=>{}:this.app.subscribe(e=>{if(e.runId===run.id&&e.type==='log')this.ui.show(e.message);});
@@ -158,7 +200,7 @@ export class TerminalSession{
   async shellCommand(script){
     const run=await this.app.startShell(script);
     if(this.ui.trackRun){
-      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:'系统命令'});
+      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:'系统命令',done:run.done});
       void run.done.catch(error=>{if(!this.ui.closed)this.ui.show(`运行记录保存失败：${error.message}`);});return;
     }
     const unsubscribe=this.app.subscribe(event=>{if(event.runId===run.id&&event.type==='log')this.ui.show(event.message);});
@@ -172,22 +214,39 @@ export class TerminalSession{
     if(!plugins.length){this.ui.show('当前插件没有声明可配置字段。');return;}
     const id=selectedId??await this.ui.select('选择要配置的插件',plugins.map(p=>({value:p.id,label:p.title??p.id})));
     const plugin=plugins.find(p=>p.id===id);
-    const value=await editValue(this.ui,plugin.config,this.app.project.config?.[id]??{}, {baseDir:this.baseDir,required:true,label:plugin.title??id});
+    let current=structuredClone(this.app.project.config?.[id]??{});
+    try{current=validate(plugin.config,current,`${id} 配置`);}
+    catch(error){if(!plugin.configurationError||error.code!=='VALIDATION')throw error;}
+    const value=await editValue(this.ui,plugin.config,current, {baseDir:this.baseDir,required:true,label:plugin.title??id});
+    if(isDeepStrictEqual(value,current)){this.ui.show('插件配置未修改。');return;}
     const result=await this.withMaintenance(options=>this.app.configurePlugin(id,value,options));
     this.ui.show(result===null?'已取消修改。':`插件配置已保存到当前工作区。原项目配置备份：${result.backup}`);
   }
   async logs(){
     const statuses=runStatuses;
+    let filter='all',limit=20;
     while(true){
-      const history=(await this.app.listRunHistory()).sort((a,b)=>(b.status==='running')-(a.status==='running'));
-      if(!history.length)this.ui.show('还没有执行记录。运行工作流后，可在 /logs 回看。');
+      const records=(await this.app.listRunHistory()).sort((a,b)=>(b.status==='running')-(a.status==='running'));
+      const history=records.filter(run=>filter==='all'||filter==='session'&&run.sessionId===this.app.sessionId||filter==='plugins'&&['action','command'].includes(runCategory(run))||filter===runCategory(run));
+      const scope={all:'全部记录',session:'本次启动',plugins:'插件调用',workflow:'工作流',shell:'系统命令'}[filter];
+      if(!history.length)this.ui.show(records.length?'当前筛选没有执行记录。':'还没有执行记录。运行工作流或调用插件后，可在 /logs 回看。');
       const titles=new Map((await this.app.listWorkflows()).map(flow=>[flow.id,flow.title??flow.id]));
-      const choice=await this.ui.select('执行记录 · 选择一次执行，查看步骤、输入输出与日志',[
-        ...history.map(r=>({value:`run:${r.id}`,label:`${statuses[r.status]??r.status} · ${titles.get(r.workflowId)??r.workflowId}`,description:`${new Date(r.startedAt).toLocaleString()} · ${r.id.slice(0,8)}`})),
+      const choice=await this.ui.select(`执行记录 · ${scope} · ${history.length} 次执行${history.length>limit?`（显示前 ${limit} 次）`:''}`, [
+        ...history.slice(0,limit).map(r=>({value:`run:${r.id}`,label:`${statuses[r.status]??r.status} · ${runCategoryNames[runCategory(r)]} · ${r.title??titles.get(r.workflowId)??r.workflowId}`,description:`${new Date(r.startedAt).toLocaleString()} · ${r.id.slice(0,8)}${r.sessionId?` · ${r.sessionId===this.app.sessionId?'本次启动':'历史启动'}`:''}`})),
+        {value:'filter',label:'筛选记录'},
+        ...(history.length>limit?[{value:'more',label:'显示更多记录'}]:[]),
         {value:'usage',label:'查看日志体积',description:'按需统计，不清理文件'},
         {value:'back',label:'返回'},
       ]);
       if(choice==='back')return;
+      if(choice==='filter'){
+        const selected=await this.ui.select('筛选执行记录',[
+          {value:'all',label:'全部记录'},...(this.app.sessionId?[{value:'session',label:'本次启动'}]:[]),
+          {value:'workflow',label:'工作流执行'},{value:'plugins',label:'插件动作与命令'},{value:'shell',label:'系统命令'},{value:'back',label:'返回'},
+        ]);
+        if(selected!=='back'){filter=selected;limit=20;}continue;
+      }
+      if(choice==='more'){limit+=20;continue;}
       if(choice==='usage'){await this.logUsage();continue;}
       const id=choice.slice(4),record=history.find(r=>r.id===id);
       try{
@@ -200,7 +259,7 @@ export class TerminalSession{
   async add(){
     this.writable();const flow=structuredClone(this.current()),catalog=this.app.catalog(),workflows=await this.app.listWorkflows();
     await this.addNode(flow,[],catalog,workflows);
-    this.flow=flow;this.dirty=true;this.ui.show('步骤已添加，可在工作流菜单继续调整或保存。');
+    this.updateWorkflow(flow);this.ui.show('步骤已添加，可在工作流菜单继续调整或保存。');
   }
   async addNode(flow,parent,catalog,workflows){
     this.writable();
@@ -223,15 +282,20 @@ export class TerminalSession{
     if(step.parallel){
       const value=Number(await this.ui.input('最大并发数（1–32）',{value:String(step.parallel.concurrency??4),files:false}));
       if(!Number.isInteger(value)||value<1||value>32)throw new Error('并发数必须为 1–32 的整数');
-      step.parallel.concurrency=value;await this.editSequence(flow,[...index,'parallel','steps'],catalog,workflows);return;
+      if(step.parallel.concurrency!==undefined||value!==4)step.parallel.concurrency=value;
+      await this.editSequence(flow,[...index,'parallel','steps'],catalog,workflows);return;
     }
     if(step.branch){
-      step.branch.else??=[];
       while(true){
-        const choice=await this.ui.select('条件分支', [{value:'condition',label:'修改判断条件'},{value:'then',label:`条件成立 · ${step.branch.then.length} 步`},{value:'else',label:`条件不成立 · ${step.branch.else.length} 步`},{value:'done',label:'完成分支编辑'}]);
+        const choice=await this.ui.select('条件分支', [{value:'condition',label:'修改判断条件'},{value:'then',label:`条件成立 · ${step.branch.then.length} 步`},{value:'else',label:`条件不成立 · ${step.branch.else?.length??0} 步`},{value:'done',label:'完成分支编辑'}]);
         if(choice==='done')return;
         if(choice==='condition')step.branch.condition=await editCondition(this.ui,flow,index,catalog,workflows,{baseDir:this.baseDir,current:step.branch.condition});
-        else await this.editSequence(flow,[...index,'branch',choice],catalog,workflows);
+        else{
+          const absent=choice==='else'&&step.branch.else===undefined;
+          if(absent)step.branch.else=[];
+          await this.editSequence(flow,[...index,'branch',choice],catalog,workflows);
+          if(absent&&!step.branch.else.length)delete step.branch.else;
+        }
       }
     }
     return this.editBindings(flow,index,catalog,workflows);
@@ -252,7 +316,7 @@ export class TerminalSession{
     else if(action==='when')step.when=await editCondition(this.ui,flow,index,catalog,workflows,{baseDir:this.baseDir,current:step.when});
     else if(action==='clear-when')delete step.when;
     else if(action==='remove'){
-      if(!await this.ui.confirm('删除此步骤？引用它的步骤或输出需要重新设置。'))return;
+      if(!await this.ui.confirm('删除此步骤？'))return;
       for(const key of Object.keys(step.with??{}))setBinding(flow,index,key,'fixed',{},undefined);
       sequence.splice(position,1);
       pruneRuntimeInputs(flow);
@@ -276,7 +340,7 @@ export class TerminalSession{
       const choices=outputSources(flow,index,catalog,workflows).filter(s=>!schema.type||!s.schema?.type||schema.type===s.schema.type);
       const mode=await this.ui.select(`${schema.title??key} · 输入来源`,[
         {value:'fixed',label:'填写固定值 / @本地文件路径'},{value:'runtime',label:'每次运行时填写'},
-        ...choices.map(({value,label})=>({value,label})),...(!required?[{value:'unset',label:'不传此参数，使用插件默认值'}]:[]),
+        ...choices.map(({value,label})=>({value,label})),...(!required?[{value:'unset',label:`不传此参数${schema.default!==undefined?'，使用已声明的默认值':''}`}]:[]),
       ]);
       if(mode==='unset')setBinding(flow,index,key,'fixed',schema,undefined);
       else if(mode==='fixed'){
@@ -294,7 +358,7 @@ export class TerminalSession{
     if(this.app.project.readOnly){this.ui.show(JSON.stringify(flow.steps[index],null,2));return;}
     await this.stepOperation(flow,[index],catalog,workflows);
     if(isDeepStrictEqual(flow,this.flow))return;
-    this.flow=flow;this.dirty=true;this.ui.show('步骤已更新，保存前可继续调整。');
+    this.updateWorkflow(flow);this.ui.show(this.dirty?'步骤已更新，保存前可继续调整。':'修改已还原，与已保存版本一致。');
   }
   async outputs(){
     this.writable();const flow=structuredClone(this.current());flow.outputs??={};
@@ -307,7 +371,7 @@ export class TerminalSession{
       if(Object.hasOwn(flow.outputs,name))throw new Error('输出名称已存在，请使用另一个名称');
       flow.outputs[name]={$ref:source};
     }else delete flow.outputs[action.slice(7)];
-    this.flow=flow;this.dirty=true;this.ui.show('汇总输出已更新。');
+    this.updateWorkflow(flow);this.ui.show(this.dirty?'汇总输出已更新。':'修改已还原，与已保存版本一致。');
   }
   async startRun(args,{draft=false}={}){
     if(args.length>2)throw new Error('用法：/run [工作流ID] [@参数.json]');
@@ -341,7 +405,7 @@ export class TerminalSession{
     const input=reference?await readRunInput(reference,this.baseDir):(needsJsonEditor(flow.inputs)||Object.keys(flow.inputs?.properties??{}).length)?await editValue(this.ui,flow.inputs,{}, {baseDir:this.baseDir,label:'本次运行参数',required:true}):{};
     const run=await this.app.startRun(flow.id,input,{allowUnknownPrivileges});
     if(this.ui.trackRun){
-      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:flow.title??flow.id,input});
+      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:flow.title??flow.id,input,done:run.done});
       void run.done.catch(error=>{if(!this.ui.closed)this.ui.show(`运行记录保存失败：${error.message}`);});return true;
     }
     if(this.ui.observeRun){
@@ -355,7 +419,8 @@ export class TerminalSession{
       const result=await run.done;
       this.ui.show(`运行${runStatuses[result.status]??result.status}\n${JSON.stringify(result.reason??(result.status==='succeeded'?result.output:result.error),null,2)}`);
       if(result.status==='succeeded'&&!Object.keys(result.output??{}).length)this.ui.show(JSON.stringify(result.events.filter(e=>e.type==='step.succeeded').map(e=>({step:e.callPath,output:e.output})),null,2));
-      this.ui.show(`输入 /logs 在终端内查看日志\n可读日志：${path.join(this.app.outputDir,run.id,'run.md')}\n结果目录：${path.join(this.app.outputDir,run.id)}`);
+      const record=this.app.getRun(run.id);
+      this.ui.show(`输入 /logs 在终端内查看日志\n可读日志：${path.join(this.app.outputDir,run.id,'run.md')}${record?.resultDir?`\n生成文件：${record.resultDir}`:''}`);
     }finally{unsubscribe();done();}
     return true;
   }
@@ -377,7 +442,7 @@ export class TerminalSession{
         {value:'back',label:'返回主面板'},
       ]);
       if(choice==='back')return;
-      if(choice==='info')this.ui.show(`工作区：${this.app.projectDir}\n日志目录：${this.app.outputDir}\n模式：${this.app.project.readOnly?'只读运行包':'可编辑工作区'}`);
+      if(choice==='info')this.ui.show(`工作区：${this.app.projectDir}\n生成文件目录：${this.app.resultsDir}\n日志目录：${this.app.outputDir}\n模式：${this.app.project.readOnly?'只读运行包':'可编辑工作区'}`);
       else if(choice==='network')await this.networkSettings();
       else if(choice==='usage')await this.logUsage();
       else await this.logSettings();
@@ -398,15 +463,16 @@ export class TerminalSession{
     while(true){
       const policy=this.app.networkPolicy(),profiles=policy.profiles??{};
       const choice=await this.ui.select('代理配置（地址可用环境变量引用，凭据请勿写入项目）',[
-        ...Object.keys(profiles).map(name=>({value:`edit:${name}`,label:`修改 ${name}`})),
+        ...Object.keys(profiles).map(name=>({value:`${this.app.project.readOnly?'view':'edit'}:${name}`,label:`${this.app.project.readOnly?'查看':'修改'} ${name}`})),
         ...(!this.app.project.readOnly?[{value:'create',label:'＋ 新建代理配置'},...Object.keys(profiles).map(name=>({value:`delete:${name}`,label:`删除 ${name}`}))]:[]),
         {value:'back',label:'返回'},
       ]);
       if(choice==='back')return;
+      if(choice.startsWith('view:')){this.ui.show(JSON.stringify(profiles[choice.slice(5)],null,2));continue;}
       this.writable();
       if(choice.startsWith('delete:')){
         const name=choice.slice(7);
-        if(await this.ui.confirm(`删除代理配置 ${name}？引用它的规则需要先改为其他模式。`)){
+        if(await this.ui.confirm(`删除代理配置 ${name}？`)){
           delete profiles[name];const saved=await this.app.configureNetworkPolicy({...policy,profiles});
           this.ui.show(`代理配置 ${name} 已删除。原项目配置备份：${saved.backup}`);
         }
@@ -423,6 +489,7 @@ export class TerminalSession{
           next[key]=(await this.ui.input(source==='env'?'环境变量名称':label,{value:current[key]??'',files:false})).trim();
         }
       }
+      if(Object.hasOwn(profiles,name)&&isDeepStrictEqual(next,current)){this.ui.show('代理配置未修改。');continue;}
       const saved=await this.app.configureNetworkPolicy({...policy,profiles:{...profiles,[name]:next}});
       this.ui.show(`代理配置 ${name} 已保存。原项目配置备份：${saved.backup}`);
     }
@@ -466,6 +533,7 @@ export class TerminalSession{
           next.plugins[id].actions??={};next.plugins[id].actions[action]=rule;
         }
       }
+      if(isDeepStrictEqual(next,policy)){this.ui.show('代理规则未修改。');continue;}
       const saved=await this.app.configureNetworkPolicy(next);this.ui.show(`代理规则已保存。原项目配置备份：${saved.backup}`);
     }
   }
@@ -473,13 +541,14 @@ export class TerminalSession{
     const usage=await this.app.logUsage(),keep=this.app.logSettings().keepRuns;
     const units=['B','KiB','MiB','GiB','TiB'];let size=usage.bytes,index=0;
     while(size>=1024&&index<units.length-1){size/=1024;index++;}
-    this.ui.show(`日志目录：${usage.directory}\n日志文件体积：${index?size.toFixed(2):size} ${units[index]}（${usage.bytes} 字节，${usage.files} 个文件）${usage.incomplete?'，部分路径无法读取，统计不完整':''}\n统计该目录中所有运行的 run.md / events.jsonl / result.json，包含进行中的运行；不含业务文件，不跟随链接。共享目录可能包含其他项目。\n这是文件长度快照，运行中可能继续增长；并非磁盘实际分配空间。\n本项目保留策略：${keep===null?'不自动清理':`最近 ${keep} 次已结束运行`}；没有单次运行体积上限。`);
+    this.ui.show(`日志目录：${usage.directory}\n日志文件体积：${index?size.toFixed(2):size} ${units[index]}（${usage.bytes} 字节，${usage.files} 个文件）${usage.incomplete?'，部分路径无法读取，统计不完整':''}\n统计目录内所有 run.md / events.jsonl / result.json 的当前文件长度，不含业务文件、不跟随链接；并非磁盘实际分配空间。\n本项目保留策略：${keep===null?'不自动清理':`最近 ${keep} 次已结束运行`}；没有单次运行体积上限。`);
   }
   async logSettings(){
     const keep=this.app.logSettings().keepRuns;
     const mode=await this.ui.select('保留策略（整个项目合计，仅清理日志，保留业务文件）',[{value:'count',label:'仅保留最近 N 次已结束运行'},{value:'all',label:'不自动清理'},{value:'back',label:'返回'}]);
     if(mode==='back')return;
     const count=mode==='all'?null:Number(await this.ui.input('保留次数（例如 10）',{value:String(keep??10),files:false}));
+    if(count===keep){this.ui.show('日志保留设置未修改。');return;}
     const saved=await this.app.configureLogs(count);this.ui.show(`日志保留设置已保存。原项目配置备份：${saved.backup}${saved.warning?`\n${saved.warning.message}`:''}`);
   }
   async openRun(entry,{initialView}={}){
@@ -490,9 +559,9 @@ export class TerminalSession{
     this.ui.clearMessages?.();
     while(true){
     const plugins=this.app.listPlugins();
-    const action=await this.ui.select(`已安装插件（${plugins.length}）· ↑↓ 选择插件查看能力与配置`,[
-      ...plugins.map(p=>({value:`plugin:${p.id}`,label:`${p.title??p.id} · v${p.version} · ${pluginStatus(p)}`,description:p.description??p.id})),
-      ...(!this.app.project.readOnly?[{value:'local',label:'＋ 安装本地插件 / @路径'},{value:'npm',label:'＋ 安装 npm 插件包'},{value:'maintenance',label:this.app.maintenance?'恢复插件服务':'进入维护模式（停止有状态服务）'},...(this.web?[{value:'stop-web',label:'停止 Web 工作台'}]:[])]:[]),{value:'back',label:'返回工作台'},
+    const action=await this.ui.select(`插件（${plugins.length}）· ${this.app.pluginScope==='global'?'全局安装，配置保存在当前工作区':'工作区插件'} · ↑↓ 选择插件查看能力与配置`,[
+      ...plugins.map(p=>({value:`plugin:${p.id}`,label:`${p.title??p.id} · v${p.version} · ${pluginStatus(p)} · ${({global:'全局',workspace:'工作区',preset:'预置'})[p.scope]??'预置'}`,description:p.description??p.id})),
+      ...(!this.app.project.readOnly?[{value:'local',label:'＋ 安装本地插件 / @路径'},{value:'npm',label:'＋ 安装 npm 插件包'},{value:'maintenance',label:this.app.maintenance?'恢复插件服务':'进入维护模式（停止插件运行时服务）'},...(this.web?[{value:'stop-web',label:'停止 Web 工作台'}]:[])]:[]),{value:'back',label:'返回工作台'},
     ]);
     if(action.startsWith('plugin:')){
       try{await this.pluginPage(action.slice(7));}catch(error){if(error.code!=='PROMPT_CANCELLED')throw error;}
@@ -505,7 +574,7 @@ export class TerminalSession{
     if(action==='local'||action==='npm'){
       const text=await this.ui.input(action==='npm'?'npm 包名（支持 @scope/name）':'输入 @ 并选择插件目录或 .tgz',{files:action==='local'});
       const source=action==='local'?fileReference(text,this.baseDir):text.trim();if(!source)throw new Error('插件来源不能为空');
-      if(!await this.ui.confirm(`安装并加载可信插件：${source}？`))return;
+      if(!await this.ui.confirm(`${this.app.pluginScope==='global'?'全局安装，各工作区可用':'安装到当前工作区'}：${source}？`))return;
       const done=this.ui.busy('正在安装插件…');let result;try{result=await this.withMaintenance(options=>this.app.installPlugin(source,options));}finally{done();}
       if(result===null){this.ui.show('已取消安装。');continue;}
     }
@@ -515,7 +584,7 @@ export class TerminalSession{
   async pluginPage(id){
     while(true){
       const plugin=this.app.listPlugins().find(p=>p.id===id);if(!plugin)return;
-      const definition=this.app.host.definitions.get(id);
+      const definition=this.app.pluginDefinition?.(id)??this.app.host.definitions.get(id);
       // 详情显示作者声明；维护模式只停止执行，不能让能力说明消失。
       const actions=Object.entries(definition.actions??{}).map(([name,a])=>({...a,id:`${id}:${name}`}));
       const declaredCommands=Object.entries(definition.commands??{}).map(([name,c])=>({...c,name}));
@@ -532,12 +601,12 @@ export class TerminalSession{
       else if(choice==='configure')await this.configure(id);
       else if(choice.startsWith('command:'))await this.pluginCommand(commands.find(c=>c.name===choice.slice(8)),[]);
       else if(choice==='remove'){
-        this.writable();if(await this.ui.confirm(`移除 ${id}？`)){
+        this.writable();if(await this.ui.confirm(`${plugin.scope==='global'?'全局卸载（影响所有工作区）':'移除'} ${id}？`)){
           let removed;
           try{removed=await this.withMaintenance(options=>this.app.removePlugin(id,options));}
           catch(error){
             if(error.code!=='PLUGIN_IN_USE'||!error.details?.workflows?.length)throw error;
-            const names=error.details.workflows.map(w=>w.title??w.id).join('、');
+            const names=error.details.workflows.map(w=>`${w.title??w.id}${w.projectDir&&w.projectDir!==this.app.projectDir?`（${w.projectDir}）`:''}`).join('、');
             if(!await this.ui.confirm(`以下工作流仍使用 ${id}：${names}。移除后这些工作流将无法运行，仍要移除吗？`))continue;
             removed=await this.withMaintenance(options=>this.app.removePlugin(id,options),{force:true});
           }
@@ -547,7 +616,7 @@ export class TerminalSession{
     }
   }
   async pack(){
-    this.writable();if(this.dirty){if(!await this.ui.confirm('先保存当前工作流再选择打包？'))return;await this.execute('/save');}
+    this.writable();
     const flows=await this.app.listWorkflows(),entries=new Set();if(!flows.length)throw new Error('没有可打包的工作流');
     while(true){
       const selection=await this.ui.select('选择入口工作流（Enter 切换勾选）',[...flows.map(w=>({value:`workflow:${w.id}`,label:`${entries.has(w.id)?'[x]':'[ ]'} ${w.title??w.id}`})),{value:'done',label:'完成选择'}]);
@@ -555,6 +624,16 @@ export class TerminalSession{
       const id=selection.slice(9);
       if(entries.has(id))entries.delete(id);else entries.add(id);
     }
+    if(this.dirty){
+      const closures=await Promise.all([...entries].map(id=>this.app.checkWorkflow(id)));
+      if(closures.some(closure=>closure.workflows.some(flow=>flow.id===this.flow.id))){
+        const choice=await this.ui.select(`${this.flow.title??this.flow.id} 有未保存修改，已选入打包范围`,[
+          {value:'cancel',label:'返回，不打包'},{value:'saved',label:'打包已保存版本，保留当前草稿'},{value:'save',label:'保存修改后打包'},
+        ]);
+        if(choice==='cancel')return;
+        if(choice==='save')await this.execute('/save');
+      }
+    }
     const target=await this.ui.select('目标运行平台',[{value:'win32-x64',label:'Windows x64 ZIP'},{value:'linux-x64-glibc',label:'Linux x64 / Linux 容器 tar.gz'}]);
     const includeWeb=await this.ui.confirm('包含可选 Web 运行界面？（终端界面始终可用）');
     const readOnly=await this.ui.select('导出用途',[{value:'editable',label:'完整工具，可编辑工作区（含内部 npm）'},{value:'readonly',label:'只读精简运行包'}])==='readonly';

package/node_modules/@mytools/fst-cli/src/terminal/view.js

@@ -173,14 +173,14 @@ export class TerminalView{
     const width=this.terminal.columns,previous=this.transcript.render===undefined?0:new Text(safe(this.lastTranscript??''),1,0).render(width).length;
     const text=safe(this.transcriptText());
     if(this.historyOffset>0)this.historyOffset=Math.max(0,this.historyOffset+new Text(text,1,0).render(width).length-previous);
-    this.lastTranscript=text;this.transcript.setText(text.split('\n').map(line=>line.startsWith('✗ ')?palette.error(line):/^[›✓●] /.test(line)?palette.brand(line):line.startsWith('↩ ')?palette.muted(line):line).join('\n'));this.tui.requestRender();
+    this.lastTranscript=text;this.transcript.setText(text.split('\n').map(line=>line.startsWith('✗ ')?palette.error(line):/^[›✓●] /.test(line)?palette.brand(line):line.startsWith('↩ ')?palette.muted(line):line).join('\n'));this.tui.requestRender();this.onHistoryChange?.();
   }
   trackRun(options){this.feed.track(options);}
   clearMessages(){this.logs=[];this.refreshTranscript();}
   show(message,{kind='message'}={}){
     const text=safe(message).slice(0,6000);
     const formatted=kind==='welcome'?text.split('\n').map((line,i)=>i===0?palette.text(line):palette.muted(line)).join('\n'):text;
-    if(kind!=='welcome'){this.feed.message(formatted);return;}
+    if(kind!=='welcome'){this.feed.message(safe(message));return;}
     this.logs.push(formatted);this.logs=this.logs.slice(-6);this.refreshTranscript();
   }
   async viewMarkdown(title,text){
@@ -204,25 +204,47 @@ export class TerminalView{
     }
   }
   async observeRun({app,runId,record,flow,workflows=[],initialView}){
-    const previousPending=this.pending??null,children=this.tui.children;let overlay,unsubscribe,readPages=false;
+    let options={app,runId,record,flow,workflows,initialView};
+    for(;;){
+      const output=await this.observeRunPage(options);if(output===undefined)return;
+      await this.viewMarkdown('执行结果',output);options={...options,record:undefined,initialView:undefined};
+    }
+  }
+  async observeRunPage({app,runId,record,flow,workflows=[],initialView}){
+    const previousPending=this.pending??null,children=this.tui.children;let overlay,unsubscribe,unsubscribeFinished,elapsedTimer,readPages=false,renderedOutput;
     const initial=app.getRun(runId)??record??await app.readRun(runId);
     if(!initial)throw new Error('这次运行记录已不存在');
     try{
       await new Promise((resolve,reject)=>{
         this.pending={resolve,reject};
-        this.runViewer=new RunViewer({record:initial,flow:initial.status==='running'?flow:undefined,workflows,catalog:app.catalog?.()??[],terminal:this.terminal,onClose:resolve,onCancel:()=>app.cancelRun(runId),onReadLogs:app.readLogPage?()=>{readPages=true;resolve();}:undefined,requestRender:()=>this.tui.requestRender()});
-        Object.assign(this.runViewer,this.runViews.get(runId)??{});
-        if(initialView!==undefined){this.runViewer.view=initialView;this.runViewer.offset=0;}
-        unsubscribe=app.subscribe(event=>{if(event.runId===runId)this.runViewer?.update(app.getRun(runId));});
+        const viewer=new RunViewer({record:initial,flow:initial.status==='running'?flow:undefined,workflows,catalog:app.catalog?.()??[],terminal:this.terminal,onClose:resolve,onCancel:()=>app.cancelRun(runId),onReadLogs:app.readLogPage?()=>{readPages=true;resolve();}:undefined,onReadOutput:()=>{renderedOutput=viewer.getRenderedOutput();resolve();},requestRender:()=>this.tui.requestRender()});
+        this.runViewer=viewer;Object.assign(viewer,this.runViews.get(runId)??{});
+        if(initialView!==undefined){viewer.view=initialView;viewer.offset=0;}
+        const stopElapsed=()=>{if(elapsedTimer){clearInterval(elapsedTimer);elapsedTimer=null;}};
+        const finish=record=>{
+          if(this.runViewer!==viewer)return;
+          viewer.update(record);stopElapsed();
+        };
+        // 收尾晚于终态事件时补最终状态；关闭页面解除监听，不让长任务留住旧阅读器。
+        unsubscribeFinished=this.feed.subscribeFinished(runId,finish);
+        unsubscribe=app.subscribe(event=>{if(event.runId===runId&&this.runViewer===viewer)viewer.update(app.getRun(runId));});
+        if(initial.status==='running')elapsedTimer=setInterval(()=>{
+          const record=app.getRun(runId)??this.feed.runs.get(runId)?.record;viewer.update(record);
+          if(!record||record.status!=='running')stopElapsed();
+          if(!record&&app.readRun)void app.readRun(runId).then(record=>{if(this.runViewer===viewer)viewer.update(record);},()=>{});
+        },1000);
+        elapsedTimer?.unref?.();
         this.tui.children=[];this.terminal.write(mouseOn);
         overlay=this.tui.showOverlay(this.runViewer,{width:'100%',maxHeight:'100%',anchor:'top-left',margin:0});this.tui.requestRender(true);
       });
     }finally{
       if(this.runViewer){const {view,selected,offset,follow,allLogs,raw}=this.runViewer;this.runViews.set(runId,{view,selected,offset,follow,allLogs,raw});}
       if(this.runViews.size>30)this.runViews.delete(this.runViews.keys().next().value);
-      unsubscribe?.();this.runViewer=null;this.tui.children=children;this.pending=previousPending;overlay?.hide();this.terminal.write(mouseOff);this.tui.requestRender(true);
+      unsubscribe?.();unsubscribeFinished?.();this.runViewer=null;this.tui.children=children;this.pending=previousPending;overlay?.hide();this.terminal.write(mouseOff);this.tui.requestRender(true);
+      if(elapsedTimer)clearInterval(elapsedTimer);
     }
     if(readPages)await this.viewLogPages(app,runId);
+    return renderedOutput;
   }
   async viewLogPages(app,id){
     let cursor=0;const previous=[];
@@ -252,6 +274,7 @@ export class TerminalView{
       const historyText=text.trimStart().startsWith('!')?text:text.trim();
       if(this.homeInput&&historyText&&this.commandHistory.at(-1)!==historyText){
         this.commandHistory.push(historyText);if(this.commandHistory.length>100)this.commandHistory.shift();
+        this.onHistoryChange?.();
       }
       resolve(text);
     };component.onSelect=item=>resolve(item.value);component.onCancel=()=>reject(cancelled());});}