@saptools/service-flow 0.1.70 → 0.1.73

package/src/db/fact-lifecycle.ts

@@ -14,6 +14,7 @@ import {
   type SchemaStructureCategoryCount,
 } from './schema-structure.js';
 import { ANALYZER_VERSION } from '../version.js';
+import { invalidEventFactExamples } from './event-fact-semantics.js';
 
 export type FactLifecycleCode =
   | 'schema_upgrade_required'
@@ -27,11 +28,8 @@ export interface FactLifecycleDiagnostic extends Record<string, unknown> {
   remediation: string;
 }
 
-const remediation = [
-  'service-flow index --workspace /workspace --force',
-  'service-flow link --workspace /workspace --force',
-].join('\n');
 const CATEGORY_LIMIT = 24;
+const EXAMPLE_LIMIT = 5;
 
 function count(db: Db, sql: string, ...params: unknown[]): number {
   const row = db.prepare(sql).get(...params);
@@ -51,12 +49,13 @@ export function factLifecycleDiagnostic(
   workspaceId?: number,
   phase: PackageFactPhase = 'pre_package',
 ): FactLifecycleDiagnostic | undefined {
-  return schemaLifecycleDiagnostic(db)
+  return schemaLifecycleDiagnostic(db, workspaceId)
     ?? currentFactLifecycleDiagnostic(db, workspaceId, phase);
 }
 
 export function schemaLifecycleDiagnostic(
   db: Db,
+  workspaceId?: number,
 ): FactLifecycleDiagnostic | undefined {
   const currentSchema = schemaVersion(db);
   if (currentSchema > CURRENT_SCHEMA_VERSION) return {
@@ -71,13 +70,15 @@ export function schemaLifecycleDiagnostic(
     severity: 'error',
     code: 'schema_upgrade_required',
     message: `Database schema ${currentSchema} must be upgraded to ${CURRENT_SCHEMA_VERSION} before this command can read current call-site facts.`,
-    remediation,
+    remediation: staleRemediation(db, workspaceId),
     currentSchemaVersion: currentSchema,
     requiredSchemaVersion: CURRENT_SCHEMA_VERSION,
   };
   const structureCategories = invalidSchemaStructureCategories(db);
   if (structureCategories.length > 0)
-    return reindexDiagnostic(0, structureCategories);
+    return reindexDiagnostic(
+      db, workspaceId, 0, structureCategories, 'pre_package', false,
+    );
   return undefined;
 }
 
@@ -88,15 +89,17 @@ export function currentFactLifecycleDiagnostic(
 ): FactLifecycleDiagnostic | undefined {
   const staleRepositories = oldAnalyzerCount(db, workspaceId);
   if (staleRepositories > 0)
-    return reindexDiagnostic(staleRepositories, []);
+    return reindexDiagnostic(
+      db, workspaceId, staleRepositories, [], phase,
+    );
   const jsonCategories = invalidFactJsonCategories(db, workspaceId);
   if (jsonCategories.length > 0)
-    return reindexDiagnostic(0, jsonCategories);
+    return reindexDiagnostic(db, workspaceId, 0, jsonCategories, phase);
   const semanticCategories = invalidFactSemanticCategories(
     db, workspaceId, phase,
   );
   if (semanticCategories.length === 0) return undefined;
-  return reindexDiagnostic(0, semanticCategories);
+  return reindexDiagnostic(db, workspaceId, 0, semanticCategories, phase);
 }
 
 type InvalidFactCategory =
@@ -105,26 +108,81 @@ type InvalidFactCategory =
   | SchemaStructureCategoryCount;
 
 function reindexDiagnostic(
+  db: Db,
+  workspaceId: number | undefined,
   staleRepositories: number,
   categories: InvalidFactCategory[],
+  phase: PackageFactPhase,
+  examplesAllowed = true,
 ): FactLifecycleDiagnostic {
   const invalidFacts = categories.reduce((sum, item) => sum + item.count, 0);
   const shown = categories.slice(0, CATEGORY_LIMIT);
+  const eventExamples = examplesAllowed
+    ? invalidEventFactExamples(db, workspaceId, phase, EXAMPLE_LIMIT)
+    : { total: 0, affectedRepositoryCount: 0, examples: [] };
+  const examples = invalidFacts > 0 ? eventExamples.examples : [];
   return {
     severity: 'error',
     code: 'reindex_required',
-    message: 'Current facts are stale or fail bounded semantic integrity checks; force index and link before tracing or rebuilding graph edges.',
-    remediation,
+    message: invalidFacts > 0
+      ? 'Current facts fail bounded semantic integrity checks; inspect the offending rows before rebuilding graph edges.'
+      : 'Current facts are stale; force index and link before tracing or rebuilding graph edges.',
+    remediation: invalidFacts > 0
+      ? invalidFactRemediation(db, workspaceId)
+      : staleRemediation(db, workspaceId),
     staleRepositoryCount: staleRepositories,
     invalidCallFactCount: invalidFacts,
     invalidFactCategories: shown,
     invalidFactCategoryCount: categories.length,
     shownInvalidFactCategoryCount: shown.length,
     omittedInvalidFactCategoryCount: categories.length - shown.length,
+    affectedRepositoryCount: eventExamples.affectedRepositoryCount,
+    workspaceRepositoryCount: repositoryCount(db, workspaceId),
+    invalidFactExamples: examples,
+    invalidFactExampleCount: eventExamples.total,
+    shownInvalidFactExampleCount: examples.length,
+    omittedInvalidFactExampleCount:
+      Math.max(0, eventExamples.total - examples.length),
     requiredAnalyzerVersion: ANALYZER_VERSION,
   };
 }
 
+function workspacePath(db: Db, workspaceId?: number): string | undefined {
+  if (workspaceId === undefined) return undefined;
+  const row = db.prepare(
+    'SELECT root_path rootPath FROM workspaces WHERE id=?',
+  ).get(workspaceId);
+  return typeof row?.rootPath === 'string' ? row.rootPath : undefined;
+}
+
+function shellQuote(value: string): string {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
+
+function workspaceArgument(db: Db, workspaceId?: number): string {
+  const root = workspacePath(db, workspaceId);
+  return root ? ` --workspace ${shellQuote(root)}` : '';
+}
+
+function staleRemediation(db: Db, workspaceId?: number): string {
+  const workspace = workspaceArgument(db, workspaceId);
+  return [
+    `service-flow index${workspace} --force`,
+    `service-flow link${workspace} --force`,
+  ].join('\n');
+}
+
+function invalidFactRemediation(db: Db, workspaceId?: number): string {
+  return `service-flow doctor${workspaceArgument(
+    db, workspaceId,
+  )} --strict --detail`;
+}
+
+function repositoryCount(db: Db, workspaceId?: number): number {
+  return count(db, `SELECT COUNT(*) count FROM repositories
+    WHERE (? IS NULL OR workspace_id=?)`, workspaceId, workspaceId);
+}
+
 export function assertWorkspaceLinkable(
   db: Db,
   workspaceId: number,

package/src/db/migrations.ts

@@ -1,6 +1,6 @@
 import type { Db } from './connection.js';
 import { schemaIndexesSql, schemaTablesSql } from './schema.js';
-export const CURRENT_SCHEMA_VERSION = 13;
+export const CURRENT_SCHEMA_VERSION = 14;
 const columns: Record<string, Array<{ name: string; ddl: string }>> = {
   handler_methods: [
     { name: 'decorator_resolution_json', ddl: "ALTER TABLE handler_methods ADD COLUMN decorator_resolution_json TEXT NOT NULL DEFAULT '{}'" },
@@ -20,6 +20,7 @@ const columns: Record<string, Array<{ name: string; ddl: string }>> = {
     { name: 'graph_stale_at', ddl: 'ALTER TABLE repositories ADD COLUMN graph_stale_at TEXT' },
     { name: 'fact_analyzer_version', ddl: "ALTER TABLE repositories ADD COLUMN fact_analyzer_version TEXT DEFAULT 'legacy'" },
     { name: 'package_public_surface_json', ddl: 'ALTER TABLE repositories ADD COLUMN package_public_surface_json TEXT' },
+    { name: 'environment_declarations_json', ddl: `ALTER TABLE repositories ADD COLUMN environment_declarations_json TEXT DEFAULT '{"schema":"service-flow/environment-declarations@1","allowedKeys":["SHARD_CODE"],"status":"not_applicable","reason":null,"recordCap":32,"total":0,"shown":0,"omitted":0,"declarations":[]}'` },
   ],
   graph_edges: [
     { name: 'status', ddl: "ALTER TABLE graph_edges ADD COLUMN status TEXT NOT NULL DEFAULT 'unresolved'" },
@@ -60,6 +61,8 @@ const columns: Record<string, Array<{ name: string; ddl: string }>> = {
     { name: 'external_target_dynamic', ddl: 'ALTER TABLE outbound_calls ADD COLUMN external_target_dynamic INTEGER NOT NULL DEFAULT 0' },
     { name: 'call_site_start_offset', ddl: 'ALTER TABLE outbound_calls ADD COLUMN call_site_start_offset INTEGER' },
     { name: 'call_site_end_offset', ddl: 'ALTER TABLE outbound_calls ADD COLUMN call_site_end_offset INTEGER' },
+    { name: 'event_skeleton_signature', ddl: 'ALTER TABLE outbound_calls ADD COLUMN event_skeleton_signature TEXT' },
+    { name: 'event_skeleton_json', ddl: 'ALTER TABLE outbound_calls ADD COLUMN event_skeleton_json TEXT' },
   ],
   symbol_calls: [
     { name: 'call_site_start_offset', ddl: 'ALTER TABLE symbol_calls ADD COLUMN call_site_start_offset INTEGER' },
@@ -104,6 +107,16 @@ function markFactProvenanceMigrationStale(db: Db, priorVersion: number): void {
       graph_stale_at=COALESCE(graph_stale_at,datetime('now'))
     WHERE index_status='indexed' OR last_indexed_at IS NOT NULL`).run();
 }
+function markEventSurfaceMigrationStale(db: Db, priorVersion: number): void {
+  if (priorVersion >= 14) return;
+  db.prepare(
+    'UPDATE repositories SET environment_declarations_json=NULL',
+  ).run();
+  db.prepare(`UPDATE repositories
+    SET graph_stale_reason='schema_v14_event_surface_requires_reindex',
+      graph_stale_at=COALESCE(graph_stale_at,datetime('now'))
+    WHERE index_status='indexed' OR last_indexed_at IS NOT NULL`).run();
+}
 export function migrate(db: Db): void {
   db.transaction(() => {
     const version = userVersion(db);
@@ -114,6 +127,7 @@ export function migrate(db: Db): void {
     normalizeLegacyStatus(db, version);
     markCallSiteMigrationStale(db, version);
     markFactProvenanceMigrationStale(db, version);
+    markEventSurfaceMigrationStale(db, version);
     const violations = db.pragma('foreign_key_check');
     if (violations.length > 0) throw new Error('SQLite foreign_key_check failed during migration');
     db.pragma(`user_version = ${CURRENT_SCHEMA_VERSION}`);

package/src/db/package-target-invalidation.ts

@@ -10,6 +10,13 @@ interface PackageCallRow {
   evidence: Record<string, unknown>;
 }
 
+interface PackageEventCallRow {
+  id: number;
+  repoId: number;
+  unresolvedReason?: string | null;
+  evidence: Record<string, unknown>;
+}
+
 export interface PackageInvalidationBatch {
   publishingRepoIds: ReadonlySet<number>;
   affectedCallerRepoIds: Set<number>;
@@ -44,6 +51,14 @@ function packageName(evidence: Record<string, unknown>): string | undefined {
     ?.requestedPackageName ?? undefined;
 }
 
+function eventPackageName(
+  evidence: Record<string, unknown>,
+): string | undefined {
+  return parsePackageImportReference(
+    evidence.eventNameConstantImportBinding,
+  )?.requestedPackageName ?? undefined;
+}
+
 function packageCallEvidenceValid(
   evidence: Record<string, unknown>,
 ): boolean {
@@ -94,6 +109,68 @@ function pendingEvidence(evidence: Record<string, unknown>): string {
   });
 }
 
+function currentEventCalls(
+  db: Db,
+  workspaceId: number,
+  targetRepoId: number,
+): PackageEventCallRow[] {
+  const rows = db.prepare(`SELECT c.id,c.repo_id repoId,
+    c.unresolved_reason unresolvedReason,c.evidence_json evidenceJson
+    FROM outbound_calls c JOIN repositories r ON r.id=c.repo_id
+    WHERE r.workspace_id=? AND r.id<>? AND r.fact_analyzer_version=?
+      AND json_extract(c.evidence_json,
+        '$.eventNameConstantImportBinding.moduleKind')='package'
+    ORDER BY c.id`).all(workspaceId, targetRepoId, ANALYZER_VERSION);
+  return rows.flatMap((row) => {
+    const evidence = parsedEvidence(row.evidenceJson);
+    return evidence && eventPackageName(evidence)
+      && typeof row.id === 'number' && typeof row.repoId === 'number'
+      ? [{
+          id: row.id, repoId: row.repoId, evidence,
+          unresolvedReason: typeof row.unresolvedReason === 'string'
+            ? row.unresolvedReason : null,
+        }] : [];
+  });
+}
+
+function pendingEventEvidence(
+  evidence: Record<string, unknown>,
+): string {
+  const parser = { ...evidence };
+  delete parser.eventNameConstant;
+  delete parser.eventNamePackageConstantResolution;
+  parser.eventNameUnresolvedReason = 'event_name_constant_resolution_pending';
+  parser.eventNameStatus = 'dynamic';
+  parser.eventNameSourceKind = 'dynamic_expression';
+  parser.eventNamePlaceholderKeys = [];
+  return JSON.stringify(parser);
+}
+
+function resetPackageEventCalls(
+  db: Db,
+  workspaceId: number,
+  targetRepoId: number,
+  names: ReadonlySet<string>,
+  batch: PackageInvalidationBatch,
+): boolean {
+  const update = db.prepare(`UPDATE outbound_calls SET event_name_expr=?,
+    unresolved_reason=?,evidence_json=? WHERE id=?`);
+  let matched = false;
+  for (const call of currentEventCalls(db, workspaceId, targetRepoId)) {
+    if (!names.has(eventPackageName(call.evidence) ?? '')) continue;
+    const source = call.evidence.eventNameConstantSourceExpression;
+    if (typeof source !== 'string' || source.length === 0)
+      throw new Error('invalid_current_package_event_constant_evidence');
+    update.run(
+      source, 'event_name_constant_resolution_pending',
+      pendingEventEvidence(call.evidence), call.id,
+    );
+    batch.affectedCallerRepoIds.add(call.repoId);
+    matched = true;
+  }
+  return matched;
+}
+
 function targetWorkspace(
   db: Db,
   repoId: number,
@@ -142,6 +219,9 @@ export function invalidatePackageTargetFacts(
     batch.affectedCallerRepoIds.add(call.repoId);
     matched = true;
   }
+  matched = resetPackageEventCalls(
+    db, target.workspaceId, targetRepoId, names, batch,
+  ) || matched;
   if (matched || packageIdentityChanged(
     target.packageName, newPackageName,
   )) batch.affectedWorkspaceIds.add(target.workspaceId);

package/src/db/repositories.ts

@@ -7,6 +7,7 @@ import type {
   HandlerRegistrationFact,
   ServiceBindingFact,
   ExecutableSymbolFact,
+  GeneratedConstantFact,
 } from '../types.js';
 import {
   selectCallOwner,
@@ -16,6 +17,9 @@ import {
   PreparedRepositorySnapshotError,
   type PreparedSnapshotFailureCode,
 } from './index-publication-failure.js';
+import {
+  emptyEnvironmentDeclarations,
+} from '../parsers/environment-declarations.js';
 export interface RepoRow {
   id: number;
   name: string;
@@ -92,8 +96,8 @@ export function upsertRepository(
   db.prepare(
     `INSERT INTO repositories(workspace_id,name,absolute_path,relative_path,
       package_name,package_version,dependencies_json,
-      package_public_surface_json,kind,is_git_repo)
-    VALUES(?,?,?,?,?,?,?,?,?,?)
+      package_public_surface_json,environment_declarations_json,kind,is_git_repo)
+    VALUES(?,?,?,?,?,?,?,?,?,?,?)
     ON CONFLICT(workspace_id,absolute_path) DO UPDATE SET
       name=excluded.name,relative_path=excluded.relative_path,
       package_name=excluded.package_name,
@@ -108,6 +112,7 @@ export function upsertRepository(
     r.packageVersion,
     JSON.stringify(r.dependencies ?? {}),
     initialPackagePublicSurface(r.packageName),
+    JSON.stringify(emptyEnvironmentDeclarations()),
     r.kind ?? 'unknown',
     r.isGitRepo ? 1 : 0,
   );
@@ -152,6 +157,7 @@ export function clearRepoFacts(db: Db, repoId: number): void {
     'symbol_calls',
     'handler_registrations',
     'service_bindings',
+    'generated_constants',
     'symbols',
     'diagnostics',
     'files',
@@ -159,6 +165,26 @@ export function clearRepoFacts(db: Db, repoId: number): void {
     db.prepare(`DELETE FROM ${t} WHERE repo_id=?`).run(repoId);
   db.prepare('DELETE FROM search_index WHERE repo=?').run(String(repoId));
 }
+export function insertGeneratedConstants(
+  db: Db,
+  repoId: number,
+  rows: GeneratedConstantFact[],
+): void {
+  const stmt = db.prepare(`INSERT INTO generated_constants(
+    repo_id,source_file,source_line,name,container_name,member_name,value,
+    constant_kind,exported,stable,resolution_status,unresolved_reason,
+    declaration_start_offset,declaration_end_offset,
+    value_start_offset,value_end_offset
+  ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`);
+  for (const row of rows) stmt.run(
+    repoId, row.sourceFile, row.sourceLine, row.name,
+    row.containerName ?? null, row.memberName ?? null, row.value ?? null,
+    row.constantKind, row.exported ? 1 : 0, row.stable ? 1 : 0,
+    row.resolutionStatus, row.unresolvedReason ?? null,
+    row.declarationStartOffset, row.declarationEndOffset,
+    row.valueStartOffset, row.valueEndOffset,
+  );
+}
 export function insertRequires(
   db: Db,
   repoId: number,

package/src/db/schema-structure.ts

@@ -12,7 +12,8 @@ const requiredColumns = {
   repositories: [
     'id', 'workspace_id', 'name', 'absolute_path', 'relative_path',
     'package_name', 'package_version', 'dependencies_json',
-    'package_public_surface_json', 'kind', 'is_git_repo', 'last_indexed_at',
+    'package_public_surface_json', 'environment_declarations_json',
+    'kind', 'is_git_repo', 'last_indexed_at',
     'index_status', 'error_count', 'fingerprint', 'fact_generation',
     'graph_generation', 'graph_stale_reason', 'graph_stale_at',
     'fact_analyzer_version',
@@ -66,6 +67,7 @@ const requiredColumns = {
   outbound_calls: [
     'id', 'repo_id', 'source_symbol_id', 'service_binding_id', 'call_type',
     'method', 'operation_path_expr', 'query_entity', 'event_name_expr',
+    'event_skeleton_signature', 'event_skeleton_json',
     'payload_summary', 'source_file', 'source_line',
     'call_site_start_offset', 'call_site_end_offset', 'evidence_json',
     'confidence', 'unresolved_reason', 'local_service_name',
@@ -79,6 +81,13 @@ const requiredColumns = {
     'call_site_end_offset', 'call_role', 'status', 'evidence_json',
     'confidence', 'unresolved_reason',
   ],
+  generated_constants: [
+    'id', 'repo_id', 'source_file', 'source_line', 'name',
+    'container_name', 'member_name', 'value', 'constant_kind', 'exported',
+    'stable', 'resolution_status', 'unresolved_reason',
+    'declaration_start_offset', 'declaration_end_offset',
+    'value_start_offset', 'value_end_offset',
+  ],
   graph_edges: [
     'id', 'workspace_id', 'edge_type', 'status', 'from_kind', 'from_id',
     'to_kind', 'to_id', 'confidence', 'evidence_json', 'is_dynamic',
@@ -167,6 +176,33 @@ function bindingIndexInvalid(
     && metadata?.unique === unique && metadata.partial === partial ? 0 : 1;
 }
 
+function tableIndexInvalid(
+  db: Db,
+  table: string,
+  name: string,
+  columns: readonly string[],
+  unique: number,
+): number {
+  const metadata = db.prepare(`PRAGMA index_list(${table})`)
+    .all().find((item) => item.name === name);
+  return metadata?.unique === unique
+    && indexColumns(db, name).join('\0') === columns.join('\0') ? 0 : 1;
+}
+
+function eventSurfaceIndexesInvalid(db: Db): number {
+  return tableIndexInvalid(
+    db, 'outbound_calls', 'idx_outbound_event_skeleton',
+    ['event_skeleton_signature', 'call_type', 'repo_id'], 0,
+  ) + tableIndexInvalid(
+    db, 'generated_constants', 'idx_generated_constant_name',
+    ['repo_id', 'source_file', 'name'], 0,
+  ) + tableIndexInvalid(
+    db, 'generated_constants', 'uq_generated_constant_site',
+    ['repo_id', 'source_file', 'name', 'declaration_start_offset',
+      'declaration_end_offset'], 1,
+  );
+}
+
 function exactBindingIndexInvalid(db: Db): number {
   const row = db.prepare(`SELECT sql FROM sqlite_master
     WHERE type='index' AND name='uq_service_binding_exact_site'`).get();
@@ -197,5 +233,9 @@ export function invalidSchemaStructureCategories(
       exactBindingIndexInvalid(db)
         + bindingIndexInvalid(db, 'idx_service_binding_site', 0, 0),
     ),
+    ...category(
+      'schema_event_surface_index_invalid',
+      eventSurfaceIndexesInvalid(db),
+    ),
   ];
 }

package/src/db/schema.ts

@@ -1,6 +1,6 @@
 export const schemaTablesSql = `
 CREATE TABLE IF NOT EXISTS workspaces (id INTEGER PRIMARY KEY, root_path TEXT UNIQUE NOT NULL, db_path TEXT NOT NULL, created_at TEXT NOT NULL, updated_at TEXT NOT NULL);
-CREATE TABLE IF NOT EXISTS repositories (id INTEGER PRIMARY KEY, workspace_id INTEGER NOT NULL, name TEXT NOT NULL, absolute_path TEXT NOT NULL, relative_path TEXT NOT NULL, package_name TEXT, package_version TEXT, dependencies_json TEXT DEFAULT '{}', package_public_surface_json TEXT, kind TEXT NOT NULL, is_git_repo INTEGER NOT NULL, last_indexed_at TEXT, index_status TEXT DEFAULT 'pending', error_count INTEGER DEFAULT 0, fingerprint TEXT, fact_generation INTEGER NOT NULL DEFAULT 0, graph_generation INTEGER NOT NULL DEFAULT 0, graph_stale_reason TEXT, graph_stale_at TEXT, fact_analyzer_version TEXT, UNIQUE(workspace_id, absolute_path), FOREIGN KEY(workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE);
+CREATE TABLE IF NOT EXISTS repositories (id INTEGER PRIMARY KEY, workspace_id INTEGER NOT NULL, name TEXT NOT NULL, absolute_path TEXT NOT NULL, relative_path TEXT NOT NULL, package_name TEXT, package_version TEXT, dependencies_json TEXT DEFAULT '{}', package_public_surface_json TEXT, environment_declarations_json TEXT DEFAULT '{"schema":"service-flow/environment-declarations@1","allowedKeys":["SHARD_CODE"],"status":"not_applicable","reason":null,"recordCap":32,"total":0,"shown":0,"omitted":0,"declarations":[]}', kind TEXT NOT NULL, is_git_repo INTEGER NOT NULL, last_indexed_at TEXT, index_status TEXT DEFAULT 'pending', error_count INTEGER DEFAULT 0, fingerprint TEXT, fact_generation INTEGER NOT NULL DEFAULT 0, graph_generation INTEGER NOT NULL DEFAULT 0, graph_stale_reason TEXT, graph_stale_at TEXT, fact_analyzer_version TEXT, UNIQUE(workspace_id, absolute_path), FOREIGN KEY(workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS files (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, relative_path TEXT NOT NULL, extension TEXT NOT NULL, sha256 TEXT NOT NULL, size_bytes INTEGER NOT NULL, last_indexed_at TEXT NOT NULL, UNIQUE(repo_id, relative_path), FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS cds_requires (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, alias TEXT NOT NULL, kind TEXT, model TEXT, destination TEXT, service_path TEXT, request_timeout INTEGER, raw_json TEXT NOT NULL, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS cds_services (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, namespace TEXT, service_name TEXT NOT NULL, qualified_name TEXT NOT NULL, service_path TEXT NOT NULL, is_extend INTEGER NOT NULL, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, extension_local_ref TEXT, extension_imported_symbol TEXT, extension_local_alias TEXT, extension_module_specifier TEXT, extension_import_kind TEXT, extension_base_service_id INTEGER, extension_base_status TEXT, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(extension_base_service_id) REFERENCES cds_services(id) ON DELETE SET NULL);
@@ -10,7 +10,8 @@ CREATE TABLE IF NOT EXISTS handler_classes (id INTEGER PRIMARY KEY, repo_id INTE
 CREATE TABLE IF NOT EXISTS handler_methods (id INTEGER PRIMARY KEY, handler_class_id INTEGER NOT NULL, method_name TEXT NOT NULL, decorator_kind TEXT NOT NULL, decorator_value TEXT, decorator_raw_expression TEXT NOT NULL, decorator_resolution_json TEXT NOT NULL DEFAULT '{}', source_file TEXT NOT NULL, source_line INTEGER NOT NULL, FOREIGN KEY(handler_class_id) REFERENCES handler_classes(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS handler_registrations (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, handler_class_id INTEGER, class_name TEXT, import_source TEXT, registration_file TEXT NOT NULL, registration_line INTEGER NOT NULL, registration_kind TEXT NOT NULL, confidence REAL NOT NULL, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(handler_class_id) REFERENCES handler_classes(id) ON DELETE SET NULL);
 CREATE TABLE IF NOT EXISTS service_bindings (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, symbol_id INTEGER, variable_name TEXT NOT NULL, alias TEXT, alias_expr TEXT, destination_expr TEXT, service_path_expr TEXT, is_dynamic INTEGER NOT NULL, placeholders_json TEXT NOT NULL, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, binding_site_start_offset INTEGER, binding_site_end_offset INTEGER, owner_resolution TEXT NOT NULL DEFAULT 'legacy_unknown' CHECK(owner_resolution IN ('owned_exact','ownerless_file_scope','legacy_unknown')), helper_chain_json TEXT, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(symbol_id) REFERENCES symbols(id) ON DELETE SET NULL);
-CREATE TABLE IF NOT EXISTS outbound_calls (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, source_symbol_id INTEGER, call_type TEXT NOT NULL, service_binding_id INTEGER, method TEXT, operation_path_expr TEXT, query_entity TEXT, event_name_expr TEXT, payload_summary TEXT, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, call_site_start_offset INTEGER, call_site_end_offset INTEGER, confidence REAL NOT NULL, unresolved_reason TEXT, local_service_name TEXT, local_service_lookup TEXT, alias_chain_json TEXT, evidence_json TEXT, external_target_kind TEXT, external_target_id TEXT, external_target_label TEXT, external_target_dynamic INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(source_symbol_id) REFERENCES symbols(id) ON DELETE SET NULL, FOREIGN KEY(service_binding_id) REFERENCES service_bindings(id) ON DELETE SET NULL);
+CREATE TABLE IF NOT EXISTS outbound_calls (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, source_symbol_id INTEGER, call_type TEXT NOT NULL, service_binding_id INTEGER, method TEXT, operation_path_expr TEXT, query_entity TEXT, event_name_expr TEXT, event_skeleton_signature TEXT, event_skeleton_json TEXT, payload_summary TEXT, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, call_site_start_offset INTEGER, call_site_end_offset INTEGER, confidence REAL NOT NULL, unresolved_reason TEXT, local_service_name TEXT, local_service_lookup TEXT, alias_chain_json TEXT, evidence_json TEXT, external_target_kind TEXT, external_target_id TEXT, external_target_label TEXT, external_target_dynamic INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(source_symbol_id) REFERENCES symbols(id) ON DELETE SET NULL, FOREIGN KEY(service_binding_id) REFERENCES service_bindings(id) ON DELETE SET NULL);
+CREATE TABLE IF NOT EXISTS generated_constants (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, name TEXT NOT NULL, container_name TEXT, member_name TEXT, value TEXT, constant_kind TEXT NOT NULL, exported INTEGER NOT NULL, stable INTEGER NOT NULL, resolution_status TEXT NOT NULL CHECK(resolution_status IN ('resolved','refused')), unresolved_reason TEXT, declaration_start_offset INTEGER NOT NULL, declaration_end_offset INTEGER NOT NULL, value_start_offset INTEGER NOT NULL, value_end_offset INTEGER NOT NULL, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS symbol_calls (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, caller_symbol_id INTEGER NOT NULL, callee_symbol_id INTEGER, callee_expression TEXT NOT NULL, import_source TEXT, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, call_site_start_offset INTEGER, call_site_end_offset INTEGER, call_role TEXT NOT NULL DEFAULT 'legacy_unknown', status TEXT NOT NULL, confidence REAL NOT NULL, evidence_json TEXT NOT NULL, unresolved_reason TEXT, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(caller_symbol_id) REFERENCES symbols(id) ON DELETE CASCADE, FOREIGN KEY(callee_symbol_id) REFERENCES symbols(id) ON DELETE SET NULL);
 CREATE TABLE IF NOT EXISTS graph_edges (id INTEGER PRIMARY KEY, workspace_id INTEGER NOT NULL, edge_type TEXT NOT NULL, status TEXT NOT NULL DEFAULT 'unresolved', from_kind TEXT NOT NULL, from_id TEXT NOT NULL, to_kind TEXT NOT NULL, to_id TEXT NOT NULL, confidence REAL NOT NULL, evidence_json TEXT NOT NULL, is_dynamic INTEGER NOT NULL, unresolved_reason TEXT, generation INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS index_runs (id INTEGER PRIMARY KEY, workspace_id INTEGER NOT NULL, started_at TEXT NOT NULL, finished_at TEXT, status TEXT NOT NULL, repo_count INTEGER NOT NULL, file_count INTEGER NOT NULL, diagnostic_count INTEGER NOT NULL, error_message TEXT, owner_pid INTEGER, FOREIGN KEY(workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE);
@@ -24,6 +25,9 @@ CREATE INDEX IF NOT EXISTS idx_extension_import ON cds_services(extension_module
 CREATE INDEX IF NOT EXISTS idx_operation_name ON cds_operations(operation_name, operation_path);
 CREATE INDEX IF NOT EXISTS idx_operation_base ON cds_operations(base_operation_id);
 CREATE INDEX IF NOT EXISTS idx_calls_repo ON outbound_calls(repo_id, call_type);
+CREATE INDEX IF NOT EXISTS idx_outbound_event_skeleton ON outbound_calls(event_skeleton_signature,call_type,repo_id);
+CREATE INDEX IF NOT EXISTS idx_generated_constant_name ON generated_constants(repo_id,source_file,name);
+CREATE UNIQUE INDEX IF NOT EXISTS uq_generated_constant_site ON generated_constants(repo_id,source_file,name,declaration_start_offset,declaration_end_offset);
 CREATE INDEX IF NOT EXISTS idx_symbol_calls_caller ON symbol_calls(repo_id, caller_symbol_id);
 CREATE INDEX IF NOT EXISTS idx_outbound_call_site ON outbound_calls(repo_id, source_file, call_site_start_offset, call_site_end_offset, call_type);
 CREATE INDEX IF NOT EXISTS idx_symbol_call_site_role ON symbol_calls(repo_id, source_file, call_site_start_offset, call_site_end_offset, call_role);