@saptools/service-flow 0.1.67 → 0.1.69

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import ts from 'typescript';
 
 type CallType = 'remote_action' | 'remote_query' | 'remote_entity_read' | 'remote_entity_mutation' | 'remote_entity_delete' | 'remote_entity_media' | 'remote_entity_candidate' | 'local_db_query' | 'external_http' | 'async_emit' | 'async_subscribe' | 'local_service_call' | 'unknown';
+type EdgeType = 'REPO_HAS_SERVICE' | 'SERVICE_HAS_OPERATION' | 'OPERATION_IMPLEMENTED_BY_HANDLER' | 'HANDLER_REGISTERED_BY_SERVER' | 'HANDLER_CALLS_LOCAL_FUNCTION' | 'HANDLER_USES_SERVICE_ALIAS' | 'HANDLER_CALLS_REMOTE_OPERATION' | 'REMOTE_CALL_RESOLVES_TO_OPERATION' | 'LOCAL_CALL_RESOLVES_TO_OPERATION' | 'HANDLER_RUNS_DB_QUERY' | 'HANDLER_RUNS_REMOTE_QUERY' | 'HANDLER_ACCESSES_REMOTE_ENTITY' | 'HANDLER_CALLS_EXTERNAL_HTTP' | 'HANDLER_CALLS_TRANSPORT_METHOD' | 'HANDLER_EMITS_EVENT' | 'EVENT_CONSUMED_BY_HANDLER' | 'EVENT_SUBSCRIPTION_HANDLED_BY' | 'REPO_IMPORTS_HELPER_PACKAGE' | 'HELPER_PACKAGE_PROVIDES_HANDLER' | 'DYNAMIC_EDGE_CANDIDATE' | 'UNRESOLVED_EDGE';
 interface DiscoveredRepository {
     name: string;
     absolutePath: string;
@@ -109,8 +110,34 @@ interface ServiceBindingFact {
     placeholders: string[];
     sourceFile: string;
     sourceLine: number;
+    bindingSiteStartOffset?: number;
+    bindingSiteEndOffset?: number;
+    sourceSymbolQualifiedName?: string;
+    ownerResolution?: ServiceBindingOwnerResolution;
     helperChain?: Array<Record<string, unknown>>;
 }
+type ServiceBindingOwnerResolution = 'owned_exact' | 'ownerless_file_scope' | 'legacy_unknown';
+type ServiceBindingReferenceStatus = 'resolved_exact' | 'ambiguous' | 'unresolved' | 'not_applicable';
+type ServiceBindingReferenceReason = 'binding_not_found' | 'binding_declared_after_call' | 'binding_scope_ambiguous' | 'scope_chain_limit_exceeded' | 'unsupported_reaching_assignment' | 'unsupported_var_binding' | 'binding_flow_unsupported';
+interface LexicalScopeFact {
+    kind: 'source_file' | 'module_block' | 'function' | 'class' | 'loop' | 'case_block' | 'block' | 'catch';
+    startOffset: number;
+    endOffset: number;
+}
+interface ServiceBindingReference {
+    status: ServiceBindingReferenceStatus;
+    variableName?: string;
+    bindingSourceFile?: string;
+    bindingSiteStartOffset?: number;
+    bindingSiteEndOffset?: number;
+    resolutionStrategy?: 'lexical_declaration' | 'lexical_alias_declaration' | 'deterministic_reaching_assignment' | 'single_hop_helper_return';
+    lexicalScopeChain?: LexicalScopeFact[];
+    bindingScopeIndex?: number;
+    scopeChainTotal: number;
+    scopeChainShown: number;
+    scopeChainOmitted: number;
+    reason?: ServiceBindingReferenceReason;
+}
 interface OutboundCallFact {
     callType: CallType;
     sourceSymbolQualifiedName?: string;
@@ -127,6 +154,7 @@ interface OutboundCallFact {
     sourceLine: number;
     callSiteStartOffset?: number;
     callSiteEndOffset?: number;
+    serviceBindingReference?: ServiceBindingReference;
     confidence: number;
     unresolvedReason?: string;
     evidence?: Record<string, unknown>;
@@ -137,6 +165,33 @@ interface OutboundCallFact {
         dynamic: boolean;
     };
 }
+interface ExecutableSymbolFact {
+    kind: string;
+    localName: string;
+    exportedName?: string;
+    qualifiedName: string;
+    sourceFile: string;
+    startLine: number;
+    endLine: number;
+    startOffset: number;
+    endOffset: number;
+    exported: boolean;
+    importExportEvidence?: Record<string, unknown>;
+}
+type SymbolCallRole = 'ordinary_call' | 'event_subscribe_handler' | 'legacy_unknown';
+interface SymbolCallFact {
+    callerQualifiedName: string;
+    calleeExpression: string;
+    calleeLocalName?: string;
+    receiverLocalName?: string;
+    importSource?: string;
+    sourceFile: string;
+    sourceLine: number;
+    callSiteStartOffset?: number;
+    callSiteEndOffset?: number;
+    callRole: Exclude<SymbolCallRole, 'legacy_unknown'>;
+    evidence: Record<string, unknown>;
+}
 interface GeneratedConstantFact {
     name: string;
     value: string;
@@ -215,7 +270,12 @@ declare function parseHandlerRegistrations(repoPath: string, filePath: string, c
 
 declare function parseServiceBindings(repoPath: string, filePath: string, context?: RepositorySourceContext): Promise<ServiceBindingFact[]>;
 
-declare function parseOutboundCalls(repoPath: string, filePath: string, context?: RepositorySourceContext): Promise<OutboundCallFact[]>;
+interface ClassifiedOutboundCall {
+    fact: OutboundCallFact;
+    node: ts.CallExpression;
+}
+
+declare function parseOutboundCalls(repoPath: string, filePath: string, context?: RepositorySourceContext, classified?: readonly ClassifiedOutboundCall[], preparedBindings?: readonly ServiceBindingFact[]): Promise<OutboundCallFact[]>;
 
 declare function parseGeneratedConstants(repoPath: string, filePath: string): Promise<GeneratedConstantFact[]>;
 
@@ -334,6 +394,7 @@ interface CompactDecisionV1 {
     implementationStrategy?: string;
     implementationGuided?: boolean;
     implementationContextual?: boolean;
+    tiedCandidateRepos?: CompactReferenceGroupV1;
     eventMatchStrategy?: string;
     dispatchCertainty?: string;
     eventSubscriptionCount?: number;
@@ -354,6 +415,10 @@ interface CompactEdgeDetailsV1 {
 }
 interface CompactDiagnosticDetailsV1 {
     reasonCode?: string;
+    tiedCandidateRepos?: CompactReferenceGroupV1;
+    selectorKind?: string;
+    selectorSuggestions?: CompactReferenceGroupV1;
+    invalidFactCategories?: CompactReferenceGroupV1;
     missingVariableNames?: string[];
     missingVariableCount?: number;
     shownMissingVariableCount?: number;
@@ -465,4 +530,4 @@ declare function parseImplementationHint(value: string): ImplementationHint;
 declare function redactText(text: string): string;
 declare function redactValue(value: unknown): unknown;
 
-export { type CompactDecisionV1, type CompactDiagnosticDetailsV1, type CompactDiagnosticRowV1, type CompactEdgeDetailsV1, type CompactEdgeRowV1, type CompactGraphV1, type CompactHintV1, type CompactNodeRowV1, type CompactQueryV1, type CompactReferenceGroupV1, type CompactReferencesV1, type CompactSourceContext, type CompactStartV1, type CompactStatus, type CompactStatusCountsV1, type CompactTraceExecution, type DynamicMode, type ImplementationHint, type RuntimeSubstitution, type TraceOptions, applyVariables, compactTrace, discoverRepositories, extractPlaceholders, linkWorkspace, parseCdsFile, parseDecorators, parseGeneratedConstants, parseHandlerRegistrations, parseImplementationHint, parseOutboundCalls, parsePackageJson, parseServiceBindings, redactText, redactValue, substituteVariables, trace, traceAndCompact };
+export { type CallType, type CompactDecisionV1, type CompactDiagnosticDetailsV1, type CompactDiagnosticRowV1, type CompactEdgeDetailsV1, type CompactEdgeRowV1, type CompactGraphV1, type CompactHintV1, type CompactNodeRowV1, type CompactQueryV1, type CompactReferenceGroupV1, type CompactReferencesV1, type CompactSourceContext, type CompactStartV1, type CompactStatus, type CompactStatusCountsV1, type CompactTraceExecution, type Db, type DynamicMode, type EdgeType, type ExecutableSymbolFact, type ImplementationHint, type OutboundCallFact, type RuntimeSubstitution, type SymbolCallFact, type SymbolCallRole, type TraceEdge, type TraceOptions, type TraceResult, type TraceStart, applyVariables, compactTrace, discoverRepositories, extractPlaceholders, linkWorkspace, parseCdsFile, parseDecorators, parseGeneratedConstants, parseHandlerRegistrations, parseImplementationHint, parseOutboundCalls, parsePackageJson, parseServiceBindings, redactText, redactValue, substituteVariables, trace, traceAndCompact };

package/dist/index.js

@@ -19,7 +19,7 @@ import {
   substituteVariables,
   trace,
   traceAndCompact
-} from "./chunk-ZQABU7MR.js";
+} from "./chunk-3N3B5KHV.js";
 
 // src/parsers/generated-constants-parser.ts
 import fs from "fs/promises";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saptools/service-flow",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "Trace SAP CAP service-to-service flows across multi-repository workspaces with runtime-aware graph resolution",
   "type": "module",
   "publishConfig": {

package/src/cli/001-index-summary.ts

@@ -0,0 +1,22 @@
+import type {
+  IndexWorkspaceSummary,
+} from '../indexer/workspace-indexer.js';
+
+export interface IndexCommandOutcome {
+  stdout: string;
+  exitCode: 0 | 1;
+}
+
+export function indexCommandOutcome(
+  summary: IndexWorkspaceSummary,
+): IndexCommandOutcome {
+  const failed = summary.failedCount > 0
+    ? `, failed ${summary.failedCount} (${
+      summary.failedRepos.map(({ name, code }) => `${name}: ${code}`).join(', ')
+    })`
+    : '';
+  return {
+    stdout: `Indexed ${summary.indexedCount} repositories, skipped ${summary.skippedCount}${failed}, ${summary.fileCount} files, ${summary.diagnosticCount} diagnostics\n`,
+    exitCode: summary.failedCount > 0 ? 1 : 0,
+  };
+}

package/src/cli/003-doctor-package-resolution.ts

@@ -0,0 +1,68 @@
+import type { Db } from '../db/connection.js';
+
+type Diagnostic = Record<string, unknown>;
+
+function pendingPredicate(alias: string): string {
+  return `${alias}.status='unresolved'
+    AND ${alias}.callee_symbol_id IS NULL
+    AND ${alias}.unresolved_reason='package_resolution_pending'
+    AND json_extract(${alias}.evidence_json,'$.relation')='package_import'
+    AND json_extract(${alias}.evidence_json,
+      '$.importBinding.moduleKind')='package'
+    AND json_extract(${alias}.evidence_json,
+      '$.candidateStrategy')='package_import_pending'
+    AND json_extract(${alias}.evidence_json,'$.candidateCount')=0
+    AND json_extract(${alias}.evidence_json,'$.eligibleCandidateCount')=0
+    AND json_extract(${alias}.evidence_json,'$.selectedCandidateCount')=0
+    AND json_extract(${alias}.evidence_json,'$.candidateSetComplete')=0`;
+}
+
+function count(db: Db, sql: string): number {
+  return Number(db.prepare(sql).get()?.count ?? 0);
+}
+
+export function packagePendingDiagnostics(db: Db): Diagnostic[] {
+  const pending = count(db, `SELECT COUNT(*) count FROM symbol_calls sc
+    WHERE ${pendingPredicate('sc')}`);
+  if (pending === 0) return [];
+  const stale = count(db, `SELECT COUNT(*) count FROM repositories
+    WHERE graph_stale_reason IS NOT NULL`);
+  return [{
+    severity: 'warning',
+    code: 'package_import_resolution_pending',
+    message: 'Package-import facts await workspace linking; terminal package-resolution quality is deferred.',
+    packageResolutionState: 'pre_link_pending',
+    pendingPackageImportCount: pending,
+    graphState: 'stale',
+    staleRepositoryCount: stale,
+    requiredAction: 'relink',
+    remediation: 'service-flow link --workspace /workspace --force',
+  }];
+}
+
+export function symbolCallQuality(db: Db): Diagnostic {
+  const terminal = `NOT (${pendingPredicate('sc')})`;
+  const row = db.prepare(`SELECT COUNT(*) total,
+    SUM(CASE WHEN sc.status='resolved' THEN 1 ELSE 0 END) resolved,
+    SUM(CASE WHEN sc.status='unresolved' THEN 1 ELSE 0 END) unresolved
+    FROM symbol_calls sc WHERE ${terminal}`).get();
+  const top = db.prepare(`SELECT sc.callee_expression calleeExpression,
+    COUNT(*) count FROM symbol_calls sc
+    WHERE sc.status='unresolved' AND ${terminal}
+    GROUP BY sc.callee_expression
+    ORDER BY count DESC,sc.callee_expression COLLATE BINARY LIMIT 5`).all();
+  const total = Number(row?.total ?? 0);
+  const unresolved = Number(row?.unresolved ?? 0);
+  const ratio = total === 0 ? 0 : Number((unresolved / total).toFixed(4));
+  return {
+    severity: ratio > 0.05 ? 'warning' : 'info',
+    code: 'strict_symbol_call_quality',
+    message: 'Terminal symbol-call quality aggregate',
+    total,
+    resolved: Number(row?.resolved ?? 0),
+    unresolved,
+    unresolvedRatio: ratio,
+    unresolvedRatioThreshold: 0.05,
+    topUnresolvedCallees: top,
+  };
+}

package/src/cli/doctor.ts

@@ -7,6 +7,10 @@ import {
   analyzerVersionDiagnostics,
   schemaDriftDiagnostics,
 } from './002-doctor-lifecycle.js';
+import {
+  packagePendingDiagnostics,
+  symbolCallQuality,
+} from './003-doctor-package-resolution.js';
 export { linkUpgradeWarnings } from './002-doctor-lifecycle.js';
 
 type Diagnostic = Record<string, unknown>;
@@ -17,13 +21,23 @@ interface DoctorOptions {
 
 export function doctorDiagnostics(db: Db, strict: boolean, options: DoctorOptions = {}): Diagnostic[] {
   const lifecycle = factLifecycleDiagnostic(db, options.workspaceId);
-  if (lifecycle?.code === 'schema_upgrade_required'
-    || lifecycle?.code === 'unsupported_future_schema')
-    return boundDoctorDiagnostics([lifecycle]);
+  if (lifecycle) return boundDoctorDiagnostics([lifecycle]);
+  const globalLifecycle = options.workspaceId === undefined
+    ? undefined : factLifecycleDiagnostic(db);
+  if (globalLifecycle) return boundDoctorDiagnostics([
+    ...schemaDriftDiagnostics(db, strict, options.workspaceId),
+    ...analyzerVersionDiagnostics(db, strict, options.workspaceId),
+    {
+      severity: 'warning',
+      code: 'workspace_detail_checks_deferred',
+      message: 'Selected-workspace lifecycle is valid, but JSON-dependent global detail checks were deferred because another workspace requires reindexing.',
+      remediation: 'Run doctor for the affected workspace after force index and link.',
+    },
+  ]);
   const diagnostics = db.prepare('SELECT severity,code,message,source_file sourceFile,source_line sourceLine FROM diagnostics ORDER BY id').all() as Diagnostic[];
   return boundDoctorDiagnostics([
-    ...(lifecycle ? [lifecycle] : []),
     ...diagnostics,
+    ...packagePendingDiagnostics(db),
     ...healthDiagnostics(db, strict),
     ...remoteTargetWithoutImplementationDiagnostics(db, strict, Boolean(options.detail)),
     ...localServiceDiagnostics(db, strict),
@@ -170,15 +184,6 @@ function jsonEvidenceQuality(db: Db): Diagnostic[] {
   ];
 }
 
-function symbolCallQuality(db: Db): Diagnostic {
-  const row = db.prepare("SELECT COUNT(*) total, SUM(CASE WHEN status='resolved' THEN 1 ELSE 0 END) resolved, SUM(CASE WHEN status='unresolved' THEN 1 ELSE 0 END) unresolved FROM symbol_calls").get() as Record<string, unknown>;
-  const top = db.prepare("SELECT callee_expression calleeExpression,COUNT(*) count FROM symbol_calls WHERE status='unresolved' GROUP BY callee_expression ORDER BY count DESC,callee_expression LIMIT 5").all() as Diagnostic[];
-  const total = Number(row.total ?? 0);
-  const unresolved = Number(row.unresolved ?? 0);
-  const ratio = total === 0 ? 0 : Number((unresolved / total).toFixed(4));
-  return { severity: ratio > 0.05 ? 'warning' : 'info', code: 'strict_symbol_call_quality', message: 'Symbol-call quality aggregate', total, resolved: Number(row.resolved ?? 0), unresolved, unresolvedRatio: ratio, unresolvedRatioThreshold: 0.05, topUnresolvedCallees: top };
-}
-
 function dbQueryQuality(db: Db): Diagnostic {
   const row = db.prepare("SELECT COUNT(*) total, SUM(CASE WHEN query_entity IS NOT NULL THEN 1 ELSE 0 END) known, SUM(CASE WHEN query_entity IS NULL THEN 1 ELSE 0 END) unknown FROM outbound_calls WHERE call_type='local_db_query'").get() as Record<string, unknown>;
   const total = Number(row.total ?? 0);
@@ -418,8 +423,13 @@ function serviceBindingQuality(db: Db, detail: boolean): Diagnostic {
 function bindingCategory(row: Diagnostic): string {
   const evidence = parseObject(row.evidenceJson);
   const resolution = parseObject(evidence.serviceBindingResolution);
+  const reference = parseObject(evidence.serviceBindingReference);
   if (resolution.status === 'rejected_future_binding') return 'direct_binding_missing';
-  if (resolution.status === 'ambiguous') return 'ambiguous_binding_candidates';
+  if (reference.reason === 'binding_declared_after_call')
+    return 'direct_binding_missing';
+  if (resolution.status === 'ambiguous' || reference.status === 'ambiguous'
+    || reference.reason === 'unsupported_reaching_assignment')
+    return 'ambiguous_binding_candidates';
   const receiver = evidence.receiver;
   const symbolEvidence = parseObject(row.symbolEvidenceJson);
   if (symbolHasReceiverParameter(symbolEvidence, receiver))
@@ -448,6 +458,7 @@ function bindingExample(row: Diagnostic): Diagnostic {
     receiver: evidence.receiver,
     unresolvedReason: row.unresolvedReason,
     bindingResolution: evidence.serviceBindingResolution,
+    bindingReference: evidence.serviceBindingReference,
   };
 }
 

package/src/cli.ts

@@ -41,6 +41,7 @@ import type {
   TraceStart,
 } from './types.js';
 import { cleanWorkspaceState } from './cli/000-clean.js';
+import { indexCommandOutcome } from './cli/001-index-summary.js';
 
 const stdout = createStdoutWriter(process.stdout, fail);
 const TRACE_FORMATS = ['table', 'json', 'mermaid', 'compact-json'] as const;
@@ -245,14 +246,16 @@ function runGraphCommand(opts: GraphCommandOptions): Promise<void> {
   });
 }
 
-export function createProgram(): Command {
-  const program = new Command();
-  program
+function configuredProgram(): Command {
+  return new Command()
     .name('service-flow')
     .description(
       'Trace SAP CAP service-to-service flows across multi-repository workspaces',
     )
     .version(VERSION);
+}
+
+function registerInitCommand(program: Command): void {
   program
     .command('init')
     .argument('<workspace>')
@@ -262,6 +265,9 @@ export function createProgram(): Command {
       (workspace: string, opts: { db?: string; ignore?: string[] }) =>
         void init(workspace, opts).catch(fail),
     );
+}
+
+function registerIndexCommand(program: Command): void {
   program
     .command('index')
     .option('--workspace <path>')
@@ -274,11 +280,14 @@ export function createProgram(): Command {
             repo: opts.repo,
             force: Boolean(opts.force),
           });
-          writeStdout(
-            `Indexed ${r.indexedCount} repositories, skipped ${r.skippedCount}, ${r.fileCount} files, ${r.diagnosticCount} diagnostics\n`,
-          );
+          const outcome = indexCommandOutcome(r);
+          writeStdout(outcome.stdout);
+          if (outcome.exitCode !== 0) process.exitCode = outcome.exitCode;
         }).catch(fail),
     );
+}
+
+function registerLinkCommand(program: Command): void {
   program
     .command('link')
     .option('--workspace <path>')
@@ -293,6 +302,9 @@ export function createProgram(): Command {
           );
         }).catch(fail),
     );
+}
+
+function registerTraceCommand(program: Command): void {
   program
     .command('trace')
     .option('--workspace <path>')
@@ -312,23 +324,91 @@ export function createProgram(): Command {
     .option('--dynamic-mode <mode>', 'strict|candidates|infer', 'strict')
     .option('--max-dynamic-candidates <n>', 'maximum dynamic candidates to show', '5')
     .action((opts: TraceCommandOptions) => void runTraceCommand(opts).catch(fail));
+}
+
+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,
+        })),
+      ),
+    ));
+}
+
+function listServicesCommand(
+  opts: { workspace?: string; repo?: string },
+): Promise<void> {
+  return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    const selection = opts.repo
+      ? selectRepository(db, opts.repo, workspaceId) : {};
+    if (selection.diagnostic) {
+      writeStdout(renderJson([selection.diagnostic]));
+      return;
+    }
+    const repo = selection.repo;
+    const rows = db.prepare(
+      'SELECT r.name repo,s.service_path servicePath,s.qualified_name qualifiedName FROM cds_services s JOIN repositories r ON r.id=s.repo_id WHERE r.workspace_id=? AND (? IS NULL OR s.repo_id=?) ORDER BY r.name,s.service_path',
+    ).all(workspaceId, repo?.id, repo?.id);
+    writeStdout(renderJson(rows));
+  });
+}
+
+function listOperationsCommand(
+  opts: { workspace?: string; repo?: string; service?: string },
+): Promise<void> {
+  return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    const selection = opts.repo
+      ? selectRepository(db, opts.repo, workspaceId) : {};
+    if (selection.diagnostic) {
+      writeStdout(renderJson([selection.diagnostic]));
+      return;
+    }
+    const repo = selection.repo;
+    const rows = db.prepare(
+      'SELECT r.name repo,s.service_path servicePath,o.operation_name operation,o.operation_path path 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 (? IS NULL OR s.repo_id=?) AND (? IS NULL OR s.service_path=?)',
+    ).all(
+      workspaceId, repo?.id, repo?.id, opts.service, opts.service,
+    );
+    writeStdout(renderJson(rows));
+  });
+}
+
+function listCallsCommand(
+  opts: { workspace?: string; repo?: string; operation?: string },
+): Promise<void> {
+  return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    const selection = opts.repo
+      ? selectRepository(db, opts.repo, workspaceId) : {};
+    if (selection.diagnostic) {
+      writeStdout(renderJson([selection.diagnostic]));
+      return;
+    }
+    const repo = selection.repo;
+    const rows = db.prepare(
+      'SELECT r.name repo,c.call_type type,c.operation_path_expr path,c.source_file file,c.source_line line FROM outbound_calls c JOIN repositories r ON r.id=c.repo_id WHERE r.workspace_id=? AND (? IS NULL OR c.repo_id=?) AND (? IS NULL OR c.operation_path_expr=? OR c.operation_path_expr=? OR c.payload_summary LIKE ?)',
+    ).all(
+      workspaceId, repo?.id, repo?.id, opts.operation, opts.operation,
+      opts.operation ? `/${opts.operation}` : undefined,
+      opts.operation ? `%${opts.operation}%` : undefined,
+    );
+    writeStdout(renderJson(rows));
+  });
+}
+
+function registerListCommands(program: Command): void {
   const list = program.command('list');
   list
     .command('repos')
     .option('--workspace <path>')
     .action(
       (opts: { workspace?: string }) =>
-        void withReadOnlyWorkspace(opts.workspace, (db, workspaceId) =>
-          writeStdout(
-            renderJson(
-              listRepositories(db, workspaceId).map((r) => ({
-                name: r.name,
-                kind: r.kind,
-                packageName: r.package_name,
-              })),
-            ),
-          ),
-        ).catch(fail),
+        void listRepositoriesCommand(opts).catch(fail),
     );
   list
     .command('services')
@@ -336,22 +416,7 @@ export function createProgram(): Command {
     .option('--repo <name>')
     .action(
       (opts: { workspace?: string; repo?: string }) =>
-        void withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
-          const selection = opts.repo
-            ? selectRepository(db, opts.repo, workspaceId)
-            : {};
-          if (selection.diagnostic) {
-            writeStdout(renderJson([selection.diagnostic]));
-            return;
-          }
-          const repo = selection.repo;
-          const rows = db
-            .prepare(
-              'SELECT r.name repo,s.service_path servicePath,s.qualified_name qualifiedName FROM cds_services s JOIN repositories r ON r.id=s.repo_id WHERE r.workspace_id=? AND (? IS NULL OR s.repo_id=?) ORDER BY r.name,s.service_path',
-            )
-            .all(workspaceId, repo?.id, repo?.id);
-          writeStdout(renderJson(rows));
-        }).catch(fail),
+        void listServicesCommand(opts).catch(fail),
     );
   list
     .command('operations')
