@narumitw/pi-sync 0.50.0 → 0.50.2

package/src/ui/sync-attention.ts

@@ -39,29 +39,33 @@ export interface SyncAttentionController {
 	markOffered(): boolean;
 	clear(ctx: ExtensionContext): void;
 	reset(ctx: ExtensionContext): void;
-	publish(ctx: ExtensionContext): void;
+	publish(ctx: ExtensionContext, signal?: AbortSignal): Promise<void>;
 }
 
 export function createSyncAttentionController(): SyncAttentionController {
 	let state: SyncAttentionState | undefined;
 	let observation: StartupObservation | undefined;
+	let generation = 0;
 
 	return {
 		observe(value) {
+			generation++;
 			observation = value;
 		},
 		observation() {
 			return observation;
 		},
 		clearObservation() {
+			generation++;
 			observation = undefined;
 		},
 		notifyObservation(ctx) {
-			if (observation && observationNeedsAttention(observation)) {
+			if (ctx.hasUI && observation && observationNeedsAttention(observation)) {
 				ctx.ui.notify(observationLines(observation).join("\n"), "warning");
 			}
 		},
 		set(decision, origin) {
+			generation++;
 			state = { decision, origin, offered: false };
 		},
 		current() {
@@ -73,36 +77,65 @@ export function createSyncAttentionController(): SyncAttentionController {
 			return true;
 		},
 		clear(ctx) {
+			generation++;
 			state = undefined;
 			clearAttentionPresentation(ctx);
 		},
 		reset(ctx) {
+			generation++;
 			state = undefined;
 			observation = undefined;
 			clearAttentionPresentation(ctx);
 		},
-		publish(ctx) {
-			if (!state && (!observation || !observationNeedsAttention(observation))) {
+		async publish(ctx, signal) {
+			const currentGeneration = ++generation;
+			if (signal?.aborted || !ctx.hasUI) return;
+			const classification = observation ? classifyObservation(observation) : "none";
+			if (!state && (classification === "none" || classification === "guidance")) {
 				clearAttentionPresentation(ctx);
 				return;
 			}
+			if (!state && classification === "status") {
+				ctx.ui.setWidget(WIDGET_KEY, undefined);
+				ctx.ui.setStatus(
+					STATUS_KEY,
+					observation?.inspection.remoteChanged
+						? "remote changes pending"
+						: "local changes pending",
+				);
+				return;
+			}
 			const presentation = state
 				? attentionPresentation(state.decision)
 				: {
 						status: "changes to review",
 						lines: observationLines(observation as StartupObservation),
 					};
+			if (ctx.mode !== "tui") {
+				ctx.ui.setWidget(WIDGET_KEY, undefined);
+				ctx.ui.setStatus(STATUS_KEY, presentation.status);
+				return;
+			}
+			// Keep Kit outside the eager startup graph; module loading owns no cancellable resources.
+			const { EditorStatusWidget } = await import("./attention-widget.js").catch((error) => {
+				if (generation === currentGeneration && !signal?.aborted) clearAttentionPresentation(ctx);
+				throw error;
+			});
+			if (generation !== currentGeneration || signal?.aborted) return;
 			ctx.ui.setStatus(STATUS_KEY, presentation.status);
-			if (ctx.mode !== "tui") return;
-			ctx.ui.setWidget(WIDGET_KEY, (_tui, theme) => ({
-				render(width: number) {
-					const safeWidth = Math.max(1, width);
-					return presentation.lines.map((line, index) =>
-						truncateToWidth(theme.fg(index === 0 ? "warning" : "muted", line), safeWidth, "…"),
-					);
-				},
-				invalidate() {},
-			}));
+			ctx.ui.setWidget(
+				WIDGET_KEY,
+				(_tui, theme) =>
+					new EditorStatusWidget({
+						theme,
+						renderBody: (width) =>
+							presentation.lines.map((line, index) =>
+								width === 0
+									? ""
+									: truncateToWidth(theme.fg(index === 0 ? "warning" : "muted", line), width, "…"),
+							),
+					}),
+			);
 		},
 	};
 }
@@ -143,16 +176,24 @@ export function observationSummary(observation: StartupObservation) {
 	return "No changes detected since last sync";
 }
 
-export function observationNeedsAttention(observation: StartupObservation) {
+export type ObservationClassification = "none" | "guidance" | "status" | "review";
+
+/** Presentation only: never discard an observation or authorize a transfer here. */
+export function classifyObservation(observation: StartupObservation): ObservationClassification {
 	const result = observation.inspection;
-	return (
-		result.emptyInclude ||
-		result.firstSync ||
-		!result.head ||
-		result.localChanged ||
-		result.remoteChanged ||
-		result.selectionState?.kind !== "same"
-	);
+	// Sync now exits before reading remote content when nothing is selected.
+	if (result.emptyInclude) return "guidance";
+	// Ordering is part of the existing transfer policy, not merely display order.
+	if (result.selectionState?.kind === "different") return "review";
+	if (result.firstSync) return result.head ? "review" : "guidance";
+	if (!result.head || (result.localChanged && result.remoteChanged)) return "review";
+	if (result.localChanged || result.remoteChanged) return "status";
+	// Legacy metadata alone requires no scope confirmation in transfer operations.
+	return "none";
+}
+
+export function observationNeedsAttention(observation: StartupObservation) {
+	return classifyObservation(observation) === "review";
 }
 
 function observationLines(observation: StartupObservation) {
@@ -164,6 +205,7 @@ function observationLines(observation: StartupObservation) {
 }
 
 function clearAttentionPresentation(ctx: ExtensionContext) {
+	if (!ctx.hasUI) return;
 	ctx.ui.setStatus(STATUS_KEY, undefined);
 	ctx.ui.setWidget(WIDGET_KEY, undefined);
 }

package/dist/chunks/chunk-6UHKGALE.ts.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/ui/sync-attention.ts"],
-  "sourcesContent": ["import type { ExtensionContext } from \"@earendil-works/pi-coding-agent\";\nimport { truncateToWidth } from \"@earendil-works/pi-tui\";\nimport { syncCheckConfigFingerprint, syncConfigReviewFingerprint } from \"../settings/config.js\";\nimport type { AnySyncConfig } from \"../settings/settings-types.js\";\nimport type { StartupObservation } from \"../sync/sync-inspection.js\";\nimport {\n\tcompareSyncInclude,\n\ttype RemoteSelectionDecision,\n\tsameSyncInclude,\n} from \"../sync/sync-policy.js\";\nimport { safeTerminalText } from \"./terminal-text.js\";\n\nconst STATUS_KEY = \"sync\";\nconst WIDGET_KEY = \"sync:attention\";\n\nexport type SyncAttentionOrigin = \"sync\" | \"pull\" | \"push\";\n\nexport interface SyncAttentionState {\n\tdecision: RemoteSelectionDecision;\n\torigin: SyncAttentionOrigin;\n\toffered: boolean;\n}\n\nexport function syncAttentionMatchesConfig(attention: SyncAttentionState, config: AnySyncConfig) {\n\treturn (\n\t\tattention.decision.setupName === config.setupName &&\n\t\tattention.decision.configIdentity === syncConfigReviewFingerprint(config) &&\n\t\tsameSyncInclude(attention.decision.localInclude, config.include)\n\t);\n}\n\nexport interface SyncAttentionController {\n\tobserve(observation: StartupObservation): void;\n\tobservation(): StartupObservation | undefined;\n\tclearObservation(): void;\n\tnotifyObservation(ctx: ExtensionContext): void;\n\tset(decision: RemoteSelectionDecision, origin: SyncAttentionOrigin): void;\n\tcurrent(): SyncAttentionState | undefined;\n\tmarkOffered(): boolean;\n\tclear(ctx: ExtensionContext): void;\n\treset(ctx: ExtensionContext): void;\n\tpublish(ctx: ExtensionContext): void;\n}\n\nexport function createSyncAttentionController(): SyncAttentionController {\n\tlet state: SyncAttentionState | undefined;\n\tlet observation: StartupObservation | undefined;\n\n\treturn {\n\t\tobserve(value) {\n\t\t\tobservation = value;\n\t\t},\n\t\tobservation() {\n\t\t\treturn observation;\n\t\t},\n\t\tclearObservation() {\n\t\t\tobservation = undefined;\n\t\t},\n\t\tnotifyObservation(ctx) {\n\t\t\tif (observation && observationNeedsAttention(observation)) {\n\t\t\t\tctx.ui.notify(observationLines(observation).join(\"\\n\"), \"warning\");\n\t\t\t}\n\t\t},\n\t\tset(decision, origin) {\n\t\t\tstate = { decision, origin, offered: false };\n\t\t},\n\t\tcurrent() {\n\t\t\treturn state;\n\t\t},\n\t\tmarkOffered() {\n\t\t\tif (!state || state.offered) return false;\n\t\t\tstate = { ...state, offered: true };\n\t\t\treturn true;\n\t\t},\n\t\tclear(ctx) {\n\t\t\tstate = undefined;\n\t\t\tclearAttentionPresentation(ctx);\n\t\t},\n\t\treset(ctx) {\n\t\t\tstate = undefined;\n\t\t\tobservation = undefined;\n\t\t\tclearAttentionPresentation(ctx);\n\t\t},\n\t\tpublish(ctx) {\n\t\t\tif (!state && (!observation || !observationNeedsAttention(observation))) {\n\t\t\t\tclearAttentionPresentation(ctx);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tconst presentation = state\n\t\t\t\t? attentionPresentation(state.decision)\n\t\t\t\t: {\n\t\t\t\t\t\tstatus: \"changes to review\",\n\t\t\t\t\t\tlines: observationLines(observation as StartupObservation),\n\t\t\t\t\t};\n\t\t\tctx.ui.setStatus(STATUS_KEY, presentation.status);\n\t\t\tif (ctx.mode !== \"tui\") return;\n\t\t\tctx.ui.setWidget(WIDGET_KEY, (_tui, theme) => ({\n\t\t\t\trender(width: number) {\n\t\t\t\t\tconst safeWidth = Math.max(1, width);\n\t\t\t\t\treturn presentation.lines.map((line, index) =>\n\t\t\t\t\t\ttruncateToWidth(theme.fg(index === 0 ? \"warning\" : \"muted\", line), safeWidth, \"\u2026\"),\n\t\t\t\t\t);\n\t\t\t\t},\n\t\t\t\tinvalidate() {},\n\t\t\t}));\n\t\t},\n\t};\n}\n\nfunction attentionPresentation(decision: RemoteSelectionDecision) {\n\tconst setupName = safeTerminalText(decision.setupName);\n\tconst comparison = compareSyncInclude(decision.localInclude, decision.remoteInclude);\n\tconst difference =\n\t\tcomparison.remoteOnly.length === 0 && comparison.localOnly.length === 0\n\t\t\t? \"Only list order differs\"\n\t\t\t: `Remote ${comparison.remoteOnly.length} \u00B7 Device ${comparison.localOnly.length}`;\n\treturn {\n\t\tstatus: \"review needed\",\n\t\tlines: [`Pi Sync needs review \u00B7 ${setupName}`, difference, \"No changes \u00B7 Run /sync to review\"],\n\t};\n}\n\nexport function observationMatchesConfig(observation: StartupObservation, config: AnySyncConfig) {\n\treturn observation.configIdentity === syncCheckConfigFingerprint(config);\n}\n\nexport function observationSummary(observation: StartupObservation) {\n\tconst result = observation.inspection;\n\tif (result.emptyInclude) return \"No included content selected\";\n\tif (result.selectionState?.kind === \"different\")\n\t\treturn \"Synced-content list differs; review needed\";\n\tif (result.firstSync)\n\t\treturn result.head\n\t\t\t? \"No sync baseline; review remote and local content\"\n\t\t\t: \"Remote empty; no sync baseline\";\n\tif (!result.head) return \"Remote snapshot missing; review needed\";\n\tif (result.localChanged && result.remoteChanged)\n\t\treturn \"Local and remote changed since last sync; review needed\";\n\tif (result.remoteChanged) return \"Remote changed since last sync\";\n\tif (result.localChanged) return \"Local content changed since last sync\";\n\tif (result.selectionState?.kind === \"legacy\")\n\t\treturn \"Legacy remote has no authoritative content list\";\n\treturn \"No changes detected since last sync\";\n}\n\nexport function observationNeedsAttention(observation: StartupObservation) {\n\tconst result = observation.inspection;\n\treturn (\n\t\tresult.emptyInclude ||\n\t\tresult.firstSync ||\n\t\t!result.head ||\n\t\tresult.localChanged ||\n\t\tresult.remoteChanged ||\n\t\tresult.selectionState?.kind !== \"same\"\n\t);\n}\n\nfunction observationLines(observation: StartupObservation) {\n\treturn [\n\t\t`Pi Sync check \u00B7 ${safeTerminalText(observation.setupName)}`,\n\t\tobservationSummary(observation),\n\t\t\"No startup transfer \u00B7 Run /sync to review\",\n\t];\n}\n\nfunction clearAttentionPresentation(ctx: ExtensionContext) {\n\tctx.ui.setStatus(STATUS_KEY, undefined);\n\tctx.ui.setWidget(WIDGET_KEY, undefined);\n}\n"],
-  "mappings": "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",
-  "names": []
-}