@wuyaos/pi-sync 1.1.0 → 1.2.1

package/extensions/sync/menus.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -6,252 +6,571 @@ import { enhancedSelect } from "../_shared/enhanced-select";
 import {
   archiveTimestamp,
   createAgentSkillsZip,
-  createConfigZip,
-  createLegacyZip,
-  createMemoryZip,
+  createPiAgentZip,
   createSessionsArchiveZip,
   listArchiveEntries,
   platformTag,
   validateArchiveEntries,
-  yieldToUI,
 } from "./archive";
-import { loadConfig, saveConfig, isProjectAllowed, type SyncConfig } from "./config";
+import {
+  SESSIONS_DIR,
+  isProjectAllowed,
+  loadConfig,
+  normalizePiExcludePaths,
+  saveConfig,
+  type SyncConfig,
+} from "./config";
+import { t, type SyncLanguage } from "./i18n";
 import {
   extractAgentSkillsZip,
-  extractConfigZip,
-  extractLegacyZip,
-  extractMemoryZip,
+  extractPiAgentZip,
   extractSessionsArchiveZip,
   getRestorePlan,
 } from "./restore";
-import {
-  describeSessionSelection,
-  listSessionProjects,
-  sessionDirToPath,
-  showSessionProjectSelect,
-  showSessionSyncMenu,
-} from "./session-sync";
 import {
   downloadFromWebdavDir,
   listWebdavDir,
   pruneOldBackupsInDir,
-  sessionsWebdavBase,
   uploadToWebdavDir,
-  WEBDAV_AGENT_SKILLS_DIR,
-  WEBDAV_CONFIG_DIR,
-  WEBDAV_MEMORY_DIR,
-  WEBDAV_SESSIONS_DIR,
   webdavAuth,
-  webdavGetFile,
+  webdavDirBase,
   webdavList,
+  WEBDAV_AGENT_SKILLS_DIR,
+  WEBDAV_PI_BACKUP_DIR,
+  WEBDAV_SESSIONS_ARCHIVE_DIR,
 } from "./webdav";
 
