@prevalentware/opencode-goal-plugin 0.1.35 → 0.1.37

package/dist/server.js

@@ -152,12 +152,20 @@ var PendingAttemptSchema = Schema.Struct({
   armNoProgress: Schema.Boolean,
   previousLastContinuationAt: Schema.NullOr(Schema.Number)
 });
+var UsageTrackerSchema = Schema.Struct({
+  baseline: Schema.optionalWith(Schema.Unknown, { default: () => null }),
+  lastObserved: Schema.optionalWith(Schema.Unknown, { default: () => null }),
+  baseTokens: Schema.optionalWith(Schema.Unknown, { default: () => null }),
+  pendingBaseline: Schema.optionalWith(Schema.Unknown, { default: () => null }),
+  pendingBaseTokens: Schema.optionalWith(Schema.Unknown, { default: () => null })
+});
 var GoalSchema = Schema.Struct({
   sessionID: Schema.String,
   objective: Schema.String,
   status: Schema.Literal("active", "paused", "budgetLimited", "usageLimited", "complete", "unmet"),
   tokenBudget: NullableNumber,
   tokensUsed: Schema.Number,
+  usageTrackers: Schema.optionalWith(Schema.Record({ key: Schema.String, value: UsageTrackerSchema }), { default: () => ({}) }),
   timeUsedSeconds: Schema.Number,
   createdAt: Schema.Number,
   updatedAt: Schema.Number,
@@ -315,12 +323,34 @@ function normalizeGoal(goal) {
   goal.maxAutoTurns = positiveIntegerOrNull(goal.maxAutoTurns);
   goal.maxDurationSeconds = positiveIntegerOrNull(goal.maxDurationSeconds);
   goal.tokenBudget = positiveIntegerOrNull(goal.tokenBudget);
+  goal.usageTrackers = normalizeUsageTrackers(goal.usageTrackers);
   goal.noProgressTokenThreshold = positiveIntegerOrNull(goal.noProgressTokenThreshold) ?? DEFAULT_NO_PROGRESS_TOKEN_THRESHOLD;
   goal.maxNoProgressTurns = positiveIntegerOrNull(goal.maxNoProgressTurns) ?? DEFAULT_MAX_NO_PROGRESS_TURNS;
   goal.budgetWrapupSent = goal.budgetWrapupSent === true;
   goal.stopReason ??= null;
   return goal;
 }
+function normalizeUsageTrackers(trackers) {
+  const normalized = {};
+  for (const [source, rawTracker] of Object.entries(trackers ?? {})) {
+    const tracker = rawTracker;
+    const baseline = nonNegativeIntegerOrNull(tracker?.baseline);
+    const lastObserved = nonNegativeIntegerOrNull(tracker?.lastObserved);
+    const baseTokens = nonNegativeIntegerOrNull(tracker?.baseTokens);
+    if (source && baseline != null && lastObserved != null && baseTokens != null && lastObserved >= baseline) {
+      const pendingBaseline = nonNegativeIntegerOrNull(tracker.pendingBaseline);
+      const pendingBaseTokens = nonNegativeIntegerOrNull(tracker.pendingBaseTokens);
+      normalized[source] = {
+        baseline,
+        lastObserved,
+        baseTokens,
+        pendingBaseline,
+        pendingBaseTokens: pendingBaseline == null ? null : pendingBaseTokens
+      };
+    }
+  }
+  return normalized;
+}
 function normalizePendingAttempt(attempt) {
   if (!attempt || typeof attempt !== "object")
     return null;
@@ -365,6 +395,9 @@ function positiveIntegerOrNull(value) {
 function nonNegativeInteger(value, fallback) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : fallback;
 }
+function nonNegativeIntegerOrNull(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
+}
 function isClosed(status) {
   return status === "complete" || status === "unmet";
 }
@@ -444,6 +477,7 @@ async function createGoal(sessionID, objective, options) {
       status: normalizedOptions.initialStatus,
       tokenBudget: normalizedOptions.tokenBudget,
       tokensUsed: 0,
+      usageTrackers: {},
       timeUsedSeconds: 0,
       createdAt: now,
       updatedAt: now,
@@ -605,14 +639,66 @@ async function clearGoal(sessionID) {
     return existed;
   });
 }
-async function accountUsage(sessionID, tokensUsed) {
+async function accountUsage(sessionID, tokensUsed, options) {
   return mutate((state) => {
     const goal = state.goals[sessionID];
     if (!goal)
       return null;
     accountWallClock(goal);
     if (typeof tokensUsed === "number" && Number.isFinite(tokensUsed)) {
-      goal.tokensUsed = Math.max(goal.tokensUsed, Math.max(0, Math.ceil(tokensUsed)));
+      const observed = Math.max(0, Math.ceil(tokensUsed));
+      if (options?.cumulative === true) {
+        const source = options.source?.trim() || "default";
+        let tracker = goal.usageTrackers[source];
+        if (!tracker) {
+          const initialBaseline = nonNegativeIntegerOrNull(options.initialBaseline);
+          tracker = initialBaseline != null && initialBaseline <= observed ? {
+            baseline: initialBaseline,
+            lastObserved: observed,
+            baseTokens: goal.tokensUsed,
+            pendingBaseline: null,
+            pendingBaseTokens: null
+          } : {
+            baseline: observed,
+            lastObserved: observed,
+            baseTokens: goal.tokensUsed,
+            pendingBaseline: null,
+            pendingBaseTokens: null
+          };
+          goal.usageTrackers[source] = tracker;
+        } else if (observed < tracker.lastObserved) {
+          const initialBaseline = nonNegativeIntegerOrNull(options.initialBaseline);
+          if (initialBaseline != null && initialBaseline <= observed) {
+            tracker = {
+              baseline: initialBaseline,
+              lastObserved: observed,
+              baseTokens: goal.tokensUsed,
+              pendingBaseline: null,
+              pendingBaseTokens: null
+            };
+            goal.usageTrackers[source] = tracker;
+          } else if (tracker.pendingBaseline == null || observed < tracker.pendingBaseline) {
+            tracker.pendingBaseline = observed;
+            tracker.pendingBaseTokens = goal.tokensUsed;
+          } else {
+            tracker = {
+              baseline: tracker.pendingBaseline,
+              lastObserved: observed,
+              baseTokens: tracker.pendingBaseTokens ?? goal.tokensUsed,
+              pendingBaseline: null,
+              pendingBaseTokens: null
+            };
+            goal.usageTrackers[source] = tracker;
+          }
+        } else {
+          tracker.lastObserved = observed;
+          tracker.pendingBaseline = null;
+          tracker.pendingBaseTokens = null;
+        }
+        goal.tokensUsed = Math.max(goal.tokensUsed, tracker.baseTokens + observed - tracker.baseline);
+      } else {
+        goal.tokensUsed = Math.max(goal.tokensUsed, observed);
+      }
     }
     maybeStopForBudget(goal);
     goal.updatedAt = nowSeconds();
@@ -1058,6 +1144,9 @@ var NON_PROGRESS_TOOLS = new Set(["get_goal", "get_goal_history"]);
 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 LIMITED_GOAL_NOTICE = "Safety limit reached. Do not start or continue substantive work for this goal. Summarize useful progress, remaining work, and blockers, then wait for the user to resume or edit the goal.";
+var DUPLICATE_GOAL_NOTICE = "This non-closed goal already exists. Do not call create_goal or set_goal again. The existing objective and limits were preserved; repeated-call arguments were not applied. Use the returned goal state and continue only when its status permits execution.";
+var CONFLICTING_GOAL_NOTICE = "A different non-closed goal already exists. Do not call create_goal or set_goal again. Report the conflict instead of replacing the goal; edit, clear, complete, or mark it unmet only when explicitly requested.";
+var RESTRICTED_GOAL_NOTICE = "Goal execution is not allowed from the current restricted agent or while the goal is paused for Plan mode. Switch to Build mode and resume the goal before doing substantive work.";
 var activeContinuations = new Set;
 function restrictedAgentSet(options) {
   if (options?.allow_goal_execution_from_plan === true)
@@ -1084,9 +1173,9 @@ Use the goal tools to handle this command:
 - If the arguments start with "edit ", update the current goal objective by calling update_goal_objective with the remaining text.
 - If the arguments start with "complete " or "done ", perform a completion audit against real artifacts and command output. Call update_goal with status "complete" only if the goal is achieved, using concise evidence from the audit.
 - If the arguments start with "unmet ", "blocked ", or "blocker ", call update_goal with status "unmet" only when the goal cannot be achieved or needs external input, using the remaining arguments as the blocker.
-- Otherwise, create a new goal with create_goal. Use the full arguments as the objective. If the user includes explicit budget instructions, pass token_budget, max_auto_turns, or max_duration_seconds to create_goal rather than leaving those words in the objective.
+- Otherwise, call get_goal first. If it returns a non-closed goal with the same objective, do not create it again; continue working from the returned state. If it returns a different non-closed goal, report that conflict instead of replacing it. Only when there is no non-closed goal, call create_goal once. Use the full arguments as the objective. If the user includes explicit budget instructions, pass token_budget, max_auto_turns, or max_duration_seconds to create_goal rather than leaving those words in the objective.
 
-Create a goal only from these explicit command arguments. Do not infer a goal from unrelated session context. After create_goal succeeds, continue working toward the new goal.`;
+Create a goal only from these explicit command arguments. Do not infer a goal from unrelated session context. After create_goal succeeds or returns an existing matching goal, never call it again for this command; continue working from the returned goal state.`;
 }
 function commandNameFromOptions(options) {
   const name = options?.command_name?.trim() || DEFAULT_COMMAND_NAME;
@@ -1097,7 +1186,7 @@ function commandNameFromOptions(options) {
 function positiveIntegerOrNull2(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : null;
 }
-function nonNegativeIntegerOrNull(value) {
+function nonNegativeIntegerOrNull2(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
 }
 function timeoutMillisecondsFromSeconds(value) {
@@ -1190,9 +1279,9 @@ function outputTokensFromMessage(message) {
     return outputTokensFromRecord(message.info.tokens);
   return;
 }
-function tokensFromMessages(messages) {
+function usageFromMessages(messages) {
   const exactTotal = messages.reduce((sum, message) => sum + (exactTokensFromMessage(message) ?? 0), 0);
-  return exactTotal > 0 ? exactTotal : estimateMessages(messages);
+  return exactTotal > 0 ? { tokens: exactTotal, source: "v1.messages.exact" } : { tokens: estimateMessages(messages), source: "v1.messages.estimated" };
 }
 function taskHeader(output) {
   const resultIndex = output.search(/<task_(?:result|error)>/);
@@ -1687,17 +1776,44 @@ function getGoalToolResult(goal) {
 }
 async function createGoalFromTool(input, context, services) {
   const planningOnly = services.isPlanAgent(context.agent);
-  const goal = await createGoal(context.sessionID, input.objective, {
-    tokenBudget: input.token_budget ?? services.options.default_token_budget ?? null,
-    maxAutoTurns: input.max_auto_turns ?? null,
-    maxDurationSeconds: input.max_duration_seconds ?? services.options.max_goal_duration_seconds ?? null,
-    noProgressTokenThreshold: services.options.no_progress_token_threshold ?? null,
-    maxNoProgressTurns: services.options.max_no_progress_turns ?? null,
-    agent: typeof context.agent === "string" ? context.agent : null,
-    initialStatus: planningOnly ? "paused" : "active"
-  });
+  const objective = validateObjective(input.objective);
+  const existing = await getGoal(context.sessionID);
+  if (existing && !isClosedGoal(existing))
+    return existingGoalResult(existing, objective, planningOnly);
+  let goal;
+  try {
+    goal = await createGoal(context.sessionID, input.objective, {
+      tokenBudget: input.token_budget ?? services.options.default_token_budget ?? null,
+      maxAutoTurns: input.max_auto_turns ?? null,
+      maxDurationSeconds: input.max_duration_seconds ?? services.options.max_goal_duration_seconds ?? null,
+      noProgressTokenThreshold: services.options.no_progress_token_threshold ?? null,
+      maxNoProgressTurns: services.options.max_no_progress_turns ?? null,
+      agent: typeof context.agent === "string" ? context.agent : null,
+      initialStatus: planningOnly ? "paused" : "active"
+    });
+  } catch (error) {
+    if (!(error instanceof Error) || !error.message.includes("non-closed goal"))
+      throw error;
+    const raced = await getGoal(context.sessionID);
+    if (raced && !isClosedGoal(raced))
+      return existingGoalResult(raced, objective, planningOnly);
+    throw error;
+  }
+  await services.initializeUsage?.(context.sessionID);
   return JSON.stringify(planningOnly ? { goal, plan_mode_notice: PLAN_MODE_CREATE_NOTICE } : { goal }, null, 2);
 }
+function isClosedGoal(goal) {
+  return goal.status === "complete" || goal.status === "unmet";
+}
+function existingGoalResult(goal, requestedObjective, planningOnly) {
+  const reused = goal.objective === requestedObjective;
+  return JSON.stringify({
+    goal,
+    ...reused ? { goal_reused: true, duplicate_goal_notice: DUPLICATE_GOAL_NOTICE } : { goal_conflict: true, goal_conflict_notice: CONFLICTING_GOAL_NOTICE },
+    ...goal.status === "budgetLimited" || goal.status === "usageLimited" ? { goal_mode_notice: LIMITED_GOAL_NOTICE } : {},
+    ...planningOnly || goal.stopReason === PLAN_MODE_STOP_REASON ? { plan_mode_notice: RESTRICTED_GOAL_NOTICE } : {}
+  }, null, 2);
+}
 async function updateGoalObjectiveFromTool(input, context, services) {
   const requested = input.status ?? "active";
   const planningOnly = requested === "active" && services.isPlanAgent(context.agent);
@@ -1758,7 +1874,7 @@ var server = async ({ client }, options) => {
   const autoContinue = options?.auto_continue ?? true;
   const deferWhileTasksActive = options?.defer_while_tasks_active ?? true;
   const maxAutoTurns = positiveIntegerOrNull2(options?.max_auto_turns) ?? DEFAULT_MAX_AUTO_TURNS;
-  const minInterval = nonNegativeIntegerOrNull(options?.min_continue_interval_seconds) ?? DEFAULT_CONTINUE_INTERVAL_SECONDS;
+  const minInterval = nonNegativeIntegerOrNull2(options?.min_continue_interval_seconds) ?? DEFAULT_CONTINUE_INTERVAL_SECONDS;
   const maxTurnTimeMs = timeoutMillisecondsFromSeconds(options?.max_turn_time);
   const maxPromptFailures = positiveIntegerOrNull2(options?.max_prompt_failures) ?? DEFAULT_MAX_PROMPT_FAILURES;
   const registerCommand = options?.register_command ?? true;
@@ -2056,7 +2172,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. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
+        description: "Create a goal only when explicitly requested by the user or system/developer instructions; do not infer goals from ordinary tasks. If any non-closed goal exists, this returns the existing goal as either reused or conflicting and must not be retried. 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."),
@@ -2068,7 +2184,7 @@ var server = async ({ client }, options) => {
         }
       },
       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. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
+        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. If any non-closed goal exists, this returns the existing goal as either reused or conflicting and must not be retried. 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."),
@@ -2167,7 +2283,8 @@ var server = async ({ client }, options) => {
       const sessionID = "sessionID" in input && typeof input.sessionID === "string" ? input.sessionID : output.messages.find((message) => typeof message.info.sessionID === "string")?.info.sessionID;
       if (!sessionID)
         return;
-      await accountUsage(sessionID, tokensFromMessages(output.messages));
+      const usage = usageFromMessages(output.messages);
+      await accountUsage(sessionID, usage.tokens, { cumulative: true, source: usage.source });
       const observed = await recordAssistantMessage(sessionID, latestAssistantMessage(output.messages), options ?? {});
       await reconcileLocalMarkerAfterProgress(locallyDeliveredPendingSessions, sessionID, observed.goal);
       const scheduled = scheduledContinuations.get(sessionID);
@@ -2298,7 +2415,7 @@ async function setupV2(context) {
   const autoContinue = options.auto_continue ?? true;
   const deferWhileTasksActive = options.defer_while_tasks_active ?? true;
   const maxAutoTurns = positiveIntegerOrNull2(options.max_auto_turns) ?? DEFAULT_MAX_AUTO_TURNS;
-  const minInterval = nonNegativeIntegerOrNull(options.min_continue_interval_seconds) ?? DEFAULT_CONTINUE_INTERVAL_SECONDS;
+  const minInterval = nonNegativeIntegerOrNull2(options.min_continue_interval_seconds) ?? DEFAULT_CONTINUE_INTERVAL_SECONDS;
   const maxTurnTimeMs = timeoutMillisecondsFromSeconds(options.max_turn_time);
   const maxPromptFailures = positiveIntegerOrNull2(options.max_prompt_failures) ?? DEFAULT_MAX_PROMPT_FAILURES;
   const registerCommand = options.register_command ?? true;
@@ -2314,11 +2431,21 @@ async function setupV2(context) {
   const toolAttempts = new Map;
   const planAgents = restrictedAgentSet(options);
   const isPlanAgent = (agent) => typeof agent === "string" && planAgents.has(agent.trim().toLowerCase());
-  const goalServices = { options, isPlanAgent };
   const activeContinuationsV2 = new Set;
   const latestStepBySession = new Map;
   const stepTextBuffers = new Map;
   const stepTokenSums = new Map;
+  const goalServices = {
+    options,
+    isPlanAgent,
+    initializeUsage: async (sessionID) => {
+      try {
+        await accountUsage(sessionID, stepTokenSums.get(sessionID) ?? 0, { cumulative: true, source: "v2.steps" });
+      } catch (error) {
+        v2ErrorLog("Failed to initialize goal usage accounting", error);
+      }
+    }
+  };
   const registrations = [];
   let disposed = false;
   function stepKey(sessionID, messageID2) {
@@ -2719,7 +2846,11 @@ async function setupV2(context) {
         if (typeof tokens === "number") {
           const sum = (stepTokenSums.get(sessionID) ?? 0) + tokens;
           stepTokenSums.set(sessionID, sum);
-          await accountUsage(sessionID, sum);
+          await accountUsage(sessionID, sum, {
+            cumulative: true,
+            source: "v2.steps",
+            initialBaseline: Math.ceil(sum - tokens)
+          });
         }
         const text = stepTextBuffers.get(stepKey(sessionID, messageID2)) ?? "";
         stepTextBuffers.delete(stepKey(sessionID, messageID2));
@@ -2755,7 +2886,11 @@ async function setupV2(context) {
         if (typeof tokens === "number") {
           const sum = (stepTokenSums.get(sessionID) ?? 0) + tokens;
           stepTokenSums.set(sessionID, sum);
-          await accountUsage(sessionID, sum);
+          await accountUsage(sessionID, sum, {
+            cumulative: true,
+            source: "v2.steps",
+            initialBaseline: Math.ceil(sum - tokens)
+          });
         }
         const text = stepTextBuffers.get(stepKey(sessionID, messageID2)) ?? "";
         stepTextBuffers.delete(stepKey(sessionID, messageID2));
@@ -2788,7 +2923,7 @@ async function setupV2(context) {
           return;
         const tokens = tokensFromRecord(data.tokens);
         if (typeof tokens === "number")
-          await accountUsage(sessionID, tokens);
+          await accountUsage(sessionID, tokens, { cumulative: true, source: "v2.session" });
         return;
       }
     }
@@ -2913,7 +3048,7 @@ function goalToolsV2(services) {
     },
     {
       name: "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. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
+      description: "Create a goal only when explicitly requested by the user or system/developer instructions; do not infer goals from ordinary tasks. If any non-closed goal exists, this returns the existing goal as either reused or conflicting and must not be retried. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
       input: v2ObjectSchema({
         objective: { type: "string", minLength: 1, maxLength: 4000, description: "The concrete objective to start pursuing." },
         token_budget: { type: ["integer", "null"], minimum: 1, description: "Optional positive token budget." },
@@ -2927,7 +3062,7 @@ function goalToolsV2(services) {
     },
     {
       name: "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. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
+      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. If any non-closed goal exists, this returns the existing goal as either reused or conflicting and must not be retried. While the session is in Plan mode, the goal is recorded as paused and execution requires the user to switch to Build mode.",
       input: v2ObjectSchema({
         objective: {
           type: "string",

package/package.json

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