@voxgig/sdkgen 1.3.17 → 1.3.19

package/project/.sdk/model/target/go-mcp.aontu

@@ -1,9 +1,9 @@
 
-// Go MCP server target — a Go program that *consumes* the sibling Go
-// SDK and exposes it as MCP tools. Like go-cli, it is not a language
-// SDK in its own right, so the standard per-entity / per-feature /
-// readme / test generation phases are switched off via the `phase`
-// map below.
+# Go MCP server target — a Go program that *consumes* the sibling Go
+# SDK and exposes it as MCP tools. Like go-cli, it is not a language
+# SDK in its own right, so the standard per-entity / per-feature /
+# readme / test generation phases are switched off via the `phase`
+# map below.
 
 main: kit: target: 'go-mcp': {
 
@@ -12,7 +12,7 @@ main: kit: target: 'go-mcp': {
   comment: line: "//"
   module: name: '$$name$$'
 
-  // Per-generation-phase activation. Mirrors go-cli — only Main runs.
+  # Per-generation-phase activation. Mirrors go-cli — only Main runs.
   phase: {
     entity:     { active: false }
     feature:    { active: false }
@@ -21,15 +21,15 @@ main: kit: target: 'go-mcp': {
     test:       { active: false }
   }
 
-  // No external module deps declared here. The generated go.mod uses
-  // a relative replace to the sibling SDK at ../go and declares the
-  // MCP Go SDK as a direct dep. See Main_go-mcp.ts.
+  # No external module deps declared here. The generated go.mod uses
+  # a relative replace to the sibling SDK at ../go and declares the
+  # MCP Go SDK as a direct dep. See Main_go-mcp.ts.
   deps: {}
 }
 
 
-// Feature-deps map slot — every target carries this so the same
-// feature can specify per-target dep variants.
+# Feature-deps map slot — every target carries this so the same
+# feature can specify per-target dep variants.
 main: kit: feature: &: target: 'go-mcp': deps: &: {
   kind: *'prod' | string
 }

package/project/.sdk/model/target/go.aontu

@@ -11,7 +11,7 @@ main: kit: target: go: {
     kind: *'prod' | string
   }
 
-  // struct is inlined under <gomodule>/utility/struct — no external dep.
+  # struct is inlined under <gomodule>/utility/struct — no external dep.
   deps: {}
 }
 

package/project/.sdk/model/target/java.aontu

@@ -10,10 +10,10 @@ main: kit: target: java: {
     kind: *'prod' | string
   }
 
-  // struct is inlined under utility/struct — no external runtime dep.
-  // JSON parsing is the zero-dep utility/Json.java; HTTP transport is
-  // java.net.http.HttpClient (JDK built-in). Tests need only JUnit,
-  // declared directly in the generated pom.xml (test scope).
+  # struct is inlined under utility/struct — no external runtime dep.
+  # JSON parsing is the zero-dep utility/Json.java; HTTP transport is
+  # java.net.http.HttpClient (JDK built-in). Tests need only JUnit,
+  # declared directly in the generated pom.xml (test scope).
   deps: {}
 }
 

package/project/.sdk/model/target/kotlin.aontu

@@ -10,10 +10,10 @@ main: kit: target: kotlin: {
     kind: *'prod' | string
   }
 
-  // struct is inlined under utility/struct — no external runtime dep.
-  // JSON parsing is the zero-dep utility/Json.kt; HTTP transport is
-  // java.net.http.HttpClient (JDK built-in). Tests need only JUnit,
-  // declared directly in the generated build.gradle.kts (test scope).
+  # struct is inlined under utility/struct — no external runtime dep.
+  # JSON parsing is the zero-dep utility/Json.kt; HTTP transport is
+  # java.net.http.HttpClient (JDK built-in). Tests need only JUnit,
+  # declared directly in the generated build.gradle.kts (test scope).
   deps: {}
 }
 

package/project/.sdk/model/target/lean.aontu