+export type SelectItem<T extends string> = { id: T; label: string };
+type BackupKind = "pi" | "skills";
+export type MainAction =
+  | "upload-all" | "restore-all"
+  | "upload-pi" | "upload-skills" | "upload-sessions"
+  | "restore-pi" | "restore-skills" | "restore-sessions"
+  | "configure" | "language" | "cancel";
+
+export interface BulkResult {
+  kind: "pi" | "skills" | "session";
+  project?: string;
+  success: boolean;
+  error?: string;
+}
+
+export interface BackupAllOperations {
+  uploadPi(): Promise<boolean>;
+  uploadSkills(): Promise<boolean>;
+  listProjects(): string[];
+  uploadSession(project: string): Promise<boolean>;
+}
+
+export interface RestoreAllOperations {
+  restorePi(): Promise<boolean>;
+  restoreSkills(): Promise<boolean>;
+  listProjects(): Promise<string[]>;
+  restoreSession(project: string): Promise<boolean>;
+}
+
+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), { initialIndex });
+  return items.find((item) => item.label === selected)?.id;
+}
+
+function cloneConfig(config: SyncConfig): SyncConfig {
+  return {
+    ...config,
+    piExcludePaths: [...config.piExcludePaths],
+    sessionProjects: [...config.sessionProjects],
+  };
+}
+
+function onOff(language: SyncLanguage, value: boolean): string {
+  return t(language, value ? "on" : "off");
+}
+
+function kindLabel(language: SyncLanguage, kind: BackupKind): string {
+  return t(language, kind === "pi" ? "piKind" : "skillsKind");
+}
+
+export function buildMainMenuItems(language: SyncLanguage): SelectItem<MainAction>[] {
+  return [
+    { id: "upload-all", label: t(language, "uploadAllBackups") },
+    { id: "restore-all", label: t(language, "restoreAllBackups") },
+    { id: "upload-pi", label: t(language, "uploadPiBackup") },
+    { id: "upload-skills", label: t(language, "uploadSkillsBackup") },
+    { id: "upload-sessions", label: t(language, "uploadSessionsArchive") },
+    { id: "restore-pi", label: t(language, "restorePiBackup") },
+    { id: "restore-skills", label: t(language, "restoreSkillsBackup") },
+    { id: "restore-sessions", label: t(language, "restoreSessionsArchive") },
+    { id: "configure", label: t(language, "configureSettings") },
+    { id: "language", label: t(language, "switchLanguage") },
+    { id: "cancel", label: t(language, "cancel") },
+  ];
+}
+
+function listSessionProjects(): string[] {
+  if (!fs.existsSync(SESSIONS_DIR)) return [];
+  return fs.readdirSync(SESSIONS_DIR, { withFileTypes: true })
+    .filter((entry) => entry.isDirectory() && entry.name.startsWith("--") && entry.name.endsWith("--"))
+    .map((entry) => entry.name)
+    .sort((a, b) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }));
+}
+
+function sessionDirToPath(dirName: string): string {
+  let value = dirName;
+  if (value.startsWith("--")) value = value.slice(2);
+  if (value.endsWith("--")) value = value.slice(0, -2);
+  return value ? `/${value.replace(/-/g, "/")}` : dirName;
+}
+
+function sessionSelectionLabel(config: SyncConfig): string {
+  const language = config.language;
+  if (config.sessionProjects.length === 0) {
+    return t(language, config.sessionProjectMode === "blacklist" ? "projectSelectionAll" : "projectSelectionWhitelist");
+  }
+  const mode = t(language, config.sessionProjectMode === "blacklist" ? "projectModeBlacklist" : "projectModeWhitelist");
+  return `${mode}: ${config.sessionProjects.length}`;
+}
+
+async function showSessionProjectSelect(ctx: ExtensionCommandContext, config: SyncConfig): Promise<void> {
+  let cursor = 0;
+  while (true) {
+    const language = config.language;
+    const projects = listSessionProjects();
+    const modeLabel = t(language, config.sessionProjectMode === "blacklist" ? "projectModeBlacklist" : "projectModeWhitelist");
+    const items: SelectItem<string>[] = [
+      { id: "mode", label: t(language, "switchProjectMode", { mode: modeLabel }) },
+      { id: "all", label: t(language, "selectAllProjects") },
+      { id: "reset", label: t(language, "resetProjects") },
+      ...projects.map((project) => ({
+        id: `project:${project}`,
+        label: `[${config.sessionProjects.includes(project) ? "x" : " "}] ${sessionDirToPath(project)}`,
+      })),
+      { id: "back", label: t(language, "back") },
+    ];
+    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") {
+      config.sessionProjects = [...projects];
+    } else if (action === "reset") {
+      config.sessionProjects = [];
+    } else if (action.startsWith("project:")) {
+      const project = action.slice("project:".length);
+      config.sessionProjects = config.sessionProjects.includes(project)
+        ? config.sessionProjects.filter((item) => item !== project)
+        : [...config.sessionProjects, project];
+    }
+  }
+}
+
 export async function showSetupWizard(ctx: ExtensionCommandContext): Promise<boolean> {
-  const config = loadConfig();
-  ctx.ui.notify("WebDAV is not configured. Please set it up now.", "warning");
-  const url = await ctx.ui.input("WebDAV URL:", config.webdavUrl); if (!url) return false;
-  const user = await ctx.ui.input("WebDAV username:", config.webdavUser); if (!user) return false;
-  const pass = await ctx.ui.input("WebDAV token (or $ENV_VAR):", config.webdavPass); if (!pass) return false;
-  const merged = { ...config, webdavUrl: url.trim(), webdavUser: user.trim(), webdavPass: pass.trim() };
-  saveConfig(merged, ctx);
+  const config = cloneConfig(loadConfig());
+  const language = config.language;
+  ctx.ui.notify(t(language, "setupRequired"), "warning");
+  const url = await ctx.ui.input(t(language, "promptWebdavUrl"), config.webdavUrl); if (!url) return false;
+  const user = await ctx.ui.input(t(language, "promptWebdavUsername"), config.webdavUser); if (!user) return false;
+  const pass = await ctx.ui.input(t(language, "promptWebdavPassword"), config.webdavPass); if (!pass) return false;
+  config.webdavUrl = url.trim();
+  config.webdavUser = user.trim();
+  config.webdavPass = pass.trim();
+  saveConfig(config, ctx);
   return true;
 }
 
 export async function showConfigureSettings(ctx: ExtensionCommandContext): Promise<void> {
-  const config = loadConfig();
+  const config = cloneConfig(loadConfig());
+  let cursor = 0;
   while (true) {
-    const choice = await enhancedSelect(ctx, "Configure Sync Settings", [
-      `WebDAV URL: ${config.webdavUrl || "(not set)"}`,
-      `WebDAV Username: ${config.webdavUser || "(not set)"}`,
-      `WebDAV Password/Token: ${config.webdavPass ? "(set)" : "(not set)"}`,
-      `Backup Providers & Config: ${config.backupProviders ? "ON" : "OFF"}`,
-      `Backup Skills: ${config.backupSkills ? "ON" : "OFF"}`,
-      `Backup Extensions: ${config.backupExtensions ? "ON" : "OFF"}`,
-      `Backup Memory Markdown: ${config.backupMemory ? "ON" : "OFF"}`,
-      `Backup Shared Agent Skills: ${config.backupAgentSkills ? "ON" : "OFF"}`,
-      `Backup Sessions: ${config.backupSessions ? "ON" : "OFF"}`,
-      `  ↳ Session Projects: ${describeSessionSelection(config)}`,
-      `Session Project Mode: ${config.sessionProjectMode}`,
-      `Sync Every N Turns: ${config.syncIntervalTurns || "OFF"}`,
-      `Sync Session On Exit: ${config.syncSessionOnExit ? "ON" : "OFF"}`,
-      `Max Cloud Backups: ${config.maxBackups === 0 ? "keep all" : config.maxBackups}`,
-      "s Save", "x Back",
-    ]);
-    if (!choice || choice === "x Back") return;
-    if (choice === "s Save") { saveConfig(config, ctx); ctx.ui.notify("Sync configuration updated.", "info"); return; }
-    if (choice.startsWith("WebDAV URL:")) { const value = await ctx.ui.input("WebDAV URL:", config.webdavUrl); if (value) config.webdavUrl = value.trim(); continue; }
-    if (choice.startsWith("WebDAV Username:")) { const value = await ctx.ui.input("WebDAV username:", config.webdavUser); if (value) config.webdavUser = value.trim(); continue; }
-    if (choice.startsWith("WebDAV Password")) { const value = await ctx.ui.input("WebDAV token (or $ENV_VAR):", config.webdavPass); if (value) config.webdavPass = value.trim(); continue; }
-    if (choice.startsWith("Backup Providers")) { config.backupProviders = !config.backupProviders; continue; }
-    if (choice.startsWith("Backup Skills:")) { config.backupSkills = !config.backupSkills; continue; }
-    if (choice.startsWith("Backup Extensions")) { config.backupExtensions = !config.backupExtensions; continue; }
-    if (choice.startsWith("Backup Memory")) { config.backupMemory = !config.backupMemory; continue; }
-    if (choice.startsWith("Backup Shared")) { config.backupAgentSkills = !config.backupAgentSkills; continue; }
-    if (choice.startsWith("Backup Sessions")) { config.backupSessions = !config.backupSessions; continue; }
-    if (choice.startsWith("  ↳")) { await showSessionProjectSelect(ctx, config); continue; }
-    if (choice.startsWith("Session Project Mode")) { config.sessionProjectMode = config.sessionProjectMode === "whitelist" ? "blacklist" : "whitelist"; continue; }
-    if (choice.startsWith("Sync Every")) { const value = await ctx.ui.input("Every N turns (0 = off):", String(config.syncIntervalTurns)); const n = value ? parseInt(value, 10) : NaN; if (n >= 0) config.syncIntervalTurns = n; continue; }
-    if (choice.startsWith("Sync Session On Exit")) { config.syncSessionOnExit = !config.syncSessionOnExit; continue; }
-    if (choice.startsWith("Max Cloud")) { const value = await ctx.ui.input("Maximum backups (0 = all):", String(config.maxBackups)); const n = value ? parseInt(value, 10) : NaN; if (n >= 0) config.maxBackups = n; continue; }
+    const language = config.language;
+    const items: SelectItem<string>[] = [
+      { id: "url", label: t(language, "webdavUrl", { value: config.webdavUrl || t(language, "notSet") }) },
+      { id: "user", label: t(language, "webdavUsername", { value: config.webdavUser || t(language, "notSet") }) },
+      { id: "password", label: t(language, "webdavPassword", { value: config.webdavPass ? t(language, "passwordSet") : t(language, "notSet") }) },
+      { id: "pi", label: t(language, "piBackup", { value: onOff(language, config.backupProviders) }) },
+      { id: "skills", label: t(language, "skillsBackup", { value: onOff(language, config.backupAgentSkills) }) },
+      { id: "sessions", label: t(language, "sessionsBackup", { value: onOff(language, config.backupSessions) }) },
+      { id: "exit", label: t(language, "backupOnExit", { value: onOff(language, config.backupOnExit) }) },
+      { id: "exclude", label: t(language, "piExcludePaths", { value: config.piExcludePaths.join(", ") || t(language, "none") }) },
+      { id: "projects", label: t(language, "sessionProjects", { value: sessionSelectionLabel(config) }) },
+      { id: "mode", label: t(language, "sessionProjectMode", { value: t(language, config.sessionProjectMode === "blacklist" ? "projectModeBlacklist" : "projectModeWhitelist") }) },
+      { id: "max", label: t(language, "maxCloudBackups", { value: config.maxBackups === 0 ? t(language, "keepAll") : config.maxBackups }) },
+      { id: "save", label: t(language, "save") },
+      { id: "back", label: t(language, "back") },
+    ];
+    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");
+      return;
+    }
+    if (action === "url") {
+      const value = await ctx.ui.input(t(language, "promptWebdavUrl"), config.webdavUrl);
+      if (value) config.webdavUrl = value.trim();
+    } else if (action === "user") {
+      const value = await ctx.ui.input(t(language, "promptWebdavUsername"), config.webdavUser);
+      if (value) config.webdavUser = value.trim();
+    } else if (action === "password") {
+      const value = await ctx.ui.input(t(language, "promptWebdavPassword"), config.webdavPass);
+      if (value) config.webdavPass = value.trim();
+    } else if (action === "pi") {
+      config.backupProviders = !config.backupProviders;
+    } else if (action === "skills") {
+      config.backupAgentSkills = !config.backupAgentSkills;
+    } else if (action === "sessions") {
+      config.backupSessions = !config.backupSessions;
+    } else if (action === "exit") {
+      config.backupOnExit = !config.backupOnExit;
+    } else if (action === "exclude") {
+      const value = await ctx.ui.input(t(language, "promptExcludePaths"), config.piExcludePaths.join(", "));
+      if (value !== undefined) config.piExcludePaths = normalizePiExcludePaths(value.split(/[\n,]/));
+    } else if (action === "projects") {
+      await showSessionProjectSelect(ctx, config);
+    } else if (action === "mode") {
+      config.sessionProjectMode = config.sessionProjectMode === "whitelist" ? "blacklist" : "whitelist";
+    } else if (action === "max") {
+      const value = await ctx.ui.input(t(language, "promptMaxBackups"), String(config.maxBackups));
+      const count = value ? Number.parseInt(value, 10) : Number.NaN;
+      if (count >= 0) config.maxBackups = count;
+    }
   }
 }
 
