@yanglaofish/fishtools 0.5.2 → 0.6.0

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

@@ -1,6 +1,7 @@
 import {randomUUID} from 'node:crypto';
+import {isDeepStrictEqual} from 'node:util';
 import {isCommandName} from '@mytools/fst-plugin/contracts';
-import {editValue} from './schema.js';
+import {editValue,editInput} from './schema.js';
 
 export async function runShortcut(session,entry,args=[]){
   if(!entry.available)throw new Error(`快捷名称 /${entry.name} 已失效：${entry.reason??'目标不存在'}`);
@@ -47,7 +48,7 @@ async function editPreset(session,id,current){
   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??(isCommandName(preset.title)?preset.title:'');
+  let shortcut=oldName??(!current&&isCommandName(preset.title)?preset.title:'');
   for(;;){
     const choice=await ui.select('常用命令设置',[
       {value:'save',label:'保存',description:shortcut?`快捷执行 /${shortcut}`:'只注册工作流动作'},
@@ -81,6 +82,7 @@ async function editPreset(session,id,current){
         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;}
@@ -107,7 +109,9 @@ export async function commandPresetsMenu(session){
     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();if(!await ui.confirm(`删除 ${preset.title}？指向它的快捷名称会显示失效；引用中的工作流需先调整。`))continue;
+      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}`);}
@@ -149,11 +153,13 @@ async function editShortcut(session,oldName){
     }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:'快捷名称默认参数'});
+      const preview=app.previewInput?value=>app.previewInput(target.action??`/${target.command}`,value):undefined;
+      target.input=await editInput(ui,metadata.input??{type:'object',properties:{},additionalProperties:false},target.input??{},{baseDir:session.baseDir,required:true,label:'快捷名称默认参数',preview});
     }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}`);}
     }
@@ -180,7 +186,7 @@ export async function shortcutsMenu(session){
     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('快捷名称已删除，插件能力仍可使用。');
+      await app.configureShortcuts(next);ui.show('快捷名称已删除。');
     }
   }
 }

package/manual/packages/fst-cli/src/terminal/file-autocomplete.js

