@saptools/service-flow 0.1.51 → 0.1.52

package/src/db/schema.ts

@@ -1,4 +1,4 @@
-export const schemaSql = `
+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 '{}', 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);
@@ -13,8 +13,11 @@ CREATE TABLE IF NOT EXISTS service_bindings (id INTEGER PRIMARY KEY, repo_id INT
 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, 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 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, 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, 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);
 CREATE TABLE IF NOT EXISTS diagnostics (id INTEGER PRIMARY KEY, repo_id INTEGER, file_id INTEGER, severity TEXT NOT NULL, code TEXT NOT NULL, message TEXT NOT NULL, source_file TEXT, source_line INTEGER, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(file_id) REFERENCES files(id) ON DELETE SET NULL);
+`;
+
+export const schemaIndexesSql = `
 CREATE INDEX IF NOT EXISTS idx_repo_name ON repositories(name);
 CREATE INDEX IF NOT EXISTS idx_service_path ON cds_services(service_path);
 CREATE INDEX IF NOT EXISTS idx_extension_import ON cds_services(extension_module_specifier, extension_imported_symbol, is_extend);
@@ -24,3 +27,5 @@ CREATE INDEX IF NOT EXISTS idx_calls_repo ON outbound_calls(repo_id, call_type);
 CREATE INDEX IF NOT EXISTS idx_symbol_calls_caller ON symbol_calls(repo_id, caller_symbol_id);
 CREATE VIRTUAL TABLE IF NOT EXISTS search_index USING fts5(kind, name, path, repo);
 `;
+
+export const schemaSql = `${schemaTablesSql}\n${schemaIndexesSql}`;

package/src/indexer/repository-indexer.ts