-type BackupKind = "config" | "memory" | "agent-skills";
+function packageMeta(kind: BackupKind): { filename: string; dir: string; prefix: string } {
+  const timestamp = archiveTimestamp();
+  return kind === "pi"
+    ? { filename: `pi_agent_${platformTag()}_${timestamp}.tar.xz`, dir: WEBDAV_PI_BACKUP_DIR, prefix: "pi_agent_" }
+    : { filename: `agent_skills_${timestamp}.tar.xz`, dir: WEBDAV_AGENT_SKILLS_DIR, prefix: "agent_skills_" };
+}
 
-async function showUploadPackage(ctx: ExtensionCommandContext, kind: BackupKind): Promise<void> {
+async function showUploadPackage(ctx: ExtensionCommandContext, kind: BackupKind, notify = true): Promise<boolean> {
   const config = loadConfig();
-  if (kind === "memory" && !config.backupMemory) { ctx.ui.notify("Memory backup is disabled.", "warning"); return; }
-  if (kind === "agent-skills" && !config.backupAgentSkills) { ctx.ui.notify("Shared skills backup is disabled.", "warning"); return; }
-  const timestamp = archiveTimestamp();
-  const meta = kind === "config"
-    ? { filename: `pi_config_${platformTag()}_${timestamp}.tar.xz`, dir: WEBDAV_CONFIG_DIR, prefix: "pi_config_" }
-    : kind === "memory"
-      ? { filename: `memory_${timestamp}.tar.xz`, dir: WEBDAV_MEMORY_DIR, prefix: "memory_" }
-      : { filename: `agent_skills_${timestamp}.tar.xz`, dir: WEBDAV_AGENT_SKILLS_DIR, prefix: "agent_skills_" };
+  const language = config.language;
+  const label = kindLabel(language, kind);
+  const enabled = kind === "pi" ? config.backupProviders : config.backupAgentSkills;
+  if (!enabled) {
+    if (notify) ctx.ui.notify(t(language, "backupDisabled", { kind: label }), "warning");
+    return false;
+  }
+  const meta = packageMeta(kind);
   const archive = path.join(os.tmpdir(), meta.filename);
   try {
-    const contents = kind === "config" ? await createConfigZip(config, archive) : kind === "memory" ? await createMemoryZip(archive) : await createAgentSkillsZip(archive);
+    const contents = kind === "pi"
+      ? await createPiAgentZip(config, archive)
+      : await createAgentSkillsZip(archive);
     await uploadToWebdavDir(archive, meta.dir, meta.filename, config, ctx);
     const deleted = await pruneOldBackupsInDir(config, ctx, meta.dir, meta.prefix);
-    ctx.ui.notify(`🎉 Uploaded ${meta.filename}\n${contents.join("\n")}${deleted.length ? `\nPruned: ${deleted.length}` : ""}`, "info");
-  } catch (error) { ctx.ui.notify(`❌ ${kind} backup failed: ${error instanceof Error ? error.message : String(error)}`, "error"); }
-  finally { fs.rmSync(archive, { force: true }); }
+    const pruned = deleted.length ? t(language, "prunedCount", { count: deleted.length }) : "";
+    if (notify) ctx.ui.notify(t(language, "backupUploaded", { filename: meta.filename, contents: contents.join("\n"), pruned }), "info");
+    return true;
+  } catch (error) {
+    if (notify) ctx.ui.notify(t(language, "backupFailed", { kind: label, error: error instanceof Error ? error.message : String(error) }), "error");
+    return false;
+  } finally { fs.rmSync(archive, { force: true }); }
 }
 
