@gracker/smartperfetto 1.0.19 → 1.0.20

package/dist/services/skillEngine/skillExecutor.js

@@ -1463,6 +1463,24 @@ class SkillExecutor {
      * Execute a step-based skill (composite/iterator/diagnostic, and legacy atomic skills without root-level `sql`).
      * Mutates `context.results` / `context.variables` and appends into `displayResults` / `diagnostics` / `synthesizeData`.
      */
+    hasMeaningfulData(value) {
+        if (Array.isArray(value))
+            return value.length > 0;
+        if (value === null || value === undefined)
+            return false;
+        if (typeof value === 'string')
+            return value.trim().length > 0;
+        if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint')
+            return true;
+        if (typeof value === 'object') {
+            if (Array.isArray(value.rows))
+                return value.rows.length > 0;
+            if (Array.isArray(value.diagnostics))
+                return value.diagnostics.length > 0;
+            return Object.keys(value).length > 0;
+        }
+        return false;
+    }
     extractSaveAsValue(stepResult) {
         // Most steps already store direct row arrays/objects in stepResult.data.
         if (stepResult.stepType !== 'skill') {
@@ -1477,11 +1495,40 @@ class SkillExecutor {
             return nested.data;
         }
         // SkillExecutionResult currently exposes payloads via rawResults.
+        // Step-based child skills often begin with DDL/setup steps that correctly
+        // return [] (for example DROP/CREATE VIEW). Prefer the first meaningful
+        // payload so a parent `skill:` step exposes the actual read step instead
+        // of a setup step's empty result.
         const rawResults = nested.rawResults;
         if (rawResults && typeof rawResults === 'object') {
             if (rawResults.root?.data !== undefined) {
                 return rawResults.root.data;
             }
+            const dataSteps = Object.values(rawResults)
+                .filter((step) => step && typeof step === 'object' && Object.prototype.hasOwnProperty.call(step, 'data'));
+            const displayStepIds = Array.isArray(nested.displayResults)
+                ? nested.displayResults
+                    .map((displayResult) => displayResult?.stepId)
+                    .filter((stepId) => typeof stepId === 'string' &&
+                    stepId.length > 0 &&
+                    stepId !== '__synthesize_summary__')
+                : [];
+            for (const stepId of displayStepIds) {
+                const displayedStep = rawResults[stepId];
+                if (displayedStep &&
+                    typeof displayedStep === 'object' &&
+                    Object.prototype.hasOwnProperty.call(displayedStep, 'data') &&
+                    this.hasMeaningfulData(displayedStep.data)) {
+                    return displayedStep.data;
+                }
+            }
+            const meaningfulStep = dataSteps.find((step) => this.hasMeaningfulData(step.data));
+            if (meaningfulStep) {
+                return meaningfulStep.data;
+            }
+            if (dataSteps.length > 0) {
+                return dataSteps[dataSteps.length - 1].data;
+            }
             for (const step of Object.values(rawResults)) {
                 if (step && typeof step === 'object' && Object.prototype.hasOwnProperty.call(step, 'data')) {
                     return step.data;
@@ -1983,6 +2030,9 @@ class SkillExecutor {
             for (let i = 0; i < skill.steps.length; i++) {
                 const step = skill.steps[i];
                 const stepResult = await this.executeStep(step, execContext, skill.name);
+                const layerStepResult = stepResult.stepType === 'skill'
+                    ? { ...stepResult, data: this.extractSaveAsValue(stepResult) }
+                    : stepResult;
                 // Save result to context
                 if (stepResult.success) {
                     execContext.results[step.id] = stepResult;
@@ -1995,7 +2045,7 @@ class SkillExecutor {
                 // This is needed for organizeByLayer to correctly place results in layers
                 // Process display config with template variable substitution (e.g., ${frame_id})
                 if ('display' in step && typeof step.display === 'object') {
-                    stepResult.display = processDisplayConfig(step.display, execContext);
+                    layerStepResult.display = processDisplayConfig(step.display, execContext);
                 }
                 // 收集标记为 synthesize 的步骤数据
                 // 支持两种格式：
@@ -2021,7 +2071,7 @@ class SkillExecutor {
                         config, // 包含 YAML 中定义的配置（如果有）
                     });
                 }
-                stepResults.push(stepResult);
+                stepResults.push(layerStepResult);
             }
         }
         // Iterator 结果绑回源列表：将 expandableData 绑定到 source step 的 StepResult
@@ -3122,28 +3172,30 @@ class SkillExecutor {
             // Preserve diagnostic structure for later extraction
             displayData = data;
         }
-        else if (Array.isArray(data) && data.length > 0) {
+        else if (Array.isArray(data)) {
             // 检查是否是 iterator 结果（包含 itemIndex, item, result）
-            if (this.isIteratorResult(data)) {
+            if (data.length > 0 && this.isIteratorResult(data)) {
                 displayData = this.flattenIteratorResults(data, stepResult.stepType === 'iterator', columnDefinitions);
             }
             else {
-                // 普通数组 - 转换为表格格式
+                const configuredColumns = Array.isArray(columnDefinitions)
+                    ? columnDefinitions
+                        .map((d) => d?.name)
+                        .filter((name, idx, arr) => typeof name === 'string' &&
+                        name.length > 0 &&
+                        arr.indexOf(name) === idx)
+                    : [];
                 const firstItem = data[0];
                 if (typeof firstItem === 'object' && firstItem !== null) {
                     // If display.columns is provided, project data to configured columns only.
                     // This keeps UI tables concise and avoids leaking internal helper fields.
-                    const configuredColumns = Array.isArray(columnDefinitions)
-                        ? columnDefinitions
-                            .map((d) => d?.name)
-                            .filter((name, idx, arr) => typeof name === 'string' &&
-                            name.length > 0 &&
-                            arr.indexOf(name) === idx)
-                        : [];
                     const columns = configuredColumns.length > 0 ? configuredColumns : Object.keys(firstItem);
                     const rows = data.map(row => columns.map(col => this.formatCellValue(row[col])));
                     displayData = { columns, rows };
                 }
+                else if (data.length === 0) {
+                    displayData = { columns: configuredColumns, rows: [] };
+                }
                 else {
                     // 简单数组
                     displayData = { columns: ['value'], rows: data.map(v => [this.formatCellValue(v)]) };