@voxgig/sdkgen 2.0.2 → 3.1.0

package/project/.sdk/src/cmp/dart/fragment/EntityBase.fragment.dart

@@ -43,6 +43,18 @@ class ProjectNameEntityBase {
     featureHook(entctx, 'PostConstructEntity');
   }
 
+  // Every operation resolves to the entity; `remove` additionally marks
+  // it. The instance KEEPS the data it held — a caller can still read what
+  // was deleted — but it is no longer a live record. See AGENTS.md.
+  bool _deleted = false;
+
+  void markDeleted() {
+    _deleted = true;
+  }
+
+  bool deleted() => _deleted;
+
+
   dynamic entopts() {
     return utility.struct.merge([{}, entoptsMap]);
   }
@@ -235,7 +247,12 @@ class ProjectNameEntityBase {
     if (d is Map) {
       d.forEach((k, v) => out[k.toString()] = v);
     }
-    out[r'entity$'] = Name;
+  // The marker is NAMESPACED. It used to be `entity$` — a short, generic
+  // name, and the `$`-suffix convention is not unique to sdkgen. Seneca uses
+  // `entity$` on its own entities to hold the canon, so an SDK record fed
+  // into `entize` silently overwrote it and produced entities claiming a
+  // canon that does not exist: no error, just wrong entities.
+    out[r'voxgig$entity'] = Name;
     return out;
   }
 

package/project/.sdk/src/cmp/dart/fragment/EntityCreateOp.fragment.dart

@@ -72,7 +72,15 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      return (null != ctx.result && true == ctx.result.ok) ? this : out;
     } catch (err) {
       // #PreUnexpected-Hook
 

package/project/.sdk/src/cmp/dart/fragment/EntityLoadOp.fragment.dart

@@ -76,7 +76,15 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      return (null != ctx.result && true == ctx.result.ok) ? this : out;
     } catch (err) {
       // #PreUnexpected-Hook
 

package/project/.sdk/src/cmp/dart/fragment/EntityRemoveOp.fragment.dart

@@ -76,7 +76,21 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      if (null != ctx.result && true == ctx.result.ok) {
+        // A removed entity keeps its data but is no longer a live record.
+        markDeleted();
+        return this;
+      }
+
+      return out;
     } catch (err) {
       // #PreUnexpected-Hook
 

package/project/.sdk/src/cmp/dart/fragment/EntityUpdateOp.fragment.dart

@@ -76,7 +76,15 @@
         }
       }
 
