@fluxvita/jovida-cli 0.0.1

package/dist/core/proto.js

@@ -0,0 +1,204 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entryToProto = entryToProto;
+exports.entryFromProto = entryFromProto;
+exports.recurringToProto = recurringToProto;
+exports.recurringFromProto = recurringFromProto;
+// ---- priority enum ↔ 本地字符串 ----
+const PRIORITY_TO_PROTO = {
+    none: 'PRIORITY_NONE',
+    low: 'PRIORITY_LOW',
+    medium: 'PRIORITY_MEDIUM',
+    high: 'PRIORITY_HIGH'
+};
+// 名字或序号都接受（protojson 通常回名字，但容错数字）。UNSPECIFIED/缺省 → 'none'。
+function priorityFromProto(v) {
+    switch (v) {
+        case 'PRIORITY_LOW':
+        case 2:
+            return 'low';
+        case 'PRIORITY_MEDIUM':
+        case 3:
+            return 'medium';
+        case 'PRIORITY_HIGH':
+        case 4:
+            return 'high';
+        default:
+            return 'none'; // PRIORITY_NONE(1) / UNSPECIFIED(0) / 省略
+    }
+}
+// int64：写出转字符串（canonical proto3-JSON）；读入用 Number（时间戳/秒在 JS 安全整数内）。
+function i64(n) {
+    return String(n);
+}
+function num(v) {
+    return v == null ? 0 : Number(v);
+}
+// ---- RepeatUnit / Weekday enum ↔ 本地 ----
+const UNIT_TO_PROTO = {
+    day: 'REPEAT_UNIT_DAY',
+    week: 'REPEAT_UNIT_WEEK',
+    month: 'REPEAT_UNIT_MONTH',
+    year: 'REPEAT_UNIT_YEAR'
+};
+function unitFromProto(v) {
+    switch (v) {
+        case 'REPEAT_UNIT_WEEK':
+        case 2:
+            return 'week';
+        case 'REPEAT_UNIT_MONTH':
+        case 3:
+            return 'month';
+        case 'REPEAT_UNIT_YEAR':
+        case 4:
+            return 'year';
+        default:
+            return 'day'; // REPEAT_UNIT_DAY(1) / UNSPECIFIED(0) / 省略
+    }
+}
+const WEEKDAY_NAMES = [
+    'WEEKDAY_UNSPECIFIED',
+    'WEEKDAY_MONDAY',
+    'WEEKDAY_TUESDAY',
+    'WEEKDAY_WEDNESDAY',
+    'WEEKDAY_THURSDAY',
+    'WEEKDAY_FRIDAY',
+    'WEEKDAY_SATURDAY',
+    'WEEKDAY_SUNDAY'
+];
+// 本地 ISO 1-7 → proto enum 名。
+function weekdayToProto(iso) {
+    return WEEKDAY_NAMES[iso] ?? 'WEEKDAY_UNSPECIFIED';
+}
+// proto enum 名或序号 → 本地 ISO 1-7（无效返回 0，调用方过滤）。
+function weekdayFromProto(v) {
+    if (typeof v === 'number')
+        return v >= 1 && v <= 7 ? v : 0;
+    const i = WEEKDAY_NAMES.indexOf(String(v));
+    return i >= 1 ? i : 0;
+}
+function entryToProto(e) {
+    const out = {
+        entryId: e.entryId,
+        title: e.title,
+        description: e.description,
+        category: e.category,
+        priority: PRIORITY_TO_PROTO[e.priority],
+        dueAt: i64(e.dueAt),
+        belongAt: i64(e.belongAt),
+        recurringId: e.recurringId,
+        occurrenceAt: i64(e.occurrenceAt),
+        subtasks: e.subtasks.map((s) => ({ id: s.id, title: s.title, completedAt: i64(s.completedAt) })),
+        completedAt: i64(e.completedAt),
+        createdAt: i64(e.createdAt),
+        updatedAt: i64(e.updatedAt)
+    };
+    if (e.reminder) {
+        out.reminder = {
+            id: e.reminder.id,
+            canAlarm: e.reminder.canAlarm,
+            offsetSecs: e.reminder.offsetSecs.map(i64)
+        };
+    }
+    return out;
+}
+function entryFromProto(o) {
+    const subtasks = (o.subtasks ?? []).map((s) => ({
+        id: s.id ?? '',
+        title: s.title ?? '',
+        completedAt: num(s.completedAt)
+    }));
+    let reminder = null;
+    if (o.reminder) {
+        reminder = {
+            id: o.reminder.id ?? '',
+            canAlarm: o.reminder.canAlarm ?? false,
+            offsetSecs: (o.reminder.offsetSecs ?? []).map(num)
+        };
+    }
+    return {
+        entryId: o.entryId ?? '',
+        title: o.title ?? '',
+        description: o.description ?? '',
+        category: o.category ?? '',
+        priority: priorityFromProto(o.priority),
+        dueAt: num(o.dueAt),
+        belongAt: num(o.belongAt),
+        recurringId: o.recurringId ?? '',
+        occurrenceAt: num(o.occurrenceAt),
+        subtasks,
+        reminder,
+        completedAt: num(o.completedAt),
+        createdAt: num(o.createdAt),
+        updatedAt: num(o.updatedAt),
+        hint: '' // hint 是本地列、不在同步 proto；importFromServer 会保留本地既有 hint，不被此 '' 覆盖
+    };
+}
+function recurringToProto(s) {
+    const out = {
+        recurringId: s.recurringId,
+        title: s.title,
+        description: s.description,
+        category: s.category,
+        priority: PRIORITY_TO_PROTO[s.priority],
+        dueAt: i64(s.dueAt),
+        belongAt: i64(s.belongAt),
+        subtasks: s.subtasks.map((t) => ({ id: t.id, title: t.title, completedAt: i64(t.completedAt) })),
+        repeatRule: {
+            unit: UNIT_TO_PROTO[s.repeat.unit],
+            interval: s.repeat.interval,
+            weekdays: s.repeat.weekdays.map(weekdayToProto),
+            dayOfMonth: s.repeat.dayOfMonth,
+            monthOfYear: s.repeat.monthOfYear,
+            endAt: i64(s.repeat.endAt)
+        },
+        createdAt: i64(s.createdAt),
+        updatedAt: i64(s.updatedAt)
+    };
+    if (s.reminder) {
+        out.reminder = {
+            id: s.reminder.id,
+            canAlarm: s.reminder.canAlarm,
+            offsetSecs: s.reminder.offsetSecs.map(i64)
+        };
+    }
+    return out;
+}
+function recurringFromProto(o) {
+    const subtasks = (o.subtasks ?? []).map((s) => ({
+        id: s.id ?? '',
+        title: s.title ?? '',
+        completedAt: num(s.completedAt)
+    }));
+    let reminder = null;
+    if (o.reminder) {
+        reminder = {
+            id: o.reminder.id ?? '',
+            canAlarm: o.reminder.canAlarm ?? false,
+            offsetSecs: (o.reminder.offsetSecs ?? []).map(num)
+        };
+    }
+    const r = o.repeatRule ?? {};
+    const repeat = {
+        unit: unitFromProto(r.unit),
+        interval: Math.max(1, num(r.interval)),
+        weekdays: (r.weekdays ?? []).map(weekdayFromProto).filter((w) => w >= 1 && w <= 7),
+        dayOfMonth: num(r.dayOfMonth),
+        monthOfYear: num(r.monthOfYear),
+        endAt: num(r.endAt)
+    };
+    return {
+        recurringId: o.recurringId ?? '',
+        title: o.title ?? '',
+        description: o.description ?? '',
+        category: o.category ?? '',
+        priority: priorityFromProto(o.priority),
+        dueAt: num(o.dueAt),
+        belongAt: num(o.belongAt),
+        subtasks,
+        reminder,
+        repeat,
+        createdAt: num(o.createdAt),
+        updatedAt: num(o.updatedAt)
+    };
+}

