@yanglaofish/fishtools 0.1.3 → 0.2.0

package/node_modules/@mytools/core/src/terminal/view.js

@@ -1,13 +1,14 @@
 import { readdirSync, statSync } from 'node:fs';
 import path from 'node:path';
 import { homedir } from 'node:os';
-import { stripVTControlCharacters } from 'node:util';
-import { TUI, Text, Container, Editor, SelectList, ProcessTerminal, CombinedAutocompleteProvider, matchesKey, truncateToWidth } from '@mariozechner/pi-tui';
+import { TUI, Text, Container, Editor, SelectList, ProcessTerminal, CombinedAutocompleteProvider, matchesKey, truncateToWidth, visibleWidth } from '@mariozechner/pi-tui';
 import { MarkdownLogViewer } from './log-viewer.js';
+import { RunViewer, mouseOn, mouseOff } from './run-viewer.js';
+import { logo } from './presentation.js';
+import { VERSION } from '../version.js';
+import {cleanText as safe,palette,menuTheme as theme,fitLine,shortenPath} from './theme.js';
 
 export const cancelled=()=>Object.assign(new Error('已返回主菜单'),{code:'PROMPT_CANCELLED'});
-const safe=value=>stripVTControlCharacters(String(value)).replace(/[\x00-\x08\x0b-\x1f\x7f]/g,'');
-const theme={selectedPrefix:s=>`\x1b[36m${s}\x1b[0m`,selectedText:s=>`\x1b[36m${s}\x1b[0m`,description:s=>s,scrollInfo:s=>s,noMatch:s=>s};
 // 上游菜单按字符数分配描述宽度，中文双宽字符需要再按终端列宽收口。
 function fit(component){const render=component.render.bind(component);component.render=width=>render(width).map(line=>truncateToWidth(line,width));return component;}
 
