@xgjktech/xg_cwork_im 1.18.9 → 1.19.1

package/dist/src/per-message-model-pending.js

@@ -1,10 +1,18 @@
 /**
  * 单轮模型覆盖：在 dispatch 前登记，由 before_model_resolve 消费。
- * 仅当当前候选与用户点名模型一致时生效；主候选被跳过进入 fallback 时不得覆盖回原模型。
- * 主通道仍以 replyOptions.modelOverride 为准，本机制只在候选一致时补一次显式覆盖。
+ *
+ * 语义：
+ * - 覆盖只作用于本轮回复的「首次模型解析」（runId 首次调用）；模型 fallback 重试不重复覆盖。
+ * - 若登记时该 session 正处于自动降级（modelOverrideSource === "auto"）且用户点名的正是降级来源
+ *   （被冷却/额度跳过的原模型），则放弃覆盖，避免把降级候选改回不可用的原模型。
+ *
+ * 注意：OpenClaw 的 replyOptions 并不消费 modelOverride（该字段仅 2026.5.17~2026.5.22 短暂存在，
+ * 用于 WebChat 图片模型路由，之后已移除）。因此本机制是单轮模型覆盖的唯一生效通道。
  */
 import { getSharedMap } from "./process-shared-store.js";
 const pendingBySessionKey = getSharedMap("pending-per-message-model");
