@gfgghgftgffg/amox-pi-sync 0.1.0 → 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.0`, 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.
 
@@ -33,11 +33,19 @@ Safety requirements: private SSH remote, no working-directory mutation, no JSONL
 | 诊断 | 保留 | 用户需要查看待传输差异、Git 状态和错误，不能将失败或“未检查”显示为已同步。 |
 | 常驻三行 widget | 替换 | 将状态、操作与设置统一到 Starline 气泡，避免常驻重复信息；未安装 Starline 时保留原生命令界面。 |
 
-精简目标是职责清晰和减少维护范围，未进行启动性能对比。后续移植上游改动时保持上述边界；新增功能应有明确需求，不随上游更新自动恢复已移除模块。
+精简目标是职责清晰和减少维护范围，未进行启动性能对比。每日监控上游正式发布，保持上述边界定向移植；新增功能应有明确需求，不随上游更新自动恢复已移除模块。
 
 ## Repository integration
 
-`maintenance/manifest.json` marks this package `maintenanceMode: manual-fork`. Automated npm/Git upstream discovery, source collection, adapter writes, version staging and context-footprint measurements skip it. **Never replace it with the full upstream suite or reintroduce removed features during automatic maintenance.** Upstream changes require manual source review and scoped porting.
+`maintenance/manifest.json` marks this package `maintenanceMode: selective-fork`. Daily maintenance monitors the latest stable npm publication, not unpublished moving repository HEAD. It compares the exact published baseline and target archives, verifies their SHA-512 integrity, and reads source as untrusted text without installing or executing the original suite. A separate read-only SDK review must cover every changed published file and apply the feature decisions above:
+
+- **Port** worthwhile fixes and improvements within retained behavior, especially data/path safety, backups, diagnostics, background responsiveness and compatibility with the existing Starline UI. Preserve local guarantees; add focused regressions.
+- **Skip** changes only to removed features or irrelevant material. Already-implemented behavior may be skipped only with a concrete source-based explanation. Record the decision; do not bump the package or move the integrated upstream baseline.
+- **Ask** the owner about new features, conflicting goals, unclear value, behavior/safety tradeoffs, compatibility uncertainty or incomplete source/review evidence. Any unresolved item pauses the whole sync port, not other packages. ntfy includes the upstream version delta, reasons and files. Do not call an uncertain change irrelevant to bypass review.
+
+Only a complete review with ports and no unresolved items enables adaptation of `index.ts`/`core.ts` and its scoped tests/docs. The owner’s feature-decisions section is immutable during automatic adaptation. An actual implementation change and focused regression are required; version-only or docs-only ports cannot be published. If implementation reveals new uncertainty, `ask_owner` records the reason, sends ntfy and pauses the existing candidate without further push or merge; it must not bypass a failed check by rebuilding. The fixed host independently stages its package version and publication baseline; local checks, exact-head three-platform CI and Release acceptance still apply. No upstream runtime dependency is added. **Never replace this fork with the full suite or reintroduce removed features.** Tool-context measurements still skip this command-only package.
+
+Skip/ask reports are saved privately under the host maintenance state directory as `fork-review-amox-pi-sync.json`, including the baseline/target, integrity and per-change evidence. The same version and unchanged local implementation/policy reuse the report without another model call; pending owner decisions remain visible in daily ntfy summaries. Source acquisition failures are rechecked. A new target or changed local policy/implementation triggers review again, always against the last integrated baseline so skipped changes cannot hide later relevant fixes. Port decisions are not cached as successful integration. To resolve a pending decision, record the owner's rule in this file and merge it, then rerun maintenance; do not edit a report to fake an approved release.
 
 All workspace packages retain their own versions; the root version identifies a release batch and its explicit package selection. This package also records `releaseVersioning: independent`. Release assets use each manifest/package version in the tarball name; the GitHub release tag remains tied to the root version. Installation and production checks still include this package. `toolContract: false` excludes this command-only fork from upstream-versus-lean tool-size comparisons; `registeredTools: []` is checked during isolated production loading.
 

package/README.md

@@ -2,7 +2,7 @@
 
 [简体中文](README.zh-CN.md)
 
-Standalone Pi agent-data sync over a private SSH Git repository. Package: `@gfgghgftgffg/amox-pi-sync@0.1.0`. Based on [MuratAitov/pi-sync](https://github.com/MuratAitov/pi-sync), `pi-sync-suite@0.1.1` (MIT; Copyright © 2026 Murat). The exact source reference is `npm:pi-sync-suite@0.1.1`; see [MAINTENANCE.md](MAINTENANCE.md).
+Standalone Pi agent-data sync over a private SSH Git repository. Package: `@gfgghgftgffg/amox-pi-sync`. Based on [MuratAitov/pi-sync](https://github.com/MuratAitov/pi-sync), `pi-sync-suite@0.1.1` (MIT; Copyright © 2026 Murat). The exact source reference is `npm:pi-sync-suite@0.1.1`; see [MAINTENANCE.md](MAINTENANCE.md).
 
 ## Install
 
@@ -14,7 +14,7 @@ From this repository checkout:
 node scripts/install-extension.mjs amox-pi-sync
 ```
 
