@gracker/smartperfetto 1.0.14 → 1.0.16

package/dist/services/skillEngine/skillExecutor.js

@@ -22,6 +22,7 @@ const teaching_types_1 = require("../../types/teaching.types");
 const dataContract_1 = require("../../types/dataContract");
 const displayContractValidator_1 = require("./displayContractValidator");
 const identityGate_1 = require("../processIdentity/identityGate");
+const identityContractMapper_1 = require("../processIdentity/identityContractMapper");
 /**
  * 将 YAML 中的 layer 值规范化为语义名称
  */
@@ -929,6 +930,12 @@ class SkillExecutor {
             });
         }
     }
+    resolveTraceSide(inherited) {
+        const value = inherited.__traceSide;
+        return value === 'current' || value === 'reference' || value === 'unknown'
+            ? value
+            : 'current';
+    }
     buildIdentityCacheKey(traceId, target) {
         return JSON.stringify({
             traceId,
@@ -975,17 +982,65 @@ class SkillExecutor {
             targetMatchSources: row.target_match_sources ? String(row.target_match_sources) : undefined,
             supportingSources: row.supporting_sources ? String(row.supporting_sources) : undefined,
             identityWarning: row.identity_warning ? String(row.identity_warning) : undefined,
+            threadUtid: this.toNumber(row.thread_utid),
+            threadTid: this.toNumber(row.thread_tid),
+            threadName: row.thread_name ? String(row.thread_name) : undefined,
+            threadRole: row.thread_role === 'app_main' || row.thread_role === 'render_thread'
+                ? row.thread_role
+                : this.toNumber(row.thread_utid) !== undefined ? 'unknown' : undefined,
+            threadTargetMatched: this.toNumber(row.thread_target_matched) === 1,
         };
     }
-    normalizeIdentityStatus(candidate) {
+    hasExactProcessIdTarget(target, candidate) {
+        if (!candidate)
+            return false;
+        const sources = new Set(this.splitSources(candidate.targetMatchSources));
+        return Boolean(target.upid !== undefined && sources.has('upid'));
+    }
+    identityQualityWarnings(candidate, candidates, target) {
+        if (!candidate)
+            return [];
+        const warnings = new Set();
+        const warning = candidate.identityWarning && candidate.identityWarning !== 'ok'
+            ? candidate.identityWarning
+            : undefined;
+        if (warning)
+            warnings.add(warning);
+        const targetSources = new Set(this.splitSources(candidate.targetMatchSources));
+        const hasProcessTarget = Boolean(target.requestedName ||
+            target.upid !== undefined ||
+            target.pid !== undefined);
+        const hasExactProcessId = this.hasExactProcessIdTarget(target, candidate);
+        const processLevelSources = Array.from(targetSources)
+            .filter(source => source !== 'thread.name');
+        if (target.threadName && !hasProcessTarget) {
+            warnings.add('thread-only identity target is not enough to verify a unique process');
+        }
+        if (processLevelSources.length === 0) {
+            warnings.add('identity candidate has no process-level target match source');
+        }
+        if (candidate.rawStatus === 'probable' && !hasExactProcessId) {
+            warnings.add('probable identity match requires additional confirmation before parameter rewrite');
+        }
+        const second = candidates.find(item => item !== candidate &&
+            item.confidenceScore > 0);
+        if (second && candidate.confidenceScore - second.confidenceScore < 20) {
+            warnings.add('multiple close process identity candidates require manual confirmation');
+        }
+        return Array.from(warnings);
+    }
+    normalizeIdentityStatus(candidate, candidates, target) {
         if (!candidate)
             return 'not_found';
-        if ((candidate.rawStatus === 'confirmed' || candidate.rawStatus === 'probable') &&
-            candidate.confidenceScore >= 50) {
-            return 'verified';
-        }
         if (candidate.confidenceScore <= 0)
             return 'not_found';
+        const qualityWarnings = this.identityQualityWarnings(candidate, candidates, target);
+        const hasExactProcessId = this.hasExactProcessIdTarget(target, candidate);
+        if (qualityWarnings.length === 0 &&
+            ((candidate.rawStatus === 'confirmed' && candidate.confidenceScore >= 80) ||
+                (hasExactProcessId && candidate.confidenceScore >= 50))) {
+            return 'verified';
+        }
         return 'ambiguous';
     }
     async resolveProcessIdentityForGate(traceId, target, inherited) {
@@ -1031,9 +1086,9 @@ class SkillExecutor {
                     : [];
                 const candidates = rows.map(row => this.rowToIdentityCandidate(row));
                 const top = candidates[0];
-                const warning = top?.identityWarning && top.identityWarning !== 'ok' ? top.identityWarning : undefined;
+                const qualityWarnings = this.identityQualityWarnings(top, candidates, target);
                 resolution = {
-                    status: this.normalizeIdentityStatus(top),
+                    status: this.normalizeIdentityStatus(top, candidates, target),
                     requestedName: target.requestedName,
                     canonicalPackageName: top?.canonicalPackageName,
                     recommendedProcessNameParam: top?.recommendedProcessNameParam,
@@ -1041,7 +1096,7 @@ class SkillExecutor {
                     confidenceScore: top?.confidenceScore ?? 0,
                     rawStatus: top?.rawStatus,
                     evidenceSources: this.splitSources(top?.targetMatchSources, top?.supportingSources),
-                    warnings: warning ? [warning] : [],
+                    warnings: qualityWarnings,
                     candidates,
                 };
             }
@@ -1072,13 +1127,31 @@ class SkillExecutor {
             resolve: (target) => this.resolveProcessIdentityForGate(traceId, target, inherited),
         });
     }
-    buildIdentityBlockedResult(skillId, skill, startTime, gate) {
+    buildIdentityBlockedResult(skillId, skill, traceId, traceSide, startTime, gate) {
         const error = gate.error || `Process identity gate blocked skill: ${skillId}`;
+        const identityResolution = (0, identityContractMapper_1.buildIdentityResolutionFromProcessGate)({
+            traceId,
+            traceSide,
+            target: gate.target,
+            resolution: gate.resolution,
+            ...(gate.config.policy === 'required' && !gate.resolution
+                ? { statusOverride: 'missing', warnings: [error] }
+                : {}),
+        });
         return {
             skillId,
             skillName: skill.meta.display_name,
             success: false,
-            displayResults: [],
+            displayResults: [{
+                    stepId: 'process_identity_gate',
+                    title: 'Process identity gate blocked',
+                    level: 'detail',
+                    layer: 'diagnosis',
+                    format: 'text',
+                    data: {
+                        text: error,
+                    },
+                }],
             diagnostics: [{
                     id: 'process_identity_gate_blocked',
                     diagnosis: error,
@@ -1095,6 +1168,7 @@ class SkillExecutor {
                     ],
                     source: 'rule',
                 }],
+            ...(identityResolution ? { identityResolution } : {}),
             executionTimeMs: Date.now() - startTime,
             error,
         };
@@ -1167,6 +1241,7 @@ class SkillExecutor {
      */
     async execute(skillId, traceId, params = {}, inherited = {}) {
         const startTime = Date.now();
+        const traceSide = this.resolveTraceSide(inherited);
         const skill = this.skillRegistry.get(skillId);
         if (!skill) {
             return {
@@ -1191,8 +1266,14 @@ class SkillExecutor {
                 skillId,
                 data: { error: gate.error },
             });
-            return this.buildIdentityBlockedResult(skillId, skill, startTime, gate);
+            return this.buildIdentityBlockedResult(skillId, skill, traceId, traceSide, startTime, gate);
         }
+        const identityResolution = (0, identityContractMapper_1.buildIdentityResolutionFromProcessGate)({
+            traceId,
+            traceSide,
+            target: gate.target,
+            resolution: gate.resolution,
+        });
         // Validate and coerce input parameters against skill.inputs declarations
         const validated = (0, skillValidator_1.validateSkillInputs)(skillId, skill.inputs, gate.params);
         for (const w of validated.warnings) {
@@ -1207,6 +1288,7 @@ class SkillExecutor {
                 success: false,
                 displayResults: [],
                 diagnostics: [],
+                ...(identityResolution ? { identityResolution } : {}),
                 executionTimeMs: Date.now() - startTime,
                 error: `Input validation failed: ${msg}`,
             };
@@ -1235,6 +1317,7 @@ class SkillExecutor {
                 success: false,
                 displayResults: [],
                 diagnostics: [],
+                ...(identityResolution ? { identityResolution } : {}),
                 executionTimeMs: Date.now() - startTime,
                 error: `Skipped: ${prereqCheck.error}`,
             };
@@ -1262,6 +1345,7 @@ class SkillExecutor {
                                 success: false,
                                 displayResults: [],
                                 diagnostics: [],
+                                ...(identityResolution ? { identityResolution } : {}),
                                 executionTimeMs: Date.now() - startTime,
                                 error: atomicResult.error,
                             };
@@ -1283,6 +1367,7 @@ class SkillExecutor {
                                 success: false,
                                 displayResults: [],
                                 diagnostics: [],
+                                ...(identityResolution ? { identityResolution } : {}),
                                 executionTimeMs: Date.now() - startTime,
                                 error: 'No SQL or steps defined for atomic skill',
                             };
@@ -1305,6 +1390,7 @@ class SkillExecutor {
                                 success: false,
                                 displayResults: [],
                                 diagnostics: [],
+                                ...(identityResolution ? { identityResolution } : {}),
                                 executionTimeMs: Date.now() - startTime,
                                 error: `No steps defined for skill: ${skillId}`,
                             };
@@ -1321,6 +1407,7 @@ class SkillExecutor {
                         success: false,
                         displayResults: [],
                         diagnostics: [],
+                        ...(identityResolution ? { identityResolution } : {}),
                         executionTimeMs: Date.now() - startTime,
                         error: `Skill type '${skill.type}' is metadata-only and not executable by the single-trace SkillExecutor: ${skillId}`,
                     };
@@ -1350,6 +1437,7 @@ class SkillExecutor {
                 aiSummary,
                 synthesizeData: synthesizeData.length > 0 ? synthesizeData : undefined,
                 rawResults: context.results,
+                ...(identityResolution ? { identityResolution } : {}),
                 executionTimeMs: Date.now() - startTime,
             };
         }
@@ -1365,6 +1453,7 @@ class SkillExecutor {
                 success: false,
                 displayResults: [],
                 diagnostics: [],
+                ...(identityResolution ? { identityResolution } : {}),
                 executionTimeMs: Date.now() - startTime,
                 error: error.message,
             };
@@ -3557,7 +3646,7 @@ class SkillExecutor {
      *
      * 用于 v2.0 数据契约，统一 SSE 事件格式
      */
-    static toDataEnvelopes(result, columnDefinitions) {
+    static toDataEnvelopes(result, columnDefinitions, provenance) {
         return result.displayResults.map(dr => {
             // Prefer external columnDefinitions, fallback to embedded columnDefinitions in DisplayResult
             const explicitColumns = columnDefinitions?.[dr.stepId] ?? dr.columnDefinitions;
@@ -3568,9 +3657,40 @@ class SkillExecutor {
                 ...drAny,
                 metadataConfig: drAny.metadataConfig || (Array.isArray(drAny.metadataFields) ? { fields: drAny.metadataFields } : undefined),
             };
-            return (0, dataContract_1.displayResultToEnvelope)(drForEnvelope, result.skillId, explicitColumns);
+            return SkillExecutor.attachTraceProvenanceToEnvelope(SkillExecutor.attachIdentityResolutionToEnvelope((0, dataContract_1.displayResultToEnvelope)(drForEnvelope, result.skillId, explicitColumns), result.identityResolution), provenance);
         });
     }
+    static attachTraceProvenanceToEnvelope(envelope, provenance) {
+        if (!provenance?.traceId && !provenance?.traceSide)
+            return envelope;
+        return {
+            ...envelope,
+            meta: {
+                ...envelope.meta,
+                ...(provenance.traceId && !envelope.meta.traceId ? { traceId: provenance.traceId } : {}),
+                ...(provenance.traceSide && !envelope.meta.traceSide ? { traceSide: provenance.traceSide } : {}),
+            },
+        };
+    }
+    static attachIdentityResolutionToEnvelope(envelope, identityResolution) {
+        if (!identityResolution)
+            return envelope;
+        const traceSide = identityResolution.target.traceSide === 'current' || identityResolution.target.traceSide === 'reference'
+            ? identityResolution.target.traceSide
+            : undefined;
+        return {
+            ...envelope,
+            meta: {
+                ...envelope.meta,
+                ...(!envelope.meta.traceId ? { traceId: identityResolution.target.traceId } : {}),
+                ...(traceSide && !envelope.meta.traceSide ? { traceSide } : {}),
+                identityRefId: identityResolution.identityRefId,
+                identityStatus: identityResolution.status,
+                identityWarnings: identityResolution.warnings,
+                identityResolution,
+            },
+        };
+    }
     /**
      * 检查数据是否是迭代器结果
      */