+const appliedRunIds = getSharedMap("per-message-model-applied-run");
+const APPLIED_RUN_TTL_MS = 60 * 60_000;
 export function normalizeModelRefRaw(raw) {
     return raw.trim().replace(/^["']|["']$/g, "").trim();
 }
@@ -19,31 +27,90 @@ export function splitModelRef(raw) {
         const model = normalized.slice(slash + 1).trim();
         if (!provider || !model)
             return undefined;
-        return { raw: normalized, provider, model };
+        return { raw: normalized, provider, model, sessionInAutoFallback: false };
     }
-    return { raw: normalized, model: normalized };
+    return { raw: normalized, model: normalized, sessionInAutoFallback: false };
+}
+/** 比较用归一化 key：有 provider 时 `provider/model`，否则仅 model。 */
+export function normalizeModelRefForCompare(provider, model) {
+    const p = (provider ?? "").trim().toLowerCase();
+    const m = (model ?? "").trim().toLowerCase();
+    if (!m)
+        return "";
+    return p ? `${p}/${m}` : m;
 }
 /**
- * 单轮覆盖只在「当前候选 == 用户点名的目标模型」时生效。
- * 主模型被冷却/额度跳过进入 fallback 后，当前候选已不是目标模型，
- * 钩子不得再把 fallback 候选改回目标模型。目标未带 provider 时仅比对 model。
+ * 用户点名的目标模型是否就是当前自动降级的来源模型。
+ * 先比对 model（大小写不敏感）；origin 带 provider 时再要求 provider 一致（目标未带 provider 视为通配）。
  */
-export function matchesPendingCandidate(ctxProvider, ctxModel, pending) {
-    const candidateProvider = (ctxProvider ?? "").trim().toLowerCase();
-    const candidateModel = (ctxModel ?? "").trim();
+export function targetMatchesFallbackOrigin(pending) {
+    const originModel = pending.fallbackOrigin?.model?.trim().toLowerCase() ?? "";
+    const targetModel = pending.model.trim().toLowerCase();
+    if (!originModel || !targetModel || originModel !== targetModel)
+        return false;
+    const originProvider = (pending.fallbackOrigin?.provider ?? "").trim().toLowerCase();
+    if (!originProvider)
+        return true;
     const targetProvider = (pending.provider ?? "").trim().toLowerCase();
-    const targetModel = pending.model.trim();
-    if (candidateModel !== targetModel) {
+    return targetProvider === "" || targetProvider === originProvider;
+}
+/** session 正处于自动降级，且目标就是降级来源时，放弃覆盖。 */
+export function shouldSkipOverrideForActiveFallback(pending) {
+    return pending.sessionInAutoFallback === true && targetMatchesFallbackOrigin(pending);
+}
+/**
+ * 本轮 run 是否首次解析模型。模型 fallback 会为同一 runId 再次调用 before_model_resolve，
+ * 此时返回 false，避免降级候选被覆盖回主模型。runId 缺失时不限制。
+ */
+export function claimPerMessageModelRun(runId) {
+    const key = runId?.trim();
+    if (!key)
+        return true;
+    const now = Date.now();
+    for (const [id, ts] of appliedRunIds) {
+        if (now - ts > APPLIED_RUN_TTL_MS) {
+            appliedRunIds.delete(id);
+        }
+    }
+    if (appliedRunIds.has(key)) {
         return false;
     }
-    return targetProvider === "" || candidateProvider === targetProvider;
+    appliedRunIds.set(key, now);
+    return true;
 }
-export function setPendingPerMessageModel(sessionKey, raw) {
+/** 从 session entry 提取自动降级上下文（纯函数，便于单测）。 */
+export function resolveSessionFallbackContextFromEntry(entry) {
+    if (!entry)
+        return { sessionInAutoFallback: false };
+    const originModel = entry.modelOverrideFallbackOriginModel?.trim();
+    const originProvider = entry.modelOverrideFallbackOriginProvider?.trim();
+    const sessionInAutoFallback = entry.modelOverrideSource === "auto";
+    if (!sessionInAutoFallback && !originModel) {
+        return { sessionInAutoFallback: false };
+    }
+    return {
+        sessionInAutoFallback,
+        ...(originModel
+            ? {
+                fallbackOrigin: {
+                    ...(originProvider ? { provider: originProvider } : {}),
+                    model: originModel,
+                },
+            }
+            : {}),
+    };
+}
+export function setPendingPerMessageModel(sessionKey, raw, fallbackContext) {
     const parsed = splitModelRef(raw);
     if (!parsed)
         return undefined;
-    pendingBySessionKey.set(sessionKey, parsed);
-    return parsed;
+    const pending = {
+        ...parsed,
+        sessionInAutoFallback: fallbackContext?.sessionInAutoFallback === true,
+        ...(fallbackContext?.fallbackOrigin ? { fallbackOrigin: fallbackContext.fallbackOrigin } : {}),
+    };
+    pendingBySessionKey.set(sessionKey, pending);
+    return pending;
 }
 export function takePendingPerMessageModel(sessionKey) {
     if (!sessionKey?.trim())
@@ -62,5 +129,6 @@ export function clearPendingPerMessageModel(sessionKey) {
 /** 插件卸载/重载时清空全部待消费的单轮模型覆盖。 */
 export function clearAllPendingPerMessageModel() {
     pendingBySessionKey.clear();
+    appliedRunIds.clear();
 }
 //# sourceMappingURL=per-message-model-pending.js.map

package/dist/src/per-message-model-pending.js.map

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

package/dist/src/plan-core-adapter.d.ts

@@ -0,0 +1,46 @@
+import type { Plan, TaskStatus } from "@xgjktech/xg-openclaw-shared";
+/** 每条 core 计划步骤的入参形态（progress_card 事件 steps 可能为旧版 string[]）。 */
+export type CorePlanStepInput = string | {
+    step?: string;
+    status?: string;
+};
+export type CorePlanUpdatePayload = {
+    phase?: string;
+    title?: string;
+    explanation?: string;
+    steps?: readonly CorePlanStepInput[];
+    source?: string;
+};
+/** 归一化后的 core 步骤。 */
+export type CorePlanStep = {
+    step: string;
+    status: TaskStatus;
+};
+/** 按 sessionKey 派生稳定的 planId（前端按 planId 覆盖/去重依赖稳定 id）。 */
+export declare function buildCorePlanId(sessionKey: string): string;
+export declare function normalizeCorePlanSteps(steps: readonly CorePlanStepInput[] | undefined): CorePlanStep[];
+/** 取或记录首次观察到该会话计划的时间（进程内记忆，跨重启由 DB 快照补 createdAt）。 */
+export declare function resolveCorePlanCreatedAt(sessionKey: string, nowMs: number, createdAtIso?: string): string;
+/** 仅测试用：清空进程内 firstSeen 记忆。 */
+export declare function resetCorePlanFirstSeenForTest(): void;
+/** 组装带内部 origin 的 Plan；core steps 为空时不产计划（纯 markdown 或清空，交由快照/后续事件决定）。 */
+export declare function buildPlanFromCoreUpdate(params: {
+    sessionKey: string;
+    groupId: string;
+    payload: CorePlanUpdatePayload;
+    accountId?: string;
+    nowMs?: number;
+    /** DB 回放时用落库的创建时间，进程内 firstSeen 不再生效。 */
+    createdAtIso?: string;
+}): Plan | undefined;
+/**
+ * progress_card 事件 → PLAN_STAT 增量（source:"tool"）。
+ * 绝不抛（sendPlanStat 本身 fire-and-forget，内部已 catch）。
+ */
+export declare function handleCorePlanUpdate(params: {
+    sessionKey: string;
+    groupId: string;
+    payload: CorePlanUpdatePayload;
+    accountId?: string;
+}): void;
+//# sourceMappingURL=plan-core-adapter.d.ts.map

package/dist/src/plan-core-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-core-adapter.d.ts","sourceRoot":"","sources":["../../src/plan-core-adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAoB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAYvF,gEAAgE;AAChE,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,MAAM,MAAM,qBAAqB,GAAG;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAqB;AACrB,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAEhE,0DAA0D;AAC1D,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG1D;AAED,wBAAgB,sBAAsB,CAClC,KAAK,EAAE,SAAS,iBAAiB,EAAE,GAAG,SAAS,GAChD,YAAY,EAAE,CAuBhB;AAID,sDAAsD;AACtD,wBAAgB,wBAAwB,CACpC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,GACtB,MAAM,CAUR;AAED,+BAA+B;AAC/B,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD;AAED,0EAA0E;AAC1E,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,IAAI,GAAG,SAAS,CA8BnB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,IAAI,CAUP"}

package/dist/src/plan-core-adapter.js

@@ -0,0 +1,103 @@
+import { createHash } from "node:crypto";
+import { sendPlanStat } from "./plan-stat-event.js";
+const LOG_PREFIX = "[xg_cwork_im] [plan-core-adapter]";
+const CORE_PLAN_STATUSES = new Set(["pending", "in_progress", "completed"]);
+const FALLBACK_PLAN_GOAL = "任务执行计划";
+/** progress_card 的 explanation 形如 "2/5 complete"，不是 goal，需回退。 */
+const COMPLETION_ONLY_EXPLANATION_RE = /^\d+\/\d+\s+complete$/i;
+/** 按 sessionKey 派生稳定的 planId（前端按 planId 覆盖/去重依赖稳定 id）。 */
+export function buildCorePlanId(sessionKey) {
+    const digest = createHash("sha256").update(`core-plan:${sessionKey}`).digest("hex");
+    return `core-${digest.slice(0, 16)}`;
+}
+export function normalizeCorePlanSteps(steps) {
+    if (!Array.isArray(steps)) {
+        return [];
+    }
+    const out = [];
+    for (const entry of steps) {
+        if (typeof entry === "string") {
+            const step = entry.trim();
+            if (step)
+                out.push({ step, status: "pending" });
+            continue;
+        }
+        if (!entry || typeof entry !== "object") {
+            continue;
+        }
+        const step = typeof entry.step === "string" ? entry.step.trim() : "";
+        const rawStatus = typeof entry.status === "string" ? entry.status : "";
+        if (!step)
+            continue;
+        const status = CORE_PLAN_STATUSES.has(rawStatus)
+            ? rawStatus
+            : "pending";
+        out.push({ step, status });
+    }
+    return out;
+}
+const firstSeenBySession = new Map();
+/** 取或记录首次观察到该会话计划的时间（进程内记忆，跨重启由 DB 快照补 createdAt）。 */
+export function resolveCorePlanCreatedAt(sessionKey, nowMs, createdAtIso) {
+    if (createdAtIso) {
+        return createdAtIso;
+    }
+    const existing = firstSeenBySession.get(sessionKey);
+    if (existing !== undefined) {
+        return new Date(existing).toISOString();
+    }
+    firstSeenBySession.set(sessionKey, nowMs);
+    return new Date(nowMs).toISOString();
+}
+/** 仅测试用：清空进程内 firstSeen 记忆。 */
+export function resetCorePlanFirstSeenForTest() {
+    firstSeenBySession.clear();
+}
+/** 组装带内部 origin 的 Plan；core steps 为空时不产计划（纯 markdown 或清空，交由快照/后续事件决定）。 */
+export function buildPlanFromCoreUpdate(params) {
+    const { sessionKey, groupId, payload, accountId, createdAtIso } = params;
+    const nowMs = params.nowMs ?? Date.now();
+    const steps = normalizeCorePlanSteps(payload.steps);
+    if (steps.length === 0) {
+        return undefined;
+    }
+    const tasks = steps.map((step) => ({
+        title: step.step,
+        status: step.status,
+    }));
+    const explanation = typeof payload.explanation === "string" ? payload.explanation.trim() : "";
+    const goal = explanation && !COMPLETION_ONLY_EXPLANATION_RE.test(explanation)
+        ? explanation
+        : FALLBACK_PLAN_GOAL;
+    const origin = {
+        channel: "xg_cwork_im",
+        to: groupId,
+        sessionKey,
+        ...(accountId ? { accountId } : {}),
+    };
+    return {
+        planId: buildCorePlanId(sessionKey),
+        goal,
+        createdAt: resolveCorePlanCreatedAt(sessionKey, nowMs, createdAtIso),
+        updatedAt: new Date(nowMs).toISOString(),
+        tasks,
+        origin,
+    };
+}
+/**
+ * progress_card 事件 → PLAN_STAT 增量（source:"tool"）。
+ * 绝不抛（sendPlanStat 本身 fire-and-forget，内部已 catch）。
+ */
+export function handleCorePlanUpdate(params) {
+    try {
+        const plan = buildPlanFromCoreUpdate(params);
+        if (!plan) {
+            return;
+        }
+        sendPlanStat({ plan, source: "tool" });
+    }
+    catch (err) {
+        console.warn(`${LOG_PREFIX} adapter 内部异常已吞: ${String(err)}`);
+    }
+}
+//# sourceMappingURL=plan-core-adapter.js.map

package/dist/src/plan-core-adapter.js.map

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

package/dist/src/plan-core-adapter.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=plan-core-adapter.test.d.ts.map

package/dist/src/plan-core-adapter.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-core-adapter.test.d.ts","sourceRoot":"","sources":["../../src/plan-core-adapter.test.ts"],"names":[],"mappings":""}

package/dist/src/plan-core-adapter.test.js

@@ -0,0 +1,164 @@
+import assert from "node:assert/strict";
+import { describe, it, beforeEach } from "node:test";
+import { buildCorePlanId, buildPlanFromCoreUpdate, handleCorePlanUpdate, normalizeCorePlanSteps, resetCorePlanFirstSeenForTest, } from "./plan-core-adapter.js";
+import { resetPlanWsRegistryForTest, setPlanWsClient } from "./plan-ws-registry.js";
+const NOW = Date.parse("2026-09-08T00:00:00.000Z");
+function makeRecordingClient() {
+    const calls = [];
+    const client = {
+        start: async () => { },
+        streamProgress: async () => { },
+        streamUsage: async () => { },
+        sendEvent: async (opts) => {
+            calls.push(opts);
+        },
+        end: async () => { },
+    };
+    return { client, calls };
+}
+beforeEach(() => {
+    resetPlanWsRegistryForTest();
+    resetCorePlanFirstSeenForTest();
+});
+describe("buildCorePlanId", () => {
+    it("对同一 sessionKey 稳定、不同 sessionKey 不同，且带 core- 前缀", () => {
+        const a1 = buildCorePlanId("sess-1");
+        const a2 = buildCorePlanId("sess-1");
+        const b = buildCorePlanId("sess-2");
+        assert.match(a1, /^core-/);
+        assert.equal(a1, a2);
+        assert.notEqual(a1, b);
+    });
+});
+describe("normalizeCorePlanSteps", () => {
+    it("typed 步骤透传 step/status", () => {
+        assert.deepEqual(normalizeCorePlanSteps([
+            { step: " 做 A ", status: "in_progress" },
+            { step: "做 B", status: "completed" },
+        ]), [
+            { step: "做 A", status: "in_progress" },
+            { step: "做 B", status: "completed" },
+        ]);
+    });
+    it("旧版 string 步骤归一为 pending", () => {
+        assert.deepEqual(normalizeCorePlanSteps(["做 A", "  "]), [{ step: "做 A", status: "pending" }]);
+    });
+    it("非法 status / 空文本丢弃，非法 status 回退 pending", () => {
+        assert.deepEqual(normalizeCorePlanSteps([
+            { step: "ok", status: "blocked" },
+            { step: "", status: "pending" },
+            "valid",
+            null,
+        ]), [
+            { step: "ok", status: "pending" },
+            { step: "valid", status: "pending" },
+        ]);
+    });
+    it("undefined / 非数组 → 空", () => {
+        assert.deepEqual(normalizeCorePlanSteps(undefined), []);
+        assert.deepEqual(normalizeCorePlanSteps("x"), []);
+    });
+});
+describe("buildPlanFromCoreUpdate", () => {
+    it("steps 映射为 tasks，origin 为内部路由字段", () => {
+        const plan = buildPlanFromCoreUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-1",
+            payload: {
+                phase: "update",
+                title: "Plan updated",
+                explanation: "迁移配置",
+                steps: [
+                    { step: "备份", status: "completed" },
+                    { step: "校验", status: "in_progress" },
+                ],
+            },
+            nowMs: NOW,
+        });
+        assert.equal(plan.planId, buildCorePlanId("sess-1"));
+        assert.equal(plan.goal, "迁移配置");
+        assert.equal(plan.updatedAt, new Date(NOW).toISOString());
+        assert.deepEqual(plan.tasks, [
+            { title: "备份", status: "completed" },
+            { title: "校验", status: "in_progress" },
+        ]);
+        assert.deepEqual(plan.origin, {
+            channel: "xg_cwork_im",
+            to: "g-1",
+            sessionKey: "sess-1",
+        });
+    });
+    it("completion 计数 explanation 回退固定 goal", () => {
+        const plan = buildPlanFromCoreUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-1",
+            payload: { steps: [{ step: "A", status: "completed" }], explanation: "2/5 complete" },
+            nowMs: NOW,
+        });
+        assert.equal(plan.goal, "任务执行计划");
+    });
+    it("createdAtIso 覆盖进程内 firstSeen", () => {
+        const first = buildPlanFromCoreUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-1",
+            payload: { steps: [{ step: "A", status: "pending" }] },
+            nowMs: NOW,
+        });
+        const second = buildPlanFromCoreUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-1",
+            payload: { steps: [{ step: "A", status: "completed" }] },
+            nowMs: NOW + 60_000,
+        });
+        assert.equal(second.createdAt, first.createdAt, "同会话 createdAt 保持首次");
+        const fromDb = buildPlanFromCoreUpdate({
+            sessionKey: "sess-db",
+            groupId: "g-1",
+            payload: { steps: [{ step: "A", status: "pending" }] },
+            nowMs: NOW,
+            createdAtIso: "2026-09-01T00:00:00.000Z",
+        });
+        assert.equal(fromDb.createdAt, "2026-09-01T00:00:00.000Z");
+    });
+    it("空 steps → undefined（不产计划）", () => {
+        assert.equal(buildPlanFromCoreUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-1",
+            payload: { steps: [] },
+            nowMs: NOW,
+        }), undefined);
+    });
+});
+describe("handleCorePlanUpdate", () => {
+    it("有 steps 且 WS 已登记 → 发一条 source=tool 的 PLAN_STAT", () => {
+        const { client, calls } = makeRecordingClient();
+        setPlanWsClient("g-1", client, "msg-1");
+        handleCorePlanUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-1",
+            payload: { steps: [{ step: "备份", status: "pending" }] },
+        });
+        assert.equal(calls.length, 1);
+        assert.equal(calls[0].event, "PLAN_STAT");
+        assert.equal(calls[0].data.source, "tool");
+        assert.equal(calls[0].data.plan.planId, buildCorePlanId("sess-1"));
+    });
+    it("空 steps → 不发送、不外抛", () => {
+        const { client, calls } = makeRecordingClient();
+        setPlanWsClient("g-1", client, "msg-1");
+        assert.doesNotThrow(() => handleCorePlanUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-1",
+            payload: { steps: [] },
+        }));
+        assert.equal(calls.length, 0);
+    });
+    it("未登记 WS client → 不外抛", () => {
+        assert.doesNotThrow(() => handleCorePlanUpdate({
+            sessionKey: "sess-1",
+            groupId: "g-nowhere",
+            payload: { steps: [{ step: "A", status: "pending" }] },
+        }));
+    });
+});
+//# sourceMappingURL=plan-core-adapter.test.js.map

