fix: goal can resuem by /resume

问题根源：Goal 状态只存储在 AppState.goal（内存）中，会话重启时内存丢失。

解决方案：把 Goal 状态持久化到 JSONL transcript 中，resume 时恢复。

改动的文件

src/types/logs.ts
- 新增 GoalEntry 类型（包含 type: 'goal'、所有 Goal 字段）
- GoalEntry 加入 Entry 联合类型
- LogOption 新增 goal?: GoalEntry 字段

src/utils/sessionStorage.ts
- METADATA_TYPE_MARKERS 数组加入 'type:goal'（支持预-compact 边界扫描时恢复）
- Project 类新增 currentSessionGoal: GoalEntry | undefined 缓存
- reAppendSessionMetadata() 中 re-append currentSessionGoal（session 退出时重写最新状态）
- restoreSessionMetadata() 新增 goal?: GoalEntry 参数，会写到 currentSessionGoal 缓存
- appendEntry() 中的 type === 'goal' 分支（不需要，已由 saveGoal 直接写）
- 新增 saveGoal(goal: GoalEntry) 函数：立即写入 transcript + 缓存
- 新增 clearGoal() 函数：清空缓存（用于 /goal clear）
- loadTranscriptFile() 解析 goal 条目，返回值加入 goal
- loadFullLog、getLastSessionLog、loadAllLogsFromSessionFile、loadTranscriptFromFile 均透传 goal

src/utils/conversationRecovery.ts
- loadConversationForResume 返回值新增 goal?: GoalEntry

src/utils/sessionRestore.ts
- ResumeLoadResult 新增 goal?: GoalEntry
- ProcessedResume 中的 initialState 展开时包含 ...(result.goal && { goal: result.goal })

src/commands/goal/goal.tsx
- setGoal 辅助函数：每次状态变更后调用 saveGoal / clearGoal

src/tools/GoalCreateTool/GoalCreateTool.ts
- 创建 goal 后调用 saveGoal

src/tools/GoalUpdateTool/GoalUpdateTool.ts
- 更新 goal 后调用 saveGoal

src/commands/goal/goal.tsx

@@ -11,6 +11,7 @@ import {
   formatGoalStatus,
   isGoalContinuationPrompt,
 } from '../../utils/goal.js'
+import { clearGoal, saveGoal } from '../../utils/sessionStorage.js'
 import { enqueue, removeByFilter } from '../../utils/messageQueueManager.js'
 import { renderToString } from '../../utils/staticRender.js'
 
@@ -147,7 +148,15 @@ function setGoal(
   setAppState: LocalJSXCommandContext['setAppState'],
   updater: (prev: Goal | undefined) => Goal | undefined,
 ): void {
-  setAppState((prev: AppState) => ({ ...prev, goal: updater(prev.goal) } satisfies AppState))
+  setAppState((prev: AppState) => {
+    const newGoal = updater(prev.goal)
+    if (newGoal) {
+      saveGoal({ type: 'goal', ...newGoal })
+    } else {
+      clearGoal()
+    }
+    return { ...prev, goal: newGoal } satisfies AppState
+  })
 }
 
 function clearQueuedGoalContinuations(): void {

src/tools/GoalCreateTool/GoalCreateTool.ts

@@ -9,6 +9,9 @@ import {
   formatGoalStatus,
   isGoalInactive,
 } from '../../utils/goal.js'
+import {
+  saveGoal,
+} from '../../utils/sessionStorage.js'
 import {
   CREATE_GOAL_TOOL_NAME,
   CREATE_GOAL_TOOL_PROMPT,
@@ -103,6 +106,17 @@ export const GoalCreateTool = buildTool({
         lastUpdatedAt: now,
       },
     }))
