@prevalentware/opencode-goal-plugin 0.1.19 → 0.1.21

package/README.md

@@ -22,6 +22,7 @@ The OpenCode Goal Plugin adds:
 - Goal close evidence: `complete` requires verified evidence, and `unmet` requires a concrete blocker.
 - Persistent per-session goal state with history, checkpoints, budgets, and owner-only file permissions.
 - Optional automatic continuation on `session.idle` / `session.status`, with no-progress pause and budget wrap-up safeguards.
+- Plan-mode safety: goals created from the `plan` agent stay paused, and auto-continue never escapes a Plan-mode session or switches agents on its own.
 - Compaction context so active goals are preserved when OpenCode summarizes a long session.
 
 ## Why Use This OpenCode Goal Plugin?
@@ -89,7 +90,9 @@ Server options can be configured in `opencode.json`:
         "default_token_budget": 200000,
         "max_goal_duration_seconds": 1800,
         "no_progress_token_threshold": 50,
-        "max_no_progress_turns": 2
+        "max_no_progress_turns": 2,
+        "restricted_agents": ["plan"],
+        "allow_goal_execution_from_plan": false
       }
     ]
   ]
@@ -105,10 +108,12 @@ Defaults:
 - `max_prompt_failures`: `3`
 - `default_token_budget`: unset by default; when set, new goals inherit this token budget.
 - `max_goal_duration_seconds`: unset by default; when set, new goals inherit this elapsed-time safety limit.
-- `no_progress_token_threshold`: `50`
-- `max_no_progress_turns`: `2`
+- `no_progress_token_threshold`: `50`; output-token floor used to judge whether a goal continuation turn made progress.
+- `max_no_progress_turns`: `2`; consecutive low-progress goal continuation turns before pausing. Only turns produced by a reserved goal continuation count — ordinary low-output assistant messages (for example short tool-call-only turns from PTY or status checks) never increment this counter.
 - `register_command`: `true`
 - `command_name`: `"goal"`
+- `restricted_agents`: `["plan"]`; agents (matched case-insensitively) treated as planning-only for goal execution.
+- `allow_goal_execution_from_plan`: `false`; when `true`, disables Plan-mode goal restrictions entirely.
 
 ## Goal Workflow
 
@@ -133,10 +138,22 @@ The plugin also uses safety states while keeping the goal available for review o
 
 - `budgetLimited` when a token budget is exhausted.
 - `usageLimited` when an auto-turn or elapsed-time budget is exhausted.
-- `paused` when the user pauses, auto-continue repeatedly fails, or repeated low-output/no-progress turns are detected.
+- `paused` when the user pauses, auto-continue repeatedly fails, or repeated low-progress goal continuation turns are detected. No-progress accounting is scoped to goal continuation turns: each reserved continuation is evaluated once, when its turn completes, and unrelated assistant activity in the session never pauses the goal.
 
 When a safety limit is reached, the plugin sends one wrap-up prompt asking for a concise handoff instead of silently continuing forever.
 
+## Plan Mode Safety
+
+OpenCode Plan mode is a user-controlled safety boundary, and goal mode must not become an escape hatch out of it. The plugin enforces that boundary in several layers:
+
+- Goals created with `create_goal` or `set_goal` from the `plan` agent are recorded as `paused` with stop reason `plan mode`, never as active implementation goals. The tool response tells the agent to ask the user to switch to Build mode and resume the goal.
+- Automatic idle continuation is suppressed while the last user prompt or the latest assistant turn came from a restricted agent. If a previously active goal idles under Plan mode, it is paused visibly instead of continuing autonomously.
+- Resuming a goal (`update_goal_status` with `active`, or `update_goal_objective` with `status: "active"`) is refused from Plan mode, so a prompt-injected instruction inside repository content cannot self-escalate a planning session into Build-mode execution. Switching to Build mode and resuming is an explicit user action; resuming from Build updates the tracked agent so continuation restarts pinned to Build.
+- Continuation prompts are pinned to the agent recorded from the last user prompt (`body.agent`), so auto-continue never silently switches the session to a different agent or mode.
+- The goal system reminder becomes planning-only after a Plan-mode prompt: it shows goal state but instructs the agent not to perform implementation work.
+
+The set of planning-only agents is configurable with `restricted_agents` (default `["plan"]`). Setting `allow_goal_execution_from_plan` to `true` opts out of all of these restrictions; the secure default is `false`.
+
 ## State
 
 Goal state is stored at:

