@yanglaofish/fishtools 0.5.1 → 0.5.3

package/manual/packages/fst-cli/package.json

@@ -31,7 +31,7 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=24.15.0"
+    "node": "^22.22.2 || >=24.0.0"
   },
   "dependencies": {
     "@mytools/sdk": "0.1.0",

package/manual/packages/fst-cli/src/development.js

@@ -1,9 +1,14 @@
 import {randomBytes} from 'node:crypto';
 import {createDevelopmentSupervisor,bindDevelopmentChild} from '@mytools/core/development';
+import {registerWorkspace,userPluginRegistry} from '@mytools/fst-workspace/registry';
+import {readJson} from '@mytools/fst-platform/json';
+import path from 'node:path';
 
 export async function startDevelopment({projectDir,entry,args,configFile,mode,port}){
   console.error('开发模式：源码变化后等待当前业务结束并重启；终端未保存的编辑草稿不会保留。');
-  const supervisor=await createDevelopmentSupervisor({projectDir,entry,args,configFile,
+  const project=await readJson(path.join(projectDir,'flow.project.json'),{}),pluginRegistryDir=project.baseBundle||project.readOnly?undefined:userPluginRegistry();
+  if(pluginRegistryDir)await registerWorkspace(pluginRegistryDir,projectDir);
+  const supervisor=await createDevelopmentSupervisor({projectDir,pluginRegistryDir,entry,args,configFile,
     env:{FISHTOOLS_DEV_PROJECT:projectDir,FISHTOOLS_DEV_MODE:mode,FISHTOOLS_DEV_TOKEN:randomBytes(24).toString('hex'),FISHTOOLS_DEV_PORT:String(port)},
     onEvent(event){
       if(event.type==='ready')console.error(event.recovered?'开发应用已恢复，源码监听继续。':`开发应用已就绪（第 ${event.generation} 代）。`);

package/manual/packages/fst-cli/src/terminal/command-menu.js

@@ -0,0 +1,191 @@
+import {randomUUID} from 'node:crypto';
+import {isDeepStrictEqual} from 'node:util';
+import {isCommandName} from '@mytools/fst-plugin/contracts';
+import {editValue} from './schema.js';
+
+export async function runShortcut(session,entry,args=[]){
+  if(!entry.available)throw new Error(`快捷名称 /${entry.name} 已失效：${entry.reason??'目标不存在'}`);
+  const {app}=session,target=entry.target;
+  if(target.command){
+    const command=app.listCommands().find(command=>command.name===target.command&&command.plugin===target.plugin);
+    if(!command)throw new Error(`快捷名称 /${entry.name} 的目标命令不存在`);
+    return session.pluginCommand({...command,name:entry.name,targetName:command.name,shortcutInput:entry.input??{}},args);
+  }
+  const action=app.catalog().find(action=>action.id===target.action);
+  if(!action)throw new Error(`快捷名称 /${entry.name} 的目标动作不存在`);
+  const plugin=action.plugin??action.id.slice(0,action.id.lastIndexOf(':'));
+  return session.pluginCommand({...action,name:entry.name,plugin,action:action.id.slice(plugin.length+1),actionId:action.id,shortcutInput:entry.input??{}},args);
+}
+
+async function parameters(session,value={}){
+  const result=structuredClone(value),{ui}=session;
+  for(;;){
+    const choice=await ui.select('命令参数（脚本通过 FST_INPUT_参数名 环境变量读取）',[
+      ...Object.entries(result).map(([name,field])=>({value:`field:${name}`,label:field.title??name,description:`${name} · ${field.type}`})),
+      {value:'new',label:'添加参数'},{value:'back',label:'完成参数设置'},
+    ]);
+    if(choice==='back')return result;
+    const existing=choice.startsWith('field:')?choice.slice(6):undefined;
+    if(existing){
+      const operation=await ui.select(`参数 ${existing}`,[{value:'edit',label:'编辑'},{value:'remove',label:'删除'},{value:'back',label:'返回'}]);
+      if(operation==='back')continue;
+      if(operation==='remove'){delete result[existing];continue;}
+    }
+    const name=existing??(await ui.input('参数名（英文字母、数字、下划线，不能以数字开头）',{files:false})).trim();
+    if(!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)||['__proto__','constructor','prototype'].includes(name)){ui.show('参数名无效，请重新填写。');continue;}
+    if(!existing&&Object.hasOwn(result,name)){ui.show('参数名已经存在。');continue;}
+    const title=await ui.input('参数显示名称',{value:result[name]?.title??name,files:false});
+    const type=await ui.select('参数类型',[{value:'string',label:'文本'},{value:'number',label:'数字'},{value:'boolean',label:'是 / 否'}]);
+    const field={title,type,required:await ui.confirm('这个参数必须填写吗？')};
+    if(await ui.confirm('设置默认值吗？'))field.default=await editValue(ui,{type},result[name]?.default,{baseDir:session.baseDir,required:true,label:'默认值'});
+    result[name]=field;
+  }
+}
+
+async function editPreset(session,id,current){
+  const {ui,app}=session,preset=structuredClone(current??{shell:'auto'});
+  preset.title=(await ui.input('常用命令名称',{value:preset.title??'',files:false})).trim();
+  preset.script=await ui.input('命令文本 · Shift+Enter 换行，Enter 提交（Alt+Enter 备用）',{value:preset.script??'',files:false,multiline:true});
+  const action=`@mytools/commands:${id}`;
+  const oldName=Object.keys(app.project.shortcuts??{}).find(name=>app.project.shortcuts[name].action===action);
+  let shortcut=oldName??(!current&&isCommandName(preset.title)?preset.title:'');
+  for(;;){
+    const choice=await ui.select('常用命令设置',[
+      {value:'save',label:'保存',description:shortcut?`快捷执行 /${shortcut}`:'只注册工作流动作'},
+      {value:'title',label:'修改名称'},{value:'script',label:'编辑多行命令'},
+      {value:'shortcut',label:'快捷名称',description:shortcut||'未设置'},
+      {value:'shell',label:'命令解释器',description:preset.shell??'auto'},
+      {value:'timeout',label:'超时时间',description:preset.timeout===0?'不限时':`${(preset.timeout??30000)/1000} 秒`},
+      {value:'parameters',label:'参数',description:`${Object.keys(preset.parameters??{}).length} 项，可不设置`},
+      {value:'root',label:'Linux root 权限要求',description:preset.requireRoot?'需要 root':'按当前用户权限执行'},
+      {value:'back',label:'取消，返回'},
+    ]);
+    if(choice==='back')return;
+    if(choice==='title')preset.title=(await ui.input('常用命令名称',{value:preset.title,files:false})).trim();
+    else if(choice==='script')preset.script=await ui.input('命令文本 · Shift+Enter 换行，Enter 提交（Alt+Enter 备用）',{value:preset.script,files:false,multiline:true});
+    else if(choice==='shortcut')shortcut=(await ui.input('快捷名称（支持中文，不含空格或 /；留空不设置）',{value:shortcut,files:false})).trim();
+    else if(choice==='shell')preset.shell=await ui.select('命令解释器',[
+      {value:'auto',label:'按系统选择（Windows PowerShell / Linux sh）'},
+      {value:'powershell',label:'Windows PowerShell'},{value:'pwsh',label:'PowerShell 7（pwsh）'},
+      {value:'sh',label:'sh'},{value:'bash',label:'bash'},
+    ]);
+    else if(choice==='timeout'){
+      const seconds=Number(await ui.input('超时时间（秒，0 表示不限时）',{value:String((preset.timeout??30000)/1000),files:false}));
+      if(!Number.isFinite(seconds)||!Number.isSafeInteger(seconds*1000)||seconds<0||seconds*1000>2147483647){ui.show('超时时间无效。');continue;}
+      preset.timeout=seconds*1000;
+    }else if(choice==='parameters')preset.parameters=await parameters(session,preset.parameters);
+    else if(choice==='root')preset.requireRoot=await ui.confirm('这个命令在 Linux 上必须使用 root 吗？执行前会检查，不会自动提权。');
+    else if(choice==='save'){
+      const next={...app.project.commandPresets,[id]:preset},shortcuts=structuredClone(app.project.shortcuts??{});
+      if(oldName)delete shortcuts[oldName];
+      if(shortcut){
+        if(Object.hasOwn(shortcuts,shortcut)){ui.show(`快捷名称 /${shortcut} 已存在，请选择其他名称。`);continue;}
+        shortcuts[shortcut]={...(oldName?app.project.shortcuts[oldName]:{}),action};
+      }
+      if(isDeepStrictEqual(preset,current)&&isDeepStrictEqual(shortcuts,app.project.shortcuts??{})){ui.show('常用命令未修改。');return;}
+      try{
+        const result=await session.withMaintenance(options=>app.configureCommandPresets(next,{...options,shortcuts}));
+        if(result===null){ui.show('已取消保存。');continue;}
+        ui.show(`常用命令已保存，修改前配置已备份。${shortcut?`输入 /${shortcut} 可直接运行。`:''}也可在工作流中添加此动作。`);
+        return;
+      }catch(error){ui.show(`保存失败：${error.message}`);}
+    }
+  }
+}
+
+export async function commandPresetsMenu(session){
+  const {app,ui}=session;
+  for(;;){
+    const choice=await ui.select('常用命令',[
+      ...(!app.project.readOnly?[{value:'new',label:'注册常用命令'}]:[]),
+      ...Object.entries(app.project.commandPresets??{}).map(([id,preset])=>({value:`preset:${id}`,label:preset.title,description:id})),
+      {value:'back',label:'返回主面板'},
+    ]);
+    if(choice==='back')return;
+    if(choice==='new'){session.writable();await editPreset(session,`command-${randomUUID().slice(0,8)}`);continue;}
+    const id=choice.slice(7),preset=app.project.commandPresets?.[id];if(!preset)continue;
+    const operation=await ui.select(preset.title,[{value:'run',label:'运行'},
+      ...(!app.project.readOnly?[{value:'edit',label:'编辑'},{value:'remove',label:'删除注册项'}]:[]),{value:'back',label:'返回'}]);
+    if(operation==='run')await runShortcut(session,{name:preset.title,target:{action:`@mytools/commands:${id}`},input:{},available:true});
+    else if(operation==='edit'){session.writable();await editPreset(session,id,preset);}
+    else if(operation==='remove'){
+      session.writable();
+      const affected=Object.entries(app.project.shortcuts??{}).filter(([,entry])=>entry.action===`@mytools/commands:${id}`).map(([name])=>`/${name}`);
+      if(!await ui.confirm(`删除 ${preset.title}？${affected.length?`快捷名称 ${affected.join('、')} 将失效。`:''}`))continue;
+      const next=structuredClone(app.project.commandPresets);delete next[id];
+      try{const result=await session.withMaintenance(options=>app.configureCommandPresets(next,options));if(result!==null)ui.show('注册项已删除，修改前配置已备份。');}
+      catch(error){ui.show(`删除失败：${error.message}`);}
+    }
+  }
+}
+
+function targets(app){
+  return [...app.catalog().map(action=>({value:`action:${action.id}`,label:`动作：${action.title??action.id}`,description:action.id})),
+    ...app.listCommands().map(command=>({value:`command:${command.name}`,label:`命令：/${command.name}`,description:command.description}))];
+}
+function shortcutTarget(app,selected){
+  if(selected.startsWith('action:'))return {action:selected.slice(7)};
+  const name=selected.slice(8),command=app.listCommands().find(command=>command.name===name);
+  if(!command)throw new Error('目标命令已失效，请重新选择');
+  return {command:name,plugin:command.plugin};
+}
+async function editShortcut(session,oldName){
+  const {app,ui}=session,old=app.project.shortcuts?.[oldName];
+  let name=(await ui.input('快捷名称（支持中文，不含空格或 /）',{value:oldName??'',files:false})).trim();
+  let target=old?structuredClone(old):{};
+  if(!old){
+    const choices=targets(app);if(!choices.length){ui.show('当前没有可选择的插件动作或命令。');return;}
+    const selected=await ui.select('选择快捷名称指向的能力',choices);
+    target=shortcutTarget(app,selected);
+  }
+  for(;;){
+    const choice=await ui.select(`快捷名称 /${name}`,[
+      {value:'save',label:'保存'},{value:'name',label:'修改快捷名称'},
+      {value:'target',label:'选择目标',description:target.action??target.command},
+      {value:'input',label:'设置默认参数',description:'可留空，运行时按需要填写'},
+      {value:'back',label:'取消，返回'},
+    ]);
+    if(choice==='back')return;
+    if(choice==='name')name=(await ui.input('快捷名称',{value:name,files:false})).trim();
+    else if(choice==='target'){
+      const selected=await ui.select('选择目标',targets(app));
+      target=shortcutTarget(app,selected);
+    }else if(choice==='input'){
+      const metadata=target.action?app.catalog().find(action=>action.id===target.action):app.listCommands().find(command=>command.name===target.command&&command.plugin===target.plugin);
+      if(!metadata){ui.show('目标已失效，请先重新选择目标。');continue;}
+      target.input=await editValue(ui,metadata.input??{type:'object',properties:{},additionalProperties:false},target.input??{},{baseDir:session.baseDir,required:true,label:'快捷名称默认参数'});
+    }else if(choice==='save'){
+      const next=structuredClone(app.project.shortcuts??{});if(oldName)delete next[oldName];
+      if(Object.hasOwn(next,name)){ui.show('快捷名称已经存在，请选择其他名称。');continue;}
+      next[name]=target;
+      if(isDeepStrictEqual(next,app.project.shortcuts??{})){ui.show('快捷名称未修改。');return;}
+      try{await app.configureShortcuts(next);ui.show('快捷名称已保存，修改前配置已备份。');return;}
+      catch(error){ui.show(`保存失败：${error.message}`);}
+    }
+  }
+}
+
+export async function shortcutsMenu(session){
+  const {app,ui}=session;
+  for(;;){
+    const entries=app.listShortcuts(),choice=await ui.select('自定义快捷名称',[
+      ...(!app.project.readOnly?[{value:'new',label:'添加快捷名称'}]:[]),
+      ...entries.map(entry=>({value:`shortcut:${entry.name}`,label:`/${entry.name}${entry.available?'':' [失效]'}`,description:entry.available?entry.description:entry.reason})),
+      {value:'back',label:'返回主面板'},
+    ]);
+    if(choice==='back')return;
+    if(choice==='new'){session.writable();await editShortcut(session);continue;}
+    const name=choice.slice(9),entry=entries.find(entry=>entry.name===name);if(!entry)continue;
+    const operation=await ui.select(`/${name}`,[
+      ...(entry.available?[{value:'run',label:'运行'}]:[]),
+      ...(!app.project.readOnly?[{value:'edit',label:'编辑'},{value:'remove',label:'删除快捷名称'}]:[]),{value:'back',label:'返回'},
+    ]);
+    if(operation==='run')await runShortcut(session,entry);
+    else if(operation==='edit'){session.writable();await editShortcut(session,name);}
+    else if(operation==='remove'){
+      session.writable();if(!await ui.confirm(`删除快捷名称 /${name}？`))continue;
+      const next=structuredClone(app.project.shortcuts??{});delete next[name];
+      await app.configureShortcuts(next);ui.show('快捷名称已删除。');
+    }
+  }
+}

package/manual/packages/fst-cli/src/terminal/navigation.js

@@ -1,10 +1,13 @@
 import {builtinCommands} from '@mytools/fst-plugin/contracts';
 
-const visible=['workflows','run','pack','logs','plugin','config','tools','help','exit'];
+const visible=['workflows','run','pack','logs','plugin','commands','shortcuts','config','tools','help','exit'];
 // 入口由插件 ID 推导；冲突时加前缀，不能覆盖内置或作者注册的命令。
-export function commandMenu(plugins,commands){
+export function commandMenu(plugins,commands,shortcuts=[]){
   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 used=new Set([...builtinCommands.map(c=>c.name),...commands.map(c=>c.name),...shortcuts.map(entry=>entry.name)]);
+  // 保留既有插件或快捷名称 history；历史会话始终可从 /tools 打开。
+  if(!used.has('history')){entries.push({name:'history',description:'[内置] 恢复完整历史会话：输入、反馈与结果'});used.add('history');}
+  entries.push(...shortcuts.map(entry=>({name:entry.name,shortcut:true,description:`[快捷] ${entry.available?entry.description:`已失效：${entry.reason}`}`})));
   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,'-');

package/manual/packages/fst-cli/src/terminal/presentation.js

@@ -4,7 +4,7 @@ export const logo=[
   '▀   ▀▀▀ ▀▀▀ ▀ ▀',
 ].join('\n');
 
-export const pluginStatus=plugin=>({ready:'可用',pending:'等待服务',failed:'失败',stopped:'已停止'})[plugin.runtime?.status]??'未知';
+export const pluginStatus=plugin=>({ready:'可用',pending:'等待服务',failed:'失败',stopped:'已停止',unconfigured:'待配置'})[plugin.runtime?.status]??'未知';
 
 export function gettingStarted(flows,{readOnly=false}={}){
   const sample=flows.find(w=>w.id==='hello')??flows[0];
@@ -12,7 +12,7 @@ export function gettingStarted(flows,{readOnly=false}={}){
     sample?`试运行  /run ${sample.id}\n${sample.description??sample.title??'按提示填写参数，执行后查看结果。'}`:'当前工作区还没有工作流。',
     '',
     `/workflows ${readOnly?'浏览工作流':'管理工作流'}   /plugin 插件   /config 工具配置`,
-    `/logs 回看执行记录、输入输出与日志   /help 帮助`,
+    `/logs 回看执行详情   /history 恢复旧会话（也在 /tools 中）   /help 帮助`,
   ].join('\n');
 }
 
@@ -34,7 +34,8 @@ export function pluginDetails(plugin,actions,commands){
   return [
     `# ${plugin.title??plugin.id}`,
     plugin.description??'作者尚未提供用途说明。',
-    `标识：${plugin.id}\n\n版本：${plugin.version}\n\n来源：${plugin.removable?'自行安装（可移除）':'发行包内置 / 项目预置'}\n\n状态：${pluginStatus(plugin)}`,
+    `标识：${plugin.id}\n\n版本：${plugin.version}\n\n来源：${({global:'用户级全局安装或链接',workspace:'工作区安装或链接（兼容旧版）',preset:'发行包内置 / 项目预置'})[plugin.scope]??(plugin.removable?'工作区安装或链接':'发行包内置 / 项目预置')}${plugin.source?`\n\n代码位置：${plugin.source}`:''}\n\n状态：${pluginStatus(plugin)}`,
+    ...(plugin.configurationError?[`配置状态：${plugin.configurationError}\n\n在当前工作区设置插件配置后启用。`]:[]),
     ...(plugin.runtime?.missing?.length?[`缺少服务：${plugin.runtime.missing.join(', ')}`]:[]),
     `更新方式：${!plugin.runtime?.updatePolicy?'无运行时服务':plugin.runtime.updatePolicy==='automatic'?'可自动短暂停止并重启':'需要本次维护确认'}\n\n插件权限：${privilege(plugin,plugin)}`,
     `声明平台：${plugin.platforms?.join(', ')??'作者未声明'}\n\n声明架构：${plugin.architectures?.join(', ')??'作者未声明'}`,

package/manual/packages/fst-cli/src/terminal/run-feed.js

@@ -1,4 +1,4 @@
-import {readableValue,readableError,readableTimeline} from './run-presentation.js';
+import {readableValue,readableError,readableTimeline,runCategory,runCategoryNames,elapsedTime} from './run-presentation.js';
 import {runStatuses} from './run-viewer.js';
 import {createStepSummaries} from '@mytools/fst-logs/steps';
 import {previewRun} from '@mytools/fst-logs/preview';
@@ -10,14 +10,20 @@ const feedRecord=(record,maxBytes)=>{
 
 // 主面板按事件到达顺序追加；运行快照另存，配置菜单不会清掉执行记录。
 export class RunFeed{
-  constructor(refresh,{maxEvents=1000,maxBytes=1048576,maxRuns=50}={}){Object.assign(this,{refresh,maxEvents,maxBytes,maxRuns});this.runs=new Map();this.entries=[];this.subscriptions=new Map();this.expanded=false;this.dropped=0;}
-  track({app,runId,title,input}){
+  constructor(refresh,{maxEvents=1000,maxBytes=1048576,maxRuns=50,now=Date.now}={}){Object.assign(this,{refresh,maxEvents,maxBytes,maxRuns,now});this.runs=new Map();this.entries=[];this.subscriptions=new Map();this.finishedListeners=new Map();this.expanded=false;this.dropped=0;this.elapsedTimer=null;}
+  subscribeFinished(runId,listener){
+    let listeners=this.finishedListeners.get(runId);if(!listeners)this.finishedListeners.set(runId,listeners=new Set());
+    listeners.add(listener);
+    return ()=>{listeners.delete(listener);if(!listeners.size)this.finishedListeners.delete(runId);};
+  }
+  track({app,runId,title,input,done}){
     if(this.runs.has(runId))return;
     const raw=app.getRun(runId),record=feedRecord(raw,this.maxBytes),bounded=previewRun({input},{maxValueBytes:Math.min(this.maxBytes,65536)});
-    const item={app,record,title,input:bounded.input,inputTruncated:bounded.inputTruncated,count:0,ended:false,steps:createStepSummaries({maxEvents:this.maxEvents,maxMemoryBytes:this.maxBytes}),catalog:new Map((app.catalog?.()??[]).map(action=>[action.id,action]))};
+    const item={app,record,title,done,input:bounded.input,inputTruncated:bounded.inputTruncated,count:0,ended:false,steps:createStepSummaries({maxEvents:this.maxEvents,maxMemoryBytes:this.maxBytes}),catalog:new Map((app.catalog?.()??[]).map(action=>[action.id,action]))};
     for(const summary of raw.stepSummaries??[])item.steps.append(summary);
     this.runs.set(runId,item);
     this.entries.push({type:'start',item});
+    this.onEntry?.({type:'start',run:this.savedRun(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);
@@ -25,6 +31,23 @@ export class RunFeed{
       else this.flushRefresh();
     }));
     this.update(item);this.release(app);this.refresh();
+    // 最终日志保存与目录清理在终态事件后完成，done 的快照才包含准确结束时间。
+    const finish=record=>{
+      delete item.done;
+      if(!this.closed){
+        this.update(item,undefined,record);this.release(app);this.onEntry?.({type:'finished',run:this.savedRun(item)});
+        const listeners=this.finishedListeners.get(runId);this.finishedListeners.delete(runId);
+        for(const listener of listeners??[])listener(item.record);
+        this.refresh();
+      }
+    };
+    if(done)void done.then(finish,()=>finish());
+  }
+  savedRun(item,maxValueBytes=8192){const {events,stepSummaries,stepSummaryBytes,...state}=item.record;return {...previewRun({...state,input:item.input},{maxValueBytes}),title:item.title};}
+  elapsed(){
+    const running=[...this.runs.values()].some(item=>!item.ended);
+    if(running&&!this.elapsedTimer){this.elapsedTimer=setInterval(()=>this.refresh(),1000);this.elapsedTimer.unref?.();}
+    if(!running&&this.elapsedTimer){clearInterval(this.elapsedTimer);this.elapsedTimer=null;}
   }
   scheduleRefresh(){
     if(this.refreshTimer)return;
@@ -34,11 +57,11 @@ export class RunFeed{
     if(this.refreshTimer){clearTimeout(this.refreshTimer);this.refreshTimer=null;}
     this.refresh();
   }
-  update(item,event){
+  update(item,event,finalRecord){
     let events;
     if(event?.type&&!['run.succeeded','run.failed','run.cancelled','run.stopped'].includes(event.type)){item.record.events.push(event);events=[event];item.count++;}
     else{
-      const record=item.app.getRun(item.record.id);if(!record)return;
+      const record=finalRecord??item.app.getRun(item.record.id);if(!record)return;
       item.record=feedRecord(record,this.maxBytes);
       for(const summary of record.stepSummaries??[])item.steps.append(summary);
       events=record.events.filter((e,index)=>e.seq!==undefined?e.seq>item.count:index>=item.count);
@@ -51,7 +74,8 @@ export class RunFeed{
       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});}
+    if(record.status!=='running'&&!item.ended){item.ended=true;item.endedAt=events.at(-1)?.time??new Date(this.now()).toISOString();this.entries.push({type:'result',item});this.onEntry?.({type:'result',run:this.savedRun(item)});}
+    this.elapsed();
     this.trim();
   }
   trim(){
@@ -78,7 +102,34 @@ export class RunFeed{
     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:String(text).slice(-65536)});this.trim();this.refresh();}
+  message(text){this.onEntry?.({type:'message',text:String(text)});this.entries.push({type:'message',text:String(text).slice(-65536)});this.trim();this.refresh();}
+  exportState(){
+    const runs=[...this.runs.values()].map(item=>{
+      const steps=previewRun({output:[...item.steps.values()].map(({input,output,error,...step})=>step)},{maxValueBytes:4096}).output;
+      return {type:'run',record:{...this.savedRun(item,1024),events:[]},input:previewRun({input:item.input},{maxValueBytes:1024}).input,title:item.title,endedAt:item.endedAt,steps:Array.isArray(steps)?steps:[]};
+    });
+    const entries=this.entries.map(entry=>entry.type==='message'?{...entry}:{type:entry.type,runId:entry.item.record.id,...(entry.events?{events:entry.events}:{})});
+    // 当前窗口保存有界摘要；更早的交互仍保留在追加日志和各次运行的原始记录中。
+    while(entries.length&&Buffer.byteLength(JSON.stringify([...runs,...entries]))>1536*1024)entries.shift();
+    return JSON.parse(JSON.stringify([...runs,...entries]));
+  }
+  restoreState(state,{catalog=[]}={}){
+    if([...this.runs.values()].some(item=>!item.ended))throw new Error('当前有运行中的任务，完成后再恢复历史会话。');
+    this.runs.clear();this.entries=[];
+    for(const entry of state??[]){
+      if(entry.type==='run'&&entry.record?.id){
+        const record={...entry.record,events:[]};
+        if(record.status==='running'){record.status='unknown';record.reason='上次退出时执行中，未记录最终状态';}
+        const steps=createStepSummaries({maxEvents:this.maxEvents,maxMemoryBytes:this.maxBytes});for(const step of entry.steps??[])steps.append(step);
+        this.runs.set(record.id,{record,input:entry.input,title:entry.title,endedAt:entry.endedAt,ended:true,steps,catalog:new Map(catalog.map(action=>[action.id,action]))});
+      }else if(entry.type==='message'&&typeof entry.text==='string')this.entries.push({type:'message',text:entry.text});
+      else if(['start','events','result'].includes(entry.type)&&this.runs.has(entry.runId)){
+        const item=this.runs.get(entry.runId);this.entries.push({type:entry.type,item,...(entry.type==='events'?{events:entry.events??[]}:{})});
+        for(const event of entry.events??[])item.steps.append(event);
+      }
+    }
+    this.trim();this.elapsed();this.refresh();
+  }
   compactEvents(entry,seen){
     const {item}=entry,rows=[];
     for(const event of entry.events){
@@ -90,7 +141,7 @@ export class RunFeed{
           const 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}`);
+          rows.push(`${symbols[status]??'·'} ${name} · ${status==='started'?'执行中':runStatuses[status]??status}${latest.durationMs!==undefined?' · '+latest.durationMs+' ms':''}${action?.plugin?' · '+action.plugin:''} · ${latest.callPath}\n  Ctrl+O 查看指令、输入与结果 · /logs 选择步骤`);
         }
       }
       if(event.type==='log'&&event.audience==='user')rows.push(`[${event.callPath??item.record.workflowId}] ${event.message??''}${event.data!==undefined?'\n'+readableValue(event.data):''}`);
@@ -101,19 +152,24 @@ export class RunFeed{
   }
   text(){const seen=new Set();return (this.dropped?'主面板仅保留近期摘要；超出预算的事件和步骤摘要已省略。完整日志可在 /logs 中按 p 分页阅读。\n\n':'')+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)}`;
+    const {record,title,input}=entry.item,label=`${title??record.workflowId} · ${record.id.slice(0,8)}`,duration=elapsedTime({...record,...(entry.item.ended&&!record.finishedAt?{finishedAt:entry.item.endedAt}:{})},this.now());
     if(entry.type==='start')return [
-      `› ${record.workflowId.startsWith('/')?record.workflowId:'/run '+record.workflowId} · ${label}`,
+      `› ${runCategoryNames[runCategory(record)]} · ${record.workflowId} · ${label}`,
       `状态：${runStatuses[record.status]??record.status}`,
+      record.reason??'',
+      duration&&`耗时：${duration}`,
+      'Ctrl+O 查看指令、文件与结果 · /logs 查看单步详情',
       this.expanded&&input&&Object.keys(input).length?'输入\n'+readableValue(input):'',
       this.expanded&&entry.item.inputTruncated?'输入较大，主面板仅显示摘要。':'',
     ].filter(Boolean).join('\n');
-    if(entry.type==='events')return this.expanded?`${label}\n${readableTimeline(entry.events,{values:true})}`:this.compactEvents(entry,seen);
+    if(entry.type==='events')return this.expanded?`${label}\n${readableTimeline(entry.events,{values:true,catalog:[...entry.item.catalog.values()]})}`:this.compactEvents(entry,seen);
     return [`结果 · ${label} · ${runStatuses[record.status]??record.status}`,
+      duration&&`耗时：${duration}`,
+      record.resultDir?`生成文件：${record.resultDir}`:'',
       ...(record.warnings??[]).map(warning=>`警告：${warning.message}`),
       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??'',
       this.expanded&&record.outputTruncated?'结果较大，主面板仅显示摘要；完整结果请在 /logs 中按 p 分页阅读。':'',
     ].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();}
+  close(){this.closed=true;if(this.refreshTimer)clearTimeout(this.refreshTimer);this.refreshTimer=null;if(this.elapsedTimer)clearInterval(this.elapsedTimer);this.elapsedTimer=null;for(const unsubscribe of this.subscriptions.values())unsubscribe();this.subscriptions.clear();this.finishedListeners.clear();}
 }

package/manual/packages/fst-cli/src/terminal/run-presentation.js

@@ -1,14 +1,33 @@
 // 阅读层只处理展示；原始事件、输入输出与错误仍保留在运行记录中。
-export function readableValue(value,indent=''){
+const fieldNames={stdout:'标准输出',stderr:'标准错误',stdin:'标准输入',exitCode:'退出码',path:'路径',file:'文件',directory:'文件目录',cwd:'执行目录',args:'参数',script:'原始脚本',executable:'程序',ok:'是否成功',success:'是否成功',plugin:'插件',durationMs:'耗时（毫秒）'};
+const jsonTextLimit=65536;
+function decodedValue(value){
+  if(typeof value!=='string'||value.length>jsonTextLimit||!/^\s*(?:[\[{"\d-]|true\b|false\b|null\b)/.test(value)||Buffer.byteLength(value)>jsonTextLimit)return value;
+  try{return JSON.parse(value);}catch{return value;}
+}
+function valueText(value,indent,schema,depth,seen){
+  if(depth>32)return `${indent}（结构较深，请按 j 查看原始数据）`;
   if(value===undefined)return '暂无记录';
-  if(value===null)return 'null';
+  if(value===null)return '空值';
+  if(typeof value==='boolean')return value?'是':'否';
   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');
+  if(seen.has(value))return `${indent}（循环引用）`;
+  seen.add(value);
+  try{
+    const list=Array.isArray(value),entries=list?value.map((v,i)=>[i,v]):Object.entries(value);
+    if(!entries.length)return list?'（空列表）':'（空对象）';
+    return entries.map(([key,item])=>{
+      const child=list?(schema?.prefixItems?.[key]??(Array.isArray(schema?.items)?schema.items[key]:schema?.items)):schema?.properties?.[key];
+      const title=typeof child?.title==='string'&&child.title.trim()?child.title.trim():undefined;
+      const label=list?`[${key+1}]`:title??fieldNames[key]??key;
+      item=decodedValue(item);const nested=item!==null&&typeof item==='object';
+      const text=valueText(item,nested?indent+'  ':'',child,depth+1,seen);
+      return `${indent}${label}：${nested?'\n'+text:text.replaceAll('\r\n','\n').replaceAll('\r','\n').replaceAll('\n','\n'+indent+'  ')}`;
+    }).join('\n');
+  }finally{seen.delete(value);}
+}
+export function readableValue(value,indent='',schema){
+  return valueText(decodedValue(value),indent,schema,0,new Set());
 }
 export function readableError(error,{details=false}={}){
   if(!error)return '';
@@ -27,7 +46,18 @@ export function readableError(error,{details=false}={}){
 }
 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 actionFrom=(catalog,id)=>catalog instanceof Map?catalog.get(id):catalog?.find(action=>action.id===id);
+function processDetails(data){
+  if(!data||typeof data!=='object')return readableValue(data);
+  const rows=[];
+  if(data.file!==undefined||data.executable!==undefined)rows.push(`程序：${data.file??data.executable}`);
+  if(Array.isArray(data.args))rows.push(data.args.length?'参数：\n'+data.args.map((argument,index)=>`  [${index+1}] ${String(argument)}`).join('\n'):'参数：（无）');
+  if(data.cwd!==undefined)rows.push(`执行目录：${data.cwd}`);
+  if(data.script!==undefined)rows.push(`原始脚本：\n${data.script}`);
+  return rows.join('\n')||readableValue(data);
+}
+export function readableTimeline(events,{callPath,values=false,catalog=[]}={}){
+  const actions=new Map();for(const event of events??[])if(event.callPath&&event.action)actions.set(event.callPath,event.action);
   const rows=[];let pending;
   const push=(event,message)=>{
     const prefix=`${time(event.time)}  [${event.callPath??'运行'}${event.stream?' · '+event.stream:''}]`;
@@ -46,15 +76,28 @@ export function readableTimeline(events,{callPath,values=false}={}){
       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(event.type==='log'){
+      flush();const data=event.kind==='process'?processDetails(event.data):readableValue(event.data);
+      push(event,`${event.message??''}${event.data!==undefined?'\n'+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));
+        const action=actionFrom(catalog,event.action??actions.get(event.callPath));
+        if(event.input!==undefined&&Object.keys(event.input??{}).length)push(event,'输入\n'+readableValue(event.input,'',action?.input));
+        if(event.output!==undefined)push(event,'输出\n'+readableValue(event.output,'',action?.output));
       }
     }
   }
   flush();return rows.join('\n')||'等待执行记录。插件通过 log 或 runProcess 输出的内容会显示在这里。';
 }
+const timestamp=value=>typeof value==='number'?value:typeof value==='string'?Date.parse(value):NaN;
+export function elapsedTime(record,now=Date.now()){
+  const start=timestamp(record?.startedAt),finish=timestamp(record?.finishedAt);
+  const end=record?.status==='running'||record?.status==='pending'?timestamp(now):finish;
+  const duration=Number.isFinite(start)&&Number.isFinite(end)?Math.max(0,end-start):record?.status!=='running'&&Number.isFinite(record?.durationMs)?Math.max(0,record.durationMs):undefined;
+  return duration===undefined?undefined:`${(duration/1000).toFixed(1)} 秒`;
+}
+export const runCategoryNames={workflow:'工作流',action:'插件动作',command:'插件命令',shell:'系统命令'};
+export function runCategory(run){return run.kind??(run.workflowId?.startsWith('!')?'shell':run.workflowId?.startsWith('/')?'command':run.workflowId?.includes(':')?'action':'workflow');}

package/manual/packages/fst-cli/src/terminal/run-viewer.js

@@ -1,7 +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';
+import {readableValue,readableError,readableTimeline,elapsedTime} from './run-presentation.js';
 
 export const runStatuses={pending:'待执行',unknown:'摘要已省略',running:'运行中',succeeded:'成功',failed:'失败',cancelled:'已取消',skipped:'已跳过',stopped:'已停止'};
 const safe=value=>stripVTControlCharacters(String(value)).replace(/[\x00-\x08\x0b-\x1f\x7f]/g,'');
@@ -10,8 +10,8 @@ export const mouseOn='\x1b[?1000h\x1b[?1006h';
 export const mouseOff='\x1b[?1006l\x1b[?1000l';
 
 export class RunViewer{
-  constructor({record,flow,workflows=[],catalog=[],terminal,onClose,onCancel,onReadLogs,requestRender}){
-    Object.assign(this,{terminal,onClose,onCancel,onReadLogs,requestRender,catalog});this.view=0;this.selected=0;this.offset=0;this.follow=true;this.allLogs=true;this.raw=false;this.confirmCancel=false;
+  constructor({record,flow,workflows=[],catalog=[],terminal,onClose,onCancel,onReadLogs,onReadOutput,now=Date.now,requestRender}){
+    Object.assign(this,{terminal,onClose,onCancel,onReadLogs,onReadOutput,now,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??[]){
@@ -27,6 +27,7 @@ export class RunViewer{
   invalidate(){}
   update(record){
     if(!record)return;
+    if(record.status!=='running')this.confirmCancel=false;
     this.record=record;const nodes=new Map(this.planned.map(node=>[node.callPath,{...node,...(record.stepsTruncated&&record.status!=='running'?{status:'unknown'}:{})}]));
     for(const event of [...(record.events??[]),...(record.stepSummaries??[])].sort((a,b)=>(a.seq??0)-(b.seq??0))){
       if(!event.type.startsWith('step.')||!event.callPath)continue;
@@ -37,26 +38,40 @@ export class RunViewer{
     this.nodes=[...nodes.values()];this.selected=Math.max(0,Math.min(this.selected,this.nodes.length-1));
     this.requestRender();
   }
+  outputSchema(node){return this.catalog.find(action=>action.id===(node?.action??this.record.action??this.record.workflowId))?.output;}
+  getRenderedOutput(){
+    const node=this.view===0?undefined:this.nodes[this.selected],output=node?node.output:this.record.output,schema=this.outputSchema(node);
+    if(output&&typeof output==='object'){
+      if(typeof output.markdown==='string')return output.markdown;
+      for(const [key,value] of Object.entries(output))if(typeof value==='string'&&(schema?.properties?.[key]?.format==='markdown'||schema?.properties?.[key]?.contentMediaType==='text/markdown'))return value;
+    }
+    return readableValue(output,'',schema);
+  }
   content(){
     const node=this.nodes[this.selected],status=runStatuses[this.record.status]??this.record.status;
+    const elapsed=elapsedTime(this.record,this.now());
     if(this.view===0)return [
       `运行：${status}${this.record.reason?` · ${this.record.reason}`:''}`,
+      elapsed!==undefined?`耗时：${elapsed}`:'',
       this.record.error?readableError(this.record.error):'',
       ...(this.record.warnings??[]).map(warning=>`警告：${warning.message}`),
-      this.record.output!==undefined?'\n最终输出\n'+readableValue(this.record.output):'',
+      this.record.output!==undefined?'\n最终输出\n'+readableValue(this.record.output,'',this.outputSchema()):'',
+      this.record.resultDir?'\n生成文件：'+this.record.resultDir:'',
       '\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 action=this.catalog.find(action=>action.id===(node?.action??this.record.action??this.record.workflowId));
+      const format=(value,schema)=>this.raw?JSON.stringify(value??null,null,2):readableValue(value,'',schema);
       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),
+      return [`步骤：${node?.title??node?.callPath??'整个运行'}`,node?.title&&node.callPath?'调用路径：'+node.callPath:'',node?.action?'能力：'+node.action:'',error?'\n错误\n'+(this.raw?format(error):readableError(error)):'',
+        '\n输入\n'+format(node?node.input:this.record.input??this.record.events?.find(event=>event.type==='run.input')?.input,action?.input), '\n输出\n'+format(node?node.output:this.record.output,action?.output),
         !error&&(node?.reason||node?.message)?'\n说明：'+(node.reason??node.message):'',this.raw?'\n原始 JSON · 包含完整错误详情与调用栈':'\nj 查看原始 JSON 与完整诊断',
+        this.onReadOutput?'m 格式化阅读输出':'',
       ].filter(Boolean).join('\n');
     }
-    return (this.record.eventsTruncated?'当前为近期日志摘要，按 p 分页查看完整落盘日志。\n\n':'')+readableTimeline(this.record.events,{callPath:this.allLogs?undefined:node?.callPath});
+    return (this.record.eventsTruncated?'当前为近期日志摘要，按 p 分页查看完整落盘日志。\n\n':'')+readableTimeline(this.record.events,{callPath:this.allLogs?undefined:node?.callPath,catalog:this.catalog});
   }
   layout(width){
     const height=Math.max(1,this.terminal.rows),pageSize=Math.max(1,height-4);
@@ -70,7 +85,7 @@ 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 取消 · p 完整日志 · 1/2/3 切换';
+    const footer=this.confirmCancel?'取消整个运行？y 确认 · 任意其他键返回':`q/Esc 返回${this.record.status==='running'?' · x 取消':''} · p 完整日志${this.onReadOutput?' · m 阅读输出':''} · 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));
@@ -79,7 +94,8 @@ export class RunViewer{
   }
   handleInput(data){
     if(data==='p'&&this.onReadLogs){this.onReadLogs();return;}
-    if(this.confirmCancel){this.confirmCancel=false;if(data==='y')this.onCancel();this.requestRender();return;}
+    if(this.confirmCancel){this.confirmCancel=false;if(data==='y'&&this.record.status==='running')this.onCancel();this.requestRender();return;}
+    if(data==='m'&&this.onReadOutput){this.onReadOutput(this.getRenderedOutput());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;}