linkshell-cli 0.10.44 → 0.10.46

package/dist/client-core/src/pro-membership.d.ts

@@ -0,0 +1,17 @@
+export interface ProMembership {
+    plan: "free" | "pro";
+    expiresAt?: string;
+}
+export interface ProMembershipOptions {
+    supabaseUrl: string;
+    anonKey: string;
+    accessToken: string;
+    userId: string;
+}
+export declare const PRO_CODE_SHOP_URL = "https://pay.ldxp.cn/item/7lgv1s";
+/** The profile is read with the user's token; only the server can grant Pro. */
+export declare function fetchProMembership(options: ProMembershipOptions): Promise<ProMembership>;
+export declare function redeemProCode(accessToken: string, code: string): Promise<{
+    expiresAt: string;
+    idempotent: boolean;
+}>;

package/dist/client-core/src/pro-membership.js

@@ -0,0 +1,107 @@
+export const PRO_CODE_SHOP_URL = "https://pay.ldxp.cn/item/7lgv1s";
+const REDEEM_URL = "https://itool.tech/api/pro/redeem";
+const REQUEST_TIMEOUT_MS = 15_000;
+const LOGIN_REQUIRED = "登录已失效，请重新登录后再试";
+function record(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function timestamp(value) {
+    return typeof value === "string" ? Date.parse(value) : NaN;
+}
+async function request(url, init) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    try {
+        const response = await fetch(url, { ...init, credentials: "omit", signal: controller.signal });
+        let body;
+        try {
+            body = await response.json();
+        }
+        catch (error) {
+            if (controller.signal.aborted || !(error instanceof SyntaxError))
+                throw error;
+        }
+        return { response, body };
+    }
+    catch {
+        throw new Error(controller.signal.aborted ? "请求超时，请稍后重试" : "网络连接失败，请检查网络后重试");
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
+/** The profile is read with the user's token; only the server can grant Pro. */
+export async function fetchProMembership(options) {
+    if (!options.accessToken.trim() || !options.userId.trim())
+        throw new Error(LOGIN_REQUIRED);
+    const url = `${options.supabaseUrl.replace(/\/$/, "")}/rest/v1/profiles?select=plan,plan_expires_at&id=eq.${encodeURIComponent(options.userId)}&limit=1`;
+    const { response, body } = await request(url, {
+        headers: { apikey: options.anonKey, Authorization: `Bearer ${options.accessToken}` },
+    });
+    if (response.status === 401 || response.status === 403)
+        throw new Error(LOGIN_REQUIRED);
+    if (!response.ok)
+        throw new Error("暂时无法获取会员状态，请稍后重试");
+    if (!Array.isArray(body))
+        throw new Error("会员状态返回异常，请稍后重试");
+    if (body.length === 0)
+        return { plan: "free" };
+    const profile = record(body[0]);
+    if (!profile || typeof profile.plan !== "string")
+        throw new Error("会员状态返回异常，请稍后重试");
+    const expiresAt = profile.plan_expires_at;
+    const expires = timestamp(expiresAt);
+    const serverTime = timestamp(response.headers.get("date"));
+    const now = Number.isFinite(serverTime) ? serverTime : Date.now();
+    return profile.plan === "pro" && Number.isFinite(expires) && expires > now
+        ? { plan: "pro", expiresAt: expiresAt }
+        : { plan: "free" };
+}
+const redeemErrors = {
+    malformed_request: "激活码格式不正确，请检查后重试",
+    login_required: LOGIN_REQUIRED,
+    request_too_large: "激活码内容过长，请检查后重试",
+    invalid_or_unavailable: "激活码无效或已不可用，请检查后重试",
+    rate_limited: "操作太频繁，请稍后重试",
+    temporarily_unavailable: "兑换服务暂时不可用，请稍后重试",
+};
+const redeemStatusCodes = {
+    400: "malformed_request",
+    401: "login_required",
+    413: "request_too_large",
+    422: "invalid_or_unavailable",
+    429: "rate_limited",
+    503: "temporarily_unavailable",
+};
+export async function redeemProCode(accessToken, code) {
+    if (!accessToken.trim())
+        throw new Error(LOGIN_REQUIRED);
+    const normalizedCode = code.trim();
+    if (!normalizedCode)
+        throw new Error("请输入激活码");
+    const { response, body: responseBody } = await request(REDEEM_URL, {
+        method: "POST",
+        headers: { Authorization: `Bearer ${accessToken}`, "Content-Type": "application/json" },
+        body: JSON.stringify({ code: normalizedCode }),
+    });
+    const body = record(responseBody);
+    if (!response.ok) {
+        const code = body?.code ?? record(body?.error)?.code;
+        const knownCode = typeof code === "string" && Object.hasOwn(redeemErrors, code) ? code : redeemStatusCodes[response.status];
+        throw new Error(knownCode ? redeemErrors[knownCode] : "兑换失败，请稍后重试");
+    }
+    const expires = timestamp(body?.plan_expires_at);
+    const serverTime = timestamp(body?.server_time);
+    if (body?.ok !== true || body.valid !== true || typeof body.idempotent !== "boolean" ||
+        typeof body.months !== "number" || !Number.isFinite(body.months) || body.months < 0 ||
+        !Number.isFinite(expires) || !Number.isFinite(serverTime)) {
+        throw new Error("兑换结果尚未确认，请刷新会员状态后重试");
+    }
+    if (expires <= serverTime) {
+        throw new Error(body.idempotent
+            ? "此激活码已兑换且权益已到期，请使用新的激活码"
+            : "兑换结果尚未确认，请刷新会员状态后重试");
+    }
+    return { expiresAt: body.plan_expires_at, idempotent: body.idempotent };
+}
+//# sourceMappingURL=pro-membership.js.map

package/dist/client-core/src/pro-membership.js.map

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

package/dist/host/src/drivers/acp/antigravity.js

@@ -827,21 +827,15 @@ export function parseTranscriptSteps(parsed, state) {
                     updates.push({ sessionUpdate: "ls_goal", goal: state.goal });
                 }
             }
-            // The context in use is the latest reply's prompt; earlier replies in the batch are superseded.
-            if (i === lastPlanner || (lastPlanner >= 0 && parsed[lastPlanner].index === stepIndex)) {
-                const input = (step.input_tokens ?? 0) + (step.cache_read_tokens ?? 0);
-                if (input > 0) {
-                    updates.push({
-                        sessionUpdate: "usage_update",
-                        usedTokens: input,
-                        tokens: {
-                            totalTokens: input + (step.output_tokens ?? 0),
-                            inputTokens: step.input_tokens ?? 0,
-                            outputTokens: step.output_tokens ?? 0,
-                            cachedReadTokens: step.cache_read_tokens ?? 0,
-                        },
-                    });
-                }
+            // Each step is a distinct usage record; only the latest supplies context occupancy.
+            const input = (step.input_tokens ?? 0) + (step.cache_read_tokens ?? 0);
+            if (input > 0 || (step.output_tokens ?? 0) > 0) {
+                const timestamp = Date.parse(step.created_at ?? "");
+                updates.push({ sessionUpdate: "usage_update",
+                    usedTokens: i === lastPlanner || (lastPlanner >= 0 && parsed[lastPlanner].index === stepIndex) ? input : undefined,
+                    ...(Number.isFinite(timestamp) ? { accounting: { id: `agy:step:${stepIndex}`, scope: "turn", timestamp, model: state.lastModelLabel } } : {}),
+                    tokens: { totalTokens: input + (step.output_tokens ?? 0), inputTokens: step.input_tokens ?? 0,
+                        outputTokens: step.output_tokens ?? 0, cachedReadTokens: step.cache_read_tokens ?? 0 }, });
             }
             if (updates.length > 0)
                 items.push({ itemId: `agy:step:${stepIndex}`, updates });