@@ -360,22 +425,7 @@ export function createProgram(): Command {
     .option('--service <path>')
     .action(
       (opts: { workspace?: string; repo?: string; service?: string }) =>
-        void withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
-          const selection = opts.repo
-            ? selectRepository(db, opts.repo, workspaceId)
-            : {};
-          if (selection.diagnostic) {
-            writeStdout(renderJson([selection.diagnostic]));
-            return;
-          }
-          const repo = selection.repo;
-          const rows = db
-            .prepare(
-              'SELECT r.name repo,s.service_path servicePath,o.operation_name operation,o.operation_path path 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 (? IS NULL OR s.repo_id=?) AND (? IS NULL OR s.service_path=?)',
-            )
-            .all(workspaceId, repo?.id, repo?.id, opts.service, opts.service);
-          writeStdout(renderJson(rows));
-        }).catch(fail),
+        void listOperationsCommand(opts).catch(fail),
     );
   list
     .command('calls')
@@ -384,31 +434,11 @@ export function createProgram(): Command {
     .option('--operation <name>')
     .action(
       (opts: { workspace?: string; repo?: string; operation?: string }) =>
-        void withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
-          const selection = opts.repo
-            ? selectRepository(db, opts.repo, workspaceId)
-            : {};
-          if (selection.diagnostic) {
-            writeStdout(renderJson([selection.diagnostic]));
-            return;
-          }
-          const repo = selection.repo;
-          const rows = db
-            .prepare(
-              'SELECT r.name repo,c.call_type type,c.operation_path_expr path,c.source_file file,c.source_line line FROM outbound_calls c JOIN repositories r ON r.id=c.repo_id WHERE r.workspace_id=? AND (? IS NULL OR c.repo_id=?) AND (? IS NULL OR c.operation_path_expr=? OR c.operation_path_expr=? OR c.payload_summary LIKE ?)',
-            )
-            .all(
-              workspaceId,
-              repo?.id,
-              repo?.id,
-              opts.operation,
-              opts.operation,
-              opts.operation ? `/${opts.operation}` : undefined,
-              opts.operation ? `%${opts.operation}%` : undefined,
-            );
-          writeStdout(renderJson(rows));
-        }).catch(fail),
+        void listCallsCommand(opts).catch(fail),
     );
