@yanglaofish/fishtools 0.1.4 → 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);