@bongos/core 1.19.132 → 1.19.133

package/.bongos-core.json

@@ -2,22 +2,22 @@
   "artifact": "bongos-core",
   "manifest_schema": 1,
   "generator": "scripts/gds/package-core.js",
-  "core_version": "1.19.132",
-  "core_contract": "1.19.132",
-  "source_commit": "450f890ee24a473026548ea2cf82cf69ac1d6d9c",
+  "core_version": "1.19.133",
+  "core_contract": "1.19.133",
+  "source_commit": "ab4e04d82f1699e1781d780bf327f3da0150ddb9",
   "source_ref": "HEAD",
-  "built_at": "2026-08-15T03:38:15.933Z",
+  "built_at": "2026-08-15T03:42:15.630Z",
   "redaction": {
     "model": "docs-redacted+functional-verbatim",
     "docs_redacted": 303,
     "agent_docs_stubbed": 21,
-    "functional_verbatim": 1248,
+    "functional_verbatim": 1249,
     "rules": 3,
     "gate_literals": 3,
     "gate": "passed"
   },
-  "file_count": 1572,
-  "tree_sha256": "d0e21da3aa85bb9e774ef6c921a2cc4be514b8dab592b7a1b3fa8bb07e8be485",
+  "file_count": 1573,
+  "tree_sha256": "90710d328ac6f0b388a9c427df22ad7fb6fc7087ea9b5baebc708525e61aac50",
   "files": [
     {
       "path": ".claude/skills/blocker-review/SKILL.md",
@@ -4172,12 +4172,12 @@
     {
       "path": "package-lock.json",
       "mode": "0000644",
-      "sha256": "26a0143ba944f1edf0c163992ecd6f447fa911d16d7b8161578c7b1bc6725a48"
+      "sha256": "fd95462763cc12a1a060875e7ba46a46b8e3a396cbda3ad743ea926357ddfda9"
     },
     {
       "path": "package.json",
       "mode": "0000644",
-      "sha256": "763b31a597012a53b4f7b6c0c0ce9a30e10ba13206468820d16dcc5d04d972ec"
+      "sha256": "73ce7f53c0bab1ed2c0ab9dc6f6b8e64fadc8d01b6baa9afcfa2b10710f196a5"
     },
     {
       "path": "public-docs/index.html",
@@ -4797,7 +4797,7 @@
     {
       "path": "scripts/gds/fitness.js",
       "mode": "0000644",
-      "sha256": "2c557a65fa79495e5d84b6902e5fbedac7cd8faa22540b595d41f33505b066cb"
+      "sha256": "c1bc8ad1db37b53b80f2f8daab0bd86c874178546695d6b6c3f65af15317de32"
     },
     {
       "path": "scripts/gds/gate-review.js",
@@ -4927,7 +4927,7 @@
     {
       "path": "scripts/gds/lib.sh",
       "mode": "0000644",
-      "sha256": "34b711dd649fe21ee149ea8b7f9f347cd36d18900846f12a6e9810b7c30c6a96"
+      "sha256": "009d436a22a274f417ee84d462036be84d76226e45ced4ed7614e4460e25d9d5"
     },
     {
       "path": "scripts/gds/linkify-refs.js",
@@ -5077,7 +5077,7 @@
     {
       "path": "scripts/gds/portability-smoke-memory.sh",
       "mode": "0000644",
-      "sha256": "dc0595220f2cb0a6620e2f26af4b43f67117b381bbc31d5711de8934eb65a245"
+      "sha256": "bec9e23a2b8092c6a2b1bb5edaed48900485e7296a3d7e683cce215ad7ec7ab9"
     },
     {
       "path": "scripts/gds/preflight.js",
@@ -5327,12 +5327,12 @@
     {
       "path": "scripts/gds/smoke-batch-claim.sh",
       "mode": "0000644",
-      "sha256": "c908a7aaf1497d5463d1fa315c1b25a21da84c96fd418d62c96f37a6bc69a7d8"
+      "sha256": "96a38493a51e3b21d6059bda25bff0bc36123117f7a683d7fc83e4ccf779b899"
     },
     {
       "path": "scripts/gds/smoke-batch-release.sh",
       "mode": "0000644",
-      "sha256": "223464bf0c953cab73092acf7928ce6142d7d677ab1858be4ae080db95d9ddf6"
+      "sha256": "1b0276b21420cd4fdbb9a77f0b34270e90109cd62579469e71607c286821904b"
     },
     {
       "path": "scripts/gds/smoke-box.sh",
@@ -5342,12 +5342,12 @@
     {
       "path": "scripts/gds/smoke-claim-consistency.sh",
       "mode": "0000644",
-      "sha256": "b4f9c864f116f5899d3e4513805d7e68cf4699346ae52f7bb87a07305185d1f8"
+      "sha256": "55aa25f1d7143edec57833dcd582f05d1a1b7261bd73d51044fc48dff3532ee1"
     },
     {
       "path": "scripts/gds/smoke-dependencies.sh",
       "mode": "0000644",
-      "sha256": "7698dc3d1c1a1c9908f734e93d4880fda389011011e9a050df3154cc418e800d"
+      "sha256": "7e0e240869ad03ed8448748c5918a232dd8c0b80a084834b44ab453d7a98c1e9"
     },
     {
       "path": "scripts/gds/smoke-gds.js",
@@ -5357,7 +5357,7 @@
     {
       "path": "scripts/gds/smoke-write.sh",
       "mode": "0000644",
-      "sha256": "29b47bc1f8664051d4fb0271adbe92e0247b7b7bb9bc254312e45390426cb29a"
+      "sha256": "9c3a382def8c074a37bad66d7e3deef41c7f2bb9406f02f107be0e9a7dc7bfb3"
     },
     {
       "path": "scripts/gds/start.js",
@@ -5762,7 +5762,7 @@
     {
       "path": "src/module-api.js",
       "mode": "0000644",
-      "sha256": "9754ad61248f7a9ccf1b4361bf7de1895318872a4994f74f53668151c60f8aeb"
+      "sha256": "6d426bc93757b3261642a8969c3ee1e87ab9c2c60e2cdb74539db67759501bbd"
     },
     {
       "path": "src/module-loader/catalog.js",
@@ -6944,6 +6944,11 @@
       "mode": "0000644",
       "sha256": "89a9d21ee1c5b00ee09de2d888873fa13c1b2b6d15ab05a6bfeb7e7a5d016a03"
     },
+    {
+      "path": "tests/lib_sh_resolution.mjs",
+      "mode": "0000644",
+      "sha256": "353fa78c96ac85e13d4fce417e32b061d9b95e8077baa5f2348fb576f18b72f6"
+    },
     {
       "path": "tests/lifecycle-card.mjs",
       "mode": "0000644",

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bongos/core",
-  "version": "1.19.132",
+  "version": "1.19.133",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bongos/core",
-      "version": "1.19.132",
+      "version": "1.19.133",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "express": "^4.21.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bongos/core",
-  "version": "1.19.132",
+  "version": "1.19.133",
   "description": "Cloud Bongos — the AI-first build platform core (GDS + platform surfaces + module system), installed as a versioned dependency (ADR 0108).",
   "license": "AGPL-3.0-or-later",
   "main": "src/platform-server.js",

package/scripts/gds/fitness.js

@@ -974,7 +974,20 @@ const IDENTITY_SCAN_EXTRA_FILES = ['scripts/gds/architect-audit.js'];
 //     records of what those tasks said when they were filed. Rewriting them would
 //     falsify the record; deleting the files would destroy it. They are inert
 //     (idempotent on source_ref) and referenced only by generated manifests.
+//   * the four *.sh entries — surfaced when `.sh` joined the extension set (task
+//     1002567). Each is a HOST-PINNED OPS script, not portable code: they name the
+//     live box's actual Postgres database/role and its actual /etc secrets dir, and
+//     every one of those literals is already only the DEFAULT behind an env override
+//     (GDS_BACKUP_DB, PROD_DB/STAGING_DB, PG_SOCKET). Same rationale as box.js's real
+//     DNS zones — an infrastructure identifier, not an instance URL, and the systemd
+//     units on that box invoke these by path. Re-pointing an instance's backups is
+//     deployment work, not a branding read. Their COUNT is still frozen here, so a
+//     NEW literal in any of them fails exactly like one in an unlisted file.
 const IDENTITY_SCAN_ALLOWED = {
+  'scripts/gds/audit-replay.sh': 1,
+  'scripts/gds/db-backup-nightly.sh': 1,
+  'scripts/gds/db-backup-offsite.sh': 2,
+  'scripts/gds/seed-staging.sh': 4,
   'scripts/gds/backfill-sessions.js': 2,
   'scripts/gds/box.js': 3,
   'scripts/gds/publish-manifest.js': 2,
@@ -989,7 +1002,13 @@ const IDENTITY_SCAN_ALLOWED = {
   'scripts/gds/seed-provisioning-tasks.js': 2,
   'scripts/gds/version-close.js': 1,
 };
-const IDENTITY_SCAN_EXTS = new Set(['.js', '.html', '.css']);
+// `.sh` joined at task 1002567: the extension set was `.js/.html/.css`, so NO shell
+// script had ever been scanned — which is how scripts/gds/lib.sh kept a hardcoded
+// founder host as its API-base default (and a hardcoded ~/.config/otb token path)
+// through the entire task 1002201 sweep, leaving all five bash smokes dead on any
+// instance with a different configDir. The guard could not see the file class the
+// bug lived in.
+const IDENTITY_SCAN_EXTS = new Set(['.js', '.html', '.css', '.sh']);
 // Path-prefix carve-outs (see the header note). Kept SMALL and documented.
 const IDENTITY_SCAN_EXCLUDE = ['modules/game/'];
 // Directories with no authored source to gate.
@@ -1001,6 +1020,11 @@ const IDENTITY_SCAN_SKIP_DIRS = new Set(['node_modules', '.git', 'generated', 'i
 function stripCommentsForIdentity(text, ext) {
   let t = String(text == null ? '' : text);
   if (ext === '.html') return t.replace(/<!--[\s\S]*?-->/g, '');
+  // Shell has no block comments, so it returns BEFORE the /* */ strip below (a
+  // `"$TMP"/*` glob would otherwise eat real code). Only FULL-LINE `#` comments
+  // (and the shebang) are stripped: cutting from an inline `#` would truncate
+  // `${v#p}` / `$#` lines and could hide a literal sitting after them.
+  if (ext === '.sh') return t.split(/\r?\n/).map((l) => (/^\s*#/.test(l) ? '' : l)).join('\n');
   t = t.replace(/\/\*[\s\S]*?\*\//g, ''); // block comments (js + css)
   // Split on /\r?\n/, NOT '\n' (task 1002428). On a CRLF checkout the old split
   // left a trailing \r on every line, and since `.` does not match \r the `.*$`
@@ -1102,7 +1126,7 @@ function checkKernelPromptsNoHardcodedIdentity() {
     hardFail: violations.length > 0,
     violations,
     warnings: [],
-    note: `${scanned} portable source file(s) scanned (src/bongos/** + modules/** + scripts/gds/** + kernel-prompt CLIs, minus the instance-1 product + generated dirs) — none may hardcode the host brand; identity comes from branding()/window.__BRANDING__ (ADR 0062 §3/§5). ${ratcheted} scripts/gds file(s) hold documented permanent carve-outs (real DNS zones, real doc filenames, operator runbook text, historical seeded prose) capped at a count they may not exceed — task 1002428.`,
+    note: `${scanned} portable source file(s) scanned (.js/.html/.css/.sh under src/bongos/** + modules/** + scripts/gds/** + kernel-prompt CLIs, minus the instance-1 product + generated dirs) — none may hardcode the host brand; identity comes from branding()/window.__BRANDING__ (ADR 0062 §3/§5). ${ratcheted} scripts/gds file(s) hold documented permanent carve-outs (real DNS zones, real doc filenames, operator runbook text, historical seeded prose) capped at a count they may not exceed — task 1002428.`,
   };
 }
 

package/scripts/gds/lib.sh

@@ -2,9 +2,20 @@
 # scripts/gds/lib.sh — shared helpers for the GDS shell smoke scripts.
 # SOURCED, never executed:  source "$(dirname "$0")/lib.sh"
 #
-# Holds ONLY the pieces that were byte-identical across smoke-batch-claim.sh,
-# smoke-claim-consistency.sh, and smoke-write.sh: the GDS API base-URL default
-# (a literal that had drifted) and the CLI session-token resolution.
+# Holds ONLY the pieces that were byte-identical across the sourcing smokes: the
+# GDS API base URL and the CLI session-token resolution.
+#
+# BOTH now delegate to `node`, the one runtime this repo guarantees (task 686),
+# instead of re-implementing config resolution in bash. Re-implementing it is
+# exactly what made every sourcing script instance-blind (task 1002567): the
+# token path was a baked-in ~/.config/otb/ and the API base a baked-in founder
+# host, so on any instance with a different configDir the scripts either died
+# looking for a session that was never there, or — worse, had they found one —
+# would have exercised somebody else's instance. src/instance-config.js and
+# cli-lib.js are the single source of truth for both values; shelling out to
+# them means this file cannot drift from them again. It also drops the python3
+# dependency these two helpers carried, which is the other reason they could
+# not run on a Windows builder's machine.
 #
 # Deliberately NOT here:
 #   - the per-script curl `call()` wrapper — the two contracts differ in
@@ -12,32 +23,51 @@
 #     non-zero so its caller can read CODE/PAYLOAD; smoke-write/-consistency echo
 #     the payload and `return 1` on a non-2xx so `set -e` aborts). Merging them
 #     would break one or the other, so each script keeps its own.
-#   - smoke-dependencies.sh / portability-smoke-memory.sh, whose token + base-URL
-#     handling intentionally differs (macOS-only path / env-first token / no PMS
-#     fallback / skip-on-missing) — left as-is to preserve that drift.
 
-# The GDS API host. One home for the default that had drifted across the smoke
-# scripts; still overridable via GDS_API_BASE / (legacy) PMS_API_BASE.
+# lib.sh's own directory, captured at SOURCE time (BASH_SOURCE, not $0 — $0 is
+# the sourcing script). Captured eagerly because a caller may cd afterwards:
+# portability-smoke-memory.sh cd's to the repo root right after sourcing.
+GDS_LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Run a node snippet with scripts/gds as its cwd, so relative require()s resolve
+# no matter where the caller is — and so no absolute path crosses the bash→node
+# boundary (Git Bash would hand node an MSYS path it cannot resolve).
+gds_node() {
+  if ! command -v node >/dev/null 2>&1; then
+    echo "FAIL: node is not on PATH — the GDS smokes resolve their config through it (task 686)." >&2
+    return 2
+  fi
+  ( cd "$GDS_LIB_DIR" && node -e "$1" )
+}
+
+# The GDS API host. GDS_API_BASE / (legacy) PMS_API_BASE win, then whatever
+# instance-config resolves for this checkout + session (env → session api_base →
+# this instance's own origin) — the same order every node CLI uses.
 gds_api_base() {
-  printf '%s' "${GDS_API_BASE:-${PMS_API_BASE:-https://amazonprimea.com}}"
+  local base="${GDS_API_BASE:-${PMS_API_BASE:-}}"
+  if [[ -n "$base" ]]; then printf '%s' "$base"; return 0; fi
+  gds_node "process.stdout.write(require('../../src/instance-config').resolveApiBase())"
+}
+
+# The instance this session actually belongs to, IGNORING the env overrides
+# (session api_base, else this instance's own origin). For guards that must
+# check an overridden base AGAINST the real instance before sending it a token.
+gds_instance_base() {
+  gds_node "process.stdout.write(require('../../src/instance-config').resolveApiBase({ env: {} }))"
 }
 
-# Resolve the CLI session token: prefer ~/.config/otb/gds-session.json, fall back
-# to the legacy pms-session.json. Echoes the token on success. On a missing file
-# or empty token it prints a FAIL line to stderr and returns 2 — callers run
+# Resolve the CLI session token through cli-lib's own reader, so a smoke looks in
+# exactly the paths every /builder-* command does (the configured instance config
+# dir, then the legacy dir, then the legacy pms-session.json filename). Echoes the
+# token on success. With no session it prints a FAIL line to stderr and returns 2
+# — callers run
 #   TOKEN="$(gds_resolve_token)" || exit $?
 # so the failure propagates out of the command substitution.
 gds_resolve_token() {
-  local sf="${HOME}/.config/otb/gds-session.json"
-  [[ -f "$sf" ]] || sf="${HOME}/.config/otb/pms-session.json"
-  if [[ ! -f "$sf" ]]; then
-    echo "FAIL: no session at $sf. Run setup first." >&2
-    return 2
-  fi
   local tok
-  tok=$(python3 -c "import json; print(json.load(open('$sf'))['token'])")
+  tok=$(gds_node "const s = require('./cli-lib.js').readSessionToken(); if (s && s.token) process.stdout.write(s.token);" 2>/dev/null) || tok=""
   if [[ -z "$tok" ]]; then
-    echo "FAIL: no token in $sf" >&2
+    echo "FAIL: no GDS session token found. Run /builder-setup (or /builder-reauth) first." >&2
     return 2
   fi
   printf '%s' "$tok"

package/scripts/gds/portability-smoke-memory.sh

@@ -18,39 +18,67 @@
 #
 # Usage:
 #   GDS_SMOKE_TOKEN=<token> bash scripts/gds/portability-smoke-memory.sh
-#   # token falls back to ~/.config/otb/gds-session.json for local runs
-#   # target with GDS_API_BASE (default prod; CI should point at staging)
+#   # token falls back to this instance's CLI session for local runs (lib.sh)
+#   # target with GDS_API_BASE (default this instance; CI should point at staging)
 
 set -uo pipefail
+# Sourced BEFORE the cd — lib.sh captures its own directory at source time, and
+# both helpers below resolve the config through node rather than a baked-in path
+# or host, which is what made this script instance-blind (task 1002567).
+# shellcheck source=scripts/gds/lib.sh
+source "$(dirname "$0")/lib.sh"
 cd "$(dirname "$0")/../.."   # repo root (consistent with portability-smoke-art.sh)
 
-BASE="${GDS_API_BASE:-https://amazonprimea.com}"
+BASE="$(gds_api_base)"
 PASS=0; FAIL=0
 ok()   { echo "PASS  $1"; PASS=$((PASS+1)); }
 bad()  { echo "FAIL  $1"; FAIL=$((FAIL+1)); }
 
 # --- resolve token -----------------------------------------------------------
 TOKEN="${GDS_SMOKE_TOKEN:-}"; TOKEN_SRC="env"
-if [ -z "$TOKEN" ] && [ -f "$HOME/.config/otb/gds-session.json" ]; then
-  TOKEN=$(python3 -c "import json,os;print(json.load(open(os.path.expanduser('~/.config/otb/gds-session.json'))).get('token',''))" 2>/dev/null || true)
-  TOKEN_SRC="file"
+if [ -z "$TOKEN" ]; then
+  # Same session lookup every /builder-* command does; stays a SKIP (not a FAIL)
+  # when there is no session, which is this script's contract.
+  TOKEN=$(gds_resolve_token 2>/dev/null) || TOKEN=""
+  [ -n "$TOKEN" ] && TOKEN_SRC="file"
 fi
 if [ -z "$TOKEN" ]; then
   echo "SKIP: no GDS token (set GDS_SMOKE_TOKEN or run /builder-setup). Memory portability not certified this run."
   exit 0
 fi
 
-# --- defense-in-depth: never send the token to a non-amazonprimea host -------
+# --- defense-in-depth: never send the token to another instance's host -------
 # We hold a real GDS_SMOKE_TOKEN and are about to send it (Authorization: Bearer)
 # to whatever GDS_API_BASE resolves to. A fat-fingered or compromised
 # STAGING_API_BASE must not be able to exfiltrate it, so refuse any host outside
-# the amazonprimea zone (localhost allowed for local dev). (idea 127 nit 3.)
-BASE_HOST=$(printf '%s' "$BASE" | sed -E 's#^[a-zA-Z][a-zA-Z0-9+.-]*://##; s#[:/?].*$##')
+# THIS instance's own zone (localhost allowed for local dev). (idea 127 nit 3.)
+# The zone is resolved from the session + branding pack, never a baked-in domain
+# — a literal here pinned the guard to one instance and refused every other one
+# outright, the same instance-blindness as the base/token defaults (task 1002567).
+host_of() { printf '%s' "$1" | sed -E 's#^[a-zA-Z][a-zA-Z0-9+.-]*://##; s#[:/?].*$##'; }
+BASE_HOST=$(host_of "$BASE")
+ALLOWED_HOST=$(host_of "$(gds_instance_base)")
+if [ -z "$ALLOWED_HOST" ]; then
+  echo "FAIL  could not resolve this instance's own host (is node on PATH?)."
+  echo "      Refusing to send GDS_SMOKE_TOKEN to an unverified target."
+  exit 1
+fi
+# ALLOWED_HOST lands unquoted-side in the case patterns below, where glob
+# metacharacters (* ? [ ) would silently WIDEN the allowlist. It comes from
+# operator config, not attacker input, but a malformed branding pack must fail
+# closed, not open.
+case "$ALLOWED_HOST" in
+  *[!A-Za-z0-9.-]*)
+    echo "FAIL  resolved instance host '$ALLOWED_HOST' contains characters invalid in a hostname."
+    echo "      Refusing to build a token allowlist from it (check branding.domains / session api_base)."
+    exit 1
+    ;;
+esac
 case "$BASE_HOST" in
-  amazonprimea.com|*.amazonprimea.com|localhost|127.0.0.1) ;;
+  "$ALLOWED_HOST"|*."$ALLOWED_HOST"|localhost|127.0.0.1) ;;
   *)
     echo "FAIL  GDS_API_BASE host '$BASE_HOST' is not an allowed target for the smoke token"
-    echo "      (allow: amazonprimea.com, *.amazonprimea.com, localhost). Refusing to send GDS_SMOKE_TOKEN."
+    echo "      (allow: $ALLOWED_HOST, *.$ALLOWED_HOST, localhost). Refusing to send GDS_SMOKE_TOKEN."
     exit 1
     ;;
 esac
@@ -66,7 +94,8 @@ if [ -z "$REMOTE" ]; then bad "could not resolve origin remote for fresh-clone t
     ok "repo clones from origin (cloneable)"
     # --- 2. the fresh clone leaks NO secrets / NO builder memory ------------
     LEAKS=0
-    for p in ".env.local" "spaces.env" ".config/otb/gds-session.json" "etc/amazonprimea"; do
+    CFG_DIR=$(gds_node "process.stdout.write(require('../../src/instance-config').configDirName())" 2>/dev/null) || CFG_DIR=""
+    for p in ".env.local" "spaces.env" ".config/${CFG_DIR:-otb}/gds-session.json" "etc/${CFG_DIR:-otb}"; do
       if [ -e "$TMP/clone/$p" ]; then echo "  leak: $p present in clone"; LEAKS=$((LEAKS+1)); fi
     done
     # builder_memory is server-side only — no memory dir should ship in-repo

package/scripts/gds/smoke-batch-claim.sh

@@ -13,7 +13,8 @@
 # 'abandoned' so they don't linger.
 #
 # Usage:   bash scripts/gds/smoke-batch-claim.sh
-# Env:     GDS_API_BASE / PMS_API_BASE  override host (default https://amazonprimea.com)
+# Env:     GDS_API_BASE / PMS_API_BASE  override host (default: this instance's own,
+#          resolved from the session + branding pack — see lib.sh)
 
 set -euo pipefail
 

package/scripts/gds/smoke-batch-release.sh

@@ -20,7 +20,8 @@
 # 'abandoned' so they don't linger.
 #
 # Usage:   bash scripts/gds/smoke-batch-release.sh
-# Env:     GDS_API_BASE / PMS_API_BASE  override host (default https://amazonprimea.com)
+# Env:     GDS_API_BASE / PMS_API_BASE  override host (default: this instance's own,
+#          resolved from the session + branding pack — see lib.sh)
 
 set -euo pipefail
 

package/scripts/gds/smoke-claim-consistency.sh

@@ -30,7 +30,8 @@
 # Usage:
 #   bash scripts/gds/smoke-claim-consistency.sh
 # Optional env:
-#   GDS_API_BASE / PMS_API_BASE  override the API host (default: https://amazonprimea.com)
+#   GDS_API_BASE / PMS_API_BASE  override the API host (default: this instance's own,
+#                                resolved from the session + branding pack — see lib.sh)
 
 set -euo pipefail
 

package/scripts/gds/smoke-dependencies.sh

@@ -14,20 +14,20 @@
 #   9. Claim A — succeeds
 #  10. Release A + clean up
 #
-# Run from any environment where ~/.config/otb/{gds,pms}-session.json is valid.
-# Requires curl + jq.
+# Run from any environment with a valid CLI session (/builder-setup).
+# Requires curl.
 set -euo pipefail
 
-TOKEN=$(python3 -c "
-import json, os, sys
-for p in ['/Users/'+os.environ['USER']+'/.config/otb/gds-session.json',
-          '/Users/'+os.environ['USER']+'/.config/otb/pms-session.json']:
-    if os.path.exists(p):
-        print(json.load(open(p))['token']); sys.exit(0)
-sys.exit(1)
-")
+# Token + API base both come from lib.sh, which resolves them through
+# instance-config the way every /builder-* command does. The literals that used
+# to live here were doubly broken: a macOS-only /Users/$USER path and a baked-in
+# founder host, so this smoke could not run on any other OS or instance
+# (task 1002567).
+# shellcheck source=scripts/gds/lib.sh
+source "$(dirname "$0")/lib.sh"
 
-BASE="${GDS_BASE:-https://amazonprimea.com}"
+TOKEN="$(gds_resolve_token)" || exit $?
+BASE="${GDS_BASE:-$(gds_api_base)}"
 SUFFIX="$(date +%s)"
 
 echo "=== 1. Create task B (depends-on target, status=ready) ==="

package/scripts/gds/smoke-write.sh

@@ -18,7 +18,8 @@
 # Usage:
 #   bash scripts/gds/smoke-write.sh
 # Optional env:
-#   GDS_API_BASE / PMS_API_BASE  override the API host (default: https://amazonprimea.com)
+#   GDS_API_BASE / PMS_API_BASE  override the API host (default: this instance's own,
+#                                resolved from the session + branding pack — see lib.sh)
 
 set -euo pipefail
 
@@ -145,9 +146,17 @@ else
   fail=1
 fi
 
-# 4d. session_logs row exists — checked via DB (need ssh)
-if command -v ssh >/dev/null && ssh -o BatchMode=yes -o ConnectTimeout=3 lars@104.236.254.243 true 2>/dev/null; then
-  SLOG_COUNT=$(ssh lars@104.236.254.243 "psql -d amazonprimea -tAc \"SELECT count(*) FROM session_logs WHERE claim_id = ${CLAIM_ID}\"")
+# 4d. session_logs row exists — checked via DB (needs ssh to the instance's host).
+# The ssh target + DB name come from the operator (GDS_SMOKE_DB_SSH /
+# GDS_SMOKE_DB_NAME) with NO default, so this simply SKIPs unless someone opted
+# in. It used to hardcode one instance's box IP, login and DB name, which made it
+# dead weight on every other instance — the same blindness as the base/token
+# defaults this script inherited from lib.sh (task 1002567).
+DB_SSH="${GDS_SMOKE_DB_SSH:-}"
+DB_NAME="${GDS_SMOKE_DB_NAME:-}"
+if [[ -n "${DB_SSH}" && -n "${DB_NAME}" ]] && command -v ssh >/dev/null \
+   && ssh -o BatchMode=yes -o ConnectTimeout=3 "${DB_SSH}" true 2>/dev/null; then
+  SLOG_COUNT=$(ssh "${DB_SSH}" "psql -d ${DB_NAME} -tAc \"SELECT count(*) FROM session_logs WHERE claim_id = ${CLAIM_ID}\"")
   if [[ "${SLOG_COUNT}" == "1" ]]; then
     echo "PASS session_logs row exists (claim_id=${CLAIM_ID})"
   else
@@ -155,7 +164,7 @@ if command -v ssh >/dev/null && ssh -o BatchMode=yes -o ConnectTimeout=3 lars@10
     fail=1
   fi
 else
-  echo "SKIP session_logs DB check (no SSH access from this host)"
+  echo "SKIP session_logs DB check (set GDS_SMOKE_DB_SSH + GDS_SMOKE_DB_NAME to enable)"
 fi
 
 echo

package/src/module-api.js

@@ -691,8 +691,10 @@ const { validateOrRespond, LIMITS, parseId, asyncHandler, corsPublicGet, parsePa
 //         landed since 1.19.130 with no explicit bump. run 31861682626. (task 1002620)
 //   1.19.132 — CI auto-patch (publish-on-merge, ADR 0161): carrier for merges
 //         landed since 1.19.131 with no explicit bump. run 31862317758. (task 1002620)
+//   1.19.133 — CI auto-patch (publish-on-merge, ADR 0161): carrier for merges
+//         landed since 1.19.132 with no explicit bump. run 31862484011. (task 1002620)
 // ---------------------------------------------------------------------------
-const CORE_VERSION = '1.19.132'; // CI auto-patch carrier (ADR 0161); see changelog above
+const CORE_VERSION = '1.19.133'; // CI auto-patch carrier (ADR 0161); see changelog above
 
 // A namespaced logger so a module's log lines are attributable + consistent.
 // Usage: const log = api.logger('dev-box'); log.info('mounted');

package/tests/lib_sh_resolution.mjs

@@ -0,0 +1,152 @@
+// tests/lib_sh_resolution.mjs — the bash smokes resolve their token + API base
+// from instance-config, never from a baked-in literal (task 1002567).
+//
+// THE BUG. scripts/gds/lib.sh — sourced by every bash smoke — resolved the CLI
+// session token from a hardcoded `${HOME}/.config/otb/` and defaulted the API
+// base to a hardcoded founder host. On any instance whose configDir is not
+// `otb` (this one's is `cloudbongos`) every sourcing script died looking for a
+// session that was never there; had one been found, the run would have
+// exercised the WRONG instance. Nothing caught it because the host-identity
+// fitness check only ever scanned .js/.html/.css — no .sh file had been looked
+// at, so the guard was blind to the whole file class the bug lived in.
+//
+// Two layers here, matching the two halves of the fix:
+//   1. the scripts themselves carry no literal and resolve through node;
+//   2. the fitness scan can now SEE a .sh re-hardcode (and its shell
+//      comment-strip does not open a hole a literal could hide in).
+//
+// The live smokes are deliberately NOT executed: smoke-write.sh creates, claims
+// and resolves a REAL task against production. `bash -n` + the sourced-helper
+// checks below are the safe verification.
+//
+// Run:  node --test tests/lib_sh_resolution.mjs
+
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { createRequire } from 'node:module';
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const GDS = path.join(ROOT, 'scripts', 'gds');
+const fitness = require(path.join(GDS, 'fitness.js'));
+
+// Every bash script that resolves a GDS token or API base.
+const SMOKES = [
+  'lib.sh',
+  'smoke-write.sh',
+  'smoke-batch-claim.sh',
+  'smoke-batch-release.sh',
+  'smoke-claim-consistency.sh',
+  'smoke-dependencies.sh',
+  'portability-smoke-memory.sh',
+];
+
+const read = (f) => fs.readFileSync(path.join(GDS, f), 'utf8');
+// CODE only. The rationale comments in these files legitimately name the old
+// literals (that is what they are explaining), so they are stripped first —
+// through fitness's own shell strip, so the test and the CI guard agree on what
+// counts as code.
+const code = (f) => fitness.stripCommentsForIdentity(read(f), '.sh');
+
+// bash is present on Mac/Linux and on a Windows builder's Git Bash, but this
+// suite must still pass where it is absent — the static assertions carry it.
+function bash(args) {
+  const r = spawnSync('bash', args, { cwd: ROOT, encoding: 'utf8' });
+  return r.error && r.error.code === 'ENOENT' ? null : r;
+}
+
+// ---- 1. no script carries a baked-in host or config dir --------------------
+
+test('no committed smoke script hardcodes a host-brand literal', () => {
+  for (const f of SMOKES) {
+    const hits = code(f).split('\n')
+      .map((l, i) => ({ l, n: i + 1 }))
+      .filter(({ l }) => /amazonprimea|off the boats/i.test(l));
+    assert.equal(hits.length, 0, `${f} still names a host brand: ${hits.map((h) => `${h.n}: ${h.l.trim()}`).join(' | ')}`);
+  }
+});
+
+test('no smoke script hardcodes the ~/.config/otb session path', () => {
+  for (const f of SMOKES) {
+    // `${CFG_DIR:-otb}` is the RESOLVED dir with a neutral fallback, not a
+    // hardcoded path — only a literal `/otb/` or `otb/gds-session` is the bug.
+    const hits = code(f).split('\n')
+      .map((l, i) => ({ l, n: i + 1 }))
+      .filter(({ l }) => /\.config\/otb\//.test(l) || /otb\/(gds|pms)-session/.test(l));
+    assert.equal(hits.length, 0, `${f} hardcodes the legacy config dir: ${hits.map((h) => `${h.n}: ${h.l.trim()}`).join(' | ')}`);
+  }
+});
+
+test('lib.sh resolves both values through node, not python3', () => {
+  const src = code('lib.sh');
+  assert.ok(!/python3/.test(src), 'lib.sh must not depend on python3 — node is the one guaranteed runtime (task 686)');
+  assert.match(src, /instance-config/, 'gds_api_base must resolve through src/instance-config.js');
+  assert.match(src, /cli-lib\.js/, 'gds_resolve_token must reuse cli-lib.js readSessionToken');
+});
+
+// ---- 2. the scripts still parse, and the helpers behave --------------------
+
+test('every smoke script passes bash -n', (t) => {
+  const probe = bash(['-n', 'scripts/gds/lib.sh']);
+  if (!probe) return t.skip('bash not available on this machine');
+  for (const f of SMOKES) {
+    const r = bash(['-n', `scripts/gds/${f}`]);
+    assert.equal(r.status, 0, `bash -n scripts/gds/${f} failed:\n${r.stderr}`);
+  }
+});
+
+test('gds_api_base honors the GDS_API_BASE override', (t) => {
+  const r = bash(['-c', 'source scripts/gds/lib.sh; GDS_API_BASE=http://127.0.0.1:9 gds_api_base']);
+  if (!r) return t.skip('bash not available on this machine');
+  assert.equal(r.status, 0, r.stderr);
+  assert.equal(r.stdout, 'http://127.0.0.1:9');
+});
+
+test('gds_api_base falls back to the instance, never a foreign host', (t) => {
+  const r = bash(['-c', 'source scripts/gds/lib.sh; gds_api_base']);
+  if (!r) return t.skip('bash not available on this machine');
+  assert.equal(r.status, 0, r.stderr);
+  assert.match(r.stdout, /^https?:\/\/\S+$/, `expected a resolved origin, got "${r.stdout}"`);
+  assert.doesNotMatch(r.stdout, /amazonprimea/i, 'resolved base must come from branding/session, not the stale founder host');
+  // instance-config is the single source of truth — the same answer the node CLIs get.
+  const viaNode = spawnSync(process.execPath,
+    ['-e', "process.stdout.write(require('./src/instance-config').resolveApiBase())"],
+    { cwd: ROOT, encoding: 'utf8' });
+  assert.equal(r.stdout, viaNode.stdout);
+});
+
+// ---- 3. the guard can now SEE a .sh re-hardcode ----------------------------
+
+test('the host-identity fitness scan covers .sh', () => {
+  const src = fs.readFileSync(path.join(GDS, 'fitness.js'), 'utf8');
+  assert.match(src, /IDENTITY_SCAN_EXTS = new Set\(\[[^\]]*'\.sh'/,
+    'the scan extension set must include .sh, or no shell script is ever checked');
+});
+
+test('a re-hardcoded host in a .sh is caught, and a rationale comment is not', () => {
+  const sh = [
+    '#!/usr/bin/env bash',
+    '# rationale: this used to point at https://amazonprimea.com',
+    'BASE="${GDS_API_BASE:-https://amazonprimea.com}"',
+  ].join('\n');
+  const found = fitness.scanPromptIdentity('scripts/gds/fake.sh', sh, '.sh');
+  assert.equal(found.length, 1, `expected exactly the code line to trip: ${JSON.stringify(found)}`);
+  assert.match(found[0], /fake\.sh:3/);
+});
+
+test('the .sh comment strip cannot swallow a literal after an inline #', () => {
+  // Cutting from ANY `#` would truncate `${v#p}` / `$#` lines and hide what
+  // follows them. Only full-line comments are stripped.
+  const sh = 'N=${VAR#prefix}; curl https://amazonprimea.com/healthz\n';
+  assert.equal(fitness.scanPromptIdentity('scripts/gds/fake.sh', sh, '.sh').length, 1);
+  assert.match(fitness.stripCommentsForIdentity('  # only a comment\ncode\n', '.sh'), /^\ncode/);
+});
+
+test('the whole host-identity check is green on this tree', () => {
+  const r = fitness.checkKernelPromptsNoHardcodedIdentity();
+  assert.equal(r.ok, true, `violations:\n${r.violations.join('\n')}`);
+});