@singh-gur/pi-session-sync 0.1.0 → 0.2.0

package/README.md

@@ -20,7 +20,7 @@ Your [pi](https://pi.dev) sessions, on every machine. Push a conversation from o
 - **Work on both machines, lose nothing.** Sessions are merged entry by entry. Continue the same conversation in two places and both branches show up in `/tree`, with the newest one active.
 - **Your files stay the source of truth.** Pull never deletes local sessions, and the active session only reloads when the agent is idle.
 - **Just git.** Any remote `git` can reach: GitHub, GitLab, Gitea, a bare repo over SSH. Authentication uses your existing git setup.
-- **Hands-free if you want it.** Optional auto mode pulls when pi starts and pushes when you quit. Off by default; startup pulls run in the background, and network failures only show a warning.
+- **Hands-free if you want it.** Optional auto mode pulls the current folder's sessions when pi starts and pushes when you quit, configurable per root or folder. Off by default; startup pulls run in the background, and network failures only show a warning.
 
 ## Get started
 
@@ -78,8 +78,26 @@ Create `~/.pi/agent/git-session-sync.json` on each machine. It is machine-local
 | `repoUrl` | yes | Any URL `git` can clone. Use an empty private repo. |
 | `branch` | no | Branch to sync. Defaults to `main`. |
 | `roots` | yes | Named root directories. Names use `a-z`, `0-9`, `_` and `-`; paths must be absolute. Only sessions under a root are synced. |
-| `auto.pullOnStart` | no | Pull new or changed sessions in the background when pi starts. Defaults to `false`. |
+| `auto.pullOnStart` | no | When pi starts, pull new or changed sessions for the folder pi was started in, in the background. Defaults to `false`. |
 | `auto.pushOnShutdown` | no | Push the current session when you quit pi. Defaults to `false`. |
+| `auto.overrides` | no | Per-root or per-folder auto settings; see below. |
+
+### Per-root and per-folder auto sync
+
+`auto.overrides` keys are a root name (`dev`) or a root name plus a path under it (`dev/api`). Each entry sets `pullOnStart` and/or `pushOnShutdown`; unset fields fall back to the closest matching parent key, then to the global `auto` value. The longest matching key wins. Keys must start with a configured root name.
+
+```json
+"auto": {
+  "pullOnStart": false,
+  "pushOnShutdown": true,
+  "overrides": {
+    "dev":         { "pullOnStart": true },
+    "dev/scratch": { "pushOnShutdown": false }
+  }
+}
+```
+
+Here `/home/me/dev/api` pulls on start and pushes on quit, `/home/me/dev/scratch` pulls but never auto-pushes, and folders under `home` only push. Folders outside every root never auto-sync.
 
 ### Same project, different paths
 
@@ -100,7 +118,7 @@ Every root path in a session (cwd, messages, tool calls and results) is replaced
 | `/session-sync-push` | Pick sessions to push. Only the current session is pre-selected. |
 | `/session-sync-pull` | Fetch the repo and pick from sessions that are **[new]** or **[changed]** compared to your local copies. If the current session is updated, pi reloads it. |
 
-In the picklist: `Space`/`Enter` toggles a session, `Esc` finishes, then confirm with **Yes** or back out with **No**. Each run ends with a summary: synced, unchanged, new entries, conflicts and anything skipped (with the reason).
+In the picklist: `↑`/`↓` move, `Space` checks or unchecks a session, `a` selects all/none, `Enter` syncs the checked sessions, `Esc` cancels. Each run ends with a summary: synced, unchanged, new entries, conflicts and anything skipped (with the reason).
 
 ## How it works
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singh-gur/pi-session-sync",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Pi extension: sync your pi sessions across machines through a private git repo, with per-machine path mapping and branch-preserving merges.",
   "repository": {
     "type": "git",

package/src/config.ts

@@ -1,12 +1,17 @@
 import { existsSync, readFileSync } from "node:fs";
+import { rootFor } from "./layout.ts";
 
+export type AutoFlags = { pullOnStart: boolean; pushOnShutdown: boolean };
 export type SyncConfig = {
 	repoUrl: string;
 	branch: string;
 	roots: Record<string, string>;
-	auto: { pullOnStart: boolean; pushOnShutdown: boolean };
+	/** overrides: "<root>" or "<root>/<rel/path>" -> partial flags; longest matching key wins. */
+	auto: AutoFlags & { overrides: Record<string, Partial<AutoFlags>> };
 };
 
+const FLAGS = ["pullOnStart", "pushOnShutdown"] as const;
+
 const ROOT_NAME = /^[a-z0-9_-]+$/;
 
 const isObject = (v: unknown): v is Record<string, unknown> => typeof v === "object" && v !== null && !Array.isArray(v);
@@ -30,14 +35,43 @@ export function parseConfig(raw: unknown): SyncConfig {
 	}
 
 	const auto = isObject(raw.auto) ? raw.auto : {};
+	if (auto.overrides !== undefined && !isObject(auto.overrides))
+		throw new Error("config.auto.overrides must be an object of \"root[/path]\" -> { pullOnStart?, pushOnShutdown? }");
+	const overrides: Record<string, Partial<AutoFlags>> = {};
+	for (const [rawKey, val] of Object.entries(auto.overrides ?? {})) {
+		const key = rawKey.replace(/^\/+|\/+$/g, "");
+		const segs = key.split("/");
+		if (!(segs[0]! in roots)) throw new Error(`config.auto.overrides: "${rawKey}" must start with a configured root name`);
+		if (segs.some((s) => !s || s === "." || s === ".."))
+			throw new Error(`config.auto.overrides: "${rawKey}" has an empty, "." or ".." segment`);
+		if (!isObject(val)) throw new Error(`config.auto.overrides.${rawKey} must be an object`);
+		const o: Partial<AutoFlags> = {};
+		for (const [k, v] of Object.entries(val)) {
+			if (!(FLAGS as readonly string[]).includes(k) || typeof v !== "boolean")
+				throw new Error(`config.auto.overrides.${rawKey}.${k}: expected pullOnStart or pushOnShutdown with a boolean`);
+			o[k as keyof AutoFlags] = v;
+		}
+		overrides[key] = o;
+	}
 	return {
 		repoUrl: raw.repoUrl,
 		branch: (raw.branch as string | undefined) ?? "main",
 		roots,
-		auto: { pullOnStart: auto.pullOnStart === true, pushOnShutdown: auto.pushOnShutdown === true },
+		auto: { pullOnStart: auto.pullOnStart === true, pushOnShutdown: auto.pushOnShutdown === true, overrides },
 	};
 }
 
+/** Effective auto flags for a local cwd: global defaults, then matching overrides from shortest to longest key. Off outside roots. */
+export function autoFor(cfg: SyncConfig, cwd: string): AutoFlags {
+	const r = rootFor(cwd, cfg.roots);
+	if (!r) return { pullOnStart: false, pushOnShutdown: false };
+	const path = r.rel ? `${r.name}/${r.rel}` : r.name;
+	const flags: AutoFlags = { pullOnStart: cfg.auto.pullOnStart, pushOnShutdown: cfg.auto.pushOnShutdown };
+	for (const key of Object.keys(cfg.auto.overrides).sort((a, b) => a.length - b.length))
+		if (path === key || path.startsWith(`${key}/`)) Object.assign(flags, cfg.auto.overrides[key]);
+	return flags;
+}
+
 export function loadConfig(file: string): SyncConfig | undefined {
 	if (!existsSync(file)) return undefined;
 	try {

package/src/index.ts

@@ -3,7 +3,7 @@ import { hostname } from "node:os";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { CURRENT_SESSION_VERSION, getAgentDir, SessionManager } from "@earendil-works/pi-coding-agent";
-import { loadConfig, type SyncConfig } from "./config.ts";
+import { autoFor, loadConfig, type SyncConfig } from "./config.ts";
 import { commitAndPush, ensureClone, type Exec, syncToRemote } from "./git.ts";
 import { localSessionDirFor, repoPathFor } from "./layout.ts";
 import { mergeSessions } from "./merge.ts";
@@ -123,12 +123,13 @@ function localize(cfg: SyncConfig, repoFile: string): { target: string; text: st
 	return { target, text };
 }
 
-async function scanPull(exec: Exec, cfg: SyncConfig, s: Summary): Promise<PullCandidate[]> {
+/** `only`: repo-relative dir (e.g. "sessions/dev/api") to restrict the scan to; defaults to all sessions. */
+async function scanPull(exec: Exec, cfg: SyncConfig, s: Summary, only = "sessions"): Promise<PullCandidate[]> {
 	const clone = cloneDir();
 	await ensureClone(exec, cfg, clone);
 	await syncToRemote(exec, cfg, clone);
 	const out: PullCandidate[] = [];
-	for (const repoFile of walkJsonl(join(clone, "sessions"))) {
+	for (const repoFile of walkJsonl(join(clone, only))) {
 		const l = localize(cfg, repoFile);
 		if ("skip" in l) {
 			s.skipped.push(l.skip);
@@ -179,13 +180,15 @@ export default function (pi: ExtensionAPI) {
 			const picked = await pickSessions(
 				ctx,
 				"Push sessions",
+				"push",
 				infos.map((i) => ({
 					id: i.path,
 					label: `${(i.name || i.firstMessage || "(empty)").replace(/\s+/g, " ").slice(0, 60)} · ${i.cwd} · ${i.modified.toLocaleString()}`,
 					checked: i.path === current,
 				})),
 			);
-			if (!picked?.length) return ctx.ui.notify("session-sync: nothing selected", "info");
+			if (!picked) return ctx.ui.notify("session-sync: cancelled", "info");
+			if (!picked.length) return ctx.ui.notify("session-sync: nothing selected", "info");
 			ctx.ui.setStatus("session-sync", "pushing sessions...");
 			try {
 				report(ctx, "pushed", await pushSessions(exec, cfg, picked));
@@ -213,9 +216,11 @@ export default function (pi: ExtensionAPI) {
 				const picked = await pickSessions(
 					ctx,
 					"Pull sessions",
+					"pull",
 					candidates.map((c) => ({ id: c.target, label: c.label, checked: c.target === current })),
 				);
-				if (!picked?.length) return ctx.ui.notify("session-sync: nothing selected", "info");
+				if (!picked) return ctx.ui.notify("session-sync: cancelled", "info");
+				if (!picked.length) return ctx.ui.notify("session-sync: nothing selected", "info");
 				for (const c of candidates.filter((c) => picked.includes(c.target))) {
 					if (c.target === current && !ctx.isIdle()) {
 						s.skipped.push(`${basename(c.target)}: agent busy (current session)`);
@@ -239,12 +244,15 @@ export default function (pi: ExtensionAPI) {
 	pi.on("session_start", async (event, ctx) => {
 		if (event.reason !== "startup") return;
 		const cfg = getConfig(ctx, true);
-		if (!cfg?.auto.pullOnStart) return;
+		const cwd = resolve(ctx.cwd);
+		// Only this folder's sessions; repoPathFor is undefined outside roots, so no network call there.
+		const rel = cfg && autoFor(cfg, cwd).pullOnStart ? repoPathFor(cwd, "x", cfg.roots) : undefined;
+		if (!cfg || !rel) return;
 		const current = ctx.sessionManager.getSessionFile();
 		// Fire and forget: never block startup on the network.
 		void (async () => {
 			const s = newSummary();
-			for (const c of await scanPull(exec, cfg, s)) if (c.target !== current) applyPull(cfg, c, s);
+			for (const c of await scanPull(exec, cfg, s, dirname(rel))) if (c.target !== current) applyPull(cfg, c, s);
 			if (s.synced || s.skipped.length) report(ctx, "auto-pulled", s);
 		})().catch((e) => ctx.ui.notify(`session-sync auto-pull failed: ${errMsg(e)}`, "warning"));
 	});
@@ -253,9 +261,9 @@ export default function (pi: ExtensionAPI) {
 		if (event.reason !== "quit") return;
 		const cfg = getConfig(ctx, true);
 		const current = ctx.sessionManager.getSessionFile();
-		if (!cfg?.auto.pushOnShutdown || !current || !existsSync(current)) return;
+		if (!cfg || !current || !existsSync(current)) return;
 		const h = header(readFileSync(current, "utf8"));
-		if (typeof h?.cwd !== "string" || !repoPathFor(h.cwd, basename(current), cfg.roots)) return;
+		if (typeof h?.cwd !== "string" || !autoFor(cfg, h.cwd).pushOnShutdown) return;
 		try {
 			await pushSessions(exec, cfg, [current]);
 		} catch (e) {

package/src/picklist.ts

@@ -1,40 +1,83 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
-import { Container, SettingsList } from "@earendil-works/pi-tui";
+import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import { type Component, getKeybindings, getSelectPageIndex, truncateToWidth } from "@earendil-works/pi-tui";
 
 export type PickItem = { id: string; label: string; checked: boolean };
+type Style = Pick<Theme, "fg" | "bold">;
 
-/** Multi-select list (pattern from examples/extensions/tools.ts). Returns selected ids, or undefined if cancelled. */
-export async function pickSessions(ctx: ExtensionContext, title: string, items: PickItem[]): Promise<string[] | undefined> {
-	if (ctx.mode !== "tui") return items.filter((i) => i.checked).map((i) => i.id);
+/** Checkbox list: ↑/↓ move, space toggles, `a` toggles all, enter confirms, esc cancels. */
+export class MultiSelect implements Component {
+	readonly capturesViewportInput = true;
+	cursor = 0;
+	readonly selected: Set<string>;
+
+	private title: string;
+	private verb: string;
+	private items: PickItem[];
+	private style: Style;
+	private done: (ids: string[] | undefined) => void;
+	private maxVisible = 12;
+
+	constructor(title: string, verb: string, items: PickItem[], style: Style, done: (ids: string[] | undefined) => void) {
+		this.title = title;
+		this.verb = verb;
+		this.items = items;
+		this.style = style;
+		this.done = done;
+		this.selected = new Set(items.filter((i) => i.checked).map((i) => i.id));
+	}
+
+	invalidate() {}
+
+	handleInput(data: string) {
+		const kb = getKeybindings();
+		const n = this.items.length;
+		const page = getSelectPageIndex(kb, data, this.cursor, n, this.maxVisible);
+		if (kb.matches(data, "tui.select.up")) this.cursor = (this.cursor - 1 + n) % n;
+		else if (kb.matches(data, "tui.select.down")) this.cursor = (this.cursor + 1) % n;
+		else if (page !== undefined) this.cursor = page;
+		else if (data === " ") {
+			const id = this.items[this.cursor]!.id;
+			if (!this.selected.delete(id)) this.selected.add(id);
+		} else if (data === "a" || data === "A") {
+			if (this.selected.size === n) this.selected.clear();
+			else for (const i of this.items) this.selected.add(i.id);
+		} else if (kb.matches(data, "tui.select.confirm")) this.done(this.items.filter((i) => this.selected.has(i.id)).map((i) => i.id));
+		else if (kb.matches(data, "tui.select.cancel")) this.done(undefined);
+	}
 
-	const selected = new Set(items.filter((i) => i.checked).map((i) => i.id));
-	await ctx.ui.custom<void>((tui, theme, _kb, done) => {
-		const container = new Container();
-		container.addChild({
-			render: () => [theme.fg("accent", theme.bold(title)), theme.fg("dim", "space/enter toggle · esc done"), ""],
-			invalidate() {},
-		});
-		const list = new SettingsList(
-			items.map((i) => ({ id: i.id, label: i.label, currentValue: i.checked ? "on" : "off", values: ["on", "off"] })),
-			Math.min(items.length + 2, 15),
-			getSettingsListTheme(),
-			(id, value) => (value === "on" ? selected.add(id) : selected.delete(id)),
-			() => done(undefined),
-		);
-		container.addChild(list);
+	render(width: number): string[] {
+		const fg: Style["fg"] = (c, t) => this.style.fg(c, t);
+		const bold = (t: string) => this.style.bold(t);
+		const n = this.items.length;
+		const start = Math.max(0, Math.min(this.cursor - Math.floor(this.maxVisible / 2), n - this.maxVisible));
+		const end = Math.min(n, start + this.maxVisible);
+		const lines = [fg("accent", bold(this.title)) + fg("muted", `  ${this.selected.size}/${n} selected`), ""];
+		for (let i = start; i < end; i++) {
+			const item = this.items[i]!;
+			const on = this.selected.has(item.id);
+			const box = on ? fg("success", "[x]") : fg("dim", "[ ]");
+			const row = i === this.cursor ? `${fg("accent", "›")} ${box} ${fg("accent", item.label)}` : `  ${box} ${item.label}`;
+			lines.push(truncateToWidth(row, width));
+		}
+		if (start > 0 || end < n) lines.push(fg("dim", `  (${this.cursor + 1}/${n})`));
+		lines.push("", fg("dim", truncateToWidth(`↑↓ move · space select · a all/none · enter ${this.verb} · esc cancel`, width)));
+		return lines;
+	}
+}
+
+/** Returns selected ids (possibly empty), or undefined if cancelled. */
+export async function pickSessions(ctx: ExtensionContext, title: string, verb: string, items: PickItem[]): Promise<string[] | undefined> {
+	if (ctx.mode !== "tui") return items.filter((i) => i.checked).map((i) => i.id);
+	return ctx.ui.custom<string[] | undefined>((tui, theme, _kb, done) => {
+		const list = new MultiSelect(title, verb, items, theme, done);
 		return {
-			capturesViewportInput: list.capturesViewportInput,
-			render: (w: number) => container.render(w),
-			invalidate: () => container.invalidate(),
+			capturesViewportInput: true,
+			render: (w: number) => list.render(w),
+			invalidate: () => list.invalidate(),
 			handleInput(data: string) {
-				list.handleInput?.(data);
+				list.handleInput(data);
 				tui.requestRender();
 			},
 		};
 	});
-
-	if (selected.size === 0) return undefined;
-	const ok = await ctx.ui.confirm(title, `Sync ${selected.size} session(s)?`);
-	return ok ? items.filter((i) => selected.has(i.id)).map((i) => i.id) : undefined;
 }