-Only this extension is installed. Do not load it alongside the original `pi-sync-suite`; inspect existing sources with `pi list` and remove the old source yourself. This new package has not been published to npm yet. After its first publication, npm installation and updates will use:
+Only this extension is installed. Do not load it alongside the original `pi-sync-suite`; inspect existing sources with `pi list` and remove the old source yourself. If the first npm publication is pending, use the checkout installer above. Once available, npm installation and updates use:
 
 ```sh
 pi install npm:@gfgghgftgffg/amox-pi-sync
@@ -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
 
@@ -47,4 +47,4 @@ Manual/off startup performs no network access. Auto startup computes a local fin
 - Backups use `amox-pi-sync-backups` under the agent-data directory. Cleanup only deletes local backups after manual preview/confirmation, using complete backup directories rather than individual files. The default limits are 20 complete backups and a maximum age of 180 days; backups older than this or beyond the newest 20 become cleanup candidates. There is no automatic deletion; sessions and missions are never cleanup targets.
 - Settings use `amox-pi-sync.json`. If absent, legacy `pi-sync-suite.json` can be read for migration. The old file is not changed before new settings are saved; saving writes the new file. Migration uses a separate `amox-pi-sync-repo` directory rather than reusing the old snapshot.
 
-Configuration sync/settings merging, Markdown/JSON archives, Environment Tools and Local Packages from the original suite are not included. Deployment tools such as `amox-agent-bootstrap` own environment setup and machine-specific configuration; Pi's native `/export` handles readable exports. Raw data selection, backups and manual backup cleanup remain part of sync. See [feature decisions](MAINTENANCE.md#功能取舍与维护边界) for the reasons and maintenance boundaries. This is a maintained local fork, not a runtime wrapper or a full replacement of the upstream suite.
+Configuration sync/settings merging, Markdown/JSON archives, Environment Tools and Local Packages from the original suite are not included. Deployment tools such as `amox-agent-bootstrap` own environment setup and machine-specific configuration; Pi's native `/export` handles readable exports. Raw data selection, backups and manual backup cleanup remain part of sync. See [feature decisions](MAINTENANCE.md#功能取舍与维护边界) for the reasons and maintenance boundaries. This is a selectively maintained fork, not a runtime wrapper or a full replacement of the upstream suite. Daily reviews track published upstream changes, port worthwhile retained behavior, skip removed features and ask the owner through ntfy when uncertain; removed modules are not restored automatically.

package/README.zh-CN.md

@@ -2,7 +2,7 @@
 
 [English](README.md)
 
-通过私有 SSH Git 仓库同步 Pi agent 数据的独立扩展。包名：`@gfgghgftgffg/amox-pi-sync@0.1.0`。基于 [MuratAitov/pi-sync](https://github.com/MuratAitov/pi-sync) 的 `pi-sync-suite@0.1.1`（MIT；Copyright © 2026 Murat）。来源 ref 为 `npm:pi-sync-suite@0.1.1`，详见[MAINTENANCE.md](MAINTENANCE.md)。
+通过私有 SSH Git 仓库同步 Pi agent 数据的独立扩展。包名：`@gfgghgftgffg/amox-pi-sync`。基于 [MuratAitov/pi-sync](https://github.com/MuratAitov/pi-sync) 的 `pi-sync-suite@0.1.1`（MIT；Copyright © 2026 Murat）。来源 ref 为 `npm:pi-sync-suite@0.1.1`，详见[MAINTENANCE.md](MAINTENANCE.md)。
 
 ## 安装
 
@@ -14,7 +14,7 @@
 node scripts/install-extension.mjs amox-pi-sync
 ```
 