package/dist/src/plan-core-adapter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-core-adapter.test.js","sourceRoot":"","sources":["../../src/plan-core-adapter.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGrD,OAAO,EACH,eAAe,EACf,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,6BAA6B,GAChC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEpF,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAEnD,SAAS,mBAAmB;IACxB,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAmB;QAC3B,KAAK,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QACtB,cAAc,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QAC/B,WAAW,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;QAC5B,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,GAAG,EAAE,KAAK,IAAI,EAAE,GAAG,CAAC;KACvB,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED,UAAU,CAAC,GAAG,EAAE;IACZ,0BAA0B,EAAE,CAAC;IAC7B,6BAA6B,EAAE,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACtD,MAAM,EAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACrB,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAC9B,MAAM,CAAC,SAAS,CACZ,sBAAsB,CAAC;YACnB,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE;YACxC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE;SACvC,CAAC,EACF;YACI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;YACtC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE;SACvC,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QAC/B,MAAM,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,SAAS,CACZ,sBAAsB,CAAC;YACnB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE;YACjC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;YAC/B,OAAO;YACP,IAAI;SACE,CAAC,EACX;YACI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE;YACjC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE;SACvC,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,SAAS,CAAC,sBAAsB,CAAC,GAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,uBAAuB,CAAC;YACjC,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE;gBACL,KAAK,EAAE,QAAQ;gBACf,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,MAAM;gBACnB,KAAK,EAAE;oBACH,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE;oBACnC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE;iBACxC;aACJ;YACD,KAAK,EAAE,GAAG;SACb,CAAS,CAAC;QAEX,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAChC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE;YACzB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE;YACpC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE;SACzC,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,aAAa;YACtB,EAAE,EAAE,KAAK;YACT,UAAU,EAAE,QAAQ;SACvB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,MAAM,IAAI,GAAG,uBAAuB,CAAC;YACjC,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE;YACrF,KAAK,EAAE,GAAG;SACb,CAAS,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACpC,MAAM,KAAK,GAAG,uBAAuB,CAAC;YAClC,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE;YACtD,KAAK,EAAE,GAAG;SACb,CAAS,CAAC;QACX,MAAM,MAAM,GAAG,uBAAuB,CAAC;YACnC,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE;YACxD,KAAK,EAAE,GAAG,GAAG,MAAM;SACtB,CAAS,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QAEtE,MAAM,MAAM,GAAG,uBAAuB,CAAC;YACnC,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE;YACtD,KAAK,EAAE,GAAG;YACV,YAAY,EAAE,0BAA0B;SAC3C,CAAS,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,KAAK,CACR,uBAAuB,CAAC;YACpB,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YACtB,KAAK,EAAE,GAAG;SACb,CAAC,EACF,SAAS,CACZ,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACtD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,oBAAoB,CAAC;YACjB,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE;SAC1D,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAa,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACzB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAChD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CACrB,oBAAoB,CAAC;YACjB,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;SACzB,CAAC,CACL,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CACrB,oBAAoB,CAAC;YACjB,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE;SACzD,CAAC,CACL,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/src/plan-core-db.d.ts

