gina 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -6,6 +6,23 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 0.4.1 - 2026-06-01
+### Added
+* New `gina bundle:status` and `gina project:status` CLI commands report the running/stopped state, PID, port, and active env of bundles (human-readable or --format=json).
+* gina minion:list lists the running bundle child-processes ("minions") of a project, or of every registered project, grouped by project. Supports --format=json for machine-readable output.
+* gina minion:kill reaps the running bundle child-processes ("minions") of a project (both pidfile-tracked and orphaned ps-discovered ones) with a graceful SIGTERM-then-SIGKILL escalation, a --dry-run preview, and --format=json output.
+* gina protocol:remove <bundle> @<project> reverts a bundle to the project default protocol and scheme by removing its protocol override from the bundle settings; supports --dry-run and --format=json, and guards against reverting to an unallocated port.
+* Added self.setTemplate(file, ext) to override the rendered template from a controller action at run time (e.g. a catch-all dispatcher); honoured by the swig render path.
+* Added bundle:copy (alias bundle:cp) to duplicate a bundle under a new name within the same project. It copies the source tree, rewrites the bundle-name footprint (controller class names, the gina require-var, app.json name, webroot) in the copied .js/.json files, allocates a fresh full port matrix, and registers the new bundle in manifest.json + env.json + the ports registry. Supports --dry-run (preview every rewrite site before writing), --force (overwrite an existing target), and --format=json.
+* Added bundle:rename to rename a bundle in place under a new name within the same project. It moves the source tree, rewrites the bundle-name footprint (controller class names, the gina require-var, app.json name, webroot) in the moved .js/.json files, and rekeys manifest.json + env.json + the ports registry preserving the existing port numbers. The bundle must be stopped first (a running bundle is refused, with no --force bypass). Supports --dry-run (preview every rewrite site before writing), --force (overwrite an existing bundle that already holds the new name), and --format=json.
+### Fixed
+* Fixed `gina bundle:add` surfacing an opaque `ERR_USE_AFTER_CLOSE` ("readline was closed") rollback when the target bundle already exists and the command runs without an interactive terminal (container entrypoint, CI, or piped stdin). It now fails fast with a clear message to re-run with `--import` (register the existing source) or `--replace` (overwrite it).
+* Extended the non-interactive (no-TTY) guard to the remaining interactive CLI commands — `bundle:remove`, `project:remove`, `protocol:set`, `port:set`, and `view:add`. When run without a terminal (container, CI, or piped stdin) and missing the values they would otherwise prompt for, they now fail fast with guidance (e.g. `--force`, or `--protocol`/`--scheme`/`--port`/`--env`) instead of throwing an opaque `ERR_USE_AFTER_CLOSE` ("readline was closed").
+* Fixed the `gina` CLI crashing with an opaque `could not load package.json` / `MODULE_NOT_FOUND` when `GINA_VERSION` resolves to a framework version that is not installed (a stale version pin, or a bind-mounted development tree at a different version). `bin/cli` now verifies the framework directory exists before requiring from it and fails fast with a clear message pointing at `gina framework:install <version>`, instead of letting every CLI command fail opaquely.
+* Fixed a crash that could kill a bundle serving static assets over HTTP/2 in dev mode under concurrent requests.
+* Fixed renderWithoutLayout returning an empty body when the template referenced controller data as top-level variables.
+* Brought the nunjucks render path to parity with swig: self.setTemplate() runtime overrides are now honoured, a bundle's controllers/setup.js can register filters via this.engine.addFilter(), and a controller passing a partial page object no longer drops framework-injected page data (webroot, view metadata, session).
+
 ## 0.4.0 - 2026-05-29
 ### Added
 * Inspector View tab now shows the template engine version next to the engine name (e.g. `Swig | 2.4.0`). The version is sourced server-side from the cached swig / nunjucks resolver decisions and falls back to a name-only badge when no version is resolvable (very-early bootstrap, test stubs, legacy render paths).

package/README.md

@@ -22,7 +22,7 @@ Node.js MVC framework with built-in HTTP/2, multi-bundle architecture, and scope
 | ORM / entities | EventEmitter-based entity system; SQL files auto-wired to entity methods |
 | Connectors | Couchbase, MongoDB, ScyllaDB / Cassandra, MySQL, PostgreSQL, Redis, SQLite, AI (LLM) — loaded from project `node_modules` |
 | AI connector | Any LLM provider via named protocol (`anthropic://`, `openai://`, `ollama://`, …) |
