Merge pull request #1830 from entireio/fix/opencode-stale-injection

fix(opencode): clear pending injection on session change

Author: gtrrz-victor

cmd/entire/cli/agent/opencode/entire_plugin.ts

@@ -117,6 +117,9 @@ export const EntirePlugin: Plugin = async ({ directory }) => {
     messageStore.clear()
     currentModel = null
     currentSessionID = sessionID
+    // Drop any turn-start injection captured for the prior session so it
+    // can't leak into the new session's system prompt.
+    pendingInjection = null
     return true
   }
 
@@ -236,6 +239,7 @@ export const EntirePlugin: Plugin = async ({ directory }) => {
             seenUserMessages.clear()
             messageStore.clear()
             currentSessionID = null
+            pendingInjection = null
             // Use sync variant: session-end may fire during shutdown.
             callHookSync("session-end", {
               session_id: session.id,
@@ -252,6 +256,7 @@ export const EntirePlugin: Plugin = async ({ directory }) => {
             seenUserMessages.clear()
             messageStore.clear()
             currentSessionID = null
+            pendingInjection = null
             // Use sync variant: this is the last event before process exit.
             callHookSync("session-end", {
               session_id: sessionID,

cmd/entire/cli/agent/opencode/hooks_test.go

@@ -195,6 +195,23 @@ func TestInstallHooks_AppliesContextInjection(t *testing.T) {
 	if !strings.Contains(content, `output.system.push(pendingInjection)`) {
 		t.Fatal("plugin file should push the injection onto the system prompt")
 	}
+	// Every session-reset site must clear the stashed injection so a session
+	// change cannot leak the prior session's context into the next session.
+	resetSites := []struct{ name, start, end string }{
+		{"resetSessionTracking", "function resetSessionTracking", "return true"},
+		{"session.deleted", `case "session.deleted"`, `callHookSync("session-end"`},
+		{"server.instance.disposed", `case "server.instance.disposed"`, `callHookSync("session-end"`},
+	}
+	for _, site := range resetSites {
+		_, after, found := strings.Cut(content, site.start)
+		if !found {
+			t.Fatalf("plugin file missing reset site %q", site.name)
+		}
+		body, _, _ := strings.Cut(after, site.end)
+		if !strings.Contains(body, `pendingInjection = null`) {
+			t.Fatalf("%s should clear pendingInjection to avoid cross-session leakage", site.name)
+		}
+	}
 }
 
 func TestInstallHooks_MessageUpdatedFallsBackToSessionStart(t *testing.T) {