package/dist/core/reminder.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reminderAnchorSec = reminderAnchorSec;
+exports.triggerTimesSec = triggerTimesSec;
+exports.nextTriggerSec = nextTriggerSec;
+const DAY_SECS = 86400;
+/**
+ * reminder 触发锚：有精确 due 用 due，否则 belong 当天 24 点（次日 0 点）。
+ * 仅用于 reminder offset 计算，区别于 scope 查询锚（belong 当天 0 点）。
+ * ⚠️ 跨端契约：所有客户端须用同一锚定义，否则同步后提醒错时。
+ */
+function reminderAnchorSec(dueAt, belongAt) {
+    if (dueAt && dueAt > 0)
+        return dueAt;
+    if (belongAt && belongAt > 0)
+        return belongAt + DAY_SECS;
+    return undefined;
+}
+/** entry 的所有提醒触发时刻（Unix 秒，= 锚 − 各 offset）。无 reminder / 无锚 → []。 */
+function triggerTimesSec(entry) {
+    if (!entry.reminder || entry.reminder.offsetSecs.length === 0)
+        return [];
+    const anchor = reminderAnchorSec(entry.dueAt, entry.belongAt);
+    if (anchor === undefined)
+        return [];
+    return entry.reminder.offsetSecs.map((o) => anchor - o);
+}
+/** 最近的未来触发时刻（Unix 秒）；无则 undefined（用于 UI 铃铛旁显示）。 */
+function nextTriggerSec(entry, nowSec) {
+    const future = triggerTimesSec(entry)
+        .filter((t) => t > nowSec)
+        .sort((a, b) => a - b);
+    return future[0];
+}

