refactor: remove legacy workspace runtime branches

2026-08-10 21:28:08 +02:00
parent f102629cee
commit c2f9b03973
14 changed files with 906 additions and 2691 deletions
@@ -1,12 +1,7 @@
 import { basename, join } from "node:path";
 import { stringify } from "yaml";
 import { buildInstallationContract } from "./contracts.js";
-import {
-  validateWorkspaceDescriptor,
-  type WorkspaceDescriptor,
-  type WorkspaceV3,
-} from "./schema.js";
-import type { DeprecatedV2Descriptor } from "./deprecated-v2-descriptor.js";
+import { validateWorkspaceDescriptor, type WorkspaceDescriptor } from "./schema.js";
 import type { ResolvedBinding, ResolvedEvidenceBinding, RuntimeBindings } from "./bindings.js";
 export type { RuntimeBindings } from "./bindings.js";

@@ -45,10 +40,6 @@ const DEFAULT_SEMANTIC_RUNTIME: SemanticRuntimeConfig = {
  internalEmbeddingDimensions: 1024,
 };

-function seconds(timeoutMs: number | undefined): number | undefined {
-  return timeoutMs === undefined ? undefined : Math.max(1, Math.ceil(timeoutMs / 1_000));
-}
-
 function bindingValue(binding: ResolvedBinding, name: string): string | undefined {
  return binding.values[name];
 }
@@ -59,7 +50,7 @@ function requireBinding(binding: ResolvedBinding, name: string): string {
  return value;
 }

