@yanglaofish/fishtools 0.2.0 → 0.4.0

package/node_modules/@mytools/core/src/terminal/run-feed.js

@@ -0,0 +1,78 @@
+import {readableValue,readableError,readableTimeline} from './run-presentation.js';
+import {runStatuses} from './run-viewer.js';
+
+// 主面板按事件到达顺序追加；运行快照另存，配置菜单不会清掉执行记录。
+export class RunFeed{
+  constructor(refresh){this.refresh=refresh;this.runs=new Map();this.entries=[];this.subscriptions=new Map();this.expanded=false;}
+  track({app,runId,title,input}){
+    if(this.runs.has(runId))return;
+    const record=app.getRun(runId),item={app,record,title,input,count:0,ended:false,steps:new Map(),catalog:new Map((app.catalog?.()??[]).map(action=>[action.id,action]))};
+    this.runs.set(runId,item);
+    this.entries.push({type:'start',item});
+    if(!this.subscriptions.has(app))this.subscriptions.set(app,app.subscribe(event=>{
+      const item=this.runs.get(event.runId);if(!item||item.app!==app)return;
+      this.update(item,event);this.release(app);
+      if(event.type==='log'&&!item.ended)this.scheduleRefresh();
+      else this.flushRefresh();
+    }));
+    this.update(item);this.release(app);this.refresh();
+  }
+  scheduleRefresh(){
+    if(this.refreshTimer)return;
+    this.refreshTimer=setTimeout(()=>{this.refreshTimer=null;this.refresh();},100);
+  }
+  flushRefresh(){
+    if(this.refreshTimer){clearTimeout(this.refreshTimer);this.refreshTimer=null;}
+    this.refresh();
+  }
+  update(item,event){
+    if(event?.type&&!['run.succeeded','run.failed','run.cancelled','run.stopped'].includes(event.type))item.record.events.push(event);
+    else{
+      const record=item.app.getRun(item.record.id);if(!record)return;
+      item.record={...record,events:[...(record.events??[])]};
+    }
+    const {record}=item,events=record.events.slice(item.count);item.count=record.events.length;
+    for(const event of events)if(event.type.startsWith('step.'))item.steps.set(event.callPath,{...item.steps.get(event.callPath),...event});
+    if(events.length){
+      const last=this.entries.at(-1);
+      if(last?.type==='events'&&last.item===item)last.events.push(...events);
+      else this.entries.push({type:'events',item,events});
+    }
+    if(record.status!=='running'&&!item.ended){item.ended=true;this.entries.push({type:'result',item});}
+  }
+  release(app){
+    if([...this.runs.values()].some(item=>item.app===app&&!item.ended))return;
+    this.subscriptions.get(app)?.();this.subscriptions.delete(app);
+  }
+  message(text){this.entries.push({type:'message',text});this.refresh();}
+  compactEvents(entry,seen){
+    const {item}=entry,rows=[];
+    for(const event of entry.events){
+      const key=`${item.record.id}\0${event.callPath}`;
+      if(event.type.startsWith('step.')&&!seen.has(key)){
+        seen.add(key);const latest=item.steps.get(event.callPath),action=item.catalog.get(latest.action);
+        const status=latest.type.slice(5),symbols={started:'●',succeeded:'✓',failed:'✗',cancelled:'×',skipped:'–',stopped:'■'};
+        const name=action?.title??latest.action??latest.stepId??latest.callPath;
+        rows.push(`${symbols[status]??'·'} ${name} · ${status==='started'?'执行中':runStatuses[status]??status}${latest.durationMs!==undefined?' · '+latest.durationMs+' ms':''}${action?.plugin?' · '+action.plugin:''} · ${latest.callPath}`);
+      }
+      if(event.type==='log'&&event.audience==='user')rows.push(`[${event.callPath??item.record.workflowId}] ${event.message??''}${event.data!==undefined?'\n'+readableValue(event.data):''}`);
+      if(event.type==='step.failed'&&![...item.steps.values()].some(step=>step.type==='step.failed'&&step.callPath?.startsWith(event.callPath+'/')))rows.push(`✗ ${event.callPath}\n${readableError(event.error??{message:event.message})}`);
+      if(event.type==='step.stopped'||event.type==='step.skipped')rows.push(`${event.callPath}：${event.reason??event.message??''}`);
+    }
+    return rows.length?`${item.title??item.record.workflowId} · ${item.record.id.slice(0,8)}\n${rows.join('\n')}`:'';
+  }
+  text(){const seen=new Set();return this.entries.map(entry=>{
+    if(entry.type==='message')return entry.text;
+    const {record,title,input}=entry.item,label=`${title??record.workflowId} · ${record.id.slice(0,8)}`;
+    if(entry.type==='start')return [
+      `› ${record.workflowId.startsWith('/')?record.workflowId:'/run '+record.workflowId} · ${label}`,
+      `状态：${runStatuses[record.status]??record.status}`,
+      this.expanded&&input&&Object.keys(input).length?'输入\n'+readableValue(input):'',
+    ].filter(Boolean).join('\n');
+    if(entry.type==='events')return this.expanded?`${label}\n${readableTimeline(entry.events,{values:true})}`:this.compactEvents(entry,seen);
+    return [`结果 · ${label} · ${runStatuses[record.status]??record.status}`,
+      this.expanded&&record.output!==undefined?readableValue(record.output):'',record.error&&(this.expanded||![...entry.item.steps.values()].some(step=>step.type==='step.failed'))?readableError(record.error,{details:this.expanded}):'',record.reason??'',
+    ].filter(Boolean).join('\n');
+  }).filter(Boolean).join('\n\n');}
+  close(){if(this.refreshTimer)clearTimeout(this.refreshTimer);this.refreshTimer=null;for(const unsubscribe of this.subscriptions.values())unsubscribe();this.subscriptions.clear();}
+}

