@estebanforge/pi-antigravity-bridge 1.3.2 → 1.3.3

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.3.3] - 2026-09-01
+
+### Added
+
+- pi system prompt injection (G10): pi's composed system prompt - operating instructions plus the global agent-dir `AGENTS.md` and ancestor `AGENTS.md`/`CLAUDE.md` files - is prepended as a delimited block to the first prompt of each NEW agy conversation. agy has no system-prompt flag, so the prompt text is the only delivery path; the block is sent once per conversation and stays byte-identical afterwards, so agy's server-side prompt cache keeps hitting (unlike the per-turn G1 digest, which stays off by default for that reason). On by default (`config.systemPrompt`, `AGY_SYSTEM_PROMPT`, `/agy system-prompt on|off`); existing conversations keep the version they started with.
+
 ## [1.3.2] - 2026-09-01
 
 ### Removed

package/README.md

@@ -91,8 +91,9 @@ If `agy models` fails at load (binary missing, auth not done, network stall), a
 | --- | --- | --- |
 | `bridgeTools` | `none` (bridge off), `mcp` (pi-mcp-adapter tools), `all` (every non-builtin tool, incl. other `Ask*` delegations) | `mcp` |
 | `digest` | `off` (stable prompts; agy's prompt cache hits) or `on` (inject a delta of pi-side context - compaction summaries, other-provider turns - into each agy prompt; the delta changes every turn, so agy re-bills the full context). Enable for mixed-provider sessions where agy must see pi-side context | `off` |
+| `systemPrompt` | `on` (prepend pi's system prompt - operating instructions plus the global agent-dir `AGENTS.md` and ancestor `AGENTS.md`/`CLAUDE.md` - to the first prompt of each new agy conversation) or `off` (agy-native behavior) | `on` |
 
-Env overrides: `AGY_BRIDGE_TOOLS`, `AGY_DIGEST`.
+Env overrides: `AGY_BRIDGE_TOOLS`, `AGY_DIGEST`, `AGY_SYSTEM_PROMPT`. Env wins over the file, so while `AGY_DIGEST` or `AGY_SYSTEM_PROMPT` is set, the matching `/agy digest` or `/agy system-prompt` toggle persists a value that never takes effect.
 
 ### The /agy command
 
@@ -108,6 +109,7 @@ Env overrides: `AGY_BRIDGE_TOOLS`, `AGY_DIGEST`.
 /agy model flash|pro|gemini   default model alias for the AskAntigravity tool
 /agy thinking low|medium|high default thinking tier for the AskAntigravity tool
 /agy digest on|off        inject pi-side context into agy prompts (default off; see table above)
+/agy system-prompt on|off send pi's system prompt + AGENTS.md to new agy conversations (default on)
 /agy patch-cleanup        restore the original pi files if an older version patched them
 /agy clear                drop all session bindings (force fresh conversations)
 ```

package/docs/PI-BRIDGE-GAPS.md

@@ -27,7 +27,13 @@ credentials, so a secret never crosses the bridge, and a long call renders in
 pi's native UI while it runs. agy's file edits surface as git-sourced diffs in
 pi's thinking stream. A delta digest of pi-side context (compaction summaries,
 other-provider turns) is available but OFF by default (`/agy digest on`): the
-digest changes every turn and defeats agy's server-side prompt cache.
+digest changes every turn and defeats agy's server-side prompt cache. The
+reverse direction is on by default (`/agy system-prompt off` to disable):
+pi's composed system prompt - its operating instructions plus the global
+agent-dir `AGENTS.md` and ancestor `AGENTS.md`/`CLAUDE.md` files - is
+prepended as a delimited block to the first prompt of each new agy
+conversation, once, so the prompt cache keeps hitting (G10 in
+`CHANGELOG.md`).
 
 ## Open gaps
 

package/extensions/index.ts

@@ -302,8 +302,9 @@ function statusText(ctx: AgyCommandCtx): string {
 		`  config:        ${CONFIG_PATH}`,
 		`  bridge tools:  ${config.bridgeTools}`,
 		`  digest:        ${config.digest ? "on" : "off"}`,
+		`  system prompt: ${config.systemPrompt ? "on" : "off"}`,
 		"",
-		"Subcommands: /agy mode plan|accept-edits, /agy permissions on|off, /agy model flash|pro|gemini, /agy thinking low|medium|high, /agy clear",
+		"Subcommands: /agy mode plan|accept-edits, /agy permissions on|off, /agy model flash|pro|gemini, /agy thinking low|medium|high, /agy digest on|off, /agy system-prompt on|off, /agy clear",
 	].join("\n");
 }
 
@@ -311,7 +312,7 @@ function statusText(ctx: AgyCommandCtx): string {
 function registerAgyCommand(pi: ExtensionAPI, ctx: AgyCommandCtx): void {
 	pi.registerCommand("agy", {
 		description:
-			"Antigravity provider: status, doctor, mode picker, clear sessions. Usage: /agy [status|doctor|mode [plan|accept-edits]|digest on|off|patch-cleanup|clear]",
+			"Antigravity provider: status, doctor, mode picker, clear sessions. Usage: /agy [status|doctor|mode [plan|accept-edits]|digest on|off|system-prompt on|off|patch-cleanup|clear]",
 		handler: async (args, cmdCtx: ExtensionCommandContext) => {
 			const ui = cmdCtx.ui;
 			const mode = cmdCtx.mode;
@@ -406,6 +407,20 @@ function registerAgyCommand(pi: ExtensionAPI, ctx: AgyCommandCtx): void {
 				}
 				return;
 			}
+			if (sub === "system-prompt") {
+				if (val === "on" || val === "off") {
+					const next = saveConfig({ systemPrompt: val === "on" });
+					ui?.notify(
+						next.systemPrompt
+							? "system-prompt on. pi's system prompt (incl. global and project AGENTS.md) is prepended to the first prompt of each new agy conversation. Existing conversations keep the version they started with."
+							: "system-prompt off. agy runs on its own system prompt; pi instructions and AGENTS.md files are not sent.",
+						"info",
+					);
+				} else {
+					ui?.notify(`system-prompt: ${loadConfig().systemPrompt ? "on" : "off"}\nusage: /agy system-prompt on|off`, "info");
+				}
+				return;
+			}
 
 			if (sub === "thinking") {
 				if (val === "low" || val === "medium" || val === "high") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estebanforge/pi-antigravity-bridge",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Streaming Gemini provider for pi, built on the agy CLI. Registers antigravity/* models in pi's /model picker; drives agy through its stream-json protocol (persistent process, tool round-trips, live usage).",
   "keywords": [
     "pi-package",

package/src/config.ts

@@ -60,6 +60,16 @@ export interface AgyConfig {
 	 *  sessions gain nothing: agy already keeps its own history, and bridge
 	 *  round-trips deliver tool results through the bridge, not the digest. */
 	digest: boolean;
+	/** Prepend pi's composed system prompt (pi tool guidance + the global
+	 *  agent-dir AGENTS.md and ancestor AGENTS.md/CLAUDE.md) to the FIRST
+	 *  prompt of each fresh agy conversation.
+	 *
+	 *  Default ON: agy keeps its own history, so the prefix is sent once per
+	 *  conversation and stays byte-identical afterwards - agy's server-side
+	 *  prompt cache keeps hitting. This is why it is safe here while the G1
+	 *  digest (per-turn) is not. Turn off for agy-native behavior (agy's own
+	 *  system prompt only). */
+	systemPrompt: boolean;
 }
 
 const DEFAULTS: AgyConfig = {
@@ -69,6 +79,7 @@ const DEFAULTS: AgyConfig = {
 	defaultThinking: "medium",
 	bridgeTools: "mcp",
 	digest: false,
+	systemPrompt: true,
 };
 
 /** Load config merged over defaults. Env vars override the file when set. */
@@ -121,6 +132,11 @@ export function loadConfig(configPath: string = CONFIG_PATH): AgyConfig {
 		? ["1", "true", "on"].includes(process.env.AGY_DIGEST.toLowerCase())
 		: file.digest ?? false;
 
+	const envSys = process.env.AGY_SYSTEM_PROMPT;
+	const systemPrompt = envSys !== undefined
+		? ["1", "true", "on"].includes(envSys.toLowerCase())
+		: file.systemPrompt ?? DEFAULTS.systemPrompt;
+
 	return {
 		mode,
 		skipPermissions,
@@ -128,6 +144,7 @@ export function loadConfig(configPath: string = CONFIG_PATH): AgyConfig {
 		defaultThinking,
 		bridgeTools,
 		digest,
+		systemPrompt,
 		patchCleanupNotified: file.patchCleanupNotified === true,
 	};
 }

package/src/provider.ts

@@ -84,6 +84,43 @@ const COMPACTION_MARKER = "compacted into the following summary";
 const DIGEST_PREAMBLE =
 	"[The following is context from the broader pi session that this Antigravity turn was not directly spawned for: compaction summaries and turns handled by other providers or pi's own tools. Your own prior turns are already in your conversation history. Use this for continuity only.]";
 
+// --- pi system prompt (G10) ----------------------------------------------------
+//
+// pi composes context.systemPrompt every turn: its own operating instructions
+// plus every AGENTS.md/CLAUDE.md it loaded (global agent dir first, then
+// ancestors). The provider used to drop it, so agy models never saw the user's
+// machine-level or project-level instructions. agy has no system-prompt flag
+// (verified against `agy --help`), so the only delivery path is the prompt
+// text. We prepend it as a delimited block on the FIRST prompt of a fresh
+// conversation only: agy keeps its own history, the block stays byte-identical
+// afterwards, and agy's server-side prompt cache keeps hitting.
+
+export const SYSTEM_PROMPT_PREAMBLE =
+	"[The following is the system prompt of the pi session that spawned this conversation: operating instructions plus project context (AGENTS.md files). Apply it for this whole conversation. Tool guidance may reference pi-side tools; use your own tools or the pi tool bridge for those actions.]";
+
+export const SYSTEM_PROMPT_END = "[END SYSTEM PROMPT]";
+
+/** Assemble the full agy prompt: system prompt block, pi-side digest, user
+ *  prompt. Empty parts are dropped. Pure; exported for unit testing.
+ *  Pass systemPrompt only on a fresh conversation (see runTurnDriver). */
+export function buildFullPrompt(
+	systemPrompt: string | undefined,
+	digest: string,
+	prompt: string,
+): string {
+	const parts: string[] = [];
+	if (systemPrompt) {
+		parts.push(`${SYSTEM_PROMPT_PREAMBLE}\n\n${systemPrompt}\n\n${SYSTEM_PROMPT_END}`);
+	}
+	if (digest) {
+		parts.push(`${DIGEST_PREAMBLE}\n\n${digest}`);
+	}
+	if (prompt) {
+		parts.push(prompt);
+	}
+	return parts.join("\n\n---\n\n");
+}
+
 /** Flatten any message content shape (string or content-block array) to text.
  *  Drops images, thinking, and tool-call blocks. */
 function blocksToText(content: unknown): string {
@@ -623,7 +660,11 @@ async function runTurnDriver(
 		const effort = entry?.efforts?.length ? toAgyEffort(options?.reasoning, entry.efforts) : undefined;
 		const watermark = existing?.lastMessageCount ?? 0;
 		const digest = config.digest ? buildContextDigest(context.messages, watermark) : "";
-		const fullPrompt = digest ? `${DIGEST_PREAMBLE}\n\n${digest}\n\n---\n\n${prompt}` : prompt;
+		// Fresh conversation only: agy stores the block in its own history, so
+		// re-sending it every turn would bloat each prompt and bust the cache.
+		const sysPrompt =
+			config.systemPrompt && !existing?.conversationId ? context.systemPrompt : undefined;
+		const fullPrompt = buildFullPrompt(sysPrompt, digest, prompt);
 		try {
 			handle = await deps.driver.run({
 				cwd,