-async function showUploadSessionsArchive(ctx: ExtensionCommandContext): Promise<void> {
-  const config = loadConfig();
-  const projects = listSessionProjects().filter((project) => isProjectAllowed(project, config));
-  if (!projects.length) { ctx.ui.notify("No allowed local session projects found.", "warning"); return; }
-  const project = await enhancedSelect(ctx, "Archive session project", [...projects, "❌ Cancel"], { fuzzy: true });
-  if (!project || project.includes("Cancel")) return;
+export async function uploadSessionProjectArchive(
+  ctx: ExtensionContext,
+  config: SyncConfig,
+  project: string,
+  notify = true,
+): Promise<boolean> {
+  const language = config.language;
   const filename = `sessions_${platformTag()}_${archiveTimestamp()}.tar.xz`;
-  const archive = path.join(os.tmpdir(), filename), remoteDir = `${WEBDAV_SESSIONS_DIR}${project}/archive/`;
+  const archive = path.join(os.tmpdir(), filename);
+  const remoteDir = `${WEBDAV_SESSIONS_ARCHIVE_DIR}${project}/`;
   try {
     const contents = await createSessionsArchiveZip(project, archive);
     await uploadToWebdavDir(archive, remoteDir, filename, config, ctx);
     await pruneOldBackupsInDir(config, ctx, remoteDir, "sessions_");
-    ctx.ui.notify(`🎉 Uploaded ${filename}\n${contents.join("\n")}`, "info");
-  } catch (error) { ctx.ui.notify(`❌ Session archive failed: ${error instanceof Error ? error.message : String(error)}`, "error"); }
-  finally { fs.rmSync(archive, { force: true }); }
+    if (notify) ctx.ui.notify(t(language, "sessionArchiveUploaded", { filename, contents: contents.join("\n") }), "info");
+    return true;
+  } catch (error) {
+    if (notify) ctx.ui.notify(t(language, "sessionArchiveFailed", { error: error instanceof Error ? error.message : String(error) }), "error");
+    return false;
+  } finally { fs.rmSync(archive, { force: true }); }
 }
 