-只安装本扩展。不要同时加载原版 `pi-sync-suite`；通过 `pi list` 检查已有来源，自行移除旧来源。这个新包尚未发布到 npm，当前使用上述本地安装方式。首次发布后可使用：
+只安装本扩展。不要同时加载原版 `pi-sync-suite`；通过 `pi list` 检查已有来源，自行移除旧来源。若首次 npm 发布尚未完成，使用上述本地安装方式。npm 包可用后可使用：
 
 ```sh
 pi install npm:@gfgghgftgffg/amox-pi-sync
@@ -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 时回退原生界面，状态输出保留纯文本。
 
 ## 数据与安全
 
@@ -47,4 +47,4 @@ manual/off 启动不访问网络。auto 启动先计算本地 fingerprint，再
 - 备份位于 agent 数据目录下的 `amox-pi-sync-backups`。Cleanup 仅在手动预览/确认后删除本地备份，按完整备份目录计数，不按单个文件计数。默认数量上限 20 份、最长 180 天；超龄或超出最新 20 份的备份纳入清理候选，不自动删除，不清理 sessions 或 missions。
 - 新设置文件为 `amox-pi-sync.json`；不存在时可读取旧 `pi-sync-suite.json` 迁移。保存新设置前不改旧文件，保存时写入新文件。迁移使用独立的 `amox-pi-sync-repo` 目录，不复用旧快照。
 
-不包含原版的配置同步/settings 合并、Markdown/JSON 归档、Environment Tools 和 Local Packages。环境部署和机器专属配置交给 `amox-agent-bootstrap` 等部署流程，阅读版导出使用 Pi 原生 `/export`；同步器保留原始数据选择、备份恢复和手动备份清理。各项原因与后续维护边界见[功能取舍](MAINTENANCE.md#功能取舍与维护边界)。这是本地维护的独立 fork，不是调用原版运行时的包装，也不是原版全功能替代品。
+不包含原版的配置同步/settings 合并、Markdown/JSON 归档、Environment Tools 和 Local Packages。环境部署和机器专属配置交给 `amox-agent-bootstrap` 等部署流程，阅读版导出使用 Pi 原生 `/export`；同步器保留原始数据选择、备份恢复和手动备份清理。各项原因与后续维护边界见[功能取舍](MAINTENANCE.md#功能取舍与维护边界)。这是选择性跟进上游的独立 fork，不是调用原版运行时的包装，也不是原版全功能替代品。每日审查上游正式发布，仅移植保留范围内有价值的改动；舍弃功能跳过，不能判断时由 ntfy 请维护者决定，不自动恢复原版模块。

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.0",
+  "version": "0.1.2",
   "type": "module",
   "description": "Independent Pi agent-data sync fork with SSH Git transport, backups and optional Starline status.",
   "license": "MIT",