@@ -0,0 +1,51 @@
+
+main: kit: target: lean: {
+
+  title: Lean
+  ext: lean
+  comment: line: "--"
+  module: name: '$$name$$'
+  srcfeature: false
+
+  # Entities are generic (config-driven F.makeEntity), so no per-entity or
+  # per-feature generated modules — the same model as the Haskell target. The
+  # readme + agentguide phases read the API model directly (not per-entity
+  # generated code), so they are active; entity/feature generation stays off.
+  phase: {
+    entity:     { active: false }
+    feature:    { active: false }
+    readme:     { active: true }
+    agentguide: { active: true }
+    test:       { active: true }
+  }
+
+  deps: &: {
+    kind: *'prod' | string
+  }
+
+  # struct is vendored under src/ (VoxgigStruct.lean + Vregex.lean) and the
+  # runtime is dependency-free: it compiles with the stock Lean 4 toolchain
+  # (only the built-in prelude + Std), no Lake package dependencies. The HTTP
+  # transport shells out to `curl` via IO.Process, so there are no manifest
+  # deps.
+  deps: {}
+}
+
+
+main: kit: feature: &: target: lean: deps: &: {
+  kind: *'prod' | string
+}
+
+
+# Publication: Reservoir (Lean package index) — declared, publish pending
+# (git-tag only for now).
+main: kit: target: lean: publish: {
+  tag: { active: true }
+  registry: {
+    state: 'pending'
+    active: false
+    name: 'reservoir'
+    url: 'https://reservoir.lean-lang.org'
+    vault: { alias: 'reservoir', env: 'RESERVOIR_TOKEN' }
+  }
+}

package/project/.sdk/model/target/scala.aontu

@@ -10,10 +10,10 @@ main: kit: target: scala: {
     kind: *'prod' | string
   }
 
-  // struct is inlined under utility/struct — no external runtime dep.
-  // JSON parsing is the zero-dep utility/Json.java; HTTP transport is
-  // java.net.http.HttpClient (JDK built-in). The corpus runner and pipeline
-  // tests are plain scala-cli mains (no test-framework dependency).
+  # struct is inlined under utility/struct — no external runtime dep.
+  # JSON parsing is the zero-dep utility/Json.java; HTTP transport is
+  # java.net.http.HttpClient (JDK built-in). The corpus runner and pipeline
+  # tests are plain scala-cli mains (no test-framework dependency).
   deps: {}
 }
 

package/project/.sdk/src/cmp/c/EntityTypes_c.ts

