@yanglaofish/fishtools 0.5.1 → 0.5.3

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

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

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

@@ -0,0 +1,82 @@
+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';
+
+// 完整交互追加落盘，快照只保存可立即恢复的近期窗口，不重复保存运行日志全文。
+export class TerminalHistory{
+  constructor(app,ui){
+    this.app=app;this.ui=ui;this.id=app.sessionId??randomUUID();this.startedAt=new Date().toISOString();this.pending=Promise.resolve();
+    const directory=app.project.readOnly?path.join(app.outputDir,'sessions'):path.join(app.projectDir,'.flow','sessions');
+    this.store=createSessionHistory(directory,{projectDir:app.projectDir});
+  }
+  snapshot(){
+    const commands=[];let bytes=0;
+    for(const command of [...this.ui.commandHistory].reverse()){
+      const size=Buffer.byteLength(JSON.stringify(command));if(bytes+size>256*1024)continue;
+      commands.unshift(command);bytes+=size;if(commands.length===100)break;
+    }
+    return {schemaVersion:1,id:this.id,startedAt:this.startedAt,updatedAt:new Date().toISOString(),...(this.resumedFrom?{resumedFrom:this.resumedFrom}:{}),commandHistory:commands,feed:this.ui.feed.exportState()};
+  }
+  report(error){
+    if(this.reported)return;this.reported=true;this.reporting=true;
+    try{this.ui.show(`历史会话保存失败：${error.message}。当前操作可继续，退出前的会话可能无法完整恢复。`);}
+    finally{this.reporting=false;}
+  }
+  async start(){
+    await this.store.save(this.snapshot());
+    this.ui.feed.onEntry=entry=>this.append(entry);
+    this.ui.onHistoryChange=()=>this.schedule();
+  }
+  append(entry){
+    if(this.reporting||this.closed)return;
+    const entries=[];
+    if(entry.type==='message'){
+      // 按字符切分完整命令及反馈，避免单条 JSON 或待写内存无限增长。
+      for(let offset=0;offset<entry.text.length;){
+        let end=Math.min(offset+8192,entry.text.length);
+        if(end<entry.text.length&&entry.text.charCodeAt(end-1)>=0xd800&&entry.text.charCodeAt(end-1)<=0xdbff&&entry.text.charCodeAt(end)>=0xdc00&&entry.text.charCodeAt(end)<=0xdfff)end--;
+        entries.push({...entry,text:entry.text.slice(offset,end),continuation:offset>0});offset=end;
+      }
+    }else entries.push(entry);
+    for(const value of entries){
+      const saved={...value,time:new Date().toISOString()};
+      // 直接进入 logs 的有界队列，不能在界面层用无限 Promise 链藏住待写数据。
+      const job=this.store.append(this.id,saved).catch(error=>this.report(error));this.pending=Promise.all([this.pending,job]).then(()=>{});
+    }
+    this.schedule();
+  }
+  schedule(){
+    if(this.closed||this.reporting||this.timer)return;
+    this.timer=setTimeout(()=>{this.timer=null;void this.flush();},250);this.timer.unref?.();
+  }
+  async flush(){
+    if(this.timer){clearTimeout(this.timer);this.timer=null;}
+    // 快照在调用时复制，保存排在已收到的交互之后；关闭时可等待同一条队列。
+    const snapshot=this.snapshot(),job=this.store.save(snapshot).catch(error=>this.report(error));this.pending=Promise.all([this.pending,job]).then(()=>{});await this.pending;
+  }
+  async restore(record){
+    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.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;}
+}
+
+export function sessionPageText(entries){
+  const joined=[];
+  for(const entry of entries){
+    const previous=joined.at(-1);
+    if(entry.type==='message'&&entry.continuation&&previous?.type==='message')previous.text+=entry.text;
+    else joined.push({...entry});
+  }
+  return joined.map(entry=>{
+    if(entry.type==='message')return entry.text;
+    if(entry.type==='restored')return `恢复并继续会话：${entry.sessionId}`;
+    const run=entry.run;if(!run)return '';
+    const header=`${entry.type==='start'?'开始':'结果'} · ${runCategoryNames[runCategory(run)]} · ${run.title??run.workflowId} · ${run.id}`;
+    return [header,run.input!==undefined?'输入\n'+readableValue(run.input):'',run.output!==undefined?'输出\n'+readableValue(run.output):'',run.error&&readableError(run.error),`/logs 可查看该次运行的完整日志和步骤详情`].filter(Boolean).join('\n');
+  }).filter(Boolean).join('\n\n');
+}