@@ -0,0 +1,22 @@
+export type StoredCoreProgressCard = {
+    steps: Array<{
+        step: string;
+        status: "pending" | "in_progress" | "completed";
+    }>;
+    markdown?: string;
+    revision: number;
+    createdAtMs: number;
+    updatedAtMs: number;
+};
+/** 供 index.ts 装配：注入 api.runtime.state.resolveStateDir()（与旧 plans.sqlite 同一基址）。 */
+export declare function setCoreAgentStateBase(dir: string): void;
+export declare function resolveCoreAgentSqlitePath(agentId: string): string | undefined;
+/**
+ * 只读当前 agent 的 openclaw-agent.sqlite 里 session_progress_cards 一行。
+ * 文件/表/行缺失、任何解析或打开异常 → undefined，绝不外抛（调用点在热路径）。
+ */
+export declare function readCoreProgressCard(params: {
+    agentId: string;
+    sessionKey: string;
+}): StoredCoreProgressCard | undefined;
+//# sourceMappingURL=plan-core-db.d.ts.map

package/dist/src/plan-core-db.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-core-db.d.ts","sourceRoot":"","sources":["../../src/plan-core-db.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,sBAAsB,GAAG;IACjC,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAA;KAAE,CAAC,CAAC;IAChF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAIF,kFAAkF;AAClF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAEvD;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK9E;AA0BD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACtB,GAAG,sBAAsB,GAAG,SAAS,CAsDrC"}

