@prevalentware/opencode-goal-plugin 0.1.52 → 0.1.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prevalentware/opencode-goal-plugin",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "OpenCode goal plugin that adds Codex-style long-running goal mode, /goal commands, persistence, and TUI status for AI coding agents.",
   "keywords": [
     "opencode",
@@ -40,6 +40,7 @@
     "dist",
     "src/tui.ts",
     "src/i18n.ts",
+    "src/state-path.ts",
     "LICENSE",
     "README.md"
   ],

package/src/i18n.ts

@@ -20,6 +20,8 @@ export type GoalMessages = {
     updateGoalObjective: string
     updateGoal: string
     updateGoalStatus: string
+    stopGoal: string
+    replaceGoal: string
     clearGoal: string
     objective: string
     modelObjective: string
@@ -123,7 +125,15 @@ const EN_MESSAGES: GoalMessages = {
     updateGoalStatus:
       "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.",
-    clearGoal: "Clear the current OpenCode goal for this session when the user explicitly asks to clear it.",
+    stopGoal:
+      "Cancel the current OpenCode goal when the user explicitly asks to stop or cancel it. Cancellation is terminal " +
+      "and prevents further autonomous continuation while preserving the goal and its history.",
+    replaceGoal:
+      "Atomically cancel and archive the current goal, then create a new independent goal in the same session. Use only " +
+      "when the user explicitly asks to replace the goal.",
+    clearGoal:
+      "Detach the current OpenCode goal from this session when the user explicitly asks to clear it. The goal is " +
+      "archived instead of deleted; an active goal is cancelled before it is cleared.",
     objective: "The concrete objective to start pursuing.",
     modelObjective: "The model-formulated concrete objective to start pursuing.",
     updatedObjective: "The updated concrete objective.",
@@ -232,7 +242,9 @@ const ZH_CN_MESSAGES: GoalMessages = {
       "只有在依据真实证据完成审计后才能关闭现有目标。仅当目标已经达成且没有剩余必需工作时使用 complete，并提供证据；仅当目标无法达成或被阻塞时使用 unmet，并提供阻塞原因。不要仅因为准备停止工作就关闭目标。",
     updateGoalStatus:
       "仅当用户明确要求暂停或继续目标时，暂停或继续当前 OpenCode 目标。在 Plan 模式下不能继续目标；用户必须先切换到 Build 模式。",
-    clearGoal: "仅当用户明确要求清除目标时，清除当前 OpenCode 会话的目标。",
+    stopGoal: "仅当用户明确要求停止或取消目标时，取消当前 OpenCode 目标。取消是终态，会阻止后续自动继续，并保留目标及其历史。",
+    replaceGoal: "仅当用户明确要求替换目标时，原子地取消并归档当前目标，然后在同一会话中创建新的独立目标。",
+    clearGoal: "仅当用户明确要求清除目标时，将当前目标从会话中分离并归档；若目标仍在活动，会先取消再清除。",
     objective: "要开始执行的具体目标。",
     modelObjective: "由模型制定、要开始执行的具体目标。",
     updatedObjective: "更新后的具体目标。",
@@ -362,6 +374,7 @@ const STATUS_PRESENTATIONS: Record<GoalLocale, Record<string, string>> = {
     usageLimited: "usage limited",
     complete: "complete",
     unmet: "unmet",
+    cancelled: "cancelled",
   },
   "zh-CN": {
     active: "进行中",
@@ -370,6 +383,7 @@ const STATUS_PRESENTATIONS: Record<GoalLocale, Record<string, string>> = {
     usageLimited: "使用量已达上限",
     complete: "已完成",
     unmet: "未达成",
+    cancelled: "已取消",
   },
 }
 
@@ -388,6 +402,9 @@ export function presentGoalStopReason(reason: string, locale: GoalLocale): strin
   const direct: Record<string, string> = {
     paused: "已暂停",
     blocked: "已阻塞",
+    cancelled: "已取消",
+    cleared: "已清除",
+    replaced: "已替换",
     "plan mode": "Plan 模式",
     "no progress": "无进展",
     "auto-continue failures": "自动继续失败",
@@ -428,6 +445,8 @@ export function presentGoalLastStatus(status: string, locale: GoalLocale): strin
     "Goal paused.": "目标已暂停。",
     "Goal completed.": "目标已完成。",
     "Goal marked unmet.": "目标已标记为未达成。",
+    "Goal cancelled.": "目标已取消。",
+    "Goal cancelled because it was replaced.": "目标因被替换而取消。",
     "Auto-continue attempt canceled before delivery.": "自动继续尝试已在发送前取消。",
     "Auto-continue prompt sent.": "自动继续提示已发送。",
     "Auto-continue prompt failed repeatedly. Resume the goal to retry.": "自动继续提示反复失败。请继续目标后重试。",
@@ -468,6 +487,8 @@ const HISTORY_TYPE_PRESENTATIONS: Record<GoalLocale, Record<string, string>> = {
     resumed: "已继续",
     completed: "已完成",
     unmet: "未达成",
+    cancelled: "已取消",
+    cleared: "已清除",
     autoContinue: "自动继续",
     checkpoint: "检查点",
     warning: "警告",

package/src/state-path.ts

@@ -0,0 +1,10 @@
+import { homedir } from "node:os"
+import { join } from "node:path"
+
+export function statePath() {
+  if (process.env.OPENCODE_GOAL_STATE_PATH) return process.env.OPENCODE_GOAL_STATE_PATH
+  const dataHome =
+    process.env.XDG_DATA_HOME ||
+    (process.platform === "win32" && process.env.APPDATA ? process.env.APPDATA : join(homedir(), ".local", "share"))
+  return join(dataHome, "opencode-goal-plugin", "goals.json")
+}

package/src/tui.ts

@@ -3,8 +3,10 @@ import type { Plugin as TuiPluginV2 } from "@opencode/plugin/tui"
 import type { SessionMessageInfo } from "@opencode/client"
 import { createElement, insert, setProp } from "@opentui/solid"
 import { createEffect, createMemo, createSignal, onCleanup } from "solid-js"
+import { readFile, stat } from "node:fs/promises"
 import type { GoalMessages } from "./i18n"
 import { messagesFor, presentGoalLastStatus, presentGoalStatus, presentGoalStopReason, resolveLocale } from "./i18n"
+import { statePath } from "./state-path"
 
 type GoalCheckpoint = {
   summary: string
@@ -20,7 +22,7 @@ type GoalHistoryEntry = {
 type GoalSnapshot = {
   sessionID: string
   objective: string
-  status: "active" | "paused" | "budgetLimited" | "usageLimited" | "complete" | "unmet"
+  status: "active" | "paused" | "budgetLimited" | "usageLimited" | "complete" | "unmet" | "cancelled"
   tokenBudget: number | null
   tokensUsed: number
   timeUsedSeconds: number
@@ -95,6 +97,8 @@ const GOAL_TOOL_NAMES: readonly string[] = [
   "update_goal",
   "update_goal_objective",
   "update_goal_status",
+  "stop_goal",
+  "replace_goal",
   "clear_goal",
 ]
 
@@ -381,7 +385,7 @@ function isGoalSnapshot(value: unknown): value is GoalSnapshot {
   if (!isRecord(value)) return false
   if (typeof value.sessionID !== "string") return false
   if (typeof value.objective !== "string") return false
-  if (!["active", "paused", "budgetLimited", "usageLimited", "complete", "unmet"].includes(String(value.status))) return false
+  if (!["active", "paused", "budgetLimited", "usageLimited", "complete", "unmet", "cancelled"].includes(String(value.status))) return false
   if (value.tokenBudget !== null && typeof value.tokenBudget !== "number") return false
   if (typeof value.tokensUsed !== "number") return false
   if (typeof value.timeUsedSeconds !== "number") return false
@@ -411,6 +415,66 @@ function isGoalSnapshot(value: unknown): value is GoalSnapshot {
   return true
 }
 
+/** Read only the current session from the server's atomic state file. */
+export async function readPersistedGoal(sessionID: string): Promise<GoalSnapshot | null | undefined> {
+  try {
+    const state: unknown = JSON.parse(await readFile(statePath(), "utf8"))
+    if (!isRecord(state) || (state.version !== 1 && state.version !== 2) || !isRecord(state.goals)) return undefined
+    const stored = state.goals[sessionID]
+    if (stored === undefined) return null
+    if (!isRecord(stored) || stored.sessionID !== sessionID) return undefined
+    const sampledAt = currentEpochSeconds()
+    const timeUsedSeconds = typeof stored.timeUsedSeconds === "number" ? stored.timeUsedSeconds : 0
+    const activeSeconds = stored.status === "active" && typeof stored.lastAccountedAt === "number"
+      ? Math.max(0, sampledAt - stored.lastAccountedAt)
+      : 0
+    const tokenBudget = stored.tokenBudget
+    const tokensUsed = stored.tokensUsed
+    const snapshot = {
+      ...stored,
+      timeUsedSeconds: timeUsedSeconds + activeSeconds,
+      sampledAt,
+      remainingTokens: typeof tokenBudget === "number" && typeof tokensUsed === "number"
+        ? Math.max(0, tokenBudget - tokensUsed)
+        : null,
+    }
+    return isGoalSnapshot(snapshot) ? snapshot : undefined
+  } catch {
+    // Keep the last valid snapshot when the file is unavailable or incomplete.
+    return undefined
+  }
+}
+
+function usePersistedGoal(sessionID: string) {
+  const [persisted, setPersisted] = createSignal<GoalSnapshot | null | undefined>(undefined)
+  let disposed = false
+  let reading = false
+  let lastFile: { ino: number; mtimeMs: number; size: number } | undefined
+  const refresh = async () => {
+    if (reading) return
+    reading = true
+    try {
+      const file = await stat(statePath())
+      if (lastFile && lastFile.ino === file.ino && lastFile.mtimeMs === file.mtimeMs && lastFile.size === file.size) return
+      const next = await readPersistedGoal(sessionID)
+      if (next === undefined) return
+      lastFile = { ino: file.ino, mtimeMs: file.mtimeMs, size: file.size }
+      if (!disposed && (next !== null || persisted() !== undefined)) setPersisted(() => next)
+    } catch {
+      // Missing or unreadable state leaves the last valid view in place.
+    } finally {
+      reading = false
+    }
+  }
+  void refresh()
+  const timer = setInterval(() => void refresh(), 1000)
+  onCleanup(() => {
+    disposed = true
+    clearInterval(timer)
+  })
+  return persisted
+}
+
 function parseGoalToolOutput(part: GoalToolPart): GoalSnapshot | null | undefined {
   if (part.type !== "tool") return undefined
   if (!GOAL_TOOL_NAMES.includes(part.tool ?? "")) return undefined
@@ -472,39 +536,50 @@ export function formatGoal(goal: GoalSnapshot | null, messages: GoalMessages, lo
 function GoalSidebar(api: TuiPluginApi, messages: GoalMessages, locale: ReturnType<typeof resolveLocale>, sessionID: string) {
   const theme = api.theme.current
   const state = goalStateFromSession(api, sessionID)
-  const goal = state.goal
-  if (!goal) return null
-  if (goal.status === "complete" || goal.status === "unmet") {
-    const elapsed = liveTimeUsedSeconds(goal)
-    const label = goal.status === "complete" ? messages.tui.achieved : messages.tui.unmet
-    return text({ fg: goal.status === "complete" ? theme.primary : theme.textMuted }, [
-      `${label} (${formatDurationBadge(elapsed)})`,
-    ])
-  }
+  if (!state.goal) return null
+  const persisted = usePersistedGoal(sessionID)
+  const goal = createMemo(() => {
+    const live = persisted()
+    if (live === undefined) return state.goal
+    if (live && state.goal && (state.goal.createdAt > live.createdAt || state.goal.updatedAt > live.updatedAt)) return state.goal
+    return live
+  })
   const [nowSeconds, setNowSeconds] = createSignal(currentEpochSeconds())
-  if (goal.status === "active") {
+  const active = createMemo(() => goal()?.status === "active")
+  createEffect(() => {
+    if (!active()) return
     const timer = setInterval(() => setNowSeconds(currentEpochSeconds()), 1000)
     onCleanup(() => clearInterval(timer))
-  }
-  return box({}, [
-    text({ fg: theme.text }, [messages.tui.title]),
-    text({ fg: theme.textMuted }, [`${messages.tui.status}: ${presentGoalStatus(goal.status, locale)}`]),
-    text({ fg: theme.textMuted }, [() => `${messages.tui.time}: ${formatDuration(liveTimeUsedSeconds(goal, nowSeconds()))}`]),
-    text({ fg: theme.textMuted }, [
-      `${messages.tui.tokens}: ${goal.tokensUsed}${goal.tokenBudget == null ? "" : `/${goal.tokenBudget}`}`,
-    ]),
-    text({ fg: theme.textMuted }, [
-      `${messages.tui.autoContinues}: ${goal.autoTurns}${goal.maxAutoTurns == null ? "" : `/${goal.maxAutoTurns}`}`,
-    ]),
-    ...(goal.lastCheckpoint
-      ? [text({ fg: theme.textMuted }, [`${messages.tui.checkpoint}: ${goal.lastCheckpoint.summary}`])]
-      : []),
-    ...(goal.stopReason
-      ? [text({ fg: theme.textMuted }, [`${messages.tui.stop}: ${presentGoalStopReason(goal.stopReason, locale)}`])]
-      : []),
-    ...(goal.lastStatus ? [text({ fg: theme.textMuted }, [presentGoalLastStatus(goal.lastStatus, locale)])] : []),
-    text({ fg: theme.textMuted }, [goal.objective]),
-  ])
+  })
+  return box({}, [() => {
+    const snapshot = goal()
+    if (!snapshot) return null
+    if (snapshot.status === "complete" || snapshot.status === "unmet") {
+      const elapsed = liveTimeUsedSeconds(snapshot)
+      return text({ fg: snapshot.status === "complete" ? theme.primary : theme.textMuted }, [
+        `${snapshot.status === "complete" ? messages.tui.achieved : messages.tui.unmet} (${formatDurationBadge(elapsed)})`,
+      ])
+    }
+    return box({}, [
+      text({ fg: theme.text }, [messages.tui.title]),
+      text({ fg: theme.textMuted }, [`${messages.tui.status}: ${presentGoalStatus(snapshot.status, locale)}`]),
+      text({ fg: theme.textMuted }, [`${messages.tui.time}: ${formatDuration(liveTimeUsedSeconds(snapshot, nowSeconds()))}`]),
+      text({ fg: theme.textMuted }, [
+        `${messages.tui.tokens}: ${snapshot.tokensUsed}${snapshot.tokenBudget == null ? "" : `/${snapshot.tokenBudget}`}`,
+      ]),
+      text({ fg: theme.textMuted }, [
+        `${messages.tui.autoContinues}: ${snapshot.autoTurns}${snapshot.maxAutoTurns == null ? "" : `/${snapshot.maxAutoTurns}`}`,
+      ]),
+      ...(snapshot.lastCheckpoint
+        ? [text({ fg: theme.textMuted }, [`${messages.tui.checkpoint}: ${snapshot.lastCheckpoint.summary}`])]
+        : []),
+      ...(snapshot.stopReason
+        ? [text({ fg: theme.textMuted }, [`${messages.tui.stop}: ${presentGoalStopReason(snapshot.stopReason, locale)}`])]
+        : []),
+      ...(snapshot.lastStatus ? [text({ fg: theme.textMuted }, [presentGoalLastStatus(snapshot.lastStatus, locale)])] : []),
+      text({ fg: theme.textMuted }, [snapshot.objective]),
+    ])
+  }])
 }
 
 function registerGoalCommand(api: TuiPluginApi, command: TuiCommand) {
@@ -655,8 +730,16 @@ function GoalSidebarV2(
   const [cache, setCache] = api.storage.memory<{ goal: GoalSnapshot | null }>(`goal-mode.v2.${sessionID}`, {
     initial: { goal: null },
   })
+  const persisted = usePersistedGoal(sessionID)
+  const messageGoal = createMemo(() => goalFromV2Messages(api.data.session.message.list(sessionID)))
   const goal = createMemo<GoalSnapshot | null>(() => {
-    const found = goalFromV2Messages(api.data.session.message.list(sessionID))
+    const found = messageGoal()
+    if (found === null) return null
+    const live = persisted()
+    if (live !== undefined) {
+      if (found && live && (found.createdAt > live.createdAt || found.updatedAt > live.updatedAt)) return found
+      return live
+    }
     return found === undefined ? cache.goal : found
   })
   createEffect(() =>
@@ -666,8 +749,9 @@ function GoalSidebarV2(
   )
 
   const [nowSeconds, setNowSeconds] = createSignal(currentEpochSeconds())
+  const active = createMemo(() => goal()?.status === "active")
   createEffect(() => {
-    if (goal()?.status !== "active") return
+    if (!active()) return
     const timer = setInterval(() => setNowSeconds(currentEpochSeconds()), 1000)
     onCleanup(() => clearInterval(timer))
   })