@wuyaos/pi-sync 1.2.1 → 1.3.0

package/extensions/sync/index.ts

@@ -1,9 +1,35 @@
-import { type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionContext, type SessionShutdownEvent } from "@earendil-works/pi-coding-agent";
+import * as fs from "node:fs";
 import * as path from "node:path";
 
-import { isProjectAllowed, loadConfig, refreshFooterStatusFromConfig } from "./config";
+import { AGENT_DIR, isProjectAllowed, loadConfig, refreshFooterStatusFromConfig, type SyncConfig } from "./config";
+import { ensureDir } from "../_shared/json-io";
 import { registerSyncCommand, uploadSessionProjectArchive } from "./menus";
 
+/** 退出时自动上传会话归档的最小间隔：频繁重启不应耗尽 maxBackups 把含历史的老归档轮替掉。 */
+export const EXIT_UPLOAD_MIN_INTERVAL_MS = 30 * 60 * 1000;
+
+const exitUploadMarkerPath = path.join(AGENT_DIR, "state", "pi-sync-last-exit-upload.txt");
+
+/**
+ * 判断退出自动上传是否到期。marker 不存在或距上次上传超过 minIntervalMs 时到期。
+ * 独立导出便于测试。
+ */
+export function exitUploadDue(markerPath: string, nowMs: number, minIntervalMs = EXIT_UPLOAD_MIN_INTERVAL_MS): boolean {
+  try {
+    const last = Number(fs.readFileSync(markerPath, "utf8").trim());
+    if (!Number.isFinite(last) || last <= 0) return true;
+    return nowMs - last >= minIntervalMs;
+  } catch {
+    return true;
+  }
+}
+
+export function recordExitUpload(markerPath: string, nowMs: number): void {
+  ensureDir(path.dirname(markerPath));
+  fs.writeFileSync(markerPath, String(nowMs));
+}
+
 export function projectDirFromSessionDir(sessionDir: string | undefined): string | undefined {
   if (!sessionDir) return undefined;
   const projectDir = path.basename(sessionDir);
@@ -11,25 +37,85 @@ export function projectDirFromSessionDir(sessionDir: string | undefined): string
 }
 
 /**
- * Archive-only pi-sync entrypoint.
+ * Archive-only pi-sync entrypoint。
  *
- * Runtime work is intentionally limited to one cached config read at startup
- * and one current-project archive on shutdown. There are no per-turn hooks,
- * timers, live uploads, or interval counters.
+ * 运行时工作仅限：启动时读一次缓存配置 + 关停时的会话归档（quit 同步等待，
+ * reload/new/resume/fork 转后台，不阻塞 reload）。无 per-turn 钩子、无定时器、无常驻上传。
  */