package/dist/src/plan-core-db.js

@@ -0,0 +1,91 @@
+import { DatabaseSync } from "node:sqlite";
+import { join } from "node:path";
+const LOG_PREFIX = "[xg_cwork_im] [plan-core-db]";
+const CORE_STATUSES = new Set(["pending", "in_progress", "completed"]);
+let coreStateBase;
+/** 供 index.ts 装配：注入 api.runtime.state.resolveStateDir()（与旧 plans.sqlite 同一基址）。 */
+export function setCoreAgentStateBase(dir) {
+    coreStateBase = dir;
+}
+export function resolveCoreAgentSqlitePath(agentId) {
+    if (!coreStateBase) {
+        return undefined;
+    }
+    return join(coreStateBase, "agents", agentId, "agent", "openclaw-agent.sqlite");
+}
+function isStoredCoreStep(entry) {
+    if (!entry || typeof entry !== "object") {
+        return false;
+    }
+    const raw = entry;
+    if (typeof raw.step !== "string" || !raw.step.trim()) {
+        return false;
+    }
+    return typeof raw.status === "string" && CORE_STATUSES.has(raw.status);
+}
+function parseStoredSteps(raw) {
+    if (!Array.isArray(raw)) {
+        return [];
+    }
+    const out = [];
+    for (const entry of raw) {
+        if (isStoredCoreStep(entry)) {
+            out.push({ step: entry.step.trim(), status: entry.status });
+        }
+    }
+    return out;
+}
+/**
+ * 只读当前 agent 的 openclaw-agent.sqlite 里 session_progress_cards 一行。
+ * 文件/表/行缺失、任何解析或打开异常 → undefined，绝不外抛（调用点在热路径）。
+ */
+export function readCoreProgressCard(params) {
+    const { agentId, sessionKey } = params;
+    const dbPath = resolveCoreAgentSqlitePath(agentId);
+    if (!dbPath) {
+        return undefined;
+    }
+    let db;
+    try {
+        db = new DatabaseSync(dbPath, { readOnly: true });
+        db.exec("PRAGMA busy_timeout = 5000;");
+        const row = db
+            .prepare("SELECT markdown, steps_json, revision, created_at, updated_at " +
+            "FROM session_progress_cards WHERE session_key = ?;")
+            .get(sessionKey);
+        if (!row) {
+            return undefined;
+        }
+        let stepsJson;
+        try {
+            stepsJson = row.steps_json ? JSON.parse(row.steps_json) : [];
+        }
+        catch {
+            stepsJson = [];
+        }
+        const steps = parseStoredSteps(stepsJson);
+        if (steps.length === 0) {
+            return undefined;
+        }
+        return {
+            steps,
+            ...(row.markdown ? { markdown: row.markdown } : {}),
+            revision: row.revision ?? 0,
+            createdAtMs: row.created_at ?? 0,
+            updatedAtMs: row.updated_at ?? 0,
+        };
+    }
+    catch (err) {
+        console.warn(`${LOG_PREFIX} 读取 core progress card 失败 agentId=${agentId}: ${String(err)}`);
+        return undefined;
+    }
+    finally {
+        try {
+            db?.close();
+        }
+        catch {
+            // close 失败可忽略
+        }
+    }
+}
+//# sourceMappingURL=plan-core-db.js.map

package/dist/src/plan-core-db.js.map

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

package/dist/src/plan-core-db.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=plan-core-db.test.d.ts.map

package/dist/src/plan-core-db.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-core-db.test.d.ts","sourceRoot":"","sources":["../../src/plan-core-db.test.ts"],"names":[],"mappings":""}