@@ -0,0 +1,106 @@
+import path from 'node:path';
+import {homedir} from 'node:os';
+import {CombinedAutocompleteProvider} from '@mariozechner/pi-tui';
+import {createFileProbe} from '@mytools/fst-platform/fs';
+import {cleanText as safe} from './theme.js';
+
+function budget(value,fallback,max){return Number.isSafeInteger(value)&&value>0?Math.min(value,max):fallback;}
+export function createAutocompleteProbe(options={}){
+  return options.probe??createFileProbe({timeout:budget(options.timeout,1200,10000),maxConcurrent:1,maxPending:1,allowRemote:options.allowRemote===true});
+}
+function remote(value){
+  const normalized=value.replaceAll('/','\\');
+  if(/^\\\\[?.]\\/u.test(normalized))return /^\\\\[?.]\\UNC(?:\\|$)/iu.test(normalized)||/^\\\\[?.]\\GLOBALROOT\\Device\\(?:Mup|LanmanRedirector|WebDavRedirector)(?:\\|$)/iu.test(normalized);
+  return /^\\\\/u.test(normalized)||/^\\(?:\?\?\\UNC|Device\\(?:Mup|LanmanRedirector|WebDavRedirector))(?:\\|$)/iu.test(normalized);
+}
+
+// 同步接口只查有界缓存；所有文件 I/O 交给可取消的隔离探测进程。
+export class FileAutocomplete extends CombinedAutocompleteProvider{
+  constructor(commands=[],baseDir=process.cwd(),workflows=[],options={}){
+    super(commands,baseDir);this.baseDir=baseDir;this.workflows=workflows;
+    this.defaultCommands=new CombinedAutocompleteProvider(commands.filter(command=>!command.searchOnly),baseDir);
+    this.files=options.files!==false;this.allowRemote=options.allowRemote===true;
+    this.entryLimit=budget(options.entryLimit,1000,10000);this.maxItems=budget(options.maxItems,100,100);
+    this.cacheLimit=budget(options.cacheLimit,16,64);this.cacheTtl=budget(options.cacheTtl,5000,60000);
+    this.timeout=budget(options.timeout,1200,10000);this.debounceMs=options.debounceMs===0?0:budget(options.debounceMs,40,500);
+    this.probe=createAutocompleteProbe(options);this.ownsProbe=options.ownsProbe!==false;
+    this.onUpdate=options.onUpdate;this.cache=new Map();this.closed=false;
+  }
+  cancelPending(){
+    const pending=this.pending;this.pending=null;
+    if(pending){clearTimeout(pending.timer);pending.controller.abort();}
+  }
+  close(){
+    if(this.closing)return this.closing;
+    this.closed=true;this.cancelPending();this.cache.clear();this.onUpdate=null;
+    return this.closing=Promise.resolve(this.ownsProbe?this.probe.close():undefined);
+  }
+  schedule(directory,snapshot){
+    if(this.pending?.directory===directory){this.pending.snapshot=snapshot;return;}
+    this.cancelPending();
+    const pending={directory,snapshot,controller:new AbortController()};this.pending=pending;
+    pending.timer=setTimeout(async()=>{
+      let result;
+      try{result=await this.probe.readDirectory(directory,{limit:this.entryLimit,timeout:this.timeout,signal:pending.controller.signal});}
+      catch{result={status:'error',incomplete:true,reason:'probeFailed'};}
+      if(this.closed||this.pending!==pending||pending.controller.signal.aborted)return;
+      this.pending=null;
+      // 错误和超时也短暂缓存，避免按键触发无限重试。
+      const cached={status:result.status,incomplete:result.incomplete,reason:result.reason,
+        value:result.status==='ok'?result.value.slice(0,this.entryLimit):[],expires:Date.now()+this.cacheTtl};
+      this.cache.delete(directory);this.cache.set(directory,cached);
+      while(this.cache.size>this.cacheLimit)this.cache.delete(this.cache.keys().next().value);
+      this.lastResult={status:cached.status,incomplete:cached.incomplete,reason:cached.reason};
+      this.onUpdate?.(pending.snapshot);
+    },this.debounceMs);
+  }
+  getSuggestions(lines,line,col){
+    if(this.closed)return null;
+    const text=(lines[line]??'').slice(0,col);
+    const prefix=text.match(/(?:^|\s)(@"[^"\n]*|@[^\s]*)$/)?.[1];
+    if(!prefix){
+      if(text==='/'){this.cancelPending();return this.defaultCommands.getSuggestions(lines,line,col);}
+      const run=text.match(/^\/run\s+([^@"\s]*)$/);
+      if(run){
+        this.cancelPending();
+        const query=run[1].toLowerCase(),items=this.workflows.filter(flow=>`${flow.id} ${flow.title??''}`.toLowerCase().includes(query)).slice(0,this.maxItems).map(flow=>({value:flow.id,label:flow.title??flow.id,description:flow.id,workflow:true}));
+        return items.length?{prefix:run[1],items}:null;
+      }
+      // 只把命令交给上游，不能回落到它的同步文件系统实现。
+      if(/^\/[^\s/]*(?:\s.*)?$/.test(text)){this.cancelPending();return super.getSuggestions(lines,line,col);}
+    }
+    if(!this.files)return null;
+    const filePrefix=prefix??this.extractPathPrefix(text,false);
+    if(filePrefix===null){this.cancelPending();return null;}
+    const raw=filePrefix.replace(/^@/,'').replace(/^"/,'').replaceAll('\\','/');
+    // 解析前判定，避免 POSIX resolve 抹掉 UNC 的双斜杠或 Windows 设备前缀。
+    if(!this.allowRemote&&(remote(raw)||remote(this.baseDir))){
+      this.cancelPending();this.lastResult={status:'skipped',incomplete:true,reason:'remotePath'};return null;
+    }
+    const expanded=raw.startsWith('~/')?path.join(homedir(),raw.slice(2)):raw==='~'?homedir():raw;
+    const absolute=path.resolve(this.baseDir,expanded||'.');
+    const directory=!raw||raw==='~'||raw.endsWith('/')?absolute:path.dirname(absolute);
+    const query=!raw||raw==='~'||raw.endsWith('/')?'':path.basename(absolute).toLowerCase();
+    const cached=this.cache.get(directory);
+    if(!cached||cached.expires<=Date.now()){
+      this.schedule(directory,{lines:[...lines],line,col});return null;
+    }
+    if(this.pending?.directory!==directory)this.cancelPending();
+    this.lastResult={status:cached.status,incomplete:cached.incomplete,reason:cached.reason};
+    const items=cached.value.filter(entry=>entry.name.toLowerCase().startsWith(query)).map(entry=>{
+      // 链接只作为链接候选，不逐个 stat 目标。用户显式输入 / 后才读取其内容。
+      const dir=entry.type==='directory',head=raw==='~'?'~/':raw.slice(0,raw.lastIndexOf('/')+1),file=head+entry.name+(dir?'/':'');
+      return {value:`${prefix?'@':''}${/[\s"]/.test(file)?JSON.stringify(file):file}`,label:safe(entry.name)+(dir?'/':''),description:dir?'目录':entry.type==='symlink'?'符号链接':'文件',directory:dir,file:true};
+    }).sort((a,b)=>Number(b.directory)-Number(a.directory)||a.label.localeCompare(b.label)).slice(0,this.maxItems);
+    return items.length?{prefix:filePrefix,items,incomplete:cached.incomplete}: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(!item.file&&!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)};
+  }
+}

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

@@ -1,17 +1,18 @@
 import { Markdown, matchesKey, truncateToWidth } from '@mariozechner/pi-tui';
 import { mouseWheel } from './run-viewer.js';
-import {palette,markdownTheme} from './theme.js';
+import {cleanText,palette,markdownTheme} from './theme.js';
 
 const theme=markdownTheme();
 
-// 文本已由 TerminalView 的 safe 清理；每次只向 Overlay 提交当前窗口内的行。
+// 每次只向 Overlay 提交当前窗口内的行；动态结果在消费时清理控制字符。
 export class MarkdownLogViewer{
   constructor({title,text,terminal,onClose,requestRender}){
     this.title=title.replace(/\s+/g,' ');this.terminal=terminal;this.onClose=onClose;this.requestRender=requestRender;
-    this.markdown=new Markdown(text,0,0,theme);this.offset=0;
+    this.source=text;this.markdown=new Markdown(typeof text==='function'?'':cleanText(text),0,0,theme);this.offset=0;
   }
   invalidate(){this.markdown.invalidate();}
   layout(width){
+    if(typeof this.source==='function'&&this.sourceWidth!==width){this.markdown.setText(cleanText(this.source(width)));this.sourceWidth=width;}
     const height=Math.max(1,this.terminal.rows);
     const pageSize=Math.max(1,height-2);
     // Markdown 自身缓存同一宽度的完整渲染，滚动时不重新解析日志。

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

@@ -1,10 +1,12 @@
-import {builtinCommands} from '@mytools/fst-plugin/contracts';
+import {builtinCommands,isCommandName} from '@mytools/fst-plugin/contracts';
 
 const visible=['workflows','run','pack','logs','plugin','commands','shortcuts','config','tools','help','exit'];
 // 入口由插件 ID 推导；冲突时加前缀，不能覆盖内置或作者注册的命令。
 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),...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){
@@ -16,3 +18,25 @@ export function commandMenu(plugins,commands,shortcuts=[]){
   }
   return entries;
 }
+
+// 空斜杠保持精简；输入前缀后可搜索所有可执行命令及无歧义的插件命名空间。
+export function commandCompletions(plugins,commands,shortcuts=[]){
+  const entries=commandMenu(plugins,commands,shortcuts),used=new Set(entries.map(entry=>entry.name));
+  const menuLength=entries.length,aliases=[];
+  for(const command of [...builtinCommands,...commands])if(!used.has(command.name)){
+    used.add(command.name);entries.push({name:command.name,description:command.description??command.name,searchOnly:true});
+  }
+  const namespaces=new Map();
+  for(const command of commands){
+    if(!command.name.includes('.'))continue;
+    const name=command.name.split('.')[0];
+    if(!namespaces.has(name))namespaces.set(name,new Set());
+    namespaces.get(name).add(command.plugin);
+  }
+  for(const [name,owners] of namespaces)if(owners.size===1&&!used.has(name)&&isCommandName(name)){
+    const id=[...owners][0],plugin=plugins.find(plugin=>plugin.id===id);
+    if(!plugin)continue;
+    used.add(name);aliases.push({name,plugin:id,searchOnly:true,description:`[插件] ${plugin.title??id} · 选择能力`});
+  }
+  return [...entries.slice(0,menuLength),...aliases,...entries.slice(menuLength)];
+}

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:'待配置',unavailable:'不可用'})[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,9 @@ 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.loadError?[`不可用原因：${plugin.loadError.message}\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/report-presentation.js

@@ -0,0 +1,38 @@
+import {inspectReport} from '@mytools/sdk/reports';
+import {cleanText as clean} from './theme.js';
+import {isDeepStrictEqual} from 'node:util';
+
+const levels={info:'提示',warning:'警告',error:'错误'};
+function conclusions(value){
+  return [value.summary&&`摘要：${value.summary}`,...(value.alerts??[]).map(alert=>`${levels[alert.level]}：${alert.message}`),
+    ...(value.recommendations?.length?['建议：',...value.recommendations.map((text,index)=>`  ${index+1}. ${text}`)]:[])].filter(Boolean);
+}
+function dataSchema(section){
+  const properties=Object.fromEntries(Object.entries(section.titles??{}).map(([key,title])=>[key,{title}]));
+  return {'x-fst-table':section.columns,properties,items:{properties},additionalProperties:{properties}};
+}
+
+// 整个输出或 report 字段均可承载报告，不猜测其他同名业务字段的含义。
+export function outputReport(value){
+  if(value?.kind==='fst-report')return value;
+  if(value?.report?.kind==='fst-report')return value.report;
+}
+
+export function forwardedReport(output,finalOutput){
+  const report=outputReport(output);
+  return report&&isDeepStrictEqual(report,outputReport(finalOutput))?report:undefined;
+}
+
+export function renderReport(value,{indent='',render,truncated=false}){
+  if(truncated&&value?.kind==='fst-report')return clean(`${indent}报告内容为摘要，完整结果请在 /logs 中按 p 分页阅读。\n${render(value,indent,undefined,{raw:true})}`);
+  const result=inspectReport(value);
+  if(result.status==='none')return;
+  if(result.status!=='valid')return clean(`${indent}${result.message}\n${render(value,indent,undefined,{raw:true})}`);
+  const inset=(text,padding)=>String(text).split('\n').map(line=>' '.repeat(padding)+line).join('\n');
+  const lines=[`报告：${value.title}`,...conclusions(value).map(text=>inset(text,2))];
+  for(const section of value.sections??[]){
+    lines.push('',inset(`── ${section.title} ──`,2),...conclusions(section).map(text=>inset(text,4)));
+    if(Object.hasOwn(section,'data'))lines.push(inset(render(section.data,'',dataSchema(section),{inset:4}),4));
+  }
+  return clean(lines.join('\n')).split('\n').map(line=>indent+line).join('\n');
+}

package/manual/packages/fst-cli/src/terminal/result-table.js

@@ -0,0 +1,66 @@
+import {visibleWidth} from '@mariozechner/pi-tui';
+import {cleanText as clean} from './theme.js';
+
+const heading=value=>clean(String(value).replace(/[\r\n\t]+/g,' '));
+const record=value=>value!==null&&typeof value==='object'&&!Array.isArray(value);
+const scalar=value=>value===null||['string','number','boolean'].includes(typeof value);
+const empty=value=>value==null||value===''||typeof value==='object'&&Object.keys(value).length===0;
+const text=value=>value===undefined?'未提供':value===null?'空值':value===''?'空字符串':typeof value==='boolean'?(value?'是':'否'):clean(value);
+const sameKeys=(a,b)=>a.length===b.length&&a.every(key=>b.includes(key));
+
+// 表格只选择阅读列；完整的长值、复杂值和其余字段在表后按行号展开。
+export function resultTable(value,{schema,width,indent,label,render}){
+  const available=width-visibleWidth(indent);
+  if(!Number.isFinite(available)||available<40)return;
+  const list=Array.isArray(value),entries=list?value.map((item,index)=>[String(index+1),item]):Object.entries(value);
+  if(entries.length<2||entries.some(([,item])=>!record(item)))return;
+  const firstKeys=Object.keys(entries[0][1]),declared=schema?.['x-fst-table'];
+  const explicit=Array.isArray(declared)&&declared.length>0&&declared.every(key=>typeof key==='string')&&new Set(declared).size===declared.length;
+  if(!explicit&&!entries.every(([,item])=>sameKeys(firstKeys,Object.keys(item))))return;
+  const rowSchema=list?(Array.isArray(schema?.items)?undefined:schema?.items):schema?.additionalProperties;
+  const candidates=(explicit?declared:firstKeys).filter(key=>entries.every(([,item])=>item[key]===undefined||scalar(item[key]))&&entries.some(([,item])=>item[key]!==undefined&&(explicit||item[key]!==null&&item[key]!=='')));
+  if(candidates.length<(explicit?1:2))return;
+  const duplicate=!explicit&&!list?candidates.find(name=>entries.every(([key,item])=>item[name]===key)):undefined;
+  const common=!explicit?candidates.filter(key=>key!==duplicate&&entries.every(([,item])=>item[key]===entries[0][1][key])&&visibleWidth(text(entries[0][1][key]))<=24&&!/[\r\n\t]/.test(text(entries[0][1][key]))):[];
+  const ordered=candidates.filter(key=>key!==duplicate&&!common.includes(key));
+  if(!explicit)ordered.sort((a,b)=>Number(entries.some(([,item])=>/[\r\n\t]/.test(text(item[a]))||visibleWidth(text(item[a]))>24))-Number(entries.some(([,item])=>/[\r\n\t]/.test(text(item[b]))||visibleWidth(text(item[b]))>24)));
+  // 条目键也可能很长，序号始终可定位；完整键在表后的对应条目显示。
+  const identity={key:null,title:list?'序号':duplicate?heading(label(duplicate,rowSchema?.properties?.[duplicate])):'条目',values:entries.map(([key])=>list?key:clean(key)),width:0};
+  const columns=[identity,...ordered.map(key=>({key,title:heading(label(key,rowSchema?.properties?.[key])),values:entries.map(([,item])=>text(item[key]))}))];
+  for(const column of columns)column.width=column.values.reduce((size,value)=>Math.max(size,/[\r\n\t]/.test(value)||visibleWidth(value)>24?Math.max(6,Math.min(24,visibleWidth(value))):visibleWidth(value)),visibleWidth(column.title));
+  const selected=[];let used=1;
+  for(const column of columns){
+    if(used+column.width+3>available||selected.length>=7){if(column===identity)return;continue;}
+    selected.push(column);used+=column.width+3;
+  }
+  if(selected.length<2&&!common.length)return;
+  let folded=false;
+  const detailRows=[],border=(left,middle,right)=>indent+left+selected.map(column=>'─'.repeat(column.width+2)).join(middle)+right;
+  const line=values=>indent+'│'+values.map((value,index)=>' '+value+' '.repeat(selected[index].width-visibleWidth(value)+1)).join('│')+'│';
+  const lines=[border('┌','┬','┐'),line(selected.map(column=>column.title)),border('├','┼','┤')];
+  entries.forEach(([key,item],index)=>{
+    const details=Object.create(null);let longKey=false;
+    const values=selected.map(column=>{
+      const value=column.values[index];
+      if(/[\r\n\t]/.test(value)||visibleWidth(value)>column.width){
+        if(column.key===null)longKey=true;else details[column.key]=item[column.key];
+        return '见下文';
+      }
+      return value;
+    });
+    for(const [name,value] of Object.entries(item))if(name!==duplicate&&!common.includes(name)&&!selected.some(column=>column.key===name)){
+      if(empty(value))folded=true;else details[name]=value;
+    }
+    lines.push(line(values));
+    if(longKey||Object.keys(details).length){
+      const identityText=list?`[${index+1}]`:`[${index+1}] ${clean(key)}`;
+      const body=render(details,indent+'  ',rowSchema);
+      detailRows.push(`${indent}${identityText} · 补充字段${longKey?'（完整条目键）':''}${body.includes('\n')?'\n'+body:'：'+body.trimStart()}`);
+    }
+  });
+  lines.push(border('└','┴','┘'));
+  if(common.length)lines.push(`${indent}共有字段：${common.map(key=>`${label(key,rowSchema?.properties?.[key])}：${text(entries[0][1][key])}`).join(' · ')}`);
+  if(folded)lines.push(`${indent}空字段已折叠；/logs → j 查看原始数据。`);
+  if(detailRows.length)lines.push(`${indent}补充字段（对应表格行，保留全文）：`,...detailRows);
+  return lines.join('\n');
+}

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

@@ -1,7 +1,8 @@
-import {readableValue,readableError,readableTimeline} from './run-presentation.js';
+import {readableValue,readableError,readableTimeline,readableProcess,runCategory,runCategoryNames,elapsedTime,presentationCatalog} from './run-presentation.js';
 import {runStatuses} from './run-viewer.js';
 import {createStepSummaries} from '@mytools/fst-logs/steps';
 import {previewRun} from '@mytools/fst-logs/preview';
+import {outputReport,forwardedReport} from './report-presentation.js';
 
 const feedRecord=(record,maxBytes)=>{
   const {stepSummaries,stepSummaryBytes,stepsTruncated,...state}=record;
@@ -10,14 +11,27 @@ 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 raw=app.getRun(runId),record=feedRecord(raw,this.maxBytes);
+    let inputTruncated=false;
+    if(input===undefined){
+      const inputEvent=raw.events?.find(event=>event.type==='run.input');
+      input=raw.input!==undefined?raw.input:inputEvent?.input;
+      inputTruncated=raw.input!==undefined?raw.inputTruncated:inputEvent?.eventTruncated;
+    }
+    const bounded=previewRun({input},{maxValueBytes:Math.min(this.maxBytes,65536)});
+    const item={app,record,title,done,input:bounded.input,inputTruncated:bounded.inputTruncated||inputTruncated,count:0,ended:false,steps:createStepSummaries({maxEvents:this.maxEvents,maxMemoryBytes:this.maxBytes}),catalog:new Map(presentationCatalog(app).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 +39,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,inputTruncated:item.inputTruncated||state.inputTruncated},{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,24 +65,29 @@ 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);
       item.count=record.eventCount??record.events.length;
     }
     const {record}=item;
+    if(item.input===undefined){
+      const inputEvent=events.find(event=>event.type==='run.input');
+      if(inputEvent){const bounded=previewRun({input:inputEvent.input},{maxValueBytes:Math.min(this.maxBytes,65536)});item.input=bounded.input;item.inputTruncated=bounded.inputTruncated||inputEvent.eventTruncated;}
+    }
     for(const event of events)item.steps.append(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});}
+    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,8 +114,35 @@ 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();}
-  compactEvents(entry,seen){
+  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,inputTruncated:record.inputTruncated,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,width){
     const {item}=entry,rows=[];
     for(const event of entry.events){
       const key=`${item.record.id}\0${event.callPath}`;
@@ -87,33 +150,51 @@ export class RunFeed{
         seen.add(key);const latest=item.steps.get(event.callPath);
         if(!latest)rows.push(`· ${event.action??event.stepId??event.callPath} · 摘要已省略 · ${event.callPath}`);
         else{
-          const action=item.catalog.get(latest.action);
+          const actionId=latest.action??event.action,action=item.catalog.get(actionId);
           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}`);
+          const name=action?.title??actionId??latest.stepId??latest.callPath;
+          rows.push(`${symbols[status]??'·'} ${name}${actionId&&name!==actionId?' · '+actionId:''} · ${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):''}`);
+      if(event.type==='step.started'&&event.input!==undefined)rows.push(`输入 · ${event.callPath}\n${readableValue(event.input,'  ',item.catalog.get(event.action)?.input,{compact:true,decodeStrings:false,width,truncated:event.eventTruncated})}`);
+      if(event.type==='log'&&event.kind==='process')rows.push(`执行指令 · ${event.callPath??item.record.workflowId}${typeof event.processId==='string'&&event.processId?' · #'+event.processId.slice(0,8):''}\n${readableProcess(event.data)}`);
+      if(event.type==='step.succeeded'&&!seen.has(`${key}\0report`)){
+        seen.add(`${key}\0report`);const report=outputReport(event.output);
+        // 从已有的有界事件读取正文；最终输出转发同一报告时展示一次即可。
+        if(report&&!forwardedReport(event.output,item.record.output))rows.push(readableValue(report,'  ',undefined,{compact:true,width,truncated:event.eventTruncated}));
+      }
+      if(event.type==='log'&&event.audience==='user'&&!event.stream&&event.kind!=='process'){
+        const data=event.data!==undefined?'\n'+readableValue(event.data,'',undefined,{compact:true,width:Number.isFinite(width)?Math.max(1,width-2):width,truncated:event.eventTruncated}):'';
+        rows.push(`[${event.callPath??item.record.workflowId}] ${event.message??''}${data}`.replaceAll('\r\n','\n').replaceAll('\r','\n').split('\n').map(line=>'  '+line).join('\n'));
+      }
       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.dropped?'主面板仅保留近期摘要；超出预算的事件和步骤摘要已省略。完整日志可在 /logs 中按 p 分页阅读。\n\n':'')+this.entries.map(entry=>{
+  text(width){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}`,
-      this.expanded&&input&&Object.keys(input).length?'输入\n'+readableValue(input):'',
-      this.expanded&&entry.item.inputTruncated?'输入较大，主面板仅显示摘要。':'',
+      record.reason??'',
+      duration&&`耗时：${duration}`,
+      'Ctrl+O 展开原始输出与诊断 · /logs 查看单步详情',
+      input!==undefined?'输入\n'+readableValue(input,'  ',entry.item.catalog.get(record.action??record.workflowId)?.input,{compact:true,decodeStrings:false,width}):'',
+      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,width,catalog:[...entry.item.catalog.values()],finalOutput:record.output})}`:this.compactEvents(entry,seen,width);
+    const report=outputReport(record.output);
+    const output=!this.expanded||report===record.output?undefined:report?Object.fromEntries(Object.entries(record.output).filter(([key])=>key!=='report')):record.output;
     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 分页阅读。':'',
+      report?readableValue(report,'  ',undefined,{compact:true,width,truncated:record.outputTruncated}):'',
+      output!==undefined&&(!report||Object.keys(output).length)?'原始输出（/logs → j 查看原始数据）\n'+readableValue(output,'',entry.item.catalog.get(record.action??record.workflowId)?.output,{compact:true,width,truncated:record.outputTruncated}):'',record.error&&(this.expanded||![...entry.item.steps.values()].some(step=>step.type==='step.failed'))?readableError(record.error,{details:this.expanded}):'',record.reason??'',
+      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();}
 }