@devcxl/opencode-cabbage 1.3.0 → 2.0.0

package/dist/plugin/continuation.js

@@ -0,0 +1,233 @@
+import { MAX_CONTINUATIONS, budgetReached, continuationPrompt, formatGoal, isBlockedReport, isDoneReport, mutateGoal, normalizeProfileModel, snapshotTokenTotal, } from "./goal.js";
+import { consumeAborted } from "./session-abort.js";
+import { readIndex, updateFlowSession, removeFlowSession } from "../kernel/session-index.js";
+import { getContextBlock, formatContextBlock } from "../kernel/context.js";
+const continuationInFlight = new Set();
+const COMPACTION_THRESHOLD = 20;
+/** autoResume 跳过窗口：索引 30s 内更新过续接的 flow 不恢复（可能刚续接过，立即恢复会双发） */
+const AUTO_RESUME_SKIP_WINDOW_MS = 30_000;
+/**
+ * 子会话活动跟踪（V2 无 session.list/children 查询 API，改用事件溯源）：
+ * - session.created（带 parentID）建立父子关系
+ * - execution.started / retry.scheduled → busy；execution.succeeded/failed/interrupted → idle
+ *
+ * 局限：重启后内存清空，重启瞬间仍在运行且未再发事件的子会话不被识别（窗口小，可接受；
+ * 子代理结果注入父会话会重新触发事件流）。V1 依赖实时查询，此为 V2 的降级替代。
+ */
+export class SessionActivityTracker {
+    parentOf = new Map();
+    busy = new Set();
+    onCreated(sessionID, parentID) {
+        if (parentID)
+            this.parentOf.set(sessionID, parentID);
+    }
+    onBusy(sessionID) {
+        this.busy.add(sessionID);
+    }
+    onIdle(sessionID) {
+        this.busy.delete(sessionID);
+    }
+    hasWorkingChildren(sessionID) {
+        for (const [child, parent] of this.parentOf) {
+            if (parent === sessionID && this.busy.has(child))
+                return true;
+        }
+        return false;
+    }
+}
+/** 续接前注入会话快照的 agent/模型，防回落默认值（switch 为幂等调用） */
+async function restoreSessionProfile(ctx, sessionID, profile) {
+    if (profile?.agent) {
+        await ctx.session.switchAgent({ sessionID, agent: profile.agent }).catch((error) => {
+            console.warn("[cabbage] switchAgent failed:", error?.message ?? error);
+        });
+    }
+    const model = normalizeProfileModel(profile?.model);
+    if (model) {
+        await ctx.session.switchModel({ sessionID, model }).catch((error) => {
+            console.warn("[cabbage] switchModel failed:", error?.message ?? error);
+        });
+    }
+}
+export async function queueContinuation(ctx, store, sessionID, projectDir, tracker) {
+    if (continuationInFlight.has(sessionID))
+        return;
+    continuationInFlight.add(sessionID);
+    try {
+        const decision = await mutateGoal(store, sessionID, async (goal) => {
+            // 读改写与事件处理同锁串行，杜绝续接计数/状态被并发覆盖
+            if (!goal || goal.status !== "active")
+                return { goal, value: null };
+            await updateFlowSession(projectDir, goal.parentIssueNumber, { status: goal.status, continuationCount: goal.continuationCount }).catch(() => undefined);
+            if (consumeAborted(sessionID)) {
+                goal.status = "paused";
+                goal.statusReason = "aborted by user";
+                await updateFlowSession(projectDir, goal.parentIssueNumber, { status: "paused" }).catch(() => undefined);
+                return { goal, value: null };
+            }
+            if (goal.continuationCount >= MAX_CONTINUATIONS) {
+                goal.status = "paused";
+                await updateFlowSession(projectDir, goal.parentIssueNumber, { status: "paused" }).catch(() => undefined);
+                return { goal, value: null };
+            }
+            // 子会话活动闸：后台 subagent 仍 busy 时跳过续接（父会话轮次结束不代表任务静默）
+            if (tracker.hasWorkingChildren(sessionID)) {
+                return { goal, value: null };
+            }
+            // 尾部静默检查：轮次结束后仍可能有新 user 消息在途或 synthetic 尚未消费。
+            // 最后一条是 user/synthetic、或最后 assistant 未完成（无 completed 时间）→ 跳过，
+            // 等这些消息各自触发的新轮次结束事件重新驱动续接。
+            const messages = await store.context(sessionID);
+            if (!messages || messages.length === 0)
+                return { goal, value: null };
+            const lastMessage = messages[messages.length - 1];
+            if (lastMessage?.type === "user" || lastMessage?.type === "synthetic")
+                return { goal, value: null };
+            let lastAssistant = null;
+            for (let i = messages.length - 1; i >= 0; i -= 1) {
+                if (messages[i]?.type === "assistant") {
+                    lastAssistant = messages[i];
+                    break;
+                }
+            }
+            if (!lastAssistant)
+                return { goal, value: null };
+            const completed = lastAssistant.time?.completed;
+            if (!(typeof completed === "number" && completed > 0))
+                return { goal, value: null };
+            // [BLOCKED:] 阻塞报告 / [DONE:] 完成报告：agent 明确信号 → 暂停 goal 请用户/验证介入
+            // （防空转烧 token；完成报告后应由 dev-lifecycle 派 goal-verify 做最终独立验证）。
+            // resume 后首次 tick 豁免（statusReason='resumed' 被消费清除），
+            // 否则 resume 会立即被上一轮旧报告再次暂停成死路。
+            const assistantText = (lastAssistant.content ?? [])
+                .filter((part) => part?.type === "text" && typeof part.text === "string")
+                .map((part) => part.text)
+                .join("\n");
+            const agentSignaled = isBlockedReport(assistantText) || isDoneReport(assistantText);
+            if (agentSignaled) {
+                if (goal.statusReason === "resumed") {
+                    goal.statusReason = "";
+                }
+                else {
+                    goal.status = "paused";
+                    goal.statusReason = isBlockedReport(assistantText) ? "blocked report" : "done report";
+                    await updateFlowSession(projectDir, goal.parentIssueNumber, { status: "paused" }).catch(() => undefined);
+                    return { goal, value: null };
+                }
+            }
+            else if (goal.statusReason === "resumed") {
+                // 豁免消费：resume 后的首次 tick 无论是否命中信号都清除 kickoff 标记。
+                // 若不消费，首 tick 正常推进后 statusReason 残留，后续真实信号会被误豁免一次。
+                goal.statusReason = "";
+            }
+            // Token 记账（会话累计快照）：used = 当前会话累计 − create 基线，单调不减。
+            // cache.read 已含此前轮次付费 token，compaction 不做分段（预算为护栏非账单）。
+            const tokensBaseline = goal.tokensBaseline ?? 0;
+            const tokensUsed = Math.max(goal.tokensUsed ?? 0, Math.max(0, snapshotTokenTotal(await store.sessionTokens(sessionID)) - tokensBaseline));
+            goal.tokensBaseline = tokensBaseline;
+            goal.tokensUsed = tokensUsed;
+            // token 预算护栏：达限即暂停（用户需提高预算后 resume，护栏优先）
+            if (budgetReached(goal)) {
+                goal.status = "paused";
+                goal.statusReason = "token budget reached";
+                await updateFlowSession(projectDir, goal.parentIssueNumber, { status: "paused" }).catch(() => undefined);
+                return { goal, value: null };
+            }
+            // 先写计数后发 prompt：崩溃窗口只会"少发一次续接"（等下次轮次结束重试），
+            // 不会"prompt 已发但计数未落盘"导致重启 autoResume 双发。
+            goal.continuationCount++;
+            await updateFlowSession(projectDir, goal.parentIssueNumber, {
+                continuationCount: goal.continuationCount,
+                lastContinuedAt: Date.now(),
+            }).catch(() => undefined);
+            return { goal, value: { proceed: true, goal } };
+        });
+        if (!decision?.proceed || !decision.goal)
+            return;
+        // abort 二次检查：轮次结束事件与 abort 事件并发时，避免对已中断的会话发出续接
+        if (consumeAborted(sessionID)) {
+            await mutateGoal(store, sessionID, async (goal) => {
+                if (!goal)
+                    return { goal, value: null };
+                goal.status = "paused";
+                goal.continuationCount = Math.max(0, goal.continuationCount - 1);
+                await updateFlowSession(projectDir, goal.parentIssueNumber, { status: "paused" }).catch(() => undefined);
+                return { goal, value: null };
+            }).catch(() => undefined);
+            return;
+        }
+        // 每 20 次续接主动 compact 会话历史（原生压缩；失败不阻塞续接）
+        if (decision.goal.continuationCount > 0 && decision.goal.continuationCount % COMPACTION_THRESHOLD === 0) {
+            try {
+                await ctx.session.compact({ sessionID });
+            }
+            catch (err) {
+                console.warn("[cabbage] compaction failed:", err);
+            }
+        }
+        const contextBlock = await getContextBlock(projectDir);
+        const contextText = contextBlock ? `${formatContextBlock(contextBlock)}\n\n` : "";
+        try {
+            await restoreSessionProfile(ctx, sessionID, decision.goal.sessionProfile);
+            await ctx.session.synthetic({
+                sessionID,
+                text: contextText + continuationPrompt(decision.goal.parentIssueNumber),
+            });
+        }
+        catch (err) {
+            // 发送失败 → 回滚计数（尽力；回滚失败只会少一次续接，方向安全）
+            console.error("[cabbage] continuation prompt failed, rolling back counter:", err);
+            await mutateGoal(store, sessionID, async (goal) => {
+                if (!goal)
+                    return { goal, value: null };
+                goal.continuationCount = Math.max(0, goal.continuationCount - 1);
+                await updateFlowSession(projectDir, goal.parentIssueNumber, { continuationCount: goal.continuationCount }).catch(() => undefined);
+                return { goal, value: null };
+            }).catch(() => undefined);
+        }
+    }
+    catch (err) {
+        console.error("[cabbage] continuation failed:", err);
+    }
+    finally {
+        continuationInFlight.delete(sessionID);
+    }
+}
+export async function autoResume(ctx, store, projectDir) {
+    const index = await readIndex(projectDir);
+    for (const [parentIssueNumber, entry] of Object.entries(index.flows)) {
+        if (entry.status !== "active")
+            continue;
+        // 重启双发防护：仅跳过"最近实际续接过"的 flow（lastContinuedAt 在发送续接时写入）。
+        // 不用 updatedAt——它被 queueContinuation 开头的索引心跳无条件刷新，反映"最近轮次结束"，
+        // 崩溃前频繁结束的 flow 会被误跳过且无再武装（静默卡住）。
+        // 无 lastContinuedAt 的旧 entry 不跳过（兼容升级前索引）。跳过时告警保证可观测。
+        if (entry.lastContinuedAt && Date.now() - entry.lastContinuedAt < AUTO_RESUME_SKIP_WINDOW_MS) {
+            console.warn(`[cabbage] auto-resume: skip #${parentIssueNumber} (continued ${Math.round((Date.now() - entry.lastContinuedAt) / 1000)}s ago; next turn end re-arms)`);
+            continue;
+        }
+        const { goal } = await store.read(entry.sessionID);
+        // 索引一致性自愈：entry 指向的 goal 已是别的 Flow（edit 换 Flow 后旧 entry 残留/rebind 失败）→
+        // 删除陈旧 entry，防止每次重启对同一会话重复续接
+        if (goal && goal.parentIssueNumber !== Number(parentIssueNumber)) {
+            console.warn(`[cabbage] auto-resume: index #${parentIssueNumber} points to goal of Flow #${goal.parentIssueNumber}; removing stale entry`);
+            await removeFlowSession(projectDir, Number(parentIssueNumber));
+            continue;
+        }
+        if (!goal || goal.status !== "active") {
+            await updateFlowSession(projectDir, Number(parentIssueNumber), { status: "paused" });
+            continue;
+        }
+        try {
+            await restoreSessionProfile(ctx, entry.sessionID, goal.sessionProfile);
+            await ctx.session.synthetic({
+                sessionID: entry.sessionID,
+                text: `[auto-resume] Plugin restarted. Resuming previous goal:\n\n${formatGoal(goal)}\n\nContinue working.`,
+            });
+        }
+        catch (err) {
+            console.error("[cabbage] auto-resume failed:", err);
+        }
+    }
+}
+//# sourceMappingURL=continuation.js.map