package/node_modules/@mytools/core/src/terminal/run-presentation.js

@@ -0,0 +1,60 @@
+// 阅读层只处理展示；原始事件、输入输出与错误仍保留在运行记录中。
+export function readableValue(value,indent=''){
+  if(value===undefined)return '暂无记录';
+  if(value===null)return 'null';
+  if(typeof value!=='object')return String(value);
+  const entries=Array.isArray(value)?value.map((v,i)=>[`[${i+1}]`,v]):Object.entries(value);
+  if(!entries.length)return Array.isArray(value)?'（空列表）':'（空对象）';
+  return entries.map(([key,item])=>{
+    const nested=item!==null&&typeof item==='object';
+    return `${indent}${key}：${nested?'\n'+readableValue(item,indent+'  '):String(item).replaceAll('\n','\n'+indent+'  ')}`;
+  }).join('\n');
+}
+export function readableError(error,{details=false}={}){
+  if(!error)return '';
+  const chain=[];for(let current=error;current;current=current.cause)chain.push(current);
+  const program=chain.find(e=>e.details?.executable)?.details.executable;
+  const code=chain.find(e=>e.code==='ENOENT')?.code??error.code;
+  const summary=[`原因：${code==='ENOENT'&&program?'未找到所需程序':error.message??'未知错误'}`,error.plugin&&`插件：${error.plugin}`,code&&`错误码：${code}`,program&&`程序：${program}`,code==='ENOENT'&&'请检查程序是否安装、路径是否正确以及 PATH 配置。'].filter(Boolean).join('\n');
+  if(!details)return summary;
+  const diagnostic=chain.flatMap((item,index)=>[
+    `${index===0?'错误':'上游原因 '+index}：${item.message??'未知错误'}`,
+    item.code&&`错误码：${item.code}`,
+    item.details!==undefined&&`细节：\n${readableValue(item.details)}`,
+    item.stack&&`调用栈：\n${item.stack}`,
+  ].filter(Boolean));
+  return `${summary}\n\n${diagnostic.join('\n')}`;
+}
+const eventNames={'step.started':'步骤开始','step.succeeded':'步骤成功','step.failed':'步骤失败','step.cancelled':'步骤取消','step.skipped':'步骤跳过','step.stopped':'步骤停止','run.started':'运行开始','run.succeeded':'运行成功','run.failed':'运行失败','run.cancelled':'运行取消','run.stopped':'提前结束'};
+const time=value=>{const date=new Date(value);return Number.isFinite(+date)?date.toLocaleTimeString('zh-CN',{hour12:false}):'--:--:--';};
+export function readableTimeline(events,{callPath,values=false}={}){
+  const rows=[];let pending;
+  const push=(event,message)=>{
+    const prefix=`${time(event.time)}  [${event.callPath??'运行'}${event.stream?' · '+event.stream:''}]`;
+    const lines=String(message).replaceAll('\r\n','\n').replaceAll('\r','\n').split('\n');
+    if(lines.at(-1)==='')lines.pop();
+    for(const line of lines)rows.push(`${prefix}  ${line}`);
+  };
+  const flush=()=>{if(pending){if(pending.text)push(pending.event,pending.text);pending=null;}};
+  for(const event of events??[]){
+    if(callPath&&event.callPath!==callPath)continue;
+    if(event.type==='log'&&event.stream){
+      const key=`${event.callPath}\0${event.stream}`;
+      if(pending?.key!==key){flush();pending={key,event,text:''};}
+      pending.text+=event.message??'';
+      const end=pending.text.lastIndexOf('\n');
+      if(end>=0){push(pending.event,pending.text.slice(0,end+1));pending.text=pending.text.slice(end+1);pending.event=event;}
+      continue;
+    }
+    if(event.type==='log'){flush();push(event,`${event.message??''}${event.data!==undefined?'\n'+readableValue(event.data):''}`);continue;}
+    if(eventNames[event.type]){
+      const detail=event.error?readableError(event.error,{details:values}):event.reason??event.message;
+      flush();push(event,`${eventNames[event.type]}${event.action?' · '+event.action:''}${event.durationMs!==undefined?` · ${event.durationMs} ms`:''}${detail?'\n'+detail:''}`);
+      if(values&&event.type.startsWith('step.')){
+        if(event.input!==undefined&&Object.keys(event.input??{}).length)push(event,'输入\n'+readableValue(event.input));
+        if(event.output!==undefined)push(event,'输出\n'+readableValue(event.output));
+      }
+    }
+  }
+  flush();return rows.join('\n')||'等待执行记录。插件通过 log 或 runProcess 输出的内容会显示在这里。';
+}

