mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-17 13:44:32 +01:00
Merge origin/main and stamp v1.91.202.0 for #3385 (train 4, slot 1)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
This commit is contained in:
commit
e4eefde91a
99 files changed
+3911
-463
No files matched your search
@@ -18,7 +18,7 @@
|
||||
# at or above the minimum, and one CI job runs the quick tier on it.
|
||||
GSTACK_BUN_FLOOR="1.3.3"
|
||||
GSTACK_BUN_TESTED="1.4.2"
|
||||
GSTACK_BUN_DEFAULT="1.4.3"
|
||||
GSTACK_BUN_DEFAULT="1.4.4"
|
||||
|
||||
# gstack_bun_archive_sha256 TARGET [VERSION] — the SHA-256 of
|
||||
# https://github.com/oven-sh/bun/releases/download/bun-v$VERSION/bun-TARGET.zip
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ const HELP = `gstack-gate — one gate list, one reply grammar
|
||||
decisions <gate.json> [--reply "<text>" --gate-rev N] [--answered-at ISO]
|
||||
decisions.jsonl rows (pending, or applied when a reply is given)
|
||||
|
||||
Reply grammar: \`all\` · \`<id><option>\` tokens (\`d3b uc1a\`) · \`all except <tokens>\`. Bare yes/no is rejected.
|
||||
Reply grammar: \`rec\` (alias \`all\`) · \`rec except <tokens>\` · \`<id><option>\` tokens (\`d3b uc1a\`) · \`as-is\` (the plan as written). Bare yes/no is rejected.
|
||||
gate.json: {"schema_version":1,"run":"<id>","gate_rev":1,"items":[{"id":"d1","title":"…","kind":"auto|approval","recommended":"a","options":[{"key":"a","text":"…"},…]}]}
|
||||
${exitTableHelp()}`;
|
||||
|
||||
|
||||
@@ -15,10 +15,22 @@
|
||||
# rather than bypass a set policy.
|
||||
#
|
||||
# gstack-gbrain-repo-policy set <remote-url> <read-write|read-only|deny>
|
||||
# Persist a tier for the given remote. Exits 0 on success.
|
||||
# Persist a tier for the given remote. Exits 0 on success. Changing a
|
||||
# remote's tier clears its Memorable recall opt-in.
|
||||
#
|
||||
# gstack-gbrain-repo-policy memorable get [<remote-url>]
|
||||
# Print "<tier>\t<allow|off>": the tier (as `get` prints it) and whether
|
||||
# Memorable recall is opted in for this remote. Read-only lookup for the
|
||||
# recall hook: a corrupt store is a hard error (exit 2), never quarantined.
|
||||
#
|
||||
# gstack-gbrain-repo-policy memorable set <remote-url> <allow|off>
|
||||
# Opt a read-only remote in to (or back out of) Memorable recall. Off by
|
||||
# default. Refused unless the remote's tier is read-only: a deny tier
|
||||
# always vetoes recall, and read-write never needed an opt-in.
|
||||
#
|
||||
# gstack-gbrain-repo-policy list
|
||||
# Print every entry as "<key>\t<tier>", sorted by key.
|
||||
# Print every entry as "<key>\t<tier>", sorted by key, with a third
|
||||
# column "memorable=allow" on remotes opted in to Memorable recall.
|
||||
#
|
||||
# gstack-gbrain-repo-policy normalize <url>
|
||||
# Print the normalized (canonical) key for a given remote URL.
|
||||
@@ -33,8 +45,11 @@
|
||||
# {
|
||||
# "_schema_version": 2,
|
||||
# "github.com/foo/bar": "read-write",
|
||||
# "github.com/baz/qux": "deny"
|
||||
# "github.com/baz/qux": "deny",
|
||||
# "_memorable_recall": { "github.com/foo/bar": "allow" }
|
||||
# }
|
||||
# The keys _schema_version and _memorable_recall are reserved; other keys
|
||||
# name remotes (including the _unattributed sentinel memory-ingest uses).
|
||||
#
|
||||
# Tier semantics:
|
||||
# read-write — agent may search AND write new pages from this repo.
|
||||
@@ -43,6 +58,11 @@
|
||||
# decision.)
|
||||
# deny — no gbrain interaction at all.
|
||||
#
|
||||
# Memorable recall opt-in: the recall hook skips deny and read-only remotes.
|
||||
# A read-only remote listed in _memorable_recall with exactly "allow" is
|
||||
# recalled anyway; any other value or shape counts as off. Every store that
|
||||
# makes the remote read-only (see the merge below) must opt it in.
|
||||
#
|
||||
# Legacy migration:
|
||||
# On any read of a file missing `_schema_version` (or with version < 2),
|
||||
# legacy `allow` values are atomically rewritten to `read-write`, and
|
||||
@@ -187,6 +207,24 @@ ensure_file() {
|
||||
fi
|
||||
}
|
||||
|
||||
# memorable_optin FILE KEY — "allow" when FILE's _memorable_recall map holds
|
||||
# exactly the string "allow" for KEY; any other value or shape is "off".
|
||||
memorable_optin() {
|
||||
jq -r --arg key "$2" '(._memorable_recall | if type == "object" then .[$key] else null end) as $v
|
||||
| if $v == "allow" then "allow" else "off" end' "$1"
|
||||
}
|
||||
|
||||
# jq filter that removes $key's opt-in (and an emptied map).
|
||||
DROP_MEMORABLE_OPTIN='if (._memorable_recall | type) == "object" then (._memorable_recall |= del(.[$key])) | (if ._memorable_recall == {} then del(._memorable_recall) else . end) else . end'
|
||||
|
||||
# _schema_version and _memorable_recall hold store metadata; a remote that
|
||||
# normalizes to one of them cannot be stored.
|
||||
reject_reserved_key() {
|
||||
case "$1" in
|
||||
_schema_version|_memorable_recall) die "'$1' is a reserved key in the policy store, not a remote" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
_tier_rank() {
|
||||
case "$1" in deny) echo 0 ;; read-only) echo 1 ;; read-write) echo 2 ;; *) echo 3 ;; esac
|
||||
}
|
||||
@@ -295,13 +333,146 @@ cmd_set() {
|
||||
local key
|
||||
key=$(normalize "$url")
|
||||
[ -z "$key" ] && die "cannot normalize remote URL: $url"
|
||||
reject_reserved_key "$key"
|
||||
ensure_file
|
||||
local tmp
|
||||
local previous opted tmp
|
||||
previous=$(jq -r --arg key "$key" '.[$key] // "unset"' "$POLICY_FILE")
|
||||
opted=$(memorable_optin "$POLICY_FILE" "$key")
|
||||
tmp=$(mktemp "$POLICY_FILE.tmp.XXXXXX")
|
||||
jq --arg key "$key" --arg tier "$tier" '.[$key] = $tier' "$POLICY_FILE" > "$tmp"
|
||||
if [ "$previous" != "$tier" ]; then
|
||||
jq --arg key "$key" --arg tier "$tier" ".[\$key] = \$tier | $DROP_MEMORABLE_OPTIN" "$POLICY_FILE" > "$tmp"
|
||||
else
|
||||
jq --arg key "$key" --arg tier "$tier" '.[$key] = $tier' "$POLICY_FILE" > "$tmp"
|
||||
fi
|
||||
mv "$tmp" "$POLICY_FILE"
|
||||
chmod 0600 "$POLICY_FILE"
|
||||
echo "Set $key → $tier"
|
||||
if [ "$previous" != "$tier" ] && [ "$opted" = "allow" ]; then
|
||||
echo "Cleared the Memorable recall opt-in for $key (the tier changed; opt in again with: gstack-gbrain-repo-policy memorable set $key allow)"
|
||||
fi
|
||||
}
|
||||
|
||||
# memorable_store_answer FILE KEY — "<tier> <allow|off>" for KEY in one store,
|
||||
# read from a single snapshot of the file with no write, migration or
|
||||
# quarantine (tier is none when the file or the key is absent; a legacy
|
||||
# "allow" reads as read-write in memory). Dies (exit 2) on anything else: a
|
||||
# path that is present but not a readable regular file, a path whose
|
||||
# existence cannot be confirmed (an unsearchable ancestor), content that is not exactly one JSON object, or a
|
||||
# present key whose value is not a known tier.
|
||||
memorable_store_answer() {
|
||||
local store="$1" key="$2" up raw
|
||||
if ! [ -e "$store" ] && ! [ -L "$store" ]; then
|
||||
# Absent only if the nearest existing ancestor is a searchable directory:
|
||||
# an unsearchable one hides an existing store from every test above.
|
||||
up=$(dirname "$store")
|
||||
while ! [ -e "$up" ] && ! [ -L "$up" ] && [ "$up" != "/" ] && [ "$up" != "." ]; do up=$(dirname "$up"); done
|
||||
if [ -d "$up" ] && [ -x "$up" ]; then
|
||||
printf 'none off\n'
|
||||
return 0
|
||||
fi
|
||||
die "cannot confirm whether $store exists ($up is not a searchable directory) — refusing the Memorable recall lookup."
|
||||
fi
|
||||
if ! [ -f "$store" ] || ! [ -r "$store" ]; then
|
||||
die "policy store $store exists but is not a readable file — refusing the Memorable recall lookup. Inspect or remove it."
|
||||
fi
|
||||
raw=$(cat -- "$store") || die "cannot read policy store $store — refusing the Memorable recall lookup."
|
||||
printf '%s' "$raw" | jq -e -s -r --arg key "$key" '
|
||||
if length == 1 and (.[0] | type) == "object" then .[0] else error("not one JSON object") end
|
||||
| (if has($key) then
|
||||
(.[$key] | if . == "allow" then "read-write"
|
||||
elif . == "deny" or . == "read-only" or . == "read-write" then .
|
||||
else error("invalid tier") end)
|
||||
else "none" end) as $tier
|
||||
| ((._memorable_recall | if type == "object" then .[$key] else null end) == "allow") as $opt
|
||||
| "\($tier) \(if $opt then "allow" else "off" end)"' 2>/dev/null \
|
||||
|| die "policy store $store is corrupt (not one JSON object, or an invalid tier for $key) — refusing the Memorable recall lookup. Inspect with: gstack-gbrain-repo-policy list; re-run /setup-gbrain to rebuild the store."
|
||||
}
|
||||
|
||||
# memorable get — tier plus the effective Memorable recall opt-in, for the
|
||||
# recall hook. Pure read: each store is read once, never migrated, never
|
||||
# quarantined, and any doubt about a present store is a hard error (exit 2),
|
||||
# because reading it as "no policy" would silently lift a deny or read-only
|
||||
# veto. The tier merges as get does (the ~/.gstack store contributes only deny
|
||||
# or read-only). The opt-in counts only when the merged tier is read-only and
|
||||
# every store that restricts the remote (deny or read-only) opts it in, so an
|
||||
# opt-in can never relax a restriction another store imposed.
|
||||
cmd_memorable_get() {
|
||||
local url="${1:-}"
|
||||
require_jq
|
||||
if [ -z "$url" ]; then
|
||||
url=$(git config --get remote.origin.url 2>/dev/null || true)
|
||||
fi
|
||||
local key
|
||||
key=$(normalize "$url")
|
||||
if [ -z "$key" ]; then
|
||||
printf 'unset\toff\n'
|
||||
return 0
|
||||
fi
|
||||
local answer p_tier p_opt l_tier="none" l_opt="off"
|
||||
answer=$(memorable_store_answer "$POLICY_FILE" "$key") || exit 2
|
||||
read -r p_tier p_opt <<<"$answer"
|
||||
if [ -n "$_gstack_legacy_root" ]; then
|
||||
answer=$(memorable_store_answer "$_gstack_legacy_root/gbrain-repo-policy.json" "$key") || exit 2
|
||||
read -r l_tier l_opt <<<"$answer"
|
||||
fi
|
||||
local merged="$p_tier"
|
||||
case "$l_tier" in
|
||||
deny|read-only)
|
||||
if [ "$(_tier_rank "$l_tier")" -lt "$(_tier_rank "$merged")" ]; then merged="$l_tier"; fi ;;
|
||||
esac
|
||||
if [ "$merged" != "read-only" ]; then
|
||||
[ "$merged" = "none" ] && merged="unset"
|
||||
printf '%s\toff\n' "$merged"
|
||||
return 0
|
||||
fi
|
||||
local optin="allow"
|
||||
case "$p_tier" in deny|read-only) [ "$p_opt" = "allow" ] || optin="off" ;; esac
|
||||
case "$l_tier" in deny|read-only) [ "$l_opt" = "allow" ] || optin="off" ;; esac
|
||||
printf 'read-only\t%s\n' "$optin"
|
||||
}
|
||||
|
||||
cmd_memorable_set() {
|
||||
local url="${1:-}" value="${2:-}"
|
||||
if [ -z "$url" ] || [ -z "$value" ]; then die "usage: memorable set <remote-url> <allow|off>"; fi
|
||||
case "$value" in
|
||||
allow|off) ;;
|
||||
*) die "invalid value '$value' (must be allow or off)" ;;
|
||||
esac
|
||||
local key
|
||||
key=$(normalize "$url")
|
||||
[ -z "$key" ] && die "cannot normalize remote URL: $url"
|
||||
reject_reserved_key "$key"
|
||||
if [ "$value" = "allow" ]; then
|
||||
local current
|
||||
current=$(cmd_memorable_get "$url" | cut -f1)
|
||||
case "$current" in
|
||||
read-only) ;;
|
||||
deny) die "$key is deny: a deny tier always vetoes Memorable recall, so an opt-in is refused. Change the tier first if you mean it: gstack-gbrain-repo-policy set $key read-only" ;;
|
||||
*) die "$key is $current, not read-only: the opt-in only applies to read-only remotes (read-write is already recalled; an unset remote has no veto)" ;;
|
||||
esac
|
||||
fi
|
||||
ensure_file
|
||||
local tmp
|
||||
tmp=$(mktemp "$POLICY_FILE.tmp.XXXXXX")
|
||||
if [ "$value" = "allow" ]; then
|
||||
jq --arg key "$key" '._memorable_recall = ((._memorable_recall | if type == "object" then . else {} end) + {($key): "allow"})' "$POLICY_FILE" > "$tmp"
|
||||
else
|
||||
jq --arg key "$key" "$DROP_MEMORABLE_OPTIN" "$POLICY_FILE" > "$tmp"
|
||||
fi
|
||||
mv "$tmp" "$POLICY_FILE"
|
||||
chmod 0600 "$POLICY_FILE"
|
||||
echo "Set $key memorable recall → $value"
|
||||
if [ "$value" = "allow" ] && [ "$(cmd_memorable_get "$url" | cut -f2)" != "allow" ]; then
|
||||
echo "gstack-gbrain-repo-policy: $LEGACY_POLICY_FILE also makes $key read-only and does not opt it in, so recall stays off. Opt in there too: GSTACK_STATE_ROOT=$_gstack_legacy_root gstack-gbrain-repo-policy memorable set $key allow" >&2
|
||||
fi
|
||||
}
|
||||
|
||||
cmd_memorable() {
|
||||
case "${1:-}" in
|
||||
get) shift; cmd_memorable_get "$@" ;;
|
||||
set) shift; cmd_memorable_set "$@" ;;
|
||||
*) die "usage: memorable {get [<remote-url>]|set <remote-url> <allow|off>}" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
cmd_list() {
|
||||
@@ -310,7 +481,9 @@ cmd_list() {
|
||||
return 0
|
||||
fi
|
||||
ensure_file
|
||||
jq -r 'to_entries[] | select(.key != "_schema_version") | "\(.key)\t\(.value)"' "$POLICY_FILE" | sort
|
||||
jq -r '(._memorable_recall | if type == "object" then . else {} end) as $m
|
||||
| to_entries[] | select(.key != "_schema_version" and .key != "_memorable_recall")
|
||||
| "\(.key)\t\(.value)" + (if $m[.key] == "allow" then "\tmemorable=allow" else "" end)' "$POLICY_FILE" | sort
|
||||
}
|
||||
|
||||
cmd_normalize() {
|
||||
@@ -323,8 +496,9 @@ case "${1:-}" in
|
||||
get) shift; cmd_get "$@" ;;
|
||||
set) shift; cmd_set "$@" ;;
|
||||
list) shift; cmd_list "$@" ;;
|
||||
memorable) shift; cmd_memorable "$@" ;;
|
||||
normalize) shift; cmd_normalize "$@" ;;
|
||||
--help|-h|help) sed -n '2,54p' "$0" | sed 's/^# \{0,1\}//' ;;
|
||||
"") die "usage: gstack-gbrain-repo-policy {get|set|list|normalize|--help}" ;;
|
||||
--help|-h|help) sed -n '2,73p' "$0" | sed 's/^# \{0,1\}//' ;;
|
||||
"") die "usage: gstack-gbrain-repo-policy {get|set|memorable|list|normalize|--help}" ;;
|
||||
*) die "unknown subcommand: $1" ;;
|
||||
esac
|
||||
+50
-1
@@ -25,8 +25,16 @@
|
||||
// the caller must handle), exit 2 on bad args / unresolvable base /
|
||||
// broken version source.
|
||||
//
|
||||
// write --version <X.Y.Z.W> [--version-path <p>] [--regen-digest]
|
||||
// write --version <X.Y.Z.W> [--version-path <p>] [--regen-digest] [--changelog <p>]
|
||||
// Validates the 4-digit pattern, writes VERSION + package.json.version.
|
||||
// --changelog <p> (opt-in): re-head the branch's `## [Unreleased]`
|
||||
// entry in <p> as `## [<version>] - <UTC date>` at the top, with
|
||||
// lib/changelog-check's reheadChangelog — the same function
|
||||
// gstack-restamp uses, so a later restamp finds the heading already in
|
||||
// place (or moves it again as the branch's own stamp). No [Unreleased]
|
||||
// section, or an absent file, is a no-op. Duplicate headings refuse with
|
||||
// exit 2 before anything is written. restamp never passes the flag: under
|
||||
// stamp-at-merge it stays the only owner of the re-heading.
|
||||
// --regen-digest (opt-in): additionally run the target repo's own
|
||||
// scripts/gen-agents-digest.ts when present, so the version-stamped
|
||||
// committed digest stays freshness-green through the bump. Executes
|
||||
@@ -67,6 +75,7 @@ import { existsSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
||||
import { bunIsolationArgs } from "../lib/bun-isolation";
|
||||
import { checkChangelog, parseChangelog, reheadChangelog } from "../lib/changelog-check";
|
||||
import {
|
||||
extractVersion,
|
||||
isJsonVersionPath,
|
||||
@@ -404,6 +413,42 @@ function regenAgentsDigest(versionPath: string, optedIn: boolean): boolean | nul
|
||||
}
|
||||
}
|
||||
|
||||
interface ChangelogPlan { rel: string; text: string | null; detail: string }
|
||||
|
||||
/**
|
||||
* --changelog: computed before any write, so a CHANGELOG the re-heading
|
||||
* cannot handle (duplicate headings) refuses with nothing written. Only an
|
||||
* existing [Unreleased] section moves; released sections are never renamed.
|
||||
*/
|
||||
function planChangelog(cwd: string, args: string[], version: string): ChangelogPlan | null {
|
||||
if (!args.includes("--changelog")) return null;
|
||||
const rel = argVal(args, "--changelog");
|
||||
if (!rel || rel.startsWith("--")) fail("write: --changelog needs a path (for example --changelog CHANGELOG.md)", 2);
|
||||
assertRepoContained(cwd, rel, "--changelog");
|
||||
const p = join(cwd, rel);
|
||||
if (!existsSync(p)) return { rel, text: null, detail: `${rel} absent` };
|
||||
const text = readFileSync(p, "utf-8");
|
||||
if (!parseChangelog(text).sections.some((s) => s.unreleased)) return { rel, text: null, detail: "no [Unreleased] section" };
|
||||
const r = reheadChangelog(text, { from: null, to: version, date: new Date().toISOString().slice(0, 10), file: rel });
|
||||
if (r.error) fail(`write: ${r.error.path}: ${r.error.message}. Nothing written.`, 2);
|
||||
if (!r.moved) return { rel, text: null, detail: `already headed ${version}` };
|
||||
const errors = checkChangelog(r.text, version, rel);
|
||||
if (errors.length) fail(`write: ${errors[0]!.path}: ${errors[0]!.message}. Nothing written.`, 2);
|
||||
return { rel, text: r.text, detail: `Unreleased -> ${version}` };
|
||||
}
|
||||
|
||||
function writeChangelog(cwd: string, plan: ChangelogPlan | null): { changelog: { path: string; moved: boolean; detail: string } } | Record<string, never> {
|
||||
if (!plan) return {};
|
||||
if (plan.text !== null) {
|
||||
try {
|
||||
writeFileSync(join(cwd, plan.rel), plan.text);
|
||||
} catch {
|
||||
fail(`write: the version files were written but ${plan.rel} was not. Re-run write with the same --version and --changelog.`, 3);
|
||||
}
|
||||
}
|
||||
return { changelog: { path: plan.rel, moved: plan.text !== null, detail: plan.detail } };
|
||||
}
|
||||
|
||||
function cmdWrite(args: string[], cwd: string): void {
|
||||
const version = argVal(args, "--version");
|
||||
if (!version) fail("write requires --version <X.Y.Z.W>", 2);
|
||||
@@ -431,6 +476,7 @@ function cmdWrite(args: string[], cwd: string): void {
|
||||
// npm rejects forever — with no drift state to catch it (a JSON source is
|
||||
// self-consistent by construction).
|
||||
const jsonV = npmVersion(version!);
|
||||
const changelogPlan = planChangelog(cwd, args, jsonV);
|
||||
let manifestWritten = false;
|
||||
let lockSynced: string[] = [];
|
||||
try {
|
||||
@@ -466,6 +512,7 @@ function cmdWrite(args: string[], cwd: string): void {
|
||||
// here: a JSON-manifest version source implies no plain VERSION file
|
||||
// for the digest generator to stamp.
|
||||
agentsDigest: null,
|
||||
...writeChangelog(cwd, changelogPlan),
|
||||
}) + "\n",
|
||||
);
|
||||
return;
|
||||
@@ -473,6 +520,7 @@ function cmdWrite(args: string[], cwd: string): void {
|
||||
|
||||
const pkgPath = resolvePkgPath(cwd, argVal(args, "--package-json-path"));
|
||||
const hasPkg = existsSync(pkgPath);
|
||||
const changelogPlan = planChangelog(cwd, args, version!);
|
||||
writeFileSync(versionPath, version + "\n");
|
||||
const digestRegen = regenAgentsDigest(versionPath, args.includes("--regen-digest"));
|
||||
let lockSynced: string[] = [];
|
||||
@@ -511,6 +559,7 @@ function cmdWrite(args: string[], cwd: string): void {
|
||||
packageLock: lockSynced.length > 0,
|
||||
// null = not the gstack repo (no digest to regen); true/false = regen outcome
|
||||
agentsDigest: digestRegen,
|
||||
...writeChangelog(cwd, changelogPlan),
|
||||
}) + "\n",
|
||||
);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user