@gfgghgftgffg/amox-pi-sync 0.1.1 → 0.1.2

package/MAINTENANCE.md

@@ -5,13 +5,13 @@
 - Upstream: [MuratAitov/pi-sync](https://github.com/MuratAitov/pi-sync), npm `pi-sync-suite@0.1.1`.
 - Source ref: `npm:pi-sync-suite@0.1.1` (published source baseline, not the repository's moving HEAD).
 - Upstream MIT notice is preserved verbatim in `LICENSE`: Copyright (c) 2026 Murat.
-- Local package: `@gfgghgftgffg/amox-pi-sync@0.1.1`, standalone TypeScript entrypoint `index.ts` and `core.ts`; no runtime dependency on the original suite.
+- Local package: `@gfgghgftgffg/amox-pi-sync@0.1.2`, standalone TypeScript entrypoint `index.ts` and `core.ts`; no runtime dependency on the original suite.
 
 ## Scope
 
 Keep raw agent-data push/pull, safe relative include/exclude paths (sessions + missions by default), manual/background automatic sync, backups/restoration and diagnostics. No configuration sync/settings merging, Markdown/JSON exports, Environment Tools or Local Packages. Cleanup is retained only for manually deleting local backup directories (Preview, Run, Delete Selected Backup, Retention); never sessions/missions, with no automatic deletion or archive restoration. Default cleanup candidates are complete backups older than 180 days or beyond the newest 20; counting individual files is not the retention unit. No three-line widget: optional Starline capsule/details, with `/sync-status` fallback.
 
-Settings are stored in `amox-pi-sync.json`; legacy `pi-sync-suite.json` is read only as a migration fallback until new settings are saved. Backups use `amox-pi-sync-backups` and require manual retention management via Cleanup. Manual/off startup must not access the network; auto startup fingerprints locally then starts timers and a non-awaited background pull. Setup only saves configuration and stops timers, requiring reload to activate auto mode. The automatic loop must not block the UI. Migration uses an independent `amox-pi-sync-repo`, not the old snapshot directory. The `pi-sync` status key preserves existing Starline placement; the pill bridge takes priority over legacy command mapping. `off` disables automation, not explicit commands.
+Settings are stored in `amox-pi-sync.json`; legacy `pi-sync-suite.json` is read only as a migration fallback until new settings are saved. Backups use `amox-pi-sync-backups` and require manual retention management via Cleanup. Manual/off startup must not access the network; auto startup fingerprints locally then starts timers and a non-awaited background pull. Setup only saves configuration and stops timers, requiring reload to activate auto mode. The automatic loop must not block the UI. Migration uses an independent `amox-pi-sync-repo`, not the old snapshot directory. The `pi-sync` status key preserves existing Starline placement; the pill bridge takes priority over legacy command mapping. `off` disables automation, not explicit commands. Presentation uses semantic Pi theme colours for labels, values and errors, and bold targets without fixed foreground/background colours so Starline owns selection contrast. Keep Manual/Auto/Off and Push/Pull terminology consistent across capsule, details, menus and command feedback; never append idle to the mode. Recompute styles when rendering, keep RPC/native status text plain, and do not store styled strings in settings. Keep large diagnostic results in the action notification rather than copying JSON dumps into status details.
 
 Safety requirements: private SSH remote, no working-directory mutation, no JSONL merging, preserve local-only files, back up replacements and never overwrite active sessions. Safe-path validation must exclude configuration and implementation data even when users select arbitrary relative data paths. Do not claim encryption, conflict-free multi-device merging or automatic secret removal.
 

package/README.md

@@ -26,14 +26,14 @@ pi update --extensions
 | Command | Purpose |
 | --- | --- |
 | `/sync-setup git@host:owner/private-repo.git [interval]` | Configure an SSH repository and optional pull interval in minutes (no transfer) |
-| `/sync-push` | Upload selected raw agent data |
+| `/sync-push` | Push selected raw agent data |
 | `/sync-pull` | Pull selected raw agent data |
 | `/sync-settings` | Open settings and maintenance actions |
 | `/sync-status` | View status and actions; also works without Starline |
 
 The settings menu contains **View Status**, **Sync Mode** (`auto`, `manual`, `off`), **Sync Paths** (include/exclude safe relative agent-data paths), **Backups** (create/list/restore), **Diagnostics** (doctor/diff/log), and **Cleanup** (Preview, Run, Delete Selected Backup, Retention). `sessions` and `missions` are the default paths. Manual push and pull commands remain available in both `manual` and `off` modes.
 
-Manual/off startup performs no network access. Auto startup computes a local fingerprint, starts timers and launches a background pull without awaiting network completion. `/sync-setup` only saves configuration and stops timers; reload to activate auto mode if enabled. With Starline installed, use its clickable status capsule to open details and actions: check status, upload, pull and settings. The status key remains `pi-sync` for existing Starline placement; the pill bridge takes precedence over legacy `extensionStatuses.commands`, with no Starline configuration changes required. There is no three-line widget. `/sync-status`, pill clicks, settings, submenus and confirmations share centered Starline bubbles above the footer; text entry still uses Pi input dialogs. Without Starline, the native UI remains available.
+Manual/off startup performs no network access. Auto startup computes a local fingerprint, starts timers and launches a background pull without awaiting network completion. `/sync-setup` only saves configuration and stops timers; reload to activate auto mode if enabled. With Starline installed, use its clickable status capsule to open details and actions: check status, push, pull and settings. The status key remains `pi-sync` for existing Starline placement; the pill bridge takes precedence over legacy `extensionStatuses.commands`, with no Starline configuration changes required. There is no three-line widget. `/sync-status`, pill clicks, settings, submenus and confirmations share centered Starline bubbles above the footer; text entry still uses Pi input dialogs. Labels and values use Pi theme colours, while bold action rows keep Starline’s selection contrast. State shows Manual, Auto or Off directly; active operations use Push/Pull, with the configured mode shown separately. Without Starline, the native UI remains available and status output stays plain text.
 
 ## Data and safety
 

package/README.zh-CN.md

@@ -26,14 +26,14 @@ pi update --extensions
 | 命令 | 用途 |
 | --- | --- |
 | `/sync-setup git@host:owner/private-repo.git [interval]` | 配置 SSH 仓库及可选拉取间隔（分钟），不传输数据 |
-| `/sync-push` | 上传选中的原始 agent 数据 |
-| `/sync-pull` | 拉取选中的原始 agent 数据 |
+| `/sync-push` | Push 选中的原始 agent 数据 |
+| `/sync-pull` | Pull 选中的原始 agent 数据 |
 | `/sync-settings` | 打开设置与维护操作 |
 | `/sync-status` | 查看状态和操作；未安装 Starline 时也可使用 |
 
 设置菜单保留 **View Status**、**Sync Mode**（`auto`、`manual`、`off`）、**Sync Paths**（包含/排除任意安全的 agent 数据相对路径）、**Backups**（创建/列表/恢复）、**Diagnostics**（doctor/diff/log）和 **Cleanup**（Preview、Run、Delete Selected Backup、Retention）。默认路径为 `sessions` 和 `missions`。`manual` 和 `off` 模式仍可手动上传、拉取。
 
-manual/off 启动不访问网络。auto 启动先计算本地 fingerprint，再启动定时器并发起后台拉取，不等待网络完成。`/sync-setup` 只保存配置并停止定时器；已启用 auto 时需 reload 激活。安装 Starline 时，优先点击状态胶囊打开详情，执行状态检查、上传、拉取或设置。状态 key 保留为 `pi-sync`，兼容原 Starline placement；pill bridge 优先于旧 `extensionStatuses.commands`，无需修改 Starline 配置。没有三行 widget。`/sync-status`、点击胶囊、设置和子菜单统一使用底栏上方居中的 Starline 气泡，确认操作也使用相同样式；文本输入仍使用 Pi 输入框。未安装 Starline 时回退原生界面。
+manual/off 启动不访问网络。auto 启动先计算本地 fingerprint，再启动定时器并发起后台拉取，不等待网络完成。`/sync-setup` 只保存配置并停止定时器；已启用 auto 时需 reload 激活。安装 Starline 时，优先点击状态胶囊打开详情，执行 Check status、Push、Pull 或 Settings。状态 key 保留为 `pi-sync`，兼容原 Starline placement；pill bridge 优先于旧 `extensionStatuses.commands`，无需修改 Starline 配置。没有三行 widget。`/sync-status`、点击胶囊、设置和子菜单统一使用底栏上方居中的 Starline 气泡，确认操作也使用相同样式；文本输入仍使用 Pi 输入框。标签、数值和异常使用 Pi 主题色区分，可选操作使用粗体并保留 Starline 自带的选中对比度。State 直接显示 Manual、Auto 或 Off；执行中显示 Push／Pull，另列当前模式，不追加 idle。未安装 Starline 时回退原生界面，状态输出保留纯文本。
 
 ## 数据与安全
 

package/index.ts

@@ -1,9 +1,14 @@
 // Derived from pi-sync-suite 0.1.1, Copyright (c) 2026 Murat (MIT).
 // Upstream: https://github.com/MuratAitov/pi-sync
+import { stripVTControlCharacters } from "node:util";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { SyncService, createConfig, defaultPaths, loadConfig, saveConfig, validatePath, type Config } from "./core.ts";
 
-type BubbleLine = string | { text: string; onSelect: () => void };
+type BubbleLine = string | { text: string; onSelect: () => void; current?: boolean };
+type Tone = "text" | "muted" | "dim" | "accent" | "success" | "warning" | "error";
+type DetailRow = { label: string; value: string; tone?: Tone };
+type Choice = string | { value: string; label: string };
+type SelectDetails = { description?: string; rows?: () => DetailRow[]; current?: string };
 type BubbleContent = { title: string; body: BubbleLine[]; hint: string };
 type BubbleHandle = { refresh(): void; close(): void; onClose?(callback: () => void): void };
 type PillAPI = {
@@ -13,8 +18,12 @@ type PillAPI = {
 };
 const STATUS_KEY = "pi-sync";
 const pillAPI = () => (globalThis as Record<symbol, unknown>)[Symbol.for("pi-starline.pill-api.v1")] as PillAPI | undefined;
-const message = (error: unknown) => error instanceof Error ? error.message : String(error);
-const displayTime = (value?: string) => value ? new Date(value).toLocaleString() : "never";
+const bubbleAPI = (context: ExtensionContext) => context.mode === "rpc" ? undefined : pillAPI();
+const message = (error: unknown) => terminalText(error instanceof Error ? error.message : String(error));
+const displayTime = (value?: string) => value ? new Date(value).toLocaleString() : "Never";
+const modeLabel = (mode: Config["mode"]) => ({ manual: "Manual", auto: "Auto", off: "Off" })[mode];
+const terminalText = (value: string) => stripVTControlCharacters(value).replace(/\r\n?/g, "\n").replace(/[\x00-\x08\x0b-\x1f\x7f]/g, "");
+const menuHint = "↑↓ Enter Esc";
 
 export default function amoxPiSync(pi: ExtensionAPI): void {
   let ctx: ExtensionContext | undefined;
@@ -34,8 +43,10 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
   let watching = false;
   let generation = 0;
 
+  const stateLabel = () => busy ?? (error ? "Error" : config ? modeLabel(config.mode) : "Not configured");
+  const stateTone = (): Tone => error && !busy ? "error" : busy ? "accent" : config?.mode === "off" ? "muted" : config ? "accent" : "warning";
   const publish = () => {
-    ctx?.ui.setStatus(STATUS_KEY, `Sync: ${busy ?? (error ? "error" : config?.mode ?? "setup")}`);
+    ctx?.ui.setStatus(STATUS_KEY, `Sync: ${stateLabel()}`);
     bubble?.refresh();
   };
 
@@ -62,7 +73,7 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
       return false;
     }
     if (busy) {
-      if (!quiet) ctx.ui.notify(`Sync is already ${busy}.`, "warning");
+      if (!quiet) ctx.ui.notify(`Sync is busy: ${busy}.`, "warning");
       return false;
     }
     const active = service;
@@ -75,16 +86,17 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
     error = undefined;
     publish();
     try {
-      const uploadedFingerprint = label === "uploading" ? await active.fingerprint() : undefined;
+      const pushedFingerprint = label === "Push" ? await active.fingerprint() : undefined;
       const result = await action(active);
-      notice = typeof result === "string" ? result : `${label} completed`;
-      // Mark only the pre-upload snapshot as observed. Changes made while Git
+      notice = `${label} completed`;
+      // Mark only the pre-push snapshot as observed. Changes made while Git
       // runs must remain detectable by the next watcher pass.
-      if (uploadedFingerprint !== undefined) fingerprint = uploadedFingerprint;
-      if (!quiet) context.ui.notify(notice, "info");
+      if (pushedFingerprint !== undefined) fingerprint = pushedFingerprint;
+      if (!quiet) context.ui.notify(typeof result === "string" ? terminalText(result) : notice, "info");
       return true;
     } catch (failure) {
       error = message(failure);
+      notice = `${label} failed`;
       context.ui.notify(`amox-pi-sync ${label}: ${error}`, "error");
       return false;
     } finally {
@@ -110,7 +122,7 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
     }
     if (token !== generation) return;
     pullTimer = setInterval(() => {
-      if (!busy) void run("downloading", sync => sync.pull(), true);
+      if (!busy) void run("Pull", sync => sync.pull(), true);
     }, config.pullIntervalMinutes * 60_000);
     watchTimer = setInterval(() => {
       if (busy || watching) return;
@@ -119,7 +131,7 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
         if (token !== generation || next === fingerprint || busy) return;
         if (debounce) clearTimeout(debounce);
         debounce = setTimeout(() => {
-          if (token === generation && !busy) void run("uploading", sync => sync.push(), true);
+          if (token === generation && !busy) void run("Push", sync => sync.push(), true);
         }, config!.pushDebounceMs);
       }).catch(failure => {
         const text = message(failure);
@@ -129,42 +141,72 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
       }).finally(() => { watching = false; });
     }, config.watchIntervalMs);
     // Do not await network during session startup.
-    void run("downloading", sync => sync.pull(), true);
+    void run("Pull", sync => sync.pull(), true);
   }
 
