mirror of
https://github.com/garrytan/gstack.git
synced 2026-09-09 22:48:57 +02:00
The brain-sync stage failed on EVERY Windows run with "is not recognized as an internal or external command", so /sync-gbrain always reported ERR brain-sync among otherwise green stages. #1731 gave these spawns shell: NEEDS_SHELL_ON_WINDOWS. That is correct for the gbrain.cmd shim and does nothing here: shell:true routes through cmd.exe, which resolves .cmd/.bat via PATHEXT but has no concept of a shebang, so an extension-less bash script is rejected outright. A .cmd shim needs a shell; a shebang script needs an interpreter. The two cases look identical and are not. The failure was quiet rather than loud. artifacts_sync_mode defaults to pushing curated artifacts to git, so a Windows user's learnings piled up uncommitted in ~/.gstack indefinitely while the sync report showed one red line out of four. New bashScriptInvocation() resolves Git for Windows' bash explicitly and passes the script as argv[0]. It prefers Git bash over a bare `bash` on PATH because WindowsApps ships a bash.exe that is the WSL launcher, which would read C:\... as a Linux path; GSTACK_BASH overrides for unusual installs; forward slashes because bash treats backslashes as escapes; and it returns null when no bash exists so the stage says so plainly instead of surfacing an unactionable spawn error. The #1731 tripwire asserted the shape that does not work, so it now asserts the opposite (never a raw spawnSync(brainSyncPath, ...)) and six unit tests cover the resolver. Verified on Windows: the stage now reports "OK brain-sync curated artifacts pushed (4.2s)" and the artifacts repo committed + pushed on its own. Affected-test set unchanged at 14 pre-existing failures before and after, with 6 new passing tests.
279 lines
11 KiB
TypeScript
279 lines
11 KiB
TypeScript
/**
|
|
* Centralized gbrain CLI invocation.
|
|
*
|
|
* Every `gbrain ...` spawn from `bin/gstack-gbrain-sync.ts` and
|
|
* `bin/gstack-memory-ingest.ts` MUST go through `spawnGbrain` (or
|
|
* `execGbrainJson`), and the invariant test
|
|
* `test/gbrain-exec-invariant.test.ts` enforces this with a static-source
|
|
* grep. The helper layer guarantees three properties:
|
|
*
|
|
* 1. **DATABASE_URL is seeded from gbrain's own config**, not from the
|
|
* caller's `.env.local`. gbrain auto-loads `.env.local` via dotenv on
|
|
* startup. When `/sync-gbrain` runs inside a Next.js / Prisma / Rails
|
|
* project with its own `DATABASE_URL`, gbrain reads that one and not
|
|
* its own `${GBRAIN_HOME:-$HOME/.gbrain}/config.json`. Auth fails;
|
|
* code + memory stages crash; only brain-sync's git push survives.
|
|
*
|
|
* 2. **Bun-aware env passing.** Mutating `process.env.DATABASE_URL` does
|
|
* NOT propagate to children of `child_process.spawnSync`/`spawn` in
|
|
* Bun — the child gets the original startup env. So we cannot just
|
|
* set process.env; we must thread an explicit `env:` dict to every
|
|
* spawn. This is the central bug the helper exists to prevent
|
|
* regressing on.
|
|
*
|
|
* 3. **`GBRAIN_HOME` honored consistently.** Other gstack helpers
|
|
* (`detectEngineTier`) already honor `GBRAIN_HOME`. `buildGbrainEnv`
|
|
* reads from `${GBRAIN_HOME:-$HOME/.gbrain}/config.json` so all
|
|
* gstack-side gbrain calls agree on which config file matters.
|
|
*
|
|
* **Escape hatch:** `GSTACK_RESPECT_ENV_DATABASE_URL=1` returns the
|
|
* caller's env unchanged. Use only when the brain intentionally lives in
|
|
* the project's local DB (rare).
|
|
*/
|
|
|
|
import { existsSync, readFileSync } from "fs";
|
|
import { join } from "path";
|
|
import { homedir } from "os";
|
|
import { spawnSync, spawn, execFileSync, type SpawnSyncReturns, type ChildProcess, type SpawnOptions } from "child_process";
|
|
|
|
interface GbrainConfig {
|
|
database_url?: string;
|
|
}
|
|
|
|
export interface BuildGbrainEnvOptions {
|
|
/**
|
|
* Caller env to extend. Defaults to `process.env`. Tests inject a
|
|
* synthetic env so the helper can be exercised without polluting the
|
|
* real process env.
|
|
*/
|
|
baseEnv?: NodeJS.ProcessEnv;
|
|
/**
|
|
* When true, announce on stderr that we overrode the caller's
|
|
* DATABASE_URL. Suppressed for the `--quiet` sync flow.
|
|
*/
|
|
announce?: boolean;
|
|
}
|
|
|
|
/**
|
|
* Detect whether a DATABASE_URL targets a PgBouncer transaction-mode pooler.
|
|
*
|
|
* Supabase transaction-mode poolers conventionally run on port 6543 at
|
|
* `*.pooler.supabase.com`. gbrain auto-disables prepared statements on these
|
|
* (prepared statements break under transaction pooling — #1965); its banner
|
|
* documents `GBRAIN_PREPARE=true` as the override for poolers that actually
|
|
* run in session mode on 6543.
|
|
*/
|
|
export function isTransactionModePooler(url: string): boolean {
|
|
try {
|
|
// DATABASE_URLs use postgresql:// scheme which URL() doesn't natively
|
|
// parse host/port from, so swap to http:// for reliable parsing.
|
|
const parsed = new URL(url.replace(/^postgres(ql)?:\/\//, "http://"));
|
|
return parsed.port === "6543";
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Build an env dict with DATABASE_URL seeded from
|
|
* `${GBRAIN_HOME:-$HOME/.gbrain}/config.json`. Returns the base env
|
|
* unchanged when:
|
|
* - `GSTACK_RESPECT_ENV_DATABASE_URL=1` (intentional opt-out),
|
|
* - the config file is missing or unparseable,
|
|
* - the config has no `database_url`,
|
|
* - the caller already set DATABASE_URL to the same value.
|
|
*
|
|
* GBRAIN_PREPARE is never set here (#1965): gbrain auto-disables prepared
|
|
* statements on transaction-mode poolers itself, and forcing them on breaks
|
|
* every write with "prepared statement does not exist". A caller-set
|
|
* GBRAIN_PREPARE (either value) passes through untouched — that remains the
|
|
* documented override for session-mode poolers on port 6543.
|
|
*
|
|
* Always returns a fresh object — mutating the returned env never
|
|
* affects the caller's env. Tests assert on effective values, not
|
|
* object identity.
|
|
*/
|
|
export function buildGbrainEnv(opts: BuildGbrainEnvOptions = {}): NodeJS.ProcessEnv {
|
|
const baseEnv = opts.baseEnv || process.env;
|
|
const out: NodeJS.ProcessEnv = { ...baseEnv };
|
|
if (baseEnv.GSTACK_RESPECT_ENV_DATABASE_URL === "1") return out;
|
|
|
|
const homeBase = baseEnv.HOME || homedir();
|
|
const gbrainHome = baseEnv.GBRAIN_HOME || join(homeBase, ".gbrain");
|
|
const configPath = join(gbrainHome, "config.json");
|
|
if (!existsSync(configPath)) return out;
|
|
|
|
let cfg: GbrainConfig = {};
|
|
try {
|
|
cfg = JSON.parse(readFileSync(configPath, "utf-8")) as GbrainConfig;
|
|
} catch {
|
|
return out;
|
|
}
|
|
if (!cfg.database_url) return out;
|
|
|
|
const hadCaller = baseEnv.DATABASE_URL !== undefined;
|
|
const alreadyMatch = baseEnv.DATABASE_URL === cfg.database_url;
|
|
if (!alreadyMatch) {
|
|
out.DATABASE_URL = cfg.database_url;
|
|
if (opts.announce) {
|
|
const note = hadCaller ? " (overrode value from caller env / .env.local)" : "";
|
|
process.stderr.write(`[gbrain-exec] seeded DATABASE_URL from ${configPath}${note}\n`);
|
|
}
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
/**
|
|
* Windows can't directly spawn the `gbrain` launcher (bun/npm install it as a
|
|
* `gbrain.cmd`/`.ps1` shim) or a shebang script like the bash `gstack-brain-sync`
|
|
* — `spawnSync`/`spawn` resolve those only through a shell's PATHEXT + interpreter
|
|
* lookup. Without `shell: true` the child spawn fails ENOENT, which on the sync
|
|
* orchestrator surfaced as "brain-sync exited undefined" (#1731). Gate on platform
|
|
* so POSIX keeps the cheaper no-shell path. Exported so the static-grep tripwire
|
|
* (test/gbrain-spawn-windows-shell.test.ts) can assert every gbrain/brain-sync
|
|
* spawn carries it.
|
|
*/
|
|
export const NEEDS_SHELL_ON_WINDOWS = process.platform === "win32";
|
|
|
|
/** Where Git for Windows puts bash, most-specific first. */
|
|
const WINDOWS_BASH_CANDIDATES = [
|
|
"C:\\Program Files\\Git\\bin\\bash.exe",
|
|
"C:\\Program Files\\Git\\usr\\bin\\bash.exe",
|
|
"C:\\Program Files (x86)\\Git\\bin\\bash.exe",
|
|
];
|
|
|
|
export interface ScriptInvocation {
|
|
cmd: string;
|
|
argv: string[];
|
|
/** Always false: we resolve the interpreter ourselves rather than via cmd.exe. */
|
|
shell: false;
|
|
}
|
|
|
|
/**
|
|
* How to invoke a **bash shebang script** (`gstack-brain-sync`) on this platform.
|
|
*
|
|
* POSIX execs it directly — the shebang does the work. Windows cannot, and
|
|
* `shell: true` does NOT rescue it: that routes through cmd.exe, which resolves
|
|
* `.cmd`/`.bat` via PATHEXT but has no concept of a shebang, so an
|
|
* extension-less bash script comes back as *"is not recognized as an internal
|
|
* or external command"*. This is why #1731's `shell: NEEDS_SHELL_ON_WINDOWS`
|
|
* fix genuinely cured the `gbrain.cmd` shim while leaving the brain-sync stage
|
|
* failing on **every** run on Windows. The two cases look identical and are not:
|
|
* a `.cmd` shim needs a shell, a shebang script needs an interpreter.
|
|
*
|
|
* The consequence was quiet rather than loud. `artifacts_sync_mode` defaults to
|
|
* pushing curated artifacts to git, so a Windows user's learnings accumulated in
|
|
* `~/.gstack` and were never committed, while `/sync-gbrain` printed one red
|
|
* line among four green ones.
|
|
*
|
|
* Git for Windows' bash is preferred over a bare `bash` on PATH because
|
|
* WindowsApps ships a `bash.exe` that is the WSL launcher; if it wins PATH
|
|
* order it interprets `C:\...` as a Linux path and the script never sees the
|
|
* repo. `GSTACK_BASH` overrides everything for unusual installs.
|
|
*
|
|
* Returns `null` when no bash can be found, so the caller can say so plainly
|
|
* instead of surfacing a spawn error nobody can act on.
|
|
*/
|
|
export function bashScriptInvocation(
|
|
scriptPath: string,
|
|
args: string[],
|
|
opts: { platform?: string; exists?: (p: string) => boolean; env?: NodeJS.ProcessEnv } = {},
|
|
): ScriptInvocation | null {
|
|
const platform = opts.platform ?? process.platform;
|
|
if (platform !== "win32") return { cmd: scriptPath, argv: args, shell: false };
|
|
|
|
const exists = opts.exists ?? existsSync;
|
|
const env = opts.env ?? process.env;
|
|
|
|
const override = env.GSTACK_BASH?.trim();
|
|
const candidates = [...(override ? [override] : []), ...WINDOWS_BASH_CANDIDATES];
|
|
const bash = candidates.find((p) => exists(p));
|
|
if (!bash) return null;
|
|
|
|
// Forward slashes: bash treats backslashes as escapes, so a Windows path
|
|
// passed verbatim loses its separators.
|
|
return { cmd: bash, argv: [scriptPath.replace(/\\/g, "/"), ...args], shell: false };
|
|
}
|
|
|
|
export interface SpawnGbrainOptions {
|
|
/** Timeout in milliseconds. Defaults to 30s. */
|
|
timeout?: number;
|
|
/** Working directory for the child process. */
|
|
cwd?: string;
|
|
/** Stdio configuration. Defaults to capturing both stdout and stderr. */
|
|
stdio?: "inherit" | "pipe" | "ignore" | Array<"inherit" | "pipe" | "ignore">;
|
|
/**
|
|
* Base env to extend before seeding DATABASE_URL. Defaults to
|
|
* `process.env`. Tests inject a synthetic env so the spawn picks up a
|
|
* gbrain shim on PATH and a fake `~/.gbrain/config.json`.
|
|
*/
|
|
baseEnv?: NodeJS.ProcessEnv;
|
|
/** Whether to announce DATABASE_URL seeding on stderr. */
|
|
announce?: boolean;
|
|
}
|
|
|
|
/**
|
|
* Spawn `gbrain <args>` with the seeded env. Returns the raw
|
|
* `SpawnSyncReturns<string>` so callers can inspect `status`, `stdout`,
|
|
* `stderr` exactly as they would with `spawnSync` directly.
|
|
*/
|
|
export function spawnGbrain(args: string[], opts: SpawnGbrainOptions = {}): SpawnSyncReturns<string> {
|
|
return spawnSync("gbrain", args, {
|
|
encoding: "utf-8",
|
|
timeout: opts.timeout ?? 30_000,
|
|
cwd: opts.cwd,
|
|
stdio: opts.stdio || ["ignore", "pipe", "pipe"],
|
|
env: buildGbrainEnv({ baseEnv: opts.baseEnv, announce: opts.announce }),
|
|
shell: NEEDS_SHELL_ON_WINDOWS, // #1731: gbrain is a .cmd shim on Windows
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Run `gbrain <args>` and parse stdout as JSON. Returns `null` on
|
|
* non-zero exit, parse failure, or timeout. Useful for `gbrain sources
|
|
* list --json` and similar.
|
|
*/
|
|
export function execGbrainJson<T = unknown>(args: string[], opts: SpawnGbrainOptions = {}): T | null {
|
|
const r = spawnGbrain(args, opts);
|
|
if (r.status !== 0) return null;
|
|
try {
|
|
return JSON.parse(r.stdout || "null") as T;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Async streaming variant for callers that need to attach stdout/stderr
|
|
* listeners (e.g., `gbrain import` in `gstack-memory-ingest.ts`). Always
|
|
* injects the seeded env. Returns the raw `ChildProcess` so the caller
|
|
* can wire up its own promise around exit/timeout/signal handling.
|
|
*/
|
|
export function spawnGbrainAsync(
|
|
args: string[],
|
|
opts: { stdio?: SpawnOptions["stdio"]; cwd?: string; baseEnv?: NodeJS.ProcessEnv } = {},
|
|
): ChildProcess {
|
|
return spawn("gbrain", args, {
|
|
stdio: opts.stdio || ["ignore", "pipe", "pipe"],
|
|
cwd: opts.cwd,
|
|
env: buildGbrainEnv({ baseEnv: opts.baseEnv, announce: false }),
|
|
shell: NEEDS_SHELL_ON_WINDOWS, // #1731: gbrain is a .cmd shim on Windows
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Run `gbrain <args>` via execFileSync. Throws on non-zero exit. Useful
|
|
* for callers that want to surface gbrain's stderr as the error message.
|
|
*/
|
|
export function execGbrainText(args: string[], opts: SpawnGbrainOptions = {}): string {
|
|
return execFileSync("gbrain", args, {
|
|
encoding: "utf-8",
|
|
timeout: opts.timeout ?? 30_000,
|
|
cwd: opts.cwd,
|
|
stdio: opts.stdio || ["ignore", "pipe", "pipe"],
|
|
env: buildGbrainEnv({ baseEnv: opts.baseEnv, announce: opts.announce }),
|
|
shell: NEEDS_SHELL_ON_WINDOWS, // #1731: gbrain is a .cmd shim on Windows
|
|
});
|
|
}
|