@devcxl/opencode-cabbage 1.0.0 → 1.2.0

package/dist/kernel/session-index.js

@@ -2,10 +2,15 @@
  * Flow → session 轻量索引（替代 session-state.json）。
  * 路径：.opencode/opencode-cabbage/session-index.json
  * 作用：parentIssueNumber → sessionID 绑定；双 session 检测（R7）。
+ * 并发：全部 read-modify-write 按 projectDir 走 KeyedMutex 串行，防丢失更新。
  */
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { PLUGIN_ID } from "../util/paths.js";
+import { KeyedMutex } from "./mutex.js";
+const VALID_STATUSES = ["active", "paused", "completed", "cancelled"];
+/** 按 projectDir 串行化索引读写（防并发 bind/update 互覆盖） */
+const indexMutex = new KeyedMutex();
 export function sessionIndexPath(projectDir) {
     return path.join(projectDir, ".opencode", PLUGIN_ID, "session-index.json");
 }
@@ -22,99 +27,60 @@ export async function readIndex(projectDir) {
         return { flows: {} };
     }
 }
-/** 原子写：先写临时文件再 rename。 */
+/** 原子写：先写临时文件（PID 后缀防跨进程 tmp 冲突）再 rename。 */
 export async function writeIndex(projectDir, index) {
     const target = sessionIndexPath(projectDir);
-    const tmp = `${target}.tmp`;
+    const tmp = `${target}.${process.pid}.tmp`;
     await mkdir(path.dirname(target), { recursive: true });
     await writeFile(tmp, JSON.stringify(index, null, 2), "utf8");
     await rename(tmp, target);
 }