+let exitUploadInFlight = false;
+
+/** 测试用：重置后台任务标志。 */
+export function resetExitUploadInFlight(): void {
+  exitUploadInFlight = false;
+}
+
+export interface ExitUploadDeps {
+  upload?: typeof uploadSessionProjectArchive;
+  config?: SyncConfig;
+  now?: number;
+  markerPath?: string;
+}
+
+/**
+ * 退出自动上传会话归档。
+ * quit：进程即将终止，同步等待上传完成（fire-and-forget 会被终止）。
+ * reload/new/resume/fork：进程存活，上传转入后台，不阻塞 reload；
+ * 旧 runner 的 ctx.signal 在 teardown 后会失效，后台任务必须用独立 AbortController。
+ */
+export async function handleSessionShutdown(
+  event: Pick<SessionShutdownEvent, "reason">,
+  ctx: ExtensionContext,
+  deps: ExitUploadDeps = {},
+): Promise<void> {
+  const config = deps.config ?? loadConfig();
+  if (!config.backupOnExit || !config.backupSessions) return;
+  if (!config.webdavUrl || !config.webdavUser || !config.webdavPass) return;
+  const projectDir = projectDirFromSessionDir(ctx.sessionManager.getSessionDir());
+  if (!projectDir || !isProjectAllowed(projectDir, config)) return;
+  const now = deps.now ?? Date.now();
+  const markerPath = deps.markerPath ?? exitUploadMarkerPath;
+  if (!exitUploadDue(markerPath, now)) return;
+
+  const upload = deps.upload ?? uploadSessionProjectArchive;
+  const finish = (uploaded: boolean): void => {
+    if (uploaded) recordExitUpload(markerPath, now);
+  };
+
+  if (event.reason === "quit") {
+    finish(await upload(ctx, config, projectDir, true));
+    return;
+  }
+
+  if (exitUploadInFlight) return;
+  exitUploadInFlight = true;
+  const controller = new AbortController();
+  const detachedCtx = {
+    signal: controller.signal,
+    ui: {
+      notify: (message: string, type?: "info" | "warning" | "error"): void => {
+        try { ctx.ui.notify(message, type); } catch { /* UI 可能已随 reload 重建 */ }
+      },
+    },
+  } as unknown as ExtensionContext;
+  void (async (): Promise<void> => {
+    try {
+      finish(await upload(detachedCtx, config, projectDir, false));
+    } catch {
+      // 后台归档失败只影响本次节流窗口，不影响会话；marker 不写入，下个窗口重试。
+    } finally {
+      exitUploadInFlight = false;
+    }
+  })();
+}
+
 export default function registerSyncExtension(pi: ExtensionAPI): void {
   pi.on("session_start", async (_event, ctx) => {
     const config = loadConfig();
     refreshFooterStatusFromConfig(ctx, config);
   });
 
-  pi.on("session_shutdown", async (_event, ctx) => {
-    const config = loadConfig();
-    if (!config.backupOnExit || !config.backupSessions) return;
-    if (!config.webdavUrl || !config.webdavUser || !config.webdavPass) return;
-    const projectDir = projectDirFromSessionDir(ctx.sessionManager.getSessionDir());
-    if (!projectDir || !isProjectAllowed(projectDir, config)) return;
-    await uploadSessionProjectArchive(ctx, config, projectDir, true);
+  pi.on("session_shutdown", async (event, ctx) => {
+    await handleSessionShutdown(event, ctx);
   });
 
   registerSyncCommand(pi);

package/extensions/sync/webdav.ts

@@ -12,7 +12,15 @@ export const WEBDAV_AGENT_SKILLS_DIR = "backup/skills/";
 export const WEBDAV_SESSIONS_ARCHIVE_DIR = "backup/sessions/";
 
 export const ensureTrailingSlash = (url: string): string => url.endsWith("/") ? url : `${url}/`;
-export const webdavDirBase = (config: SyncConfig, remoteDir: string): string => ensureTrailingSlash(config.webdavUrl) + remoteDir.replace(/^\/+/, "");
+/**
+ * 拼接 WebDAV 目录 URL。remoteDir 逐段 encodeURIComponent，与 ensureWebdavDirectory
+ * 的编码一致；否则含中文/空格的 cwd 转义目录在严格 WebDAV 实现上会 400。
+ */
+export const webdavDirBase = (config: SyncConfig, remoteDir: string): string =>
+  remoteDir.split("/").filter(Boolean).reduce(
+    (url, segment) => `${url}${encodeURIComponent(segment)}/`,
+    ensureTrailingSlash(config.webdavUrl),
+  );
 export const webdavAuth = (config: SyncConfig): string => "Basic " + Buffer.from(`${config.webdavUser}:${resolvePassword(config.webdavPass)}`).toString("base64");
 
 export async function webdavList(url: string, auth: string, ctx: ExtensionContext, filter?: (name: string) => boolean): Promise<string[]> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wuyaos/pi-sync",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "WebDAV archive backup and restore for Pi agent data, shared skills, and per-project sessions",
   "keywords": [
     "pi-package",