@wuyaos/pi-sync 1.2.0 → 1.2.2

package/extensions/_shared/enhanced-select.ts

@@ -85,6 +85,12 @@ export interface EnhancedSelectOptions {
    * key takes precedence over filter input, mirroring shortcut-key behavior.
    */
   actionKeys?: Array<{ key: string; label: string }>;
+  /**
+   * Initial highlighted index (0-based). Defaults to 0. Clamped to the
+   * valid item range. Use to preserve cursor position across re-renders in
+   * looping menus (e.g. a config toggle that re-enters the select).
+   */
+  initialIndex?: number;
 }
 
 /** Sentinel prefix marking an action-key result from enhancedSelect. */
@@ -143,6 +149,13 @@ class EnhancedSelectComponent {
         this.shortcutMap.set(key, i);
       }
     }
+
+    // Preserve caller-provided cursor position; clamp to valid range so a
+    // stale index from a previous (longer) item list cannot overflow.
+    const initial = this.options.initialIndex ?? 0;
+    this.selectedIdx = this.items.length > 0
+      ? Math.max(0, Math.min(initial, this.items.length - 1))
+      : 0;
   }
 
   // ── Fuzzy filter state ──────────────────────────────────────────────

package/extensions/sync/i18n.ts

@@ -6,9 +6,9 @@ const EN = {
   enabled: "enabled",
   disabled: "disabled",
   keepAll: "keep all",
-  cancel: "❌ Cancel",
-  back: "x Back",
-  save: "s Save",
+  cancel: "x ✕ Cancel",
+  back: "b ← Back",
+  save: "s ✓ Save",
 
   menuTitle: "Pi WebDAV Backup",
   uploadAllBackups: "⬆️  Back Up All",
@@ -101,9 +101,9 @@ const ZH: Record<TranslationKey, string> = {
   enabled: "已启用",
   disabled: "已禁用",
   keepAll: "全部保留",
-  cancel: "❌ 取消",
-  back: "x 返回",
-  save: "s 保存",
+  cancel: "x ✕ 取消",
+  back: "b ← 返回",
+  save: "s ✓ 保存",
 
   menuTitle: "Pi WebDAV 备份",
   uploadAllBackups: "⬆️  全部备份",

package/extensions/sync/index.ts

@@ -1,9 +1,35 @@
 import { type ExtensionAPI } 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 } 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);
@@ -29,7 +55,10 @@ export default function registerSyncExtension(pi: ExtensionAPI): void {
     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);
+    const now = Date.now();
+    if (!exitUploadDue(exitUploadMarkerPath, now)) return;
+    const uploaded = await uploadSessionProjectArchive(ctx, config, projectDir, true);
+    if (uploaded) recordExitUpload(exitUploadMarkerPath, now);
   });
 
   registerSyncCommand(pi);

package/extensions/sync/menus.ts

@@ -73,8 +73,9 @@ async function selectAction<T extends string>(
   ctx: ExtensionCommandContext,
   title: string,
   items: SelectItem<T>[],
+  initialIndex = 0,
 ): Promise<T | undefined> {
-  const selected = await enhancedSelect(ctx, title, items.map((item) => item.label));
+  const selected = await enhancedSelect(ctx, title, items.map((item) => item.label), { initialIndex });
   return items.find((item) => item.label === selected)?.id;
 }
 
@@ -135,6 +136,7 @@ function sessionSelectionLabel(config: SyncConfig): string {
 }
 
 async function showSessionProjectSelect(ctx: ExtensionCommandContext, config: SyncConfig): Promise<void> {
+  let cursor = 0;
   while (true) {
     const language = config.language;
     const projects = listSessionProjects();
@@ -149,8 +151,9 @@ async function showSessionProjectSelect(ctx: ExtensionCommandContext, config: Sy
       })),
       { id: "back", label: t(language, "back") },
     ];
-    const action = await selectAction(ctx, t(language, "selectSessionProjects", { mode: modeLabel }), items);
+    const action = await selectAction(ctx, t(language, "selectSessionProjects", { mode: modeLabel }), items, cursor);
     if (!action || action === "back") return;