-      return done(ctx);
+      final out = done(ctx);
+
+      // An operation resolves to the ENTITY, not the raw data — the record
+      // has just been absorbed into this instance and is reached through
+      // data(). `done` still runs: it completes the pipeline and raises on
+      // failure, and when throwing is disabled it hands back the error
+      // payload, which passes through unchanged. See AGENTS.md "Entity
+      // operations return ENTITIES".
+      return (null != ctx.result && true == ctx.result.ok) ? this : out;
     } catch (err) {
       // #PreUnexpected-Hook
 

package/project/.sdk/src/cmp/dart/fragment/SdkError.fragment.dart

@@ -11,6 +11,14 @@ class ProjectNameError extends Error {
   dynamic result;
   dynamic spec;
 
+  // HTTP status of the response that caused this error, or -1 when the
+  // request never got one. PROMOTED to the top level: it used to be
+  // reachable only at `err.result['status']`, so every consumer coupled
+  // itself to the internal shape of `result`.
+  int status = -1;
+
+  bool get notFound => 404 == status;
+
   ProjectNameError(this.code, this.message, [this.ctx]);
 
   @override

package/project/.sdk/src/cmp/elixir/Package_elixir.ts

@@ -5,6 +5,7 @@ import {
   cmp,
   pkgDescription,
   repoInfo,
+  packageVersion,
 } from '@voxgig/sdkgen'
 
 
@@ -17,6 +18,7 @@ import type {
 // third-party runtime deps, so the SDK ships with none either.
 const Package = cmp(async function Package(props: any) {
   const ctx$ = props.ctx$
+  const target = props.target
   const model: Model = ctx$.model
 
   const Name = model.const.Name
@@ -32,7 +34,7 @@ const Package = cmp(async function Package(props: any) {
   def project do
     [
       app: :${app},
-      version: "0.0.1",
+      version: "${packageVersion(model, target.name)}",
       elixir: "~> 1.14",
       description: ${JSON.stringify(pkgDescription(model, 'elixir'))},
       elixirc_paths: elixirc_paths(Mix.env()),

package/project/.sdk/src/cmp/elixir/ReadmeInstall_elixir.ts

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isPublished, repoInfo } from '@voxgig/sdkgen'
+import { cmp, Content, isPublished, repoInfo, packageVersion } from '@voxgig/sdkgen'
 
 
 const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
@@ -16,7 +16,7 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
 \`\`\`elixir
 def deps do
   [
-    {:${app}, "~> 0.0.1"}
+    {:${app}, "~> ${packageVersion(model, target.name)}"}
   ]
 end
 \`\`\`

package/project/.sdk/src/cmp/elixir/TestEntity_elixir.ts

@@ -70,8 +70,15 @@ defmodule ${Name}.${EName}EntityTest do
   test "should list records" do
     sdk = mk_sdk()
     ent = ${Name}.${ename}(sdk)
+    # The op resolves to one ENTITY per record; the record is reached with
+    # data_get. See AGENTS.md "Entity operations return ENTITIES".
     result = ${Name}.Entity.${EName}.list(ent, S.jm([]))
     assert S.islist(result)
+    if S.size(result) > 0 do
+      Enum.each(0..(S.size(result) - 1), fn i ->
+        assert S.ismap(${Name}.EntityBase.data_get(S.getelem(result, i)))
+      end)
+    end
   end
 `)
     }
@@ -84,7 +91,8 @@ defmodule ${Name}.${EName}EntityTest do
     if id != nil do
       sdk = mk_sdk()
       ent = ${Name}.${ename}(sdk)
-      rec = ${Name}.Entity.${EName}.load(ent, S.jm(["id", id]))
+      loaded = ${Name}.Entity.${EName}.load(ent, S.jm(["id", id]))
+      rec = ${Name}.EntityBase.data_get(loaded)
       assert S.ismap(rec)
       assert S.getprop(rec, "id") == id
     end
@@ -97,7 +105,8 @@ defmodule ${Name}.${EName}EntityTest do
   test "should create then read back" do
     sdk = ${Name}.test(S.jm(["entity", S.jm(["${ename}", S.jm([])])]))
     ent = ${Name}.${ename}(sdk)
-    made = ${Name}.Entity.${EName}.create(ent, S.jm(["name", "test-create"]))
+    created = ${Name}.Entity.${EName}.create(ent, S.jm(["name", "test-create"]))
+    made = ${Name}.EntityBase.data_get(created)
     assert S.ismap(made)
     assert S.getprop(made, "id") != nil
   end

package/project/.sdk/src/cmp/elixir/fragment/EntityCreateOp.fragment.ex

@@ -26,7 +26,8 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    EntityBase.op_return(ent, ctx, out)
   end
 
 # EJECT-END

package/project/.sdk/src/cmp/elixir/fragment/EntityListOp.fragment.ex

@@ -28,6 +28,7 @@
       end
     end
 
+    # `list` resolves to one ENTITY per record — make_result builds them.
     Pipeline.run_op(ctx, post_done)
   end
 

package/project/.sdk/src/cmp/elixir/fragment/EntityLoadOp.fragment.ex

@@ -30,7 +30,8 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    EntityBase.op_return(ent, ctx, out)
   end
 
 # EJECT-END

package/project/.sdk/src/cmp/elixir/fragment/EntityRemoveOp.fragment.ex

@@ -30,7 +30,10 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    ent = EntityBase.op_return(ent, ctx, out)
+    # A removed entity keeps its data but is no longer a live record.
+    if ent == out, do: out, else: EntityBase.mark_deleted(ent)
   end
 
 # EJECT-END

package/project/.sdk/src/cmp/elixir/fragment/EntityUpdateOp.fragment.ex

@@ -28,7 +28,8 @@
       end
     end
 
-    Pipeline.run_op(ctx, post_done)
+    out = Pipeline.run_op(ctx, post_done)
+    EntityBase.op_return(ent, ctx, out)
   end
 
 # EJECT-END

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

@@ -28,7 +28,7 @@
 
 import {
   cmp, each,
-  File, Content, Folder,
+  File, Content, Folder, goModule
 } from '@voxgig/sdkgen'
 
 import { canonToType, opTypeName, opRequestShape, warnEntityTypeCollisions , deriveEntityNames } from '@voxgig/sdkgen'
@@ -165,6 +165,10 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
   const { target } = props
   const { model, log } = props.ctx$
 
+  // This file is GENERATED, not templated, so the GOMODULE placeholder is
+  // never substituted for it — the module path has to be interpolated.
+  const gomodule = goModule(model, 'go')
+
   // only_active:false — getModelPath DROPS active:false entries by default,
   // but the consumer scaffold (create-sdkgen Root.ts) iterates the RAW entity
   // collection, so inactive entities still get generated entity code that
@@ -196,7 +200,11 @@ const EntityTypes = cmp(function EntityTypes(props: any) {
 // @voxgig/apidef VALID_CANON). Do not edit by hand.
 package entity
 
-import "encoding/json"
+import (
+	"encoding/json"
+
+	"${gomodule}/core"
+)
 
 `)
 
@@ -262,12 +270,26 @@ func asMap(v any) map[string]any {
 	return out
 }
 
-// typedFrom decodes a runtime value (a map[string]any produced by the op
-// pipeline) into a typed model T via a JSON round-trip. On any error it
-// returns the zero value of T; the op's own (value, error) tuple carries the
-// real error.
+// entityData unwraps an entity to its data map.
+//
+// Operations resolve to the ENTITY, not the raw data (see AGENTS.md), and an
+// entity's fields are UNEXPORTED — marshalling one directly yields \`{}\`, so
+// every typed accessor would silently hand back a zero-valued struct. The
+// typed boundary therefore takes the data hop first.
+func entityData(v any) any {
+	if ent, ok := v.(core.Entity); ok {
+		return ent.Data()
+	}
+	return v
+}
+
+// typedFrom decodes a runtime value (an entity, or the map[string]any the op
+// pipeline produced) into a typed model T via a JSON round-trip. On any error
+// it returns the zero value of T; the op's own (value, error) tuple carries
+// the real error.
 func typedFrom[T any](v any) T {
 	var out T
+	v = entityData(v)
 	if v == nil {
 		return out
 	}
@@ -279,13 +301,21 @@ func typedFrom[T any](v any) T {
 	return out
 }
 
-// typedSliceFrom decodes a runtime list value ([]any of maps) into a typed
-// slice []T via a JSON round-trip, for list ops.
+// typedSliceFrom decodes a runtime list value into a typed slice []T via a
+// JSON round-trip, for list ops. \`list\` resolves to a slice of ENTITY
+// instances, so each element takes the data hop.
 func typedSliceFrom[T any](v any) []T {
 	var out []T
 	if v == nil {
 		return out
 	}
+	if list, ok := v.([]any); ok {
+		unwrapped := make([]any, 0, len(list))
+		for _, item := range list {
+			unwrapped = append(unwrapped, entityData(item))
+		}
+		v = unwrapped
+	}
 	b, err := json.Marshal(v)
 	if err != nil {
 		return out

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

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, camelify, names,
   File, Content, Folder, Fragment, Line, FeatureHook, Slot,
-  entityClassName, entityCollection,
+  entityClassName, entityCollection, goModule
 } from '@voxgig/sdkgen'
 
 import {
@@ -21,7 +21,7 @@ const Entity = cmp(function Entity(props: any) {
 
   // Module name: concatenated lowercase
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   // Collision-free entity CLASS name (see entityClassName): normally
   // `<Name>Entity`, but disambiguated (e.g. `<Name>EntityClient`) when it would

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

@@ -4,7 +4,7 @@ import * as Path from 'node:path'
 import {
   cmp, each, names, cmap,
   List, File, Content, Copy, Folder, Fragment, Line, FeatureHook,
-  entityClassName, entityCollection,
+  entityClassName, entityCollection, goModule, goPackageIdent
 } from '@voxgig/sdkgen'
 
 
@@ -37,11 +37,10 @@ const Main = cmp(async function Main(props: any) {
 
   // Go module path == the repo path on GitHub (org from model.origin),
   // e.g. github.com/voxgig-sdk/<slug>-sdk. Used in go.mod and every import.
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
   // The root package name must be a plain Go identifier (can't be a path),
-  // so it stays as the concatenated-lowercase form (e.g. voxgigdogsdk).
-  const gopackage = (model.origin || 'voxgig-sdk').replace(/-sdk$/, '').replace(/[^a-z0-9]/gi, '') +
-    model.name.replace(/[^a-z0-9]/gi, '').toLowerCase() + 'sdk'
+  // so it stays a concatenated-lowercase form (e.g. voxgigdogsdk).
+  const gopackage = goPackageIdent(model, 'go')
 
   Package({ target })
 

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

@@ -3,7 +3,7 @@ import {
   Content,
   File,
   cmp,
-  collectDeps,
+  collectDeps, goModule, goVersion
 } from '@voxgig/sdkgen'
 
 
@@ -18,14 +18,17 @@ const Package = cmp(async function Package(props: any) {
 
   const model: Model = ctx$.model
 
-  // Module name: concatenated lowercase (e.g., voxgigsolardemosdk)
-  // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  // Module path and language version both come from the model — see
+  // goModule / goVersion. Neither is derivable from the slug alone: the repo
+  // may not be named `<slug>-sdk`, and the hardcoded `go 1.20` this used to
+  // emit could not compile sdkgen's own `log` feature (it imports log/slog,
+  // which needs 1.21).
+  const gomodule = goModule(model, 'go')
 
   File({ name: 'go.mod' }, () => {
     Content(`module ${gomodule}
 
-go 1.20
+go ${goVersion(model, target.name)}
 
 `)
 

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

@@ -1,12 +1,12 @@
 
-import { cmp, Content } from '@voxgig/sdkgen'
+import { cmp, Content, goModule } from '@voxgig/sdkgen'
 
 
 const ReadmeExplanation = cmp(function ReadmeExplanation(props: any) {
   const { target, ctx$: { model } } = props
 
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   Content(`### Data as maps
 

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, canonKey, entityIdField, pickExampleEntity, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, canonKey, entityIdField, pickExampleEntity, opRequestShape, goModule } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -29,7 +29,7 @@ const ReadmeHowto = cmp(function ReadmeHowto(props: any) {
   const { target, ctx$: { model } } = props
 
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Pick an entity with a real op (prefer a read op) — never fabricate a

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

@@ -8,7 +8,9 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
 
   // Go module path == repo path on GitHub (org from model.origin).
   const gomodule = packageName(model, 'go')
-  const { releasesUrl } = repoInfo(model)
+  // `repo` is the directory a `git clone` of this project creates — not
+  // `<slug>-sdk`, which is only the DEFAULT repo name.
+  const { releasesUrl, repo } = repoInfo(model)
 
   Content(`\`\`\`bash
 go get ${gomodule}@latest
@@ -22,7 +24,7 @@ project and add a \`replace\` directive pointing at the checked-out
 \`go/\` directory:
 
 \`\`\`bash
-go mod edit -replace ${gomodule}=../${model.name}-sdk/go
+go mod edit -replace ${gomodule}=../${repo}/go
 \`\`\`
 
 `)

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

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content, isAuthActive, entityIdField, entityPrimaryOp } from '@voxgig/sdkgen'
+import { cmp, each, Content, isAuthActive, entityIdField, entityPrimaryOp, goModule } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -44,7 +44,7 @@ const ReadmeModel = cmp(function ReadmeModel(props: any) {
   const resultShapeRows = resultRows.join('\n')
 
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   const apikeyOptionRow = isAuthActive(model)
     ? '| `"apikey"` | `string` | API key for authentication. |\n'

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, opRequestShape, entityIdField, entityOps } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, opRequestShape, entityIdField, entityOps, goModule } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -20,7 +20,7 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   const exampleEntity = Object.values(entity).find((e: any) => e.active !== false) as any
 

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, isAuthActive, envName, entityIdField, entityOps, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive, envName, entityIdField, entityOps, opRequestShape, goModule } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -15,7 +15,7 @@ const ReadmeTopQuick = cmp(function ReadmeTopQuick(props: any) {
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   const exampleEntity = Object.values(entity).find((e: any) => e.active !== false) as any
 

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

@@ -1,5 +1,5 @@
 
-import { cmp, Content, canonKey, entityIdField, pickExampleEntity, opRequestShape } from '@voxgig/sdkgen'
+import { cmp, Content, canonKey, entityIdField, pickExampleEntity, opRequestShape, goModule } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -28,7 +28,7 @@ const ReadmeTopTest = cmp(function ReadmeTopTest(props: any) {
 
   const entity = getModelPath(model, `main.${KIT}.entity`)
   // Go module path == repo path on GitHub (org from model.origin).
-  const gomodule = `github.com/${model.origin || 'voxgig-sdk'}/${model.name}-sdk/go`
+  const gomodule = goModule(model, 'go')
 
   // Pick an entity with a real op (prefer a read op) — never fabricate a
   // `load` on an op-less entity like Cloudsmith's `Abort`.

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

@@ -11,7 +11,7 @@ import {
   File,
   cmp,
   snakify,
-  isAuthActive,
+  isAuthActive, envName, envToken, liveStrict
 } from '@voxgig/sdkgen'
 
 
@@ -65,7 +65,11 @@ const TestDirect = cmp(function TestDirect(props: any) {
   const entity: ModelEntity = props.entity
   const gomodule = props.gomodule
 
-  const PROJECTNAME = nom(model, 'Name').toUpperCase().replace(/[^A-Z_]/g, '_')
+  const PROJECTNAME = envName(model)
+
+  // Does a live run ASSERT, or merely observe? See helpers/testPolicy.
+  // t.Skipf passes; t.Fatalf does not.
+  const liveFail = liveStrict(model, target.name) ? 'Fatalf' : 'Skipf'
 
   const authActive = isAuthActive(model)
   const apikeyEnvEntry = authActive
@@ -146,7 +150,7 @@ const TestDirect = cmp(function TestDirect(props: any) {
     : ''
 
   // Build the ENTID env var name for this entity
-  const entidEnvVar = `${PROJECTNAME}_TEST_${nom(entity, 'NAME').replace(/[^A-Z_]/g, '_')}_ENTID`
+  const entidEnvVar = `${PROJECTNAME}_TEST_${envToken(entity.name)}_ENTID`
 
   File({ name: entity.name + '_direct_test.' + target.ext }, () => {
 
@@ -254,18 +258,19 @@ ${listSkipBlock}		client := setup.client
       }
 
       Content(`		if setup.live {
-			// Live mode is lenient: synthetic IDs frequently 4xx and the
-			// list-response shape varies wildly across public APIs. Skip
-			// rather than fail when the call doesn't return a usable list.
+			// Live-mode leniency is a model decision
+			// (main.kit.test.live.strict): synthetic IDs 4xx constantly
+			// against an arbitrary public API, so the default SKIPS here.
+			// A project that owns its test server sets strict and FAILS.
 			if err != nil {
-				t.Skipf("list call failed (likely synthetic IDs against live API): %v", err)
+				t.${liveFail}("list call failed (likely synthetic IDs against live API): %v", err)
 			}
 			if result["ok"] != true {
-				t.Skipf("list call not ok (likely synthetic IDs against live API): %v", result)
+				t.${liveFail}("list call not ok (likely synthetic IDs against live API): %v", result)
 			}
 			status := core.ToInt(result["status"])
 			if status < 200 || status >= 300 {
-				t.Skipf("expected 2xx status, got %v", result["status"])
+				t.${liveFail}("expected 2xx status, got %v", result["status"])
 			}
 		} else {
 			if err != nil {
@@ -413,10 +418,10 @@ ${loadSkipBlock}		client := setup.client
 				"params": listParams,
 			})
 			if listErr != nil {
-				t.Skipf("list call failed (likely synthetic IDs against live API): %v", listErr)
+				t.${liveFail}("list call failed (likely synthetic IDs against live API): %v", listErr)
 			}
 			if listResult["ok"] != true {
-				t.Skipf("list call not ok (likely synthetic IDs against live API): %v", listResult)
+				t.${liveFail}("list call not ok (likely synthetic IDs against live API): %v", listResult)
 			}
 
 			// Get first entity ID from list
@@ -468,16 +473,17 @@ ${loadSkipBlock}		client := setup.client
 		if setup.live {
 			// Live mode is lenient: synthetic IDs frequently 4xx. Skip
 			// rather than fail when the load endpoint isn't reachable with
-			// the IDs we can construct from setup.idmap.
+			// the IDs we can construct from setup.idmap — unless the model
+			// sets main.kit.test.live.strict.
 			if err != nil {
-				t.Skipf("load call failed (likely synthetic IDs against live API): %v", err)
+				t.${liveFail}("load call failed (likely synthetic IDs against live API): %v", err)
 			}
 			if result["ok"] != true {
-				t.Skipf("load call not ok (likely synthetic IDs against live API): %v", result)
+				t.${liveFail}("load call not ok (likely synthetic IDs against live API): %v", result)
 			}
 			status := core.ToInt(result["status"])
 			if status < 200 || status >= 300 {
-				t.Skipf("expected 2xx status, got %v", result["status"])
+				t.${liveFail}("expected 2xx status, got %v", result["status"])
 			}
 		} else {
 			if err != nil {