@saptools/service-flow 0.1.70 → 0.1.73

package/src/cli.ts

@@ -4,6 +4,7 @@ import {
   createWorkspaceConfig,
   loadWorkspaceConfig,
   saveWorkspaceConfig,
+  type WorkspaceConfig,
 } from './config/workspace-config.js';
 import { openDatabase, openReadOnlyDatabase, type Db } from './db/connection.js';
 import {
@@ -20,6 +21,7 @@ import { classifyRepository } from './discovery/classify-repository.js';
 import { indexWorkspace } from './indexer/workspace-indexer.js';
 import { linkWorkspace } from './linker/cross-repo-linker.js';
 import { doctorDiagnostics, linkUpgradeWarnings } from './cli/doctor.js';
+import { factLifecycleDiagnostic } from './db/fact-lifecycle.js';
 import { trace } from './trace/trace-engine.js';
 import { compactTrace } from './trace/compact-trace.js';
 import {
@@ -33,6 +35,9 @@ import { renderDoctorDiagnostics } from './output/doctor-output.js';
 import { renderMermaid } from './output/mermaid-output.js';
 import { createStdoutWriter } from './output/stdout-policy.js';
 import { renderCompactJson } from './output/compact-json-output.js';
+import {
+  projectRepositoryInspection,
+} from './output/repository-inspection.js';
 import { VERSION } from './version.js';
 import type {
   DynamicMode,
@@ -122,6 +127,7 @@ async function withWorkspace<T>(
     db: ReturnType<typeof openDatabase>,
     workspaceId: number,
     rootPath: string,
+    config: WorkspaceConfig,
   ) => Promise<T> | T,
 ): Promise<T> {
   const config = await loadWorkspaceConfig(workspace);
@@ -130,7 +136,7 @@ async function withWorkspace<T>(
     const row = getWorkspace(db, config.rootPath);
     const workspaceId =
       row?.id ?? upsertWorkspace(db, config.rootPath, config.dbPath);
-    return await fn(db, workspaceId, config.rootPath);
+    return await fn(db, workspaceId, config.rootPath, config);
   } finally {
     db.close();
   }
@@ -275,10 +281,11 @@ function registerIndexCommand(program: Command): void {
     .option('--force')
     .action(
       (opts: { workspace?: string; repo?: string; force?: boolean }) =>
-        void withWorkspace(opts.workspace, async (db, workspaceId) => {
+        void withWorkspace(opts.workspace, async (db, workspaceId, _root, config) => {
           const r = await indexWorkspace(db, workspaceId, {
             repo: opts.repo,
             force: Boolean(opts.force),
+            eventEnvironmentKeys: config.eventEnvironmentKeys,
           });
           const outcome = indexCommandOutcome(r);
           writeStdout(outcome.stdout);
@@ -298,7 +305,7 @@ function registerLinkCommand(program: Command): void {
           const r = linkWorkspace(db, workspaceId);
           const upgradeWarnings = linkUpgradeWarnings(db, workspaceId);
           writeStdout(
-            `${upgradeWarnings.length ? `Warnings: ${upgradeWarnings.map((item) => String(item.code)).join(', ')}. Run service-flow doctor --strict for remediation.\n` : ''}Linked ${r.edgeCount} edges: ${r.remoteResolvedCount} remote operation calls resolved, ${r.localResolvedCount} local operation calls resolved, ${r.unresolvedCount} unresolved operation calls, ${r.ambiguousCount} ambiguous operation calls, ${r.dynamicCount} dynamic operation calls, ${r.terminalCount} terminal call edges, ${r.dependencyResolvedCount} dependency resolved, ${r.dependencyAmbiguousCount} dependency ambiguous, ${r.implementationResolvedCount} implementation resolved, ${r.implementationAmbiguousCount} implementation ambiguous, ${r.implementationUnresolvedCount} implementation unresolved, ${r.subscriptionHandlerResolvedCount} subscription handlers resolved, ${r.subscriptionHandlerAmbiguousCount} subscription handlers ambiguous, ${r.subscriptionHandlerUnresolvedCount} subscription handlers unresolved, ${r.subscriptionHandlerMissingAssociationCount} subscription handler associations missing\n`,
+            `${upgradeWarnings.length ? `Warnings: ${upgradeWarnings.map((item) => String(item.code)).join(', ')}. Run service-flow doctor --strict for remediation.\n` : ''}Linked ${r.edgeCount} edges: ${r.remoteResolvedCount} remote operation calls resolved, ${r.localResolvedCount} local operation calls resolved, ${r.unresolvedCount} unresolved operation calls, ${r.ambiguousCount} ambiguous operation calls, ${r.dynamicCount} dynamic operation calls, ${r.terminalCount} terminal call edges, ${r.dependencyResolvedCount} dependency resolved, ${r.dependencyAmbiguousCount} dependency ambiguous, ${r.implementationResolvedCount} implementation resolved, ${r.implementationAmbiguousCount} implementation ambiguous, ${r.implementationUnresolvedCount} implementation unresolved, ${r.subscriptionHandlerResolvedCount} subscription handlers resolved, ${r.subscriptionHandlerAmbiguousCount} subscription handlers ambiguous, ${r.subscriptionHandlerUnresolvedCount} subscription handlers unresolved, ${r.subscriptionHandlerMissingAssociationCount} subscription handler associations missing, ${r.eventShapeCandidateCount} event shape candidates, ${r.eventShapeCandidateOmittedCount} event shape candidates omitted by the link cap\n`,
           );
         }).catch(fail),
     );
@@ -329,22 +336,23 @@ function registerTraceCommand(program: Command): void {
 function listRepositoriesCommand(
   opts: { workspace?: string },
 ): Promise<void> {
-  return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) =>
-    writeStdout(
-      renderJson(
-        listRepositories(db, workspaceId).map((repo) => ({
-          name: repo.name,
-          kind: repo.kind,
-          packageName: repo.package_name,
-        })),
-      ),
+  return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    if (writeLifecycleBlock(db, workspaceId)) return;
+    writeStdout(renderJson(
+      listRepositories(db, workspaceId).map((repo) => ({
+        name: repo.name,
+        kind: repo.kind,
+        packageName: repo.package_name,
+      })),
     ));
+  });
 }
 
 function listServicesCommand(
   opts: { workspace?: string; repo?: string },
 ): Promise<void> {
   return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    if (writeLifecycleBlock(db, workspaceId)) return;
     const selection = opts.repo
       ? selectRepository(db, opts.repo, workspaceId) : {};
     if (selection.diagnostic) {
@@ -363,6 +371,7 @@ function listOperationsCommand(
   opts: { workspace?: string; repo?: string; service?: string },
 ): Promise<void> {
   return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    if (writeLifecycleBlock(db, workspaceId)) return;
     const selection = opts.repo
       ? selectRepository(db, opts.repo, workspaceId) : {};
     if (selection.diagnostic) {
@@ -383,6 +392,7 @@ function listCallsCommand(
   opts: { workspace?: string; repo?: string; operation?: string },
 ): Promise<void> {
   return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    if (writeLifecycleBlock(db, workspaceId)) return;
     const selection = opts.repo
       ? selectRepository(db, opts.repo, workspaceId) : {};
     if (selection.diagnostic) {
@@ -460,9 +470,12 @@ function inspectRepositoryCommand(
   opts: { workspace?: string },
 ): Promise<void> {
   return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    if (writeLifecycleBlock(db, workspaceId)) return;
     const selection = selectRepository(db, name, workspaceId);
     writeStdout(renderJson(
-      selection.repo ?? selection.diagnostic ?? { error: 'repo not found' },
+      selection.repo
+        ? projectRepositoryInspection(selection.repo)
+        : selection.diagnostic ?? { error: 'repo not found' },
     ));
   });
 }
@@ -472,6 +485,7 @@ function inspectOperationCommand(
   opts: { workspace?: string },
 ): Promise<void> {
   return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    if (writeLifecycleBlock(db, workspaceId)) return;
     const rows = db.prepare(
       'SELECT o.* FROM cds_operations o JOIN cds_services s ON s.id=o.service_id JOIN repositories r ON r.id=s.repo_id WHERE r.workspace_id=? AND (o.operation_name=? OR o.operation_path=?)',
     ).all(workspaceId, selector, selector);
@@ -479,6 +493,14 @@ function inspectOperationCommand(
   });
 }
 
+function writeLifecycleBlock(db: Db, workspaceId: number): boolean {
+  const diagnostic = factLifecycleDiagnostic(db, workspaceId);
+  if (!diagnostic) return false;
+  writeStdout(renderJson([diagnostic]));
+  process.exitCode = 1;
+  return true;
+}
+
 function registerInspectCommands(program: Command): void {
   const inspect = program.command('inspect');
   inspect

package/src/config/workspace-config.ts

@@ -7,10 +7,24 @@ import {
   DEFAULT_DB_FILE,
   DEFAULT_IGNORES,
 } from './defaults.js';
+import {
+  DEFAULT_EVENT_ENVIRONMENT_KEYS,
+  EVENT_ENVIRONMENT_KEY_CAP,
+  normalizeEventEnvironmentKeys,
+  validEventEnvironmentKey,
+} from '../parsers/environment-declarations.js';
+const environmentKeys = z.array(
+  z.string().refine(validEventEnvironmentKey),
+).min(1).max(EVENT_ENVIRONMENT_KEY_CAP).transform(
+  normalizeEventEnvironmentKeys,
+);
 const schema = z.object({
   rootPath: z.string(),
   dbPath: z.string(),
   ignore: z.array(z.string()),
+  eventEnvironmentKeys: environmentKeys.default(
+    [...DEFAULT_EVENT_ENVIRONMENT_KEYS],
+  ),
   createdAt: z.string(),
   updatedAt: z.string(),
 });
@@ -55,6 +69,7 @@ export function createWorkspaceConfig(
     rootPath: root,
     dbPath: path.resolve(dbPath ?? defaultDbPath(root)),
     ignore,
+    eventEnvironmentKeys: [...DEFAULT_EVENT_ENVIRONMENT_KEYS],
     createdAt: now,
     updatedAt: now,
   };

package/src/db/call-fact-repository.ts

@@ -400,11 +400,12 @@ export function insertCalls(
 function outboundCallInsertStatement(db: Db): Statement {
   return db.prepare(`INSERT INTO outbound_calls(
     repo_id,source_symbol_id,call_type,method,operation_path_expr,query_entity,
-    event_name_expr,payload_summary,source_file,source_line,call_site_start_offset,
+    event_name_expr,event_skeleton_signature,event_skeleton_json,
+    payload_summary,source_file,source_line,call_site_start_offset,
     call_site_end_offset,confidence,unresolved_reason,local_service_name,
     local_service_lookup,alias_chain_json,evidence_json,external_target_kind,
     external_target_id,external_target_label,external_target_dynamic,service_binding_id
-  ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`);
+  ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`);
 }
 
 function insertOutboundCall(
@@ -424,7 +425,9 @@ function insertOutboundCall(
   stmt.run(
     repoId, sourceSymbolId,
     call.callType, call.method, call.operationPathExpr, call.queryEntity,
-    call.eventNameExpr, call.payloadSummary, call.sourceFile, call.sourceLine,
+    call.eventNameExpr, call.eventSkeleton?.signature ?? null,
+    call.eventSkeleton ? JSON.stringify(call.eventSkeleton) : null,
+    call.payloadSummary, call.sourceFile, call.sourceLine,
     call.callSiteStartOffset, call.callSiteEndOffset, call.confidence,
     call.unresolvedReason,
     call.localServiceName, call.localServiceLookup,

package/src/db/current-fact-semantics.ts

@@ -10,9 +10,9 @@ import {
 import {
   invalidBindingFactCategories,
 } from './binding-fact-semantics.js';
-import {
-  invalidSymbolFactCategories,
-} from './symbol-call-semantics.js';
+import { invalidSymbolFactCategories } from './symbol-call-semantics.js';
+import { invalidEventFactCategories } from './event-fact-semantics.js';
+import { eventSiteCategories } from './event-site-semantics.js';
 
 export type PackageFactPhase = 'pre_package' | 'terminal';
 
@@ -258,31 +258,6 @@ function duplicateSymbolCallCategories(
   return category('symbol_call_site_duplicate', duplicate);
 }
 
-function eventNameCategories(
-  db: Db,
-  workspaceId?: number,
-): FactSemanticCategoryCount[] {
-  const invalid = count(db, `SELECT COUNT(*) count
-    FROM outbound_calls fact JOIN repositories r ON r.id=fact.repo_id
-    WHERE ${currentRepositoryPredicate()}
-      AND fact.call_type IN ('async_emit','async_subscribe')
-      AND (typeof(fact.event_name_expr)<>'text'
-        OR length(fact.event_name_expr)=0)`, workspaceId);
-  const duplicate = count(db, `SELECT COUNT(*) count FROM (
-    SELECT fact.repo_id,fact.source_file,fact.call_site_start_offset,
-      fact.call_site_end_offset,COUNT(*) duplicate_count
-    FROM outbound_calls fact JOIN repositories r ON r.id=fact.repo_id
-    WHERE ${currentRepositoryPredicate()}
-      AND fact.call_type='async_subscribe'
-    GROUP BY fact.repo_id,fact.source_file,fact.call_site_start_offset,
-      fact.call_site_end_offset HAVING COUNT(*)<>1
-  )`, workspaceId);
-  return [
-    ...category('event_name_invalid', invalid),
-    ...category('async_subscription_site_duplicate', duplicate),
-  ];
-}
-
 function outboundOwnerCount(db: Db, workspaceId?: number): number {
   return count(db, `WITH eligible AS (
     SELECT fact.id fact_id,s.id symbol_id,
@@ -685,7 +660,8 @@ export function invalidFactSemanticCategories(
     ...operationCategories(db, workspaceId),
     ...callSpanCategories(db, workspaceId),
     ...duplicateSymbolCallCategories(db, workspaceId),
-    ...eventNameCategories(db, workspaceId),
+    ...eventSiteCategories(db, workspaceId),
+    ...invalidEventFactCategories(db, workspaceId, phase),
     ...ownerCategories(db, workspaceId),
     ...bindingCategories(db, workspaceId),
     ...invalidBindingFactCategories(db, workspaceId),