mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-01 19:25:10 +02:00
9dbaf906cf
* feat(gbrain-sync): queue primitives + writer shims
Adds bin/gstack-brain-enqueue (atomic append to sync queue) and
bin/gstack-jsonl-merge (git merge driver, ts-sort with SHA-256 fallback).
Wires one backgrounded enqueue call into learnings-log, timeline-log,
review-log, and developer-profile --migrate. question-log and
question-preferences stay local per Codex v2 decision.
gstack-config gains gbrain_sync_mode (off/artifacts-only/full) and
gbrain_sync_mode_prompted keys, plus GSTACK_HOME env alignment so
tests don't leak into real ~/.gstack/config.yaml.
* feat(gbrain-sync): --once drain + secret scan + push
bin/gstack-brain-sync is the core sync binary. Subcommands: --once
(drain queue, allowlist-filter, privacy-class-filter, secret-scan
staged diff, commit with template, push with fetch+merge retry),
--status, --skip-file <path>, --drop-queue --yes, --discover-new
(cursor-based detection of artifact writes that skip the shim).
Secret regex families: AWS keys, GitHub tokens (ghp_/gho_/ghu_/ghs_/
ghr_/github_pat_), OpenAI sk-, PEM blocks, JWTs, bearer-token-in-JSON.
On hit: unstage, preserve queue, print remediation hint (--skip-file
or edit), exit clean. No daemon — invoked by preamble at skill
boundaries.
* feat(gbrain-sync): init, restore, uninstall, consumer registry
bin/gstack-brain-init: idempotent first-run. git init ~/.gstack/,
.gitignore=*, canonical .brain-allowlist + .brain-privacy-map.json,
pre-commit secret-scan hook (defense-in-depth), merge driver registration
via git config, gh repo create --private OR arbitrary --remote <url>,
initial push, ~/.gstack-brain-remote.txt for new-machine discovery,
GBrain consumer registration via HTTP POST.
bin/gstack-brain-restore: safe new-machine bootstrap. Refuses clobber
of existing allowlisted files, clones to staging, rsync-copies tracked
files, re-registers merge drivers (required — not cloned from remote),
rehydrates consumers.json, prompts for per-consumer tokens.
bin/gstack-brain-uninstall: clean off-ramp. Removes .git + .brain-*
files + consumers.json + config keys. Preserves user data (learnings,
plans, retros, profile). Optional --delete-remote for GitHub repos.
bin/gstack-brain-consumer + bin/gstack-brain-reader (symlink alias):
registry management. Internal 'consumer' term; user-facing 'reader'
per DX review decision.
* feat(gbrain-sync): preamble block — privacy gate + boundary sync
scripts/resolvers/preamble/generate-brain-sync-block.ts emits bash that
runs at every skill invocation:
- Detects ~/.gstack-brain-remote.txt on machines without local .git
and surfaces a restore-available hint (does NOT auto-run restore).
- Runs gstack-brain-sync --once at skill start to drain any pending
writes (and at skill end via prose instruction).
- Once-per-day auto-pull (cached via .brain-last-pull) for append-only
JSONL files.
- Emits BRAIN_SYNC: status line every skill run.
Also emits prose for the host LLM to fire the one-time privacy
stop-gate (full / artifacts-only / off) when gbrain is detected and
gbrain_sync_mode_prompted is false. Wired into preamble.ts composition.
* test(gbrain-sync): 27-test consolidated suite
test/brain-sync.test.ts covers:
- Config: validation, defaults, GSTACK_HOME env isolation
- Enqueue: no-op gates, skip list, concurrent atomicity, JSON escape
- JSONL merge driver: 3-way + ts-sort + SHA-256 fallback
- Init + sync: canonical file creation, merge driver registration,
push-reject + fetch+merge retry path
- Init refuses different remote (idempotency)
- Cross-machine restore round-trip (machine A write → machine B sees)
- Secret scan across all 6 regex families (AWS, GH, OpenAI, PEM, JWT,
bearer-JSON). --skip-file unblock remediation
- Uninstall removes sync config, preserves user data
- --discover-new idempotence via mtime+size cursor
Behaviors verified via integration smokes during implementation. Known
follow-up: bun-test 5s default timeout needs 30s wrapper for
spawnSync-heavy tests.
* docs(gbrain-sync): user guide + error lookup + README section
docs/gbrain-sync.md: setup walkthrough, privacy modes, cross-machine
workflow, secret protection, two-machine conflict handling, uninstall,
troubleshooting reference.
docs/gbrain-sync-errors.md: problem/cause/fix index for every
user-visible error. Patterned on Rust's error docs + Stripe's API
error reference.
README.md: 'Cross-machine memory with GBrain sync' section near the
top (discovery moment), plus docs-table entry.
* chore: bump version and changelog (v1.7.0.0)
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* chore: regenerate SKILL.md files for gbrain-sync preamble block
Re-runs bun run gen:skill-docs after adding generateBrainSyncBlock
to scripts/resolvers/preamble.ts in a2aa8a07. CI check-freshness
caught the drift. All 36 SKILL.md files regenerated with the new
skill-start bash block + privacy-gate prose + skill-end sync
instructions baked in.
* fix(test): session-awareness reads AskUserQuestion Format from a Tier 2+ SKILL.md
The test was reading ROOT/SKILL.md (browse skill, Tier 1) which never
contained '## AskUserQuestion Format' — that section is only emitted
for Tier 2+ skills by scripts/resolvers/preamble.ts. As a result the
agent was prompted with an empty format guide and only emitted
'RECOMMENDATION' intermittently, making the test flaky.
Pre-existing on main (same ROOT/SKILL.md shape there) — surfaced now
because the agent run didn't hit the RECOMMENDATION/recommend/option a
fallback strings in this particular attempt.
Fix: read from office-hours/SKILL.md (Tier 3, always has the section)
with a fallback that scans for the first top-level skill dir whose
SKILL.md contains the header. Future template moves won't break this
test again.
* chore: bump to v1.9.0.0 for gbrain-sync landing
Changes just the VERSION + package.json + CHANGELOG header (1.7.0.0 → 1.9.0.0
and date 2026-04-22 → 2026-04-23). No code changes. User call: land gbrain-sync
as a bigger-signal release above main's 1.6.4.0, skipping 1.8.0.0.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
108 lines
5.0 KiB
TypeScript
108 lines
5.0 KiB
TypeScript
/**
|
|
* Preamble composition root.
|
|
*
|
|
* Each generator lives in its own file under ./preamble/*.ts. This file only
|
|
* wires them together via generatePreamble(). Keep composition declarative —
|
|
* no inline logic beyond tier gating.
|
|
*
|
|
* Each skill runs independently via `claude -p` (or the host's equivalent).
|
|
* There is no shared loader. The preamble provides: update checks, session
|
|
* tracking, user preferences, repo mode detection, model overlays, and
|
|
* telemetry.
|
|
*
|
|
* Telemetry data flow:
|
|
* 1. Always: local JSONL append to ~/.gstack/analytics/ (inline, inspectable)
|
|
* 2. If _TEL != "off" AND binary exists: gstack-telemetry-log for remote reporting
|
|
*/
|
|
|
|
|
|
import type { TemplateContext } from './types';
|
|
import { generateModelOverlay } from './model-overlay';
|
|
import { generateQuestionTuning } from './question-tuning';
|
|
|
|
// Core bootstrap
|
|
import { generatePreambleBash } from './preamble/generate-preamble-bash';
|
|
import { generateUpgradeCheck } from './preamble/generate-upgrade-check';
|
|
import { generateCompletionStatus } from './preamble/generate-completion-status';
|
|
|
|
// One-time onboarding prompts
|
|
import { generateLakeIntro } from './preamble/generate-lake-intro';
|
|
import { generateTelemetryPrompt } from './preamble/generate-telemetry-prompt';
|
|
import { generateProactivePrompt } from './preamble/generate-proactive-prompt';
|
|
import { generateRoutingInjection } from './preamble/generate-routing-injection';
|
|
import { generateVendoringDeprecation } from './preamble/generate-vendoring-deprecation';
|
|
import { generateSpawnedSessionCheck } from './preamble/generate-spawned-session-check';
|
|
import { generateWritingStyleMigration } from './preamble/generate-writing-style-migration';
|
|
|
|
// Host-specific instructions
|
|
import { generateBrainHealthInstruction } from './preamble/generate-brain-health-instruction';
|
|
|
|
// GBrain cross-machine sync (runs at skill start; end-side handled in completion-status)
|
|
import { generateBrainSyncBlock } from './preamble/generate-brain-sync-block';
|
|
|
|
// Behavioral / voice
|
|
import { generateVoiceDirective } from './preamble/generate-voice-directive';
|
|
|
|
// Tier 2+ context and interaction framework
|
|
import { generateContextRecovery } from './preamble/generate-context-recovery';
|
|
import { generateAskUserFormat } from './preamble/generate-ask-user-format';
|
|
import { generateWritingStyle } from './preamble/generate-writing-style';
|
|
import { generateCompletenessSection } from './preamble/generate-completeness-section';
|
|
import { generateConfusionProtocol } from './preamble/generate-confusion-protocol';
|
|
import { generateContinuousCheckpoint } from './preamble/generate-continuous-checkpoint';
|
|
import { generateContextHealth } from './preamble/generate-context-health';
|
|
|
|
// Tier 3+ repo mode + search
|
|
import { generateRepoModeSection } from './preamble/generate-repo-mode-section';
|
|
import { generateSearchBeforeBuildingSection } from './preamble/generate-search-before-building';
|
|
|
|
// Standalone export used directly by the resolver registry
|
|
export { generateTestFailureTriage } from './preamble/generate-test-failure-triage';
|
|
|
|
// Preamble Composition (tier → sections)
|
|
// ─────────────────────────────────────────────
|
|
// T1: core + upgrade + lake + telemetry + voice(trimmed) + completion
|
|
// T2: T1 + voice(full) + ask + completeness + context-recovery + confusion + checkpoint + context-health
|
|
// T3: T2 + repo-mode + search
|
|
// T4: (same as T3 — TEST_FAILURE_TRIAGE is a separate {{}} placeholder, not preamble)
|
|
//
|
|
// Skills by tier:
|
|
// T1: browse, setup-cookies, benchmark
|
|
// T2: investigate, cso, retro, doc-release, setup-deploy, canary, context-save, context-restore, health
|
|
// T3: autoplan, codex, design-consult, office-hours, ceo/design/eng-review
|
|
// T4: ship, review, qa, qa-only, design-review, land-deploy
|
|
export function generatePreamble(ctx: TemplateContext): string {
|
|
const tier = ctx.preambleTier ?? 4;
|
|
if (tier < 1 || tier > 4) {
|
|
throw new Error(`Invalid preamble-tier: ${tier} in ${ctx.tmplPath}. Must be 1-4.`);
|
|
}
|
|
const sections = [
|
|
generatePreambleBash(ctx),
|
|
generateUpgradeCheck(ctx),
|
|
generateWritingStyleMigration(ctx),
|
|
generateLakeIntro(),
|
|
generateTelemetryPrompt(ctx),
|
|
generateProactivePrompt(ctx),
|
|
generateRoutingInjection(ctx),
|
|
generateVendoringDeprecation(ctx),
|
|
generateSpawnedSessionCheck(),
|
|
generateBrainHealthInstruction(ctx),
|
|
generateBrainSyncBlock(ctx),
|
|
generateModelOverlay(ctx),
|
|
generateVoiceDirective(tier),
|
|
...(tier >= 2 ? [
|
|
generateContextRecovery(ctx),
|
|
generateAskUserFormat(ctx),
|
|
generateWritingStyle(ctx),
|
|
generateCompletenessSection(),
|
|
generateConfusionProtocol(),
|
|
generateContinuousCheckpoint(),
|
|
generateContextHealth(),
|
|
generateQuestionTuning(ctx),
|
|
] : []),
|
|
...(tier >= 3 ? [generateRepoModeSection(), generateSearchBeforeBuildingSection(ctx)] : []),
|
|
generateCompletionStatus(ctx),
|
|
];
|
|
return sections.filter(s => s && s.trim().length > 0).join('\n\n');
|
|
}
|