-async function showRestorePackage(ctx: ExtensionCommandContext, kind: BackupKind, autoLatest = false): Promise<boolean> {
+async function showUploadSessionsArchive(ctx: ExtensionCommandContext): Promise<boolean> {
   const config = loadConfig();
-  const meta = kind === "config" ? { dir: WEBDAV_CONFIG_DIR, prefix: "pi_config_" } : kind === "memory" ? { dir: WEBDAV_MEMORY_DIR, prefix: "memory_" } : { dir: WEBDAV_AGENT_SKILLS_DIR, prefix: "agent_skills_" };
+  const language = config.language;
+  if (!config.backupSessions) {
+    ctx.ui.notify(t(language, "backupDisabled", { kind: t(language, "sessionsKind") }), "warning");
+    return false;
+  }
+  const projects = listSessionProjects().filter((project) => isProjectAllowed(project, config));
+  if (!projects.length) {
+    ctx.ui.notify(t(language, "noAllowedSessionProjects"), "warning");
+    return false;
+  }
+  const items: SelectItem<string>[] = [
+    ...projects.map((project) => ({ id: project, label: sessionDirToPath(project) })),
+    { id: "cancel", label: t(language, "cancel") },
+  ];
+  const project = await selectAction(ctx, t(language, "archiveSessionProject"), items);
+  if (!project || project === "cancel") return false;
+  return uploadSessionProjectArchive(ctx, config, project);
+}
+
+async function showRestorePackage(
+  ctx: ExtensionCommandContext,
+  kind: BackupKind,
+  autoLatest = false,
+  reloadAfter = true,
+): Promise<boolean> {
+  const config = loadConfig();
+  const language = config.language;
+  const label = kindLabel(language, kind);
+  const meta = packageMeta(kind);
   try {
-    const files = (await listWebdavDir(meta.dir, config, ctx)).filter((name) => name.startsWith(meta.prefix) && name.endsWith(".tar.xz")).sort().reverse();
-    if (!files.length) { ctx.ui.notify(`No ${kind} archives found.`, "warning"); return false; }
+    const files = (await listWebdavDir(meta.dir, config, ctx))
+      .filter((name) => name.startsWith(meta.prefix) && name.endsWith(".tar.xz"))
+      .sort()
+      .reverse();
+    if (!files.length) {
+      ctx.ui.notify(t(language, "noArchivesFound", { kind: label }), "warning");
+      return false;
+    }
     let selected: string | undefined;
-    if (autoLatest) selected = files[0];
-    else { selected = await enhancedSelect(ctx, `Restore ${kind} archive`, [...files, "❌ Cancel"], { fuzzy: true }); if (!selected || selected.includes("Cancel")) return false; }
-    if (kind === "agent-skills" && !await ctx.ui.confirm("Replace shared skills?", "The current ~/.agents/skills will be moved to a timestamped backup.")) return false;
+    if (autoLatest) {
+      selected = files[0];
+    } else {
+      const items: SelectItem<string>[] = [
+        ...files.map((file) => ({ id: file, label: file })),
+        { id: "cancel", label: t(language, "cancel") },
+      ];
+      selected = await selectAction(ctx, t(language, "restoreArchive", { kind: label }), items);
+    }
+    if (!selected || selected === "cancel") return false;
+    if (kind === "skills" && !await ctx.ui.confirm(
+      t(language, "replaceSharedSkillsTitle"),
+      t(language, "replaceSharedSkillsBody"),
+    )) return false;
     const local = path.join(os.tmpdir(), path.basename(selected));
     try {
       await downloadFromWebdavDir(selected, meta.dir, local, config, ctx);
-      const restored = kind === "config" ? await extractConfigZip(local, config) : kind === "memory" ? await extractMemoryZip(local) : await extractAgentSkillsZip(local);
-      ctx.ui.notify(`🎉 Restored ${kind}:\n${restored.join("\n")}`, "info");
+      if (kind === "pi") {
+        const entries = await listArchiveEntries(local);
+        validateArchiveEntries(entries);
+        const plan = getRestorePlan(entries).join("\n");
+        if (!await ctx.ui.confirm(
+          t(language, "confirmPiRestoreTitle"),
+          t(language, "confirmPiRestoreBody", { count: entries.length, plan }),
+        )) 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();
+      }
       return true;
     } finally { fs.rmSync(local, { force: true }); }
-  } catch (error) { ctx.ui.notify(`❌ ${kind} restore failed: ${error instanceof Error ? error.message : String(error)}`, "error"); return false; }
+  } catch (error) {
+    ctx.ui.notify(t(language, "restoreFailed", { kind: label, error: error instanceof Error ? error.message : String(error) }), "error");
+    return false;
+  }
 }
 
