@gaosh3n/pi-package-manager 0.1.3 → 0.1.4

package/index.ts

@@ -49,6 +49,7 @@ export default function initPackageManager(
     )
 
     pi.on("session_start", controller.onSessionStart)
+    pi.on("session_shutdown", controller.onSessionShutdown)
 
     pi.registerCommand("package-manager", {
         description:

package/internal/controller.ts

@@ -29,8 +29,11 @@ export function createPackageManagerController(
     pi: Pick<ExtensionAPI, "appendEntry" | "sendUserMessage" | "exec">,
     deps: PackageManagerDeps = defaultPackageManagerDeps,
 ) {
+    let sessionIsActive = true
+
     return {
         onSessionStart,
+        onSessionShutdown,
         handleStatus,
         handleUpdate,
         handleInstall,
@@ -41,6 +44,8 @@ export function createPackageManagerController(
         event: Pick<SessionStartEvent, "reason">,
         _ctx: ExtensionContext,
     ): Promise<void> {
+        sessionIsActive = true
+
         if (!shouldAutoUpdateOnSessionStart(event)) {
             return
         }
@@ -50,6 +55,10 @@ export function createPackageManagerController(
         })
     }
 
+    async function onSessionShutdown(): Promise<void> {
+        sessionIsActive = false
+    }
+
     async function handleStatus(ctx: ExtensionCommandContext): Promise<void> {
         const lastAutoUpdate = getLastAutoUpdateRecord(ctx.sessionManager.getEntries())
 
@@ -57,26 +66,37 @@ export function createPackageManagerController(
 
         try {
             const availableUpdates = await deps.checkForAvailableUpdates(ctx)
-            pi.appendEntry(
-                REPORT_ENTRY_TYPE,
-                createStatusReport({
+
+            if (!isSessionActive()) {
+                return
+            }
+
+            appendReport({
+                type: REPORT_ENTRY_TYPE,
+                report: createStatusReport({
                     availableUpdates,
                     lastAutoUpdate,
                 }),
-            )
+            })
         } catch (error) {
-            pi.appendEntry(
-                REPORT_ENTRY_TYPE,
-                createStatusErrorReport(
+            if (!isSessionActive()) {
+                return
+            }
+
+            appendReport({
+                type: REPORT_ENTRY_TYPE,
+                report: createStatusErrorReport(
                     {
                         availableUpdates: [],
                         lastAutoUpdate,
                     },
                     getErrorMessage(error),
                 ),
-            )
+            })
         } finally {
-            clearPackageManagerWidget(ctx)
+            if (isSessionActive()) {
+                clearPackageManagerWidget(ctx)
+            }
         }
     }
 
@@ -97,6 +117,10 @@ export function createPackageManagerController(
 
             const availableUpdates = await deps.checkForAvailableUpdates(ctx)
 
+            if (!isSessionActive()) {
+                return
+            }
+
             if (availableUpdates.length === 0) {
                 appendSkippedResult(startedAtUtc, "No package updates are available.")
                 return
@@ -108,6 +132,11 @@ export function createPackageManagerController(
             })
 
             const result = await deps.runNativeUpdate(pi, ctx)
+
+            if (!isSessionActive()) {
+                return
+            }
+
             const output = getExecDisplayOutput(result)
 
             if (result.code === 0) {
@@ -117,17 +146,18 @@ export function createPackageManagerController(
                     outcome: "succeeded",
                     packagesUpdated: availableUpdates.length,
                 })
-
-                appendAutoUpdateRecordAndReport(
-                    pi,
+                const report = createAutoUpdateResultReport({
                     record,
-                    createAutoUpdateResultReport({
-                        record,
-                        output,
-                        reloadAfterSeconds: RELOAD_COUNTDOWN_SECONDS,
-                    }),
-                )
-                await runReloadCountdown(ctx)
+                    output,
+                    reloadAfterSeconds: RELOAD_COUNTDOWN_SECONDS,
+                })
+
+                appendAutoUpdateRecordAndReport(pi, record, report)
+
+                if (!(await runReloadCountdown(ctx))) {
+                    return
+                }
+
                 clearPackageManagerWidget(ctx)
                 shouldClearWidget = false
                 await ctx.reload()
@@ -141,14 +171,15 @@ export function createPackageManagerController(
                 packagesUpdated: 0,
                 reason: getExecFailureDetail(result, "Package update command failed."),
             })
+            const report = createAutoUpdateResultReport({ record, output })
 
-            appendAutoUpdateRecordAndReport(
-                pi,
-                record,
-                createAutoUpdateResultReport({ record, output }),
-            )
+            appendAutoUpdateRecordAndReport(pi, record, report)
             notifyStartupFailure(ctx, options.startupTriggered)
         } catch (error) {
+            if (!isSessionActive()) {
+                return
+            }
+
             const record = createAutoUpdateRecord({
                 startedAtUtc,
                 endedAtUtc: deps.nowIso(),
@@ -156,15 +187,12 @@ export function createPackageManagerController(
                 packagesUpdated: 0,
                 reason: getErrorMessage(error),
             })
+            const report = createAutoUpdateResultReport({ record })
 
-            appendAutoUpdateRecordAndReport(
-                pi,
-                record,
-                createAutoUpdateResultReport({ record }),
-            )
+            appendAutoUpdateRecordAndReport(pi, record, report)
             notifyStartupFailure(ctx, options.startupTriggered)
         } finally {
-            if (shouldClearWidget) {
+            if (shouldClearWidget && isSessionActive()) {
                 clearPackageManagerWidget(ctx)
             }
         }
@@ -186,7 +214,7 @@ export function createPackageManagerController(
             )
         )?.trim()
 
-        if (source === undefined) {
+        if (!isSessionActive() || source === undefined) {
             return
         }
 
@@ -200,49 +228,47 @@ export function createPackageManagerController(
 
         try {
             const result = await deps.runNativeInstall(pi, ctx, source)
-            const output = getExecDisplayOutput(result)
 
-            if (result.code === 0) {
-                pi.appendEntry(
-                    REPORT_ENTRY_TYPE,
-                    createInstallResultReport({
-                        startedAtUtc,
-                        endedAtUtc: deps.nowIso(),
-                        source,
-                        outcome: "succeeded",
-                        output,
-                    }),
-                )
+            if (!isSessionActive()) {
                 return
             }
 
-            pi.appendEntry(
-                REPORT_ENTRY_TYPE,
-                createInstallResultReport({
-                    startedAtUtc,
-                    endedAtUtc: deps.nowIso(),
-                    source,
-                    outcome: "failed",
-                    output,
-                    reason: getExecFailureDetail(
-                        result,
-                        "Package install command failed.",
-                    ),
-                }),
-            )
+            const output = getExecDisplayOutput(result)
+            const report = createInstallResultReport({
+                startedAtUtc,
+                endedAtUtc: deps.nowIso(),
+                source,
+                outcome: result.code === 0 ? "succeeded" : "failed",
+                output,
+                reason:
+                    result.code === 0
+                        ? undefined
+                        : getExecFailureDetail(
+                              result,
+                              "Package install command failed.",
+                          ),
+            })
+
+            appendReport({ type: REPORT_ENTRY_TYPE, report })
         } catch (error) {
-            pi.appendEntry(
-                REPORT_ENTRY_TYPE,
-                createInstallResultReport({
+            if (!isSessionActive()) {
+                return
+            }
+
+            appendReport({
+                type: REPORT_ENTRY_TYPE,
+                report: createInstallResultReport({
                     startedAtUtc,
                     endedAtUtc: deps.nowIso(),
                     source,
                     outcome: "failed",
                     reason: getErrorMessage(error),
                 }),
-            )
+            })
         } finally {
-            clearPackageManagerWidget(ctx)
+            if (isSessionActive()) {
+                clearPackageManagerWidget(ctx)
+            }
         }
     }
 
@@ -254,6 +280,10 @@ export function createPackageManagerController(
 
         const packages = await deps.listConfiguredPackages(ctx)
 
+        if (!isSessionActive()) {
+            return
+        }
+
         if (packages.length === 0) {
             ctx.ui.notify("No Pi packages are available to uninstall.", "info")
             return
@@ -261,7 +291,7 @@ export function createPackageManagerController(
 
         const selectedSources = await promptForPackagesToUninstall(ctx, packages)
 
-        if (selectedSources === undefined) {
+        if (!isSessionActive() || selectedSources === undefined) {
             return
         }
 
@@ -295,6 +325,11 @@ export function createPackageManagerController(
                 })
 
                 const result = await deps.runNativeUninstall(pi, ctx, source)
+
+                if (!isSessionActive()) {
+                    return
+                }
+
                 const output = getExecDisplayOutput(result)
 
                 if (result.code === 0) {
@@ -311,9 +346,9 @@ export function createPackageManagerController(
                 )
             }
 
-            pi.appendEntry(
-                REPORT_ENTRY_TYPE,
-                createUninstallResultReport({
+            appendReport({
+                type: REPORT_ENTRY_TYPE,
+                report: createUninstallResultReport({
                     startedAtUtc,
                     endedAtUtc: deps.nowIso(),
                     sources,
@@ -334,8 +369,12 @@ export function createPackageManagerController(
                             ? `Failed to uninstall ${failedSources[0]}.`
                             : undefined,
                 }),
-            )
+            })
         } catch (error) {
+            if (!isSessionActive()) {
+                return
+            }
+
             const failedSource = sources[succeededSources.length]
             const errorMessage = getErrorMessage(error)
 
@@ -346,9 +385,9 @@ export function createPackageManagerController(
             outputSections.push(
                 failedSource ? `[${failedSource}]\n${errorMessage}` : errorMessage,
             )
-            pi.appendEntry(
-                REPORT_ENTRY_TYPE,
-                createUninstallResultReport({
+            appendReport({
+                type: REPORT_ENTRY_TYPE,
+                report: createUninstallResultReport({
                     startedAtUtc,
                     endedAtUtc: deps.nowIso(),
                     sources,
@@ -358,9 +397,11 @@ export function createPackageManagerController(
                     output: outputSections.join("\n\n"),
                     reason: errorMessage,
                 }),
-            )
+            })
         } finally {
-            clearPackageManagerWidget(ctx)
+            if (isSessionActive()) {
+                clearPackageManagerWidget(ctx)
+            }
         }
     }
 
@@ -372,26 +413,44 @@ export function createPackageManagerController(
             packagesUpdated: 0,
             reason,
         })
+        const report = createAutoUpdateResultReport({ record })
 
-        appendAutoUpdateRecordAndReport(
-            pi,
-            record,
-            createAutoUpdateResultReport({ record }),
-        )
+        appendAutoUpdateRecordAndReport(pi, record, report)
+    }
+
+    function appendReport(entry: {
+        type: string
+        report: ReturnType<typeof createStatusReport>
+    }): void {
+        pi.appendEntry(entry.type, entry.report)
+    }
+
+    function isSessionActive(): boolean {
+        return sessionIsActive
     }
 
     async function runReloadCountdown(
         ctx: ExtensionContext,
         seconds = RELOAD_COUNTDOWN_SECONDS,
-    ): Promise<void> {
+    ): Promise<boolean> {
         for (let remaining = seconds; remaining >= 1; remaining--) {
+            if (!isSessionActive()) {
+                return false
+            }
+
             setPackageManagerWidget(ctx, {
                 mode: "countdown",
                 secondsRemaining: remaining,
             })
 
             await deps.sleep(1000)
+
+            if (!isSessionActive()) {
+                return false
+            }
         }
+
+        return true
     }
 }
 

package/internal/reports.ts

@@ -36,81 +36,7 @@ export function createReportEntryRenderer() {
             return undefined
         }
 
-        const toneColor =
-            report.tone === "error"
-                ? "error"
-                : report.tone === "warning"
-                  ? "warning"
-                  : report.tone === "success"
-                    ? "success"
-                    : "accent"
-        const lineTextTone = report.lineTone === "dim" ? "dim" : "customMessageText"
-        const outputTextTone = report.outputTone === "dim" ? "dim" : lineTextTone
-
-        const box = new Box(1, 1, (text: string) => theme.bg("customMessageBg", text))
-
-        box.addChild(
-            new Text(
-                `${theme.fg(toneColor, "●")} ${theme.bold(theme.fg("customMessageLabel", report.title))}`,
-                0,
-                0,
-            ),
-        )
-
-        if (report.headline) {
-            box.addChild(new Text(theme.fg("text", report.headline), 0, 0))
-        }
-
-        if (report.lines.length > 0) {
-            box.addChild(
-                new Text(
-                    report.lines.map((line) => theme.fg(lineTextTone, line)).join("\n"),
-                    0,
-                    0,
-                ),
-            )
-        }
-
-        if (report.output?.trim()) {
-            if (!expanded && report.hideOutputWhenCollapsed) {
-                box.addChild(
-                    new Text(
-                        formatExpandHint(
-                            theme,
-                            `to expand to see ${report.outputDescription ?? "output"}.`,
-                        ),
-                        0,
-                        0,
-                    ),
-                )
-            } else {
-                const { text, truncated } = formatReportOutput(report.output, expanded)
-
-                box.addChild(
-                    new Text(
-                        theme.fg(outputTextTone, report.outputLabel ?? "Output:"),
-                        0,
-                        0,
-                    ),
-                )
-                box.addChild(new Text(theme.fg(outputTextTone, text), 0, 0))
-
-                if (truncated) {
-                    box.addChild(
-                        new Text(
-                            formatExpandHint(
-                                theme,
-                                `to expand to view the full ${report.outputDescription ?? "output"}.`,
-                            ),
-                            0,
-                            0,
-                        ),
-                    )
-                }
-            }
-        }
-
-        return box
+        return createReportBox(report, theme, { expanded })
     }
 }
 
@@ -343,39 +269,12 @@ export function setPackageManagerWidget(
 
     ctx.ui.setWidget(
         PACKAGE_MANAGER_WIDGET_KEY,
-        (_tui, theme) => {
-            const background =
-                state.mode === "countdown"
-                    ? (text: string) => theme.bg("toolSuccessBg", text)
-                    : (text: string) => theme.bg("toolPendingBg", text)
-            const box = new Box(1, 1, background)
-            const titleColor = state.mode === "countdown" ? "success" : "accent"
-            const bodyLines = createAutomaticUpdateWidgetLines(state)
-
-            box.addChild(
-                new Text(
-                    `${theme.fg(titleColor, "●")} ${theme.bold(theme.fg("customMessageLabel", PACKAGE_MANAGER_TITLE))}`,
-                    0,
-                    0,
-                ),
-            )
-            box.addChild(
-                new Text(
-                    bodyLines
-                        .map((line, index) =>
-                            theme.fg(
-                                index === bodyLines.length - 1 ? "dim" : "text",
-                                line,
-                            ),
-                        )
-                        .join("\n"),
-                    0,
-                    0,
-                ),
-            )
-
-            return box
-        },
+        (_tui, theme) =>
+            createStatusBox(theme, createAutomaticUpdateWidgetLines(state), {
+                titleColor: state.mode === "countdown" ? "success" : "accent",
+                background:
+                    state.mode === "countdown" ? "toolSuccessBg" : "toolPendingBg",
+            }),
         { placement: "aboveEditor" },
     )
 }
@@ -428,6 +327,115 @@ function formatAutomaticUpdateHeadline(
     return `Pi package(s) update ${suffix}.`
 }
 
+function createReportBox(
+    report: PackageManagerReport,
+    theme: ThemeLike,
+    options: { expanded: boolean },
+): Box {
+    const toneColor =
+        report.tone === "error"
+            ? "error"
+            : report.tone === "warning"
+              ? "warning"
+              : report.tone === "success"
+                ? "success"
+                : "accent"
+    const lineTextTone = report.lineTone === "dim" ? "dim" : "customMessageText"
+    const outputTextTone = report.outputTone === "dim" ? "dim" : lineTextTone
+    const box = new Box(1, 1, (text: string) => theme.bg("customMessageBg", text))
+
+    box.addChild(
+        new Text(
+            `${theme.fg(toneColor, "●")} ${theme.bold(theme.fg("customMessageLabel", report.title))}`,
+            0,
+            0,
+        ),
+    )
+
+    if (report.headline) {
+        box.addChild(new Text(theme.fg("text", report.headline), 0, 0))
+    }
+
+    if (report.lines.length > 0) {
+        box.addChild(
+            new Text(
+                report.lines.map((line) => theme.fg(lineTextTone, line)).join("\n"),
+                0,
+                0,
+            ),
+        )
+    }
+
+    if (!report.output?.trim()) {
+        return box
+    }
+
+    if (!options.expanded && report.hideOutputWhenCollapsed) {
+        box.addChild(
+            new Text(
+                formatExpandHint(
+                    theme,
+                    `to expand to see ${report.outputDescription ?? "output"}.`,
+                ),
+                0,
+                0,
+            ),
+        )
+        return box
+    }
+
+    const { text, truncated } = formatReportOutput(report.output, options.expanded)
+
+    box.addChild(
+        new Text(theme.fg(outputTextTone, report.outputLabel ?? "Output:"), 0, 0),
+    )
+    box.addChild(new Text(theme.fg(outputTextTone, text), 0, 0))
+
+    if (truncated) {
+        box.addChild(
+            new Text(
+                formatExpandHint(
+                    theme,
+                    `to expand to view the full ${report.outputDescription ?? "output"}.`,
+                ),
+                0,
+                0,
+            ),
+        )
+    }
+
+    return box
+}
+
+function createStatusBox(
+    theme: ThemeLike,
+    bodyLines: string[],
+    options: { titleColor: string; background: string },
+): Box {
+    const box = new Box(1, 1, (text: string) => theme.bg(options.background, text))
+
+    box.addChild(
+        new Text(
+            `${theme.fg(options.titleColor, "●")} ${theme.bold(theme.fg("customMessageLabel", PACKAGE_MANAGER_TITLE))}`,
+            0,
+            0,
+        ),
+    )
+    box.addChild(
+        new Text(
+            bodyLines
+                .map((line, index) =>
+                    theme.fg(index === bodyLines.length - 1 ? "dim" : "text", line),
+                )
+                .join("\n"),
+            0,
+            0,
+        ),
+    )
+
+    return box
+}
+
 function formatExpandHint(theme: ThemeLike, description: string): string {
     const expandKey = keyText("app.tools.expand") || "Ctrl+O"
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gaosh3n/pi-package-manager",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "description": "Package Manager for Pi",
     "type": "module",
     "packageManager": "pnpm@11.23.0",