@yanglaofish/fishtools 0.2.0 → 0.3.0

package/manual/packages/core/src/terminal/view.js

@@ -0,0 +1,283 @@
+import { readdirSync, statSync } from 'node:fs';
+import path from 'node:path';
+import { homedir } from 'node:os';
+import { TUI, Text, Container, Editor, SelectList, ProcessTerminal, CombinedAutocompleteProvider, matchesKey, truncateToWidth, visibleWidth } from '@mariozechner/pi-tui';
+import { MarkdownLogViewer } from './log-viewer.js';
+import { RunViewer, mouseOn, mouseOff, mouseWheel } from './run-viewer.js';
+import {RunFeed} from './run-feed.js';
+import { logo } from './presentation.js';
+import { VERSION } from '../version.js';
+import {cleanText as safe,palette,menuTheme as theme,fitLine,shortenPath} from './theme.js';
+
+export const cancelled=()=>Object.assign(new Error('已返回主菜单'),{code:'PROMPT_CANCELLED'});
+// 上游菜单按字符数分配描述宽度，中文双宽字符需要再按终端列宽收口。
+function fit(component){const render=component.render.bind(component);component.render=width=>render(width).map(line=>truncateToWidth(line,width));return component;}
+
+// Pi 的 @ 模糊搜索依赖额外的 fd 程序。这里按目录补全，离线目标机无需安装 fd。
+export class FileAutocomplete extends CombinedAutocompleteProvider{
+  constructor(commands,baseDir,workflows=[]){super(commands,baseDir);this.baseDir=baseDir;this.workflows=workflows;}
+  getSuggestions(lines,line,col){
+    const run=lines[line].slice(0,col).match(/^\/run\s+([^@"\s]*)$/);
+    if(run){
+      const query=run[1].toLowerCase(),items=this.workflows.filter(flow=>`${flow.id} ${flow.title??''}`.toLowerCase().includes(query)).map(flow=>({value:flow.id,label:flow.title??flow.id,description:flow.id,workflow:true}));
+      return items.length?{prefix:run[1],items}:null;
+    }
+    const prefix=lines[line].slice(0,col).match(/(?:^|\s)(@"[^"\n]*|@[^\s]*)$/)?.[1];
+    if(!prefix)return super.getSuggestions(lines,line,col);
+    const raw=prefix.slice(1).replace(/^"/,'').replaceAll('\\','/');
+    const expanded=raw.startsWith('~/')?path.join(homedir(),raw.slice(2)):raw;
+    const absolute=path.resolve(this.baseDir,expanded||'.');
+    const directory=!raw||raw.endsWith('/')?absolute:path.dirname(absolute);
+    const query=!raw||raw.endsWith('/')?'':path.basename(absolute).toLowerCase();
+    try{
+      const items=readdirSync(directory,{withFileTypes:true}).filter(e=>e.name.toLowerCase().startsWith(query)).map(e=>{
+        let dir=e.isDirectory();if(e.isSymbolicLink()){try{dir=statSync(path.join(directory,e.name)).isDirectory();}catch{}}
+        const head=raw.slice(0,raw.lastIndexOf('/')+1),file=head+e.name+(dir?'/':'');
+        return {value:`@${/[\s"]/.test(file)?JSON.stringify(file):file}`,label:safe(e.name)+(dir?'/':''),description:dir?'目录':'文件',directory:dir};
+      }).sort((a,b)=>(b.description==='目录')-(a.description==='目录')||a.label.localeCompare(b.label)).slice(0,100);
+      return items.length?{prefix,items}:null;
+    }catch{return null;}
+  }
+  getForceFileSuggestions(lines,line,col){return this.getSuggestions(lines,line,col);}
+  applyCompletion(lines,line,col,item,prefix){
+    if(item.workflow){const next=[...lines],before=lines[line].slice(0,col-prefix.length),text=item.value+' ';next[line]=before+text+lines[line].slice(col);return {lines:next,cursorLine:line,cursorCol:before.length+text.length};}
+    if(!prefix.startsWith('@'))return super.applyCompletion(lines,line,col,item,prefix);
+    const before=lines[line].slice(0,col-prefix.length);
+    let after=lines[line].slice(col);if(after.startsWith('"'))after=after.slice(1);
+    const completed=item.value+(item.directory?'':' '),next=[...lines];next[line]=before+completed+after;
+    return {lines:next,cursorLine:line,cursorCol:before.length+completed.length-(item.directory&&item.value.endsWith('"')?1:0)};
+  }
+}
+
+export class TerminalView{
+  constructor({baseDir,previewLabel,terminal=new ProcessTerminal()}={}){
+    this.baseDir=baseDir;this.terminal=terminal;this.tui=new TUI(terminal);this.logs=[];this.runViews=new Map();
+    this.historyOffset=0;this.commandHistory=[];this.commandHistoryIndex=null;this.feed=new RunFeed(()=>this.refreshTranscript());
+    const originalStart=terminal.start.bind(terminal);
+    terminal.start=(input,resize)=>originalStart(data=>{
+      if(this.homeInput&&!this.runViewer&&!this.logViewer){
+        if(this.browseCommands(data))return;
+        if(matchesKey(data,'ctrl+o')){this.feed.expanded=!this.feed.expanded;this.historyOffset=0;this.refreshTranscript();return;}
+        const wheel=mouseWheel(data),page=Math.max(1,Math.floor(this.terminal.rows/2));
+        if(wheel||matchesKey(data,'pageUp')||matchesKey(data,'pageDown')){
+          this.historyOffset=Math.max(0,this.historyOffset+(wheel?-wheel*3:matchesKey(data,'pageUp')?page:-page));this.tui.requestRender();return;
+        }
+      }
+      if(matchesKey(data,'f4')&&this.homeInput&&this.pending&&!this.runViewer&&!this.logViewer){
+        // 快捷入口不提交或丢弃当前草稿，返回首页时继续编辑。
+        this.homeDraft=this.editor.getText();this.pending.resolve('/logs');return;
+      }
+      if(matchesKey(data,'ctrl+c')){if(this.runViewer){this.runViewer.onClose();return;}if(this.cancelRun)this.cancelRun();this.pending?.reject(cancelled());return;}
+      if(matchesKey(data,'escape')&&this.pending&&!this.logViewer&&!this.runViewer){
+        // 编辑器自己处理补全菜单 Escape，第二次 Escape 返回上一级。
+        if(this.editor?.isShowingAutocomplete?.()){input(data);return;}
+        this.pending.reject(cancelled());return;
+      }
+      input(data);
+    },resize);
+    this.header=new Text('',1,0);this.transcript=new Text('',1,0);this.prompt=new Container();this.hint=new Text('',1,0);
+    this.hint.render=width=>['',fitLine(' '+palette.muted(this.homeInput?(width<45?`/ 操作 · Ctrl+O ${this.feed.expanded?'收起':'展开'}`:`/ 操作 · Ctrl+O ${this.feed.expanded?'收起':'展开'}详情 · /logs 回看 · Ctrl+C 退出`):(width<45?'↑↓ 选择  Enter 确认  Esc 返回':'↑↓ 选择   Enter 确认   Tab 补全   Esc 返回   Ctrl+C 退出')),width)];
+    const renderTranscript=this.transcript.render.bind(this.transcript);
+    this.headingLines=(width,mark='FISHtools')=>{
+      const room=Math.max(1,width-2),lines=[''];
+      const summary=(this.summaryText??'').split('\n');
+      const workspace=summary.find(line=>line.startsWith('当前工作区：'));
+      const details=summary.filter(line=>line!==workspace&&!line.startsWith('[F4')&&!line.startsWith('欢迎使用'));
+      if(mark===logo){
+        const side=[palette.text('FISHtools')+'  '+palette.muted(`v${VERSION}`),palette.text('欢迎使用 · 插件编排工作台'),palette.muted(details[0]??'')];
+        lines.push(...logo.split('\n').map((line,i)=>' '+palette.brand(line)+'   '+side[i]));
+      }else lines.push(' '+palette.brand('FISH')+palette.text('tools')+'  '+palette.muted(`v${VERSION}`));
+      if(previewLabel)lines.push(' '+palette.brand(safe(previewLabel)));
+      if(workspace){
+        const label='当前工作区：',folder=shortenPath(workspace.slice(label.length),Math.max(1,room-visibleWidth(label)));
+        lines.push(' '+palette.muted(label)+palette.text(folder));
+      }
+      lines.push(' '+palette.muted('位置：')+palette.brand('主面板')+(this.commandLocation?palette.muted(' › ')+palette.text(this.commandLocation):''));
+      if(this.activeRuns?.())lines.push(' '+palette.muted(`${this.activeRuns()} 个运行中 · /logs 查看详情`));
+      lines.push('');return lines.map(line=>fitLine(line,width));
+    };
+    // 先保证输入与菜单可见，空间充足才展示三行字标。
+    this.header.render=width=>{
+      const full=this.headingLines(width,logo),other=renderTranscript(width).length+this.prompt.render(width).length+this.hint.render(width).length;
+      let lines=width>=55&&this.terminal.rows>=18&&full.length+other<=this.terminal.rows&&!this.feed.entries.length?full:this.headingLines(width);
+      const budget=Math.max(0,this.terminal.rows-this.prompt.render(width).length-this.hint.render(width).length-1);
+      if(lines.length>budget)lines=lines.filter(line=>safe(line).trim());
+      if(lines.length>budget)lines=lines.slice(0,budget);
+      return lines;
+    };
+    this.transcript.render=width=>{
+      const lines=renderTranscript(width),budget=Math.max(0,this.terminal.rows-this.header.render(width).length-this.prompt.render(width).length-this.hint.render(width).length);
+      if(lines.length<=budget){this.historyOffset=0;return lines;}
+      if(!budget)return [];
+      if(this.feed.entries.length){
+        const count=Math.max(0,budget-1),max=Math.max(0,lines.length-count);this.historyOffset=Math.min(this.historyOffset,max);
+        const end=lines.length-this.historyOffset,start=Math.max(0,end-count);
+        return [...lines.slice(start,end),fitLine(' '+palette.muted(`PgUp/PgDn/滚轮 查看过程 · ${this.historyOffset?'历史位置':'跟随最新'}`),width)];
+      }
+      const excerpt=this.logs.length<=1?lines.slice(0,budget-1):lines.slice(-(budget-1)||lines.length);
+      return [...excerpt,fitLine(' '+palette.muted('… /help 完整帮助 · /logs 运行日志'),width)];
+    };
+    this.tui.addChild(this.header);this.tui.addChild(this.transcript);this.tui.addChild(this.prompt);this.tui.addChild(this.hint);
+  }
+  start(){
+    if(this.started)return;this.started=true;
+    // 独立屏幕避免全屏阅读与主终端的滚动历史混在一起。
+    this.terminal.write('\x1b[?1049h\x1b[2J\x1b[H');this.tui.start();
+  }
+  browseCommands(data){
+    const direction=matchesKey(data,'up')?-1:matchesKey(data,'down')?1:0;
+    // 补全菜单保留方向键；多行编辑保留光标移动，不把配置值放进命令历史。
+    if(!direction||!this.editor||this.editor.isShowingAutocomplete()||this.editor.getText().includes('\n')||!this.commandHistory.length)return false;
+    const current=this.commandHistoryIndex??this.commandHistory.length;
+    const next=Math.max(0,Math.min(this.commandHistory.length,current+direction));
+    if(next===current)return true;
+    if(this.commandHistoryIndex===null)this.commandHistoryDraft=this.editor.getText();
+    this.commandHistoryIndex=next;
+    this.editor.setText(next===this.commandHistory.length?this.commandHistoryDraft:this.commandHistory[next]);
+    if(next===this.commandHistory.length)this.commandHistoryIndex=null;
+    this.tui.requestRender();return true;
+  }
+  async close(){
+    if(this.closed)return;this.closed=true;
+    this.feed.close();
+    // Pi 的渲染排在 nextTick；先排空最后一帧，再恢复终端，避免退出后隐藏光标。
+    await new Promise(resolve=>process.nextTick(resolve));this.tui.stop();
+    if(this.started)this.terminal.write(mouseOff+'\x1b[?1049l');
+    if(this.terminal instanceof ProcessTerminal)process.stdin.pause();
+  }
+  summary(text){this.summaryText=safe(text);this.tui.requestRender();}
+  beginCommand(text){
+    const name=text.trim().split(/\s+/)[0].replace(/^\//,'');
+    const labels={workflows:'工作流',run:'运行工作流',plugin:'插件管理',plugins:'插件管理',config:'工具配置',pack:'打包',logs:'执行记录',runs:'执行记录',tools:'工具',help:'帮助',exit:'退出'};
+    this.commandLocation=labels[name]??'/'+name;this.historyOffset=0;
+    this.clearMessages();this.feed.message('› '+safe(text));
+  }
+  endCommand(){
+    this.commandLocation=null;this.tui.requestRender();
+  }
+  transcriptText(){return [...this.logs,this.feed.text()].filter(Boolean).join('\n\n');}
+  refreshTranscript(){
+    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();
+  }
+  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;}
+    this.logs.push(formatted);this.logs=this.logs.slice(-6);this.refreshTranscript();
+  }
+  async viewMarkdown(title,text){
+    const previousPending=this.pending??null,previousViewer=this.logViewer;
+    const children=this.tui.children;
+    let overlay;
+    try{
+      await new Promise((resolve,reject)=>{
+        this.pending={resolve,reject};
+        this.logViewer=new MarkdownLogViewer({title:safe(title),text:safe(text),terminal:this.terminal,onClose:resolve,requestRender:()=>this.tui.requestRender()});
+        this.terminal.write(mouseOn);
+        // Overlay 的基底为空，旧 transcript 不再撑高滚动区域；关闭后原样恢复。
+        this.tui.children=[];
+        overlay=this.tui.showOverlay(this.logViewer,{width:'100%',maxHeight:'100%',anchor:'top-left',margin:0});
+        this.tui.requestRender(true);
+      });
+    }finally{
+      this.tui.children=children;this.pending=previousPending;this.logViewer=previousViewer;
+      overlay?.hide();this.tui.requestRender(true);
+      this.terminal.write(mouseOff);
+    }
+  }
+  async observeRun({app,runId,record,flow,workflows=[],initialView}){
+    const previousPending=this.pending??null,children=this.tui.children;let overlay,unsubscribe;
+    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),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));});
+        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);
+    }
+  }
+  async ask(message,component){
+    fit(component);
+    const title=new Text(palette.brand('› ')+palette.text(safe(message)),1,0);
+    const renderTitle=title.render.bind(title);
+    title.render=width=>[fitLine(' '+palette.border('─'.repeat(Math.max(1,width-2))),width),...renderTitle(width)];
+    if(message.startsWith('fst >'))title.render=()=>[];
+    this.prompt.clear();this.prompt.addChild(title);this.prompt.addChild(component);this.tui.setFocus(component);this.tui.requestRender();
+    try{return await new Promise((resolve,reject)=>{this.pending={resolve,reject};component.onSubmit=text=>{
+      if(this.homeInput&&text.trim()&&this.commandHistory.at(-1)!==text.trim()){
+        this.commandHistory.push(text.trim());if(this.commandHistory.length>100)this.commandHistory.shift();
+      }
+      resolve(text);
+    };component.onSelect=item=>resolve(item.value);component.onCancel=()=>reject(cancelled());});}
+    finally{if(this.homeInput)this.terminal.write(mouseOff);this.pending=null;this.editor=null;this.homeInput=false;this.prompt.clear();this.tui.requestRender();}
+  }
+  input(message,{value='',commands=[],files=true,workflows=[]}={}){
+    const editor=new Editor(this.tui,{borderColor:palette.border,selectList:theme},{paddingX:1});
+    const renderEditor=editor.render.bind(editor);
+    editor.render=width=>{
+      if(width<8)return renderEditor(width);
+      const inner=width-4,lines=renderEditor(inner);let closed=false;
+      return lines.map((line,i)=>{
+        if(i===0)return ' '+palette.border('╭'+'─'.repeat(inner)+'╮');
+        if(!closed&&/^─+$/.test(safe(line))){closed=true;return ' '+palette.border('╰'+'─'.repeat(inner)+'╯');}
+        if(closed)return '  '+line;
+        return ' '+palette.border('│')+line+' '.repeat(Math.max(0,inner-visibleWidth(line)))+palette.border('│');
+      });
+    };
+    this.homeInput=message.startsWith('fst >');
+    this.commandHistoryIndex=null;
+    if(this.homeInput)editor.onChange=text=>{
+      if(this.commandHistoryIndex!==null&&text!==this.commandHistory[this.commandHistoryIndex])this.commandHistoryIndex=null;
+    };
+    if(this.homeInput)this.terminal.write(mouseOn);
+    this.editor=editor;editor.setText(this.homeInput?(this.homeDraft??value):value);
+    if(this.homeInput)this.homeDraft=undefined;
+    if(files||commands.length)editor.setAutocompleteProvider(new FileAutocomplete(commands,this.baseDir,workflows));
+    return this.ask(message,editor);
+  }
+  async select(message,items){
+    if(!items.length)throw new Error('当前没有可选择的项目');
+    const list=new SelectList(items.map(i=>({...i,label:safe(i.label).replace(/\s+/g,' '),description:i.description?safe(i.description).replace(/\s+/g,' '):undefined})),8,theme);
+    list.render=width=>{
+      const reserved=this.headingLines(width).length+new Text(palette.text(safe(message)),1,0).render(width).length+this.hint.render(width).length+2;
+      list.maxVisible=Math.max(1,Math.min(8,this.terminal.rows-reserved));
+      const start=Math.max(0,Math.min(list.selectedIndex-Math.floor(list.maxVisible/2),list.filteredItems.length-list.maxVisible));
+      const end=Math.min(start+list.maxVisible,list.filteredItems.length),lines=[];
+      for(let i=start;i<end;i++){
+        const item=list.filteredItems[i],selected=i===list.selectedIndex,available=Math.max(1,width-4);
+        const labelWidth=item.description&&width>=56?Math.min(32,Math.floor(available*0.45)):available;
+        const label=fitLine(item.label||item.value,labelWidth),prefix=selected?'› ':'  ';
+        let line=' '+(selected?palette.brand(prefix+label):palette.text(prefix+label));
+        if(item.description&&width>=56)line+=' '.repeat(Math.max(2,labelWidth-visibleWidth(label)+2))+palette.muted(fitLine(item.description,Math.max(1,available-labelWidth-2)));
+        lines.push(fitLine(line,width));
+      }
+      if(start>0||end<list.filteredItems.length)lines.push(palette.muted(`   ${list.selectedIndex+1} / ${list.filteredItems.length}`));
+      return lines.length?lines:[palette.muted('  没有匹配项')];
+    };
+    const value=await this.ask(message,list);
+    if(this.commandLocation){
+      const item=items.find(item=>item.value===value);
+      if(item&&value!=='back'&&value!=='cancel')this.feed.message(`· ${safe(item.label??item.value)}`);
+    }
+    return value;
+  }
+  async confirm(message){return await this.select(message,[{value:'no',label:'否，返回'},{value:'yes',label:'是，继续'}])==='yes';}
+  busy(message,cancel){
+    this.cancelRun=cancel;this.prompt.clear();this.prompt.addChild(new Text(palette.text(safe(message)),1,0));this.tui.setFocus(this.prompt);this.tui.requestRender();
+    return ()=>{this.cancelRun=null;this.prompt.clear();this.tui.requestRender();};
+  }
+}