+}
+
+function registerGraphCommand(program: Command): void {
   program
     .command('graph')
     .option('--workspace <path>')
@@ -423,6 +453,33 @@ export function createProgram(): Command {
     .option('--dynamic-mode <mode>', 'strict|candidates|infer', 'strict')
     .option('--max-dynamic-candidates <n>', 'maximum dynamic candidates to show', '5')
     .action((opts: GraphCommandOptions) => void runGraphCommand(opts).catch(fail));
+}
+
+function inspectRepositoryCommand(
+  name: string,
+  opts: { workspace?: string },
+): Promise<void> {
+  return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    const selection = selectRepository(db, name, workspaceId);
+    writeStdout(renderJson(
+      selection.repo ?? selection.diagnostic ?? { error: 'repo not found' },
+    ));
+  });
+}
+
+function inspectOperationCommand(
+  selector: string,
+  opts: { workspace?: string },
+): Promise<void> {
+  return withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
+    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);
+    writeStdout(renderJson(rows));
+  });
+}
+
+function registerInspectCommands(program: Command): void {
   const inspect = program.command('inspect');
   inspect
     .command('repo')
@@ -430,12 +487,7 @@ export function createProgram(): Command {
     .option('--workspace <path>')
     .action(
       (name: string, opts: { workspace?: string }) =>
-        void withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
-          const selection = selectRepository(db, name, workspaceId);
-          writeStdout(renderJson(
-            selection.repo ?? selection.diagnostic ?? { error: 'repo not found' },
-          ));
-        }).catch(fail),
+        void inspectRepositoryCommand(name, opts).catch(fail),
     );
   inspect
     .command('operation')
