@yanglaofish/fishtools 0.5.3 → 0.6.0

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

@@ -1,7 +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??'目标不存在'}`);
@@ -153,7 +153,8 @@ 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;}

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,4 +1,4 @@
-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 推导；冲突时加前缀，不能覆盖内置或作者注册的命令。
@@ -18,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:'已停止',unconfigured:'待配置'})[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];
@@ -36,6 +36,7 @@ export function pluginDetails(plugin,actions,commands){
     plugin.description??'作者尚未提供用途说明。',
     `标识：${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,runCategory,runCategoryNames,elapsedTime} 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;
@@ -18,8 +19,15 @@ export class RunFeed{
   }
   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,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]))};
+    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});
@@ -43,7 +51,7 @@ export class RunFeed{
     };
     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};}
+  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?.();}
@@ -68,6 +76,10 @@ export class RunFeed{
       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);
@@ -121,7 +133,7 @@ export class RunFeed{
         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]))});
+        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??[]}:{})});
@@ -130,7 +142,7 @@ export class RunFeed{
     }
     this.trim();this.elapsed();this.refresh();
   }
-  compactEvents(entry,seen){
+  compactEvents(entry,seen,width){
     const {item}=entry,rows=[];
     for(const event of entry.events){
       const key=`${item.record.id}\0${event.callPath}`;
@@ -138,19 +150,29 @@ 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}\n  Ctrl+O 查看指令、输入与结果 · /logs 选择步骤`);
+          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)}`,duration=elapsedTime({...record,...(entry.item.ended&&!record.finishedAt?{finishedAt:entry.item.endedAt}:{})},this.now());
     if(entry.type==='start')return [
@@ -158,17 +180,20 @@ export class RunFeed{
       `状态：${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?'输入较大，主面板仅显示摘要。':'',
+      '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,catalog:[...entry.item.catalog.values()]})}`: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(){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,33 +1,60 @@
+import {visibleWidth} from '@mariozechner/pi-tui';
+import {resultTable} from './result-table.js';
+import {renderReport,forwardedReport} from './report-presentation.js';
 // 阅读层只处理展示；原始事件、输入输出与错误仍保留在运行记录中。
-const fieldNames={stdout:'标准输出',stderr:'标准错误',stdin:'标准输入',exitCode:'退出码',path:'路径',file:'文件',directory:'文件目录',cwd:'执行目录',args:'参数',script:'原始脚本',executable:'程序',ok:'是否成功',success:'是否成功',plugin:'插件',durationMs:'耗时（毫秒）'};
+const fieldNames={stdout:'标准输出',stderr:'标准错误',stdin:'标准输入',exitCode:'退出码',path:'路径',file:'文件',directory:'文件目录',cwd:'执行目录',args:'参数',script:'原始脚本',executable:'程序',ok:'是否成功',success:'是否成功',plugin:'插件',durationMs:'耗时（毫秒）',id:'标识',title:'名称',group:'分组',found:'已找到',version:'版本',source:'来源',error:'错误',note:'说明'};
 const jsonTextLimit=65536;
+// 斜杠命令与工作流动作共用阅读元信息，避免直接调用时丢失字段标题。
+export function presentationCatalog(app){
+  return [...(app.catalog?.()??[]),...(app.listCommands?.()??[]).map(command=>({...command,id:`/${command.name}`}))];
+}
 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){
+const emptyField=value=>value==null||value===''||typeof value==='object'&&Object.keys(value).length===0;
+function valueText(value,indent,schema,depth,seen,decodeStrings,compact,width,truncated){
   if(depth>32)return `${indent}（结构较深，请按 j 查看原始数据）`;
   if(value===undefined)return '暂无记录';
   if(value===null)return '空值';
   if(typeof value==='boolean')return value?'是':'否';
+  if(typeof value==='string'&&!decodeStrings)return JSON.stringify(value);
   if(typeof value!=='object')return String(value);
   if(seen.has(value))return `${indent}（循环引用）`;
+  if(decodeStrings){
+    const report=renderReport(value,{indent,truncated,render:(item,prefix,child,{raw=false,inset=0}={})=>valueText(item,prefix,child,depth+1,seen,!raw,raw?false:compact,raw?width:width-visibleWidth(indent)-inset,truncated)});
+    if(report!==undefined)return report;
+  }
   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 table=compact&&decodeStrings?resultTable(value,{schema,width,indent,label:(key,child)=>(typeof child?.title==='string'&&child.title.trim())||fieldNames[key]||key,render:(item,prefix,child)=>valueText(item,prefix,child,depth+1,seen,decodeStrings,compact,undefined,truncated)}):undefined;
+    if(table!==undefined)return table;
+    const rows=[];let inline=[];
+    const flush=()=>{if(inline.length){rows.push(indent+inline.join(' · '));inline=[];}};
+    for(let [key,item] of entries){
+      // 输入采用原值阅读，显式空值也可能有意义；仅结果紧凑模式折叠空字段。
+      if(compact&&decodeStrings&&!list&&emptyField(item))continue;
+      const child=list?(schema?.prefixItems?.[key]??(Array.isArray(schema?.items)?schema.items[key]:schema?.items)):(schema?.properties?.[key]??(typeof schema?.additionalProperties==='object'?schema.additionalProperties:undefined));
       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');
+      if(decodeStrings)item=decodedValue(item);const nested=item!==null&&typeof item==='object';
+      const text=valueText(item,nested?indent+'  ':'',child,depth+1,seen,decodeStrings,compact,width,truncated);
+      const scalar=`${label}：${text}`;
+      if(compact&&!nested&&!/[\r\n]/.test(scalar)&&scalar.length<=100){
+        if(inline.join(' · ').length+scalar.length>120)flush();
+        inline.push(scalar);
+      }else{
+        flush();
+        rows.push(`${indent}${label}：${nested?(compact&&!text.includes('\n')?text.trimStart():'\n'+text):text.replaceAll('\r\n','\n').replaceAll('\r','\n').replaceAll('\n','\n'+indent+'  ')}`);
+      }
+    }
+    flush();return rows.join('\n')||(compact?'（空字段已折叠）':'');
   }finally{seen.delete(value);}
 }
-export function readableValue(value,indent='',schema){
-  return valueText(decodedValue(value),indent,schema,0,new Set());
+export function readableValue(value,indent='',schema,{decodeStrings=true,compact=false,width,truncated=false}={}){
+  return valueText(decodeStrings?decodedValue(value):value,indent,schema,0,new Set(),decodeStrings,compact,width,truncated);
 }
 export function readableError(error,{details=false}={}){
   if(!error)return '';
@@ -47,7 +74,7 @@ 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}):'--:--:--';};
 const actionFrom=(catalog,id)=>catalog instanceof Map?catalog.get(id):catalog?.find(action=>action.id===id);
-function processDetails(data){
+export function readableProcess(data){
   if(!data||typeof data!=='object')return readableValue(data);
   const rows=[];
   if(data.file!==undefined||data.executable!==undefined)rows.push(`程序：${data.file??data.executable}`);
@@ -56,11 +83,13 @@ function processDetails(data){
   if(data.script!==undefined)rows.push(`原始脚本：\n${data.script}`);
   return rows.join('\n')||readableValue(data);
 }
-export function readableTimeline(events,{callPath,values=false,catalog=[]}={}){
+export function readableTimeline(events,{callPath,values=false,catalog=[],width,finalOutput}={}){
   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 identity=event=>`${event.callPath??'运行'}${typeof event.processId==='string'&&event.processId?' · #'+event.processId.slice(0,8):''}${event.stream?' · '+event.stream:''}`;
+  const contentWidth=event=>Number.isFinite(width)?Math.max(1,width-visibleWidth(`00:00:00  [${identity(event)}]  `)):undefined;
   const push=(event,message)=>{
-    const prefix=`${time(event.time)}  [${event.callPath??'运行'}${event.stream?' · '+event.stream:''}]`;
+    const prefix=`${time(event.time)}  [${identity(event)}]`;
     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}`);
@@ -69,7 +98,7 @@ export function readableTimeline(events,{callPath,values=false,catalog=[]}={}){
   for(const event of events??[]){
     if(callPath&&event.callPath!==callPath)continue;
     if(event.type==='log'&&event.stream){
-      const key=`${event.callPath}\0${event.stream}`;
+      const key=`${event.callPath}\0${event.processId??''}\0${event.stream}`;
       if(pending?.key!==key){flush();pending={key,event,text:''};}
       pending.text+=event.message??'';
       const end=pending.text.lastIndexOf('\n');
@@ -77,7 +106,7 @@ export function readableTimeline(events,{callPath,values=false,catalog=[]}={}){
       continue;
     }
     if(event.type==='log'){
-      flush();const data=event.kind==='process'?processDetails(event.data):readableValue(event.data);
+      flush();const data=event.kind==='process'?readableProcess(event.data):readableValue(event.data,'',undefined,{compact:true,width:contentWidth(event),truncated:event.eventTruncated});
       push(event,`${event.message??''}${event.data!==undefined?'\n'+data:''}`);continue;
     }
     if(eventNames[event.type]){
@@ -85,8 +114,13 @@ export function readableTimeline(events,{callPath,values=false,catalog=[]}={}){
       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.')){
         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));
+        if(event.input!==undefined)push(event,'输入\n'+readableValue(event.input,'',action?.input,{decodeStrings:false,compact:true,width:contentWidth(event)}));
+        if(event.output!==undefined){
+          const forwarded=forwardedReport(event.output,finalOutput);
+          const output=forwarded?(forwarded===event.output?undefined:Object.fromEntries(Object.entries(event.output).filter(([key])=>key!=='report'))):event.output;
+          if(forwarded)push(event,'报告已展示在本次运行的最终输出。');
+          if(output!==undefined&&(!forwarded||Object.keys(output).length))push(event,'输出（紧凑显示）\n'+readableValue(output,'',action?.output,{compact:true,width:contentWidth(event),truncated:event.eventTruncated}));
+        }
       }
     }
   }