SILVER
/
NODEDC_1C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.692.72 и 2.732.76 - типобезопасность turn-runtime билдера и убрал остатки слабых кастов в маппинге зависимостей: assistantTurnRuntimeInputBuilder.ts / Поднял типы в deps-адаптере до контрактов AssistantTurnRuntimeBuilderDeps (sessions/normalizer/data-layer/query/chat/log), убрал unknown/any-обертки: assistantTurnRuntimeDepsAdapter.ts

This commit is contained in:
dctouch 2026-04-11 10:24:16 +03:00
parent bf16309a29
commit 9f3749fd4a
6 changed files with 309 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
docs/TECH/1CLLMARCH-FACT.md
View File

@ -1850,7 +1850,47 @@ Validation:
- `assistantWave10SettlementCorrectiveRegression.test.ts`
- `assistantLivingChatMode.test.ts`
Status: **In progress (Phase 2.1 + 2.2 + 2.3 + 2.4 + 2.5 + 2.6 + 2.7 + 2.8 + 2.9 + 2.10 + 2.11 + 2.12 + 2.13 + 2.14 + 2.15 + 2.16 + 2.17 + 2.18 + 2.19 + 2.20 + 2.21 + 2.22 + 2.23 + 2.24 + 2.25 + 2.26 + 2.27 + 2.28 + 2.29 + 2.30 + 2.31 + 2.32 + 2.33 + 2.34 + 2.35 + 2.36 + 2.37 + 2.38 + 2.39 + 2.40 + 2.41 + 2.42 + 2.43 + 2.44 + 2.45 + 2.46 + 2.47 + 2.48 + 2.49 + 2.50 + 2.51 + 2.52 + 2.53 + 2.54 + 2.55 + 2.56 + 2.57 + 2.58 + 2.59 + 2.60 + 2.61 + 2.62 + 2.63 + 2.64 + 2.65 + 2.66 + 2.67 + 2.68 completed)**
Implemented in current pass (Phase 2.69 + 2.70 + 2.71 + 2.72):
1. Finalized strict deps typing in turn runtime input builder:
- `assistantTurnRuntimeInputBuilder.ts`
- completed generic `AssistantTurnRuntimeBuilderDeps<ResponseType>` wiring through address/deep runtime input contracts;
- removed residual weak casts from builder field projection.
2. Hardened turn runtime deps adapter contracts:
- `assistantTurnRuntimeDepsAdapter.ts`
- typed sessions/normalizer/data-layer/address-query/chat/log inputs directly from `AssistantTurnRuntimeBuilderDeps` contract slices;
- removed `unknown`/`any` wrappers from adapter mapping while preserving compatible handler signatures for optional args.
3. Preserved behavior of turn orchestration chain under stricter typing:
- bootstrap -> address attempt -> deep attempt flow remains unchanged at runtime.
Validation:
1. `npm run build` passed.
2. Targeted turn/deps regression pack passed:
- `assistantTurnRuntimeInputBuilder.test.ts`
- `assistantTurnRuntimeDepsAdapter.test.ts`
- `assistantTurnAttemptRuntimeAdapter.test.ts`
- `assistantAddressAttemptRuntimeAdapter.test.ts`
Implemented in current pass (Phase 2.73 + 2.74 + 2.75 + 2.76):
1. Removed remaining unsafe casts in address->living-chat bridge:
- `assistantAddressAttemptRuntimeAdapter.ts`
- replaced `mergeKnownOrganizations` dependency type with living-chat compatible contract;
- removed `as any` cast for `mergeKnownOrganizations` and removed final object cast to `RunAssistantLivingChatAttemptRuntimeInput`.
2. Added explicit mode-decision normalization before living-chat runtime handoff:
- mapped untyped `modeDecision` to typed `{ mode: string | null; reason: string | null }` contract.
3. Preserved behavior of address lane + living-chat fallback under stricter typing:
- runtime flow unchanged, only contract hardening.
Validation:
1. `npm run build` passed.
2. Targeted address/living/turn regression pack passed:
- `assistantAddressAttemptRuntimeAdapter.test.ts`
- `assistantLivingChatAttemptRuntimeAdapter.test.ts`
- `assistantLivingChatHandlerRuntimeAdapter.test.ts`
- `assistantTurnRuntimeInputBuilder.test.ts`
- `assistantTurnRuntimeDepsAdapter.test.ts`
- `assistantTurnAttemptRuntimeAdapter.test.ts`
Status: **In progress (Phase 2.1 + 2.2 + 2.3 + 2.4 + 2.5 + 2.6 + 2.7 + 2.8 + 2.9 + 2.10 + 2.11 + 2.12 + 2.13 + 2.14 + 2.15 + 2.16 + 2.17 + 2.18 + 2.19 + 2.20 + 2.21 + 2.22 + 2.23 + 2.24 + 2.25 + 2.26 + 2.27 + 2.28 + 2.29 + 2.30 + 2.31 + 2.32 + 2.33 + 2.34 + 2.35 + 2.36 + 2.37 + 2.38 + 2.39 + 2.40 + 2.41 + 2.42 + 2.43 + 2.44 + 2.45 + 2.46 + 2.47 + 2.48 + 2.49 + 2.50 + 2.51 + 2.52 + 2.53 + 2.54 + 2.55 + 2.56 + 2.57 + 2.58 + 2.59 + 2.60 + 2.61 + 2.62 + 2.63 + 2.64 + 2.65 + 2.66 + 2.67 + 2.68 + 2.69 + 2.70 + 2.71 + 2.72 + 2.73 + 2.74 + 2.75 + 2.76 completed)**
## Stage 3 (P2): Hybrid Semantic Layer (LLM + Deterministic Guards)

104
llm_normalizer/backend/dist/services/assistantAddressAttemptRuntimeAdapter.js vendored
View File