@@ -443,15 +495,11 @@ export function createProgram(): Command {
     .option('--workspace <path>')
     .action(
       (selector: string, opts: { workspace?: string }) =>
-        void withReadOnlyWorkspace(opts.workspace, (db, workspaceId) => {
-          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);
-          writeStdout(renderJson(rows));
-        }).catch(fail),
+        void inspectOperationCommand(selector, opts).catch(fail),
     );
+}
+
+function registerDoctorCommand(program: Command): void {
   program
     .command('doctor')
     .option('--workspace <path>')
@@ -467,6 +515,9 @@ export function createProgram(): Command {
           writeStdout(renderDoctorDiagnostics(allDiagnostics, opts.format));
         }).catch(fail),
     );
+}
+
+function registerCleanCommand(program: Command): void {
   program
     .command('clean')
     .option('--workspace <path>')
@@ -479,6 +530,19 @@ export function createProgram(): Command {
           writeStdout('Cleaned service-flow state\n');
         })().catch(fail),
     );
+}
+
+export function createProgram(): Command {
+  const program = configuredProgram();
+  registerInitCommand(program);
+  registerIndexCommand(program);
+  registerLinkCommand(program);
+  registerTraceCommand(program);
+  registerListCommands(program);
+  registerGraphCommand(program);
+  registerInspectCommands(program);
+  registerDoctorCommand(program);
+  registerCleanCommand(program);
   return program;
 }
 function collect(value: string, previous: string[]): string[] {