@@ -28,11 +28,11 @@
 // <Name>RemoveMatch.
 
 import {
-  cmp, each, names,
+  cmp, each,
   File, Content, Folder,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -93,8 +93,7 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // Emit for every entity that gets an entity file (filter on `name`, always
   // present; derive `Name` here so the struct set is deterministic — parity
   // with the go/rust emitters' fix).
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
+  const entityList = deriveEntityNames(entity)
 
   // Surface duplicate generated type names (two entities with the same
   // PascalCase Name) — they would redeclare a type in statically-typed

package/project/.sdk/src/cmp/c/Entity_c.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify,
   File, Content, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -20,7 +20,7 @@ const Entity = cmp(function Entity(props: any) {
   const { model, stdrep } = props.ctx$
   const { target, entity } = props
 
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
   const evar = cVarName(entity.name)
 
@@ -34,7 +34,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: evar + '.c' }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       // For each CRUD op: splice the real implementation when the spec
       // defines it, otherwise emit a stub that errors at runtime (so the

package/project/.sdk/src/cmp/c/ReadmeExamplesTest_c.ts

@@ -67,22 +67,31 @@ static void ltrim_eq_buf(const char* start, const char* end, char* out, size_t c
   out[len] = '\\0';
 }
 
-// Balanced (), [], {} outside of string literals. Naive quote toggle: the
-// generated snippets never embed an escaped quote inside a string.
+// Balanced (), [], {} outside of string literals, with each closer matching
+// the most-recent opener (so "([)]" is rejected, not just counted). Naive
+// quote toggle: the generated snippets never embed an escaped quote inside a
+// string.
 static int is_balanced(const char* block, size_t len) {
   int in_str = 0;
-  int depth = 0;
+  // Depth can never exceed len; a per-call heap stack keeps this reentrant.
+  char* stack = (char*)malloc(len + 1);
+  if (!stack) return 0;
+  size_t top = 0;
   for (size_t i = 0; i < len; i++) {
     char c = block[i];
     if (c == '"') { in_str = !in_str; continue; }
     if (in_str) continue;
-    if (c == '(' || c == '[' || c == '{') depth++;
+    if (c == '(') stack[top++] = ')';
+    else if (c == '[') stack[top++] = ']';
+    else if (c == '{') stack[top++] = '}';
     else if (c == ')' || c == ']' || c == '}') {
-      depth--;
-      if (depth < 0) return 0;
+      if (top == 0 || stack[top - 1] != c) { free(stack); return 0; }
+      top--;
     }
   }
-  return depth == 0 && !in_str;
+  int ok = (top == 0 && !in_str);
+  free(stack);
+  return ok;
 }
 
 // Scan one doc: for every \`\`\`c ... \`\`\` block, check non-empty + balanced.
@@ -126,6 +135,14 @@ static int check_doc(const char* label, const char* path) {
     p = nl + 1;
   }
 
+  // A fence opened but never closed is a malformed doc — fail rather than
+  // silently skipping the unterminated block.
+  {
+    char msg[128];
+    snprintf(msg, sizeof(msg), "%s: c fence closed", label);
+    CHECK(!in_block, msg);
+  }
+
   free(src);
   return blocks;
 }

package/project/.sdk/src/cmp/c/TestDirect_c.ts

@@ -64,15 +64,15 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const evar = cVarName(entity.name)
   const Name = model.const.Name
 
-  const opnames = Object.keys(entity.op)
+  const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
   if (!hasLoad && !hasList) {
     return
   }
 
-  const loadOp = (entity.op as any).load
-  const listOp = (entity.op as any).list
+  const loadOp = (entity.op as any)?.load
+  const listOp = (entity.op as any)?.list
 
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''

package/project/.sdk/src/cmp/c/TestEntity_c.ts

@@ -44,7 +44,7 @@ int main(void) {
     // The stream test drives the list op; only emit it when the entity has a
     // list op — a create/load-only entity has no list endpoint, so
     // stream("list") would error.
-    const hasList = null != (entity.op && (entity.op as any).list)
+    const hasList = null != (entity.op && (entity.op as any)?.list)
     if (hasList) {
       Content(`
   // stream(): runs the list op through the full pipeline and returns a List

package/project/.sdk/src/cmp/clojure/Entity_clojure.ts

@@ -31,7 +31,7 @@ const Entity = cmp(function Entity(props: any) {
 
         File({ name: entity.name + '.' + target.ext }, () => {
 
-          const opnames = Object.keys(entity.op)
+          const opnames = Object.keys(entity.op || {})
 
           // For each CRUD op: splice the real implementation when the spec
           // defines it; otherwise leave the slot empty (the fn is simply not

package/project/.sdk/src/cmp/clojure/ReadmeExamplesTest_clojure.ts

@@ -20,9 +20,10 @@ import { cmp, Content } from '@voxgig/sdkgen'
 // TS template literal needs no embedded backticks.
 const ReadmeExamplesTest = cmp(function ReadmeExamplesTest(_props: any) {
 
-  Content(`  (letfn [(clj-blocks [text]
-            (let [fence (apply str (repeat 3 (char 96)))
-                  parts (clojure.string/split text (re-pattern fence))]
+  Content(`  (letfn [(fence-pat [] (re-pattern (apply str (repeat 3 (char 96)))))
+          (fence-count [text] (count (re-seq (fence-pat) text)))
+          (clj-blocks [text]
+            (let [parts (clojure.string/split text (fence-pat))]
               (->> parts
                    (map-indexed vector)
                    (filter (fn [[i _]] (odd? i)))
@@ -40,11 +41,21 @@ const ReadmeExamplesTest = cmp(function ReadmeExamplesTest(_props: any) {
         (fn []
           (if-not (.exists (java.io.File. ^String path))
             (t/is-true true (str label " absent (skipped)"))
-            (let [blocks (clj-blocks (slurp path))]
-              (doseq [b blocks]
-                (binding [*read-eval* false]
-                  (read-string (str "[\\n" b "\\n]"))))
-              (t/is-true true (str label " clojure blocks parse cleanly"))))))))
+            (let [text (slurp path)]
+              ;; A code fence opened but never closed leaves an ODD number of
+              ;; fence markers; the split-on-fence then captures the trailing
+              ;; prose (everything after the last opener) as if it were a
+              ;; clojure block, which can parse cleanly and pass silently. Fail
+              ;; on the malformed doc instead. (Count markers directly rather
+              ;; than split parts: split drops trailing empty segments, so a
+              ;; closing fence at EOF would be miscounted.)
+              (t/is-true (even? (fence-count text))
+                         (str label " code fences balanced (no unclosed fence)"))
+              (let [blocks (clj-blocks text)]
+                (doseq [b blocks]
+                  (binding [*read-eval* false]
+                    (read-string (str "[\\n" b "\\n]"))))
+                (t/is-true true (str label " clojure blocks parse cleanly")))))))))
 `)
 })
 

package/project/.sdk/src/cmp/cpp/EntityTypes_cpp.ts

@@ -27,6 +27,7 @@ import {
   cmp, each, names,
   File, Content,
   canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions,
+  deriveEntityNames,
 } from '@voxgig/sdkgen'
 
 import {
@@ -99,9 +100,8 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // filter, so inactive entities still get class files referencing these
   // typed names. Filter on `name` (always present), NOT `active` — parity
   // with the go emitter's fix.
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
+  const entityList = deriveEntityNames(entity)
   // Derive the PascalCase Name up-front — it is set LAZILY by names().
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
 
   // Surface duplicate generated type names (two entities with the same
   // PascalCase Name) — they would redeclare a type in statically-typed

package/project/.sdk/src/cmp/cpp/Entity_cpp.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify,
   File, Content, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -20,7 +20,7 @@ const Entity = cmp(function Entity(props: any) {
   const { model, stdrep } = props.ctx$
   const { target, entity } = props
 
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -33,7 +33,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: cppVarName(entity.name) + '.' + target.ext }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       // For each CRUD op: splice the real method if the spec defines it, else
       // a stub that satisfies the SdkEntity interface but throws at runtime.

package/project/.sdk/src/cmp/cpp/MainEntity_cpp.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -16,7 +16,7 @@ const MainEntity = cmp(async function MainEntity(props: any) {
   const { entity } = props
   const { model } = props.ctx$
 
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
   const accessor = cppVarName(entity.name)
 

package/project/.sdk/src/cmp/cpp/ReadmeExamplesTest_cpp.ts

@@ -0,0 +1,136 @@
+
+import { cmp, Content, File } from '@voxgig/sdkgen'
+
+
+// Emits test/readme_examples_test.cpp — a structural gate over every ```cpp
+// fenced block in the docs that ship C++ examples:
+//   - the root README.md          (top-level, multi-language quick start)
+//   - the per-language cpp/README.md
+//   - the per-language cpp/REFERENCE.md
+//
+// DESIGN NOTE (mirrors ReadmeExamplesTest_c): the go gate shells out to
+// `go build`/`go run` to COMPILE and RUN every block. A faithful C++ port
+// would extract each snippet, wrap it in a translation unit, and drive the
+// bundled Makefile / c++ against the header-only runtime — a large,
+// environment-sensitive harness that cannot be authored safely here. This gate
+// instead validates that every documented C++ block is PRESENT and
+// STRUCTURALLY well-formed (balanced ()[]{}, non-empty). It is a real,
+// always-passing test that keeps the docs honest about block structure;
+// upgrading it to a true compile gate is left as a follow-up. Missing docs are
+// tolerated (a run may generate a subset of phases).
+//
+// The test binary runs with the C++ project root as its working directory, so
+// the doc paths resolve as "README.md", "REFERENCE.md", and "../README.md".
+const ReadmeExamplesTest = cmp(function ReadmeExamplesTest(props: any) {
+  const { model } = props.ctx$
+
+  File({ name: 'readme_examples_test.cpp' }, () => {
+    Content(`// Structural gate over every \`\`\`cpp block in the ${model.const.Name} SDK docs
+// (root README.md, cpp/README.md, cpp/REFERENCE.md). Generated by
+// @voxgig/sdkgen — do not edit by hand.
+//
+// Validates that each documented C++ block is present, non-empty, and has
+// balanced delimiters. Missing docs are tolerated. See ReadmeExamplesTest_cpp
+// for why this is a structural gate rather than a full compile harness.
+
+#include "testlib.hpp"
+
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+using namespace sdk;
+
+// Read an entire file into a string, or "" if absent.
+static std::string read_file(const std::string& path) {
+  std::ifstream f(path, std::ios::binary);
+  if (!f) return std::string();
+  std::ostringstream ss;
+  ss << f.rdbuf();
+  return ss.str();
+}
+
+// Trim leading/trailing whitespace (fence lines are short).
+static std::string trim(const std::string& s) {
+  size_t a = s.find_first_not_of(" \\t\\r\\n");
+  if (a == std::string::npos) return std::string();
+  size_t b = s.find_last_not_of(" \\t\\r\\n");
+  return s.substr(a, b - a + 1);
+}
+
+// Balanced (), [], {} outside of string literals, with each closer matching
+// the most-recent opener (so "([)]" is rejected, not just counted). Naive
+// quote toggle: the generated snippets never embed an escaped quote inside a
+// string.
+static bool is_balanced(const std::string& block) {
+  bool in_str = false;
+  std::vector<char> stack;
+  for (char c : block) {
+    if (c == '"') { in_str = !in_str; continue; }
+    if (in_str) continue;
+    if (c == '(') stack.push_back(')');
+    else if (c == '[') stack.push_back(']');
+    else if (c == '{') stack.push_back('}');
+    else if (c == ')' || c == ']' || c == '}') {
+      if (stack.empty() || stack.back() != c) return false;
+      stack.pop_back();
+    }
+  }
+  return stack.empty() && !in_str;
+}
+
+// Scan one doc: for every \`\`\`cpp ... \`\`\` block, check non-empty + balanced.
+// Returns the number of blocks seen (0 if the file is absent).
+static int check_doc(const std::string& label, const std::string& path) {
+  std::string src = read_file(path);
+  if (src.empty()) return 0; // doc not generated in this run — tolerate
+
+  int blocks = 0;
+  bool in_block = false;
+  std::string block;
+  std::istringstream in(src);
+  std::string line;
+  while (std::getline(in, line)) {
+    std::string t = trim(line);
+    if (!in_block) {
+      if (t == "\`\`\`cpp") { in_block = true; block.clear(); }
+    } else if (t == "\`\`\`") {
+      std::string body = trim(block);
+      ASSERT_TRUE(!body.empty(), label + ": cpp block " + std::to_string(blocks + 1) + " non-empty");
+      ASSERT_TRUE(is_balanced(body), label + ": cpp block " + std::to_string(blocks + 1) + " balanced");
+      blocks++;
+      in_block = false;
+    } else {
+      block += line;
+      block += '\\n';
+    }
+  }
+  // A fence opened but never closed is a malformed doc — fail rather than
+  // silently skipping the unterminated block.
+  ASSERT_TRUE(!in_block, label + ": cpp fence closed");
+  return blocks;
+}
+
+static void readme_examples_gate() {
+  int total = 0;
+  total += check_doc("root README", "../README.md");
+  total += check_doc("cpp/README", "README.md");
+  total += check_doc("cpp/REFERENCE", "REFERENCE.md");
+  // Missing docs are tolerated (a run may generate a subset of phases), so a
+  // zero total is not a failure — the per-block checks above carry the gate.
+  std::printf("readme_examples: scanned %d cpp block(s)\\n", total);
+}
+
+int main() {
+  T_RUN(readme_examples_gate);
+  return sdktest::summary("readme_examples_test");
+}
+`)
+  })
+})
+
+
+export {
+  ReadmeExamplesTest
+}

package/project/.sdk/src/cmp/cpp/TestDirect_cpp.ts

@@ -60,15 +60,15 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const ProjectName = model.const.Name
 
-  const opnames = Object.keys(entity.op)
+  const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
   if (!hasLoad && !hasList) {
     return
   }
 
-  const loadOp = (entity.op as any).load
-  const listOp = (entity.op as any).list
+  const loadOp = (entity.op as any)?.load
+  const listOp = (entity.op as any)?.list
 
   const loadPoint = loadOp?.points?.[0]
   const loadPath = loadPoint ? normalizePathParams(loadPoint.parts || [], loadPoint?.args?.params || [], loadPoint?.rename?.param) : ''

package/project/.sdk/src/cmp/cpp/Test_cpp.ts

@@ -13,6 +13,7 @@ import { cmp, each, Folder } from '@voxgig/sdkgen'
 
 import { TestEntity } from './TestEntity_cpp'
 import { TestDirect } from './TestDirect_cpp'
+import { ReadmeExamplesTest } from './ReadmeExamplesTest_cpp'
 
 
 const Test = cmp(function Test(props: any) {
@@ -27,6 +28,9 @@ const Test = cmp(function Test(props: any) {
       TestEntity({ target, entity })
       TestDirect({ target, entity })
     })
+
+    // Validate the documented C++ examples in the READMEs are well-formed.
+    ReadmeExamplesTest({ target })
   })
 })
 

package/project/.sdk/src/cmp/csharp/EntityTypes_csharp.ts

@@ -34,7 +34,7 @@ import {
   File, Content,
 } from '@voxgig/sdkgen'
 
-import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions } from '@voxgig/sdkgen'
+import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -133,11 +133,10 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   // filter, so inactive entities still get class files referencing these
   // typed names. Filter on `name` (always present), NOT `active` — parity
   // with the go emitter's fix.
-  const entityList = each(entity).filter((e: any) => e && null != e.name)
+  const entityList = deriveEntityNames(entity)
   // Derive the PascalCase Name up-front — it is set LAZILY by names(), so an
   // entity not yet named (e.g. a fieldless placeholder) would otherwise read
   // `Name = undefined` below. Parity with the go/py emitter's fix.
-  entityList.forEach((e: any) => { if (null == e.Name) names(e, e.name) })
 
   // Surface duplicate generated type names (two entities with the same
   // PascalCase Name) — they would redeclare a type in statically-typed

package/project/.sdk/src/cmp/csharp/Entity_csharp.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify, names,
   Content, File, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -22,7 +22,7 @@ const Entity = cmp(function Entity(props: any) {
   // Collision-free entity CLASS name (see entityClassName): normally
   // `<Name>Entity`, but disambiguated when it would clash with another
   // entity's data-type name.
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   const entrep = {
@@ -38,7 +38,7 @@ const Entity = cmp(function Entity(props: any) {
 
     File({ name: cls + '.' + target.ext }, () => {
 
-      const opnames = Object.keys(entity.op)
+      const opnames = Object.keys(entity.op || {})
 
       // For each CRUD op: if the spec defines it, splice in the real
       // implementation (an override). Otherwise leave the base-class

package/project/.sdk/src/cmp/csharp/MainEntity_csharp.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, entityClassName } from '@voxgig/sdkgen'
+import { cmp, Content, entityClassName, entityCollection } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -12,7 +12,7 @@ const MainEntity = cmp(async function MainEntity(props: any) {
   const { model } = props.ctx$
 
   // Collision-free entity CLASS name (see entityClassName).
-  const entityColl = getModelPath(model, `main.${KIT}.entity`)
+  const entityColl = entityCollection(model)
   const cls = entityClassName(entity, entityColl)
 
   // C# keeps the PascalCase accessor: public members are PascalCase, so a

package/project/.sdk/src/cmp/csharp/Package_csharp.ts

@@ -31,7 +31,7 @@ const Package = cmp(async function Package(props: any) {
   const { repoUrl } = repoInfo(model)
 
   const deps: Record<string, string> = {}
-  for (const d of collectDeps(model, target.name, target.deps)) {
+  for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
     deps[d.name] = d.source === 'target' ? (d.version || '0.0.0') : d.version
   }