package/node_modules/@mytools/core/src/terminal/run-viewer.js

@@ -1,6 +1,7 @@
 import { stripVTControlCharacters } from 'node:util';
 import { Text, matchesKey, truncateToWidth } from '@mariozechner/pi-tui';
 import {palette} from './theme.js';
+import {readableValue,readableError,readableTimeline} from './run-presentation.js';
 
 export const runStatuses={pending:'待执行',running:'运行中',succeeded:'成功',failed:'失败',cancelled:'已取消',skipped:'已跳过',stopped:'已停止'};
 const safe=value=>stripVTControlCharacters(String(value)).replace(/[\x00-\x08\x0b-\x1f\x7f]/g,'');
@@ -9,8 +10,8 @@ export const mouseOn='\x1b[?1000h\x1b[?1006h';
 export const mouseOff='\x1b[?1006l\x1b[?1000l';
 
 export class RunViewer{
-  constructor({record,flow,workflows=[],terminal,onClose,onCancel,requestRender}){
-    Object.assign(this,{terminal,onClose,onCancel,requestRender});this.view=0;this.selected=0;this.offset=0;this.follow=true;this.allLogs=false;this.confirmCancel=false;
+  constructor({record,flow,workflows=[],catalog=[],terminal,onClose,onCancel,requestRender}){
+    Object.assign(this,{terminal,onClose,onCancel,requestRender,catalog});this.view=0;this.selected=0;this.offset=0;this.follow=true;this.allLogs=true;this.raw=false;this.confirmCancel=false;
     this.planned=[];
     const walk=(steps,prefix,ancestors)=>{
       for(const step of steps??[]){
@@ -30,20 +31,34 @@ export class RunViewer{
     for(const event of record.events??[]){
       if(!event.type.startsWith('step.')||!event.callPath)continue;
       const node=nodes.get(event.callPath)??{callPath:event.callPath,stepId:event.stepId};
-      Object.assign(node,event,{status:event.type==='step.started'?'running':event.type.slice(5)});nodes.set(event.callPath,node);
+      Object.assign(node,event,{status:event.type==='step.started'?'running':event.type.slice(5)});
+      node.title??=this.catalog.find(action=>action.id===node.action)?.title;nodes.set(event.callPath,node);
     }
     this.nodes=[...nodes.values()];this.selected=Math.max(0,Math.min(this.selected,this.nodes.length-1));
     this.requestRender();
   }
   content(){
     const node=this.nodes[this.selected],status=runStatuses[this.record.status]??this.record.status;
-    if(this.view===0)return [`运行：${status}${this.record.reason?` · ${this.record.reason}`:''}`,this.record.error?`错误：${this.record.error.message}`:'',...this.nodes.map((n,i)=>`${i===this.selected?'›':' '} ${runStatuses[n.status]??n.status} · ${n.callPath}${n.action?` · ${n.action}`:''}${n.message?` · ${n.message}`:''}`)].filter(Boolean).join('\n');
-    if(this.view===1)return `步骤：${node?.callPath??'运行结果'}\n输入\n${JSON.stringify(node?.input??{},null,2)}\n输出\n${JSON.stringify(node?.output??{},null,2)}${node?.error?`\n错误\n${JSON.stringify(node.error,null,2)}`:''}${node?.reason||node?.message?`\n说明：${node.reason??node.message}`:''}\n运行状态：${status}${this.record.reason?` · ${this.record.reason}`:''}\n汇总输出\n${JSON.stringify(this.record.output??{},null,2)}`;
-    const logs=(this.record.events??[]).filter(e=>e.type==='log'&&(this.allLogs||!node||e.callPath===node.callPath));
-    return logs.length?logs.map(e=>`${this.allLogs?`[${e.callPath??'运行'}] `:''}[${e.stream??'日志'}] ${e.message??''}${e.data?` ${JSON.stringify(e.data)}`:''}`).join('\n'):'尚无日志';
+    if(this.view===0)return [
+      `运行：${status}${this.record.reason?` · ${this.record.reason}`:''}`,
+      this.record.error?readableError(this.record.error):'',
+      this.record.output!==undefined?'\n最终输出\n'+readableValue(this.record.output):'',
+      '\n步骤 · Enter 查看详情',
+      ...this.nodes.map((n,i)=>`${i===this.selected?'›':' '} ${runStatuses[n.status]??n.status} · ${n.title??n.callPath}${n.durationMs!==undefined?` · ${n.durationMs} ms`:''}${n.reason?' · '+n.reason:''}`),
+      !this.nodes.length?'此运行没有工作流步骤，可在日志页查看插件输出。':'',
+    ].filter(Boolean).join('\n');
+    if(this.view===1){
+      const format=value=>this.raw?JSON.stringify(value??null,null,2):readableValue(value);
+      const error=node?node.error:this.record.error;
+      return [`步骤：${node?.callPath??'整个运行'}`,node?.action?'能力：'+node.action:'',error?'\n错误\n'+(this.raw?format(error):readableError(error)):'',
+        node?'\n输入\n'+format(node.input):'', '\n输出\n'+format(node?node.output:this.record.output),
+        !error&&(node?.reason||node?.message)?'\n说明：'+(node.reason??node.message):'',this.raw?'\n原始 JSON · 包含完整错误详情与调用栈':'\nj 查看原始 JSON 与完整诊断',
+      ].filter(Boolean).join('\n');
+    }
+    return readableTimeline(this.record.events,{callPath:this.allLogs?undefined:node?.callPath});
   }
   layout(width){
-    const height=Math.max(1,this.terminal.rows),pageSize=Math.max(1,height-3);
+    const height=Math.max(1,this.terminal.rows),pageSize=Math.max(1,height-4);
     const lines=new Text(safe(this.content()),0,0).render(Math.max(1,width));
     const maxOffset=Math.max(0,lines.length-pageSize);
     this.offset=this.follow&&this.view===2?maxOffset:Math.max(0,Math.min(this.offset,maxOffset));
@@ -54,20 +69,23 @@ export class RunViewer{
     const body=lines.slice(this.offset,this.offset+pageSize);while(body.length<pageSize)body.push('');
     const tabs=`${['1 总览','2 输入输出','3 日志'].map((s,i)=>this.view===i?palette.brand(`[${s}]`):palette.muted(s)).join('  ')} ${palette.muted('·')} ${palette.text(safe(runStatuses[this.record.status]??this.record.status))} ${palette.muted('· '+safe(this.record.workflowId??'运行'))}`;
     const selection=`[ / ] 切换步骤：${node?.callPath??'暂无步骤'}${this.view===2?` · ${this.allLogs?'全部日志':'本步骤日志'} · ${this.follow?'跟随尾部':'暂停跟随'}`:''}`;
-    const footer=this.confirmCancel?'取消整个运行？y 确认 · 任意其他键返回':`q/Esc 关闭 · x 取消 · ↑↓/滚轮 PgUp/PgDn · End 跟随 · a 全部日志 · ${this.offset+1}–${Math.min(this.offset+pageSize,lines.length)}/${lines.length}`;
+    const footer=this.confirmCancel?'取消整个运行？y 确认 · 任意其他键返回':'q/Esc 返回 · x 取消 · 1/2/3 切换';
+    const shortcuts=width<60?'↑↓/滚轮 · [ ] 步骤 · j 原始数据':`↑↓/滚轮 翻页 · [ ] 步骤 · j 原始数据 · a 全部/本步骤 · End 跟随 · ${this.offset+1}–${Math.min(this.offset+pageSize,lines.length)}/${lines.length}`;
     const styledBody=body.map(line=>line.startsWith('›')?palette.brand(line):line);
     const styledFooter=palette.muted(safe(footer));
-    const screen=height===1?styledBody:height===2?[styledBody[0],styledFooter]:height===3?[tabs,styledBody[0],styledFooter]:[tabs,palette.muted(safe(selection)),...styledBody,styledFooter];
+    const screen=height===1?styledBody:height===2?[styledBody[0],styledFooter]:height===3?[tabs,styledBody[0],styledFooter]:height===4?[tabs,styledBody[0],styledFooter,palette.muted(shortcuts)]:[tabs,palette.muted(safe(selection)),...styledBody,styledFooter,palette.muted(shortcuts)];
     return screen.map(line=>truncateToWidth(line,width));
   }
   handleInput(data){
     if(this.confirmCancel){this.confirmCancel=false;if(data==='y')this.onCancel();this.requestRender();return;}
-    if(['escape','q','enter'].some(key=>matchesKey(data,key))){this.onClose();return;}
+    if(['escape','q'].some(key=>matchesKey(data,key))){this.onClose();return;}
+    if(matchesKey(data,'enter')){if(this.view===0){this.view=1;this.offset=0;this.requestRender();}return;}
+    if(data==='j'){this.raw=!this.raw;this.view=1;this.offset=0;this.requestRender();return;}
     if(data==='x'&&this.record.status==='running'){this.confirmCancel=true;this.requestRender();return;}
     if(['1','2','3'].includes(data)){this.view=Number(data)-1;this.offset=0;this.follow=true;this.requestRender();return;}
     if(data==='['||data===']'){
       this.selected=Math.max(0,Math.min(this.nodes.length-1,this.selected+(data===']'?1:-1)));this.offset=0;
-      if(this.view===0)this.offset=Math.max(0,this.selected-Math.floor((this.terminal.rows-3)/2));
+      if(this.view===0){const {lines,pageSize,maxOffset}=this.layout(this.terminal.columns);const row=lines.findIndex(line=>line.startsWith('›'));this.offset=Math.min(maxOffset,Math.max(0,row-Math.floor(pageSize/2)));}
       this.requestRender();return;
     }
     if(data==='a'){this.allLogs=!this.allLogs;this.offset=0;this.requestRender();return;}

package/node_modules/@mytools/core/src/terminal/session.js

@@ -1,16 +1,20 @@
 import { randomUUID } from 'node:crypto';
+import { isDeepStrictEqual } from 'node:util';
 import path from 'node:path';
-import { commands, parseCommand, fileReference, readRunInput, newWorkflow, setBinding, stepMetadata, outputSources, stepAt, sequenceAt, pruneRuntimeInputs } from './model.js';
+import { parseCommand, fileReference, readRunInput, newWorkflow, setBinding, stepMetadata, outputSources, stepAt, sequenceAt, pruneRuntimeInputs } from './model.js';
 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 {commandMenu} from './navigation.js';
+import {workflowMenu} from './workflow-menu.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;}
+  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;}
   writable(){if(this.app.project.readOnly)throw new Error('这是只读运行包，请在完整工作区中编排、安装或打包');}
-  current(){if(!this.flow)throw new Error('先用 /workflows 打开工作流，或用 /new 新建');return this.flow;}
-  commands(){return [...commands,...this.app.listCommands()];}
+  current(){if(!this.flow)throw new Error('先用 /workflows 打开或新建工作流');return this.flow;}
+  commands(){return commandMenu(this.app.listPlugins?.()??[],this.app.listCommands());}
   async discard(){return !this.dirty||await this.ui.confirm('当前修改未保存，是否放弃修改？');}
   async mayExit(){
     if(!await this.discard())return false;
@@ -27,15 +31,25 @@ export class TerminalSession{
       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?'未保存':'已保存'}`:''}`);
         let text;
-        try{text=await this.ui.input('fst > 输入 / 选择操作，@ 引用文件',{commands:this.commands()});}
+        try{text=await this.ui.input('fst > 输入 / 选择操作，@ 引用文件',{commands:this.commands(),workflows:await this.app.listWorkflows()});}
         catch(e){if(e.code!=='PROMPT_CANCELLED')throw e;try{if(await this.mayExit())break;}catch{}continue;}
         if(!text.trim())continue;
-        try{await this.execute(text);}catch(e){this.ui.show(e.code==='PROMPT_CANCELLED'?'已返回，未完成的修改已放弃。':`操作失败：${e.message}`);}
+        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();}
   }
   async execute(text){
+    // 只记录用户提交的入口；菜单内部调用 /save 等动作不制造伪命令。
+    const outer=!this.commandDepth;
+    if(outer)this.ui.beginCommand?.(text);
+    this.commandDepth=(this.commandDepth??0)+1;
+    try{return await this.executeCommand(text);}
+    finally{this.commandDepth--;if(outer&&!this.exiting)this.ui.endCommand?.();}
+  }
+  async executeCommand(text){
     const [command,...args]=parseCommand(text);
+    const entry=this.commands().find(c=>c.name===command&&c.plugin);
+    if(entry){if(args.length)throw new Error(`/${command} 请从二级菜单选择能力`);return this.pluginSkills(entry.plugin);}
     const pluginCommand=this.app.listCommands().find(c=>c.name===command);
     if(pluginCommand)return this.pluginCommand(pluginCommand,args);
     if(command!=='run'&&args.length)throw new Error(`/${command} 使用交互选择，请不要附加参数`);
@@ -46,8 +60,11 @@ export class TerminalSession{
         `当前工作区：${this.app.projectDir}`,
         `文件路径起点：${this.baseDir}`,
         '## 常用操作',gettingStarted(await this.app.listWorkflows(),this.app.project),
-        '## 编排工作流','/new 新建 → /add 添加步骤 → /steps 编辑参数、条件与分组 → /save 保存 → /run 执行。',
-        '## 观察运行','/runs 打开观察面板。1 / 2 / 3 切换步骤总览、输入输出和日志，[ / ] 切换步骤。↑↓、PgUp/PgDn 或滚轮浏览；End 恢复尾部跟随。q / Esc 关闭后任务在后台继续，x 后 y 明确取消。',
+        '## 编排工作流','/workflows 浏览、新建、打开工作流，进入后添加步骤、编辑参数、设置输出、保存或删除。删除会保留备份，仍被其他流程引用时不能删除。/run 选择已保存的工作流，或补全工作流 ID/中文标题后执行已保存版本，不会要求保存编辑草稿。要执行未保存修改，在工作流编辑菜单选择运行，再选择保存并运行；返回编辑会保留草稿。',
+        '## 主面板','运行期间可以继续输入命令，打开配置、管理插件或执行其他工作流。↑/↓ 回看本次启动已提交的命令，回到底部恢复草稿；补全菜单打开时仍用于选择候选。Ctrl+O 展开或收起执行详情，PgUp/PgDn 或滚轮浏览执行过程；/logs 回看各次执行的步骤、输入输出和日志。关闭菜单不会清空运行内容。',
+        '## 命令分层','/config 配置 Fishtools，/plugin 管理插件及各插件配置。输入 /插件入口名 后进入该插件的能力菜单；补全列表标明 [内置] 或 [插件]。/tools 包含 Web 与离线文档。旧 /new、/add、/steps、/outputs、/save、/plugins 以及插件的原始命令仍可直接输入。',
+        '## 观察运行','输入 /logs 打开执行记录。列表包含多个工作流的每次执行，运行中任务排在前面；选择后查看进度、结果和日志。从详情返回后可选择另一条记录，本次启动期间每条记录分别保留阅读位置。重启后仍可查看保留下来的执行记录。',
+        '1 / 2 / 3 切换总览、输入输出和日志，Enter 查看步骤详情，[ / ] 切换步骤，j 查看原始诊断数据。↑↓、PgUp/PgDn 或滚轮浏览；End 恢复尾部跟随。q / Esc 返回，正在执行的任务在后台继续，x 后 y 明确取消。',
         '## 文件与运行参数','输入 @ 后按 Tab 选择文件；@@ 表示字面量 @。运行命令的 @参数.json 会读取 JSON 对象作为输入。',
         '/run 工作流ID @"参数 文件.json"',
         '## 离线文档','输入 /docs 阅读插件开发、部署、控制流与服务文档。独立命令 fst docs --path 查看资料位置，fst docs --export 目标目录 导出资料。',
@@ -61,28 +78,26 @@ export class TerminalSession{
         return;
       }
       case 'exit':if(await this.mayExit())this.exiting=true;return;
-      case 'workflows':{
-        const flows=await this.app.listWorkflows();
-        if(!flows.length){this.ui.show('没有工作流，输入 /new 新建。');return;}
-        if(!await this.discard())return;
-        const id=await this.ui.select('打开工作流',flows.map(w=>({value:w.id,label:w.title??w.id,description:`${w.steps.length} 步 · ${w.description??''}`})));
-        this.flow=structuredClone(flows.find(w=>w.id===id));this.dirty=false;this.ui.show(`已打开：${this.flow.title}`);return;
-      }
+      case 'workflows':return workflowMenu(this);
       case 'new':{
-        this.writable();if(!await this.discard())return;
+        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('已新建。输入 /add 添加第一个步骤。');return;
+        this.flow=newWorkflow(title,description);this.dirty=true;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 'run':return this.startRun(args);
-      case 'runs':return this.runs();
+      case 'runs':return this.logs();
       case 'logs':return this.logs();
-      case 'plugins':return this.plugins();
-      case 'config':return this.configure();
+      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;
+      }
       case 'pack':return this.pack();
       case 'web':{
         if(!this.web)this.web=await this.app.startWeb(this.webOptions);
@@ -96,9 +111,13 @@ export class TerminalSession{
     const input=args.length?await readRunInput(args[0],this.baseDir):command.input?await editValue(this.ui,command.input,{}, {baseDir:this.baseDir,required:true,label:command.description}):{};
     const ui=Object.fromEntries(['input','select','show','confirm'].map(name=>[name,this.ui[name].bind(this.ui)]));
     const run=await this.app.startCommand(command.name,input,{ui});
-    const unsubscribe=this.app.subscribe(e=>{if(e.runId===run.id&&e.type==='log')this.ui.show(e.message);});
+    if(this.ui.trackRun){
+      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:command.description??command.name,input});
+      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);});
     const done=this.ui.busy(`正在执行 /${command.name} · Ctrl+C 取消`,()=>this.app.cancelRun(run.id));
-    try{const result=await run.done;this.ui.show(`${result.status}\n${JSON.stringify(result.error??result.output,null,2)}\n输入 /logs 在终端内查看日志\n可读日志：${path.join(this.app.outputDir,run.id,'run.md')}`);}
+    try{const result=await run.done;if(!this.ui.trackRun)this.ui.show(`插件执行${runStatuses[result.status]??result.status}\n${result.error?readableError(result.error):readableValue(result.output)}\n/logs 查看执行详情与历史日志`);}
     finally{unsubscribe();done();}
   }
   async configure(selectedId){
@@ -113,27 +132,26 @@ export class TerminalSession{
   async logs(){
     const statuses=runStatuses;
     while(true){
-      const history=await this.app.listRunHistory(),keep=this.app.logSettings().keepRuns;
-      const choice=await this.ui.select(`运行日志 · ${keep===null?'不自动清理':`项目保留最近 ${keep} 次`}`,[
-        ...history.map(r=>({value:`run:${r.id}`,label:`${statuses[r.status]??r.status} · ${r.workflowId}`,description:`${new Date(r.startedAt).toLocaleString()} · ${r.id}`})),
-        ...(!this.app.project.readOnly?[{value:'settings',label:'设置日志保留次数'}]:[]),{value:'back',label:'返回'},
+      const history=(await this.app.listRunHistory()).sort((a,b)=>(b.status==='running')-(a.status==='running'));
+      if(!history.length){this.ui.show('还没有执行记录。运行工作流后，可在 /logs 回看。');return;}
+      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)}`})),
+        {value:'back',label:'返回'},
       ]);
       if(choice==='back')return;
-      if(choice==='settings'){
-        const mode=await this.ui.select('保留策略（整个项目合计，仅清理日志，保留业务文件）',[{value:'count',label:'仅保留最近 N 次已结束运行'},{value:'all',label:'不自动清理'},{value:'back',label:'返回'}]);
-        if(mode==='back')continue;
-        const count=mode==='all'?null:Number(await this.ui.input('保留次数（例如 10）',{value:String(keep??10),files:false}));
-        await this.app.configureLogs(count);this.ui.show('日志保留设置已保存。');continue;
-      }
       const id=choice.slice(4),record=history.find(r=>r.id===id);
-      try{await this.ui.viewMarkdown(`${record.workflowId} · ${statuses[record.status]??record.status}`,await this.app.readLog(id));}
+      try{
+        if(this.ui.observeRun)await this.openRun(record,{initialView:2});
+        else await this.ui.viewMarkdown(`${record.workflowId} · ${statuses[record.status]??record.status}`,await this.app.readLog(id));
+      }
       catch(error){if(error.code!=='PROMPT_CANCELLED')throw error;}
     }
   }
   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('步骤已添加。/add 继续添加，/steps 调整，/save 保存。');
+    this.flow=flow;this.dirty=true;this.ui.show('步骤已添加，可在工作流菜单继续调整或保存。');
   }
   async addNode(flow,parent,catalog,workflows){
     this.writable();
@@ -226,6 +244,7 @@ export class TerminalSession{
     const index=flow.steps.findIndex(s=>s.id===id);
     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('步骤已更新，保存前可继续调整。');
   }
   async outputs(){
@@ -241,22 +260,42 @@ export class TerminalSession{
     }else delete flow.outputs[action.slice(7)];
     this.flow=flow;this.dirty=true;this.ui.show('汇总输出已更新。');
   }
-  async startRun(args){
+  async startRun(args,{draft=false}={}){
     if(args.length>2)throw new Error('用法：/run [工作流ID] [@参数.json]');
     const [first,second]=args;let reference=first?.startsWith('@')?first:second;
     if(first?.startsWith('@')&&second)throw new Error('参数文件后不能再附加参数');
-    let flow=this.flow;
-    if(first&&!first.startsWith('@')&&first!==flow?.id){
-      const found=(await this.app.listWorkflows()).find(w=>w.id===first);if(!found)throw new Error(`工作流不存在：${first}`);flow=found;
+    const workflows=await this.app.listWorkflows();
+    let flow=draft?this.current():null;
+    if(first&&!first.startsWith('@')){
+      flow=workflows.find(w=>w.id===first);if(!flow)throw new Error(`工作流不存在：${first}`);
+    }
+    if(!flow){
+      if(!workflows.length){this.ui.show('还没有已保存的工作流，请在 /workflows 中新建并保存。');return false;}
+      const id=await this.ui.select('运行 · 选择已保存的工作流',[...workflows.map(w=>({value:`workflow:${w.id}`,label:w.title??w.id,description:w.id})),{value:'back',label:'返回主面板'}]);
+      if(id==='back')return false;flow=workflows.find(w=>`workflow:${w.id}`===id);
+    }
+    if(flow===this.flow&&this.dirty){
+      const saved=workflows.find(w=>w.id===flow.id);
+      const choice=await this.ui.select(`${flow.title??flow.id} · 有未保存的修改`,[
+        {value:'cancel',label:'返回编辑',description:'保留草稿，本次不运行'},
+        {value:'save',label:'保存并运行',description:'将当前修改保存到工作流文件'},
+        ...(saved?[{value:'saved',label:'运行已保存版本',description:'保留当前草稿，不执行未保存修改'}]:[]),
+      ]);
+      if(choice==='cancel'){this.ui.show('已取消本次运行，草稿保留，返回工作流编辑。');return false;}
+      if(choice==='saved')flow=saved;
+      else await this.execute('/save');
     }
-    if(!flow)throw new Error('先用 /workflows 选择工作流，或使用 /run 工作流ID');
-    if(flow===this.flow&&this.dirty){if(!await this.ui.confirm('保存当前修改后运行？'))return;await this.execute('/save');}
     await this.app.checkWorkflow(flow.id);
     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);
+    if(this.ui.trackRun){
+      this.ui.clearMessages?.();this.ui.trackRun({app:this.app,runId:run.id,title:flow.title??flow.id,input});
+      void run.done.catch(error=>{if(!this.ui.closed)this.ui.show(`运行记录保存失败：${error.message}`);});return true;
+    }
     if(this.ui.observeRun){
       await this.ui.observeRun({app:this.app,runId:run.id,flow,workflows:await this.app.listWorkflows()});
-      this.ui.show(`已关闭运行观察面板。输入 /runs 重新查看，/logs 查看历史日志。`);return;
+      const status=this.app.getRun(run.id)?.status;
+      this.ui.clearMessages?.();this.ui.show(`${status==='running'?'已返回工作台，任务在后台继续执行。':`本次运行${runStatuses[status]??'已结束'}。`}\n输入 /logs 查看任意一次执行的进度、结果和日志。`);return true;
     }
     const unsubscribe=this.app.subscribe(e=>{if(e.runId===run.id&&e.type.startsWith('step.'))this.ui.show(`${e.type} · ${e.callPath}${e.message?' · '+e.message:''}`);});
     const done=this.ui.busy('运行中 · Ctrl+C 取消当前运行',()=>this.app.cancelRun(run.id));
@@ -266,14 +305,38 @@ export class TerminalSession{
       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)}`);
     }finally{unsubscribe();done();}
+    return true;
+  }
+  async pluginSkills(id){
+    const plugin=this.app.listPlugins().find(p=>p.id===id),commands=this.app.listCommands().filter(c=>c.plugin===id);
+    const choice=await this.ui.select(`[插件] ${plugin?.title??id} · 选择能力`,[
+      ...commands.map(c=>({value:`command:${c.name}`,label:c.description??c.name,description:`/${c.name}`})),{value:'back',label:'返回主面板'},
+    ]);
+    if(choice!=='back')await this.pluginCommand(commands.find(c=>`command:${c.name}`===choice),[]);
+  }
+  async toolConfig(){
+    while(true){
+      const keep=this.app.logSettings().keepRuns;
+      const choice=await this.ui.select('Fishtools 配置',[
+        {value:'info',label:'查看工作区信息'},
+        ...(!this.app.project.readOnly?[{value:'logs',label:'日志保留次数',description:keep===null?'不自动清理':`最近 ${keep} 次`}]:[]),
+        {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?'只读运行包':'可编辑工作区'}`);
+      else await this.logSettings();
+    }
   }
-  async runs(){
-    const runs=this.app.listRuns();
-    if(!runs.length){this.ui.show('当前会话还没有运行。/run 执行工作流，/logs 查看历史记录。');return;}
-    const id=await this.ui.select('运行观察 · 关闭面板后后台继续', [...runs.slice().reverse().map(run=>({value:run.id,label:`${runStatuses[run.status]??run.status} · ${run.workflowId}`,description:run.id})),{value:'back',label:'返回工作台'}]);
-    if(id==='back')return;
-    const workflows=await this.app.listWorkflows(),record=this.app.getRun(id);
-    await this.ui.observeRun({app:this.app,runId:id,flow:workflows.find(flow=>flow.id===record.workflowId),workflows});
+  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}));
+    await this.app.configureLogs(count);this.ui.show('日志保留设置已保存。');
+  }
+  async openRun(entry,{initialView}={}){
+    const record=this.app.getRun(entry.id)??await this.app.readRun(entry.id),workflows=await this.app.listWorkflows();
+    await this.ui.observeRun({app:this.app,runId:record.id,record,flow:workflows.find(flow=>flow.id===record.workflowId),workflows,initialView});
   }
   async plugins(){
     this.ui.clearMessages?.();
@@ -339,7 +402,12 @@ export class TerminalSession{
     const closure=await this.app.checkWorkflow([...entries][0]);
     const ids=new Set(closure.plugins);
     for(const id of [...entries].slice(1))for(const plugin of (await this.app.checkWorkflow(id)).plugins)ids.add(plugin);
-    if(includeWeb)ids.add('@mytools/web');
+    if(includeWeb){
+      const provider=[...this.app.host.definitions.values()].find(plugin=>typeof plugin.services?.web==='function');
+      if(!provider)throw new Error('未安装提供 Web 服务的插件');
+      ids.add(provider.id);
+    }
+    for(const id of ids)for(const dependency of Object.keys(this.app.host.definitions.get(id)?.dependencies??{}))ids.add(dependency);
     const environments={};
     for(const id of ids){
       const plugin=this.app.host.definitions.get(id),declarations=new Map();
@@ -363,7 +431,7 @@ export class TerminalSession{
 
 export async function startTerminal(app,options={}){
   const {TerminalView}=await import('./view.js');
-  const ui=new TerminalView({baseDir:process.cwd()}),session=new TerminalSession(app,ui,options);
+  const ui=new TerminalView({baseDir:options.baseDir??process.cwd(),previewLabel:options.previewLabel}),session=new TerminalSession(app,ui,options);
   const terminate=()=>{session.exiting=true;ui.pending?.reject(Object.assign(new Error('退出'),{code:'PROMPT_CANCELLED'}));for(const r of app.listRuns())if(r.status==='running')app.cancelRun(r.id);};
   process.once('SIGTERM',terminate);
   try{ui.start();await session.run();}finally{process.removeListener('SIGTERM',terminate);await ui.close();}

package/node_modules/@mytools/core/src/terminal/theme.js

@@ -6,6 +6,7 @@ export const cleanText=value=>stripVTControlCharacters(String(value)).replace(/[
 const color=(rgb,text)=>Object.hasOwn(process.env,'NO_COLOR')?text:`\x1b[38;2;${rgb}m${text}\x1b[39m`;
 export const palette={
   brand:text=>color('78;201;176',text),
+  error:text=>color('244;117;117',text),
   text:text=>color('229;233;237',text),
   muted:text=>color('139;149;158',text),
   border:text=>color('74;101;99',text),