-  function detailLines(): string[] {
-    if (!config || !service) return ["Not configured", "Use /sync-setup <private-ssh-repository>", ...(error ? [`Error: ${error}`] : [])];
+  function overviewRows(): DetailRow[] {
+    if (!config || !service) return [
+      { label: "State", value: stateLabel(), tone: stateTone() },
+      { label: "Setup", value: "/sync-setup <private-ssh-repository>", tone: "accent" },
+      ...(error ? [{ label: "Error", value: error, tone: "error" as const }] : []),
+    ];
+    return [
+      { label: "State", value: stateLabel(), tone: stateTone() },
+      ...(busy || error ? [{ label: "Mode", value: modeLabel(config.mode), tone: "muted" as const }] : []),
+      { label: "Paths", value: config.paths.join(", ") || "None" },
+      { label: "Remote", value: config.repoUrl },
+    ];
+  }
+
+  function detailRows(): DetailRow[] {
+    const rows = overviewRows();
+    if (!config || !service) return rows;
     const status = service.status;
+    const local = status.localChanges?.trim();
+    const remoteChecked = Boolean(status.checkedAt) && status.remoteChanges !== undefined;
     return [
-      `State: ${busy ?? (error ? "error" : `idle (${config.mode})`)}`,
-      `Objects: ${config.paths.join(", ") || "none"}`,
-      `Remote: ${config.repoUrl}`,
-      `Last upload: ${displayTime(config.lastPushAt)}`,
-      `Last pull: ${displayTime(config.lastPullAt)}`,
-      `Local: ${status.localChanges?.trim() || (status.checkedAt ? "no pending changes at last check" : "not checked")}`,
-      `Remote updates: ${status.remoteChanges === undefined ? "not checked" : status.remoteChanges}`,
-      `Checked: ${displayTime(status.checkedAt)}`,
-      ...(config.lastResult ? [`Last sync result: ${config.lastResult}`] : []),
-      ...(notice ? [`Last action: ${notice}`] : []),
-      ...(error ? [`Error: ${error}`] : []),
+      ...rows,
+      { label: "Last push", value: displayTime(config.lastPushAt), tone: config.lastPushAt ? "text" : "dim" },
+      { label: "Last pull", value: displayTime(config.lastPullAt), tone: config.lastPullAt ? "text" : "dim" },
+      { label: "Last check", value: displayTime(status.checkedAt), tone: status.checkedAt ? "text" : "dim" },
+      { label: "Local changes", value: local || (status.checkedAt ? "None at last check" : "Not checked"), tone: local ? "warning" : status.checkedAt ? "success" : "dim" },
+      { label: "Remote updates", value: remoteChecked ? String(status.remoteChanges) : "Not checked", tone: remoteChecked ? status.remoteChanges ? "warning" : "success" : "dim" },
+      ...(config.lastResult ? [{ label: "Last sync", value: config.lastResult }] : []),
+      ...(notice ? [{ label: "Last action", value: notice }] : []),
+      ...(error ? [{ label: "Error", value: error, tone: "error" as const }] : []),
     ];
   }
 
+  function detailLines(): string[] {
+    return detailRows().map(row => `${row.label}: ${terminalText(row.value)}`);
+  }
+
+  function renderRows(context: ExtensionContext, rows: DetailRow[]): string[] {
+    const theme = context.ui.theme;
+    return rows.map(row => theme.fg("muted", `${row.label.padEnd(14)} `)
+      + theme.fg(row.tone ?? "text", row.label === "State" ? theme.bold(terminalText(row.value)) : terminalText(row.value)));
+  }
+
+  // Targets inherit Starline's foreground so a selected row remains legible on
+  // its pill-coloured background. Bold adds hierarchy without overriding it.
+  const actionText = (context: ExtensionContext, text: string) => context.ui.theme.bold(terminalText(text));
+
   function content(context: ExtensionContext): BubbleContent {
-    const body: BubbleLine[] = detailLines();
+    const body: BubbleLine[] = renderRows(context, detailRows());
     if (config && !busy) {
-      body.push(
-        { text: "Check status", onSelect: () => { void run("checking", sync => sync.check()); } },
-        { text: "Upload", onSelect: () => { void run("uploading", sync => sync.push()); } },
-        { text: "Pull", onSelect: () => { void run("downloading", sync => sync.pull()); } },
+      body.push("", context.ui.theme.fg("muted", "Actions"),
+        { text: actionText(context, "Check status"), onSelect: () => { void run("Check", sync => sync.check()); } },
+        { text: actionText(context, "Push"), onSelect: () => { void run("Push", sync => sync.push()); } },
+        { text: actionText(context, "Pull"), onSelect: () => { void run("Pull", sync => sync.pull()); } },
       );
-    }
-    if (!busy) body.push({ text: "Settings", onSelect: () => settings(context).catch(report) });
-    return { title: "Amox Pi Sync", body, hint: "Last-check values are not a live guarantee · Esc to close" };
+    } else if (!busy) body.push("");
+    if (!busy) body.push({ text: actionText(context, "Settings"), onSelect: () => settings(context).catch(report) });
+    body.push("", context.ui.theme.fg("dim", "Values reflect the last check."));
+    return { title: "Amox Pi Sync", body, hint: menuHint };
   }
 
   function showStatus(context: ExtensionContext): void {
-    const api = pillAPI();
+    const api = bubbleAPI(context);
     if (api?.version === 1 && context.hasUI) {
       // All command, pill and menu views share Starline's unanchored placement.
       bubble = api.showBubble(context, () => content(context));
@@ -173,18 +215,26 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
     }
   }
 
-  async function select(context: ExtensionContext, title: string, options: string[], description?: string): Promise<string | undefined> {
-    const api = pillAPI();
-    if (api?.version !== 1 || !context.hasUI) return context.ui.select(title, options);
+  async function select(context: ExtensionContext, title: string, options: Choice[], details: SelectDetails = {}): Promise<string | undefined> {
+    const choices = options.map(option => typeof option === "string" ? { value: option, label: option } : option);
+    const nativeSelect = async () => {
+      const heading = details.description ? `${title}\n${terminalText(details.description)}` : title;
+      const label = await context.ui.select(heading, choices.map(choice => terminalText(choice.label)));
+      return choices.find(choice => terminalText(choice.label) === label)?.value;
+    };
+    const api = bubbleAPI(context);
+    if (api?.version !== 1 || !context.hasUI) return nativeSelect();
     return new Promise(resolve => {
       let selected = false;
       const handle = api.showBubble(context, () => ({
         title,
         body: [
-          ...(description ? [description] : []),
-          ...options.map(text => ({ text, onSelect: () => { selected = true; resolve(text); } })),
+          ...(details.rows ? [...renderRows(context, details.rows()), ""] : []),
+          ...(details.description ? [context.ui.theme.fg("muted", terminalText(details.description)), ""] : []),
+          ...choices.map(choice => ({ text: actionText(context, choice.label), current: choice.value === details.current,
+            onSelect: () => { selected = true; resolve(choice.value); } })),
         ],
-        hint: "↑/↓ · Enter to select · Esc to close",
+        hint: menuHint,
       }));
       bubble = handle;
       if (handle?.onClose) {
@@ -193,14 +243,14 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
         handle.onClose(() => queueMicrotask(() => { if (!selected) resolve(undefined); }));
       } else {
         handle?.close();
-        void context.ui.select(title, options).then(resolve);
+        void nativeSelect().then(resolve);
       }
     });
   }
 
   async function confirm(context: ExtensionContext, title: string, description: string): Promise<boolean> {
-    if (pillAPI()?.version !== 1 || !context.hasUI) return context.ui.confirm(title, description);
-    return await select(context, title, ["Cancel", "Confirm"], description) === "Confirm";
+    if (bubbleAPI(context)?.version !== 1 || !context.hasUI) return context.ui.confirm(title, description);
+    return await select(context, title, ["Cancel", "Confirm"], { description, current: "Cancel" }) === "Confirm";
   }
 
   const report = (failure: unknown) => {
@@ -210,7 +260,7 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
   };
 
   async function persist(next: Config): Promise<void> {
-    if (busy) throw new Error(`Sync is already ${busy}; retry the settings change after it finishes.`);
+    if (busy) throw new Error(`Sync is busy: ${busy}; retry the settings change after it finishes.`);
     await saveConfig(next, paths);
     config = next;
     makeService();
@@ -219,17 +269,21 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
   }
 
   async function settings(context: ExtensionContext): Promise<void> {
-    if (busy) { context.ui.notify(`Sync is already ${busy}.`, "warning"); return; }
+    if (busy) { context.ui.notify(`Sync is busy: ${busy}.`, "warning"); return; }
     for (;;) {
-      const choice = await select(context, "Amox Pi Sync", [
-        "View Status", `Sync Mode [${config?.mode ?? "not configured"}]`,
-        `Sync Paths [${config?.paths.length ?? 0}]`, "Backups", "Cleanup", "Diagnostics", "Back",
-      ]);
+      const choice = await select(context, "Sync settings", [
+        { value: "status", label: "Status" },
+        { value: "mode", label: `Mode  ${config ? modeLabel(config.mode) : "Not configured"}` },
+        { value: "paths", label: `Paths  ${config?.paths.length ?? 0}` },
+        "Backups", "Cleanup", "Diagnostics", "Back",
+      ], { rows: overviewRows });
       if (!choice || choice === "Back") return;
-      if (choice === "View Status") { showStatus(context); return; }
+      if (choice === "status") { showStatus(context); return; }
       if (!config || !service) { context.ui.notify("Run /sync-setup first.", "warning"); continue; }
-      if (choice.startsWith("Sync Mode")) {
-        const selected = await select(context, "Sync mode", ["Manual", "Auto", "Off", "Back"]);
+      if (choice === "mode") {
+        const selected = await select(context, "Sync mode", ["Manual", "Auto", "Off", "Back"], {
+          current: modeLabel(config.mode), description: "Auto runs in the background. Manual and Off still allow Push and Pull.",
+        });
         if (!selected || selected === "Back") continue;
         const next = structuredClone(config);
         if (selected === "Auto") {
@@ -242,7 +296,7 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
         }
         next.mode = selected.toLowerCase() as Config["mode"];
         await persist(next);
-      } else if (choice.startsWith("Sync Paths")) {
+      } else if (choice === "paths") {
         const selected = await select(context, "Sync paths", [
           ...config.paths.map(item => `Exclude ${item}`), "Include path", "Back",
         ]);
@@ -256,38 +310,38 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
         } else next.paths = next.paths.filter(item => `Exclude ${item}` !== selected);
         await persist(next);
       } else if (choice === "Backups") {
-        const selected = await select(context, "Backups (local; no automatic cleanup)", ["Create", "List", "Restore", "Back"]);
-        if (selected === "Create") await run("backing up", async sync => {
+        const selected = await select(context, "Backups", ["Create", "List", "Restore", "Back"], { description: "Local backups. Cleanup is manual; nothing is deleted automatically." });
+        if (selected === "Create") await run("Create backup", async sync => {
           const backup = await sync.backup(); return JSON.stringify(backup, null, 2);
         });
-        if (selected === "List") await run("listing backups", async sync => JSON.stringify(await sync.listBackups(), null, 2));
+        if (selected === "List") await run("List backups", async sync => JSON.stringify(await sync.listBackups(), null, 2));
         if (selected === "Restore") {
           const backups = await service.listBackups();
           if (!backups.length) { context.ui.notify("No backups.", "info"); continue; }
           const id = await context.ui.input("Backup ID", "latest");
           if (!id) continue;
           if (!await confirm(context, "Restore backup?", "Matching managed files can be overwritten. A pre-restore backup will be created. The active session cannot be replaced.")) continue;
-          await run("restoring", sync => sync.restore(id));
+          await run("Restore backup", sync => sync.restore(id));
         }
       } else if (choice === "Cleanup") {
-        const selected = await select(context, "Cleanup (complete local backups only)", ["Preview", "Run", "Delete Selected Backup", "Retention", "Back"]);
-        if (selected === "Preview" || selected === "Run") {
+        const selected = await select(context, "Backup cleanup", ["Preview", "Delete eligible backups", "Delete backup", "Retention", "Back"], { description: "Only complete local backups can be deleted. Sessions and missions are never cleanup targets." });
+        if (selected === "Preview" || selected === "Delete eligible backups") {
           let candidates: Awaited<ReturnType<SyncService["planCleanup"]>> = [];
-          const planned = await run("planning cleanup", async sync => {
+          const planned = await run("Preview cleanup", async sync => {
             candidates = await sync.planCleanup();
             return candidates.length ? JSON.stringify(candidates, null, 2) : "No backup cleanup candidates.";
           });
-          if (!planned || selected !== "Run" || !candidates.length) continue;
+          if (!planned || selected !== "Delete eligible backups" || !candidates.length) continue;
           if (await confirm(context, "Delete complete backups?", `Delete ${candidates.length} previewed backup(s)? Sessions, missions and the sync repository will not be deleted.`)) {
-            await run("cleaning backups", async sync => `Deleted ${await sync.applyCleanup(candidates.map(item => item.id))} backup(s).`);
+            await run("Delete backups", async sync => `Deleted ${await sync.applyCleanup(candidates.map(item => item.id))} backup(s).`);
           }
-        } else if (selected === "Delete Selected Backup") {
+        } else if (selected === "Delete backup") {
           const backups = await service.listBackups();
           if (!backups.length) { context.ui.notify("No backups.", "info"); continue; }
-          const id = await select(context, "Select complete backup to delete", [...backups.map(item => item.id), "Back"]);
+          const id = await select(context, "Choose backup to delete", [...backups.map(item => item.id), "Back"]);
           if (!id || id === "Back") continue;
           if (await confirm(context, "Delete backup?", `Permanently delete local backup ${id}?`)) {
-            await run("cleaning backups", async sync => `Deleted ${await sync.applyCleanup([id])} backup.`);
+            await run("Delete backups", async sync => `Deleted ${await sync.applyCleanup([id])} backup.`);
           }
         } else if (selected === "Retention") {
           const keep = await context.ui.input("Keep newest complete backups (0 or more)", String(config.retention?.keepBackups ?? 20));
@@ -303,10 +357,10 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
           context.ui.notify("Retention saved. Cleanup remains manual; no files deleted.", "info");
         }
       } else if (choice === "Diagnostics") {
-        const selected = await select(context, "Diagnostics", ["Doctor", "Diff / Check", "Log", "Back"]);
-        if (selected === "Doctor") await run("diagnosing", async sync => JSON.stringify(await sync.doctor(), null, 2));
-        if (selected === "Diff / Check") await run("checking", async sync => { await sync.check(); return detailLines().join("\n"); });
-        if (selected === "Log") await run("reading log", sync => sync.log());
+        const selected = await select(context, "Diagnostics", ["Doctor", "Check status", "View log", "Back"]);
+        if (selected === "Doctor") await run("Doctor", async sync => JSON.stringify(await sync.doctor(), null, 2));
+        if (selected === "Check status") await run("Check", async sync => { await sync.check(); return detailLines().join("\n"); });
+        if (selected === "View log") await run("View log", sync => sync.log());
       }
     }
   }
@@ -326,7 +380,7 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
     context.ui.setWidget(STATUS_KEY, undefined);
     publish();
     unregister?.();
-    const api = pillAPI();
+    const api = bubbleAPI(context);
     unregister = api?.version === 1 ? api.register(STATUS_KEY, ({ ctx: current }) => showStatus(current)) : undefined;
     await startTimers();
   });
@@ -351,17 +405,17 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
     handler: async (_args, context) => { await settings(context).catch(report); },
   });
   pi.registerCommand("sync-push", {
-    description: "Upload the managed raw data snapshot",
-    handler: async () => { await run("uploading", sync => sync.push()); },
+    description: "Push the managed raw data snapshot",
+    handler: async () => { await run("Push", sync => sync.push()); },
   });
   pi.registerCommand("sync-pull", {
     description: "Pull raw data, backing up files before replacement",
-    handler: async () => { await run("downloading", sync => sync.pull()); },
+    handler: async () => { await run("Pull", sync => sync.pull()); },
   });
   pi.registerCommand("sync-setup", {
     description: "Configure a private SSH repository: /sync-setup <ssh-url> [pull-minutes]",
     handler: async (args, context) => {
-      if (busy) { context.ui.notify(`Sync is already ${busy}.`, "warning"); return; }
+      if (busy) { context.ui.notify(`Sync is busy: ${busy}.`, "warning"); return; }
       try {
         const [url, interval, ...extra] = args.trim().split(/\s+/);
         if (!url || extra.length) throw new Error("Usage: /sync-setup <private-ssh-url> [pull-minutes]");
@@ -375,7 +429,7 @@ export default function amoxPiSync(pi: ExtensionAPI): void {
           next.paths = [...config.paths];
           next.mode = config.mode;
         }
-        if (busy) throw new Error(`Sync is already ${busy}; retry setup after it finishes.`);
+        if (busy) throw new Error(`Sync is busy: ${busy}; retry setup after it finishes.`);
         stopTimers();
         await saveConfig(next, paths);
         config = next;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gfgghgftgffg/amox-pi-sync",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "description": "Independent Pi agent-data sync fork with SSH Git transport, backups and optional Starline status.",
   "license": "MIT",