package/manual/tests/application.test.js

@@ -4,6 +4,36 @@ import { mkdir, writeFile, readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { createApplication } from '../packages/core/src/application.js';
 import { temporary, testPlugin, object } from './helpers.js';
+import {validate} from '../packages/core/src/validation.js';
+
+test('同 ID schema 隔离编译，保留内嵌引用且不串用旧约束',()=>{
+  const schema=type=>({$id:'https://fishtools.test/review/config',type:'object',definitions:{value:{type}},properties:{value:{$ref:'#/definitions/value'}},required:['value']});
+  assert.deepEqual(validate(schema('string'),{value:'old'},'旧配置'),{value:'old'});
+  assert.deepEqual(validate(schema('integer'),{value:2},'新配置'),{value:2});
+  assert.throws(()=>validate(schema('integer'),{value:'old'},'新配置'),/integer/);
+});
+
+test('外部带 $id 配置插件可升级，后续安装与卸载不被旧 schema 阻塞',async t=>{
+  const root=await temporary(t),projectDir=path.join(root,'project');
+  const fixture=async(version)=>{
+    const directory=path.join(root,'plugin-'+version);await mkdir(directory);
+    await writeFile(path.join(directory,'package.json'),JSON.stringify({name:'review-schema-plugin',version,type:'module',main:'index.js'}));
+    const config={$id:'https://fishtools.test/external/config',type:'object',properties:{version:{type:'string',const:version,default:version}}};
+    await writeFile(path.join(directory,'index.js'),`export default {id:'review-schema-plugin',version:${JSON.stringify(version)},config:${JSON.stringify(config)},commands:{'review.version':{action:'version'}},actions:{version:{input:{type:'object'},output:{type:'object'},async run(_, {config}){return config;}}}};`);
+    return directory;
+  };
+  const first=await fixture('1.0.0'),second=await fixture('1.0.1'),extra=path.join(root,'unrelated');await mkdir(extra);
+  await writeFile(path.join(extra,'package.json'),JSON.stringify({name:'review-unrelated',version:'1.0.0',type:'module',main:'index.js'}));
+  await writeFile(path.join(extra,'index.js'),"export default {id:'review-unrelated',version:'1.0.0'};");
+  const app=await createApplication({projectDir,plugins:[]});t.after(()=>app.close());
+  await app.installPlugin(first);await app.installPlugin(extra);await app.removePlugin('review-unrelated');await app.installPlugin(second);
+  assert.equal((await (await app.startCommand('review.version')).done).output.version,'1.0.1');
+  await assert.rejects(app.configurePlugin('review-schema-plugin',{version:'1.0.0'}),/配置/);
+  await app.close();
+  const restarted=await createApplication({projectDir});t.after(()=>restarted.close());
+  assert.equal((await (await restarted.startCommand('review.version')).done).output.version,'1.0.1');
+  await restarted.removePlugin('review-schema-plugin');assert.equal(restarted.listPlugins().length,0);
+});
 
 test('运行快照独立于之后保存，状态与日志持久化',async t=>{
   const projectDir=await temporary(t);

package/node_modules/@mytools/core/src/application.js

@@ -34,6 +34,7 @@ export async function createApplication({projectDir=process.cwd(),workspace,outp
     listCommands:()=>host.commands(),
     listWorkflows:()=>store.list(),
     async saveWorkflow(w){if(project.readOnly)throw new FlowError('此分发包仅用于运行；请在开发项目中编辑');return store.save(w);},
+    async removeWorkflow(id){if(project.readOnly)throw new FlowError('只读项目不能删除工作流');return store.remove(id);},
     checkWorkflow:id=>store.resolve([id],host),
     subscribe(fn){emitter.on('event',fn);return ()=>emitter.off('event',fn);},
     async startRun(id,input={}) {
@@ -176,7 +177,7 @@ export async function createApplication({projectDir=process.cwd(),workspace,outp
   const external=[];
   for(const name of Object.keys(state.dependencies??{}))external.push(await loadPlugin(name,state.root));
   host=await build(external);
-  for(const name of ['startRun','startCommand','startWeb','saveWorkflow','installPlugin','removePlugin','configurePlugin','configureLogs','setMaintenance','pack']){
+  for(const name of ['startRun','startCommand','startWeb','saveWorkflow','removeWorkflow','installPlugin','removePlugin','configurePlugin','configureLogs','setMaintenance','pack']){
     const original=app[name],isRun=['startRun','startCommand'].includes(name);
     app[name]=async(...args)=>{
       if(closing)throw new FlowError('应用已关闭');

package/node_modules/@mytools/core/src/contracts.js

@@ -4,7 +4,7 @@ import {conditionOperators} from './control.js';
 export const builtinCommands=[
   ['workflows','选择已有工作流'],['new','新建工作流'],['add','添加插件能力或子工作流'],
   ['steps','设置步骤参数、排序或删除'],['outputs','设置最终输出'],['save','保存工作流'],
-  ['run','运行工作流，可附带 @参数.json'],['runs','观察运行中的步骤、输入输出与实时日志'],['logs','查看运行日志与保留设置'],['plugins','管理插件'],['config','设置插件配置'],
+  ['run','运行工作流，可附带 @参数.json'],['runs','运行记录：选择任意一次执行，查看进度、结果和日志'],['logs','查看运行日志'],['plugin','管理插件'],['plugins','管理插件（兼容旧入口）'],['config','配置 Fishtools'],['tools','Web 与离线文档'],
   ['pack','选择工作流打包'],['web','启动 Web 工作台'],['docs','阅读离线开发与使用文档'],['help','查看操作说明'],['exit','退出终端工作台'],
 ].map(([name,description])=>({name,description}));
 

package/node_modules/@mytools/core/src/documentation.js

@@ -12,7 +12,7 @@ const topics=[
   ['readme','Fishtools 使用说明','README.md'],
 ];
 // 保留文档链接所需的目录布局；参考代码仅供阅读，不是第二份运行时。
-const assets=['README.md','LICENSE','THIRD_PARTY_NOTICES.md','docs','examples/service-plugins','plugins/examples','plugins/environment','packages/sdk','packages/core/src/host.js','packages/core/LICENSE','tests/application.test.js'];
+const assets=['README.md','LICENSE','THIRD_PARTY_NOTICES.md','docs','examples/service-plugins','plugins/examples','plugins/environment','packages/sdk','packages/core/src/host.js','packages/core/src/runtime.js','packages/core/src/engine.js','packages/core/src/application.js','packages/core/src/terminal/view.js','packages/core/src/terminal/run-feed.js','packages/core/src/terminal/session.js','packages/core/LICENSE','tests/application.test.js'];
 const excluded=new Set(['node_modules','dist','.git','.cache','__pycache__','.pytest_cache','coverage','public']);
 const inside=(parent,child)=>{const relative=path.relative(parent,child);return relative===''||(!relative.startsWith(`..${path.sep}`)&&relative!=='..'&&!path.isAbsolute(relative));};
 

package/node_modules/@mytools/core/src/engine.js

@@ -57,7 +57,7 @@ export async function runWorkflow({store,host,id,input={},signal,onEvent=()=>{},
       let output;
       if(step.action)output=await host.invoke(step.action,args,{
         ...context,signal:currentSignal,runId,stepId:step.id,callPath,workflow:w,
-        log:(message,data,meta={})=>emit({type:'log',stream:meta.stream,...base,message,data}),
+        log:(message,data,meta={})=>emit({type:'log',stream:meta.stream,...(meta.audience==='user'?{audience:'user'}:{}),...base,message,data}),
       });
       else if(step.workflow)output=await execute(store.childId(step.workflow),args,callPath,currentSignal,reportFailure);
       else if(step.branch){

package/node_modules/@mytools/core/src/host.js

@@ -16,6 +16,8 @@ export async function createHost({ plugins = [], config = {}, services = {}, env
   const commandNames=new Set(),commands=new Map();
   function bindContext(context){
     const bound={...services,...context},execute=bound.runProcess;
+    // 面向用户的输出与诊断日志共用持久化通道，只区分默认可见性。
+    bound.print=(message,data)=>Promise.resolve(bound.log?.(message,data,{audience:'user'}));
     if(typeof execute==='function')bound.runProcess=(file,args,options={})=>{
       const signal=context.signal&&options.signal?AbortSignal.any([context.signal,options.signal]):context.signal??options.signal;
       return execute(file,args,{...options,signal,onOutput:async({stream,message})=>{

package/node_modules/@mytools/core/src/markdown-log.js

@@ -32,7 +32,7 @@ export function markdownHeader(run){
 }
 
 export function markdownEvent(event){
-  let output=`### ${names[event.type]??'事件'}\n\n`;
+  let output=`### ${event.type==='log'&&event.audience==='user'?'用户输出':names[event.type]??'事件'}\n\n`;
   const lines=[`时间：${event.time}`];
   for(const [key,label] of [['callPath','调用路径'],['action','动作'],['plugin','插件'],['command','命令'],['stream','输出流'],['durationMs','耗时（毫秒）']]){
     if(event[key]!==undefined)lines.push(`${label}：${event[key]}`);

package/node_modules/@mytools/core/src/process.js

@@ -3,11 +3,24 @@ import treeKill from 'tree-kill';
 import which from 'which';
 import { FlowError } from '@mytools/sdk';
 import { StringDecoder } from 'node:string_decoder';
+import path from 'node:path';
 
 export async function runProcess(file,args=[],{cwd,env,signal,timeout=30000,maxBuffer=4*1024*1024,onOutput}={}) {
   if(signal?.aborted) throw new FlowError('操作已取消',{code:'CANCELLED'});
   let executable;
-  try {executable=await which(file,{path:env?.PATH??process.env.PATH});}
+  try {
+    // 不改变宿主 cwd；程序路径和 PATH 中相对目录都以子进程 cwd 为基准。
+    const directory=path.resolve(cwd??process.cwd()),windows=process.platform==='win32';
+    const hasPath=path.isAbsolute(file)||file.includes('/')||(windows&&file.includes('\\'));
+    const search=hasPath?[path.resolve(directory,file)]:[
+      ...(windows?[directory]:[]),...(env?.PATH??(windows?env?.Path:undefined)??process.env.PATH??'').split(path.delimiter),
+    ].map(entry=>path.resolve(directory,entry.replace(/^"(.*)"$/,'$1'),file));
+    for(const candidate of search){
+      executable=await which(candidate,{nothrow:true,pathExt:env?.PATHEXT??process.env.PATHEXT});
+      if(executable)break;
+    }
+    if(!executable)throw Object.assign(new Error(`not found: ${file}`),{code:'ENOENT'});
+  }
   catch(cause){throw new FlowError(`未找到程序：${file}`,{code:'ENOENT',details:{executable:file},cause});}
   const child=execa(executable,args,{cwd,env,reject:false,windowsHide:true,maxBuffer,timeout:0,shell:false});
   let reason,killing,outputError,outputFailed=false,outputWrites=Promise.resolve();

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

@@ -15,7 +15,7 @@ export function parseCommand(text){
   }
   if(quote)throw new Error('文件路径的引号未闭合');
   if(started)args.push(token);
-  if(!args[0]?.startsWith('/'))throw new Error('请输入 / 选择操作，例如 /workflows 或 /run');
+  if(!args[0]?.startsWith('/'))throw Object.assign(new Error('这不是斜杠命令。输入 / 选择操作；执行工作流请用 /run 工作流ID。'),{code:'COMMAND_INPUT'});
   args[0]=args[0].slice(1);return args;
 }
 

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

@@ -0,0 +1,17 @@
+import {builtinCommands} from '../contracts.js';
+
+const visible=['workflows','run','pack','logs','plugin','config','tools','help','exit'];
+// 入口由插件 ID 推导；冲突时加前缀，不能覆盖内置或作者注册的命令。
+export function commandMenu(plugins,commands){
+  const entries=builtinCommands.filter(command=>visible.includes(command.name)).map(command=>({...command,description:`[内置] ${command.description}`}));
+  const used=new Set([...builtinCommands.map(c=>c.name),...commands.map(c=>c.name)]);
+  const groups=plugins.filter(plugin=>commands.some(c=>c.plugin===plugin.id)).sort((a,b)=>a.id.localeCompare(b.id));
+  for(const plugin of groups){
+    const leaf=plugin.id.split('/').at(-1).replace(/[^\w.-]/g,'-');
+    let name=/^[a-zA-Z]/.test(leaf)?leaf:`plugin-${leaf}`;
+    if(groups.filter(p=>p.id.split('/').at(-1)===leaf).length>1)name=plugin.id.replace(/^@/,'').replace(/[^\w.-]/g,'-');
+    while(used.has(name))name='plugin-'+name;
+    used.add(name);entries.push({name,plugin:plugin.id,description:`[插件] ${plugin.title??plugin.id} · ${plugin.id}`});
+  }
+  return entries;
+}

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

@@ -11,8 +11,8 @@ export function gettingStarted(flows,{readOnly=false}={}){
   return [
     sample?`试运行  /run ${sample.id}\n${sample.description??sample.title??'按提示填写参数，执行后查看结果。'}`:'当前工作区还没有工作流。',
     '',
-    `/workflows 工作流   /plugins 插件`,
-    `${readOnly?'只读运行包': '/new 新建'}   /runs 运行观察   /help 帮助`,
+    `/workflows ${readOnly?'浏览工作流':'管理工作流'}   /plugin 插件   /config 工具配置`,
+    `/logs 回看执行记录、输入输出与日志   /help 帮助`,
   ].join('\n');
 }
 
@@ -37,6 +37,6 @@ export function pluginDetails(plugin,actions,commands){
     '## 环境声明',
     ...[plugin,...actions].flatMap(item=>Object.entries(item.environments??{}).map(([name,e])=>`- ${item.id} / ${name}：${({host:'使用宿主机环境',bundled:'随包携带',tool:'使用 Fishtools 自带环境'})[e.source]??e.source}`)),
     '环境与平台由插件作者声明；具体执行结果请在 /logs 查看。',
-    '编排用法：/new 新建工作流 → /add 选择上述能力 → 填写参数 → /save → /run。',
+    '编排用法：/workflows 新建工作流 → 添加步骤并选择上述能力 → 填写参数 → 保存 → 运行。也可在主面板用 /run 选择已保存的工作流。',
   ].join('\n\n');
 }

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 输出的内容会显示在这里。';
+}