@gracker/smartperfetto 1.0.15 → 1.0.17

package/dist/agentv3/claudeMcpServer.js

@@ -1437,7 +1437,7 @@ function createClaudeMcpServer(options) {
             if (summary && success && rows.length > 0) {
                 const summaryResult = (0, sqlSummarizer_1.summarizeSqlResult)(result.columns, result.rows);
                 if (emitUpdate) {
-                    emittedEvidence = emitSqlSummaryDataEnvelope(emitUpdate, summaryResult, finalSql, injected, traceProvenance, producer);
+                    emittedEvidence = emitSqlSummaryDataEnvelope(emitUpdate, summaryResult, finalSql, injected, traceProvenance, producer, processIdentityWarning);
                 }
                 return {
                     content: [{
@@ -1466,10 +1466,10 @@ function createClaudeMcpServer(options) {
                 };
             }
             if (emitUpdate && success && result.columns.length > 0) {
-                emittedEvidence = emitSqlDataEnvelope(emitUpdate, result.columns, rows, finalSql, injected, traceProvenance, producer);
+                emittedEvidence = emitSqlDataEnvelope(emitUpdate, result.columns, rows, finalSql, injected, traceProvenance, producer, processIdentityWarning);
             }
             else if (emitUpdate && !success) {
-                emittedEvidence = emitSqlDiagnosticDataEnvelope(emitUpdate, result.error || (0, outputLanguage_1.localize)(outputLanguage, 'SQL 执行失败', 'SQL execution failed'), finalSql, injected, traceProvenance, producer, outputLanguage);
+                emittedEvidence = emitSqlDiagnosticDataEnvelope(emitUpdate, result.error || (0, outputLanguage_1.localize)(outputLanguage, 'SQL 执行失败', 'SQL execution failed'), finalSql, injected, traceProvenance, producer, processIdentityWarning, outputLanguage);
             }
             return {
                 content: [{
@@ -1503,7 +1503,7 @@ function createClaudeMcpServer(options) {
                 traceId,
                 traceSide: 'current',
             });
-            const emittedEvidence = emitUpdate ? emitSqlDiagnosticDataEnvelope(emitUpdate, errMsg, sql, undefined, traceProvenance, producer, outputLanguage) : undefined;
+            const emittedEvidence = emitUpdate ? emitSqlDiagnosticDataEnvelope(emitUpdate, errMsg, sql, undefined, traceProvenance, producer, undefined, outputLanguage) : undefined;
             emitUpdate?.({
                 type: 'progress',
                 content: {
@@ -1615,6 +1615,10 @@ function createClaudeMcpServer(options) {
         try {
             const effectiveParams = normalizeSkillParams(params, packageName);
             const producer = createEvidenceProducerContext('invoke_skill', { skillId, params: effectiveParams }, (0, outputLanguage_1.localize)(outputLanguage, `调用 Skill ${skillId}，收集本阶段结构化证据。`, `Run Skill ${skillId} to collect structured evidence for this phase.`));
+            const skillTraceProvenance = (0, traceProcessorConnectionModel_1.buildTraceProcessorQueryProvenance)({
+                traceId,
+                traceSide: 'current',
+            });
             emitUpdate?.({
                 type: 'progress',
                 content: {
@@ -1649,8 +1653,82 @@ function createClaudeMcpServer(options) {
                 // Persist to disk (fire-and-forget) for cross-session learning
                 logSqlErrorFixPair(errorPair, knowledgeScope).catch(() => { });
             }
+            // Artifact mode stores displayResults before emitting DataEnvelopes so
+            // evidence meta can carry the same artifact ids that the model sees.
+            let artifacts;
+            let diagnosticsArtifactId;
+            let synthesizeArtifacts;
+            const artifactIdsByStepId = new Map();
+            if (artifactStore && result.displayResults?.length) {
+                artifacts = result.displayResults.map(dr => {
+                    const artId = artifactStore.store({
+                        skillId: result.skillId || skillId,
+                        stepId: dr.stepId,
+                        layer: dr.layer,
+                        title: dr.title,
+                        data: dr.data,
+                        diagnostics: undefined,
+                        planPhaseId: producer.planPhaseId,
+                        planPhaseTitle: producer.planPhaseTitle,
+                        planPhaseGoal: producer.planPhaseGoal,
+                        sourceToolCallId: producer.sourceToolCallId,
+                        paramsHash: producer.paramsHash,
+                        identityResolution: result.identityResolution,
+                    });
+                    if (dr.stepId)
+                        artifactIdsByStepId.set(dr.stepId, artId);
+                    const summary = artifactStore.generateCompactSummary(artId);
+                    return summary;
+                }).filter((summary) => Boolean(summary));
+            }
+            // Store diagnostics as a separate artifact if present, even for
+            // diagnostics-only skill results that do not emit displayResults.
+            if (artifactStore && result.diagnostics && Array.isArray(result.diagnostics) && result.diagnostics.length > 0) {
+                diagnosticsArtifactId = artifactStore.store({
+                    skillId: result.skillId || skillId,
+                    stepId: '_diagnostics',
+                    layer: 'diagnosis',
+                    title: `${skillId} diagnostics`,
+                    data: { columns: ['diagnostic'], rows: result.diagnostics.map((d) => [d]) },
+                    diagnostics: result.diagnostics,
+                    planPhaseId: producer.planPhaseId,
+                    planPhaseTitle: producer.planPhaseTitle,
+                    planPhaseGoal: producer.planPhaseGoal,
+                    sourceToolCallId: producer.sourceToolCallId,
+                    paramsHash: producer.paramsHash,
+                    identityResolution: result.identityResolution,
+                });
+            }
+            // Store synthesizeData entries as artifacts too — these contain the
+            // raw step data that would otherwise overflow token limits.
+            if (artifactStore && result.synthesizeData && Array.isArray(result.synthesizeData) && result.synthesizeData.length > 0) {
+                synthesizeArtifacts = result.synthesizeData
+                    .filter((sd) => sd.data && sd.success !== false)
+                    .map((sd) => {
+                    const normalizedData = normalizeSynthesizeDataForStorage(sd.data);
+                    const artId = artifactStore.store({
+                        skillId: result.skillId || skillId,
+                        stepId: sd.stepId,
+                        layer: sd.layer || 'synthesize',
+                        title: sd.stepName || sd.stepId,
+                        data: normalizedData,
+                        planPhaseId: producer.planPhaseId,
+                        planPhaseTitle: producer.planPhaseTitle,
+                        planPhaseGoal: producer.planPhaseGoal,
+                        sourceToolCallId: producer.sourceToolCallId,
+                        paramsHash: producer.paramsHash,
+                        identityResolution: result.identityResolution,
+                    });
+                    return {
+                        artifactId: artId,
+                        stepId: sd.stepId,
+                        rowCount: normalizedData.rows?.length ?? 0,
+                        columns: normalizedData.columns ?? [],
+                    };
+                });
+            }
             if (emitUpdate && result.displayResults?.length) {
-                emitSkillDataEnvelopes(result.displayResults, result.skillId || skillId, emitUpdate, undefined, producer);
+                emitSkillDataEnvelopes(result.displayResults, result.skillId || skillId, emitUpdate, skillTraceProvenance, producer, result.identityResolution, artifactIdsByStepId);
             }
             if (onSkillResult && result.success && result.displayResults?.length) {
                 onSkillResult({ skillId: result.skillId || skillId, displayResults: result.displayResults });
@@ -1688,72 +1766,9 @@ function createClaudeMcpServer(options) {
                     };
                 }
             }
-            // Artifact mode: store displayResults AND synthesizeData as artifacts, return compact references
-            if (artifactStore && result.displayResults?.length) {
-                const artifacts = result.displayResults.map(dr => {
-                    const artId = artifactStore.store({
-                        skillId: result.skillId || skillId,
-                        stepId: dr.stepId,
-                        layer: dr.layer,
-                        title: dr.title,
-                        data: dr.data,
-                        diagnostics: undefined,
-                        planPhaseId: producer.planPhaseId,
-                        planPhaseTitle: producer.planPhaseTitle,
-                        planPhaseGoal: producer.planPhaseGoal,
-                        sourceToolCallId: producer.sourceToolCallId,
-                        paramsHash: producer.paramsHash,
-                    });
-                    const summary = artifactStore.generateCompactSummary(artId);
-                    return summary;
-                });
-                // Store diagnostics as a separate artifact if present
-                let diagnosticsArtifactId;
-                if (result.diagnostics && Array.isArray(result.diagnostics) && result.diagnostics.length > 0) {
-                    diagnosticsArtifactId = artifactStore.store({
-                        skillId: result.skillId || skillId,
-                        stepId: '_diagnostics',
-                        layer: 'diagnosis',
-                        title: `${skillId} diagnostics`,
-                        data: { columns: ['diagnostic'], rows: result.diagnostics.map((d) => [d]) },
-                        diagnostics: result.diagnostics,
-                        planPhaseId: producer.planPhaseId,
-                        planPhaseTitle: producer.planPhaseTitle,
-                        planPhaseGoal: producer.planPhaseGoal,
-                        sourceToolCallId: producer.sourceToolCallId,
-                        paramsHash: producer.paramsHash,
-                    });
-                }
-                // Store synthesizeData entries as artifacts too — these contain the raw step data
-                // (e.g. batch_frame_root_cause with 487 rows) that would otherwise overflow token limits.
-                // Claude can fetch them on demand via fetch_artifact with pagination.
-                let synthesizeArtifacts;
-                if (result.synthesizeData && Array.isArray(result.synthesizeData) && result.synthesizeData.length > 0) {
-                    synthesizeArtifacts = result.synthesizeData
-                        .filter((sd) => sd.data && sd.success !== false)
-                        .map((sd) => {
-                        // synthesizeData entries have data as array-of-objects or { columns, rows }
-                        const normalizedData = normalizeSynthesizeDataForStorage(sd.data);
-                        const artId = artifactStore.store({
-                            skillId: result.skillId || skillId,
-                            stepId: sd.stepId,
-                            layer: sd.layer || 'synthesize',
-                            title: sd.stepName || sd.stepId,
-                            data: normalizedData,
-                            planPhaseId: producer.planPhaseId,
-                            planPhaseTitle: producer.planPhaseTitle,
-                            planPhaseGoal: producer.planPhaseGoal,
-                            sourceToolCallId: producer.sourceToolCallId,
-                            paramsHash: producer.paramsHash,
-                        });
-                        return {
-                            artifactId: artId,
-                            stepId: sd.stepId,
-                            rowCount: normalizedData.rows?.length ?? 0,
-                            columns: normalizedData.columns ?? [],
-                        };
-                    });
-                }
+            // Artifact mode: return compact references whenever any fetchable
+            // artifact was created.
+            if (artifactStore && (artifacts?.length || diagnosticsArtifactId || synthesizeArtifacts?.length)) {
                 return {
                     content: [{
                             type: 'text',
@@ -1762,6 +1777,7 @@ function createClaudeMcpServer(options) {
                                 skillId: result.skillId,
                                 skillName: result.skillName,
                                 ...(result.error ? { error: result.error } : {}),
+                                ...(result.identityResolution ? { identityResolution: result.identityResolution } : {}),
                                 artifacts,
                                 ...(diagnosticsArtifactId ? { diagnosticsArtifactId } : {}),
                                 ...(synthesizeArtifacts && synthesizeArtifacts.length > 0
@@ -1782,6 +1798,7 @@ function createClaudeMcpServer(options) {
                             skillId: result.skillId,
                             skillName: result.skillName,
                             ...(result.error ? { error: result.error } : {}),
+                            ...(result.identityResolution ? { identityResolution: result.identityResolution } : {}),
                             ...(vendorOverrideHint ? { vendorOverride: vendorOverrideHint } : {}),
                             displayResults: result.displayResults?.map(dr => ({
                                 stepId: dr.stepId,
@@ -2072,7 +2089,8 @@ function createClaudeMcpServer(options) {
             success: true,
             detail: effectiveDetail,
             ...result,
-            sourceToolCallId: producer.sourceToolCallId,
+            sourceToolCallId: result?.sourceToolCallId || producer.sourceToolCallId,
+            fetchedByToolCallId: producer.sourceToolCallId,
             paramsHash: producer.paramsHash,
             planPhaseId: producer.planPhaseId,
             planPhaseTitle: producer.planPhaseTitle,
@@ -3552,7 +3570,7 @@ function createClaudeMcpServer(options) {
                 const summaryResult = (0, sqlSummarizer_1.summarizeSqlResult)(result.columns, result.rows);
                 const durationMs = Date.now() - sqlStart;
                 if (emitUpdate) {
-                    emittedEvidence = emitSqlSummaryDataEnvelope(emitUpdate, summaryResult, finalSql, injected, traceProvenance, producer);
+                    emittedEvidence = emitSqlSummaryDataEnvelope(emitUpdate, summaryResult, finalSql, injected, traceProvenance, producer, processIdentityWarning);
                 }
                 const text = JSON.stringify({
                     success: true,
@@ -3576,10 +3594,10 @@ function createClaudeMcpServer(options) {
             }
             const durationMs = Date.now() - sqlStart;
             if (emitUpdate && success && result.columns.length > 0) {
-                emittedEvidence = emitSqlDataEnvelope(emitUpdate, result.columns, rows, finalSql, injected, traceProvenance, producer);
+                emittedEvidence = emitSqlDataEnvelope(emitUpdate, result.columns, rows, finalSql, injected, traceProvenance, producer, processIdentityWarning);
             }
             else if (emitUpdate && !success) {
-                emittedEvidence = emitSqlDiagnosticDataEnvelope(emitUpdate, result.error || (0, outputLanguage_1.localize)(outputLanguage, 'SQL 执行失败', 'SQL execution failed'), finalSql, injected, traceProvenance, producer);
+                emittedEvidence = emitSqlDiagnosticDataEnvelope(emitUpdate, result.error || (0, outputLanguage_1.localize)(outputLanguage, 'SQL 执行失败', 'SQL execution failed'), finalSql, injected, traceProvenance, producer, processIdentityWarning);
             }
             const text = JSON.stringify({
                 success,
@@ -3609,7 +3627,7 @@ function createClaudeMcpServer(options) {
                 traceId: targetTraceId,
                 traceSide: trace,
             });
-            const emittedEvidence = emitUpdate ? emitSqlDiagnosticDataEnvelope(emitUpdate, e.message, sql, undefined, traceProvenance, producer, outputLanguage) : undefined;
+            const emittedEvidence = emitUpdate ? emitSqlDiagnosticDataEnvelope(emitUpdate, e.message, sql, undefined, traceProvenance, producer, undefined, outputLanguage) : undefined;
             return {
                 content: [{
                         type: 'text',
@@ -3668,8 +3686,8 @@ function createClaudeMcpServer(options) {
                 traceSide: 'reference',
             });
             const [currentResult, refResult] = await Promise.all([
-                skillExecutor.execute(skillId, traceId, effectiveParams),
-                skillExecutor.execute(skillId, referenceTraceId, refParams),
+                skillExecutor.execute(skillId, traceId, effectiveParams, { __traceSide: 'current' }),
+                skillExecutor.execute(skillId, referenceTraceId, refParams, { __traceSide: 'reference' }),
             ]);
             const compareDuration = Date.now() - compareStart;
             // Schema alignment: check which steps are comparable
@@ -3690,14 +3708,14 @@ function createClaudeMcpServer(options) {
                     ...baseProducer,
                     sourceToolCallId: `${baseProducer.sourceToolCallId}:current`,
                     producerReason: (0, outputLanguage_1.localize)(outputLanguage, `当前 Trace 对比 Skill ${skillId} 结果。`, `Current trace result for comparison Skill ${skillId}.`),
-                });
+                }, currentResult.identityResolution);
             }
             if (emitUpdate && refResult.displayResults?.length) {
                 emitSkillDataEnvelopes(refResult.displayResults, skillId, emitUpdate, referenceTraceProvenance, {
                     ...baseProducer,
                     sourceToolCallId: `${baseProducer.sourceToolCallId}:reference`,
                     producerReason: (0, outputLanguage_1.localize)(outputLanguage, `参考 Trace 对比 Skill ${skillId} 结果。`, `Reference trace result for comparison Skill ${skillId}.`),
-                });
+                }, refResult.identityResolution);
             }
             // Build compact comparison summary for Claude
             const buildStepSummary = (results) => results.map(r => ({
@@ -3717,6 +3735,7 @@ function createClaudeMcpServer(options) {
                     stepCount: currentResult.displayResults?.length || 0,
                     steps: buildStepSummary(currentResult.displayResults || []),
                     diagnosticCount: currentResult.diagnostics?.length || 0,
+                    identityResolution: currentResult.identityResolution,
                     error: currentResult.error,
                 },
                 reference: {
@@ -3727,6 +3746,7 @@ function createClaudeMcpServer(options) {
                     stepCount: refResult.displayResults?.length || 0,
                     steps: buildStepSummary(refResult.displayResults || []),
                     diagnosticCount: refResult.diagnostics?.length || 0,
+                    identityResolution: refResult.identityResolution,
                     error: refResult.error,
                 },
                 alignment: {
@@ -3932,7 +3952,7 @@ function producerEnvelopeOptions(producer) {
     };
 }
 /** Emit a DataEnvelope for SQL query results. */
-function emitSqlDataEnvelope(emit, columns, rows, sql, stdlibInjectedModules, traceProvenance, producer) {
+function emitSqlDataEnvelope(emit, columns, rows, sql, stdlibInjectedModules, traceProvenance, producer, processIdentityWarning) {
     const { evidenceRefId, queryHash } = stableSqlEvidenceRefId(sql, columns, rows, traceProvenance, producer);
     const envelope = (0, dataContract_1.createDataEnvelope)({ columns, rows }, {
         type: 'sql_result',
@@ -3949,6 +3969,7 @@ function emitSqlDataEnvelope(emit, columns, rows, sql, stdlibInjectedModules, tr
         traceId: traceProvenance?.traceId,
         queryHash,
         ...producerEnvelopeOptions(producer),
+        processIdentityWarning,
         intent: 'ad_hoc_sql_verification',
     });
     emit({
@@ -3968,7 +3989,7 @@ function emitSqlDataEnvelope(emit, columns, rows, sql, stdlibInjectedModules, tr
     return { evidenceRefId, queryHash };
 }
 /** Emit a DataEnvelope for SQL summary-mode results. */
-function emitSqlSummaryDataEnvelope(emit, summary, sql, stdlibInjectedModules, traceProvenance, producer) {
+function emitSqlSummaryDataEnvelope(emit, summary, sql, stdlibInjectedModules, traceProvenance, producer, processIdentityWarning) {
     const { evidenceRefId, queryHash } = stableSqlEvidenceRefId(sql, summary.columns, summary.sampleRows, traceProvenance, producer, 'summary');
     const envelope = (0, dataContract_1.createDataEnvelope)({
         summary: {
@@ -3987,6 +4008,7 @@ function emitSqlSummaryDataEnvelope(emit, summary, sql, stdlibInjectedModules, t
         traceId: traceProvenance?.traceId,
         queryHash,
         ...producerEnvelopeOptions(producer),
+        processIdentityWarning,
         intent: 'ad_hoc_sql_summary',
     });
     emit({
@@ -4006,7 +4028,7 @@ function emitSqlSummaryDataEnvelope(emit, summary, sql, stdlibInjectedModules, t
     return { evidenceRefId, queryHash };
 }
 /** Emit a diagnostic DataEnvelope for failed SQL so missing tables remain explainable. */
-function emitSqlDiagnosticDataEnvelope(emit, error, sql, stdlibInjectedModules, traceProvenance, producer, outputLanguage = outputLanguage_1.DEFAULT_OUTPUT_LANGUAGE) {
+function emitSqlDiagnosticDataEnvelope(emit, error, sql, stdlibInjectedModules, traceProvenance, producer, processIdentityWarning, outputLanguage = outputLanguage_1.DEFAULT_OUTPUT_LANGUAGE) {
     const { evidenceRefId, queryHash } = stableSqlEvidenceRefId(sql, [], [[error]], traceProvenance, producer, 'diagnostic');
     const envelope = (0, dataContract_1.createDataEnvelope)({
         text: [
@@ -4026,6 +4048,7 @@ function emitSqlDiagnosticDataEnvelope(emit, error, sql, stdlibInjectedModules,
         traceId: traceProvenance?.traceId,
         queryHash,
         ...producerEnvelopeOptions(producer),
+        processIdentityWarning,
         intent: 'ad_hoc_sql_diagnostic',
     });
     emit({
@@ -4057,13 +4080,22 @@ function inferSqlColumnType(col) {
  * Convert skill DisplayResults to DataEnvelopes and emit as SSE 'data' events.
  * This enables interactive tables (clickable timestamps, expandable rows) in the frontend.
  */
-function emitSkillDataEnvelopes(displayResults, skillId, emit, traceProvenance, producer) {
+function emitSkillDataEnvelopes(displayResults, skillId, emit, traceProvenance, producer, identityResolution, artifactIdsByStepId) {
     const envelopes = displayResults
-        .filter(dr => Array.isArray(dr.data?.rows))
+        .filter(dr => Boolean(dr.data))
         .map(dr => {
         const explicitColumns = dr.columnDefinitions;
-        const envelope = (0, dataContract_1.displayResultToEnvelope)(dr, skillId, explicitColumns);
+        const drForEnvelope = {
+            ...dr,
+            metadataConfig: dr.metadataConfig || (Array.isArray(dr.metadataFields)
+                ? { fields: dr.metadataFields }
+                : undefined),
+        };
+        const envelope = (0, dataContract_1.displayResultToEnvelope)(drForEnvelope, skillId, explicitColumns);
         const evidenceRefId = stableSkillEvidenceRefId(skillId, envelope.meta.stepId, envelope.display.title, envelope.data, traceProvenance, producer);
+        const artifactId = envelope.meta.stepId
+            ? artifactIdsByStepId?.get(envelope.meta.stepId)
+            : undefined;
         const withEvidence = {
             ...envelope,
             meta: {
@@ -4071,6 +4103,13 @@ function emitSkillDataEnvelopes(displayResults, skillId, emit, traceProvenance,
                 evidenceRefId,
                 traceSide: traceProvenance?.traceSide,
                 traceId: traceProvenance?.traceId,
+                ...(artifactId ? { artifactId, sourceArtifactId: artifactId } : {}),
+                ...(identityResolution ? {
+                    identityRefId: identityResolution.identityRefId,
+                    identityStatus: identityResolution.status,
+                    identityWarnings: identityResolution.warnings,
+                    identityResolution,
+                } : {}),
                 ...producerEnvelopeOptions(producer),
                 intent: 'skill_structured_result',
             },