+    cursor = Math.max(0, items.findIndex((item) => item.id === action));
     if (action === "mode") {
       config.sessionProjectMode = config.sessionProjectMode === "whitelist" ? "blacklist" : "whitelist";
     } else if (action === "all") {
@@ -182,6 +185,7 @@ export async function showSetupWizard(ctx: ExtensionCommandContext): Promise<boo
 
 export async function showConfigureSettings(ctx: ExtensionCommandContext): Promise<void> {
   const config = cloneConfig(loadConfig());
+  let cursor = 0;
   while (true) {
     const language = config.language;
     const items: SelectItem<string>[] = [
@@ -199,8 +203,9 @@ export async function showConfigureSettings(ctx: ExtensionCommandContext): Promi
       { id: "save", label: t(language, "save") },
       { id: "back", label: t(language, "back") },
     ];
-    const action = await selectAction(ctx, t(language, "configureTitle"), items);
+    const action = await selectAction(ctx, t(language, "configureTitle"), items, cursor);
     if (!action || action === "back") return;
+    cursor = Math.max(0, items.findIndex((item) => item.id === action));
     if (action === "save") {
       saveConfig(config, ctx);
       ctx.ui.notify(t(language, "configSaved"), "info");
@@ -361,6 +366,19 @@ async function showRestorePackage(
         )) return false;
       }
       const restored = kind === "pi" ? await extractPiAgentZip(local) : await extractAgentSkillsZip(local);
+      if (kind === "pi") {
+        try {
+          // ctx.reload() 只重载扩展等资源，不会刷新内存中的 ModelRegistry。
+          // 禁用网络请求，仅重读刚恢复的 ~/.pi/agent/models.json，使模型选择器立即可见最新目录。
+          const refresh = await ctx.modelRegistry.refresh({ allowNetwork: false });
+          if (refresh.errors.size > 0) {
+            console.warn(`[pi-sync] Model catalog refresh completed with ${refresh.errors.size} error(s)`);
+          }
+        } catch (error) {
+          // 文件已恢复；模型刷新失败不应让整个恢复操作误报失败，重启 Pi 后仍会重新读取 models.json。
+          console.warn(`[pi-sync] Failed to refresh restored model catalog: ${error instanceof Error ? error.message : String(error)}`);
+        }
+      }
       ctx.ui.notify(t(language, "restoreCompleted", { kind: label, contents: restored.join("\n") }), "info");
       if (kind === "pi" && reloadAfter && await ctx.ui.confirm(t(language, "reloadRuntimeTitle"), t(language, "reloadRuntimeBody"))) {
         await ctx.reload();

package/extensions/sync/restore.ts

@@ -15,6 +15,9 @@ async function extractToTemp(archivePath: string, prefix: string): Promise<strin
 }
 
 function assertSafeRestoreParent(root: string, destination: string): void {
+  // destination 就是 root 本身（sessions 顶层合并的目标）是安全的：
+  // 此时 dirname(destination) 在 root 之外，会被下面的检查误判为路径逃逸。
+  if (path.resolve(destination) === path.resolve(root)) return;
   const relative = path.relative(root, path.dirname(destination));
   if (relative.startsWith("..") || path.isAbsolute(relative)) throw new Error(`Restore destination escapes root: ${destination}`);
   let current = root;
@@ -134,13 +137,14 @@ export async function extractAgentSkillsZip(archivePath: string, targetDir = AGE
   }
 }
 
-export async function extractSessionsArchiveZip(archivePath: string): Promise<string[]> {
+export async function extractSessionsArchiveZip(archivePath: string, targetDir = SESSIONS_DIR): Promise<string[]> {
   const tempDir = await extractToTemp(archivePath, "pi_sessions_extract");
   try {
     const source = path.join(tempDir, "sessions");
     if (!fs.existsSync(source)) throw new Error("Archive does not contain sessions/.");
-    fs.mkdirSync(SESSIONS_DIR, { recursive: true });
-    const fileCount = copyExtractedTree(source, SESSIONS_DIR, SESSIONS_DIR);
+    const target = path.resolve(targetDir);
+    fs.mkdirSync(target, { recursive: true });
+    const fileCount = copyExtractedTree(source, target, target);
     return [`Session archive merged: ${fileCount} file(s)`];
   } finally { fs.rmSync(tempDir, { recursive: true, force: true }); }
 }

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.0",
+  "version": "1.2.2",
   "description": "WebDAV archive backup and restore for Pi agent data, shared skills, and per-project sessions",
   "keywords": [
     "pi-package",
@@ -11,7 +11,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/wuyaos/pi-packages.git",
+    "url": "git+https://github.com/wuyaos/pi-packages.git",
     "directory": "pi-sync"
   },
   "publishConfig": {