-async function showUploadAll(ctx: ExtensionCommandContext): Promise<void> {
-  const results: string[] = [];
-  for (const kind of ["config", "memory", "agent-skills"] as BackupKind[]) {
-    const config = loadConfig();
-    if (kind === "config" && !config.backupProviders) { results.push(`⏭️  config (disabled)`); continue; }
-    if (kind === "memory" && !config.backupMemory) { results.push(`⏭️  memory (disabled)`); continue; }
-    if (kind === "agent-skills" && !config.backupAgentSkills) { results.push(`⏭️  agent-skills (disabled)`); continue; }
-    await showUploadPackage(ctx, kind);
-    results.push(`✅ ${kind}`);
+async function restoreSessionProjectArchive(
+  ctx: ExtensionCommandContext,
+  config: SyncConfig,
+  project: string,
+  autoLatest = false,
+  notify = true,
+): Promise<boolean> {
+  const language = config.language;
+  const remoteDir = `${WEBDAV_SESSIONS_ARCHIVE_DIR}${project}/`;
+  try {
+    const files = (await listWebdavDir(remoteDir, config, ctx))
+      .filter((name) => name.startsWith("sessions_") && name.endsWith(".tar.xz"))
+      .sort()
+      .reverse();
+    if (!files.length) {
+      if (notify) ctx.ui.notify(t(language, "noArchivesFound", { kind: t(language, "sessionsKind") }), "warning");
+      return false;
+    }
+    let selected: string | undefined;
+    if (autoLatest) {
+      selected = files[0];
+    } else {
+      const archiveItems: SelectItem<string>[] = [
+        ...files.map((file) => ({ id: file, label: file })),
+        { id: "cancel", label: t(language, "cancel") },
+      ];
+      selected = await selectAction(ctx, t(language, "selectSessionArchive"), archiveItems);
+    }
+    if (!selected || selected === "cancel") return false;
+    const local = path.join(os.tmpdir(), path.basename(selected));
+    try {
+      await downloadFromWebdavDir(selected, remoteDir, local, config, ctx);
+      const restored = await extractSessionsArchiveZip(local);
+      if (notify) ctx.ui.notify(t(language, "sessionRestoreCompleted", { contents: restored.join("\n") }), "info");
+      return true;
+    } finally { fs.rmSync(local, { force: true }); }
+  } catch (error) {
+    if (notify) ctx.ui.notify(t(language, "sessionRestoreFailed", { error: error instanceof Error ? error.message : String(error) }), "error");
+    return false;
   }
-  ctx.ui.notify(`Upload All complete:\n${results.join("\n")}\n\n💡 Sessions: use 🗂️ Upload Sessions Archive or 🔄 Session Sync.`, "info");
 }
 
-async function showRestoreAll(ctx: ExtensionCommandContext): Promise<void> {
-  const results: string[] = [];
-  for (const kind of ["config", "memory", "agent-skills"] as BackupKind[]) {
-    const ok = await showRestorePackage(ctx, kind, true);
-    results.push(ok ? `✅ ${kind}` : `⏭️  ${kind} (skipped)`);
-  }
-  ctx.ui.notify(`Restore All complete:\n${results.join("\n")}`, "info");
-  if (results.some((r) => r.startsWith("✅")) && await ctx.ui.confirm("Reload Runtime?", "Reload Pi to apply the restored data?")) await ctx.reload();
+async function listRemoteSessionProjects(ctx: ExtensionCommandContext, config: SyncConfig): Promise<string[]> {
+  const base = webdavDirBase(config, WEBDAV_SESSIONS_ARCHIVE_DIR);
+  return webdavList(base, webdavAuth(config), ctx, (name) => name.startsWith("--") && name.endsWith("--"));
 }
 
-async function showRestoreSessionsArchive(ctx: ExtensionCommandContext): Promise<void> {
+async function showRestoreSessionsArchive(ctx: ExtensionCommandContext): Promise<boolean> {
   const config = loadConfig();
+  const language = config.language;
   try {
-    const projects = await webdavList(sessionsWebdavBase(config), webdavAuth(config), ctx, (name) => name.startsWith("--") && name.endsWith("--"));
-    const project = await enhancedSelect(ctx, "Restore session archive: project", [...projects, "❌ Cancel"], { fuzzy: true }); if (!project || project.includes("Cancel")) return;
-    const remoteDir = `${WEBDAV_SESSIONS_DIR}${project}/archive/`;
-    const files = (await listWebdavDir(remoteDir, config, ctx)).filter((name) => name.startsWith("sessions_") && name.endsWith(".tar.xz")).sort().reverse();
-    const selected = await enhancedSelect(ctx, "Select session archive", [...files, "❌ Cancel"], { fuzzy: true }); if (!selected || selected.includes("Cancel")) return;
-    const local = path.join(os.tmpdir(), path.basename(selected));
-    try { await downloadFromWebdavDir(selected, remoteDir, local, config, ctx); ctx.ui.notify(`🎉 ${(await extractSessionsArchiveZip(local)).join("\n")}`, "info"); }
-    finally { fs.rmSync(local, { force: true }); }
-  } catch (error) { ctx.ui.notify(`❌ Session restore failed: ${error instanceof Error ? error.message : String(error)}`, "error"); }
+    const projects = (await listRemoteSessionProjects(ctx, config)).filter((project) => isProjectAllowed(project, config));
+    if (!projects.length) {
+      ctx.ui.notify(t(language, "noRemoteSessionProjects"), "warning");
+      return false;
+    }
+    const projectItems: SelectItem<string>[] = [
+      ...projects.map((project) => ({ id: project, label: sessionDirToPath(project) })),
+      { id: "cancel", label: t(language, "cancel") },
+    ];
+    const project = await selectAction(ctx, t(language, "restoreSessionProject"), projectItems);
+    if (!project || project === "cancel") return false;
+    return restoreSessionProjectArchive(ctx, config, project);
+  } catch (error) {
+    ctx.ui.notify(t(language, "sessionRestoreFailed", { error: error instanceof Error ? error.message : String(error) }), "error");
+    return false;
+  }
 }
 
-async function listLegacyBackups(config: SyncConfig, ctx: ExtensionCommandContext): Promise<string[]> {
-  return (await listWebdavDir("", config, ctx)).filter((name) => name.startsWith("pi_sync_backup_") && (name.endsWith(".tar.xz") || name.endsWith(".zip"))).sort().reverse();
+export async function executeBackupAll(config: SyncConfig, operations: BackupAllOperations): Promise<BulkResult[]> {
+  const results: BulkResult[] = [];
+  if (config.backupProviders) {
+    results.push({ kind: "pi", success: await operations.uploadPi() });
+  }
+  if (config.backupAgentSkills) {
+    results.push({ kind: "skills", success: await operations.uploadSkills() });
+  }
+  if (config.backupSessions) {
+    const projects = operations.listProjects().filter((project) => isProjectAllowed(project, config));
+    for (const project of projects) {
+      results.push({ kind: "session", project, success: await operations.uploadSession(project) });
+    }
+  }
+  return results;
 }
 
-async function showUploadLegacy(ctx: ExtensionCommandContext): Promise<void> {
-  const config = loadConfig(), filename = `pi_sync_backup_${archiveTimestamp()}_${platformTag()}.tar.xz`, local = path.join(os.tmpdir(), filename);
-  try { const contents = await createLegacyZip(config, local); await uploadToWebdavDir(local, "", filename, config, ctx); await pruneOldBackupsInDir(config, ctx, "", "pi_sync_backup_"); ctx.ui.notify(`🎉 Legacy backup uploaded\n${contents.join("\n")}`, "info"); }
-  catch (error) { ctx.ui.notify(`❌ Legacy backup failed: ${error instanceof Error ? error.message : String(error)}`, "error"); }
-  finally { fs.rmSync(local, { force: true }); }
+export async function executeRestoreAll(config: SyncConfig, operations: RestoreAllOperations): Promise<BulkResult[]> {
+  const results: BulkResult[] = [];
+  if (config.backupProviders) {
+    results.push({ kind: "pi", success: await operations.restorePi() });
+  }
+  if (config.backupAgentSkills) {
+    results.push({ kind: "skills", success: await operations.restoreSkills() });
+  }
+  if (config.backupSessions) {
+    try {
+      const projects = (await operations.listProjects()).filter((project) => isProjectAllowed(project, config));
+      for (const project of projects) {
+        results.push({ kind: "session", project, success: await operations.restoreSession(project) });
+      }
+    } catch (error) {
+      results.push({ kind: "session", success: false, error: errorMessage(error) });
+    }
+  }
+  return results;
+}
+
+function errorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
+function formatBulkResults(language: SyncLanguage, results: BulkResult[]): string {
+  return results.map((result) => {
+    const label = result.kind === "pi"
+      ? t(language, "piKind")
+      : result.kind === "skills"
+        ? t(language, "skillsKind")
+        : result.project ? sessionDirToPath(result.project) : t(language, "sessionsKind");
+    return `${result.success ? "✅" : "❌"} ${label}${result.error ? `: ${result.error}` : ""}`;
+  }).join("\n");
 }
 
-async function showRestoreLegacy(ctx: ExtensionCommandContext): Promise<void> {
+async function showUploadAll(ctx: ExtensionCommandContext): Promise<void> {
   const config = loadConfig();
-  try {
-    const files = await listLegacyBackups(config, ctx); if (!files.length) { ctx.ui.notify("No legacy backups found.", "warning"); return; }
-    const selected = await enhancedSelect(ctx, "Select legacy backup", [...files, "❌ Cancel"], { fuzzy: true }); if (!selected || selected.includes("Cancel")) return;
-    const local = path.join(os.tmpdir(), path.basename(selected));
-    try {
-      await downloadFromWebdavDir(selected, "", local, config, ctx);
-      const entries = await listArchiveEntries(local); validateArchiveEntries(entries);
-      if (!await ctx.ui.confirm("Confirm restore?", [`Entries: ${entries.length}`, ...getRestorePlan(entries, config)].join("\n"))) return;
-      await yieldToUI();
-      const restored = await extractLegacyZip(local, config); ctx.ui.notify(`🎉 Restored:\n${restored.join("\n")}`, "info");
-      if (await ctx.ui.confirm("Reload Runtime?", "Reload Pi now?")) await ctx.reload();
-    } finally { fs.rmSync(local, { force: true }); }
-  } catch (error) { ctx.ui.notify(`❌ Legacy restore failed: ${error instanceof Error ? error.message : String(error)}`, "error"); }
+  const language = config.language;
+  const results = await executeBackupAll(config, {
+    uploadPi: () => showUploadPackage(ctx, "pi", false),
+    uploadSkills: () => showUploadPackage(ctx, "skills", false),
+    listProjects: () => listSessionProjects(),
+    uploadSession: (project) => uploadSessionProjectArchive(ctx, config, project, false),
+  });
+  ctx.ui.notify(t(language, "allBackupCompleted", { results: formatBulkResults(language, results) || t(language, "none") }), "info");
+}
+
+async function showRestoreAll(ctx: ExtensionCommandContext): Promise<void> {
+  const config = loadConfig();
+  const language = config.language;
+  if (!await ctx.ui.confirm(t(language, "confirmRestoreAllTitle"), t(language, "confirmRestoreAllBody"))) return;
+  const results = await executeRestoreAll(config, {
+    restorePi: () => showRestorePackage(ctx, "pi", true, false),
+    restoreSkills: () => showRestorePackage(ctx, "skills", true, false),
+    listProjects: () => listRemoteSessionProjects(ctx, config),
+    restoreSession: (project) => restoreSessionProjectArchive(ctx, config, project, true, false),
+  });
+  ctx.ui.notify(t(language, "allRestoreCompleted", { results: formatBulkResults(language, results) || t(language, "none") }), "info");
+  if (results.some((result) => result.success)
+    && await ctx.ui.confirm(t(language, "reloadRuntimeTitle"), t(language, "reloadRuntimeBody"))) {
+    await ctx.reload();
+  }
 }
 
 export async function handleSyncCommand(ctx: ExtensionCommandContext): Promise<void> {
   let config = loadConfig();
-  if (!config.webdavUrl || !config.webdavUser || !config.webdavPass) { if (!await showSetupWizard(ctx)) return; config = loadConfig(); }
-  const choice = await enhancedSelect(ctx, "Pi WebDAV Synchronization", [
-    "⬆️  Upload All (config + memory + skills)", "⬇️  Restore All (latest)",
-    "☁️  Upload Config Backup", "🧠 Upload Memory Backup", "📦 Upload Skills Snapshot", "🗂️  Upload Sessions Archive",
-    "📥 Restore Config Backup", "📥 Restore Memory Backup", "📥 Restore Skills Snapshot", "📥 Restore Sessions Archive",
-    "🔄 Session Sync", "🧰 Legacy Monolithic Backup/Restore", "⚙️  Configure Sync Settings", "❌  Cancel",
-  ]);
-  if (!choice || choice.includes("Cancel")) return;
-  if (choice.startsWith("⬆️  Upload All")) return showUploadAll(ctx);
-  if (choice.startsWith("⬇️  Restore All")) return showRestoreAll(ctx);
-  if (choice.includes("Configure")) return showConfigureSettings(ctx);
-  if (choice === "☁️  Upload Config Backup") return showUploadPackage(ctx, "config");
-  if (choice === "🧠 Upload Memory Backup") return showUploadPackage(ctx, "memory");
-  if (choice === "📦 Upload Skills Snapshot") return showUploadPackage(ctx, "agent-skills");
-  if (choice === "🗂️  Upload Sessions Archive") return showUploadSessionsArchive(ctx);
-  if (choice === "📥 Restore Config Backup") return showRestorePackage(ctx, "config");
-  if (choice === "📥 Restore Memory Backup") return showRestorePackage(ctx, "memory");
-  if (choice === "📥 Restore Skills Snapshot") return showRestorePackage(ctx, "agent-skills");
-  if (choice === "📥 Restore Sessions Archive") return showRestoreSessionsArchive(ctx);
-  if (choice.startsWith("🔄")) return showSessionSyncMenu(ctx);
-  if (choice.startsWith("🧰")) {
-    const action = await enhancedSelect(ctx, "Legacy backup", ["Upload legacy backup", "Restore legacy backup", "❌ Cancel"]);
-    if (action?.startsWith("Upload")) return showUploadLegacy(ctx);
-    if (action?.startsWith("Restore")) return showRestoreLegacy(ctx);
+  if (!config.webdavUrl || !config.webdavUser || !config.webdavPass) {
+    if (!await showSetupWizard(ctx)) return;
+  }
+  while (true) {
+    config = loadConfig();
+    const language = config.language;
+    const items = buildMainMenuItems(language);
+    const action = await selectAction(ctx, t(language, "menuTitle"), items);
+    if (!action || action === "cancel") return;
+    if (action === "upload-all") await showUploadAll(ctx);
+    else if (action === "restore-all") await showRestoreAll(ctx);
+    else if (action === "upload-pi") await showUploadPackage(ctx, "pi");
+    else if (action === "upload-skills") await showUploadPackage(ctx, "skills");
+    else if (action === "upload-sessions") await showUploadSessionsArchive(ctx);
+    else if (action === "restore-pi") await showRestorePackage(ctx, "pi");
+    else if (action === "restore-skills") await showRestorePackage(ctx, "skills");
+    else if (action === "restore-sessions") await showRestoreSessionsArchive(ctx);
+    else if (action === "configure") await showConfigureSettings(ctx);
+    else if (action === "language") {
+      saveConfig({ ...config, language: language === "zh" ? "en" : "zh" }, ctx);
+    }
   }
 }
 
 export function registerSyncCommand(pi: ExtensionAPI): void {
   pi.registerCommand("sync", {
-    description: "Sync configurations, skills, extensions, and sessions via WebDAV",
+    description: "Back up and restore Pi data via WebDAV",
     getArgumentCompletions: () => null,
     handler: async (_args, ctx) => handleSyncCommand(ctx),
   });