package/dist/plugin/continuation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"continuation.js","sourceRoot":"","sources":["../../src/plugin/continuation.ts"],"names":[],"mappings":"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"}

package/dist/plugin/goal-store.d.ts

@@ -1,33 +1,52 @@
 import type { GoalData } from "./goal.js";
 /**
- * goal 存储抽象（V2 迁移解耦准备）。
+ * goal 存储抽象（OpenCode V2）。
  *
- * V1 实现 = session.metadata.goal（createMetadataGoalStore）。
- * V2 候选 = ctx.storage / 本地文件——切换时只替换实现，不改调用方。
- * 见 docs/dev/research/2026-08-31-opencode-v2-compat-spike.md §6.3.1。
+ * V2 实现 = 会话 metadata（ctx.session.get/update）；
+ * 消息面用 session.context 投影；记账快照用会话累计 tokens。
+ * read 的 fail-closed 语义（异常 → null）由实现保证，调用方依赖此兜底。
  */
-/** goal 宿主会话的最小面：goal 工具判定子会话（parentID）与元数据保留（write 全量替换）所需 */
+/** goal 宿主会话的最小面（V2 SessionInfo 子集） */
 export interface GoalSession {
     parentID: string | null;
     metadata: Record<string, unknown>;
-}
-/** 宽松消息面：记账与尾部检查的最小形状（V1 实现直接透传 SDK messages data，不做映射） */
-export interface GoalMessage {
-    info?: {
+    agent?: string | null;
+    model?: {
+        providerID?: string;
         id?: string;
-        role?: string;
-        time?: {
-            completed?: number;
-            created?: number;
-        } | null;
-        tokens?: unknown;
-        error?: unknown;
+        variant?: string;
+    } | null;
+    tokens?: unknown;
+}
+/** V2 消息投影的最小形状（session.context 返回值的子集） */
+export interface GoalContextMessage {
+    type?: string;
+    time?: {
+        completed?: number;
+        created?: number;
     } | null;
-    parts?: Array<{
+    content?: Array<{
         type?: string;
         text?: string;
     }>;
 }
+/**
+ * GoalStore V2 实现所需的 session 域最小面（ctx.session 的子集）。
+ * 参数/返回值放宽为 any：该接口是插件到存储的唯一适配边界，
+ * 内部做运行时形状校验后以强类型 GoalStore 暴露（避免把平台品牌类型渗入内核）。
+ */
+export interface GoalStoreSessionApi {
+    get(args: {
+        sessionID: string;
+    }): Promise<any>;
+    update(args: {
+        sessionID: string;
+        metadata: any;
+    }): Promise<any>;
+    context(args: {
+        sessionID: string;
+    }): Promise<any>;
+}
 /** goal 状态存储。read 的 fail-closed 语义（异常 → null）由实现保证，调用方依赖此兜底。 */
 export interface GoalStore {
     read(sessionID: string): Promise<{
@@ -36,36 +55,10 @@ export interface GoalStore {
     }>;
     /** 写 goal；null 表示删除。existingSession 复用 read 结果避免二次读取。 */
     write(sessionID: string, goal: GoalData | null, existingSession?: GoalSession | null): Promise<void>;
-    /** 最近消息（记账基线 + 续接尾部检查用）。data 非数组时返回 null（与 SDK 语义一致）。 */
-    messages(sessionID: string, limit: number): Promise<GoalMessage[] | null>;
-}
-/** GoalStore V1 实现所需的最小 SDK 客户端面（createOpencodeClient 返回类型的子集） */
-export interface GoalStoreClient {
-    session: {
-        get(args: {
-            sessionID: string;
-        }): Promise<{
-            data?: {
-                parentID?: string | null;
-                metadata?: Record<string, unknown>;
-            } | null;
-        }>;
-        update(args: {
-            sessionID: string;
-            metadata: Record<string, unknown>;
-        }): Promise<unknown>;
-        messages(args: {
-            sessionID: string;
-            limit?: number;
-        }): Promise<{
-            data?: GoalMessage[];
-        }>;
-    };
+    /** 会话消息投影（续接尾部检查与信号检测用）。异常/非数组时返回 null。 */
+    context(sessionID: string): Promise<GoalContextMessage[] | null>;
+    /** 会话累计 token 快照（预算护栏记账用）。异常时返回 null。 */
+    sessionTokens(sessionID: string): Promise<unknown | null>;
 }
-/** V1 实现：goal 持久化在 session metadata 的 goal 键；messages 直接透传 SDK 消息面 */
-export declare function createMetadataGoalStore(client: GoalStoreClient): GoalStore;
-/**
- * 从插件上下文构建 SDK client（V1 宿主机制）。
- * V2 下 ctx 本身即 server client，本函数与 createMetadataGoalStore 一起被替换。
- */
-export declare function createGoalClient(serverUrl: URL, v1Client: any): import("@opencode-ai/sdk/v2").OpencodeClient;
+/** V2 实现：goal 持久化在 session metadata 的 goal 键；消息/tokens 走 session 域读取。 */
+export declare function createSessionGoalStore(session: GoalStoreSessionApi): GoalStore;

package/dist/plugin/goal-store.js

@@ -1,17 +1,21 @@
-import { createOpencodeClient } from "@opencode-ai/sdk/v2";
-/** V1 实现：goal 持久化在 session metadata 的 goal 键；messages 直接透传 SDK 消息面 */
-export function createMetadataGoalStore(client) {
+function toGoalSession(session) {
+    return {
+        parentID: session?.parentID ?? null,
+        metadata: session?.metadata ?? {},
+        agent: session?.agent ?? null,
+        model: session?.model ?? null,
+        tokens: session?.tokens,
+    };
+}
+/** V2 实现：goal 持久化在 session metadata 的 goal 键；消息/tokens 走 session 域读取。 */
+export function createSessionGoalStore(session) {
     return {
         async read(sessionID) {
             try {
-                const result = await client.session.get({ sessionID });
-                const session = result?.data ?? null;
-                if (!session)
+                const result = await session.get({ sessionID });
+                if (!result)
                     return { goal: null, session: null };
-                const goalSession = {
-                    parentID: session.parentID ?? null,
-                    metadata: session.metadata ?? {},
-                };
+                const goalSession = toGoalSession(result);
                 if (!goalSession.metadata.goal)
                     return { goal: null, session: goalSession };
                 return { goal: goalSession.metadata.goal, session: goalSession };
@@ -21,34 +25,33 @@ export function createMetadataGoalStore(client) {
             }
         },
         async write(sessionID, goal, existingSession) {
-            const session = existingSession ?? (await this.read(sessionID)).session;
-            if (!session)
+            const current = existingSession ?? (await this.read(sessionID)).session;
+            if (!current)
                 throw new Error("Failed to get session");
-            const existing = session.metadata ?? {};
+            const existing = current.metadata ?? {};
             const metadata = goal === null
                 ? Object.fromEntries(Object.entries(existing).filter(([k]) => k !== "goal"))
                 : { ...existing, goal };
-            await client.session.update({ sessionID, metadata });
+            await session.update({ sessionID, metadata });
         },
-        async messages(sessionID, limit) {
-            const result = await client.session.messages({ sessionID, limit });
-            return Array.isArray(result?.data) ? result.data : null;
+        async context(sessionID) {
+            try {
+                const result = await session.context({ sessionID });
+                return Array.isArray(result) ? result : null;
+            }
+            catch {
+                return null;
+            }
+        },
+        async sessionTokens(sessionID) {
+            try {
+                const result = await session.get({ sessionID });
+                return result?.tokens ?? null;
+            }
+            catch {
+                return null;
+            }
         },
     };
 }
-/**
- * 从插件上下文构建 SDK client（V1 宿主机制）。
- * V2 下 ctx 本身即 server client，本函数与 createMetadataGoalStore 一起被替换。
- */
-export function createGoalClient(serverUrl, v1Client) {
-    const v1Config = v1Client?.getConfig?.() ?? {};
-    return createOpencodeClient({
-        baseUrl: serverUrl.origin,
-        headers: v1Config.headers,
-        fetch: v1Config.fetch,
-        // SDK v2 默认 ThrowOnError=false（4xx/5xx 静默 resolve 为 {error}），
-        // 必须显式开启，否则 readGoal/writeGoal 的 try/catch 与错误传播全部失效
-        throwOnError: true,
-    });
-}
 //# sourceMappingURL=goal-store.js.map

package/dist/plugin/goal-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"goal-store.js","sourceRoot":"","sources":["../../src/plugin/goal-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AA+C1D,sEAAsE;AACtE,MAAM,UAAU,uBAAuB,CAAC,MAAuB;IAC7D,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,SAAS;YAClB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;gBACtD,MAAM,OAAO,GAAG,MAAM,EAAE,IAAI,IAAI,IAAI,CAAA;gBACpC,IAAI,CAAC,OAAO;oBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;gBAClD,MAAM,WAAW,GAAgB;oBAC/B,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI;oBAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;iBACjC,CAAA;gBACD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI;oBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAA;gBAC3E,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,CAAA;YAC9E,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;YACtC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,eAAe;YAC1C,MAAM,OAAO,GAAG,eAAe,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAA;YACvE,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;YAEtD,MAAM,QAAQ,GAA4B,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAA;YAChE,MAAM,QAAQ,GAAG,IAAI,KAAK,IAAI;gBAC5B,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;gBAC5E,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,CAAA;YAEzB,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;QACtD,CAAC;QAED,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK;YAC7B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;YAClE,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;QACzD,CAAC;KACF,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAc,EAAE,QAAa;IAC5D,MAAM,QAAQ,GAAG,QAAQ,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,CAAA;IAC9C,OAAO,oBAAoB,CAAC;QAC1B,OAAO,EAAE,SAAS,CAAC,MAAM;QACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,8DAA8D;QAC9D,qDAAqD;QACrD,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"goal-store.js","sourceRoot":"","sources":["../../src/plugin/goal-store.ts"],"names":[],"mappings":"AAgDA,SAAS,aAAa,CAAC,OAMH;IAClB,OAAO;QACL,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,IAAI;QACnC,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,EAAE;QACjC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,IAAI;QAC7B,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,IAAI;QAC7B,MAAM,EAAE,OAAO,EAAE,MAAM;KACxB,CAAA;AACH,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,sBAAsB,CAAC,OAA4B;IACjE,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,SAAS;YAClB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;gBAC/C,IAAI,CAAC,MAAM;oBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;gBACjD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;gBACzC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI;oBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAA;gBAC3E,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAgB,EAAE,OAAO,EAAE,WAAW,EAAE,CAAA;YAC9E,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;YACtC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,eAAe;YAC1C,MAAM,OAAO,GAAG,eAAe,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAA;YACvE,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;YAEtD,MAAM,QAAQ,GAA4B,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAA;YAChE,MAAM,QAAQ,GAAG,IAAI,KAAK,IAAI;gBAC5B,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;gBAC5E,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,CAAA;YAEzB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC/C,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,SAAS;YACrB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;gBACnD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAA;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;gBAC/C,OAAO,MAAM,EAAE,MAAM,IAAI,IAAI,CAAA;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/plugin/goal.d.ts

@@ -1,12 +1,14 @@
-import type { ToolContext, ToolResult } from "@opencode-ai/plugin";
 import type { GoalSession, GoalStore } from "./goal-store.js";
 export type GoalStatus = "active" | "paused" | "complete";
-/** 用户最后使用的会话配置快照：续接注入时显式传回，防止 idle 后回落/切换默认 agent 与模型 */
+/** 用户最后使用的会话配置快照：续接注入时显式传回，防止回落/切换默认 agent 与模型 */
 export interface GoalSessionProfile {
     agent: string;
+    /** V1 存量语义：{providerID, modelID}；V2 新写入为 {providerID, id, variant?}，读取时两种都接受 */
     model?: {
         providerID: string;
-        modelID: string;
+        modelID?: string;
+        id?: string;
+        variant?: string;
     };
 }
 /** 最小化 goal（§10.2）：目标与验收条件从 Flow Record（Parent Issue body）读取 */
@@ -14,15 +16,15 @@ export interface GoalData {
     parentIssueNumber: number;
     status: GoalStatus;
     continuationCount: number;
-    /** 用户最后使用的 agent/模型（create 或用户消息时快照） */
+    /** 用户最后使用的 agent/模型（create 或用户切换时快照） */
     sessionProfile?: GoalSessionProfile;
     /** 可选 token 预算（护栏）：tokensUsed 达限后自动 pause，防止长跑成本失控 */
     tokenBudget?: number;
-    /** 已用 token（快照法：最新完成 assistant 轮 input+cache.read+output − baseline，单调不减） */
+    /** 已用 token（会话累计快照 − baseline，单调不减；护栏非账单） */
     tokensUsed?: number;
-    /** 记账基线：create 时点最新完成 assistant 轮的快照（compaction 不做分段，护栏非账单） */
+    /** 记账基线：create 时点的会话累计 token 快照 */
     tokensBaseline?: number;
-    /** goal 创建时刻（ms）：记账基线初始化与诊断用 */
+    /** goal 创建时刻（ms）：记账基线与诊断用 */
     createdAt?: number;
     /** 状态原因：'resumed' 是 UI/resume 的 kickoff 信号（首次 tick 豁免 blocked 检测后消费清除） */
     statusReason?: string;
@@ -30,11 +32,22 @@ export interface GoalData {
 export declare function createGoal(parentIssueNumber: number, sessionProfile?: GoalSessionProfile, tokenBudget?: number): GoalData;
 export declare function canTransitionTo(goal: GoalData, target: GoalStatus): boolean;
 export declare function formatGoal(goal: GoalData): string;
+/** 把存储的 profile.model（V1/V2 两种形状）归一为 V2 的 ModelRef；无法识别时返回 null */
+export declare function normalizeProfileModel(model: {
+    providerID?: string;
+    modelID?: string;
+    id?: string;
+    variant?: string;
+} | undefined): {
+    providerID: string;
+    id: string;
+    variant?: string;
+} | null;
 export declare const MAX_CONTINUATIONS = 50;
 /**
- * 单条消息的 token 快照 = input + reasoning + cache.read + output。
- * 与 OpenChamber 记账同源：OpenCode 每轮的 cache.read 已含此前所有轮次付费 token，
- * 最新完成轮的快照即整段成本，无需跨消息求和。reasoning 也计费，护栏方向偏严。
+ * token 快照 = input + reasoning + cache.read + output。
+ * OpenCode 每轮的 cache.read 已含此前所有轮次付费 token，
+ * 最新快照即整段成本，无需跨消息求和。reasoning 也计费，护栏方向偏严。
  */
 export declare function snapshotTokenTotal(tokens: unknown): number;
 /** token 预算护栏：达到或超过预算即应暂停（null 表示未设预算） */
@@ -61,24 +74,75 @@ export declare function mutateGoal<T>(store: GoalStore, sessionID: string, fn: (
     goal: GoalData | null;
     value: T;
 }>): Promise<T>;
-export declare function createGoalTool(store: GoalStore, projectDirFallback?: string): {
+/** goal 工具执行时可见的 context 最小面（V2 ToolContext 子集） */
+export interface GoalToolContext {
+    sessionID: string;
+    agent?: string;
+}
+export interface GoalToolInput {
+    op: "create" | "get" | "complete" | "resume" | "cancel" | "pause" | "edit";
+    parent_issue_number?: number;
+    token_budget?: number;
+}
+export interface GoalToolResult {
+    content: string;
+}
+/**
+ * goal 工具的允许名单（与权限规则层一致）。
+ * 规则层通过 agent permissions 隐藏/放行工具；此处的检查是工具级兜底，
+ * 覆盖规则层未覆盖的 agent（例如后续新注册的 agent）。
+ */
+export declare const GOAL_ALLOWED_AGENTS: Set<string>;
+export declare const GOAL_TOOL_INPUT_SCHEMA: {
+    readonly type: "object";
+    readonly properties: {
+        readonly op: {
+            readonly type: "string";
+            readonly enum: readonly ["create", "get", "complete", "resume", "cancel", "pause", "edit"];
+            readonly description: "Goal operation";
+        };
+        readonly parent_issue_number: {
+            readonly type: "number";
+            readonly description: "Parent GitHub Issue number of the Flow Record (required for create; editable via edit)";
+        };
+        readonly token_budget: {
+            readonly type: "number";
+            readonly description: "Optional token budget guardrail; goal auto-pauses when tokensUsed reaches it. Pass 0 via edit to remove the budget";
+        };
+    };
+    readonly required: readonly ["op"];
+    readonly additionalProperties: false;
+};
+export declare const GOAL_TOOL_DESCRIPTION = "Manage the active goal-mode objective (minimal: parentIssueNumber/status/continuationCount).\n\nUse a single op field:\n- create: starts a goal bound to a Flow Record. Requires parent_issue_number.\n- get: returns the current goal.\n- resume: re-activates a paused goal.\n- cancel: discards the current goal.\n- pause: pauses the active goal.\n- complete: marks the goal as completed. Follow the returned instructions.";
+/**
+ * 构建 goal 工具描述符：{name, description, input(JSON Schema), options, execute}。
+ * execute 返回 {content}（V2 Tool.Result 形状）；授权在工具内自检（见 GOAL_ALLOWED_AGENTS）。
+ */
+export declare function buildGoalTool(store: GoalStore, projectDir: string): {
+    name: string;
     description: string;
-    args: {
-        op: import("zod").ZodEnum<{
-            complete: "complete";
-            create: "create";
-            get: "get";
-            resume: "resume";
-            cancel: "cancel";
-            pause: "pause";
-            edit: "edit";
-        }>;
-        parent_issue_number: import("zod").ZodOptional<import("zod").ZodNumber>;
-        token_budget: import("zod").ZodOptional<import("zod").ZodNumber>;
+    input: {
+        readonly type: "object";
+        readonly properties: {
+            readonly op: {
+                readonly type: "string";
+                readonly enum: readonly ["create", "get", "complete", "resume", "cancel", "pause", "edit"];
+                readonly description: "Goal operation";
+            };
+            readonly parent_issue_number: {
+                readonly type: "number";
+                readonly description: "Parent GitHub Issue number of the Flow Record (required for create; editable via edit)";
+            };
+            readonly token_budget: {
+                readonly type: "number";
+                readonly description: "Optional token budget guardrail; goal auto-pauses when tokensUsed reaches it. Pass 0 via edit to remove the budget";
+            };
+        };
+        readonly required: readonly ["op"];
+        readonly additionalProperties: false;
+    };
+    options: {
+        permission: string;
     };
-    execute(args: {
-        op: "complete" | "create" | "get" | "resume" | "cancel" | "pause" | "edit";
-        parent_issue_number?: number | undefined;
-        token_budget?: number | undefined;
-    }, context: ToolContext): Promise<ToolResult>;
+    execute(args: GoalToolInput, context: GoalToolContext): Promise<GoalToolResult>;
 };