@voxgig/sdkgen 1.3.17 → 1.3.19

package/project/.sdk/src/cmp/go/TestEntity_go.ts

@@ -59,7 +59,7 @@ const TestEntity = cmp(function TestEntity(props: any) {
   // it only applies to entities that declare a list op. Others (e.g. Batch =
   // create/load) have no list endpoint — make_point errors and the stream
   // yields nothing — so skip the stream test for them.
-  const hasList = !!(entity.op && (entity.op as any).list)
+  const hasList = !!(entity.op && (entity.op as any)?.list)
 
   const basicflow: ModelEntityFlow | undefined =
     getModelPath(model, `main.${KIT}.flow.Basic${nom(entity, 'Name')}Flow`)

package/project/.sdk/src/cmp/go/utility_go.ts

@@ -7,6 +7,7 @@ import {
   canonKey,
   each,
   exampleVarName,
+  names,
 } from '@voxgig/sdkgen'
 
 import {
@@ -149,7 +150,31 @@ function clean(o: any) {
 }
 
 
+
+// The Go identifier fragment for a feature's generated constructor
+// (New<Fname>Feature / New<Fname>FeatureFunc).
+//
+// SHARED because the identifier is DECLARED in Main_go.ts (registry.go and the
+// root init()) and REFERENCED in Config_go.ts (makeFeature). Two copies of the
+// derivation is a latent undefined-identifier bug in the generated SDK: they
+// were both `name.charAt(0).toUpperCase() + name.slice(1)`, consistently wrong
+// for a name needing real normalisation but at least agreeing, until one side
+// was fixed alone and `rate_limit` became NewRateLimitFeatureFunc in the
+// registry and NewRate_limitFeatureFunc in config.
+//
+// Uses the jostraca-derived PascalCase `Name` (deriving it if absent), which is
+// what Main_ts.ts uses, so a hyphenated or underscored feature name yields a
+// legal Go identifier instead of `NewRate-limitFeatureFunc`.
+function goFeatureName(feat: any): string {
+  if (null == feat.Name) {
+    names(feat, feat.name)
+  }
+  return feat.Name
+}
+
+
 export {
+  goFeatureName,
   clean,
   exampleValue,
   formatGoMap,

package/project/.sdk/src/cmp/go-cli/Main_go-cli.ts

@@ -2,7 +2,7 @@
 import * as Path from 'node:path'
 
 import {
-  cmp, each,
+  cmp, each, deriveEntityNames,
   File, Content, Fragment, Slot,
 } from '@voxgig/sdkgen'
 
@@ -16,18 +16,32 @@ import {
 } from '@voxgig/apidef'
 
 
-// Published aql/eng/go version. Tagged at aql-lang/aql under
-// eng/go/v<X.Y.Z>. Bump here when adopting a newer engine.
-const AQL_ENG_VERSION = 'v0.0.1'
+// Published boru/eng/go version. The engine module
+// github.com/boru-lang/boru/eng/go is not yet tagged under the boru path (the
+// eng/go/v0.0.1 tag predates the aql->boru rename and still declares the old
+// aql-lang/aql module path), so we pin a commit pseudo-version. Bump here —
+// to a real eng/go/v<X.Y.Z> once one is published, or a newer pseudo-version —
+// when adopting a newer engine.
+const BORU_ENG_VERSION = 'v0.0.2-0.20260804163932-0d66b55c5110'
 
-// go.sum entries for AQL_ENG_VERSION and its transitive deps. The sibling
+// go.sum entries for BORU_ENG_VERSION and its transitive deps. The sibling
 // SDK dep needs no entry (path replace). Deterministic because the version
 // is pinned above — regenerate with `go mod tidy` and update BOTH constants
-// together when bumping AQL_ENG_VERSION.
-const AQL_ENG_GOSUM = `github.com/aql-lang/aql/eng/go v0.0.1 h1:qvopmpIX5xL6cpAC4otSUO7fUDA46x/y+2lT2zoxTaA=
-github.com/aql-lang/aql/eng/go v0.0.1/go.mod h1:7LmNG+pASY2jlPZB0iFAt/ZNdmc8qxvaf+njVmaSFks=
-github.com/jsonicjs/jsonic/go v0.1.6 h1:oUw4vxCK6tqa7SGN87vjCtx3sCpeHXdqfl25hx5LKP0=
-github.com/jsonicjs/jsonic/go v0.1.6/go.mod h1:ObNKlCG7esWoi4AHCpdgkILvPINV8bpvkbCd4llGGUg=
+// together when bumping BORU_ENG_VERSION.
+const BORU_ENG_GOSUM = `github.com/boru-lang/boru/eng/go v0.0.2-0.20260804163932-0d66b55c5110 h1:iwMbEPhByhVhJgt6xhyhT+jXMiARvbG4wHIrc4OPcvU=
+github.com/boru-lang/boru/eng/go v0.0.2-0.20260804163932-0d66b55c5110/go.mod h1:KQLjjCq4QVAfdSuhmQ58ZFA9JK7LV2+A/aLRb3m4s5k=
+github.com/cockroachdb/apd/v3 v3.2.3 h1:4Zx+I3R35bFXMnltzmjP79i2cravE4jTRL6ps9Aux80=
+github.com/cockroachdb/apd/v3 v3.2.3/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/tabnas/debug/go v0.2.3 h1:cptiwHcHKw+lqtZuKp6gX7yY1NunJLS5PHD7ykVcIvM=
+github.com/tabnas/debug/go v0.2.3/go.mod h1:EXSNFdN6Ct9pcAUk8ZGozNbIltb3Hw0wcne+5vWQyns=
+github.com/tabnas/json/go v0.4.0 h1:1BxLHyCullkKXkvui/SuZ4s6OMrFVDuEB13IX/5S1eM=
+github.com/tabnas/json/go v0.4.0/go.mod h1:MJzyziKcvZk3OZCaSDxhMdf/Wkq2UJ0uLGWFtp9zsJs=
+github.com/tabnas/jsonic/go v0.4.0 h1:y5k/P21C3q3jWaA+VxEhXxzZ8xJgpgAehMBEseDN31g=
+github.com/tabnas/jsonic/go v0.4.0/go.mod h1:eDpkddhkuTFuIXMkSqTZl7cU7M23swbMpkXR1W5bApQ=
+github.com/tabnas/parser/go v0.4.0 h1:M8+qRT4KaCtr4OCpg9NDNUXJIdbbweqeqbpEpVGNEqU=
+github.com/tabnas/parser/go v0.4.0/go.mod h1:WrlfEVyZ1QjEIowWiyEu3K1iHj7wxuPut5zoH9Trehk=
 `
 
 
@@ -40,6 +54,14 @@ const Main = cmp(function Main(props: any) {
   const cliModule = `github.com/${org}/${model.name}-sdk/go-cli`
 
   const entityMap: any = getModelPath(model, `main.${KIT}.entity`)
+  // Derive each entity's PascalCase `Name` here rather than relying on another
+  // TARGET having run first. This target sets `phase.entity: { active: false }`
+  // (see model/target/go-{cli,mcp}.aontu), so create-sdkgen's Root.ts never
+  // calls names() for it — the accessor emitted below used to read `Name` off
+  // objects the `go` target happened to have named as a side effect, which
+  // yields `client.undefined(nil)` whenever this target is generated without
+  // `go`, or before it in target order.
+  deriveEntityNames(entityMap)
   const entityNames = Object.keys(entityMap).map(n => n.toLowerCase())
 
   const FRAGMENT = Path.normalize(__dirname + '/../../../src/cmp/go-cli/fragment')
@@ -56,7 +78,7 @@ const Main = cmp(function Main(props: any) {
   // EVERYTHING here is MODEL-DRIVEN: verbs, examples and how-to sections are
   // gated on whether an active entity actually exposes that op
   // (op.<name>.active !== false) — never document an operation no entity
-  // supports. The CLI implements three AQL words (list / load / update; see
+  // supports. The CLI implements three boru words (list / load / update; see
   // words.fragment.go + runOp).
   // ==========================================================================
   const bin = `${model.name}-cli`
@@ -121,7 +143,7 @@ const Main = cmp(function Main(props: any) {
   ex.push('# 3. Provide credentials once, via the environment')
   ex.push(`export ${apiKeyEnv}=sk_live_xxx`)
   ex.push('')
-  ex.push('# 4. Each command line is ONE AQL expression, run against the API:')
+  ex.push('# 4. Each command line is ONE boru expression, run against the API:')
   if (firstHas('list')) ex.push(`./${bin} list ${firstEntity}`)
   if (firstHas('load')) {
     ex.push(`./${bin} load 1 ${firstEntity}            # {id:1} shorthand`)
@@ -150,7 +172,7 @@ const Main = cmp(function Main(props: any) {
 \`\`\`
 
 \`list <entity>\` returns the first page of records. \`<entity>\` is a bareword —
-it is auto-quoted as an AQL atom, so no quotes are needed.`)
+it is auto-quoted as an boru atom, so no quotes are needed.`)
 
   if (firstHas('load')) howtos.push(`### Load a single record
 
@@ -186,7 +208,7 @@ Both are injectable by a secrets vault, so the key never has to be typed inline.
   howtos.push(`### Explore interactively with the REPL
 
 Run with no arguments to open a REPL (prompt \`${model.name}>\`). Each line is
-evaluated as its own AQL expression:
+evaluated as its own boru expression:
 
 \`\`\`text
 $ ./${bin}
@@ -210,10 +232,10 @@ below — this SDK exposes ${entityCount} ${entityNoun}.`)
 
   File({ name: 'README.md' }, () => Content(`# ${model.name}-cli
 
-AQL-driven command-line client **and** interactive REPL for the ${model.Name}
-SDK. Each command line is parsed as a single [AQL](https://github.com/aql-lang/aql)
+boru-driven command-line client **and** interactive REPL for the ${model.Name}
+SDK. Each command line is parsed as a single [boru](https://github.com/boru-lang/boru)
 expression and evaluated against the live API; run it with no arguments to drop
-into a REPL. Built on \`github.com/aql-lang/aql/eng/go\` and the sibling Go SDK
+into a REPL. Built on \`github.com/boru-lang/boru/eng/go\` and the sibling Go SDK
 at \`../go\`.
 
 ## Examples
@@ -240,7 +262,7 @@ ${exampleBlock}
    export ${apiKeyEnv}=sk_live_xxx
    \`\`\`
 
-3. **Run a query.** Evaluate an AQL expression against the API (or run with no
+3. **Run a query.** Evaluate an boru expression against the API (or run with no
    arguments to open the REPL):
 
    \`\`\`sh
@@ -250,7 +272,7 @@ ${exampleBlock}
 4. **Go interactive.** Run the binary with no arguments to open the REPL, then
    type \`/help\` for the word and entity lists and \`/quit\` to leave.
 
-That is the whole loop: *build → set key → evaluate AQL expressions*.
+That is the whole loop: *build → set key → evaluate boru expressions*.
 
 ## How-to guides
 
@@ -260,13 +282,13 @@ ${howtoBlock}
 
 ### Words
 
-The CLI registers these AQL words, each bound to the SDK:
+The CLI registers these boru words, each bound to the SDK:
 
 | Word     | Signatures                                    | Returns                        |
 |----------|-----------------------------------------------|--------------------------------|
 ${verbRows}
 
-- \`<entity>\` is a bareword, auto-quoted as an AQL atom (e.g. \`${firstEntity}\`).
+- \`<entity>\` is a bareword, auto-quoted as an boru atom (e.g. \`${firstEntity}\`).
 - \`<query>\` is either a **Map** (\`{id:1}\`) or a **Scalar** (\`1\`, treated as
   \`{id:1}\`). A scalar is always wrapped as \`{id:<value>}\`.
 
@@ -285,7 +307,7 @@ Unset variables fall back to the SDK's built-in defaults.
 
 ### REPL commands
 
-Meta-commands use the \`/\` prefix (everything else on a line is evaluated as AQL):
+Meta-commands use the \`/\` prefix (everything else on a line is evaluated as boru):
 
 - \`/quit\` / \`/q\` / \`/exit\` — exit the REPL
 - \`/help\` / \`/h\` / \`/?\`     — show the word list, entity list and meta commands
@@ -313,25 +335,25 @@ ${entityList}
 
 ## Explanation
 
-### Why AQL?
+### Why boru?
 
-The whole command line is one [AQL](https://github.com/aql-lang/aql) expression,
+The whole command line is one [boru](https://github.com/boru-lang/boru) expression,
 not a fixed \`verb --flag\` grammar. That means the same binary works one-shot
 (\`./${bin} <expr>\`) and interactively (the REPL), and expressions compose the
-same way in both. \`list\` / \`load\` / \`update\` are ordinary AQL *words* bound to
+same way in both. \`list\` / \`load\` / \`update\` are ordinary boru *words* bound to
 the SDK — adding SDK operations is adding words, not re-parsing flags.
 
 ### How it is wired
 
 \`main.go\` builds the SDK client (configured from the environment), creates an
-AQL registry, and \`words.go\` registers \`list\` / \`load\` / \`update\` as native
+boru registry, and \`words.go\` registers \`list\` / \`load\` / \`update\` as native
 words that dispatch on the entity atom and call the sibling Go SDK at \`../go\`.
 Results are unwrapped from their \`Entity\` wrappers to plain data before being
 printed.
 
 ### Output format
 
-Each result value is printed as its AQL string form (a JSON-like rendering of
+Each result value is printed as its boru string form (a JSON-like rendering of
 the record or list of records). One-shot mode prints to stdout; errors go to
 stderr with a non-zero exit code.
 
@@ -342,25 +364,30 @@ this repo, or upstream at
 \`github.com/voxgig/sdkgen/project/.sdk/src/cmp/go-cli/\`.
 `))
 
-  // go.mod — sibling SDK via relative replace; aql/eng/go from the
-  // public Go module proxy. The go directive must be >= aql/eng/go's own
-  // (go 1.24.7 at eng/go/v0.0.1) — keep in step with AQL_ENG_VERSION.
+  // go.mod — sibling SDK via relative replace; boru/eng/go from the
+  // public Go module proxy. The go directive must be >= boru/eng/go's own
+  // (go 1.24.7) — keep in step with BORU_ENG_VERSION.
   File({ name: 'go.mod' }, () => Content(`module ${cliModule}
 
 go 1.24.7
 
 require ${sdkModule} v0.0.0
-require github.com/aql-lang/aql/eng/go ${AQL_ENG_VERSION}
+require github.com/boru-lang/boru/eng/go ${BORU_ENG_VERSION}
 
-require github.com/jsonicjs/jsonic/go v0.1.6 // indirect
+require (
+	github.com/cockroachdb/apd/v3 v3.2.3 // indirect
+	github.com/tabnas/json/go v0.4.0 // indirect
+	github.com/tabnas/jsonic/go v0.4.0 // indirect
+	github.com/tabnas/parser/go v0.4.0 // indirect
+)
 
 replace ${sdkModule} => ../go
 `))
 
-  // go.sum — required for `go build` to accept the aql/eng/go dependency
+  // go.sum — required for `go build` to accept the boru/eng/go dependency
   // (the path-replaced sibling SDK needs no entry). Pinned alongside
-  // AQL_ENG_VERSION above.
-  File({ name: 'go.sum' }, () => Content(AQL_ENG_GOSUM))
+  // BORU_ENG_VERSION above.
+  File({ name: 'go.sum' }, () => Content(BORU_ENG_GOSUM))
 
   // Makefile — `make build` for the current machine, `make build-all` to
   // cross-compile for the three desktop OSes (linux, darwin, windows) on

package/project/.sdk/src/cmp/go-cli/fragment/main.fragment.go

@@ -1,6 +1,6 @@
 // Command ProjectName-cli is a CLI + REPL for the ProjectName SDK,
-// built on the AQL engine. Positional arguments are joined into a
-// single AQL expression and evaluated; with no arguments, falls into
+// built on the boru engine. Positional arguments are joined into a
+// single boru expression and evaluated; with no arguments, falls into
 // a REPL. Generated by sdkgen go-cli target.
 package main
 
@@ -11,8 +11,8 @@ import (
 	"os"
 	"strings"
 
-	eng "github.com/aql-lang/aql/eng/go"
-	"github.com/aql-lang/aql/eng/go/parser"
+	eng "github.com/boru-lang/boru/eng/go"
+	"github.com/boru-lang/boru/eng/go/parser"
 	sdk "GOMODULE"
 )
 
@@ -28,10 +28,10 @@ func main() {
 
 // usage prints the CLI help (for --help / -h). No client or network setup.
 func usage(out io.Writer) {
-	fmt.Fprintf(out, "%s-cli — AQL-driven CLI + REPL for the %s SDK\n\n", prompt, prompt)
+	fmt.Fprintf(out, "%s-cli — boru-driven CLI + REPL for the %s SDK\n\n", prompt, prompt)
 	fmt.Fprintln(out, "Usage:")
-	fmt.Fprintf(out, "  %s-cli [--help] [<AQL expression>]\n\n", prompt)
-	fmt.Fprintln(out, "With arguments, they are joined into a single AQL expression and")
+	fmt.Fprintf(out, "  %s-cli [--help] [<boru expression>]\n\n", prompt)
+	fmt.Fprintln(out, "With arguments, they are joined into a single boru expression and")
 	fmt.Fprintln(out, "evaluated against the API. With no arguments, starts an interactive REPL.")
 	fmt.Fprintln(out)
 	fmt.Fprintln(out, "Words:    list / load / update <query?> <entity>")

package/project/.sdk/src/cmp/go-cli/fragment/words.fragment.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"strings"
 
-	eng "github.com/aql-lang/aql/eng/go"
+	eng "github.com/boru-lang/boru/eng/go"
 	sdk "GOMODULE"
 )
 
-// registerSDKWords installs three native AQL words bound to the SDK:
+// registerSDKWords installs three native boru words bound to the SDK:
 // list / load / update. Each is declared with two overloads matching
 // the signature  [query?:(Node or Scalar) entity:atom]:
 //
@@ -18,31 +18,34 @@ import (
 //                              `load {id:1} book`, `load 1 book`)
 //
 // The entity slot is /q-quoted so a bareword `book` parses as the
-// Atom "book" rather than dispatching as an undefined word.
+// Atom "book" rather than dispatching as an undefined word. Both
+// overloads are all-forward (BarrierAllForward), so args are collected
+// from the tokens following the word.
 func registerSDKWords(r *eng.Registry, client *sdk.ProjectNameSDK) {
 	for _, op := range []string{"list", "load", "update"} {
 		op := op
-		single := eng.NativeSig{
+		single := eng.Signature{
 			Args:      []*eng.Type{eng.TAtom},
 			QuoteArgs: map[int]bool{0: true},
-			Handler: func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
+			Impl: eng.Go(func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
 				return runOp(client, op, nil, args[0])
-			},
-			Returns: []*eng.Type{eng.TAny},
+			}),
+			Returns:    []*eng.Type{eng.TAny},
+			BarrierPos: eng.BarrierAllForward,
 		}
-		dual := eng.NativeSig{
+		dual := eng.Signature{
 			Args:      []*eng.Type{eng.TAny, eng.TAtom},
 			QuoteArgs: map[int]bool{1: true},
-			Handler: func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
+			Impl: eng.Go(func(args []eng.Value, _ map[string]eng.Value, _ []eng.Value, _ *eng.Registry) ([]eng.Value, error) {
 				q := args[0]
 				return runOp(client, op, &q, args[1])
-			},
-			Returns: []*eng.Type{eng.TAny},
+			}),
+			Returns:    []*eng.Type{eng.TAny},
+			BarrierPos: eng.BarrierAllForward,
 		}
 		r.RegisterNativeFunc(eng.NativeFunc{
-			Name:        op,
-			ForwardArgs: true,
-			Signatures:  []eng.NativeSig{single, dual},
+			Name:       op,
+			Signatures: []eng.Signature{single, dual},
 		})
 	}
 }
@@ -91,22 +94,22 @@ func entityFor(client *sdk.ProjectNameSDK, name string) (sdk.ProjectNameEntity,
 	return nil, fmt.Errorf("unknown entity %q", name)
 }
 
-// queryToMap converts an AQL Value (Map or Scalar) into the
+// queryToMap converts a boru Value (Map or Scalar) into the
 // `map[string]any` shape the SDK expects. Maps are unwrapped via
 // eng.ToNative. Scalars are wrapped as {"id": <value>} so the
 // shorthand `load 1 book` becomes `load {id:1} book`.
 func queryToMap(v eng.Value) (map[string]any, error) {
-	if v.VType.Matches(eng.TMap) {
+	if v.Parent.ConformsTo(eng.TMap) {
 		m, ok := eng.ToNative(v).(map[string]any)
 		if !ok {
 			return nil, fmt.Errorf("query map could not be unwrapped")
 		}
 		return m, nil
 	}
-	if v.VType.Matches(eng.TScalar) {
+	if v.Parent.ConformsTo(eng.TScalar) {
 		return map[string]any{"id": eng.ToNative(v)}, nil
 	}
-	return nil, fmt.Errorf("query must be a Map or Scalar, got %s", v.VType)
+	return nil, fmt.Errorf("query must be a Map or Scalar, got %s", v.Parent)
 }
 
 // extractData walks an SDK result and replaces any sdk.Entity wrapper

package/project/.sdk/src/cmp/go-mcp/Main_go-mcp.ts

@@ -2,7 +2,7 @@
 import * as Path from 'node:path'
 
 import {
-  cmp, each,
+  cmp, each, deriveEntityNames,
   File, Content, Fragment, Slot,
 } from '@voxgig/sdkgen'
 
@@ -54,6 +54,14 @@ const Main = cmp(function Main(props: any) {
   const mcpModule = `github.com/${org}/${model.name}-sdk/go-mcp`
 
   const entityMap: any = getModelPath(model, `main.${KIT}.entity`)
+  // Derive each entity's PascalCase `Name` here rather than relying on another
+  // TARGET having run first. This target sets `phase.entity: { active: false }`
+  // (see model/target/go-{cli,mcp}.aontu), so create-sdkgen's Root.ts never
+  // calls names() for it — the accessor emitted below used to read `Name` off
+  // objects the `go` target happened to have named as a side effect, which
+  // yields `client.undefined(nil)` whenever this target is generated without
+  // `go`, or before it in target order.
+  deriveEntityNames(entityMap)
   const entityNames = Object.keys(entityMap).map(n => n.toLowerCase())
   const entityHelp = entityNames.length > 0 ? entityNames.join(' | ') : '(none)'
 

package/project/.sdk/src/cmp/haskell/ReadmeExamplesTest_haskell.ts

@@ -67,35 +67,44 @@ readDoc path = do
   pure (either (const "") id r)
 
 
--- Extract the body of every fenced Haskell block from markdown. The fence
--- marker (three backticks) is built from its char code so this source stays
--- backtick-free.
-haskellBlocks :: String -> [String]
+-- Extract the body of every fenced Haskell block from markdown. Returns
+-- (blocks, allClosed) where allClosed is False when a fence was opened but
+-- never closed before EOF — a malformed doc that must fail rather than pass
+-- silently on the unterminated block. The fence marker (three backticks) is
+-- built from its char code so this source stays backtick-free.
+haskellBlocks :: String -> ([String], Bool)
 haskellBlocks src = go (lines src)
   where
     fence3 = replicate 3 (toEnum 96 :: Char)
     fenceHs = fence3 ++ "haskell"
-    go [] = []
+    go [] = ([], True)
     go (l : ls)
       | trimWs l == fenceHs =
-          let (blk, rest) = break (\\x -> trimWs x == fence3) ls
-          in unlines blk : go (drop 1 rest)
+          case break (\\x -> trimWs x == fence3) ls of
+            (blk, [])       -> ([unlines blk], False)
+            (blk, _ : rest) -> let (bs, ok) = go rest in (unlines blk : bs, ok)
       | otherwise = go ls
 
 
--- Balanced (), [], {} ignoring the contents of double-quoted string literals.
--- The generated snippets never embed an escaped quote inside a string.
+-- Balanced (), [], {} outside of double-quoted string literals, with each
+-- closer matching the most-recent opener via a stack (so "([)]" is rejected,
+-- not merely counted). The generated snippets never embed an escaped quote
+-- inside a string.
 balanced :: String -> Bool
-balanced = go False (0 :: Int)
+balanced = go False []
   where
-    go inStr d [] = not inStr && d == 0
-    go inStr d (c : cs)
-      | c == '"'                          = go (not inStr) d cs
-      | inStr                             = go inStr d cs
-      | c == '(' || c == '[' || c == '{'  = go inStr (d + 1) cs
+    go inStr stack [] = not inStr && null stack
+    go inStr stack (c : cs)
+      | c == '"'                          = go (not inStr) stack cs
+      | inStr                             = go inStr stack cs
+      | c == '('                          = go inStr (')' : stack) cs
+      | c == '['                          = go inStr (']' : stack) cs
+      | c == '{'                          = go inStr ('}' : stack) cs
       | c == ')' || c == ']' || c == '}'  =
-          if d <= 0 then False else go inStr (d - 1) cs
-      | otherwise                         = go inStr d cs
+          case stack of
+            (top : rest) | top == c -> go inStr rest cs
+            _                        -> False
+      | otherwise                         = go inStr stack cs
 
 
 -- The three documents held to the gate, tagged by human label.
@@ -111,7 +120,8 @@ tests :: Counters -> IO ()
 tests c =
   forM_ docs (\\(label, path) -> do
     src <- readDoc path
-    let blocks = haskellBlocks src
+    let (blocks, closed) = haskellBlocks src
+    runTest c (label ++ " haskell fences closed") (pure closed)
     forM_ (zip [1 :: Int ..] blocks) (\\(i, blk) ->
       runTest c (label ++ " haskell block " ++ show i ++ " well-formed")
         (pure (not (null (trimWs blk)) && balanced blk))))

package/project/.sdk/src/cmp/java/EntityTypes_java.ts

@@ -37,7 +37,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,
@@ -134,11 +134,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/csharp 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/java/Entity_java.ts

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, camelify, names,
   File, Content, Folder, Fragment,
-  entityClassName,
+  entityClassName, entityCollection,
 } from '@voxgig/sdkgen'
 
 import {
@@ -25,7 +25,7 @@ const Entity = cmp(function Entity(props: any) {
   // Collision-free entity CLASS name (see entityClassName): normally
   // `<Name>Entity`, but disambiguated (e.g. `<Name>EntityClient`) 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 = {
@@ -42,7 +42,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. Otherwise emit a stub that satisfies the SdkEntity

package/project/.sdk/src/cmp/java/MainEntity_java.ts

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

package/project/.sdk/src/cmp/java/Package_java.ts

@@ -31,7 +31,7 @@ const Package = cmp(async function Package(props: any) {
 
   // Dep name convention: "groupId:artifactId" with an explicit version.
   const deps: { groupId: string, artifactId: string, version: string, kind: string }[] = []
-  for (const d of collectDeps(model, target.name, target.deps)) {
+  for (const d of collectDeps(model, target.name, target.deps, ctx$.log)) {
     const [dgroup, dartifact] = String(d.name).split(':')
     if (dgroup && dartifact && d.version) {
       deps.push({

package/project/.sdk/src/cmp/java/ReadmeExamplesTest_java.ts

@@ -95,6 +95,23 @@ public class ReadmeExamplesTest {
     return blocks;
   }
 
+  // A well-formed doc has an even number of triple-backtick fence markers:
+  // every opening fence has a matching close. An odd count means a fence was
+  // opened but never closed — a truncated or malformed generated doc. The
+  // split-based javaBlocks() would silently treat the unterminated tail as a
+  // complete block, so this must be checked explicitly.
+  private static boolean fencesClosed(String text) {
+    String fence = String.valueOf((char) 96).repeat(3);
+    int count = 0;
+    int from = 0;
+    int idx;
+    while ((idx = text.indexOf(fence, from)) >= 0) {
+      count++;
+      from = idx + fence.length();
+    }
+    return count % 2 == 0;
+  }
+
   private static String readDoc(Path path, String label) {
     assertTrue(Files.exists(path), label + " not found: " + path);
     try {
@@ -158,7 +175,12 @@ public class ReadmeExamplesTest {
       if (!Files.exists(path)) {
         continue;
       }
-      List<String> blocks = javaBlocks(readDoc(path, doc[0]));
+      String src = readDoc(path, doc[0]);
+      if (!fencesClosed(src)) {
+        failures.add(doc[0] +
+            " has an unclosed code fence (opened but never closed)");
+      }
+      List<String> blocks = javaBlocks(src);
       int balancedCount = 0;
       for (int i = 0; i < blocks.size(); i++) {
         if (balanced(blocks.get(i))) {

package/project/.sdk/src/cmp/java/TestDirect_java.ts

@@ -75,7 +75,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
 
   const authActive = isAuthActive(model)
 
-  const opnames = Object.keys(entity.op)
+  const opnames = Object.keys(entity.op || {})
   const hasLoad = opnames.includes('load')
   const hasList = opnames.includes('list')
 
@@ -83,8 +83,8 @@ const TestDirect = cmp(function TestDirect(props: any) {
     return
   }
 
-  const loadOp = entity.op.load
-  const listOp = entity.op.list
+  const loadOp = entity.op?.load
+  const listOp = entity.op?.list
 
   // Get load point info
   const loadPoint = loadOp?.points?.[0]