-function legacyDirectConnection(
+function directConnection(
  binding: ResolvedBinding,
  names: { host: string; port: string; user: string; passwordFile: string; tlsCaFile: string },
  identity: { database: string; schema: string },
@@ -77,7 +68,7 @@ function legacyDirectConnection(
  return connection;
 }

-function legacyRestEndpoint(
+function restEndpoint(
  binding: ResolvedBinding,
  names: { baseUrl: string; apiKeyFile: string; tlsCaFile: string },
  requiresCredential: boolean,
@@ -115,7 +106,7 @@ function requireEvidenceBinding(binding: ResolvedEvidenceBinding, name: string):
 }

 function renderEvidence(
-  workspace: WorkspaceV3,
+  workspace: WorkspaceDescriptor,
  binding: ResolvedEvidenceBinding,
  context: RuntimeRenderContext,
  bindingName: (suffix: string) => string,
@@ -188,6 +179,7 @@ function renderEvidence(
  };
 }

+
 function placeholderConnection(identity: { database: string; schema: string }): Record<string, unknown> {
  return {
    host: "localhost",
@@ -200,7 +192,18 @@ function placeholderConnection(identity: { database: string; schema: string }):
  };
 }

-/** Render the compatibility fields consumed by the current Python harness. */
+function requireSupportedDescriptor(workspace: unknown): void {
+  if (typeof workspace !== "object" || workspace === null) {
+    throw new Error("Runtime renderer supports only workspace schema version 3");
+  }
+  const metadata = Reflect.get(workspace, "workspace");
+  if (typeof metadata !== "object" || metadata === null
+    || Reflect.get(metadata, "schema_version") !== 3) {
+    throw new Error("Runtime renderer supports only workspace schema version 3");
+  }
+}
+
+/** Render the schema-v3 compatibility fields consumed by the current Python harness. */
 export function renderRuntimeConfig(
  workspace: WorkspaceDescriptor,
  bindings: RuntimeBindings,
@@ -209,119 +212,36 @@ export function renderRuntimeConfig(
  installation: RuntimeInstallationOverlay = {},
  semanticRuntime: SemanticRuntimeConfig = DEFAULT_SEMANTIC_RUNTIME,
 ): string {
+  requireSupportedDescriptor(workspace);
  const descriptor = validateWorkspaceDescriptor(workspace);
  const contract = buildInstallationContract(descriptor);
-  const name = (role: "DWH" | "VECTOR" | "EMBEDDING" | "EVIDENCE", suffix: string) => {
+  const name = (role: "DWH" | "EVIDENCE", suffix: string) => {
    const variable = contract.variables.find((entry) => entry.role === role && entry.suffix === suffix);
    if (!variable) throw new Error(`workspace contract is missing ${role}_${suffix}`);
    return variable.name;
  };
-  if (Number(descriptor.workspace.schema_version) !== 2) {
-    if (Number(descriptor.workspace.schema_version) === 1) {
-      throw new Error("Workspace descriptor requires explicit migration to schema version 2");
-    }
-    const canonicalV3 = descriptor as WorkspaceV3;
-    const renderedEvidence = canonicalV3.evidence === undefined
-      ? undefined
-      : renderEvidence(
-        canonicalV3,
-        bindings.evidence,
-        requireRuntimeRenderContext(identity),
-        (suffix) => name("EVIDENCE", suffix),
-      );
-    if (bindings.dwh.missing.length > 0) {
-      throw new Error("runtime configuration requires complete bindings");
-    }
-
-    const dwhRest = bindings.dwh.transport === "rest_api";
-    const dwhIdentity = { database: descriptor.dwh.database, schema: descriptor.dwh.schema };
-    const database = bindings.dwh.transport === "postgres_direct"
-      ? { ...legacyDirectConnection(bindings.dwh, {
-        host: name("DWH", "HOST"),
-        port: name("DWH", "PORT"),
-        user: name("DWH", "USER"),
-        passwordFile: name("DWH", "PASSWORD_FILE"),
-        tlsCaFile: name("DWH", "TLS_CA_FILE"),
-      }, dwhIdentity), transport: "direct" }
-      : placeholderConnection(dwhIdentity);
-    const renderedV3: Record<string, unknown> = {
-      ...(identity ? {
-        runtime_identity: {
-          workspace_id: identity.workspaceId,
-          workspace_revision: identity.workspaceRevision,
-          source_identity: `workspace://${identity.workspaceId}`,
-        },
-      } : {}),
-      ...(installation.session_storage === undefined
-        ? {} : { session_storage: installation.session_storage }),
-      ...(installation.profile === undefined ? {} : { profile: installation.profile }),
-      language: descriptor.workspace.language,
-      database,
-      resources: {
-        vector: {
-          engine: "qdrant",
-          base_url: semanticRuntime.internalQdrantUrl,
-          collection: descriptor.semantic_index.vector_store.collection,
-        },
-        embeddings: {
-          provider: "ollama_internal",
-          base_url: semanticRuntime.internalEmbeddingUrl,
-          model: semanticRuntime.internalEmbeddingModel,
-          dimensions: semanticRuntime.internalEmbeddingDimensions,
-        },
-      },
-      roots: paths,
-      paths,
-      ...(renderedEvidence ?? {}),
-    };
-    if (bindings.dwh.transport === "postgres_direct") {
-      renderedV3.dwh = { type: "postgres_direct", connection: database };
-    } else if (dwhRest) {
-      renderedV3.rest = legacyRestEndpoint(bindings.dwh, {
-        baseUrl: name("DWH", "BASE_URL"),
-        apiKeyFile: name("DWH", "API_KEY_FILE"),
-        tlsCaFile: name("DWH", "TLS_CA_FILE"),
-      }, descriptor.diagnostics?.dwh_rest?.auth !== "none");
-      renderedV3.database = placeholderConnection(dwhIdentity);
-      renderedV3.dwh = { type: "thoth_rest", database: dwhIdentity, endpoint: renderedV3.rest };
-    } else {
-      throw new Error("ssh_tunnel runtime configuration requires a diagnostic tunnel");
-    }
-    return stringify(renderedV3, { lineWidth: 0, sortMapEntries: false });
-  }
-
-  const canonical = descriptor as unknown as DeprecatedV2Descriptor;
-  if ([...bindings.dwh.missing, ...bindings.vector.missing, ...bindings.embedding.missing].length > 0) {
+  const renderedEvidence = descriptor.evidence === undefined
+    ? undefined
+    : renderEvidence(
+      descriptor,
+      bindings.evidence,
+      requireRuntimeRenderContext(identity),
+      (suffix) => name("EVIDENCE", suffix),
+    );
+  if (bindings.dwh.missing.length > 0) {
    throw new Error("runtime configuration requires complete bindings");
  }

-  const dwhIdentity = { database: canonical.dwh.database, schema: canonical.dwh.schema };
-  const vectorIdentity = {
-    database: canonical.semantic_index.vector_store.database ?? canonical.dwh.database,
-    schema: canonical.semantic_index.vector_store.schema ?? canonical.dwh.schema,
-  };
-  const dwhDirect = bindings.dwh.transport === "postgres_direct";
-  const vectorDirect = bindings.vector.transport === "pgvector_direct";
-  const database = dwhDirect
-    ? { ...legacyDirectConnection(bindings.dwh, {
-      host: name("DWH", "HOST"), port: name("DWH", "PORT"), user: name("DWH", "USER"),
-      passwordFile: name("DWH", "PASSWORD_FILE"), tlsCaFile: name("DWH", "TLS_CA_FILE"),
+  const dwhIdentity = { database: descriptor.dwh.database, schema: descriptor.dwh.schema };
+  const database = bindings.dwh.transport === "postgres_direct"
+    ? { ...directConnection(bindings.dwh, {
+      host: name("DWH", "HOST"),
+      port: name("DWH", "PORT"),
+      user: name("DWH", "USER"),
+      passwordFile: name("DWH", "PASSWORD_FILE"),
+      tlsCaFile: name("DWH", "TLS_CA_FILE"),
    }, dwhIdentity), transport: "direct" }
    : placeholderConnection(dwhIdentity);
-  const vectorDb = vectorDirect
-    ? legacyDirectConnection(bindings.vector, {
-      host: name("VECTOR", "HOST"), port: name("VECTOR", "PORT"), user: name("VECTOR", "USER"),
-      passwordFile: name("VECTOR", "PASSWORD_FILE"), tlsCaFile: name("VECTOR", "TLS_CA_FILE"),
-    }, vectorIdentity)
-    : placeholderConnection(vectorIdentity);
-  const embedding: Record<string, unknown> = {
-    base_url: requireBinding(bindings.embedding, name("EMBEDDING", "BASE_URL")),
-    model: canonical.semantic_index.embedding.model,
-    dim: canonical.semantic_index.embedding.dimensions,
-  };
-  const embeddingTimeout = seconds(canonical.semantic_index.embedding.timeout_ms);
-  if (embeddingTimeout !== undefined) embedding.timeout = embeddingTimeout;
-
  const rendered: Record<string, unknown> = {
    ...(identity ? {
      runtime_identity: {
@@ -333,37 +253,38 @@ export function renderRuntimeConfig(
    ...(installation.session_storage === undefined
      ? {} : { session_storage: installation.session_storage }),
    ...(installation.profile === undefined ? {} : { profile: installation.profile }),
-    language: canonical.workspace.language,
+    language: descriptor.workspace.language,
    database,
-    vector_db: vectorDb,
-    embeddings: embedding,
+    resources: {
+      vector: {
+        engine: "qdrant",
+        base_url: semanticRuntime.internalQdrantUrl,
+        collection: descriptor.semantic_index.vector_store.collection,
+      },
+      embeddings: {
+        provider: "ollama_internal",
+        base_url: semanticRuntime.internalEmbeddingUrl,
+        model: semanticRuntime.internalEmbeddingModel,
+        dimensions: semanticRuntime.internalEmbeddingDimensions,
+      },
+    },
    roots: paths,
    paths,
+    ...(renderedEvidence ?? {}),
  };
-  if (dwhDirect) {
+  if (bindings.dwh.transport === "postgres_direct") {
    rendered.dwh = { type: "postgres_direct", connection: database };
  } else if (bindings.dwh.transport === "rest_api") {
-    const rest = legacyRestEndpoint(bindings.dwh, {
-      baseUrl: name("DWH", "BASE_URL"), apiKeyFile: name("DWH", "API_KEY_FILE"),
+    const rest = restEndpoint(bindings.dwh, {
+      baseUrl: name("DWH", "BASE_URL"),
+      apiKeyFile: name("DWH", "API_KEY_FILE"),
      tlsCaFile: name("DWH", "TLS_CA_FILE"),
-    }, canonical.diagnostics?.dwh_rest?.auth !== "none");
+    }, descriptor.diagnostics?.dwh_rest?.auth !== "none");
    rendered.rest = rest;
+    rendered.database = placeholderConnection(dwhIdentity);
    rendered.dwh = { type: "thoth_rest", database: dwhIdentity, endpoint: rest };
  } else {
    throw new Error("ssh_tunnel runtime configuration requires a diagnostic tunnel");
  }
-  if (vectorDirect) {
-    rendered.vectors = { type: "pgvector_direct", connection: vectorDb };
-  } else if (bindings.vector.transport === "rest_api") {
-    const vectorRest = legacyRestEndpoint(bindings.vector, {
-      baseUrl: name("VECTOR", "BASE_URL"), apiKeyFile: name("VECTOR", "API_KEY_FILE"),
-      tlsCaFile: name("VECTOR", "TLS_CA_FILE"),
-    }, canonical.diagnostics?.vector_rest?.metadata.auth !== "none");
-    rendered.vector_rest = vectorRest;
-    rendered.vectors = { type: "thoth_vector_http", reader: vectorRest };
-  } else {
-    throw new Error("ssh_tunnel runtime configuration requires a diagnostic tunnel");
-  }
-
  return stringify(rendered, { lineWidth: 0, sortMapEntries: false });
 }