-| Template engine | [`@rhinostone/swig`](https://github.com/gina-io/swig) 2.4.0 — maintained fork with CVE-2023-25345 patched; streaming SSE/chunked via `renderStream()`. Nunjucks supported as opt-in via `render.engine = "nunjucks"` |
+| Template engine | [`@rhinostone/swig`](https://github.com/gina-io/swig) 2.5.1 — maintained fork with CVE-2023-25345 patched; streaming SSE/chunked via `renderStream()`. Nunjucks supported as opt-in via `render.engine = "nunjucks"` |
 | Internationalisation | Per-bundle JSON catalogs, `t()` helper, swig + nunjucks `t` filter, CLDR plurals, ICU MessageFormat opt-in via `t.icu()` |
 | Observability | Built-in `/_gina/metrics` Prometheus endpoint (opt-in, IP-allowlisted) — Node.js process metrics + HTTP counter / duration histogram with cardinality-safe route labels |
 | Hot reload | WatcherService evicts `require.cache` only on file change — zero per-request overhead in dev |
@@ -39,17 +39,11 @@ gina bundle:start api @myproject
 open https://localhost:3100
 ```
 
-## What's in 0.4.0
+## What's in 0.4.1
 
-**Upgrading note — this is a shortVersion bump (0.3 → 0.4):** the framework creates a fresh `~/.gina/0.4/settings.json` from defaults on install, so customizations made under 0.3 (log level, port, culture, timezone, etc.) are not carried forward. Re-apply them with `gina framework:set`, or copy values across from `~/.gina/0.3/settings.json`. See the [migration guide](https://gina.io/docs/migration).
-
-- **Breaking — Couchbase SDK v2 removed** (#CN8) — the v2 ORM connector and session store are gone; only Couchbase Node SDK **v3 and v4** are supported (defaults to v3). Migration is a driver bump, not a config change: `npm install couchbase@^4` (or `^3`). Bundles still resolving to SDK v2 fail fast at connector load with an explicit upgrade message.
-- **Async jobs** (#AI6) — run slow work out-of-band: `self.startJob(fn)` returns a job id immediately and runs `fn` on a concurrency-limited worker; `self.inferAsync(messages, opts)` wires the AI connector through a job in one call. Poll the built-in `GET /_gina/jobs/:id` for state, or opt into a signed completion webhook. See the [Async jobs guide](https://gina.io/docs/guides/async-jobs).
-- **HTTP/2 response trailers** (#H10) — `self.sendTrailers(fields)` before rendering emits trailing headers after the body (via the `wantTrailers` event) — useful for gRPC-style `grpc-status` or a content-integrity `Digest`. Fully opt-in: a no-op on HTTP/1.1 and when no trailers are registered. See the [native HTTP/2 guide](https://gina.io/docs/guides/http2-native).
-- **CSP per-response nonce** (#HDR16) — `gina.plugins.Csp({ useNonce: true })` mints a fresh nonce per response, stamps the framework-injected bootstrap (and dev-Inspector) inline scripts, and exposes it to templates as `{{ page.cspNonce }}` (swig) / `{{ cspNonce }}` (nunjucks) — letting bundles drop `'unsafe-inline'` from `script-src`. Opt-in (default false). See the [CSP guide](https://gina.io/docs/guides/csp).
-- **Inspector remote instrumentation** (#INS9b, #INS10) — an opt-in API-key gate on the dev-mode `/_gina/agent` SSE stream streams authenticated server logs outside dev; `POST /_gina/instrument` opens a time-boxed, key-authenticated window that captures query + flow timelines (JSON, XHR, and server-rendered HTML pages) over the authenticated channel without ever modifying the page HTML. See the [Inspector guide](https://gina.io/docs/guides/inspector).
-- **`gina secrets:scan` / `secrets:check` CLI** — introspect the `${secret:KEY}` placeholders your bundle configs require; `secrets:check` marks each key SET/UNSET and exits non-zero on any missing key (CI / pre-deploy gating). `--scope=<scope>`, `--env-file=<path>`, and `--format=json` supported. See the [secrets guide](https://gina.io/docs/guides/secrets).
-- **Inspector dev-UX + fixes** — template engine version on the View badge; Weight/Load badges and the Flow timeline restored under `Cross-Origin-Opener-Policy` and for nunjucks bundles; SQL column-level index-coverage matching (including live DB introspection). Fixes: `throwError(statusCode, Error)` now honors the explicit code; an HTTP 500 on browser-session (no-expiry) cookies; `npm install -g` hardening for npm setups that don't propagate `npm_config_global`; refreshed stale external references; `@rhinostone/swig` floor → `^2.5.1`.
+- **CLI Tier 2 — run-state + lifecycle commands.** `bundle:status` / `project:status` report a bundle's (or every bundle's) running/stopped state, PID, port, and active env — human-readable or `--format=json`. `minion:list` / `minion:kill` list and reap a project's running bundle child-processes (both pidfile-tracked and `ps`-discovered orphans) with a graceful SIGTERM→SIGKILL escalation and a `--dry-run` preview. `bundle:copy` (alias `bundle:cp`) duplicates a bundle under a new name and `bundle:rename` renames one in place — both rewrite the bundle-name footprint and update the manifest / env / ports registry, with `--dry-run` / `--force`. `protocol:remove` reverts a bundle to the project's default protocol and scheme.
+- **Runtime template override** — `self.setTemplate(file, ext)` lets a controller action choose its template at request time (e.g. a catch-all dispatcher), resolved verbatim under the templates root. Honoured by both the swig and nunjucks render paths.
+- **Fixes** — nunjucks↔swig render parity (`self.setTemplate()` overrides, `controllers/setup.js` filter registration via `this.engine.addFilter()`, and a controller passing a partial `page` object no longer dropping framework-injected page data — webroot, view metadata, session); a crash that could kill a bundle serving static assets over HTTP/2 in dev mode under concurrent requests; `renderWithoutLayout` returning an empty body when the template referenced controller data as top-level variables; and clearer fail-fast errors when the `gina` CLI hits an uninstalled `GINA_VERSION` or when an interactive command (`bundle:add`/`bundle:remove`/`project:remove`/`protocol:set`/`port:set`/`view:add`) runs without a TTY.
 
 See the full [Changelog](./CHANGELOG.md) and [Roadmap](./ROADMAP.md).
 

package/ROADMAP.md

@@ -60,13 +60,14 @@ Stub commands confirmed in source — handler files exist but are empty or comme
 
 | Status | Feature | Version | Target |
 | --- | --- | --- | --- |
-| 📋 | **`bundle:status`** — Show the running/stopped state, PID, port, and active env for a specific bundle. Handler is comments only (6 lines). | `0.4.0` | Q4 2026 |
-| 📋 | **`bundle:rename`** — Rename a bundle within a project, updating `manifest.json`, routing config, and the `src/` directory name. Handler is comments only (7 lines). | `0.4.0` | Q4 2026 |
-| 📋 | **`protocol:remove`** — Remove a protocol assignment from a bundle. No handler file exists. Also requires fixing the `help.txt` typo ("remouve"). | `0.4.0` | Q4 2026 |
-| 📋 | **`minion:kill` / `minion:list`** — Kill all orphaned Node.js child processes for a project (`kill`), or list active minion PIDs grouped by bundle (`list`). No handler files exist despite both being documented in `minion/help.txt`. | `0.4.0` | Q4 2026 |
+| ✅ | **`bundle:status`** — Show the running/stopped state, PID, port, and active env for a specific bundle. | `0.4.1-alpha.2` | 2026-05-30 |
+| ✅ | **`bundle:rename`** — Rename a bundle in place within a project: moves the `src/` directory, rewrites the bundle-name footprint, and rekeys `manifest.json` + `env.json` + the ports registry preserving the existing port numbers, with `--dry-run` / `--force`. | `0.4.1-alpha.2` | 2026-06-01 |
+| ✅ | **`protocol:remove`** — Revert a bundle to the project's default protocol/scheme by removing its `settings.json` override (no shared `ports*.json` mutation), with `--dry-run` / `--force`. | `0.4.1-alpha.2` | 2026-05-31 |
+| ✅ | **`minion:list`** — List the running bundle child-processes ("minions") of a project, or of every project, grouped by project. `--format=json` supported. | `0.4.1-alpha.2` | 2026-05-31 |
+| ✅ | **`minion:kill`** — Reap a project's running bundle child-processes ("minions") — both pidfile-tracked and `ps`-discovered orphans — with a graceful SIGTERM/SIGKILL escalation and a `--dry-run` preview. | `0.4.1-alpha.2` | 2026-05-31 |
 | 📋 | **`gina --status` / `-t`** — Top-level health check: print whether the framework daemon is running, its version, and active bundle count. Requires adding `--status`/`-t` entries to `aliases.json` and implementing `framework/status.js`. | `0.4.0` | Q4 2026 |
-| 📋 | **`bundle:copy` / `bundle:cp`** — Duplicate a bundle (source files + config) under a new name within the same project. Handler is comments only (17 lines). | `0.4.0` | Q4 2026 |
-| 📋 | **`project:status`** — Show the running/stopped state of each bundle in a project with PID and port info. Handler is comments only (3 lines). | `0.4.0` | Q4 2026 |
+| ✅ | **`bundle:copy` / `bundle:cp`** — Duplicate a bundle (source files + config) under a new name within the same project, with a word-boundary name rewrite, a fresh full protocol/scheme/env port matrix, and `--dry-run` / `--force`. | `0.4.1-alpha.2` | 2026-05-31 |
+| ✅ | **`project:status`** — Show the running/stopped state of each bundle in a project with PID and port info. | `0.4.1-alpha.2` | 2026-05-30 |
 
 ### Tier 3 — `0.5.0`
 
@@ -181,6 +182,16 @@ HTTP security response headers as opt-in `gina.plugins.*` middlewares, mirroring
 
 ---
 
+## Accessibility
+
+Client-side form-validation accessibility — keeping `FormValidator`'s ARIA state in sync with field validity so screen-reader users get the same error feedback sighted users already get from native `:user-invalid` styling. No new public API; behaviour applies to fields that opt in through their existing ARIA markup. Models the `isInList` rule + CSP-nonce (#HDR16) rollout: ship behind the existing validator API, default-on for opted-in markup, no consuming-app code change.
+
+| Status | Feature | Version | Target |
+| --- | --- | --- | --- |
+| 📋 | **`aria-invalid` validity reflection (#A11Y1)** — `FormValidator` keeps `aria-invalid` in sync with each managed field's effective validity, so a field's `aria-errormessage` (and error `aria-describedby`) association is actually exposed to assistive technology. Per WAI-ARIA those associations are inert unless the field also carries `aria-invalid="true"`, so today screen-reader users are never told which field is invalid or what the error says even when the markup wires `aria-errormessage`. On every blur and submit pass — plus on `input` once a field has errored at least once — the validator sets `aria-invalid="true"` when invalid and `aria-invalid="false"` when valid; a pristine, never-validated field carries no attribute (three-state: absent / `false` / `true`, where `false` is a DOM-observable touched-and-valid signal the post-error `input` revalidation reads off the element). Where the field has native HTML constraints the native `ValidityState` (`element.validity.valid`) is the source of truth, so the attribute never disagrees with the `:user-invalid` styling that already drives the visible error. When the field already references an error element via `aria-errormessage`, the validator does NOT inject its `form-item-error-message` div (no duplicate message) — setting `aria-invalid` is enough to expose the existing element; legacy forms with no association keep the injected div and additionally gain an `aria-errormessage` wire to it. On a failed submit, focus moves to the first invalid field; blur-time errors (focus already gone) are announced through a dedicated visually-hidden `aria-live="polite"` status region rather than the static message, since a CSS `:user-invalid` display toggle is not reliably announced — suppressed for any field that simultaneously receives focus to avoid double-speaking. No new public API; existing `form-item-error` / `form-item-warning` / `form-item-error-message` / `error-message` / `data-gina-form-errors` classes and the submit-button `aria-disabled` / `disabled` toggling are unchanged. Acceptance: VoiceOver + NVDA announce the invalid field and its `aria-errormessage` text on a failed blur and submit, and stop once corrected; no visual regression on forms already using `form-item-error` / `error-message`. First consumer: freelancer-app-v3 public contact form. | `0.4.2-alpha` | Q3 2026 |
+
+---
+
 ## Secrets & Configuration
 
 Secrets handling for bundle JSON configs without baking plaintext values into source. Pluggable-backend design with `process.env` as the default; the reserved API surface allows future Vault / SOPS / K8s Secrets backends to slot in without changing call sites or the placeholder syntax.
@@ -273,7 +284,7 @@ A cold audit of the Couchbase connector identified two critical security vulnera
 | ✅ | **HTTP/2 session metrics** — expose active session count, stream count, GOAWAY and RST_STREAM totals via `/_gina/info` | `0.3.0-alpha.1` | 2026-04-01 | `server._h2Metrics` counter object instrumented via session event handlers; exposed under `"http2"` key in `/_gina/info` JSON. |
 | ✅ | **Configurable `maxConcurrentStreams` and `initialWindowSize`** — move from hardcoded to `settings.json` `http2Options` | `0.3.0-alpha.1` | 2026-04-05 | All four HTTP/2 server settings configurable: `maxConcurrentStreams` (256), `initialWindowSize` (655350), `maxSessionRejectedStreams` (100), `maxSessionInvalidFrames` (1000). Security guards (`maxHeaderListSize`, `enablePush`) remain hardcoded. |
 | ✅ | **Application-level rapid reset rate limiter** (CVE-2023-44487) — per-session stream creation counter | `0.3.13` | 2026-05-14 | The Isaac HTTP/2 session handler counts new streams in a rolling 1s window per session; over `maxStreamsPerSecond` (default 200) it sends a GOAWAY and closes the session. More targeted than `maxSessionRejectedStreams` (which counts refused streams, not created ones). Configurable via `settings.json` `http2Options.maxStreamsPerSecond`; `/_gina/info` exposes a `rapidResetBlocked` counter. |
-| 📋 | **Trailer support** — `stream.sendTrailers()` + `waitForTrailers: true` | `0.4.0` | Q4 2026 | No trailer support today. Required for gRPC-style streaming (grpc-status trailer) and content integrity use cases. Opt-in: activated only when a controller calls `self.sendTrailers(fields)`. |
+| ✅ | **Trailer support** — `stream.sendTrailers()` + `waitForTrailers: true` | `0.4.0` | 2026-05-22 | Opt-in HTTP/2 response trailers via `self.sendTrailers(fields)`. The render pipeline sets `waitForTrailers` and emits the trailing headers after the body (in the `wantTrailers` event), across all render delegates. Activated only when a controller calls `self.sendTrailers(fields)`; HTTP/1.1 and the no-trailers path are unchanged. For gRPC-style streaming (`grpc-status`) and content-integrity (`Digest`) use cases. |
 | 📋 | **Alt-Svc header** — advertise HTTP/3 availability | `0.5.0` | Q1 2027 | Set `Alt-Svc: h3=":443"; ma=86400` response header to advertise HTTP/3 (QUIC) availability via a QUIC-capable reverse proxy (nginx, Caddy, Cloudflare). Gina does not need to implement QUIC — just announce it. Opt-in via `settings.server.json`. Native HTTP/3 is out of scope: Node.js has no stable QUIC API, and the standard deployment topology (Gina → proxy → client) already delivers HTTP/3 at the edge. |
 | 📋 | **RFC 9218 Extensible Priorities** — read `Priority: u=N, i` request header | `0.5.0` | Q1 2027 | Use the RFC 9218 priority header to order response writes for multiplexed API clients. Low value for typical HTML page loads; high value for parallel API requests with declared urgency. |
 | 📋 | **WebSocket over HTTP/2** (RFC 8441 — CONNECT method extension) | `0.5.0` | Q1 2027 | Tunnel WebSocket over an HTTP/2 stream without a separate HTTP/1.1 connection. Node.js supports this since v10.19. Enables WebSocket in HTTP/2-only deployments. |

package/bin/cli

@@ -63,6 +63,18 @@ async function onExec() {
         var packObj         = require(pack);
         var version         = getEnvVar('GINA_VERSION') || packObj.version;// jshint ignore:line
         frameworkPath   = ginaPath + '/framework/v' + version;
+        // Validate the framework dir exists BEFORE requiring from it. GINA_VERSION
+        // (env/state) can point at a version that is not installed here — a stale
+        // pin, or a bind-mounted dev tree whose version differs from the expected
+        // one. Without this guard the require() below throws an opaque
+        // MODULE_NOT_FOUND that the catch mislabels as "could not load
+        // package.json", and every CLI command silently fails (e.g. project
+        // registration never runs). The sibling guard further down (resolving
+        // GINA_FRAMEWORK_DIR) runs too late — after this require.
+        if ( !fs.existsSync(frameworkPath) ) {
+            process.stderr.write('gina: framework version ' + version + ' is not installed (expected at ' + frameworkPath + ').\nInstalled package version is ' + packObj.version + '.\nTry:\n  $ gina framework:install ' + version + '\n');
+            return process.exit(1);
+        }
         var generator   = require(frameworkPath + '/lib/generator');
 
         require(frameworkPath + '/lib');

package/framework/v0.4.1/VERSION

@@ -0,0 +1 @@
+0.4.1

package/framework/{v0.4.0 → v0.4.1}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -19734,9 +19734,6 @@ if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     define( 'lib/inherits',[],function() { return Inherits(); });
 };
 
-if ( typeof(module) !== 'undefined' && module.exports ) {
-    var lib = require('../../index');
-}
 
 /**
  * @module lib/collection

package/framework/{v0.4.0 → v0.4.1}/core/asset/plugin/dist/vendor/gina/js/gina.min.js

@@ -510,7 +510,7 @@ typeof Object.assign!=='function'&&Object.defineProperty(Object,'assign',{value:
 if(typeof JSON.clone=='undefined'){var clone=function(m,E){if(m==null||typeof m!='object'||m.constructor!=Object&&m.constructor!=Array)return m;if(m.constructor==Date||m.constructor==RegExp||m.constructor==Function||m.constructor==String||m.constructor==Number||m.constructor==Boolean)return new m.constructor(m);E=E||new m.constructor;for(var J=0,M=Object.getOwnPropertyNames(m).length||0,C=Object.keys(m);J<M;)E[C[J]]=typeof E[C[J]]=='undefined'?clone(m[C[J]],null):E[C[J]],J++;return E};JSON.clone=
 clone}if(typeof JSON.escape=='undefined'){var escape=function(m){try{return m.replace(/\n/g,'\\n').replace(/\r/g,'\\r').replace(/\t/g,'\\t')}catch(E){throw E;}};JSON.escape=escape}define('utils/polyfill',function(){});
 function Inherits(m,E){return function(J,M){var C=typeof J=='undefined'||typeof M=='undefined'?"inherits(a, b): neither [ a ] nor [ b ] can't be undefined or null":!1;if(C)throw Error(C);C=function(){return function(){if(this){this.prototype=J.prototype;this.name||(this.name=J.name);this.prototype.name=this.name;for(var A in M.prototype)this[A]||(this[A]=M.prototype[A]);M.apply(this,arguments);J.apply(this,arguments)}}}(J,M);J.prototype==void 0&&(J.prototype={});M.prototype==void 0&&(M.prototype=
-{});J.prototype=Object.create(M.prototype,{});C.prototype=Object.create(J.prototype,{});return C}}typeof module!=='undefined'&&module.exports?module.exports=Inherits():typeof define==='function'&&define.amd&&define('lib/inherits',[],function(){return Inherits()});if(typeof module!=='undefined'&&module.exports)var lib=require('../../index');
+{});J.prototype=Object.create(M.prototype,{});C.prototype=Object.create(J.prototype,{});return C}}typeof module!=='undefined'&&module.exports?module.exports=Inherits():typeof define==='function'&&define.amd&&define('lib/inherits',[],function(){return Inherits()});
 function Collection(m,E){var J=typeof module!=='undefined'&&module.exports?!1:!0,M=J?require('lib/uuid'):require('../../../lib/uuid'),C=J?require('lib/merge'):require('../../../lib/merge'),A={isCaseSensitive:{false:{re:'^%s$',modifiers:'i'},true:{re:'^%s$'}},skipEval:!1},U=!1,D=!1,Y=null;J={useLocalStorage:!1,locale:'en',searchOptionRules:A};E=typeof E=='object'?C(E,J):J;var n=['not null'],l=/^\s*(new\s+Date\("[^"]*"\)|"[^"]*"|-?\d+(?:\.\d+)?)\s*(===|!==|<=|>=|==|!=|<|>)\s*(new\s+Date\("[^"]*"\)|"[^"]*"|-?\d+(?:\.\d+)?)\s*$/,
 c=function(h){var g=h.match(/^\s*new\s+Date\("([^"]*)"\)\s*$/);if(g)return new Date(g[1]);g=h.replace(/^\s+|\s+$/g,'');if(/^"[^"]*"$/.test(g))return g.slice(1,-1);var r=Number(g);if(!isNaN(r)&&g!=='')return r;throw Error('Invalid operand: `'+h+'`');},S=function(h){var g=typeof h=='string'?h.match(l):null;if(!g)throw Error('Could not evaluate condition `'+h+'`.\n(grammar: <operand><op><operand>; operand \u2208 number | "string" | new Date("..."); op \u2208 === !== == != < > <= >=)');try{var r=c(g[1]),
 F=g[2],N=c(g[3]);if(F==='<'||F==='>'||F==='<='||F==='>=')r instanceof Date&&(r=r.getTime()),N instanceof Date&&(N=N.getTime());switch(F){case '===':return r===N;case '!==':return r!==N;case '==':return r==N;case '!=':return r!=N;case '<':return r<N;case '>':return r>N;case '<=':return r<=N;case '>=':return r>=N}}catch(q){throw Error('Could not evaluate condition `'+h+'`.\n'+q.stack);}};if(typeof m=='undefined'||m==''||m==null)m=[];if(!Array.isArray(m))throw Error('`new Collection([content] [, options] )`: `content` argument must be an Array !');

package/framework/{v0.4.0 → v0.4.1}/core/controller/controller.js

@@ -1059,6 +1059,49 @@ function SuperController(options) {
         return (/(http|ftp|https|sftp):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])?/.test(url)) ? true : false;
     }
 
+    /**
+     * Override the route's default template path / extension at action time.
+     *
+     * Use case: a controller action that resolves the template dynamically
+     * (e.g. a catch-all router that picks the template by URL pattern). With
+     * Gina's standard 1:1 routing.json → template mapping the rule's
+     * `param.file` is sufficient, but dynamic dispatch needs a runtime
+     * override that survives until render-time.
+     *
+     * The render delegates (controller.render-swig.js,
+     * controller.render-nunjucks.js) read `localOptions._templateOverride`
+     * and use it verbatim under the templates root — with no namespace
+     * prefixing — before falling back to `data.page.view.file`/`.ext`.
+     * Setting this after `setOptions()` has already populated
+     * `data.page.view.*` is the supported way to redirect rendering from
+     * inside an action — that eviction-order is otherwise unreachable from
+     * controller code because `local.options` is closure-private.
+     *
+     * @memberof BaseController
+     * @param {string} file - Template path relative to the bundle's
+     *                        templates root (no extension; pass `ext` separately).
+     * @param {string} [ext] - File extension (with or without leading dot).
+     *                         Defaults to whatever `data.page.view.ext` carries.
+     * @returns {void}
+     * @example
+     * // Catch-all action dispatching to a template chosen at runtime:
+     * this.catchAll = function (req, res, next) {
+     *     var self = this;
+     *     self.setTemplate('errors/' + res.statusCode); // → templates/errors/404(.html)
+     *     self.render({ message: 'Not found' });
+     * };
+     */
+    this.setTemplate = function (file, ext) {
+        if (!local.options) return; // setOptions hasn't run yet — bail safely
+        if (!local.options._templateOverride) local.options._templateOverride = {};
+        if (typeof file === 'string') {
+            local.options._templateOverride.file = file;
+        }
+        if (typeof ext === 'string' && ext) {
+            local.options._templateOverride.ext = (ext.charAt(0) === '.') ? ext : ('.' + ext);
+        }
+    };
+
     /**
      * Render the current view without its layout wrapper.
      * Delegates to `self.render()` after setting `local.options.isWithoutLayout = true`.

package/framework/{v0.4.0 → v0.4.1}/core/controller/controller.render-nunjucks.js

@@ -136,6 +136,7 @@ var emitInspectorWindowData = require('./inspector-window-emit');
 // undefined and crashes the module-level read. Push upstream to gina-io/gina.
 var libRef          = require('../../lib') || require.cache[require.resolve('../../lib')];
 var Collection      = libRef.Collection;
+var merge           = libRef.merge;
 // #NJ3 — static HTML cache writes. Module-scoped `cache` instance mirrors
 // `render-swig.js:6` and `render-json.js:5`. Per-request, the main render
 // function re-points it at the server's shared in-memory store (key:
@@ -204,6 +205,17 @@ function getEnvironment(nunjucks, templateRoot, options) {
  * @returns {string} relative template path
  */
 function resolveTemplatePath(data, localOptions) {
+    // Honour controller-set override from self.setTemplate(file, ext).
+    // When set, the override fully replaces the rule's default path —
+    // no namespace prefixing — so a catch-all dispatcher can drop the
+    // controller anywhere under the templates root.
+    if (localOptions && localOptions._templateOverride && localOptions._templateOverride.file) {
+        var ovFile = localOptions._templateOverride.file;
+        var ovExt  = localOptions._templateOverride.ext || data.page.view.ext || '';
+        if (ovExt && !ovFile.endsWith(ovExt)) ovFile += ovExt;
+        return ovFile;
+    }
+
     var file = data.page.view.file;
     var ext  = data.page.view.ext || '';
 
@@ -639,6 +651,70 @@ function registerGinaFilters(env, self, local, localOptions, req, res) {
     }
 }
 
+/**
+ * Invoke the bundle's `controllers/setup.js` (if any) with `this.engine`
+ * bound to the cached `nunjucks.Environment`, so user code can call
+ * `engine.addFilter(name, fn)` to extend filters on the nunjucks side
+ * the same way it already can on swig (where `self.engine = swig` is
+ * set by `controller.js` before setup runs).
+ *
+ * Without this hook, every nunjucks bundle that uses the documented
+ * setup.js pattern (`var engine = this.engine; engine.addFilter(...)`)
+ * silently no-ops because `this.engine` arrives as the controller's
+ * default `{}` — the nunjucks engine is created lazily here in the
+ * render delegate, after the controller's onReady->setup chain has
+ * already fired.
+ *
+ * Run once per `nunjucks.Environment` instance: marker `_userSetupDone`
+ * is stamped on the env itself so re-renders are no-ops, and a fresh
+ * env (e.g. after `nunjucksResolver.reset()`) re-runs setup.
+ *
+ * @inner
+ * @param {*}        env          - cached `nunjucks.Environment`
+ * @param {object}   self         - SuperController instance (provides throwError)
+ * @param {object}   local        - per-request closure (`req`, `res`, `next`)
+ * @param {object}   localOptions - controller's localOptions (has `bundle`, `conf.bundlesPath`)
+ * @param {object}   req          - function-scoped capture of `local.req` (#M1 async-race guard)
+ * @param {object}   res          - function-scoped capture of `local.res`
+ * @param {Function} _next        - function-scoped capture of `local.next`
+ * @returns {void}
+ */
+function registerUserFilters(env, self, local, localOptions, req, res, _next) {
+    if (env._userSetupDone) return;
+    if (!localOptions || !localOptions.bundle || !localOptions.conf || !localOptions.conf.bundlesPath) return;
+
+    var setupFile = localOptions.conf.bundlesPath + '/' + localOptions.bundle + '/controllers/setup.js';
+    if (!fs.existsSync(setupFile)) {
+        env._userSetupDone = true; // no setup.js — nothing to do, don't recheck
+        return;
+    }
+
+    var Setup;
+    try {
+        Setup = require(setupFile);
+    } catch (loadErr) {
+        try { console.warn('[render-nunjucks] failed to load user setup.js (' + setupFile + '): ' + (loadErr.message || loadErr)); } catch (e) {}
+        env._userSetupDone = true;
+        return;
+    }
+
+    if (typeof Setup !== 'function') {
+        env._userSetupDone = true;
+        return;
+    }
+
+    Setup.engine     = env;
+    Setup.throwError = self.throwError;
+
+    try {
+        Setup.apply(Setup, [req, res, _next]);
+    } catch (setupErr) {
+        try { console.warn('[render-nunjucks] user setup.js threw: ' + (setupErr.message || setupErr)); } catch (e) {}
+    }
+
+    env._userSetupDone = true;
+}
+
 /**
  * Post-render asset injection — the nunjucks counterpart to the pre-compile
  * layout mutation in `render-swig.js:963-1195`. Idempotent and safe to call
@@ -949,18 +1025,42 @@ module.exports = async function renderNunjucks(userData, displayInspector, errOp
         ));
     }
 
-    // Merge user data into page.data so templates can access via {{ page.data.foo }}
-    // or {{ foo }} at top level (promoted for ergonomic parity with swig).
-    // FRAMEWORK PATCH: the comment promised top-level promotion but
-    // the original code only wrote to data.page.data. Mirror to top-level too.
+    // Merge user data into the render context, mirroring `render-swig.js`.
+    //
+    //   (a) Branching stash — if userData has no `page` key, copy it into
+    //       `data.page.data` (so `{{ page.data.foo }}` works). userData with
+    //       a `page` key skips the stash.
+    //   (b) Unconditional top-level merge — userData wins on collision;
+    //       userData.page merges INTO data.page (per-key) so a controller
+    //       passing `page.*` does not wholesale-replace the subtree.
+    //   (c) Framework-data restore — re-overlay getData() so the deep merge
+    //       brings back any framework-injected page.environment/page.view/
+    //       page.data.session keys that (b)'s per-key page write dropped.
+    //       This is the `render-swig.js:593` step nunjucks was missing; without
+    //       it a controller passing a partial `page.environment` clobbers
+    //       webroot/hostname/version (§4 parity rule).
     if (userData && typeof(userData) === 'object') {
-        if (!data.page.data) { data.page.data = {}; }
+        // (a) Branching stash
+        if (!userData.page) {
+            if (!data.page.data) { data.page.data = {}; }
+            Object.keys(userData).forEach(function (k) {
+                data.page.data[k] = userData[k];
+            });
+        }
+        // (b) Unconditional top-level merge — userData wins; userData.page
+        // merges INTO data.page (preserves framework-injected page.view etc.).
         Object.keys(userData).forEach(function (k) {
-            data.page.data[k] = userData[k];
-            if (typeof(data[k]) === 'undefined') {
+            if (k === 'page' && data.page && typeof userData.page === 'object') {
+                Object.keys(userData.page).forEach(function (pk) {
+                    data.page[pk] = userData.page[pk];
+                });
+            } else {
                 data[k] = userData[k];
             }
         });
+        // (c) Restore framework page.* — deep-merge getData() back on top so
+        // page.environment/page.view/page.data.session survive (b).
+        data = merge(data, getData());
     }
 
     // FRAMEWORK PATCH: Bug J — alias `data.data` to `data.page.data`
@@ -1001,6 +1101,16 @@ module.exports = async function renderNunjucks(userData, displayInspector, errOp
         return self.throwError(filterErr);
     }
 
+    // #NJ1b — give the bundle's controllers/setup.js a chance to extend
+    // filters via `this.engine.addFilter(...)`, mirroring the swig path
+    // where `self.engine = swig` is set in controller.js before setup runs.
+    // No-op if no setup.js exists or it doesn't add filters.
+    try {
+        registerUserFilters(env, self, local, localOptions, req, res, _next);
+    } catch (userFilterErr) {
+        try { console.warn('[render-nunjucks] registerUserFilters failed: ' + (userFilterErr.message || userFilterErr)); } catch (e) {}
+    }
+
     // #NJ2 — build the per-request template config and populate
     // `data.page.view.stylesheets` / `data.page.view.scripts`. Mirrors the
     // swig path at render-swig.js:493-499. When `isWithoutLayout` is set

package/framework/{v0.4.0 → v0.4.1}/core/controller/controller.render-swig.js

@@ -312,7 +312,18 @@ module.exports = async function render(userData, displayInspector, errOptions, d
         }
         file = (isRenderingCustomError) ? localOptions.file : data.page.view.file;
         // making path thru [namespace &] file
-        if ( typeof(localOptions.namespace) != 'undefined' && localOptions.namespace ) {
+        // #27 — self.setTemplate(file, ext) override wins and fully replaces
+        // the path with NO namespace prefixing (mirrors render-nunjucks
+        // resolveTemplatePath), so a catch-all dispatcher can target any
+        // template under the templates root. Skipped during custom-error
+        // rendering, which renders the framework error template instead.
+        if ( !isRenderingCustomError && localOptions._templateOverride && typeof(localOptions._templateOverride.file) === 'string' && localOptions._templateOverride.file ) {
+            file = data.page.view.file = localOptions._templateOverride.file;
+            if ( typeof(localOptions._templateOverride.ext) === 'string' && localOptions._templateOverride.ext ) {
+                data.page.view.ext = localOptions._templateOverride.ext;
+            }
+            path = _(localOptions.template.html + '/' + file);
+        } else if ( typeof(localOptions.namespace) != 'undefined' && localOptions.namespace ) {
             // excepted for custom paths
             var fileNamingConvention = file.replace(localOptions.namespace+'-', '');
             // replaced: !/^(\.|\/|\\)/.test(file) → charAt(0) checks (#P9)
@@ -535,6 +546,15 @@ module.exports = async function render(userData, displayInspector, errOptions, d
 
         if (!userData) {
             userData = { page: { view: {}}}
+        } else if ( isWithoutLayout ) {
+            // Layoutless renders (self.renderWithoutLayout) have no page envelope
+            // — no `view.layout`, no breadcrumb, no session card — so the
+            // `page`-key-presence gating used below for full pages serves no
+            // purpose here and only buries the controller's context under
+            // `data.page.data`, where the fragment template's top-level
+            // {{ var }} references can't reach it. Merge user context at
+            // top level unconditionally for fragments.
+            data = (isRenderingCustomError) ? userData : merge(userData, data)
         } else if ( userData && !userData['page']) {
 
             if ( typeof(data['page']['data']) == 'undefined' )

package/framework/{v0.4.0 → v0.4.1}/core/server.js

@@ -2178,7 +2178,25 @@ function Server(options) {
                                 !isBinary
                                 && typeof(self._options.template.assets[request.url]) == 'undefined'
                             ) {
-                                self._options.template.assets = getAssets(bundleConf, file);
+                                // #assets-guard — getAssets() returns the assets map SERIALIZED as a
+                                // string (its render-path consumers in controller.render-swig.js /
+                                // controller.render-v1.js embed it verbatim). `template.assets` must
+                                // stay an OBJECT here: assigning the raw string and then writing
+                                // `template.assets[request.url]` below throws under 'use strict'
+                                // (TypeError: Cannot create property '<url>' on string '{}'), killing the
+                                // bundle under concurrent static requests (Chrome HTTP/2 favicon/manifest
+                                // prefetch). Parse it back into the object form it represents.
+                                try {
+                                    self._options.template.assets = JSON.parse( getAssets(bundleConf, file) || '{}' );
+                                } catch (e) {
+                                    self._options.template.assets = {};
+                                }
+                            }
+
+                            // #assets-guard — defense-in-depth: never write a property on a non-object
+                            // assets map (binary requests skip the coercion above).
+                            if ( typeof(self._options.template.assets) != 'object' || self._options.template.assets == null ) {
+                                self._options.template.assets = {};
                             }
 
                             if (
@@ -2261,6 +2279,10 @@ function Server(options) {
                                         contentType = contentType +'; charset='+ bundleConf.encoding;
                                         ext = request.url.match(/\.([A-Za-z0-9]+)$/);
                                         request.url = ( ext != null && typeof(ext[0]) != 'undefined' ) ? request.url : request.url + 'index.html';
+                                        // #assets-guard — defense-in-depth before the property writes below.
+                                        if ( typeof(self._options.template.assets) != 'object' || self._options.template.assets == null ) {
+                                            self._options.template.assets = {};
+                                        }
                                         if (
                                             !isPathMatchingUrl
                                             && typeof(self._options.template.assets[request.url]) == 'undefined'

package/framework/{v0.4.0 → v0.4.1}/lib/cache/src/main.js

@@ -1,7 +1,4 @@
 'use strict';
-if ( typeof(module) !== 'undefined' && module.exports ) {
-    const lib = require('../../index');
-}
 
 /**
  * @module lib/cache

package/framework/{v0.4.0 → v0.4.1}/lib/cmd/bundle/add.js

@@ -182,6 +182,14 @@ function Add(opt, cmd) {
     /**
      * Checks if the bundle already exists and prompts for replace/import/cancel.
      *
+     * When the bundle already exists and neither `--replace` nor `--import` was
+     * passed, an interactive prompt is shown. In a non-interactive context (no
+     * TTY — container entrypoint, CI, piped/detached stdin) that prompt cannot be
+     * answered: the module-scope readline closes on stdin EOF before this async
+     * scan callback runs, so `rl.prompt()` would throw ERR_USE_AFTER_CLOSE. The
+     * guard below fails fast with guidance to re-run with `--import` or
+     * `--replace` instead of surfacing an opaque "readline was closed" rollback.
+     *
      * @inner
      * @private
      */
@@ -215,6 +223,22 @@ function Add(opt, cmd) {
                 return;
             }
 
+            // Interactive prompt requires a TTY. In a non-interactive context
+            // (container entrypoint, CI, piped or detached stdin) the module-scope
+            // readline closes on stdin EOF before this async scan callback runs, so
+            // rl.prompt() below would throw ERR_USE_AFTER_CLOSE — caught upstream and
+            // surfaced as an opaque "could not complete bundle creation: readline was
+            // closed" rollback. Fail fast with actionable guidance instead.
+            if ( !process.stdin.isTTY || rl.closed ) {
+                console.error(
+                    'Bundle [ '+ local.bundle +' ] already exists, but no choice can be read: stdin is not interactive (no TTY).\n'
+                    + 'Re-run with --import to register the existing source, or --replace to overwrite it (existing files will be lost):\n'
+                    + '  gina bundle:add '+ local.bundle +' @'+ self.projectName +' --import\n'
+                    + '  gina bundle:add '+ local.bundle +' @'+ self.projectName +' --replace'
+                );
+                return process.exit(1);
+            }
+
             rl.setPrompt('Bundle [ '+ local.bundle +' ] already exists !\n(r) Replace - All existing files will be lost !\n(c) Cancel\n(i) Import\n> ');
 
             rl.prompt();

package/framework/{v0.4.0 → v0.4.1}/lib/cmd/bundle/arguments.json

@@ -13,5 +13,7 @@
   "--http-port",
   "--max-in-flight",
   "--auth-token",
-  "--cors-origin"
+  "--cors-origin",
+  "--dry-run",
+  "--format"
 ]