@@ -46,15 +47,42 @@ export class TerminalView{
     this.baseDir=baseDir;this.terminal=terminal;this.tui=new TUI(terminal);this.logs=[];
     const originalStart=terminal.start.bind(terminal);
     terminal.start=(input,resize)=>originalStart(data=>{
-      if(matchesKey(data,'ctrl+c')){if(this.cancelRun)this.cancelRun();this.pending?.reject(cancelled());return;}
-      if(matchesKey(data,'escape')&&this.pending&&!this.logViewer){
+      if(matchesKey(data,'ctrl+c')){if(this.runViewer){this.runViewer.onClose();return;}if(this.cancelRun)this.cancelRun();this.pending?.reject(cancelled());return;}
+      if(matchesKey(data,'escape')&&this.pending&&!this.logViewer&&!this.runViewer){
         // 编辑器自己处理补全菜单 Escape，第二次 Escape 返回上一级。
         if(this.editor?.isShowingAutocomplete?.()){input(data);return;}
         this.pending.reject(cancelled());return;
       }
       input(data);
     },resize);
-    this.header=new Text('',1,1);this.transcript=new Text('',1,0);this.prompt=new Container();this.hint=new Text('↑↓ 选择 · Enter 确认 · Tab 补全 · Esc 返回 · Ctrl+C 取消/退出',1,1);
+    this.header=new Text('',1,0);this.transcript=new Text('',1,0);this.prompt=new Container();this.hint=new Text('',1,0);
+    this.hint.render=width=>['',fitLine(' '+palette.muted(width<45?'↑↓ 选择  Enter 确认  Esc 返回':'↑↓ 选择   Enter 确认   Tab 补全   Esc 返回   Ctrl+C 退出'),width)];
+    const renderTranscript=this.transcript.render.bind(this.transcript);
+    this.headingLines=(width,mark='FISHtools')=>{
+      const room=Math.max(1,width-2),lines=[''];
+      if(mark===logo){
+        lines.push(...logo.split('\n').map((line,i)=>' '+palette.brand(line)+(i===2?' '+palette.text('tools')+'  '+palette.muted(`v${VERSION}`):'')));
+      }else lines.push(' '+palette.brand('FISH')+palette.text('tools')+'  '+palette.muted(`v${VERSION}`));
+      for(const [i,line] of (this.summaryText??'').split('\n').entries()){
+        if(line.startsWith('当前工作区：')){
+          const label='当前工作区：',folder=shortenPath(line.slice(label.length),Math.max(1,room-visibleWidth(label)));
+          lines.push(' '+palette.muted(label)+palette.text(folder));
+        }else lines.push(' '+(i===0?palette.text:palette.muted)(fitLine(line,room)));
+      }
+      lines.push('');return lines.map(line=>fitLine(line,width));
+    };
+    // 先保证输入与菜单可见，空间充足才展示三行字标。
+    this.header.render=width=>{
+      const full=this.headingLines(width,logo),other=renderTranscript(width).length+this.prompt.render(width).length+this.hint.render(width).length;
+      return width>=34&&this.terminal.rows>=18&&full.length+other<=this.terminal.rows?full:this.headingLines(width);
+    };
+    this.transcript.render=width=>{
+      const lines=renderTranscript(width),budget=Math.max(0,this.terminal.rows-this.header.render(width).length-this.prompt.render(width).length-this.hint.render(width).length);
+      if(lines.length<=budget)return lines;
+      if(!budget)return [];
+      const excerpt=this.logs.length<=1?lines.slice(0,budget-1):lines.slice(-(budget-1)||lines.length);
+      return [...excerpt,fitLine(' '+palette.muted('… /help 完整帮助 · /logs 运行日志'),width)];
+    };
     this.tui.addChild(this.header);this.tui.addChild(this.transcript);this.tui.addChild(this.prompt);this.tui.addChild(this.hint);
   }
   start(){this.tui.start();}
@@ -63,8 +91,13 @@ export class TerminalView{
     await new Promise(resolve=>process.nextTick(resolve));this.tui.stop();
     if(this.terminal instanceof ProcessTerminal)process.stdin.pause();
   }
-  summary(text){this.header.setText(`Fishtools / fst\n${safe(text)}`);this.tui.requestRender();}
-  show(message){this.logs.push(safe(message).slice(0,6000));this.logs=this.logs.slice(-6);this.transcript.setText(this.logs.join('\n\n'));this.tui.requestRender();}
+  summary(text){this.summaryText=safe(text);this.tui.requestRender();}
+  clearMessages(){this.logs=[];this.transcript.setText('');this.tui.requestRender();}
+  show(message,{kind='message'}={}){
+    const text=safe(message).slice(0,6000);
+    const formatted=kind==='welcome'?text.split('\n').map((line,i)=>i===0?palette.text(line):palette.muted(line)).join('\n'):text;
+    this.logs.push(formatted);this.logs=this.logs.slice(-6);this.transcript.setText(this.logs.join('\n\n'));this.tui.requestRender();
+  }
   async viewMarkdown(title,text){
     const previousPending=this.pending??null,previousViewer=this.logViewer;
     const children=this.tui.children;
@@ -73,6 +106,7 @@ export class TerminalView{
       await new Promise((resolve,reject)=>{
         this.pending={resolve,reject};
         this.logViewer=new MarkdownLogViewer({title:safe(title),text:safe(text),terminal:this.terminal,onClose:resolve,requestRender:()=>this.tui.requestRender()});
+        this.terminal.write(mouseOn);
         // Overlay 的基底为空，旧 transcript 不再撑高滚动区域；关闭后原样恢复。
         this.tui.children=[];
         overlay=this.tui.showOverlay(this.logViewer,{width:'100%',maxHeight:'100%',anchor:'top-left',margin:0});
@@ -81,27 +115,72 @@ export class TerminalView{
     }finally{
       this.tui.children=children;this.pending=previousPending;this.logViewer=previousViewer;
       overlay?.hide();this.tui.requestRender(true);
+      this.terminal.write(mouseOff);
+    }
+  }
+  async observeRun({app,runId,flow,workflows=[]}){
+    const previousPending=this.pending??null,children=this.tui.children;let overlay,unsubscribe;
+    try{
+      await new Promise((resolve,reject)=>{
+        this.pending={resolve,reject};
+        this.runViewer=new RunViewer({record:app.getRun(runId),flow,workflows,terminal:this.terminal,onClose:resolve,onCancel:()=>app.cancelRun(runId),requestRender:()=>this.tui.requestRender()});
+        unsubscribe=app.subscribe(event=>{if(event.runId===runId)this.runViewer?.update(app.getRun(runId));});
+        this.tui.children=[];this.terminal.write(mouseOn);
+        overlay=this.tui.showOverlay(this.runViewer,{width:'100%',maxHeight:'100%',anchor:'top-left',margin:0});this.tui.requestRender(true);
+      });
+    }finally{
+      unsubscribe?.();this.runViewer=null;this.tui.children=children;this.pending=previousPending;overlay?.hide();this.terminal.write(mouseOff);this.tui.requestRender(true);
     }
   }
   async ask(message,component){
     fit(component);
-    this.prompt.clear();this.prompt.addChild(new Text(safe(message),1,1));this.prompt.addChild(component);this.tui.setFocus(component);this.tui.requestRender();
+    const title=new Text(palette.text(safe(message)),1,0);
+    if(message.startsWith('fst >'))title.render=width=>[fitLine(' '+palette.text(width<45?'fst > / 选择操作 · @ 文件':safe(message)),width)];
+    this.prompt.clear();this.prompt.addChild(title);this.prompt.addChild(component);this.tui.setFocus(component);this.tui.requestRender();
     try{return await new Promise((resolve,reject)=>{this.pending={resolve,reject};component.onSubmit=resolve;component.onSelect=item=>resolve(item.value);component.onCancel=()=>reject(cancelled());});}
     finally{this.pending=null;this.editor=null;this.prompt.clear();this.tui.requestRender();}
   }
   input(message,{value='',commands=[],files=true}={}){
-    const editor=new Editor(this.tui,{borderColor:theme.selectedPrefix,selectList:theme},{paddingX:1});
+    const editor=new Editor(this.tui,{borderColor:palette.border,selectList:theme},{paddingX:1});
+    const renderEditor=editor.render.bind(editor);
+    editor.render=width=>{
+      if(width<8)return renderEditor(width);
+      const inner=width-4,lines=renderEditor(inner);let closed=false;
+      return lines.map((line,i)=>{
+        if(i===0)return ' '+palette.border('╭'+'─'.repeat(inner)+'╮');
+        if(!closed&&/^─+$/.test(safe(line))){closed=true;return ' '+palette.border('╰'+'─'.repeat(inner)+'╯');}
+        if(closed)return '  '+line;
+        return ' '+palette.border('│')+line+' '.repeat(Math.max(0,inner-visibleWidth(line)))+palette.border('│');
+      });
+    };
     this.editor=editor;editor.setText(value);
     if(files||commands.length)editor.setAutocompleteProvider(new FileAutocomplete(commands,this.baseDir));
     return this.ask(message,editor);
   }
   select(message,items){
     if(!items.length)throw new Error('当前没有可选择的项目');
-    return this.ask(message,new SelectList(items.map(i=>({...i,label:safe(i.label),description:i.description?safe(i.description):undefined})),8,theme));
+    const list=new SelectList(items.map(i=>({...i,label:safe(i.label).replace(/\s+/g,' '),description:i.description?safe(i.description).replace(/\s+/g,' '):undefined})),8,theme);
+    list.render=width=>{
+      const reserved=this.headingLines(width).length+new Text(palette.text(safe(message)),1,0).render(width).length+this.hint.render(width).length+1;
+      list.maxVisible=Math.max(1,Math.min(8,this.terminal.rows-reserved));
+      const start=Math.max(0,Math.min(list.selectedIndex-Math.floor(list.maxVisible/2),list.filteredItems.length-list.maxVisible));
+      const end=Math.min(start+list.maxVisible,list.filteredItems.length),lines=[];
+      for(let i=start;i<end;i++){
+        const item=list.filteredItems[i],selected=i===list.selectedIndex,available=Math.max(1,width-4);
+        const labelWidth=item.description&&width>=56?Math.min(32,Math.floor(available*0.45)):available;
+        const label=fitLine(item.label||item.value,labelWidth),prefix=selected?'› ':'  ';
+        let line=' '+(selected?palette.brand(prefix+label):palette.text(prefix+label));
+        if(item.description&&width>=56)line+=' '.repeat(Math.max(2,labelWidth-visibleWidth(label)+2))+palette.muted(fitLine(item.description,Math.max(1,available-labelWidth-2)));
+        lines.push(fitLine(line,width));
+      }
+      if(start>0||end<list.filteredItems.length)lines.push(palette.muted(`   ${list.selectedIndex+1} / ${list.filteredItems.length}`));
+      return lines.length?lines:[palette.muted('  没有匹配项')];
+    };
+    return this.ask(message,list);
   }
   async confirm(message){return await this.select(message,[{value:'no',label:'否，返回'},{value:'yes',label:'是，继续'}])==='yes';}
   busy(message,cancel){
-    this.cancelRun=cancel;this.prompt.clear();this.prompt.addChild(new Text(safe(message),1,1));this.tui.setFocus(this.prompt);this.tui.requestRender();
+    this.cancelRun=cancel;this.prompt.clear();this.prompt.addChild(new Text(palette.text(safe(message)),1,0));this.tui.setFocus(this.prompt);this.tui.requestRender();
     return ()=>{this.cancelRun=null;this.prompt.clear();this.tui.requestRender();};
   }
 }

package/node_modules/@mytools/core/src/validation.js

@@ -3,12 +3,23 @@ import { FlowError } from '@mytools/sdk';
 
 const ajv = new Ajv({ allErrors: true, strict: false, useDefaults: true });
 const validators = new WeakMap();
+const booleanValidators = new Map();
 export const emptyObject = { type: 'object', properties: {}, additionalProperties: false };
 
+export function assertSchema(schema,label) {
+  if (!(typeof schema==='boolean'||schema&&typeof schema==='object'&&!Array.isArray(schema))) throw new FlowError(`${label} 必须声明有效的 JSON Schema`,{code:'VALIDATION'});
+  const cache=typeof schema==='boolean'?booleanValidators:validators;
+  let check=cache.get(schema);
+  if(!check){
+    try{check=ajv.compile(schema);cache.set(schema,check);}
+    catch(cause){throw new FlowError(`${label} JSON Schema 无效：${cause.message}`,{code:'VALIDATION',cause});}
+  }
+  return check;
+}
+
 export function validate(schema, value, label) {
-  if (!schema) return structuredClone(value);
-  let check = validators.get(schema);
-  if (!check) { check = ajv.compile(schema); validators.set(schema, check); }
+  if (schema==null) return structuredClone(value);
+  const check = assertSchema(schema,label);
   const copy = structuredClone(value);
   if (!check(copy)) throw new FlowError(`${label}: ${ajv.errorsText(check.errors, { separator: '；' })}`, { code: 'VALIDATION', details: check.errors });
   return copy;
@@ -42,7 +53,7 @@ export function bind(value, context) {
   if (Object.hasOwn(value, '$ref')) {
     let current = context;
     for (const field of referenceParts(value.$ref)) {
-      if (current == null || !Object.hasOwn(current, field)) throw new FlowError(`引用的值不存在：${value.$ref}`);
+      if (current == null || !Object.hasOwn(current, field)) throw new FlowError(`引用的值不存在：${value.$ref}`,{code:'MISSING_REFERENCE'});
       current = current[field];
     }
     return structuredClone(current);

package/node_modules/@mytools/core/src/version.js

@@ -1,2 +1,2 @@
 // 由 npm version 的生命周期脚本同步，内部插件 API 版本独立维护。
-export const VERSION="0.1.3";
+export const VERSION="0.2.0";

package/node_modules/@mytools/core/src/workflows.js

@@ -3,7 +3,8 @@ import path from 'node:path';
 import { randomUUID } from 'node:crypto';
 import YAML from 'yaml';
 import { FlowError } from '@mytools/sdk';
-import { assertId, references, referenceParts, emptyObject } from './validation.js';
+import { assertId, assertSchema, references, referenceParts, emptyObject } from './validation.js';
+import {validateCondition,validateStepList} from './control.js';
 
 function fieldSchema(schema,fields,ref){
   let current=schema;
@@ -34,13 +35,7 @@ export class WorkflowStore {
   validateShape(w) {
     assertId(w?.id);
     if (w.schemaVersion!==1 || !Array.isArray(w.steps)) throw new FlowError('工作流格式错误：需要 schemaVersion: 1 与 steps 列表',{code:'VALIDATION'});
-    const ids=new Set();
-    for(const s of w.steps) {
-      assertId(s.id);
-      if(ids.has(s.id)) throw new FlowError(`步骤 ID 重复：${s.id}`,{code:'VALIDATION'});
-      ids.add(s.id);
-      if(Boolean(s.action)===Boolean(s.workflow) || (s.action && typeof s.action!=='string') || (s.workflow && typeof s.workflow!=='string')) throw new FlowError(`${s.id} 必须选择一个动作或子工作流`,{code:'VALIDATION'});
-    }
+    validateStepList(w.steps,assertId);
     return structuredClone(w);
   }
   async save(definition) {
@@ -66,21 +61,37 @@ export class WorkflowStore {
       if(visiting.has(id)) throw new FlowError(`工作流循环引用：${[...visiting,id].join(' → ')}`,{code:'VALIDATION'});
       if(workflows.has(id)) return;
       visiting.add(id);
-      const w=await this.get(id), previous=new Map();
-      const check=ref=>{
+      const w=await this.get(id);
+      const checker=previous=>ref=>{
         const p=referenceParts(ref);
         if(p[0]==='steps' && !previous.has(p[1])) throw new FlowError(`${id} 引用必须指向前序步骤：${ref}`,{code:'VALIDATION'});
         return fieldSchema(p[0]==='inputs'?(w.inputs??emptyObject):previous.get(p[1]),p.slice(p[0]==='inputs'?1:3),ref);
       };
-      for(const s of w.steps) {
-        references(s.with??{},check);
-        if(s.action) {
-          const action=host.actions.get(s.action);
-          if(!action) throw new FlowError(`${id} → ${s.id} 缺少插件动作 ${s.action}`,{code:'VALIDATION'});
-          plugins.add(action.plugin);
-          previous.set(s.id,action.output);
-        } else {const child=this.childId(s.workflow);await visit(child);previous.set(s.id,outputs.get(child));}
-      }
+      const resolveList=async(steps,inherited=new Map(),parallel=false)=>{
+        const previous=new Map(inherited),own={};
+        for(const s of steps){
+          const check=checker(parallel?inherited:previous);
+          if(s.when)validateCondition(s.when,check);
+          let output;
+          if(s.action){
+            references(s.with??{},check);
+            const action=host.actions.get(s.action);
+            if(!action)throw new FlowError(`${id} → ${s.id} 缺少插件动作 ${s.action}`,{code:'VALIDATION'});
+            if(action.input===undefined||action.output===undefined)throw new FlowError(`可编排动作 ${s.action} 必须声明 input 和 output schema`,{code:'VALIDATION'});
+            assertSchema(action.input,`${s.action} input schema`);assertSchema(action.output,`${s.action} output schema`);
+            plugins.add(action.plugin);output=action.output;
+          }else if(s.workflow){references(s.with??{},check);const child=this.childId(s.workflow);await visit(child);output=outputs.get(child);}
+          else if(s.branch){
+            validateCondition(s.branch.condition,check);
+            const left=await resolveList(s.branch.then,parallel?inherited:previous),right=await resolveList(s.branch.else??[],parallel?inherited:previous);
+            output={type:'object',additionalProperties:false,properties:{...left.own,...right.own}};
+          }else if(s.parallel){const group=await resolveList(s.parallel.steps,parallel?inherited:previous,true);output={type:'object',additionalProperties:false,properties:group.own};}
+          else output=emptyObject;
+          previous.set(s.id,output);own[s.id]=output;
+        }
+        return {previous,own};
+      };
+      const {previous}=await resolveList(w.steps),check=checker(previous);
       references(w.outputs??{},check);
       const infer=value=>{
         if(value?.$ref)return check(value.$ref);

package/node_modules/@mytools/core/templates/control-demo.yaml

@@ -0,0 +1,47 @@
+schemaVersion: 1
+id: control-demo
+title: 条件与并行入门
+description: 检查系统后，根据你的选择继续或提前结束；继续时并行处理两段文本。运行中可切换步骤和查看日志。
+inputs:
+  type: object
+  properties:
+    proceed:
+      type: boolean
+      title: 继续执行文本处理
+      default: true
+  required: [proceed]
+steps:
+  - id: environment
+    action: "@mytools/environment:report"
+    with: {}
+  - id: guard
+    when:
+      left: {$ref: steps.environment.output.ok}
+      op: eq
+      right: false
+    stop:
+      reason: 环境检查未通过，已停止后续步骤。
+  - id: choose
+    branch:
+      condition:
+        left: {$ref: inputs.proceed}
+        op: eq
+        right: true
+      then:
+        - id: batch
+          parallel:
+            concurrency: 2
+            steps:
+              - id: first
+                action: "@mytools/examples:uppercase"
+                with: {text: "Hello, Fishtools!"}
+              - id: second
+                action: "@mytools/examples:uppercase"
+                with: {text: Parallel workflow}
+      else:
+        - id: finish
+          stop:
+            reason: 本次选择提前结束，没有执行文本处理。
+outputs:
+  first: {$ref: steps.choose.output.batch.first.text}
+  second: {$ref: steps.choose.output.batch.second.text}

package/node_modules/@mytools/environment/index.js

@@ -17,7 +17,7 @@ for item in names:
         packages.append({'name':name,'ok':False,'error':str(e)})
 print(json.dumps({'executable':sys.executable,'version':sys.version.split()[0],'prefix':sys.prefix,'packages':packages}))`;
 
-export default definePlugin({
+const plugin={
   id:'@mytools/environment',version:'0.1.0',title:'环境检查',description:'检查目标机器的系统、Python/pip 与昇腾 NPU 环境，缺失必需条件时停止工作流。',
   platforms:['win32','linux'],commands:{'env.check':{description:'检查系统、Python/pip 或 NPU',action:'check'}},
   actions:{
@@ -77,4 +77,16 @@ export default definePlugin({
       },
     },
   },
-});
+};
+// 报告模式将“检测完成”与“检测通过”分开；旧 check 保持失败即终止的兼容语义。
+plugin.actions.report={
+  ...plugin.actions.check,
+  title:'生成环境报告',description:'返回结构化检测结果；未通过时返回 ok:false，由工作流条件决定是否继续。',
+  conditions:{passed:{title:'环境检查通过',path:'ok',op:'eq',value:true}},
+  async run(input,context){
+    try{return await plugin.actions.check.run(input,context);}
+    catch(error){if(error.code==='ENVIRONMENT_FAILED')return error.details;throw error;}
+  },
+};
+plugin.commands['env.report']={description:'检测环境并返回报告（不因检查未通过抛错）',action:'report'};
+export default definePlugin(plugin);

package/node_modules/@mytools/pack/index.js

@@ -9,6 +9,7 @@ import YAML from 'yaml';
 import { verifyBundle } from '@mytools/core/bundle';
 import {planEnvironments} from './environments.js';
 import {archiveDirectory} from './archive.js';
+import {copyDocumentation} from '../core/src/documentation.js';
 export {verifyBundle};
 
 async function hashes(root,dir=root,result={}){
@@ -84,6 +85,7 @@ export async function packApplication(app,{entries,target,outDir='dist',includeW
   for(const e of environmentPlan.entries.filter(e=>e.source==='bundled'))for(const p of packages.filter(p=>p.name===e.plugin)){
     const file=['app',p.path,e.executable].join('/');executablePaths.add(file);await chmod(path.join(directory,file),0o755);
   }
+  await copyDocumentation(path.join(directory,'manual'));
   const manifest={format:2,bundleId,editable:!readOnly,createdAt:new Date().toISOString(),target,runtime,entries,workflows:closure.workflows.map(w=>w.id),plugins:plugins.map(p=>({id:p.id,version:p.version,platforms:p.platforms,architectures:p.architectures})),environments:environmentPlan.entries,warnings:environmentPlan.warnings,packages,files:await hashes(directory)};
   await writeFile(path.join(directory,'manifest.json'),JSON.stringify(manifest,null,2));
   const archive=await archiveDirectory(directory,target,executablePaths);