+    saveGoal({
+      type: 'goal',
+      id: goalId,
+      objective: objective.trim(),
+      status: 'pursuing',
+      startedAt: now,
+      startCostUSD: getTotalCost(),
+      startTokensUsed: getTotalTokensUsed(),
+      continuationCount: 0,
+      lastUpdatedAt: now,
+    })
 
     return {
       data: {

src/tools/GoalUpdateTool/GoalUpdateTool.ts

@@ -2,6 +2,7 @@ import { z } from 'zod'
 import { buildTool, type ToolDef } from '../../Tool.js'
 import { lazySchema } from '../../utils/lazySchema.js'
 import { jsonStringify } from '../../utils/slowOperations.js'
+import { saveGoal } from '../../utils/sessionStorage.js'
 import {
   DESCRIPTION,
   UPDATE_GOAL_TOOL_NAME,
@@ -103,13 +104,13 @@ export const GoalUpdateTool = buildTool({
     }
 
     const now = Date.now()
-    let updated = false
 
     const internalStatus =
       status === 'complete'
         ? ('achieved' as const)
         : ('blocked' as const)
 
+    let updatedGoal: typeof goal | null = null
     setAppState(prev => {
       const current = prev.goal
       if (
@@ -119,19 +120,19 @@ export const GoalUpdateTool = buildTool({
       ) {
         return prev
       }
-      updated = true
+      updatedGoal = {
+        ...current,
+        status: internalStatus,
+        lastReason: reason,
+        lastUpdatedAt: now,
+      }
       return {
         ...prev,
-        goal: {
-          ...current,
-          status: internalStatus,
-          lastReason: reason,
-          lastUpdatedAt: now,
-        },
+        goal: updatedGoal,
       }
     })
 
-    if (!updated) {
+    if (!updatedGoal) {
       return {
         data: {
           status: 'stale-goal' as const,
@@ -142,6 +143,11 @@ export const GoalUpdateTool = buildTool({
       }
     }
 
+    saveGoal({
+      type: 'goal',
+      ...updatedGoal,
+    })
+
     return {
       data: {
         status,

src/types/logs.ts

@@ -50,6 +50,7 @@ export type LogOption = {
   mode?: 'coordinator' | 'normal' // Session mode for coordinator/normal detection
   worktreeSession?: PersistedWorktreeSession | null // Worktree state at session end (null = exited, undefined = never entered)
   contentReplacements?: ContentReplacementRecord[] // Replacement decisions for resume reconstruction
+  goal?: GoalEntry // /goal state for session resume
 }
 
 export type SummaryMessage = {
@@ -84,6 +85,27 @@ export type LastPromptMessage = {
   lastPrompt: string
 }
 
+/** /goal state persisted to the transcript for resume. Last-wins. */
+export type GoalEntry = {
+  type: 'goal'
+  sessionId: UUID
+  id: string
+  objective: string
+  status:
+    | 'pursuing'
+    | 'paused'
+    | 'achieved'
+    | 'blocked'
+    | 'usage-limited'
+    | 'budget-limited'
+  startedAt: number
+  startCostUSD: number
+  startTokensUsed: number
+  continuationCount: number
+  lastReason?: string
+  lastUpdatedAt: number
+}
+
 /**
  * Periodic fork-generated summary of what the agent is currently doing.
  * Written every min(5 steps, 2min) by forking the main thread mid-turn so
@@ -315,6 +337,7 @@ export type Entry =
   | ContentReplacementEntry
   | ContextCollapseCommitEntry
   | ContextCollapseSnapshotEntry
+  | GoalEntry
 
 export function sortLogs(logs: LogOption[]): LogOption[] {
   return logs.sort((a, b) => {

src/utils/conversationRecovery.ts

@@ -8,6 +8,7 @@ import type {
   AttributionSnapshotMessage,
   ContextCollapseCommitEntry,
   ContextCollapseSnapshotEntry,
+  GoalEntry,
   LogOption,
   PersistedWorktreeSession,
   SerializedMessage,
@@ -478,6 +479,7 @@ export async function loadConversationForResume(
   prRepository?: string
   // Full path to the session file (for cross-directory resume)
   fullPath?: string
+  goal?: GoalEntry
 } | null> {
   try {
     let log: LogOption | null = null
@@ -589,6 +591,7 @@ export async function loadConversationForResume(
       prRepository: log?.prRepository,
       // Include full path for cross-directory resume
       fullPath: log?.fullPath,
+      goal: log?.goal,
     }
   } catch (error) {
     logError(error as Error)

src/utils/sessionRestore.ts

@@ -25,6 +25,7 @@ import type {
   AttributionSnapshotMessage,
   ContextCollapseCommitEntry,
   ContextCollapseSnapshotEntry,
+  GoalEntry,
   PersistedWorktreeSession,
 } from '../types/logs.js'
 import type { Message } from '../types/message.js'
@@ -312,6 +313,7 @@ type ResumeLoadResult = {
   prNumber?: number
   prUrl?: string
   prRepository?: string
+  goal?: GoalEntry
 }
 
 /**
@@ -546,6 +548,7 @@ export async function processResumedConversation(
       ...(restoredAttribution && { attribution: restoredAttribution }),
       ...(standaloneAgentContext && { standaloneAgentContext }),
       agentDefinitions: refreshedAgentDefs,
+      ...(result.goal && { goal: result.goal }),
     },
   }
 }

src/utils/sessionStorage.ts

@@ -41,7 +41,7 @@ import {
   asSessionId,
   type SessionId,
 } from '../types/ids.js'
-import type { AttributionSnapshotMessage } from '../types/logs.js'
+import type { AttributionSnapshotMessage, GoalEntry } from '../types/logs.js'
 import {
   type ContentReplacementEntry,
   type ContextCollapseCommitEntry,
@@ -545,6 +545,8 @@ class Project {
   currentSessionPrNumber: number | undefined
   currentSessionPrUrl: string | undefined
   currentSessionPrRepository: string | undefined
+  // /goal state — re-appended on exit so --resume restores it
+  currentSessionGoal: GoalEntry | undefined
 
   sessionFile: string | null = null
   // Entries buffered while sessionFile is null. Flushed by materializeSessionFile
@@ -836,6 +838,12 @@ class Project {
         timestamp: new Date().toISOString(),
       })
     }
+    if (this.currentSessionGoal) {
+      appendEntryToFile(this.sessionFile, {
+        ...this.currentSessionGoal,
+        sessionId,
+      })
+    }
   }
 
   async flush(): Promise<void> {
@@ -2307,6 +2315,7 @@ export async function loadTranscriptFromFile(
       leafUuids,
       contentReplacements,
       worktreeStates,
+      goal,
     } = await loadTranscriptFile(filePath)
 
     if (messages.size === 0) {
@@ -2352,6 +2361,7 @@ export async function loadTranscriptFromFile(
       worktreeSession: worktreeStates.has(sessionId)
         ? worktreeStates.get(sessionId)
         : undefined,
+      goal,
     }
   }
 
@@ -2766,6 +2776,7 @@ export function restoreSessionMetadata(meta: {
   prNumber?: number
   prUrl?: string
   prRepository?: string
+  goal?: GoalEntry
 }): void {
   const project = getProject()
   // ??= so --name (cacheSessionTitle) wins over the resumed
@@ -2782,6 +2793,7 @@ export function restoreSessionMetadata(meta: {
     project.currentSessionPrNumber = meta.prNumber
   if (meta.prUrl) project.currentSessionPrUrl = meta.prUrl
   if (meta.prRepository) project.currentSessionPrRepository = meta.prRepository
+  if (meta.goal) project.currentSessionGoal = meta.goal
 }
 
 /**
@@ -2919,6 +2931,34 @@ export function saveWorktreeState(
   }
 }
 
+/**
+ * Persist /goal state to the transcript for --resume.
+ * Written eagerly on every goal change so the transcript always reflects
+ * the latest state. Last-wins on restore — the freshest entry wins.
+ */
+export function saveGoal(goal: GoalEntry): void {
+  const project = getProject()
+  project.currentSessionGoal = goal
+  // Write immediately so the transcript reflects the latest state at all times.
+  // reAppendSessionMetadata also re-appends on exit, but without an immediate
+  // write a crash after goal change but before exit would lose the update.
+  if (project.sessionFile) {
+    appendEntryToFile(project.sessionFile, {
+      ...goal,
+      sessionId: getSessionId(),
+    })
+  }
+}
+
+/**
+ * Clear the cached goal state. Called when /goal clear removes the goal,
+ * or when restoreSessionMetadata runs for a session that had no goal.
+ */
+export function clearGoal(): void {
+  const project = getProject()
+  project.currentSessionGoal = undefined
+}
+
 /**
  * Extracts the session ID from a log.
  * For lite logs, uses the sessionId field directly.
@@ -2978,6 +3018,7 @@ export async function loadFullLog(log: LogOption): Promise<LogOption> {
       contextCollapseCommits,
       contextCollapseSnapshot,
       leafUuids,
+      goal,
     } = await loadTranscriptFile(sessionFile)
 
     if (messages.size === 0) {
@@ -3048,6 +3089,7 @@ export async function loadFullLog(log: LogOption): Promise<LogOption> {
         sessionId && contextCollapseSnapshot?.sessionId === sessionId
           ? contextCollapseSnapshot
           : undefined,
+      goal,
     }
   } catch {
     // If loading fails, return the original log
@@ -3120,6 +3162,7 @@ const METADATA_TYPE_MARKERS = [
   '"type":"mode"',
   '"type":"worktree-state"',
   '"type":"pr-link"',
+  '"type":"goal"',
 ]
 const METADATA_MARKER_BUFS = METADATA_TYPE_MARKERS.map(m => Buffer.from(m))
 // Longest marker is 22 bytes; +1 for leading `{` = 23.
@@ -3492,6 +3535,8 @@ export async function loadTranscriptFile(
   contextCollapseCommits: ContextCollapseCommitEntry[]
   contextCollapseSnapshot: ContextCollapseSnapshotEntry | undefined
   leafUuids: Set<UUID>
+  /** Last-wins goal entry for this session */
+  goal?: GoalEntry
 }> {
   const messages = new Map<UUID, TranscriptMessage>()
   const summaries = new Map<UUID, string>()
@@ -3516,6 +3561,8 @@ export async function loadTranscriptFile(
   const contextCollapseCommits: ContextCollapseCommitEntry[] = []
   // Last-wins — later entries supersede.
   let contextCollapseSnapshot: ContextCollapseSnapshotEntry | undefined
+  // Last-wins — later goal entries supersede.
+  let goal: GoalEntry | undefined
 
   try {
     // For large transcripts, avoid materializing megabytes of stale content.
@@ -3607,6 +3654,8 @@ export async function loadTranscriptFile(
           prNumbers.set(entry.sessionId, entry.prNumber)
           prUrls.set(entry.sessionId, entry.prUrl)
           prRepositories.set(entry.sessionId, entry.prRepository)
+        } else if (entry.type === 'goal' && entry.sessionId) {
+          goal = entry
         }
       }
     }
@@ -3675,6 +3724,8 @@ export async function loadTranscriptFile(
         prNumbers.set(entry.sessionId, entry.prNumber)
         prUrls.set(entry.sessionId, entry.prUrl)
         prRepositories.set(entry.sessionId, entry.prRepository)
+      } else if (entry.type === 'goal' && entry.sessionId) {
+        goal = entry
       } else if (entry.type === 'file-history-snapshot') {
         fileHistorySnapshots.set(entry.messageId, entry)
       } else if (entry.type === 'attribution-snapshot') {
@@ -3809,6 +3860,7 @@ export async function loadTranscriptFile(
     contextCollapseCommits,
     contextCollapseSnapshot,
     leafUuids,
+    goal,
   }
 }
 
@@ -3827,6 +3879,7 @@ async function loadSessionFile(sessionId: UUID): Promise<{
   contentReplacements: Map<UUID, ContentReplacementRecord[]>
   contextCollapseCommits: ContextCollapseCommitEntry[]
   contextCollapseSnapshot: ContextCollapseSnapshotEntry | undefined
+  goal?: GoalEntry
 }> {
   const sessionFile = join(
     getSessionProjectDir() ?? getProjectDir(getOriginalCwd()),
@@ -3882,6 +3935,7 @@ export async function getLastSessionLog(
     contentReplacements,
     contextCollapseCommits,
     contextCollapseSnapshot,
+    goal,
   } = await loadSessionFile(sessionId)
   if (messages.size === 0) return null
   // Prime getSessionMessages cache so recordTranscript (called after REPL
@@ -3928,6 +3982,7 @@ export async function getLastSessionLog(
       contextCollapseSnapshot?.sessionId === sessionId
         ? contextCollapseSnapshot
         : undefined,
+    goal,
   }
 }
 
@@ -4615,6 +4670,7 @@ export async function loadAllLogsFromSessionFile(
     attributionSnapshots,
     contentReplacements,
     leafUuids,
+    goal,
   } = await loadTranscriptFile(sessionFile, { keepAllLeaves: true })
 
   if (messages.size === 0) return []
@@ -4687,6 +4743,7 @@ export async function loadAllLogsFromSessionFile(
         chain,
       ),
       contentReplacements: contentReplacements.get(sessionId) ?? [],
+      goal,
     })
   }