@yanglaofish/fishtools 0.5.3 → 0.6.0

package/node_modules/@mytools/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/node_modules/@mytools/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}));
+        }
       }
     }
   }

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

@@ -1,10 +1,9 @@
-import { stripVTControlCharacters } from 'node:util';
 import { Text, matchesKey, truncateToWidth } from '@mariozechner/pi-tui';
-import {palette} from './theme.js';
+import {palette,cleanText as safe} from './theme.js';
 import {readableValue,readableError,readableTimeline,elapsedTime} from './run-presentation.js';
+import {outputReport} from './report-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,'');
 export const mouseWheel=data=>{const match=/^\x1b\[<(\d+);\d+;\d+[Mm]$/.exec(data);return match&&(Number(match[1])&64)?(Number(match[1])&1?1:-1):0;};
 export const mouseOn='\x1b[?1000h\x1b[?1006h';
 export const mouseOff='\x1b[?1006l\x1b[?1000l';
@@ -39,15 +38,18 @@ export class RunViewer{
     this.requestRender();
   }
   outputSchema(node){return this.catalog.find(action=>action.id===(node?.action??this.record.action??this.record.workflowId))?.output;}
-  getRenderedOutput(){
+  getRenderedOutput(width=this.terminal.columns,{markdown=false}={}){
     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(output&&typeof output==='object'&&!outputReport(output)){
       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);
+    const text=readableValue(output,'',schema,{compact:true,width:markdown?Math.max(1,width-2):width,truncated:node?node.eventTruncated:this.record.outputTruncated});
+    if(!markdown)return text;
+    const fence='`'.repeat(Math.max(3,...[...text.matchAll(/`+/g)].map(match=>match[0].length+1)));
+    return `${fence}text\n${text}\n${fence}`;
   }
-  content(){
+  content(width=this.terminal.columns){
     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 [
@@ -55,7 +57,7 @@ export class RunViewer{
       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.outputSchema()):'',
+      this.record.output!==undefined?'\n最终输出（紧凑显示）\n'+readableValue(this.record.output,'',this.outputSchema(),{compact:true,width,truncated:this.record.outputTruncated}):'',
       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:''}`),
@@ -63,19 +65,20 @@ export class RunViewer{
     ].filter(Boolean).join('\n');
     if(this.view===1){
       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 format=(value,schema,{compact=false,decodeStrings=true}={})=>this.raw?JSON.stringify(value??null,null,2):readableValue(value,'',schema,{compact,decodeStrings,width,truncated:node?node.eventTruncated:compact?this.record.outputTruncated:this.record.inputTruncated});
       const error=node?node.error:this.record.error;
+      const input=node?node.input:this.record.input!==undefined?this.record.input:this.record.events?.find(event=>event.type==='run.input')?.input;
       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),
+        '\n输入\n'+format(input,action?.input,{decodeStrings:false}), '\n输出\n'+format(node?node.output:this.record.output,action?.output,{compact:true}),
         !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,catalog:this.catalog});
+    return (this.record.eventsTruncated?'当前为近期日志摘要，按 p 分页查看完整落盘日志。\n\n':'')+readableTimeline(this.record.events,{callPath:this.allLogs?undefined:node?.callPath,catalog:this.catalog,width});
   }
   layout(width){
     const height=Math.max(1,this.terminal.rows),pageSize=Math.max(1,height-4);
-    const lines=new Text(safe(this.content()),0,0).render(Math.max(1,width));
+    const lines=new Text(safe(this.content(width)),0,0).render(Math.max(1,width));
     const maxOffset=Math.max(0,lines.length-pageSize);
     this.offset=this.follow&&this.view===2?maxOffset:Math.max(0,Math.min(this.offset,maxOffset));
     return {height,pageSize,lines,maxOffset};

package/node_modules/@mytools/fst-cli/src/terminal/schema.js

@@ -1,18 +1,128 @@
-import { validate } from '@mytools/sdk/schema';
+import { validate, assertSchema } from '@mytools/sdk/schema';
+import {isDeepStrictEqual} from 'node:util';
 import { fileReference } from './model.js';
+import {readableValue} from './run-presentation.js';
+import {cleanText,fitLine} from './theme.js';
+import {visibleWidth} from '@mariozechner/pi-tui';
+import {hasInputRules,resolveInput} from '@mytools/sdk/inputs';
 
 export const needsJsonEditor=schema=>['oneOf','anyOf','allOf','if','$ref','patternProperties'].some(key=>schema?.[key]!==undefined);
 
+// 与执行时共用校验器；即使尚缺必填字段，也保留已能确定的默认值供编辑。
+function editableDefaults(schema,value){
+  const copy=structuredClone(value);
+  if(schema!=null)assertSchema(schema,'参数')(copy);
+  return copy;
+}
+
+export function inputEntries(schema,value,fields={}){
+  if(schema?.type!=='object'||!schema.properties||needsJsonEditor(schema))return [readableValue(value,'',schema,{decodeStrings:false})];
+  const names=new Set([...Object.keys(schema.properties),...Object.keys(value??{})]);
+  return [...names].map(name=>{
+    const field=fields[name],title=schema.properties[name]?.title??name;
+    if(value?.[name]===undefined)return `${title}：${schema.required?.includes(name)?'未填写（必填）':field?.unsetLabel??'未提供（插件未声明缺省行为）'}`;
+    const text=readableValue({[name]:value[name]},'',schema,{decodeStrings:false});
+    if(!field)return text;
+    const source=field?.source==='config'?'继承插件配置：':field?.source==='default'?'默认值：':field?.source==='input'?'本次输入：':'';
+    return `${title}：${source}${readableValue(value[name],'',schema.properties[name],{decodeStrings:false})}${field?.unit?' '+field.unit:''}${field?.path?'（'+field.path+'）':''}`;
+  });
+}
+
+function parameterPreview(entries,label,screenWidth=80,screenHeight=24){
+  const limit=Math.max(1,Math.min(4,screenHeight-10)),width=Math.max(8,screenWidth-6);
+  const values=entries.map(entry=>cleanText(entry).replace(/[\r\n\t]/g,' '));
+  let columns=width>=110?3:width>=60?2:1;
+  // 来源说明较长时减少列数，优先显示完整含义，仍保持预览行数有界。
+  while(columns>1&&values.some(value=>visibleWidth(value)>Math.floor((width-(columns-1)*3)/columns)))columns--;
+  const cellWidth=Math.floor((width-(columns-1)*3)/columns);
+  const cells=values.slice(0,limit*columns).map(entry=>fitLine(entry,cellWidth));
+  const rows=[];
+  for(let index=0;index<cells.length;index+=columns){
+    rows.push(cells.slice(index,index+columns).map((cell,i)=>i<columns-1?cell+' '.repeat(cellWidth-visibleWidth(cell)):cell).join('   '));
+  }
+  const preview=rows.join('\n')||'无需参数';
+  return {text:`${fitLine(cleanText(label??'插件能力').replace(/\s+/g,' '),width)}\n当前参数（含默认值）：\n${preview}`,truncated:values.length>cells.length||values.some(value=>visibleWidth(value)>cellWidth)||entries.some(entry=>/[\r\n\t]/.test(entry))};
+}
+
+export async function commandInput(ui,schema,value,{baseDir,label,preview}={}){
+  const rules=hasInputRules(schema),project=preview??(value=>resolveInput(schema,value,{}, {check:false}));
+  let current=rules?structuredClone(value):editableDefaults(schema,value);
+  while(true){
+    const resolved=rules?project(current):{value:current};
+    const entries=inputEntries(schema,resolved.value,resolved.fields),summary=entries.join('\n')||'无需参数';
+    const layout=()=>parameterPreview(entries,label,ui.terminal?.columns,ui.terminal?.rows);
+    const message=(width,height)=>parameterPreview(entries,label,width,height).text;
+    const choice=await ui.select(ui.terminal?message:message(),[
+      {value:'run',label:'执行'},
+      {value:'edit',label:'配置参数'},
+      ...(ui.viewMarkdown?[{value:'view',label:'展开未显示完整的参数',description:`共 ${entries.length} 项`,hidden:()=>!layout().truncated}]:[]),
+      {value:'cancel',label:'返回'},
+    ]);
+    if(choice==='cancel')return {cancelled:true};
+    if(choice==='view'){
+      // 保留换行和引号，参数里的 Markdown 符号不能改变显示含义。
+      let fenceLength=3;for(const match of summary.matchAll(/`+/g))fenceLength=Math.max(fenceLength,match[0].length+1);
+      const fence='`'.repeat(fenceLength);
+      await ui.viewMarkdown('当前参数（含默认值）',`${fence}text\n${summary}\n${fence}`);continue;
+    }
+    if(choice==='edit')current=await editInput(ui,schema,current,{baseDir,label,preview:project,required:true});
+    else if(choice==='run'){
+      try{
+        if(rules){validate(schema,project(current).value,label??'插件参数',{useDefaults:false});return {value:structuredClone(current)};}
+        return {value:validate(schema,current,label??'插件参数')};
+      }
+      catch(error){if(error.code!=='VALIDATION')throw error;ui.show(`暂不能执行，请配置参数：${error.message}`);}
+    }
+  }
+}
+
+// 能力调用和快捷名称保存使用同一编辑入口，省略值不因打开表单而固化。
+export async function editInput(ui,schema,value,options={}){
+  if(!hasInputRules(schema))return editValue(ui,schema,value,options);
+  return editInputRules(ui,schema,value,{...options,preview:options.preview??(value=>resolveInput(schema,value,{}, {check:false}))});
+}
+
+async function editInputRules(ui,schema,value,{baseDir,label,preview}){
+  const current=structuredClone(value);
+  while(true){
+    const resolved=preview(current),entries=inputEntries(schema,resolved.value,resolved.fields);
+    const names=Object.keys(schema.properties);
+    const choice=await ui.select(`${label??'参数'} · 选择字段`,[
+      ...names.map((name,index)=>({value:`field:${name}`,label:schema.properties[name].title??name,description:entries[index]})),
+      {value:'__done',label:'完成填写'},
+    ]);
+    if(choice==='__done'){
+      try{validate(schema,preview(current).value,label??'参数',{useDefaults:false});return current;}
+      catch(error){ui.show(error.message);continue;}
+    }
+    const name=choice.slice(6),field=schema.properties[name],rule=field['x-fst'];
+    if(rule){
+      const action=await ui.select(field.title??name,[{value:'set',label:'设置本次输入'},{value:'inherit',label:rule.fromConfig?'恢复继承插件配置':'恢复省略参数'},{value:'back',label:'返回'}]);
+      if(action==='back')continue;
+      if(action==='inherit'){delete current[name];continue;}
+    }
+    const next=await editValue(ui,field,resolved.value[name],{baseDir,label:field.title??name,required:schema.required?.includes(name)});
+    if(next===undefined)delete current[name];else Object.defineProperty(current,name,{value:next,enumerable:true,writable:true,configurable:true});
+  }
+}
+
 // 值只在整个编辑过程完成后返回，Escape 不会留下半个修改。
 export async function editValue(ui,schema={},value,{baseDir,required=false,label=schema.title??'值'}={}){
   if(value===undefined&&schema.default!==undefined)value=structuredClone(schema.default);
   if(schema.enum&&!needsJsonEditor(schema)){
-    const index=await ui.select(label,schema.enum.map((v,i)=>({value:String(i),label:JSON.stringify(v)})));
+    const choices=schema.enum.map((v,i)=>({value:String(i),label:JSON.stringify(v)}));
+    const selected=schema.enum.findIndex(item=>isDeepStrictEqual(item,value));
+    if(selected>0)choices.unshift(...choices.splice(selected,1));
+    const index=await ui.select(label,choices);
     return schema.enum[Number(index)];
   }
-  if(schema.type==='boolean'&&!needsJsonEditor(schema))return (await ui.select(label,[{value:'true',label:'是 / true'},{value:'false',label:'否 / false'}]))==='true';
+  if(schema.type==='boolean'&&!needsJsonEditor(schema)){
+    const choices=[{value:'true',label:'是 / true'},{value:'false',label:'否 / false'}];
+    if(value===false)choices.reverse();
+    return (await ui.select(label,choices))==='true';
+  }
   if(schema.type==='object'&&schema.properties&&!needsJsonEditor(schema)){
-    const result=structuredClone(value??{}),props=Object.entries(schema.properties);
+    const result=editableDefaults(schema,value??{}),props=Object.entries(schema.properties);
     while(true){
       const key=await ui.select(`${label} · 选择字段`,[
         ...props.map(([key,s])=>({value:`field:${key}`,label:`${s.title??key}${schema.required?.includes(key)?' *':''}`,description:JSON.stringify(result[key])??'未填写'})),

package/node_modules/@mytools/fst-cli/src/terminal/session-history.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import {randomUUID} from 'node:crypto';
 import {createSessionHistory} from '@mytools/fst-logs/sessions';
-import {readableValue,readableError,runCategory,runCategoryNames} from './run-presentation.js';
+import {readableValue,readableError,runCategory,runCategoryNames,presentationCatalog} from './run-presentation.js';
 
 // 完整交互追加落盘，快照只保存可立即恢复的近期窗口，不重复保存运行日志全文。
 export class TerminalHistory{
@@ -59,7 +59,7 @@ export class TerminalHistory{
     if(this.app.listRuns().some(run=>run.status==='running'))throw new Error('当前有运行中的任务，完成后再恢复历史会话。');
     await this.flush();this.resumedFrom=record.id;
     this.ui.commandHistory=[...record.commandHistory];this.ui.commandHistoryIndex=null;
-    this.ui.feed.restoreState(record.feed,{catalog:this.app.catalog?.()??[]});
+    this.ui.feed.restoreState(record.feed,{catalog:presentationCatalog(this.app)});
     this.append({type:'restored',sessionId:record.id});await this.flush();
   }
   async close(){await this.flush();this.closed=true;this.ui.feed.onEntry=null;this.ui.onHistoryChange=null;}