opencode-goal-mode 0.3.10 → 0.3.11

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.3.11
+
+- Fixed Goal sidebar/status isolation so an explicit Build or other non-Goal
+  session never falls back to another active Goal session in the same worktree.
+- Blocked mutating `goal_*` tools from activating Goal Guard state in non-Goal
+  sessions; read-only tools remain strictly scoped to the current session.
+- Added regression coverage for mixed Goal/Build persisted snapshots, session-scoped
+  status/evidence/memory reads, and Build-mode tool calls.
+
 ## v0.3.10
 
 - Clarified the recommended install command to use a persistent global npm install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-goal-mode",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Strict Goal Mode agents, commands, and guard plugin for OpenCode.",
   "type": "module",
   "main": "plugins/goal-sidebar.tsx",

package/plugins/goal-guard/sidebar-data.js

@@ -30,8 +30,10 @@ function normalize(record) {
 }
 
 /**
- * Choose which session's goal to show: the most-recently-touched ACTIVE session
- * (optionally preferring an explicit sessionId when it is present and active).
+ * Choose which session's goal to show. When OpenCode gives us a concrete session
+ * id, never fall back to another session: Build/non-Goal sessions must not show a
+ * Goal from the same worktree. The most-recent active fallback is only for
+ * no-session contexts such as initial sidebar registration polling.
  */
 export function pickSession(snapshot, sessionId) {
   if (!snapshot || !Array.isArray(snapshot.sessions)) return null;
@@ -41,6 +43,7 @@ export function pickSession(snapshot, sessionId) {
   if (sessionId) {
     const direct = records.find(([key, st]) => key === sessionId && st.active);
     if (direct) return direct[1];
+    return null;
   }
   const active = records.filter(([, st]) => st.active);
   if (active.length === 0) return null;

package/plugins/goal-guard/tools.js

@@ -16,6 +16,7 @@ import { evidenceMapReport, reviewerMemoryReport, statusReport } from "./summary
 import { recordEvidence } from "./events.js";
 import { refreshStickyGates } from "./gates.js";
 import { createState } from "./state.js";
+import { isPrimaryAgent } from "./agents.js";
 
 const s = tool.schema;
 
@@ -28,6 +29,18 @@ const s = tool.schema;
 export function createGoalTools({ store, config, persist }) {
   const save = typeof persist === "function" ? persist : () => {};
 
+  function requireGoalMode(state) {
+    return Boolean(state?.active || isPrimaryAgent(state?.currentAgent));
+  }
+
+  function goalModeOnlyResult() {
+    return {
+      title: "Goal Mode required",
+      output: "This goal_* tool can only mutate Goal Guard state from an active Goal session. Switch to the `goal` agent or start with /goal.",
+      metadata: { blocked: true, reason: "not_goal_mode" },
+    };
+  }
+
   return {
     goal_status: tool({
       description:
@@ -109,6 +122,7 @@ export function createGoalTools({ store, config, persist }) {
       },
       async execute(args, ctx) {
         const state = store.stateFor(ctx.sessionID);
+        if (!requireGoalMode(state)) return goalModeOnlyResult();
         state.active = true;
         state.contract = {
           title: String(args.title || "").replace(/\s+/g, " ").trim(),
@@ -145,6 +159,7 @@ export function createGoalTools({ store, config, persist }) {
       },
       async execute(args, ctx) {
         const state = store.stateFor(ctx.sessionID);
+        if (!requireGoalMode(state)) return goalModeOnlyResult();
         state.active = true;
         recordEvidence(store, state, args.command, args.result, args.criteria);
         save();
@@ -164,6 +179,8 @@ export function createGoalTools({ store, config, persist }) {
         confirm: s.boolean().describe("Must be true to actually reset."),
       },
       async execute(args, ctx) {
+        const state = store.stateFor(ctx.sessionID);
+        if (!requireGoalMode(state)) return goalModeOnlyResult();
         if (!args.confirm) {
           return { title: "Reset not confirmed", output: "Pass confirm=true to reset Goal Guard state." };
         }