package/dist/core/types.js

@@ -0,0 +1,3 @@
+"use strict";
+// 领域类型(Jovida 待办)。时间一律 Unix 秒(0=未设/未完成)。
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/ctx.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeCtx = makeCtx;
+const config_1 = require("./config");
+const api_1 = require("./api");
+const session_1 = require("./session");
+const sync_1 = require("./sync");
+const state_1 = require("./state");
+function makeCtx() {
+    const cfg = (0, config_1.loadConfig)();
+    const api = new api_1.ApiClient({
+        baseUrl: cfg.baseUrl,
+        appId: cfg.appId,
+        deviceId: (0, state_1.getDeviceId)(),
+        platform: (0, config_1.platformName)()
+    });
+    const session = new session_1.Session(api);
+    const sync = new sync_1.SyncClient(api);
+    return { api, session, sync, baseUrl: cfg.baseUrl };
+}

package/dist/lib/open-url.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tryOpenBrowser = tryOpenBrowser;
+const node_child_process_1 = require("node:child_process");
+/** 尽力在系统浏览器打开 URL；失败静默（headless 服务器无浏览器属正常）。返回是否尝试成功派生进程。 */
+function tryOpenBrowser(url) {
+    try {
+        const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'cmd' : 'xdg-open';
+        const args = process.platform === 'win32' ? ['/c', 'start', '', url] : [url];
+        const child = (0, node_child_process_1.spawn)(cmd, args, { stdio: 'ignore', detached: true });
+        child.on('error', () => { });
+        child.unref();
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/machine-id.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deriveDeviceId = deriveDeviceId;
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
+const node_crypto_1 = require("node:crypto");
+// 设备标识（Vita-Did）派生。目标：删 app 再装回来不变 —— 故派生自**OS 机器标识**，
+// 而非存一个 UUID（UUID 落在 app userData，卸载即丢）。机器标识能扛卸载重装/清数据，
+// 扛不住重装系统/换机/抹盘。取不到时降级随机 UUID（那种会重置）。
+// 隐私：原始硬件 ID 不外发，加盐 SHA-256 后用（app 维度隔离）。
+function rawMachineId() {
+    try {
+        if (process.platform === 'darwin') {
+            const out = (0, node_child_process_1.execFileSync)('ioreg', ['-rd1', '-c', 'IOPlatformExpertDevice'], {
+                encoding: 'utf8'
+            });
+            return /"IOPlatformUUID"\s*=\s*"([^"]+)"/.exec(out)?.[1] ?? null;
+        }
+        if (process.platform === 'win32') {
+            const out = (0, node_child_process_1.execFileSync)('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Cryptography', '/v', 'MachineGuid'], { encoding: 'utf8' });
+            return /MachineGuid\s+REG_SZ\s+([A-Fa-f0-9-]+)/.exec(out)?.[1] ?? null;
+        }
+        // linux
+        for (const p of ['/etc/machine-id', '/var/lib/dbus/machine-id']) {
+            try {
+                const id = (0, node_fs_1.readFileSync)(p, 'utf8').trim();
+                if (id)
+                    return id;
+            }
+            catch {
+                /* try next */
+            }
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+const SALT = 'jovida-cli-did-v1';
+/** 派生 device-id。stable=true 表示来自机器标识（重装稳定）；false=降级随机（会重置）。 */
+function deriveDeviceId() {
+    const raw = rawMachineId();
+    if (raw) {
+        const h = (0, node_crypto_1.createHash)('sha256').update(SALT).update(raw).digest('hex').slice(0, 32);
+        return { id: `dvc_${h}`, stable: true };
+    }
+    return { id: `dvc_${(0, node_crypto_1.randomUUID)().replace(/-/g, '')}`, stable: false };
+}

package/dist/session.js

@@ -0,0 +1,161 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Session = exports.NotSignedInError = void 0;
+// 鉴权 session。**正式 CLI 不支持匿名态**——必须先 `jovida login`。
+//
+// 登录 = OAuth 设备授权流（RFC 8628 语义，vita 线格式）：
+//   device_authorize（匿名）拿 deviceCode(密)+userCode(短码) → 用户在浏览器登录批准
+//   → 轮询 device_token，reason=="" 即批准、返回 Sign 态 vita token → 落盘 token.raw。
+// 凭证 = 单枚 vita token（raw 内含 access/refresh 双窗）；access 临期用 refresh_token 续；
+// refresh 死 → NotSignedIn，重跑 login。**不走 apikey/Bearer。**
+// 过渡：`loginWithToken` 直粘一枚 Sign token（开发期，无 durs 故不自动 refresh）。
+const api_1 = require("./api");
+const state_1 = require("./state");
+const AUTHORIZE = '/uc/v1/passport/device_authorize';
+const DEVICE_TOKEN = '/uc/v1/passport/device_token';
+const REFRESH = '/uc/v1/passport/refresh_token';
+const USER_INFO = '/uc/v1/user/get_user_info';
+const SKEW = 60;
+const nowSec = () => Math.floor(Date.now() / 1000);
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+/** 未登录 / 会话失效。CLI 不回退匿名。 */
+class NotSignedInError extends Error {
+    constructor(msg = 'Not signed in. Run `jovida login` first.') {
+        super(msg);
+        this.name = 'NotSignedInError';
+    }
+}
+exports.NotSignedInError = NotSignedInError;
+class Session {
+    api;
+    refreshing = null;
+    constructor(api) {
+        this.api = api;
+        const t = (0, state_1.getToken)();
+        if (t)
+            api.setToken(t.raw);
+    }
+    /** 业务命令前：无 token → NotSignedIn；access 临期 → 续期。 */
+    async ensureSession() {
+        const t = (0, state_1.getToken)();
+        if (!t)
+            throw new NotSignedInError();
+        this.api.setToken(t.raw);
+        if (t.accessDur > 0 && nowSec() > t.receivedAt + t.accessDur - SKEW)
+            await this.refresh();
+    }
+    // ── 设备授权流 ────────────────────────────────────────────────
+    /** 第 1 步：发起。device endpoints 匿名（清掉可能的旧 token）。 */
+    async deviceAuthorize() {
+        this.api.setToken('');
+        return this.api.post(AUTHORIZE, {});
+    }
+    /**
+     * 第 2 步：按 interval 轮询直到批准 / 拒绝 / 过期 / 超时。
+     * reason: ""=已批准(带 token)、AUTHORIZATION_PENDING=继续、SLOW_DOWN=加间隔、ACCESS_DENIED/EXPIRED_TOKEN=终止。
+     */
+    async pollForToken(d) {
+        let interval = Math.max(1, d.interval || 5);
+        const deadline = nowSec() + (d.expiresIn || 600);
+        for (;;) {
+            if (nowSec() >= deadline)
+                throw new Error('Login timed out before approval. Run `jovida login` again.');
+            await sleep(interval * 1000);
+            const resp = await this.api.post(DEVICE_TOKEN, { deviceCode: d.deviceCode });
+            if (resp.token?.raw)
+                return this.applyToken(resp); // reason=="" 已批准
+            switch (resp.reason ?? '') {
+                case 'AUTHORIZATION_PENDING':
+                case '':
+                    continue;
+                case 'SLOW_DOWN':
+                    interval += 5;
+                    continue;
+                case 'ACCESS_DENIED':
+                    throw new Error('Login was denied.');
+                case 'EXPIRED_TOKEN':
+                    throw new Error('The login request expired. Run `jovida login` again.');
+                default:
+                    throw new Error(`Unexpected device_token reason: ${resp.reason}`);
+            }
+        }
+    }
+    /** 设备流登录：authorize → present(展示 URL+短码 + 开浏览器) → 轮询落盘。 */
+    async loginWithDeviceFlow(present) {
+        const d = await this.deviceAuthorize();
+        present(d);
+        return this.pollForToken(d);
+    }
+    // ── 过渡 / 续期 / 身份 ─────────────────────────────────────────
+    /** 过渡登录（开发期）：直粘 Sign 态 vita token，get_user_info 验活后落盘（durs=0，不自动 refresh）。 */
+    async loginWithToken(rawToken) {
+        const raw = rawToken.trim();
+        if (!raw)
+            throw new Error('empty token');
+        this.api.setToken(raw);
+        const info = await this.fetchUserInfo('That token is not a valid signed-in session.');
+        const rec = { raw, vitaId: info.vitaId, accessDur: 0, refreshDur: 0, receivedAt: nowSec() };
+        (0, state_1.setToken)(rec);
+        return rec;
+    }
+    async refresh() {
+        if (this.refreshing)
+            return this.refreshing;
+        this.refreshing = (async () => {
+            try {
+                const resp = await this.api.post(REFRESH, {});
+                this.applyToken(resp);
+            }
+            catch (e) {
+                if (e instanceof api_1.ApiError && (e.status === 401 || e.status === 403)) {
+                    (0, state_1.clearCredentials)();
+                    throw new NotSignedInError('Session expired. Run `jovida login` again.');
+                }
+                throw e;
+            }
+            finally {
+                this.refreshing = null;
+            }
+        })();
+        return this.refreshing;
+    }
+    /** 当前身份（在线查；无凭证 → NotSignedIn）。 */
+    async whoami() {
+        await this.ensureSession();
+        return this.fetchUserInfo('Session is no longer valid.');
+    }
+    async fetchUserInfo(rejectMsg) {
+        let resp;
+        try {
+            resp = await this.api.get(USER_INFO);
+        }
+        catch (e) {
+            if (e instanceof api_1.ApiError && (e.status === 401 || e.status === 403)) {
+                (0, state_1.clearCredentials)();
+                throw new NotSignedInError(`${rejectMsg} Run \`jovida login\` again.`);
+            }
+            throw e;
+        }
+        return {
+            vitaId: String(resp.user?.vitaId ?? ''),
+            vitaHao: resp.user?.vitaHao ?? '',
+            entitlement: resp.subscription?.entitlement ?? ''
+        };
+    }
+    applyToken(resp) {
+        const tk = resp.token;
+        if (!tk?.raw)
+            throw new Error('passport response missing token');
+        const rec = {
+            raw: tk.raw,
+            vitaId: String(resp.register?.vitaId ?? (0, state_1.getToken)()?.vitaId ?? ''),
+            accessDur: Number(tk.accessDur ?? 0),
+            refreshDur: Number(tk.refreshDur ?? 0),
+            receivedAt: nowSec()
+        };
+        (0, state_1.setToken)(rec);
+        this.api.setToken(rec.raw);
+        return rec;
+    }
+}
+exports.Session = Session;

package/dist/state.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDeviceId = getDeviceId;
+exports.getLastServerVersion = getLastServerVersion;
+exports.setLastServerVersion = setLastServerVersion;
+exports.getToken = getToken;
+exports.setToken = setToken;
+exports.clearCredentials = clearCredentials;
+// 本地状态:~/.jovida/(可经 JOVIDA_HOME 覆盖)。无待办库——storeless。
+// credentials.json(token,0600)+ state.json(deviceId / lastServerVersion)。
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
+const machine_id_1 = require("./machine-id");
+const DIR = process.env['JOVIDA_HOME'] ?? (0, node_path_1.join)((0, node_os_1.homedir)(), '.jovida');
+const CRED = (0, node_path_1.join)(DIR, 'credentials.json');
+const STATE = (0, node_path_1.join)(DIR, 'state.json');
+function ensureDir() {
+    if (!(0, node_fs_1.existsSync)(DIR))
+        (0, node_fs_1.mkdirSync)(DIR, { recursive: true, mode: 0o700 });
+}
+function readJson(p) {
+    try {
+        return JSON.parse((0, node_fs_1.readFileSync)(p, 'utf8'));
+    }
+    catch {
+        return null;
+    }
+}
+function loadState() {
+    return readJson(STATE) ?? {};
+}
+function saveState(s) {
+    ensureDir();
+    (0, node_fs_1.writeFileSync)(STATE, JSON.stringify(s, null, 2));
+}
+/** Vita-Did:首次派生(机器标识)并持久化;重装后由 machine-id 派生回同值。 */
+function getDeviceId() {
+    const s = loadState();
+    if (s.deviceId)
+        return s.deviceId;
+    const { id, stable } = (0, machine_id_1.deriveDeviceId)();
+    s.deviceId = id;
+    s.didStable = stable;
+    saveState(s);
+    return id;
+}
+function getLastServerVersion() {
+    return loadState().lastServerVersion ?? 0;
+}
+function setLastServerVersion(v) {
+    const s = loadState();
+    s.lastServerVersion = v;
+    saveState(s);
+}
+function readCreds() {
+    return readJson(CRED);
+}
+function writeCreds(c) {
+    ensureDir();
+    (0, node_fs_1.writeFileSync)(CRED, JSON.stringify(c), { mode: 0o600 });
+}
+function getToken() {
+    return readCreds()?.token ?? null;
+}
+function setToken(rec) {
+    const c = readCreds() ?? {};
+    c.token = rec;
+    writeCreds(c);
+}
+/** 退出:清 token。 */
+function clearCredentials() {
+    try {
+        (0, node_fs_1.rmSync)(CRED);
+    }
+    catch {
+        /* 不存在即忽略 */
+    }
+}

package/dist/sync.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncClient = void 0;
+// 同步原语:在线读改写(put/get snapshot + OCC)。CLI storeless,无本地库/对账。
+// 请求形与后端一致:PUT={ dataset:{entries,recurrings}, baseServerVersion };GET={ expectedServerVersion, pageToken, snapshotToken };均 proto3-JSON。
+const api_1 = require("./api");
+const state_1 = require("./state");
+const proto_1 = require("./core/proto");
+const PUT = '/jov/todo/v1/put_todo_snapshot';
+const GET = '/jov/todo/v1/get_todo_snapshot';
+const DELETE = '/jov/todo/v1/delete_todo_objects';
+const MAX_CONFLICT = 3; // put 409(落后)→pull→重试
+const MAX_EXPIRED = 3; // get 409(分页快照过期)→首页重拉
+class SyncClient {
+    api;
+    constructor(api) {
+        this.api = api;
+    }
+    /** 全量拉取(CLI storeless:每次强制全量,expectedServerVersion=0)。处理分页 + 409 SNAPSHOT_EXPIRED 重拉。 */
+    async pull() {
+        for (let attempt = 0; attempt < MAX_EXPIRED; attempt++) {
+            const r = await this.pullOnce();
+            if (r) {
+                (0, state_1.setLastServerVersion)(r.serverVersion);
+                return r;
+            }
+        }
+        throw new Error('snapshot kept expiring during pagination');
+    }
+    async pullOnce() {
+        const entries = [];
+        const recurrings = [];
+        let pageToken = '';
+        let snapshotToken = '';
+        let serverVersion = 0;
+        for (;;) {
+            let resp;
+            try {
+                resp = await this.api.post(GET, {
+                    expectedServerVersion: '0', // 强制全量(storeless 无本地副本可省传)
+                    pageToken,
+                    snapshotToken
+                });
+            }
+            catch (e) {
+                if (e instanceof api_1.ApiError && e.status === 409)
+                    return null; // SNAPSHOT_EXPIRED → 外层重拉
+                throw e;
+            }
+            serverVersion = resp.serverVersion != null ? Number(resp.serverVersion) : serverVersion;
+            if (!snapshotToken && resp.snapshotToken)
+                snapshotToken = resp.snapshotToken;
+            for (const o of resp.objects ?? []) {
+                if (o.entry)
+                    entries.push((0, proto_1.entryFromProto)(o.entry));
+                else if (o.recurring)
+                    recurrings.push((0, proto_1.recurringFromProto)(o.recurring));
+            }
+            if (!resp.hasMore || !resp.nextPageToken)
+                break;
+            pageToken = resp.nextPageToken;
+        }
+        return { entries, recurrings, serverVersion };
+    }
+    /** 增量 upsert entries。409 SYNC_CONFLICT → pull 追平版本 → 重试。 */
+    async putEntries(items) {
+        for (let attempt = 0; attempt <= MAX_CONFLICT; attempt++) {
+            try {
+                await this.api.post(PUT, {
+                    dataset: { entries: items.map(proto_1.entryToProto), recurrings: [] },
+                    baseServerVersion: String((0, state_1.getLastServerVersion)())
+                });
+                return;
+            }
+            catch (e) {
+                if (e instanceof api_1.ApiError && e.status === 409 && attempt < MAX_CONFLICT) {
+                    await this.pull(); // 追平 lastServerVersion 后重试
+                    continue;
+                }
+                throw e;
+            }
+        }
+    }
+    /** 增量 upsert 循环「类」(recurrings)。409 SYNC_CONFLICT → pull 追平 → 重试。 */
+    async putRecurrings(items) {
+        for (let attempt = 0; attempt <= MAX_CONFLICT; attempt++) {
+            try {
+                await this.api.post(PUT, {
+                    dataset: { entries: [], recurrings: items.map(proto_1.recurringToProto) },
+                    baseServerVersion: String((0, state_1.getLastServerVersion)())
+                });
+                return;
+            }
+            catch (e) {
+                if (e instanceof api_1.ApiError && e.status === 409 && attempt < MAX_CONFLICT) {
+                    await this.pull();
+                    continue;
+                }
+                throw e;
+            }
+        }
+    }
+    /** 逐条硬删(无 OCC 门控;对未知 id 幂等)。 */
+    async deleteObjects(ids) {
+        for (const objectId of ids)
+            await this.api.post(DELETE, { objectId });
+    }
+}
+exports.SyncClient = SyncClient;