-export function getFlowSession(index, parentIssueNumber) {
-    return index.flows[String(parentIssueNumber)] ?? null;
-}
 /**
- * 绑定 parentIssueNumber → sessionID。
- * 双 session 检测（§10.3）：该 flow 已被另一 active session 绑定时拒绝。
+ * 绑定 parentIssueNumber → sessionID（goal create 时建立，供插件重启后的 autoResume 恢复）。
+ * 已绑定其它 session 时更新绑定（覆盖式，无双 session 强制）。
  */
 export async function bindSession(projectDir, parentIssueNumber, sessionID) {
-    const index = await readIndex(projectDir);
-    const key = String(parentIssueNumber);
-    const existing = index.flows[key];
-    if (existing && existing.sessionID !== sessionID && existing.status === "active") {
-        return {
-            ok: false,
-            code: "FLOW_SESSION_CONFLICT",
-            message: `Flow #${parentIssueNumber} is already bound to active session "${existing.sessionID}". Use flow_control takeover with user confirmation to take over.`,
-        };
-    }
-    const entry = {
-        sessionID,
-        status: "active",
-        continuationCount: existing && existing.sessionID === sessionID ? existing.continuationCount : 0,
-        updatedAt: Date.now(),
-    };
-    index.flows[key] = entry;
-    await writeIndex(projectDir, index);
-    return { ok: true, entry };
-}
-/**
- * 接管绑定：旧 session 置 paused，新 session 绑定 active（R7）。
- * 旧 session 为另一 active session 时要求 userConfirmed（§10.3）；
- * 调用方还需将旧 session 的 goal status 置 paused（goalClient 层）。
- */
-export async function takeoverSession(projectDir, parentIssueNumber, newSessionID, userConfirmed) {
-    const index = await readIndex(projectDir);
-    const key = String(parentIssueNumber);
-    const existing = index.flows[key];
-    if (existing && existing.sessionID !== newSessionID && existing.status === "active" && !userConfirmed) {
-        return {
-            ok: false,
-            code: "TAKEOVER_NOT_CONFIRMED",
-            message: `Flow #${parentIssueNumber} is bound to active session "${existing.sessionID}". Takeover requires user confirmation (user_confirmed: true).`,
+    return indexMutex.runExclusive(projectDir, async () => {
+        const index = await readIndex(projectDir);
+        const key = String(parentIssueNumber);
+        const existing = index.flows[key];
+        const entry = {
+            sessionID,
+            status: "active",
+            continuationCount: existing && existing.sessionID === sessionID ? existing.continuationCount : 0,
+            updatedAt: Date.now(),
         };
-    }
-    if (existing) {
-        if (existing.sessionID === newSessionID) {
-            const entry = { ...existing, status: "active", updatedAt: Date.now() };
-            index.flows[key] = entry;
-            await writeIndex(projectDir, index);
-            return { ok: true, entry };
-        }
-        existing.status = "paused";
-        existing.updatedAt = Date.now();
-    }
-    const entry = {
-        sessionID: newSessionID,
-        status: "active",
-        continuationCount: 0,
-        updatedAt: Date.now(),
-    };
-    index.flows[key] = entry;
-    await writeIndex(projectDir, index);
-    return { ok: true, entry };
+        index.flows[key] = entry;
+        await writeIndex(projectDir, index);
+    });
 }
-/** 更新已绑定 flow 的状态/计数；flow 未绑定时返回 null 且不创建 entry。 */
+/** 更新已绑定 flow 的状态/计数/goal 完成标记；flow 未绑定时返回 null 且不创建 entry。 */
 export async function updateFlowSession(projectDir, parentIssueNumber, patch) {
-    const index = await readIndex(projectDir);
-    const key = String(parentIssueNumber);
-    const existing = index.flows[key];
-    if (!existing)
+    if (patch.status !== undefined && !VALID_STATUSES.includes(patch.status)) {
         return null;
-    const entry = { ...existing, ...patch, updatedAt: Date.now() };
-    index.flows[key] = entry;
-    await writeIndex(projectDir, index);
-    return entry;
+    }
+    return indexMutex.runExclusive(projectDir, async () => {
+        const index = await readIndex(projectDir);
+        const key = String(parentIssueNumber);
+        const existing = index.flows[key];
+        if (!existing)
+            return null;
+        const entry = { ...existing, ...patch, updatedAt: Date.now() };
+        index.flows[key] = entry;
+        await writeIndex(projectDir, index);
+        return entry;
+    });
 }
-/** 解绑：仅当 sessionID 与当前绑定匹配时删除 entry。 */
-export async function unbindSession(projectDir, parentIssueNumber, sessionID) {
-    const index = await readIndex(projectDir);
-    const key = String(parentIssueNumber);
-    const existing = index.flows[key];
-    if (!existing || existing.sessionID !== sessionID)
-        return false;
-    delete index.flows[key];
-    await writeIndex(projectDir, index);
-    return true;
+/** 删除 flow 的索引 entry（goal cancel 时调用，避免重启 autoResume 恢复已取消 goal）。 */
+export async function removeFlowSession(projectDir, parentIssueNumber) {
+    return indexMutex.runExclusive(projectDir, async () => {
+        const index = await readIndex(projectDir);
+        const key = String(parentIssueNumber);
+        if (!index.flows[key])
+            return false;
+        delete index.flows[key];
+        await writeIndex(projectDir, index);
+        return true;
+    });
 }
 //# sourceMappingURL=session-index.js.map

package/dist/kernel/session-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-index.js","sourceRoot":"","sources":["../../src/kernel/session-index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACrE,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAe5C,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAA;AAC5E,CAAC;AAED,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,UAAkB;IAChD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAwB,CAAA;QACtG,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvH,OAAO,MAAsB,CAAA;QAC/B,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IACtB,CAAC;AACH,CAAC;AAED,0BAA0B;AAC1B,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,UAAkB,EAAE,KAAmB;IACtE,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,GAAG,GAAG,GAAG,MAAM,MAAM,CAAA;IAC3B,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtD,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IAC5D,MAAM,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AAC3B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAmB,EAAE,iBAAyB;IAC3E,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,IAAI,CAAA;AACvD,CAAC;AAOD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,UAAkB,EAClB,iBAAyB,EACzB,SAAiB;IAEjB,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEjC,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACjF,OAAO;YACL,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,uBAAuB;YAC7B,OAAO,EAAE,SAAS,iBAAiB,wCAAwC,QAAQ,CAAC,SAAS,mEAAmE;SACjK,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAAqB;QAC9B,SAAS;QACT,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,QAAQ,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAChG,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAA;IACD,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACxB,MAAM,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IACnC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AAC5B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,iBAAyB,EACzB,YAAoB,EACpB,aAAsB;IAEtB,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEjC,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS,KAAK,YAAY,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,aAAa,EAAE,CAAC;QACtG,OAAO;YACL,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,wBAAwB;YAC9B,OAAO,EAAE,SAAS,iBAAiB,gCAAgC,QAAQ,CAAC,SAAS,gEAAgE;SACtJ,CAAA;IACH,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,QAAQ,CAAC,SAAS,KAAK,YAAY,EAAE,CAAC;YACxC,MAAM,KAAK,GAAqB,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;YACxF,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;YACxB,MAAM,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;YACnC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;QAC5B,CAAC;QACD,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAA;QAC1B,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACjC,CAAC;IAED,MAAM,KAAK,GAAqB;QAC9B,SAAS,EAAE,YAAY;QACvB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,CAAC;QACpB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAA;IACD,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACxB,MAAM,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IACnC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AAC5B,CAAC;AAED,qDAAqD;AACrD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAkB,EAClB,iBAAyB,EACzB,KAAsE;IAEtE,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAA;IAC1B,MAAM,KAAK,GAAqB,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;IAChF,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACxB,MAAM,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IACnC,OAAO,KAAK,CAAA;AACd,CAAC;AAED,wCAAwC;AACxC,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,UAAkB,EAClB,iBAAyB,EACzB,SAAiB;IAEjB,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAA;IACzC,MAAM,GAAG,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;IACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IAC/D,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACvB,MAAM,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IACnC,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"session-index.js","sourceRoot":"","sources":["../../src/kernel/session-index.ts"],"names":[],"mappings":"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"}

package/dist/plugin/bootstrap.d.ts

@@ -1,3 +1,2 @@
 export declare function initBootstrap(): Promise<void>;
 export declare function getBootstrapContent(): string;
-export declare function resetBootstrap(): void;

package/dist/plugin/bootstrap.js

@@ -11,7 +11,4 @@ export async function initBootstrap() {
 export function getBootstrapContent() {
     return _bootstrapCache ?? _fallbackContent;
 }
-export function resetBootstrap() {
-    _bootstrapCache = undefined;
-}
 //# sourceMappingURL=bootstrap.js.map

package/dist/plugin/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/plugin/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,IAAI,eAAmC,CAAA;AAEvC,MAAM,gBAAgB,GAAG,YAAY,CACnC,IAAI,CAAC,IAAI,CACP,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,EACnE,QAAQ,EAAE,SAAS,EAAE,cAAc,CACpC,EACD,OAAO,CACR,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,CAAA;IAC7C,eAAe,GAAG,OAAO,IAAI,SAAS,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,eAAe,IAAI,gBAAgB,CAAA;AAC5C,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,eAAe,GAAG,SAAS,CAAA;AAC7B,CAAC"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/plugin/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,IAAI,eAAmC,CAAA;AAEvC,MAAM,gBAAgB,GAAG,YAAY,CACnC,IAAI,CAAC,IAAI,CACP,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,EACnE,QAAQ,EAAE,SAAS,EAAE,cAAc,CACpC,EACD,OAAO,CACR,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,CAAA;IAC7C,eAAe,GAAG,OAAO,IAAI,SAAS,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,eAAe,IAAI,gBAAgB,CAAA;AAC5C,CAAC"}

package/dist/plugin/goal.d.ts

@@ -2,25 +2,73 @@ import type { ToolContext, ToolResult } from "@opencode-ai/plugin";
 import { createOpencodeClient } from "@opencode-ai/sdk/v2";
 import type { Session } from "@opencode-ai/sdk/v2";
 export type GoalStatus = "active" | "paused" | "complete";
+/** 用户最后使用的会话配置快照：续接注入时显式传回，防止 idle 后回落/切换默认 agent 与模型 */
+export interface GoalSessionProfile {
+    agent: string;
+    model?: {
+        providerID: string;
+        modelID: string;
+    };
+}
 /** 最小化 goal（§10.2）：目标与验收条件从 Flow Record（Parent Issue body）读取 */
 export interface GoalData {
     parentIssueNumber: number;
     status: GoalStatus;
     continuationCount: number;
+    /** 用户最后使用的 agent/模型（create 或用户消息时快照） */
+    sessionProfile?: GoalSessionProfile;
+    /** 可选 token 预算（护栏）：tokensUsed 达限后自动 pause，防止长跑成本失控 */
+    tokenBudget?: number;
+    /** 已用 token（快照法：最新完成 assistant 轮 input+cache.read+output − baseline，单调不减） */
+    tokensUsed?: number;
+    /** 记账基线：create 时点最新完成 assistant 轮的快照（compaction 不做分段，护栏非账单） */
+    tokensBaseline?: number;
+    /** goal 创建时刻（ms）：记账基线初始化与诊断用 */
+    createdAt?: number;
+    /** 状态原因：'resumed' 是 UI/resume 的 kickoff 信号（首次 tick 豁免 blocked 检测后消费清除） */
+    statusReason?: string;
 }
-export declare function createGoal(parentIssueNumber: number): 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;
 export declare const MAX_CONTINUATIONS = 50;
+/**
+ * 单条消息的 token 快照 = input + reasoning + cache.read + output。
+ * 与 OpenChamber 记账同源：OpenCode 每轮的 cache.read 已含此前所有轮次付费 token，
+ * 最新完成轮的快照即整段成本，无需跨消息求和。reasoning 也计费，护栏方向偏严。
+ */
+export declare function snapshotTokenTotal(tokens: unknown): number;
+/** token 预算护栏：达到或超过预算即应暂停（null 表示未设预算） */
+export declare function budgetReached(goal: GoalData): boolean;
+/**
+ * 识别 agent 在续接回复中输出的显式阻塞报告（continuationPrompt 要求格式：
+ * 无法推进时必须输出 [BLOCKED: <原因>]）。大小写与空白容错。
+ */
+export declare const BLOCKED_REPORT_RE: RegExp;
+export declare function isBlockedReport(text: string): boolean;
+/**
+ * 识别 agent 的显式完成报告（continuationPrompt 要求格式：[DONE: <摘要>]）。
+ * 命中 → goal 暂停并提示用户派 goal-verify 做最终独立验证（与 [BLOCKED:] 对称）。
+ */
+export declare const DONE_REPORT_RE: RegExp;
+export declare function isDoneReport(text: string): boolean;
 export declare function continuationPrompt(parentIssueNumber: number): string;
-export declare function verifyAgentPrompt(): string;
 export declare function createGoalClient(serverUrl: URL, v1Client: any): import("@opencode-ai/sdk/v2").OpencodeClient;
 export declare function readGoal(client: ReturnType<typeof createOpencodeClient>, sessionID: string): Promise<{
     goal: GoalData | null;
     session: Session | null;
 }>;
 export declare function writeGoal(client: ReturnType<typeof createOpencodeClient>, sessionID: string, goal: GoalData | null, existingSession?: Session | null): Promise<void>;
-export declare function createGoalTool(client: ReturnType<typeof createOpencodeClient>): {
+/**
+ * 带锁的 goal 读-改-写单一入口：同一 sessionID 的操作串行，杜绝并发丢失更新。
+ * fn 接收当前 goal 与 session，返回写回的 goal（null 表示删除）与调用方结果 value。
+ * 当前无 goal 且 fn 也返回 null 时跳过写回（避免对不存在 goal 的无谓删除/写入）。
+ */
+export declare function mutateGoal<T>(client: ReturnType<typeof createOpencodeClient>, sessionID: string, fn: (goal: GoalData | null, session: Session | null) => Promise<{
+    goal: GoalData | null;
+    value: T;
+}>): Promise<T>;
+export declare function createGoalTool(client: ReturnType<typeof createOpencodeClient>, projectDirFallback?: string): {
     description: string;
     args: {
         op: import("zod").ZodEnum<{
@@ -30,11 +78,14 @@ export declare function createGoalTool(client: ReturnType<typeof createOpencodeC
             resume: "resume";
             cancel: "cancel";
             pause: "pause";
+            edit: "edit";
         }>;
-        parent_issue_number: import("zod").ZodNumber;
+        parent_issue_number: import("zod").ZodOptional<import("zod").ZodNumber>;
+        token_budget: import("zod").ZodOptional<import("zod").ZodNumber>;
     };
     execute(args: {
-        op: "complete" | "create" | "get" | "resume" | "cancel" | "pause";
-        parent_issue_number: number;
+        op: "complete" | "create" | "get" | "resume" | "cancel" | "pause" | "edit";
+        parent_issue_number?: number | undefined;
+        token_budget?: number | undefined;
     }, context: ToolContext): Promise<ToolResult>;
 };