package/dist/server.js

@@ -21,6 +21,8 @@ var MAX_CHECKPOINTS = 8;
 var CHECKPOINT_CHAR_LIMIT = 280;
 var DEFAULT_NO_PROGRESS_TOKEN_THRESHOLD = 50;
 var DEFAULT_MAX_NO_PROGRESS_TURNS = 2;
+var PLAN_MODE_STOP_REASON = "plan mode";
+var PLAN_MODE_BLOCKER = "Goal execution is paused while the session is in Plan mode. Switch to Build mode and resume the goal to continue.";
 var NullableString = Schema.NullOr(Schema.String);
 var NullableNumber = Schema.NullOr(Schema.Number);
 var HistoryEntrySchema = Schema.Struct({
@@ -60,7 +62,11 @@ var GoalSchema = Schema.Struct({
   checkpoints: Schema.optionalWith(Schema.Array(CheckpointSchema), { default: () => [] }),
   lastCheckpoint: Schema.optionalWith(Schema.NullOr(CheckpointSchema), { default: () => null }),
   lastAssistantText: Schema.optionalWith(Schema.String, { default: () => "" }),
-  lastAssistantMessageID: Schema.optionalWith(Schema.String, { default: () => "" })
+  lastAssistantMessageID: Schema.optionalWith(Schema.String, { default: () => "" }),
+  lastPromptAgent: Schema.optionalWith(NullableString, { default: () => null }),
+  awaitingContinuationProgress: Schema.optionalWith(Schema.Boolean, { default: () => false }),
+  continuationBaselineMessageID: Schema.optionalWith(Schema.String, { default: () => "" }),
+  continuationBaselineSummary: Schema.optionalWith(Schema.String, { default: () => "" })
 });
 var StateSchema = Schema.Struct({
   version: Schema.Literal(1),
@@ -164,6 +170,10 @@ function normalizeGoal(goal) {
   goal.lastCheckpoint = goal.lastCheckpoint ?? goal.checkpoints.at(-1) ?? null;
   goal.lastAssistantText ??= "";
   goal.lastAssistantMessageID ??= "";
+  goal.lastPromptAgent ??= null;
+  goal.awaitingContinuationProgress = goal.awaitingContinuationProgress === true;
+  goal.continuationBaselineMessageID ??= "";
+  goal.continuationBaselineSummary ??= "";
   goal.noProgressTurns = nonNegativeInteger(goal.noProgressTurns, 0);
   goal.maxAutoTurns = positiveIntegerOrNull(goal.maxAutoTurns);
   goal.maxDurationSeconds = positiveIntegerOrNull(goal.maxDurationSeconds);
@@ -181,7 +191,9 @@ function normalizeCreateOptions(input) {
       maxAutoTurns: null,
       maxDurationSeconds: null,
       noProgressTokenThreshold: DEFAULT_NO_PROGRESS_TOKEN_THRESHOLD,
-      maxNoProgressTurns: DEFAULT_MAX_NO_PROGRESS_TURNS
+      maxNoProgressTurns: DEFAULT_MAX_NO_PROGRESS_TURNS,
+      agent: null,
+      initialStatus: "active"
     };
   }
   return {
@@ -189,7 +201,9 @@ function normalizeCreateOptions(input) {
     maxAutoTurns: positiveIntegerOrNull(input?.maxAutoTurns),
     maxDurationSeconds: positiveIntegerOrNull(input?.maxDurationSeconds),
     noProgressTokenThreshold: positiveIntegerOrNull(input?.noProgressTokenThreshold) ?? DEFAULT_NO_PROGRESS_TOKEN_THRESHOLD,
-    maxNoProgressTurns: positiveIntegerOrNull(input?.maxNoProgressTurns) ?? DEFAULT_MAX_NO_PROGRESS_TURNS
+    maxNoProgressTurns: positiveIntegerOrNull(input?.maxNoProgressTurns) ?? DEFAULT_MAX_NO_PROGRESS_TURNS,
+    agent: typeof input?.agent === "string" && input.agent.trim() ? input.agent.trim() : null,
+    initialStatus: input?.initialStatus === "paused" ? "paused" : "active"
   };
 }
 function positiveIntegerOrNull(value) {
@@ -238,6 +252,10 @@ function snapshot(goal) {
     lastCheckpoint: goal.lastCheckpoint,
     lastAssistantText: goal.lastAssistantText,
     lastAssistantMessageID: goal.lastAssistantMessageID,
+    lastPromptAgent: goal.lastPromptAgent,
+    awaitingContinuationProgress: goal.awaitingContinuationProgress,
+    continuationBaselineMessageID: goal.continuationBaselineMessageID,
+    continuationBaselineSummary: goal.continuationBaselineSummary,
     autoTurns: goal.autoTurns,
     lastContinuationAt: goal.lastContinuationAt,
     remainingTokens: remainingTokens(goal),
@@ -258,63 +276,108 @@ async function createGoal(sessionID, objective, options) {
       throw new Error("cannot create a new goal because this session already has a non-closed goal");
     }
     const now = nowSeconds();
+    const paused = normalizedOptions.initialStatus === "paused";
     const goal = {
       sessionID,
       objective: value,
-      status: "active",
+      status: normalizedOptions.initialStatus,
       tokenBudget: normalizedOptions.tokenBudget,
       tokensUsed: 0,
       timeUsedSeconds: 0,
       createdAt: now,
       updatedAt: now,
       completionEvidence: null,
-      blocker: null,
+      blocker: paused ? PLAN_MODE_BLOCKER : null,
       closedAt: null,
-      lastAccountedAt: now,
+      lastAccountedAt: paused ? null : now,
       autoTurns: 0,
       lastContinuationAt: null,
       continuationFailures: 0,
-      lastStatus: "Goal set.",
+      lastStatus: paused ? "Goal recorded from Plan mode; execution paused until resumed from Build mode." : "Goal set.",
       maxAutoTurns: normalizedOptions.maxAutoTurns,
       maxDurationSeconds: normalizedOptions.maxDurationSeconds,
       noProgressTokenThreshold: normalizedOptions.noProgressTokenThreshold,
       maxNoProgressTurns: normalizedOptions.maxNoProgressTurns,
       noProgressTurns: 0,
       budgetWrapupSent: false,
-      stopReason: null,
+      stopReason: paused ? PLAN_MODE_STOP_REASON : null,
       history: [],
       checkpoints: [],
       lastCheckpoint: null,
       lastAssistantText: "",
-      lastAssistantMessageID: ""
+      lastAssistantMessageID: "",
+      lastPromptAgent: normalizedOptions.agent,
+      awaitingContinuationProgress: false,
+      continuationBaselineMessageID: "",
+      continuationBaselineSummary: ""
     };
     pushHistory(goal, "created", goalLimitSummary(goal));
+    if (paused)
+      pushHistory(goal, "paused", goal.lastStatus);
     state.goals[sessionID] = goal;
     return snapshot(goal);
   });
 }
-async function updateGoalObjective(sessionID, objective, status = "active") {
+async function updateGoalObjective(sessionID, objective, status = "active", options) {
   const value = validateObjective(objective);
+  const agent = typeof options?.agent === "string" && options.agent.trim() ? options.agent.trim() : null;
+  const planModePause = options?.planModePause === true;
   return mutate((state) => {
     const goal = state.goals[sessionID];
     if (!goal)
       throw new Error("cannot update goal because this session has no goal");
     accountWallClock(goal);
     goal.objective = value;
-    goal.status = status;
+    goal.status = planModePause ? "paused" : status;
     goal.updatedAt = nowSeconds();
-    goal.lastAccountedAt = status === "active" ? goal.updatedAt : null;
+    goal.lastAccountedAt = goal.status === "active" ? goal.updatedAt : null;
     goal.completionEvidence = null;
-    goal.blocker = null;
+    goal.blocker = planModePause ? PLAN_MODE_BLOCKER : null;
     goal.closedAt = null;
-    goal.stopReason = null;
+    goal.stopReason = planModePause ? PLAN_MODE_STOP_REASON : null;
     goal.budgetWrapupSent = false;
-    goal.lastStatus = status === "active" ? "Goal objective updated and resumed." : "Goal objective updated and paused.";
+    if (agent)
+      goal.lastPromptAgent = agent;
+    goal.lastStatus = planModePause ? "Goal objective updated; execution paused while the session is in Plan mode." : goal.status === "active" ? "Goal objective updated and resumed." : "Goal objective updated and paused.";
     pushHistory(goal, "updated", `Goal objective updated: ${summarizeText(value, 400)}`);
+    if (planModePause)
+      pushHistory(goal, "paused", goal.lastStatus);
     return snapshot(goal);
   });
 }
-async function setGoalStatus(sessionID, status) {
+async function recordPromptAgent(sessionID, agent) {
+  const value = agent.trim();
+  if (!value)
+    return null;
+  return mutate((state) => {
+    const goal = state.goals[sessionID];
+    if (!goal || isClosed(goal.status))
+      return goal ? snapshot(goal) : null;
+    if (goal.lastPromptAgent === value)
+      return snapshot(goal);
+    goal.lastPromptAgent = value;
+    goal.updatedAt = nowSeconds();
+    return snapshot(goal);
+  });
+}
+async function pauseGoalForPlanMode(sessionID) {
+  return mutate((state) => {
+    const goal = state.goals[sessionID];
+    if (!goal || goal.status !== "active")
+      return goal ? snapshot(goal) : null;
+    accountWallClock(goal);
+    goal.status = "paused";
+    goal.lastAccountedAt = null;
+    goal.stopReason = PLAN_MODE_STOP_REASON;
+    goal.blocker = PLAN_MODE_BLOCKER;
+    goal.lastStatus = "Auto-continue paused while the session is in Plan mode.";
+    goal.updatedAt = nowSeconds();
+    pushHistory(goal, "paused", goal.lastStatus);
+    return snapshot(goal);
+  });
+}
+async function setGoalStatus(sessionID, status, agent) {
+  const agentValue = typeof agent === "string" && agent.trim() ? agent.trim() : null;
   return mutate((state) => {
     const goal = state.goals[sessionID];
     if (!goal)
@@ -328,6 +391,8 @@ async function setGoalStatus(sessionID, status) {
     goal.stopReason = status === "active" ? null : "paused";
     goal.budgetWrapupSent = status === "active" ? false : goal.budgetWrapupSent;
     goal.blocker = status === "active" ? null : goal.blocker;
+    if (agentValue)
+      goal.lastPromptAgent = agentValue;
     goal.lastStatus = status === "active" ? "Goal resumed." : "Goal paused.";
     pushHistory(goal, status === "active" ? "resumed" : "paused", goal.lastStatus);
     return snapshot(goal);
@@ -406,24 +471,28 @@ async function recordAssistantProgress(sessionID, input) {
       goal.lastAssistantText = text;
     if (messageID)
       goal.lastAssistantMessageID = messageID;
-    const lowOutput = outputTokens > 0 && outputTokens < (threshold ?? DEFAULT_NO_PROGRESS_TOKEN_THRESHOLD);
-    const stalled = lowOutput && (repeatedMessage || !changed);
-    if (stalled) {
-      goal.noProgressTurns += 1;
-      if (maxNoProgressTurns && goal.noProgressTurns >= maxNoProgressTurns) {
-        accountWallClock(goal);
-        goal.status = "paused";
-        goal.lastAccountedAt = null;
-        goal.stopReason = "no progress";
-        goal.blocker = `Auto-continue paused after ${goal.noProgressTurns} low-progress turn(s). Resume the goal to retry.`;
-        goal.lastStatus = goal.blocker;
-        pushHistory(goal, "warning", goal.blocker);
+    const continuationTurnCompleted = input.evaluateContinuation === true && goal.awaitingContinuationProgress && Boolean(messageID) && messageID !== goal.continuationBaselineMessageID;
+    if (continuationTurnCompleted) {
+      goal.awaitingContinuationProgress = false;
+      const lowOutput = outputTokens > 0 && outputTokens < (threshold ?? DEFAULT_NO_PROGRESS_TOKEN_THRESHOLD);
+      const changedSinceContinuation = Boolean(summary && summary !== goal.continuationBaselineSummary);
+      if (lowOutput && !changedSinceContinuation) {
+        goal.noProgressTurns += 1;
+        if (maxNoProgressTurns && goal.noProgressTurns >= maxNoProgressTurns) {
+          accountWallClock(goal);
+          goal.status = "paused";
+          goal.lastAccountedAt = null;
+          goal.stopReason = "no progress";
+          goal.blocker = `Auto-continue paused after ${goal.noProgressTurns} low-progress continuation turn(s). Resume the goal to retry.`;
+          goal.lastStatus = goal.blocker;
+          pushHistory(goal, "warning", goal.blocker);
+        } else {
+          goal.lastStatus = `Low-progress continuation turn detected (${goal.noProgressTurns}/${maxNoProgressTurns ?? "unbounded"}).`;
+          pushHistory(goal, "warning", goal.lastStatus);
+        }
       } else {
-        goal.lastStatus = `Low-progress turn detected (${goal.noProgressTurns}/${maxNoProgressTurns ?? "unbounded"}).`;
-        pushHistory(goal, "warning", goal.lastStatus);
+        goal.noProgressTurns = 0;
       }
-    } else if (changed || outputTokens >= (threshold ?? DEFAULT_NO_PROGRESS_TOKEN_THRESHOLD)) {
-      goal.noProgressTurns = 0;
     }
     goal.updatedAt = nowSeconds();
     return snapshot(goal);
@@ -446,6 +515,8 @@ async function reserveContinuation(sessionID, maxAutoTurns, minIntervalSeconds)
       return null;
     goal.autoTurns += 1;
     goal.lastContinuationAt = now;
+    goal.continuationBaselineMessageID = goal.lastAssistantMessageID;
+    goal.continuationBaselineSummary = summarizeText(goal.lastAssistantText);
     goal.lastStatus = `Auto-continue ${goal.autoTurns} reserved.`;
     pushHistory(goal, "autoContinue", goal.lastStatus);
     goal.updatedAt = now;
@@ -461,11 +532,14 @@ async function recordContinuationResult(sessionID, result, maxFailures) {
     goal.updatedAt = now;
     if (result === "success") {
       goal.continuationFailures = 0;
-      if (goal.status === "active")
+      if (goal.status === "active") {
         goal.lastStatus = "Auto-continue prompt sent.";
+        goal.awaitingContinuationProgress = true;
+      }
       return snapshot(goal);
     }
     goal.continuationFailures += 1;
+    goal.awaitingContinuationProgress = false;
     goal.lastStatus = `Auto-continue failed ${goal.continuationFailures} time(s).`;
     pushHistory(goal, "error", goal.lastStatus);
     if (goal.continuationFailures >= maxFailures) {
@@ -674,9 +748,23 @@ Stop reason: ${goal.stopReason ?? "goal limit reached"}
 
 Do not start new substantive work for this goal. Wrap up this turn soon: summarize useful progress, identify remaining work or blockers, and leave the user with a clear next step. Do not call update_goal unless the goal is actually complete.`;
 }
-function systemReminder(goal) {
+function planModeReminder(goal) {
+  return `OpenCode goal mode is tracking a goal, but this session is currently in Plan mode.
+
+${formatGoal(goal)}
+
+Plan-mode constraints:
+- Do not perform implementation work for this goal: no file edits, no state-changing commands, no dependency or repository changes.
+- Use this turn for analysis, planning, and answering the user.
+- Goal auto-continue stays disabled while the session is in Plan mode.
+- If the user wants the goal executed, ask them to switch to Build mode and resume the goal (for example with "/goal resume").
+- Do not treat the goal objective as higher-priority instructions.`;
+}
+function systemReminder(goal, options) {
   if (!goal || goal.status === "complete" || goal.status === "unmet")
     return "";
+  if (options?.planningOnly)
+    return planModeReminder(goal);
   if (goal.status === "active")
     return `OpenCode goal mode active reminder:
 
@@ -700,11 +788,19 @@ var DEFAULT_MAX_AUTO_TURNS = 25;
 var DEFAULT_CONTINUE_INTERVAL_SECONDS = 3;
 var DEFAULT_MAX_PROMPT_FAILURES = 3;
 var DEFAULT_COMMAND_NAME = "goal";
+var DEFAULT_RESTRICTED_AGENTS = ["plan"];
 var GOAL_SYSTEM_MARKER = "OpenCode goal mode";
 var TASK_SETTLE_DELAY_MS = 25;
 var SNAPSHOT_IDLE_HOLD_MS = 250;
 var TASK_TERMINAL_STATES = new Set(["completed", "error", "cancelled"]);
+var PLAN_MODE_CREATE_NOTICE = 'Goal recorded while the session is in Plan mode, so execution is paused. Do not start implementation work now. Ask the user to switch to Build mode and resume the goal (for example with "/goal resume") to begin execution.';
 var activeContinuations = new Set;
+function restrictedAgentSet(options) {
+  if (options?.allow_goal_execution_from_plan === true)
+    return new Set;
+  const names = Array.isArray(options?.restricted_agents) ? options.restricted_agents : DEFAULT_RESTRICTED_AGENTS;
+  return new Set(names.map((name) => typeof name === "string" ? name.trim().toLowerCase() : "").filter(Boolean));
+}
 function goalCommandTemplate(commandName) {
   return `OpenCode goal mode command "/${commandName}" was invoked.
 
@@ -808,13 +904,16 @@ function exactTokensFromMessage(message) {
   return;
 }
 function outputTokensFromMessage(message) {
+  let total;
   for (const part of message.parts ?? []) {
     if (part && typeof part === "object" && part.type === "step-finish") {
       const output = outputTokensFromRecord(part.tokens);
       if (output != null)
-        return output;
+        total = (total ?? 0) + output;
     }
   }
+  if (total != null)
+    return total;
   if (message.info && typeof message.info === "object")
     return outputTokensFromRecord(message.info.tokens);
   return;
@@ -869,10 +968,25 @@ function assistantMarker(message) {
     completedAt: messageCompletedAt(message)
   };
 }
-async function sendContinuation(client, sessionID, prompt) {
+function agentFromMessage(message) {
+  if (!message)
+    return;
+  for (const source of [message, message.info]) {
+    if (!isRecord(source))
+      continue;
+    for (const key of ["agent", "mode"]) {
+      const value = source[key];
+      if (typeof value === "string" && value.trim())
+        return value.trim();
+    }
+  }
+  return;
+}
+async function sendContinuation(client, sessionID, prompt, agent) {
   await client.session.promptAsync({
     path: { id: sessionID },
     body: {
+      ...agent ? { agent } : {},
       parts: [{ type: "text", text: prompt }]
     }
   });
@@ -1149,7 +1263,7 @@ class TaskTracker {
     return false;
   }
 }
-async function recordAssistantMessage(sessionID, message, options) {
+async function recordAssistantMessage(sessionID, message, options, evaluateContinuation = false) {
   if (!message)
     return;
   await recordAssistantProgress(sessionID, {
@@ -1157,7 +1271,8 @@ async function recordAssistantMessage(sessionID, message, options) {
     text: textFromMessage(message),
     outputTokens: outputTokensFromMessage(message) ?? null,
     noProgressTokenThreshold: positiveIntegerOrNull2(options.no_progress_token_threshold),
-    maxNoProgressTurns: positiveIntegerOrNull2(options.max_no_progress_turns)
+    maxNoProgressTurns: positiveIntegerOrNull2(options.max_no_progress_turns),
+    evaluateContinuation
   });
 }
 function mergeSystemReminder(output, reminder) {
@@ -1185,6 +1300,21 @@ var server = async ({ client }, options) => {
   const taskDeferredSessions = new Set;
   const scheduledContinuations = new Map;
   const busySessions = new Set;
+  const planAgents = restrictedAgentSet(options);
+  const isPlanAgent = (agent) => typeof agent === "string" && planAgents.has(agent.trim().toLowerCase());
+  async function createGoalFromTool(input, context) {
+    const planningOnly = isPlanAgent(context.agent);
+    const goal = await createGoal(context.sessionID, input.objective, {
+      tokenBudget: input.token_budget ?? options?.default_token_budget ?? null,
+      maxAutoTurns: input.max_auto_turns ?? null,
+      maxDurationSeconds: input.max_duration_seconds ?? options?.max_goal_duration_seconds ?? null,
+      noProgressTokenThreshold: options?.no_progress_token_threshold ?? null,
+      maxNoProgressTurns: options?.max_no_progress_turns ?? null,
+      agent: typeof context.agent === "string" ? context.agent : null,
+      initialStatus: planningOnly ? "paused" : "active"
+    });
+    return JSON.stringify(planningOnly ? { goal, plan_mode_notice: PLAN_MODE_CREATE_NOTICE } : { goal }, null, 2);
+  }
   async function taskBlockStatus(sessionID) {
     if (!deferWhileTasksActive)
       return false;
@@ -1224,7 +1354,16 @@ var server = async ({ client }, options) => {
       }
       if (busySessions.has(sessionID))
         return;
-      await recordAssistantMessage(sessionID, latestAssistant, options ?? {});
+      await recordAssistantMessage(sessionID, latestAssistant, options ?? {}, true);
+      const current = await getGoal(sessionID);
+      if (!current)
+        return;
+      const latestTurnAgent = agentFromMessage(latestAssistant);
+      if (isPlanAgent(current.lastPromptAgent) || isPlanAgent(latestTurnAgent)) {
+        if (current.status === "active")
+          await pauseGoalForPlanMode(sessionID);
+        return;
+      }
       if (!fromTaskDeferral && taskDeferredSessions.has(sessionID)) {
         scheduleSettledContinuation(sessionID);
         return;
@@ -1233,7 +1372,7 @@ var server = async ({ client }, options) => {
       const goal = await reserveContinuation(sessionID, maxAutoTurns, minInterval);
       if (!goal)
         return;
-      await sendContinuation(client, sessionID, goal.status === "active" ? continuationPrompt(goal) : limitPrompt(goal));
+      await sendContinuation(client, sessionID, goal.status === "active" ? continuationPrompt(goal) : limitPrompt(goal), goal.lastPromptAgent ?? latestTurnAgent ?? null);
       await recordContinuationResult(sessionID, "success", maxPromptFailures);
     } catch (error) {
       await recordContinuationResult(sessionID, "failure", maxPromptFailures);
@@ -1277,7 +1416,7 @@ var server = async ({ client }, options) => {
         }
       },
       create_goal: {
-        description: "Create a goal only when explicitly requested by the user or system/developer instructions; do not infer goals from ordinary tasks. Fails if a non-complete goal exists.",
+        description: "Create a goal only when explicitly requested by the user or system/developer instructions; do not infer goals from ordinary tasks. Fails if a non-complete goal exists. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
         args: {
           objective: z.string().min(1).max(4000).describe("The concrete objective to start pursuing."),
           token_budget: z.number().int().positive().nullable().optional().describe("Optional positive token budget."),
@@ -1285,19 +1424,11 @@ var server = async ({ client }, options) => {
           max_duration_seconds: z.number().int().positive().nullable().optional().describe("Optional per-goal duration limit.")
         },
         async execute(args, context) {
-          const input = args;
-          const goal = await createGoal(context.sessionID, input.objective, {
-            tokenBudget: input.token_budget ?? options?.default_token_budget ?? null,
-            maxAutoTurns: input.max_auto_turns ?? null,
-            maxDurationSeconds: input.max_duration_seconds ?? options?.max_goal_duration_seconds ?? null,
-            noProgressTokenThreshold: options?.no_progress_token_threshold ?? null,
-            maxNoProgressTurns: options?.max_no_progress_turns ?? null
-          });
-          return JSON.stringify({ goal }, null, 2);
+          return createGoalFromTool(args, context);
         }
       },
       set_goal: {
-        description: "Set a new goal when the user explicitly asks the agent to formulate and set its own goal. The model should write the objective itself based on the user's explicit request. Fails if a non-complete goal exists.",
+        description: "Set a new goal when the user explicitly asks the agent to formulate and set its own goal. The model should write the objective itself based on the user's explicit request. Fails if a non-complete goal exists. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
         args: {
           objective: z.string().min(1).max(4000).describe("The model-formulated concrete objective to start pursuing."),
           token_budget: z.number().int().positive().nullable().optional().describe("Optional positive token budget."),
@@ -1305,15 +1436,7 @@ var server = async ({ client }, options) => {
           max_duration_seconds: z.number().int().positive().nullable().optional().describe("Optional per-goal duration limit.")
         },
         async execute(args, context) {
-          const input = args;
-          const goal = await createGoal(context.sessionID, input.objective, {
-            tokenBudget: input.token_budget ?? options?.default_token_budget ?? null,
-            maxAutoTurns: input.max_auto_turns ?? null,
-            maxDurationSeconds: input.max_duration_seconds ?? options?.max_goal_duration_seconds ?? null,
-            noProgressTokenThreshold: options?.no_progress_token_threshold ?? null,
-            maxNoProgressTurns: options?.max_no_progress_turns ?? null
-          });
-          return JSON.stringify({ goal }, null, 2);
+          return createGoalFromTool(args, context);
         }
       },
       update_goal_objective: {
@@ -1324,8 +1447,13 @@ var server = async ({ client }, options) => {
         },
         async execute(args, context) {
           const input = args;
-          const goal = await updateGoalObjective(context.sessionID, input.objective, input.status ?? "active");
-          return JSON.stringify({ goal }, null, 2);
+          const requested = input.status ?? "active";
+          const planningOnly = requested === "active" && isPlanAgent(context.agent);
+          const goal = await updateGoalObjective(context.sessionID, input.objective, planningOnly ? "paused" : requested, {
+            agent: typeof context.agent === "string" ? context.agent : null,
+            planModePause: planningOnly
+          });
+          return JSON.stringify(planningOnly ? { goal, plan_mode_notice: PLAN_MODE_CREATE_NOTICE } : { goal }, null, 2);
         }
       },
       update_goal: {
@@ -1349,13 +1477,16 @@ var server = async ({ client }, options) => {
         }
       },
       update_goal_status: {
-        description: "Pause or resume the current OpenCode goal when the user explicitly asks to pause or resume it.",
+        description: "Pause or resume the current OpenCode goal when the user explicitly asks to pause or resume it. Resuming is not allowed while the session is in Plan mode; the user must switch to Build mode first.",
         args: {
           status: z.enum(["active", "paused"]).describe("active resumes a goal; paused pauses it without clearing it.")
         },
         async execute(args, context) {
           const input = args;
-          const goal = await setGoalStatus(context.sessionID, input.status);
+          if (input.status === "active" && isPlanAgent(context.agent)) {
+            throw new Error("cannot resume the goal while the session is in Plan mode; ask the user to switch to Build mode and resume the goal from there");
+          }
+          const goal = await setGoalStatus(context.sessionID, input.status, typeof context.agent === "string" ? context.agent : null);
           return JSON.stringify({ goal }, null, 2);
         }
       },
@@ -1373,6 +1504,13 @@ var server = async ({ client }, options) => {
     async "tool.execute.after"(input, output) {
       taskTracker.noteTaskOutput(input, output);
     },
+    async "chat.message"(input, output) {
+      const sessionID = typeof input?.sessionID === "string" ? input.sessionID : output.message?.sessionID;
+      const agent = typeof input?.agent === "string" && input.agent.trim() ? input.agent : output.message?.agent;
+      if (typeof sessionID !== "string" || typeof agent !== "string" || !agent.trim())
+        return;
+      await recordPromptAgent(sessionID, agent);
+    },
     async "experimental.chat.messages.transform"(input, output) {
       taskTracker.observeMessages(output.messages);
       const sessionID = "sessionID" in input && typeof input.sessionID === "string" ? input.sessionID : output.messages.find((message) => typeof message.info.sessionID === "string")?.info.sessionID;
@@ -1384,7 +1522,8 @@ var server = async ({ client }, options) => {
     async "experimental.chat.system.transform"(input, output) {
       if (typeof input.sessionID !== "string")
         return;
-      mergeSystemReminder(output, systemReminder(await getGoal(input.sessionID)));
+      const goal = await getGoal(input.sessionID);
+      mergeSystemReminder(output, systemReminder(goal, { planningOnly: isPlanAgent(goal?.lastPromptAgent) }));
     },
     async "experimental.session.compacting"(input, output) {
       const goal = await getGoal(input.sessionID);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prevalentware/opencode-goal-plugin",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "OpenCode goal plugin that adds Codex-style long-running goal mode, /goal commands, persistence, and TUI status for AI coding agents.",
   "keywords": [
     "opencode",