@ -35,52 +35,64 @@ async function runAssistantAddressAttemptRuntime(input) {
logEvent: input.logEvent,
messageIdFactory: input.messageIdFactory
}));
const tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => runLivingChatAttemptRuntimeSafe((0, assistantLivingChatAttemptInputBuilder_1.buildAssistantLivingChatAttemptRuntimeInput)({
sessionId: input.sessionId,
userMessage: input.userMessage,
sessionItems: input.sessionItems,
modeDecision,
sessionScope: {
knownOrganizations: input.sessionScope.knownOrganizations,
selectedOrganization: input.sessionScope.selectedOrganization,
activeOrganization: input.sessionScope.activeOrganization
},
addressRuntimeMeta,
toNonEmptyString: input.toNonEmptyString,
mergeKnownOrganizations: input.mergeKnownOrganizations,
hasAssistantDataScopeMetaQuestionSignal: input.hasAssistantDataScopeMetaQuestionSignal,
shouldHandleAsAssistantCapabilityMetaQuery: input.shouldHandleAsAssistantCapabilityMetaQuery,
hasDestructiveDataActionSignal: input.hasDestructiveDataActionSignal,
hasDangerOrCoercionSignal: input.hasDangerOrCoercionSignal,
hasOperationalAdminActionRequestSignal: input.hasOperationalAdminActionRequestSignal,
hasOrganizationFactLookupSignal: input.hasOrganizationFactLookupSignal,
hasOrganizationFactFollowupSignal: input.hasOrganizationFactFollowupSignal,
shouldEmitOrganizationSelectionReply: input.shouldEmitOrganizationSelectionReply,
hasAssistantCapabilityQuestionSignal: input.hasAssistantCapabilityQuestionSignal,
resolveDataScopeProbe: input.resolveDataScopeProbe,
applyScriptGuard: input.applyScriptGuard,
applyGroundingGuard: input.applyGroundingGuard,
buildAssistantSafetyRefusalReply: input.buildAssistantSafetyRefusalReply,
buildAssistantDataScopeContractReply: input.buildAssistantDataScopeContractReply,
buildAssistantOrganizationFactBoundaryReply: input.buildAssistantOrganizationFactBoundaryReply,
buildAssistantDataScopeSelectionReply: input.buildAssistantDataScopeSelectionReply,
buildAssistantOperationalBoundaryReply: input.buildAssistantOperationalBoundaryReply,
buildAssistantCapabilityContractReply: input.buildAssistantCapabilityContractReply,
appendItem: input.appendItem,
getSession: input.getSession,
persistSession: input.persistSession,
cloneConversation: input.cloneConversation,
logEvent: input.logEvent,
messageIdFactory: input.messageIdFactory,
nowIso: input.nowIso,
payload: input.payload,
chatClient: input.chatClient,
loadAssistantCanonExcerpt: input.loadAssistantCanonExcerpt,
sanitizeOutgoingAssistantText: input.sanitizeOutgoingAssistantText,
defaultModel: input.defaultModel,
defaultBaseUrl: input.defaultBaseUrl,
defaultApiKey: input.defaultApiKey
}));
const tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => {
const normalizedModeDecision = (() => {
if (!modeDecision || typeof modeDecision !== "object") {
return undefined;
}
const candidate = modeDecision;
return {
mode: typeof candidate.mode === "string" ? candidate.mode : null,
reason: typeof candidate.reason === "string" ? candidate.reason : null
};
})();
return runLivingChatAttemptRuntimeSafe((0, assistantLivingChatAttemptInputBuilder_1.buildAssistantLivingChatAttemptRuntimeInput)({
sessionId: input.sessionId,
userMessage: input.userMessage,
sessionItems: input.sessionItems,
modeDecision: normalizedModeDecision,
sessionScope: {
knownOrganizations: input.sessionScope.knownOrganizations,
selectedOrganization: input.sessionScope.selectedOrganization,
activeOrganization: input.sessionScope.activeOrganization
},
addressRuntimeMeta,
toNonEmptyString: input.toNonEmptyString,
mergeKnownOrganizations: input.mergeKnownOrganizations,
hasAssistantDataScopeMetaQuestionSignal: input.hasAssistantDataScopeMetaQuestionSignal,
shouldHandleAsAssistantCapabilityMetaQuery: input.shouldHandleAsAssistantCapabilityMetaQuery,
hasDestructiveDataActionSignal: input.hasDestructiveDataActionSignal,
hasDangerOrCoercionSignal: input.hasDangerOrCoercionSignal,
hasOperationalAdminActionRequestSignal: input.hasOperationalAdminActionRequestSignal,
hasOrganizationFactLookupSignal: input.hasOrganizationFactLookupSignal,
hasOrganizationFactFollowupSignal: input.hasOrganizationFactFollowupSignal,
shouldEmitOrganizationSelectionReply: input.shouldEmitOrganizationSelectionReply,
hasAssistantCapabilityQuestionSignal: input.hasAssistantCapabilityQuestionSignal,
resolveDataScopeProbe: input.resolveDataScopeProbe,
applyScriptGuard: input.applyScriptGuard,
applyGroundingGuard: input.applyGroundingGuard,
buildAssistantSafetyRefusalReply: input.buildAssistantSafetyRefusalReply,
buildAssistantDataScopeContractReply: input.buildAssistantDataScopeContractReply,
buildAssistantOrganizationFactBoundaryReply: input.buildAssistantOrganizationFactBoundaryReply,
buildAssistantDataScopeSelectionReply: input.buildAssistantDataScopeSelectionReply,
buildAssistantOperationalBoundaryReply: input.buildAssistantOperationalBoundaryReply,
buildAssistantCapabilityContractReply: input.buildAssistantCapabilityContractReply,
appendItem: input.appendItem,
getSession: input.getSession,
persistSession: input.persistSession,
cloneConversation: input.cloneConversation,
logEvent: input.logEvent,
messageIdFactory: input.messageIdFactory,
nowIso: input.nowIso,
payload: input.payload,
chatClient: input.chatClient,
loadAssistantCanonExcerpt: input.loadAssistantCanonExcerpt,
sanitizeOutgoingAssistantText: input.sanitizeOutgoingAssistantText,
defaultModel: input.defaultModel,
defaultBaseUrl: input.defaultBaseUrl,
defaultApiKey: input.defaultApiKey
}));
};
const runAddressLaneAttempt = async (messageUsed, carryMeta, analysisDateHint) => runAddressLaneAttemptRuntimeSafe((0, assistantAddressLaneAttemptInputBuilder_1.buildAssistantAddressLaneAttemptRuntimeInput)({
messageUsed,
carryMeta,

12
llm_normalizer/backend/dist/services/assistantTurnRuntimeDepsAdapter.js vendored
View File

@ -4,12 +4,12 @@ exports.buildAssistantTurnRuntimeDeps = buildAssistantTurnRuntimeDeps;
function buildAssistantTurnRuntimeDeps(input) {
return {
...input.helpers,
ensureSession: (sessionId) => input.sessions.ensureSession(sessionId),
appendItem: (sessionId, item) => input.sessions.appendItem(sessionId, item),
getSession: (sessionId) => input.sessions.getSession(sessionId),
persistSession: (sessionState) => input.sessionLogger.persistSession(sessionState),
setInvestigationState: (sessionId, snapshot) => input.sessions.setInvestigationState(sessionId, snapshot),
normalize: (payload) => input.normalizerService.normalize(payload),
ensureSession: input.sessions.ensureSession,
appendItem: input.sessions.appendItem,
getSession: input.sessions.getSession,
persistSession: input.sessionLogger.persistSession,
setInvestigationState: input.sessions.setInvestigationState,
normalize: input.normalizerService.normalize,
executeRouteRuntime: (route, fragmentText, options) => input.dataLayer.executeRouteRuntime(route, fragmentText, options),
tryAddressQueryHandle: (messageUsed, options) => input.addressQueryService.tryHandle(messageUsed, options),
chatClient: input.chatClient,

24
llm_normalizer/backend/src/services/assistantAddressAttemptRuntimeAdapter.ts
View File

@ -48,7 +48,7 @@ export interface RunAssistantAddressAttemptRuntimeInput<ResponseType = unknown>
sessionScope: AddressSessionScope;
mergeFollowupContextWithOrganizationScope: RunAssistantAddressLaneAttemptRuntimeInput["mergeFollowupContextWithOrganizationScope"];
runAddressQueryTryHandle: RunAssistantAddressLaneAttemptRuntimeInput["runAddressQueryTryHandle"];
mergeKnownOrganizations: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["mergeKnownOrganizations"];
mergeKnownOrganizations: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["mergeKnownOrganizations"];
hasAssistantDataScopeMetaQuestionSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasAssistantDataScopeMetaQuestionSignal"];
shouldHandleAsAssistantCapabilityMetaQuery: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["shouldHandleAsAssistantCapabilityMetaQuery"];
hasDestructiveDataActionSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasDestructiveDataActionSignal"];
@ -140,13 +140,24 @@ export async function runAssistantAddressAttemptRuntime<ResponseType = unknown>(
const tryHandleLivingChat: RunAssistantAddressRuntimeInput<ResponseType>["tryHandleLivingChat"] = async (
modeDecision,
addressRuntimeMeta = null
) =>
runLivingChatAttemptRuntimeSafe(
) => {
const normalizedModeDecision: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["modeDecision"] = (() => {
if (!modeDecision || typeof modeDecision !== "object") {
return undefined;
}
const candidate = modeDecision as { mode?: unknown; reason?: unknown };
return {
mode: typeof candidate.mode === "string" ? candidate.mode : null,
reason: typeof candidate.reason === "string" ? candidate.reason : null
};
})();
return runLivingChatAttemptRuntimeSafe(
buildAssistantLivingChatAttemptRuntimeInput({
sessionId: input.sessionId,
userMessage: input.userMessage,
sessionItems: input.sessionItems,
modeDecision,
modeDecision: normalizedModeDecision,
sessionScope: {
knownOrganizations: input.sessionScope.knownOrganizations,
selectedOrganization: input.sessionScope.selectedOrganization,
@ -154,7 +165,7 @@ export async function runAssistantAddressAttemptRuntime<ResponseType = unknown>(
},
addressRuntimeMeta,
toNonEmptyString: input.toNonEmptyString,
mergeKnownOrganizations: input.mergeKnownOrganizations as any,
mergeKnownOrganizations: input.mergeKnownOrganizations,
hasAssistantDataScopeMetaQuestionSignal: input.hasAssistantDataScopeMetaQuestionSignal,
shouldHandleAsAssistantCapabilityMetaQuery: input.shouldHandleAsAssistantCapabilityMetaQuery,
hasDestructiveDataActionSignal: input.hasDestructiveDataActionSignal,
@ -187,8 +198,9 @@ export async function runAssistantAddressAttemptRuntime<ResponseType = unknown>(
defaultModel: input.defaultModel,
defaultBaseUrl: input.defaultBaseUrl,
defaultApiKey: input.defaultApiKey
} as any) as RunAssistantLivingChatAttemptRuntimeInput<ResponseType>
})
);
};
const runAddressLaneAttempt: RunAssistantAddressRuntimeInput<ResponseType>["runAddressLaneAttempt"] = async (
messageUsed,

41
llm_normalizer/backend/src/services/assistantTurnRuntimeDepsAdapter.ts
View File

@ -1,26 +1,26 @@
import type { AssistantTurnRuntimeBuilderDeps } from "./assistantTurnRuntimeInputBuilder";
export interface AssistantTurnRuntimeDepsSessionsLike {
ensureSession: (sessionId: string) => unknown;
appendItem: (sessionId: string, item: unknown) => void;
getSession: (sessionId: string) => unknown;
setInvestigationState: (sessionId: string, snapshot: unknown) => void;
ensureSession: AssistantTurnRuntimeBuilderDeps["ensureSession"];
appendItem: AssistantTurnRuntimeBuilderDeps["appendItem"];
getSession: AssistantTurnRuntimeBuilderDeps["getSession"];
setInvestigationState: AssistantTurnRuntimeBuilderDeps["setInvestigationState"];
}
export interface AssistantTurnRuntimeDepsSessionLoggerLike {
persistSession: (sessionState: unknown) => void;
persistSession: AssistantTurnRuntimeBuilderDeps["persistSession"];
}
export interface AssistantTurnRuntimeDepsNormalizerLike {
normalize: (payload: unknown) => Promise<unknown>;
normalize: AssistantTurnRuntimeBuilderDeps["normalize"];
}
export interface AssistantTurnRuntimeDepsDataLayerLike {
executeRouteRuntime: (route: string, fragmentText: string, options?: unknown) => Promise<unknown>;
executeRouteRuntime: AssistantTurnRuntimeBuilderDeps["executeRouteRuntime"];
}
export interface AssistantTurnRuntimeDepsAddressQueryServiceLike {
tryHandle: (messageUsed: string, options?: unknown) => Promise<unknown>;
tryHandle: AssistantTurnRuntimeBuilderDeps["tryAddressQueryHandle"];
}
type BuilderDepsProvidedByAdapter = Pick<
@ -58,11 +58,11 @@ export interface BuildAssistantTurnRuntimeDepsInput {
normalizerService: AssistantTurnRuntimeDepsNormalizerLike;
dataLayer: AssistantTurnRuntimeDepsDataLayerLike;
addressQueryService: AssistantTurnRuntimeDepsAddressQueryServiceLike;
chatClient: unknown;
messageIdFactory: () => string;
nowIso: () => string;
defaultApiKey: string;
logEvent: (payload: Record<string, unknown>) => void;
chatClient: AssistantTurnRuntimeBuilderDeps["chatClient"];
messageIdFactory: AssistantTurnRuntimeBuilderDeps["messageIdFactory"];
nowIso: AssistantTurnRuntimeBuilderDeps["nowIso"];
defaultApiKey: AssistantTurnRuntimeBuilderDeps["defaultApiKey"];
logEvent: AssistantTurnRuntimeBuilderDeps["logEvent"];
flags: {
featureAssistantAddressQueryV1: boolean;
featureAddressLlmPredecomposeV1: boolean;
@ -85,13 +85,14 @@ export function buildAssistantTurnRuntimeDeps(
): AssistantTurnRuntimeBuilderDeps {
return {
...input.helpers,
ensureSession: (sessionId) => input.sessions.ensureSession(sessionId) as any,
appendItem: (sessionId, item) => input.sessions.appendItem(sessionId, item as any),
getSession: (sessionId) => input.sessions.getSession(sessionId) as any,
persistSession: (sessionState) => input.sessionLogger.persistSession(sessionState as any),
setInvestigationState: (sessionId, snapshot) => input.sessions.setInvestigationState(sessionId, snapshot),
normalize: (payload) => input.normalizerService.normalize(payload),
executeRouteRuntime: (route, fragmentText, options) => input.dataLayer.executeRouteRuntime(route, fragmentText, options),
ensureSession: input.sessions.ensureSession,
appendItem: input.sessions.appendItem,
getSession: input.sessions.getSession,
persistSession: input.sessionLogger.persistSession,
setInvestigationState: input.sessions.setInvestigationState,
normalize: input.normalizerService.normalize,
executeRouteRuntime: (route, fragmentText, options) =>
input.dataLayer.executeRouteRuntime(route, fragmentText, options),
tryAddressQueryHandle: (messageUsed, options) => input.addressQueryService.tryHandle(messageUsed, options),
chatClient: input.chatClient,
messageIdFactory: input.messageIdFactory,

306
llm_normalizer/backend/src/services/assistantTurnRuntimeInputBuilder.ts
View File

@ -9,83 +9,104 @@ import type {
RunAssistantUserTurnBootstrapRuntimeInput
} from "./assistantUserTurnBootstrapRuntimeAdapter";
export interface AssistantTurnRuntimeBuilderDeps {
type AddressAttemptRuntimeInput<ResponseType = unknown> = RunAssistantAddressAttemptRuntimeInput<ResponseType>;
type DeepTurnAttemptRuntimeInput<ResponseType = unknown> = RunAssistantDeepTurnAttemptRuntimeInput<ResponseType>;
export interface AssistantTurnRuntimeBuilderDeps<ResponseType = unknown> {
ensureSession: RunAssistantUserTurnBootstrapRuntimeInput["ensureSession"];
appendItem: RunAssistantUserTurnBootstrapRuntimeInput["appendItem"];
getSession: RunAssistantUserTurnBootstrapRuntimeInput["getSession"];
persistSession: RunAssistantUserTurnBootstrapRuntimeInput["persistSession"];
setInvestigationState: (sessionId: string, snapshot: unknown) => void;
normalize: (payload: unknown) => Promise<unknown>;
executeRouteRuntime: (route: string, fragmentText: string, options?: unknown) => Promise<unknown>;
tryAddressQueryHandle: (messageUsed: string, options?: unknown) => Promise<unknown>;
chatClient: unknown;
messageIdFactory: () => string;
nowIso: () => string;
defaultApiKey: string;
logEvent: (payload: Record<string, unknown>) => void;
featureAssistantAddressQueryV1: boolean;
featureAddressLlmPredecomposeV1: boolean;
featureInvestigationStateV1: boolean;
featureStateFollowupBindingV1: boolean;
featureContractsV11: boolean;
featureAnswerPolicyV11: boolean;
featureProblemCentricAnswerV1: boolean;
featureLifecycleAnswerV1: boolean;
defaultModel: string;
defaultBaseUrl: string;
compactWhitespace: RunAssistantUserTurnBootstrapRuntimeInput["compactWhitespace"];
repairAddressMojibake: RunAssistantUserTurnBootstrapRuntimeInput["repairAddressMojibake"];
resolveRuntimeAnalysisContext: RunAssistantUserTurnBootstrapRuntimeInput["resolveRuntimeAnalysisContext"];
runAddressLlmPreDecompose: (payload: unknown, userMessage: string) => Promise<Record<string, unknown>>;
buildAddressLlmPredecomposeContractV1: (...args: any[]) => unknown;
sanitizeAddressMessageForFallback: (...args: any[]) => unknown;
toNonEmptyString: (...args: any[]) => unknown;
resolveAddressFollowupCarryoverContext: (...args: any[]) => unknown;
resolveAssistantOrchestrationDecision: (...args: any[]) => unknown;
buildAddressDialogContinuationContractV2: (...args: any[]) => unknown;
mergeFollowupContextWithOrganizationScope: (...args: any[]) => unknown;
isRetryableAddressLimitedResult: (...args: any[]) => unknown;
mergeKnownOrganizations: (...args: any[]) => unknown;
hasAssistantDataScopeMetaQuestionSignal: (...args: any[]) => unknown;
shouldHandleAsAssistantCapabilityMetaQuery: (...args: any[]) => unknown;
hasDestructiveDataActionSignal: (...args: any[]) => unknown;
hasDangerOrCoercionSignal: (...args: any[]) => unknown;
hasOperationalAdminActionRequestSignal: (...args: any[]) => unknown;
hasOrganizationFactLookupSignal: (...args: any[]) => unknown;
hasOrganizationFactFollowupSignal: (...args: any[]) => unknown;
shouldEmitOrganizationSelectionReply: (...args: any[]) => unknown;
hasAssistantCapabilityQuestionSignal: (...args: any[]) => unknown;
resolveDataScopeProbe: () => unknown;
applyScriptGuard: (...args: any[]) => unknown;
applyGroundingGuard: (...args: any[]) => unknown;
buildAssistantSafetyRefusalReply: (...args: any[]) => unknown;
buildAssistantDataScopeContractReply: (...args: any[]) => unknown;
buildAssistantOrganizationFactBoundaryReply: (...args: any[]) => unknown;
buildAssistantDataScopeSelectionReply: (...args: any[]) => unknown;
buildAssistantOperationalBoundaryReply: (...args: any[]) => unknown;
buildAssistantCapabilityContractReply: (...args: any[]) => unknown;
loadAssistantCanonExcerpt: (...args: any[]) => unknown;
sanitizeOutgoingAssistantText: (value: unknown, fallback?: string) => string;
buildAddressDebugPayload: (...args: any[]) => unknown;
buildAddressFollowupOffer: (...args: any[]) => unknown;
buildFollowupStateBinding: (...args: any[]) => unknown;
resolveBusinessScopeAlignment: (...args: any[]) => unknown;
inferP0DomainFromMessage: (...args: any[]) => unknown;
resolveBusinessScopeFromLiveContext: (...args: any[]) => unknown;
extractRequirements: (...args: any[]) => unknown;
toExecutionPlan: (...args: any[]) => unknown;
enforceRbpLiveRoutePlan: (...args: any[]) => unknown;
enforceFaLiveRoutePlan: (...args: any[]) => unknown;
mapNoRouteReason: (...args: any[]) => unknown;
buildSkippedResult: (...args: any[]) => unknown;
evaluateCoverage: (...args: any[]) => unknown;
checkGrounding: (...args: any[]) => unknown;
collectRbpLiveRouteAudit: (...args: any[]) => unknown;
collectFaLiveRouteAudit: (...args: any[]) => unknown;
hasExplicitPeriodAnchorFromNormalized: (...args: any[]) => unknown;
extractDroppedIntentSegments: (...args: any[]) => unknown;
toDebugRoutes: (...args: any[]) => unknown;
extractExecutionState: (...args: any[]) => unknown;
runAddressLlmPreDecompose: (
payload: AddressAttemptRuntimeInput<ResponseType>["payload"],
userMessage: string
) => Promise<Record<string, unknown>>;
tryAddressQueryHandle: AddressAttemptRuntimeInput<ResponseType>["runAddressQueryTryHandle"];
setInvestigationState: DeepTurnAttemptRuntimeInput<ResponseType>["persistInvestigationState"];
normalize: DeepTurnAttemptRuntimeInput<ResponseType>["normalize"];
executeRouteRuntime: DeepTurnAttemptRuntimeInput<ResponseType>["executeRouteRuntime"];
chatClient: AddressAttemptRuntimeInput<ResponseType>["chatClient"];
messageIdFactory: AddressAttemptRuntimeInput<ResponseType>["messageIdFactory"];
nowIso: AddressAttemptRuntimeInput<ResponseType>["nowIso"];
defaultApiKey: NonNullable<AddressAttemptRuntimeInput<ResponseType>["defaultApiKey"]>;
logEvent: AddressAttemptRuntimeInput<ResponseType>["logEvent"];
featureAssistantAddressQueryV1: AddressAttemptRuntimeInput<ResponseType>["featureAssistantAddressQueryV1"];
featureAddressLlmPredecomposeV1: AddressAttemptRuntimeInput<ResponseType>["featureAddressLlmPredecomposeV1"];
featureInvestigationStateV1: DeepTurnAttemptRuntimeInput<ResponseType>["featureInvestigationStateV1"];
featureStateFollowupBindingV1: DeepTurnAttemptRuntimeInput<ResponseType>["featureStateFollowupBindingV1"];
featureContractsV11: DeepTurnAttemptRuntimeInput<ResponseType>["featureContractsV11"];
featureAnswerPolicyV11: DeepTurnAttemptRuntimeInput<ResponseType>["featureAnswerPolicyV11"];
featureProblemCentricAnswerV1: DeepTurnAttemptRuntimeInput<ResponseType>["featureProblemCentricAnswerV1"];
featureLifecycleAnswerV1: DeepTurnAttemptRuntimeInput<ResponseType>["featureLifecycleAnswerV1"];
defaultModel: AddressAttemptRuntimeInput<ResponseType>["defaultModel"];
defaultBaseUrl: AddressAttemptRuntimeInput<ResponseType>["defaultBaseUrl"];
buildAddressLlmPredecomposeContractV1:
AddressAttemptRuntimeInput<ResponseType>["buildAddressLlmPredecomposeContractV1"];
sanitizeAddressMessageForFallback: AddressAttemptRuntimeInput<ResponseType>["sanitizeAddressMessageForFallback"];
toNonEmptyString: AddressAttemptRuntimeInput<ResponseType>["toNonEmptyString"];
resolveAddressFollowupCarryoverContext:
AddressAttemptRuntimeInput<ResponseType>["resolveAddressFollowupCarryoverContext"];
resolveAssistantOrchestrationDecision:
AddressAttemptRuntimeInput<ResponseType>["resolveAssistantOrchestrationDecision"];
buildAddressDialogContinuationContractV2:
AddressAttemptRuntimeInput<ResponseType>["buildAddressDialogContinuationContractV2"];
mergeFollowupContextWithOrganizationScope:
AddressAttemptRuntimeInput<ResponseType>["mergeFollowupContextWithOrganizationScope"];
isRetryableAddressLimitedResult: AddressAttemptRuntimeInput<ResponseType>["isRetryableAddressLimitedResult"];
mergeKnownOrganizations: AddressAttemptRuntimeInput<ResponseType>["mergeKnownOrganizations"];
hasAssistantDataScopeMetaQuestionSignal:
AddressAttemptRuntimeInput<ResponseType>["hasAssistantDataScopeMetaQuestionSignal"];
shouldHandleAsAssistantCapabilityMetaQuery:
AddressAttemptRuntimeInput<ResponseType>["shouldHandleAsAssistantCapabilityMetaQuery"];
hasDestructiveDataActionSignal: AddressAttemptRuntimeInput<ResponseType>["hasDestructiveDataActionSignal"];
hasDangerOrCoercionSignal: AddressAttemptRuntimeInput<ResponseType>["hasDangerOrCoercionSignal"];
hasOperationalAdminActionRequestSignal:
AddressAttemptRuntimeInput<ResponseType>["hasOperationalAdminActionRequestSignal"];
hasOrganizationFactLookupSignal: AddressAttemptRuntimeInput<ResponseType>["hasOrganizationFactLookupSignal"];
hasOrganizationFactFollowupSignal: AddressAttemptRuntimeInput<ResponseType>["hasOrganizationFactFollowupSignal"];
shouldEmitOrganizationSelectionReply:
AddressAttemptRuntimeInput<ResponseType>["shouldEmitOrganizationSelectionReply"];
hasAssistantCapabilityQuestionSignal:
AddressAttemptRuntimeInput<ResponseType>["hasAssistantCapabilityQuestionSignal"];
resolveDataScopeProbe: AddressAttemptRuntimeInput<ResponseType>["resolveDataScopeProbe"];
applyScriptGuard: AddressAttemptRuntimeInput<ResponseType>["applyScriptGuard"];
applyGroundingGuard: AddressAttemptRuntimeInput<ResponseType>["applyGroundingGuard"];
buildAssistantSafetyRefusalReply: AddressAttemptRuntimeInput<ResponseType>["buildAssistantSafetyRefusalReply"];
buildAssistantDataScopeContractReply:
AddressAttemptRuntimeInput<ResponseType>["buildAssistantDataScopeContractReply"];
buildAssistantOrganizationFactBoundaryReply:
AddressAttemptRuntimeInput<ResponseType>["buildAssistantOrganizationFactBoundaryReply"];
buildAssistantDataScopeSelectionReply:
AddressAttemptRuntimeInput<ResponseType>["buildAssistantDataScopeSelectionReply"];
buildAssistantOperationalBoundaryReply:
AddressAttemptRuntimeInput<ResponseType>["buildAssistantOperationalBoundaryReply"];
buildAssistantCapabilityContractReply:
AddressAttemptRuntimeInput<ResponseType>["buildAssistantCapabilityContractReply"];
loadAssistantCanonExcerpt: AddressAttemptRuntimeInput<ResponseType>["loadAssistantCanonExcerpt"];
sanitizeOutgoingAssistantText: AddressAttemptRuntimeInput<ResponseType>["sanitizeOutgoingAssistantText"];
buildAddressDebugPayload: AddressAttemptRuntimeInput<ResponseType>["buildAddressDebugPayload"];
buildAddressFollowupOffer: AddressAttemptRuntimeInput<ResponseType>["buildAddressFollowupOffer"];
buildFollowupStateBinding: DeepTurnAttemptRuntimeInput<ResponseType>["buildFollowupStateBinding"];
resolveBusinessScopeAlignment: DeepTurnAttemptRuntimeInput<ResponseType>["resolveBusinessScopeAlignment"];
inferP0DomainFromMessage: DeepTurnAttemptRuntimeInput<ResponseType>["inferP0DomainFromMessage"];
resolveBusinessScopeFromLiveContext: DeepTurnAttemptRuntimeInput<ResponseType>["resolveBusinessScopeFromLiveContext"];
extractRequirements: DeepTurnAttemptRuntimeInput<ResponseType>["extractRequirements"];
toExecutionPlan: DeepTurnAttemptRuntimeInput<ResponseType>["toExecutionPlan"];
enforceRbpLiveRoutePlan: DeepTurnAttemptRuntimeInput<ResponseType>["enforceRbpLiveRoutePlan"];
enforceFaLiveRoutePlan: DeepTurnAttemptRuntimeInput<ResponseType>["enforceFaLiveRoutePlan"];
mapNoRouteReason: DeepTurnAttemptRuntimeInput<ResponseType>["mapNoRouteReason"];
buildSkippedResult: DeepTurnAttemptRuntimeInput<ResponseType>["buildSkippedResult"];
evaluateCoverage: DeepTurnAttemptRuntimeInput<ResponseType>["evaluateCoverage"];
checkGrounding: DeepTurnAttemptRuntimeInput<ResponseType>["checkGrounding"];
collectRbpLiveRouteAudit: DeepTurnAttemptRuntimeInput<ResponseType>["collectRbpLiveRouteAudit"];
collectFaLiveRouteAudit: DeepTurnAttemptRuntimeInput<ResponseType>["collectFaLiveRouteAudit"];
hasExplicitPeriodAnchorFromNormalized: DeepTurnAttemptRuntimeInput<ResponseType>["hasExplicitPeriodAnchor"];
extractDroppedIntentSegments: DeepTurnAttemptRuntimeInput<ResponseType>["extractDroppedIntentSegments"];
toDebugRoutes: DeepTurnAttemptRuntimeInput<ResponseType>["buildDebugRoutes"];
extractExecutionState: DeepTurnAttemptRuntimeInput<ResponseType>["extractExecutionState"];
}
export function buildAssistantUserTurnBootstrapRuntimeInput(
@ -107,15 +128,15 @@ export function buildAssistantUserTurnBootstrapRuntimeInput(
}
export function buildAssistantAddressAttemptRuntimeInput<ResponseType = unknown>(
runtimeInput: RunAssistantTurnAttemptRuntimeAddressInput,
deps: AssistantTurnRuntimeBuilderDeps
runtimeInput: RunAssistantTurnAttemptRuntimeAddressInput<AddressAttemptRuntimeInput<ResponseType>["payload"]>,
deps: AssistantTurnRuntimeBuilderDeps<ResponseType>
): RunAssistantAddressAttemptRuntimeInput<ResponseType> {
return {
featureAssistantAddressQueryV1: deps.featureAssistantAddressQueryV1,
sessionId: runtimeInput.sessionId,
userMessage: runtimeInput.userMessage,
sessionItems: runtimeInput.sessionItems,
payload: runtimeInput.payload as any,
payload: runtimeInput.payload,
sessionScope: {
knownOrganizations: runtimeInput.sessionOrganizationScope.knownOrganizations,
selectedOrganization: runtimeInput.sessionOrganizationScope.selectedOrganization,
@ -123,65 +144,68 @@ export function buildAssistantAddressAttemptRuntimeInput<ResponseType = unknown>
},
featureAddressLlmPredecomposeV1: deps.featureAddressLlmPredecomposeV1,
runAddressLlmPreDecompose: async () => deps.runAddressLlmPreDecompose(runtimeInput.payload, runtimeInput.userMessage),
buildAddressLlmPredecomposeContractV1: deps.buildAddressLlmPredecomposeContractV1 as any,
sanitizeAddressMessageForFallback: deps.sanitizeAddressMessageForFallback as any,
toNonEmptyString: deps.toNonEmptyString as any,
resolveAddressFollowupCarryoverContext: deps.resolveAddressFollowupCarryoverContext as any,
resolveAssistantOrchestrationDecision: deps.resolveAssistantOrchestrationDecision as any,
buildAddressDialogContinuationContractV2: deps.buildAddressDialogContinuationContractV2 as any,
buildAddressLlmPredecomposeContractV1: deps.buildAddressLlmPredecomposeContractV1,
sanitizeAddressMessageForFallback: deps.sanitizeAddressMessageForFallback,
toNonEmptyString: deps.toNonEmptyString,
resolveAddressFollowupCarryoverContext: deps.resolveAddressFollowupCarryoverContext,
resolveAssistantOrchestrationDecision: deps.resolveAssistantOrchestrationDecision,
buildAddressDialogContinuationContractV2: deps.buildAddressDialogContinuationContractV2,
runtimeAnalysisContextAsOfDate: runtimeInput.runtimeAnalysisContext.as_of_date,
compactWhitespace: deps.compactWhitespace,
mergeFollowupContextWithOrganizationScope: deps.mergeFollowupContextWithOrganizationScope as any,
runAddressQueryTryHandle: deps.tryAddressQueryHandle as any,
isRetryableAddressLimitedResult: deps.isRetryableAddressLimitedResult as any,
mergeKnownOrganizations: deps.mergeKnownOrganizations as any,
hasAssistantDataScopeMetaQuestionSignal: deps.hasAssistantDataScopeMetaQuestionSignal as any,
shouldHandleAsAssistantCapabilityMetaQuery: deps.shouldHandleAsAssistantCapabilityMetaQuery as any,
hasDestructiveDataActionSignal: deps.hasDestructiveDataActionSignal as any,
hasDangerOrCoercionSignal: deps.hasDangerOrCoercionSignal as any,
hasOperationalAdminActionRequestSignal: deps.hasOperationalAdminActionRequestSignal as any,
hasOrganizationFactLookupSignal: deps.hasOrganizationFactLookupSignal as any,
hasOrganizationFactFollowupSignal: deps.hasOrganizationFactFollowupSignal as any,
shouldEmitOrganizationSelectionReply: deps.shouldEmitOrganizationSelectionReply as any,
hasAssistantCapabilityQuestionSignal: deps.hasAssistantCapabilityQuestionSignal as any,
resolveDataScopeProbe: deps.resolveDataScopeProbe as any,
applyScriptGuard: deps.applyScriptGuard as any,
applyGroundingGuard: deps.applyGroundingGuard as any,
buildAssistantSafetyRefusalReply: deps.buildAssistantSafetyRefusalReply as any,
buildAssistantDataScopeContractReply: deps.buildAssistantDataScopeContractReply as any,
buildAssistantOrganizationFactBoundaryReply: deps.buildAssistantOrganizationFactBoundaryReply as any,
buildAssistantDataScopeSelectionReply: deps.buildAssistantDataScopeSelectionReply as any,
buildAssistantOperationalBoundaryReply: deps.buildAssistantOperationalBoundaryReply as any,
buildAssistantCapabilityContractReply: deps.buildAssistantCapabilityContractReply as any,
chatClient: deps.chatClient as any,
loadAssistantCanonExcerpt: deps.loadAssistantCanonExcerpt as any,
mergeFollowupContextWithOrganizationScope: deps.mergeFollowupContextWithOrganizationScope,
runAddressQueryTryHandle: deps.tryAddressQueryHandle,
isRetryableAddressLimitedResult: deps.isRetryableAddressLimitedResult,
mergeKnownOrganizations: deps.mergeKnownOrganizations,
hasAssistantDataScopeMetaQuestionSignal: deps.hasAssistantDataScopeMetaQuestionSignal,
shouldHandleAsAssistantCapabilityMetaQuery: deps.shouldHandleAsAssistantCapabilityMetaQuery,
hasDestructiveDataActionSignal: deps.hasDestructiveDataActionSignal,
hasDangerOrCoercionSignal: deps.hasDangerOrCoercionSignal,
hasOperationalAdminActionRequestSignal: deps.hasOperationalAdminActionRequestSignal,
hasOrganizationFactLookupSignal: deps.hasOrganizationFactLookupSignal,
hasOrganizationFactFollowupSignal: deps.hasOrganizationFactFollowupSignal,
shouldEmitOrganizationSelectionReply: deps.shouldEmitOrganizationSelectionReply,
hasAssistantCapabilityQuestionSignal: deps.hasAssistantCapabilityQuestionSignal,
resolveDataScopeProbe: deps.resolveDataScopeProbe,
applyScriptGuard: deps.applyScriptGuard,
applyGroundingGuard: deps.applyGroundingGuard,
buildAssistantSafetyRefusalReply: deps.buildAssistantSafetyRefusalReply,
buildAssistantDataScopeContractReply: deps.buildAssistantDataScopeContractReply,
buildAssistantOrganizationFactBoundaryReply: deps.buildAssistantOrganizationFactBoundaryReply,
buildAssistantDataScopeSelectionReply: deps.buildAssistantDataScopeSelectionReply,
buildAssistantOperationalBoundaryReply: deps.buildAssistantOperationalBoundaryReply,
buildAssistantCapabilityContractReply: deps.buildAssistantCapabilityContractReply,
chatClient: deps.chatClient,
loadAssistantCanonExcerpt: deps.loadAssistantCanonExcerpt,
sanitizeOutgoingAssistantText: deps.sanitizeOutgoingAssistantText,
defaultModel: deps.defaultModel,
defaultBaseUrl: deps.defaultBaseUrl,
defaultApiKey: deps.defaultApiKey,
buildAddressDebugPayload: deps.buildAddressDebugPayload as any,
buildAddressFollowupOffer: deps.buildAddressFollowupOffer as any,
appendItem: deps.appendItem as any,
getSession: deps.getSession as any,
persistSession: deps.persistSession as any,
buildAddressDebugPayload: deps.buildAddressDebugPayload,
buildAddressFollowupOffer: deps.buildAddressFollowupOffer,
appendItem: deps.appendItem,
getSession: deps.getSession,
persistSession: deps.persistSession,
cloneConversation: (items) => items.map((item) => ({ ...item })),
logEvent: deps.logEvent as any,
logEvent: deps.logEvent,
messageIdFactory: deps.messageIdFactory,
nowIso: deps.nowIso
};
}
export function buildAssistantDeepTurnAttemptRuntimeInput<ResponseType = unknown>(
runtimeInput: RunAssistantTurnAttemptRuntimeDeepInput,
deps: AssistantTurnRuntimeBuilderDeps
runtimeInput: RunAssistantTurnAttemptRuntimeDeepInput<DeepTurnAttemptRuntimeInput<ResponseType>["payload"]> & {
runtimeAnalysisContext: DeepTurnAttemptRuntimeInput<ResponseType>["runtimeAnalysisContext"];
sessionInvestigationState: DeepTurnAttemptRuntimeInput<ResponseType>["sessionInvestigationState"];
},
deps: AssistantTurnRuntimeBuilderDeps<ResponseType>
): RunAssistantDeepTurnAttemptRuntimeInput<ResponseType> {
return {
sessionId: runtimeInput.sessionId,
questionId: runtimeInput.questionId,
userMessage: runtimeInput.userMessage,
payload: runtimeInput.payload as any,
runtimeAnalysisContext: runtimeInput.runtimeAnalysisContext as any,
sessionInvestigationState: runtimeInput.sessionInvestigationState as any,
payload: runtimeInput.payload,
runtimeAnalysisContext: runtimeInput.runtimeAnalysisContext,
sessionInvestigationState: runtimeInput.sessionInvestigationState,
addressRuntimeMetaForDeep: runtimeInput.addressRuntimeMetaForDeep,
featureInvestigationStateV1: deps.featureInvestigationStateV1,
featureStateFollowupBindingV1: deps.featureStateFollowupBindingV1,
@ -189,33 +213,33 @@ export function buildAssistantDeepTurnAttemptRuntimeInput<ResponseType = unknown
featureAnswerPolicyV11: deps.featureAnswerPolicyV11,
featureProblemCentricAnswerV1: deps.featureProblemCentricAnswerV1,
featureLifecycleAnswerV1: deps.featureLifecycleAnswerV1,
buildFollowupStateBinding: deps.buildFollowupStateBinding as any,
normalize: deps.normalize as any,
resolveBusinessScopeAlignment: deps.resolveBusinessScopeAlignment as any,
inferP0DomainFromMessage: deps.inferP0DomainFromMessage as any,
resolveBusinessScopeFromLiveContext: deps.resolveBusinessScopeFromLiveContext as any,
extractRequirements: deps.extractRequirements as any,
toExecutionPlan: deps.toExecutionPlan as any,
enforceRbpLiveRoutePlan: deps.enforceRbpLiveRoutePlan as any,
enforceFaLiveRoutePlan: deps.enforceFaLiveRoutePlan as any,
executeRouteRuntime: deps.executeRouteRuntime as any,
mapNoRouteReason: deps.mapNoRouteReason as any,
buildSkippedResult: deps.buildSkippedResult as any,
evaluateCoverage: deps.evaluateCoverage as any,
checkGrounding: deps.checkGrounding as any,
collectRbpLiveRouteAudit: deps.collectRbpLiveRouteAudit as any,
collectFaLiveRouteAudit: deps.collectFaLiveRouteAudit as any,
hasExplicitPeriodAnchor: deps.hasExplicitPeriodAnchorFromNormalized as any,
extractDroppedIntentSegments: deps.extractDroppedIntentSegments as any,
buildDebugRoutes: deps.toDebugRoutes as any,
extractExecutionState: deps.extractExecutionState as any,
sanitizeReply: deps.sanitizeOutgoingAssistantText as any,
persistInvestigationState: deps.setInvestigationState as any,
messageIdFactory: deps.messageIdFactory as any,
appendItem: deps.appendItem as any,
getSession: deps.getSession as any,
persistSession: deps.persistSession as any,
buildFollowupStateBinding: deps.buildFollowupStateBinding,
normalize: deps.normalize,
resolveBusinessScopeAlignment: deps.resolveBusinessScopeAlignment,
inferP0DomainFromMessage: deps.inferP0DomainFromMessage,
resolveBusinessScopeFromLiveContext: deps.resolveBusinessScopeFromLiveContext,
extractRequirements: deps.extractRequirements,
toExecutionPlan: deps.toExecutionPlan,
enforceRbpLiveRoutePlan: deps.enforceRbpLiveRoutePlan,
enforceFaLiveRoutePlan: deps.enforceFaLiveRoutePlan,
executeRouteRuntime: deps.executeRouteRuntime,
mapNoRouteReason: deps.mapNoRouteReason,
buildSkippedResult: deps.buildSkippedResult,
evaluateCoverage: deps.evaluateCoverage,
checkGrounding: deps.checkGrounding,
collectRbpLiveRouteAudit: deps.collectRbpLiveRouteAudit,
collectFaLiveRouteAudit: deps.collectFaLiveRouteAudit,
hasExplicitPeriodAnchor: deps.hasExplicitPeriodAnchorFromNormalized,
extractDroppedIntentSegments: deps.extractDroppedIntentSegments,
buildDebugRoutes: deps.toDebugRoutes,
extractExecutionState: deps.extractExecutionState,
sanitizeReply: deps.sanitizeOutgoingAssistantText,
persistInvestigationState: deps.setInvestigationState,
messageIdFactory: deps.messageIdFactory,
appendItem: deps.appendItem,
getSession: deps.getSession,
persistSession: deps.persistSession,
cloneConversation: (items) => items.map((item) => ({ ...item })),
logEvent: deps.logEvent as any
logEvent: deps.logEvent
};
}