@@ -7,6 +7,7 @@ import {
   insertCalls,
   insertExecutableSymbols,
   insertHandler,
+  handlerMethodIsExecutable,
   insertRegistrations,
   insertSymbolCalls,
   insertRequires,
@@ -19,14 +20,20 @@ import { parseDecorators } from '../parsers/decorator-parser.js';
 import { parseHandlerRegistrations } from '../parsers/handler-registration-parser.js';
 import { parseOutboundCalls } from '../parsers/outbound-call-parser.js';
 import { parseExecutableSymbols } from '../parsers/symbol-parser.js';
-import { parsePackageJson } from '../parsers/package-json-parser.js';
+import {
+  loadPackageJsonSnapshot,
+} from '../parsers/package-json-parser.js';
 import { parseServiceBindings } from '../parsers/service-binding-parser.js';
-import { sha256File } from '../utils/hashing.js';
 import { normalizePath } from '../utils/path-utils.js';
 import { errorMessage } from '../utils/diagnostics.js';
 import { sha256Text } from '../utils/hashing.js';
 import { ANALYZER_VERSION } from '../version.js';
-import type { CdsServiceFact, HandlerClassFact, HandlerRegistrationFact, OutboundCallFact, ServiceBindingFact, ExecutableSymbolFact, SymbolCallFact } from '../types.js';
+import {
+  loadRepositorySourceContext,
+  type RepositorySourceContext,
+  type SourceContextInstrumentation,
+} from '../parsers/ts-project.js';
+import type { CdsServiceFact, HandlerClassFact, HandlerRegistrationFact, OutboundCallFact, PackageFacts, ServiceBindingFact, ExecutableSymbolFact, SymbolCallFact } from '../types.js';
 export interface IndexRepoResult {
   fileCount: number;
   diagnosticCount: number;
@@ -44,7 +51,7 @@ interface ParsedFacts {
 }
 export interface PreparedRepositoryIndex extends IndexRepoResult {
   repo: RepoRow;
-  packageFacts?: Awaited<ReturnType<typeof parsePackageJson>>;
+  packageFacts?: PackageFacts;
   fingerprint?: string;
   kind?: string;
   parsed?: ParsedFacts;
@@ -53,9 +60,10 @@ export async function indexRepository(
   db: Db,
   repo: RepoRow,
   force: boolean,
+  instrumentation?: SourceContextInstrumentation,
 ): Promise<IndexRepoResult> {
   try {
-    const prepared = await prepareRepositoryIndex(repo, force);
+    const prepared = await prepareRepositoryIndex(repo, force, instrumentation);
     if (!prepared.skipped) db.transaction(() => publishPreparedRepositoryIndex(db, prepared));
     return { fileCount: prepared.fileCount, diagnosticCount: prepared.diagnosticCount, skipped: prepared.skipped };
   } catch (error) {
@@ -63,19 +71,36 @@ export async function indexRepository(
     return { fileCount: 0, diagnosticCount: 1, skipped: false };
   }
 }
-export async function prepareRepositoryIndex(repo: RepoRow, force: boolean): Promise<PreparedRepositoryIndex> {
+export async function prepareRepositoryIndex(
+  repo: RepoRow,
+  force: boolean,
+  instrumentation?: SourceContextInstrumentation,
+): Promise<PreparedRepositoryIndex> {
   const sourceFiles = await findSourceFiles(repo.absolute_path);
-  const packageFacts = await parsePackageJson(repo.absolute_path);
-  const fingerprint = await repositoryFingerprint(repo.absolute_path, sourceFiles, packageFacts);
+  const packageSnapshot = await loadPackageJsonSnapshot(repo.absolute_path, {
+    strict: true,
+    allowMissing: repo.package_name === null,
+  });
+  const packageFacts = packageSnapshot.facts;
+  const sources = await loadRepositorySourceContext(
+    repo.absolute_path, sourceFiles, instrumentation,
+  );
+  const fingerprint = repositoryFingerprint(
+    sources, packageFacts, packageSnapshot.rawText,
+  );
   if (!force && repo.fingerprint === fingerprint) return { repo, fileCount: 0, diagnosticCount: 0, skipped: true };
+  const parsed = await parseAllSourceFacts(repo.absolute_path, sources);
   return {
     repo,
     packageFacts,
     fingerprint,
     kind: await classifyRepository(repo.absolute_path, packageFacts),
-    parsed: await parseAllSourceFacts(repo.absolute_path, sourceFiles),
+    parsed,
     fileCount: sourceFiles.length,
-    diagnosticCount: 0,
+    diagnosticCount: parsed.handlers.filter((handler) =>
+      handler.hasHandlerDecorator
+      && (handler.methods.length === 0
+        || handler.methods.some((method) => !handlerMethodIsExecutable(method)))).length,
     skipped: false,
   };
 }
@@ -104,21 +129,23 @@ export function recordIndexFailure(db: Db, repoId: number, error: unknown): void
   db.prepare("DELETE FROM diagnostics WHERE repo_id=? AND code IN ('index_failed_snapshot_preserved','source_read_failed')").run(repoId);
   db.prepare('INSERT INTO diagnostics(repo_id,severity,code,message) VALUES(?,?,?,?)').run(repoId, 'error', 'source_read_failed', `Index failed before publication; previous facts and fingerprint were preserved. ${message}`);
 }
-async function parseAllSourceFacts(root: string, files: string[]): Promise<ParsedFacts> {
+async function parseAllSourceFacts(
+  root: string,
+  sources: RepositorySourceContext,
+): Promise<ParsedFacts> {
   const facts: ParsedFacts = { services: [], handlers: [], registrations: [], bindings: [], calls: [], symbols: [], symbolCalls: [], fileRecords: [] };
-  for (const file of files) {
-    const abs = path.join(root, file);
-    const stat = await fs.stat(abs);
-    facts.fileRecords.push({ relativePath: normalizePath(file), extension: path.extname(file), sha256: await sha256File(abs), sizeBytes: stat.size });
-    if (file.endsWith('.cds')) facts.services.push(...(await parseCdsFile(root, file)));
+  for (const snapshot of sources.entries()) {
+    const file = snapshot.filePath;
+    facts.fileRecords.push({ relativePath: normalizePath(file), extension: path.extname(file), sha256: sha256Text(snapshot.text), sizeBytes: snapshot.sizeBytes });
+    if (file.endsWith('.cds')) facts.services.push(...(await parseCdsFile(root, file, sources)));
     if (/\.[jt]s$/.test(file)) {
-      facts.handlers.push(...(await parseDecorators(root, file)));
-      facts.registrations.push(...(await parseHandlerRegistrations(root, file)));
-      facts.bindings.push(...(await parseServiceBindings(root, file)));
-      const symbolFacts = await parseExecutableSymbols(root, file);
+      facts.handlers.push(...(await parseDecorators(root, file, sources)));
+      facts.registrations.push(...(await parseHandlerRegistrations(root, file, sources)));
+      facts.bindings.push(...(await parseServiceBindings(root, file, sources)));
+      const symbolFacts = await parseExecutableSymbols(root, file, sources);
       facts.symbols.push(...symbolFacts.symbols);
       facts.symbolCalls.push(...symbolFacts.calls);
-      facts.calls.push(...(await parseOutboundCalls(root, file)));
+      facts.calls.push(...(await parseOutboundCalls(root, file, sources)));
     }
   }
   return facts;
@@ -126,7 +153,7 @@ async function parseAllSourceFacts(root: string, files: string[]): Promise<Parse
 async function findSourceFiles(root: string): Promise<string[]> {
   const out: string[] = [];
   async function walk(dir: string, prefix = ''): Promise<void> {
-    const entries = await fs.readdir(dir, { withFileTypes: true }).catch(() => []);
+    const entries = await fs.readdir(dir, { withFileTypes: true });
     for (const e of entries) {
       const rel = prefix ? `${prefix}/${e.name}` : e.name;
       if (e.isDirectory()) {
@@ -142,8 +169,11 @@ function isDefaultTestFile(relativeFile: string): boolean {
   if (parts.some((part) => ['test', 'tests', '__tests__'].includes(part))) return true;
   return /\.(test|spec)\.[jt]s$/.test(parts.at(-1) ?? '');
 }
-async function repositoryFingerprint(root: string, files: string[], facts: Awaited<ReturnType<typeof parsePackageJson>>): Promise<string> {
-  const packageJson = await fs.readFile(path.join(root, 'package.json'), 'utf8').catch(() => '');
+function repositoryFingerprint(
+  sources: RepositorySourceContext,
+  facts: PackageFacts,
+  packageJsonText: string,
+): string {
   const normalizedFacts = {
     analyzerVersion: ANALYZER_VERSION,
     packageName: facts.packageName,
@@ -152,12 +182,10 @@ async function repositoryFingerprint(root: string, files: string[], facts: Await
     cdsRequires: [...facts.cdsRequires].sort((a, b) => a.alias.localeCompare(b.alias)),
     scripts: Object.fromEntries(Object.entries(facts.scripts).sort()),
     includeTests: false,
-    packageJsonHash: sha256Text(packageJson),
+    packageJsonHash: sha256Text(packageJsonText),
   };
   const entries: string[] = [`facts:${JSON.stringify(normalizedFacts)}`];
-  for (const file of files) {
-    const content = await fs.readFile(path.join(root, file), 'utf8');
-    entries.push(`${file}:${sha256Text(content)}`);
-  }
+  for (const snapshot of sources.entries())
+    entries.push(`${snapshot.filePath}:${sha256Text(snapshot.text)}`);
   return sha256Text(entries.join('\n'));
 }

package/src/indexer/workspace-indexer.ts

@@ -1,16 +1,94 @@
 import type { Db } from '../db/connection.js';
-import { listRepositories, repoByName } from '../db/repositories.js';
+import { listRepositories, reposByName } from '../db/repositories.js';
 import { errorMessage } from '../utils/diagnostics.js';
 import { prepareRepositoryIndex, publishPreparedRepositoryIndex, recordIndexFailure, type PreparedRepositoryIndex } from './repository-indexer.js';
 import { materializeCdsExtensionOperations } from './cds-extension-resolver.js';
+// Ownerless rows predate PID coordination; this matches doctor's stale-run threshold without taking over a recent legacy writer.
+const LEGACY_OWNER_RECOVERY_MS = 60 * 60 * 1_000;
+type RunningIndexRow = Record<string, unknown>;
+function ownerPid(value: unknown): number | undefined {
+  return typeof value === 'number' && Number.isSafeInteger(value) && value > 0
+    ? value
+    : undefined;
+}
+function processIsAlive(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    // Only ESRCH proves that ownership ended; permission and platform errors must fail closed.
+    const ownerIsMissing = typeof error === 'object'
+      && error !== null
+      && 'code' in error
+      && error.code === 'ESRCH';
+    return !ownerIsMissing;
+  }
+}
+function isRecoverableRun(row: RunningIndexRow, now: number): boolean {
+  const pid = ownerPid(row.ownerPid);
+  if (pid !== undefined) return !processIsAlive(pid);
+  if (typeof row.startedAt !== 'string') return false;
+  const startedAt = Date.parse(row.startedAt);
+  return Number.isFinite(startedAt) && now - startedAt >= LEGACY_OWNER_RECOVERY_MS;
+}
+function recoveredOwnerMessage(row: RunningIndexRow): string {
+  const pid = ownerPid(row.ownerPid);
+  return pid === undefined
+    ? 'Recovered stale legacy index writer without owner process metadata.'
+    : `Recovered stale index writer because owner process ${pid} is no longer running.`;
+}
+export function claimIndexRun(
+  db: Db,
+  workspaceId: number,
+  repoCount: number,
+): number {
+  // The short write transaction serializes claims without holding a SQLite writer lock during source preparation.
+  try {
+    return db.transaction(() => {
+      const now = Date.now();
+      const rows = db
+        .prepare("SELECT id,workspace_id workspaceId,owner_pid ownerPid,started_at startedAt FROM index_runs WHERE status='running' ORDER BY id")
+        .all();
+      const active = rows.find((row) => !isRecoverableRun(row, now));
+      if (active) {
+        const pid = ownerPid(active.ownerPid);
+        const owner = pid === undefined ? 'an unknown owner' : `process ${pid}`;
+        throw new Error(`index_writer_active: this database is already being indexed for workspace ${String(active.workspaceId ?? 'unknown')} by ${owner}; wait for that writer to finish.`);
+      }
+      const finish = db.prepare(
+        "UPDATE index_runs SET finished_at=?,status='failed',error_message=? WHERE id=?",
+      );
+      for (const row of rows)
+        finish.run(new Date(now).toISOString(), recoveredOwnerMessage(row), row.id);
+      const inserted = db
+        .prepare('INSERT INTO index_runs(workspace_id,started_at,status,repo_count,file_count,diagnostic_count,owner_pid) VALUES(?,?,?,?,?,?,?) RETURNING id')
+        .get(workspaceId, new Date(now).toISOString(), 'running', repoCount, 0, 0, process.pid);
+      const runId = Number(inserted?.id);
+      if (!Number.isSafeInteger(runId)) throw new Error('index_writer_claim_failed: SQLite did not return an index run identifier.');
+      return runId;
+    });
+  } catch (error) {
+    if (/\b(?:locked|busy)\b/i.test(errorMessage(error)))
+      throw new Error(
+        'index_writer_coordination_failed: SQLite remained busy beyond the bounded writer-claim interval; wait for the active publication to finish.',
+        { cause: error },
+      );
+    throw error;
+  }
+}
 export async function indexWorkspace(
   db: Db,
   workspaceId: number,
   options: { repo?: string; force: boolean; injectDerivedMaterializationFailure?: boolean },
 ): Promise<{ repoCount: number; indexedCount: number; skippedCount: number; fileCount: number; diagnosticCount: number }> {
-  const started = new Date().toISOString();
-  const repos = options.repo ? [repoByName(db, options.repo)].filter((r) => r !== undefined) : listRepositories(db);
-  const runId = Number(db.prepare('INSERT INTO index_runs(workspace_id,started_at,status,repo_count,file_count,diagnostic_count) VALUES(?,?,?,?,?,?) RETURNING id').get(workspaceId, started, 'running', repos.length, 0, 0)?.id);
+  const repos = options.repo
+    ? reposByName(db, options.repo, workspaceId)
+    : listRepositories(db, workspaceId);
+  if (options.repo && repos.length === 0)
+    throw new Error(`selector_repo_not_found: no indexed repository matched ${options.repo}.`);
+  if (options.repo && repos.length > 1)
+    throw new Error(`selector_repo_ambiguous: repository selector ${options.repo} matched ${repos.length} repositories; use a unique repository name.`);
+  const runId = claimIndexRun(db, workspaceId, repos.length);
   let fileCount = 0;
   let diagnosticCount = 0;
   let skippedCount = 0;
@@ -32,12 +110,12 @@ export async function indexWorkspace(
       }
       if (options.injectDerivedMaterializationFailure) throw new Error('Injected derived materialization failure');
       materializeCdsExtensionOperations(db, workspaceId);
-      db.prepare('UPDATE index_runs SET finished_at=?, status=?, file_count=?, diagnostic_count=? WHERE id=?').run(new Date().toISOString(), diagnosticCount ? 'failed' : 'success', fileCount, diagnosticCount, runId);
+      db.prepare("UPDATE index_runs SET finished_at=?, status='success', file_count=?, diagnostic_count=? WHERE id=?").run(new Date().toISOString(), fileCount, diagnosticCount, runId);
     });
     return { repoCount: repos.length, indexedCount: repos.length - skippedCount, skippedCount, fileCount, diagnosticCount };
   } catch (error) {
-    if (activeRepoId && preparedRows.length < repos.length) recordIndexFailure(db, activeRepoId, error);
     db.prepare("UPDATE index_runs SET finished_at=?, status='failed', file_count=?, diagnostic_count=?, error_message=? WHERE id=?").run(new Date().toISOString(), fileCount, diagnosticCount + 1, errorMessage(error), runId);
+    if (activeRepoId && preparedRows.length < repos.length) recordIndexFailure(db, activeRepoId, error);
     throw error;
   }
 }

package/src/linker/cross-repo-linker.ts

@@ -453,7 +453,7 @@ function implementationCandidates(db: Db, workspaceId: number, operation: Record
       CASE WHEN appRepo.id=handlerRepo.id THEN 1 ELSE 0 END sameRepoRegistration,
       CASE WHEN EXISTS (SELECT 1 FROM cds_services localService WHERE localService.repo_id=appRepo.id AND localService.service_path=?) THEN 1 ELSE 0 END localServicePathMatch,
       CASE WHEN EXISTS (SELECT 1 FROM cds_services localService WHERE localService.repo_id=appRepo.id) THEN 1 ELSE 0 END applicationHasLocalServices,
-      CASE WHEN EXISTS (SELECT 1 FROM handler_registrations localReg JOIN handler_classes localClass ON ((localReg.handler_class_id IS NOT NULL AND localClass.id=localReg.handler_class_id) OR (localReg.handler_class_id IS NULL AND localClass.class_name=localReg.class_name AND localClass.repo_id=localReg.repo_id)) JOIN handler_methods localMethod ON localMethod.handler_class_id=localClass.id WHERE localReg.repo_id=appRepo.id AND (localMethod.decorator_value=? OR localMethod.decorator_value=? OR localMethod.method_name=? OR localMethod.decorator_raw_expression LIKE ?)) THEN 1 ELSE 0 END applicationHasLocalRegistrationForOperation,
+      CASE WHEN EXISTS (SELECT 1 FROM handler_registrations localReg JOIN handler_classes localClass ON ((localReg.handler_class_id IS NOT NULL AND localClass.id=localReg.handler_class_id) OR (localReg.handler_class_id IS NULL AND localClass.class_name=localReg.class_name AND localClass.repo_id=localReg.repo_id)) JOIN handler_methods localMethod ON localMethod.handler_class_id=localClass.id WHERE localReg.repo_id=appRepo.id AND COALESCE(json_extract(localMethod.decorator_resolution_json,'$.handlerKind'),CASE WHEN localMethod.decorator_kind='Event' THEN 'event' WHEN localMethod.decorator_kind IN ('Action','Func','On') THEN 'operation' ELSE 'unsupported' END)='operation' AND COALESCE(json_extract(localMethod.decorator_resolution_json,'$.executable'),CASE WHEN localMethod.decorator_kind IN ('Action','Func','On') THEN 1 ELSE 0 END)=1 AND (localMethod.decorator_value=? OR localMethod.decorator_value=? OR localMethod.method_name=? OR localMethod.decorator_raw_expression LIKE ?)) THEN 1 ELSE 0 END applicationHasLocalRegistrationForOperation,
       CASE WHEN EXISTS (SELECT 1 FROM graph_edges dep WHERE dep.edge_type='REPO_IMPORTS_HELPER_PACKAGE' AND dep.status='resolved' AND dep.from_kind='repo' AND dep.from_id=CAST(appRepo.id AS TEXT) AND dep.to_id=?) THEN 1 ELSE 0 END appDependsOnModel,
       CASE WHEN EXISTS (SELECT 1 FROM graph_edges dep WHERE dep.edge_type='REPO_IMPORTS_HELPER_PACKAGE' AND dep.status='resolved' AND dep.from_kind='repo' AND dep.from_id=CAST(appRepo.id AS TEXT) AND dep.to_id=CAST(handlerRepo.id AS TEXT)) THEN 1 ELSE 0 END appDependsOnHandler,
       CASE WHEN EXISTS (SELECT 1 FROM graph_edges dep WHERE dep.edge_type='REPO_IMPORTS_HELPER_PACKAGE' AND dep.status='resolved' AND dep.from_kind='repo' AND dep.from_id=CAST(handlerRepo.id AS TEXT) AND dep.to_id=?) THEN 1 ELSE 0 END handlerDependsOnModel
@@ -485,6 +485,13 @@ function implementationCandidates(db: Db, workspaceId: number, operation: Record
     )
     JOIN repositories appRepo ON appRepo.id=hr.repo_id
     WHERE appRepo.workspace_id=?
+      AND COALESCE(json_extract(hm.decorator_resolution_json,'$.handlerKind'),
+        CASE WHEN hm.decorator_kind='Event' THEN 'event'
+          WHEN hm.decorator_kind IN ('Action','Func','On') THEN 'operation'
+          ELSE 'unsupported' END)='operation'
+      AND COALESCE(json_extract(hm.decorator_resolution_json,'$.executable'),
+        CASE WHEN hm.decorator_kind IN ('Action','Func','On')
+          THEN 1 ELSE 0 END)=1
       AND (hm.decorator_value=? OR hm.decorator_value=? OR hm.method_name=? OR hm.decorator_raw_expression LIKE ?)`).all(
         operation.modelRepoId,
         operation.modelRepo,
@@ -613,6 +620,11 @@ function candidateEvidence(candidate: ImplementationCandidate, rank: number): Re
   };
 }
 function implementationMethodSignal(row: Record<string, unknown>, operation: Record<string, unknown>): { matches: boolean; contradicted: boolean; acceptedReasons: string[]; rejectedReasons: string[] } {
+  const resolution = objectJson(row.decoratorResolutionJson) ?? {};
+  if (resolution.handlerKind && resolution.handlerKind !== 'operation')
+    return { matches: false, contradicted: true, acceptedReasons: [], rejectedReasons: ['non_operation_handler_kind'] };
+  if (resolution.executable === false)
+    return { matches: false, contradicted: true, acceptedReasons: [], rejectedReasons: ['handler_method_not_executable'] };
   const op = normalizedOperationName(String(operation.operationPath ?? operation.operationName ?? ''));
   const decorator = normalizeDecoratorOperationSignal(typeof row.decoratorValue === 'string' ? row.decoratorValue : undefined, typeof row.decoratorRawExpression === 'string' ? row.decoratorRawExpression : undefined, op);
   if (decorator.status === 'resolved' && decorator.operationName === op) return { matches: true, contradicted: false, acceptedReasons: ['decorator targets operation'], rejectedReasons: [] };

package/src/output/table-output.ts

@@ -24,7 +24,30 @@ export function renderTraceTable(result: TraceResult): string {
 
 function diagnosticLines(diagnostic: Record<string, unknown>): string[] {
   const first = `${String(diagnostic.severity ?? 'info')} ${String(diagnostic.code ?? 'diagnostic')} ${String(diagnostic.message ?? '')}`;
-  return [first, ...hintLines(diagnostic).map((hint) => `  ${hint}`)];
+  const details = diagnosticDetailLines(diagnostic);
+  return [first, ...[...details, ...hintLines(diagnostic)]
+    .map((hint) => `  ${hint}`)];
+}
+
+function diagnosticDetailLines(diagnostic: Record<string, unknown>): string[] {
+  const lines: string[] = [];
+  if (diagnostic.sourceFile || diagnostic.sourceLine)
+    lines.push(`at ${String(diagnostic.sourceFile ?? '')}:${String(diagnostic.sourceLine ?? '')}`);
+  const unsupported = stringList(diagnostic.unsupportedDecoratorNames);
+  const observed = stringList(diagnostic.observedDecoratorNames);
+  if (unsupported.length > 0)
+    lines.push(`unsupported decorators: ${unsupported.join(', ')}`);
+  else if (observed.length > 0)
+    lines.push(`observed decorators: ${observed.join(', ')}`);
+  if (typeof diagnostic.remediation === 'string')
+    lines.push(`hint: ${diagnostic.remediation}`);
+  return lines;
+}
+
+function stringList(value: unknown): string[] {
+  return Array.isArray(value)
+    ? value.filter((item): item is string => typeof item === 'string')
+    : [];
 }
 
 function hintLines(evidence: Record<string, unknown>): string[] {
@@ -50,9 +73,12 @@ function dynamicHintLines(evidence: Record<string, unknown>): string[] {
   if (count === 0) return [];
   const shown = numberValue(exploration.shownCandidateCount);
   const omitted = numberValue(exploration.omittedCandidateCount);
-  const lines = [`candidates: ${shown} shown, ${omitted} omitted`];
+  const rejected = numberValue(exploration.rejectedCandidateCount);
+  const lines = [
+    `viable candidates: ${shown} shown, ${omitted} omitted; rejected: ${rejected}`,
+  ];
   lines.push(...varSetHints(exploration.suggestedVarSets));
-  if (omitted > 0 || shown < count)
+  if (omitted > 0 || rejected > 0 || shown < count)
     lines.push('use --dynamic-mode candidates --max-dynamic-candidates 20 to explore candidate branches');
   return lines;
 }

package/src/parsers/cds-parser.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import type { CdsOperationFact, CdsServiceFact } from '../types.js';
 import { ensureLeadingSlash, normalizePath } from '../utils/path-utils.js';
+import type { RepositorySourceContext } from './ts-project.js';
 
 function lineOf(text: string, index: number): number {
   return text.slice(0, index).split('\n').length;
@@ -136,9 +137,14 @@ function operationsFromBody(text: string, maskedBody: string, bodyOffset: number
   }));
 }
 
-export async function parseCdsFile(repoPath: string, filePath: string): Promise<CdsServiceFact[]> {
+export async function parseCdsFile(
+  repoPath: string,
+  filePath: string,
+  context?: RepositorySourceContext,
+): Promise<CdsServiceFact[]> {
   const absolute = path.join(repoPath, filePath);
-  const text = await fs.readFile(absolute, 'utf8');
+  const text = context?.get(filePath)?.text
+    ?? await fs.readFile(absolute, 'utf8');
   const masked = maskCommentsAndStrings(text);
   const namespace = /namespace\s+([\w.]+)\s*;/.exec(masked)?.[1];
   const services: CdsServiceFact[] = [];