pi-archimedes 1.8.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-archimedes",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "type": "module",
   "keywords": [
     "pi-package"
@@ -11,14 +11,14 @@
   ],
   "main": "./src/index.ts",
   "dependencies": {
-    "@pi-archimedes/core": "1.8.0",
-    "@pi-archimedes/diff": "1.8.0",
-    "@pi-archimedes/ask": "1.8.0",
-    "@pi-archimedes/image-paste": "1.8.0",
-    "@pi-archimedes/subagent": "1.8.0",
-    "@pi-archimedes/todo": "1.8.0",
-    "@pi-archimedes/notify": "1.8.0",
-    "@pi-archimedes/footer": "1.8.0"
+    "@pi-archimedes/core": "1.8.2",
+    "@pi-archimedes/footer": "1.8.2",
+    "@pi-archimedes/ask": "1.8.2",
+    "@pi-archimedes/diff": "1.8.2",
+    "@pi-archimedes/image-paste": "1.8.2",
+    "@pi-archimedes/subagent": "1.8.2",
+    "@pi-archimedes/todo": "1.8.2",
+    "@pi-archimedes/notify": "1.8.2"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": ">=0.1.0",

package/src/index.ts

@@ -14,13 +14,12 @@ import { registerNotify } from "@pi-archimedes/notify";
 import { loadDiffConfig } from "./config.js";
 import { openSettings } from "./settings.js"
 
-// Module-level refs for shutdown (survive hot-reloads)
+// Module-level ref for shutdown (survives session replacements)
 let imagePasteShutdown: (() => void) | undefined;
-// Guard: tracks which lazy-loaded packages have been registered.
-// session_start fires for /new, /resume, /fork, /reload — each tears down the
-// old runtime and rebuilds, but pi itself stays loaded, so this module is
-// evaluated once and these guards prevent handler accumulation on reload.
-const registeredLazy = new Set<string>();
+// Module-level ref for current session context (survives /reload, /new, /fork)
+// Used by diff's theme getter callback — updated every session_start so the
+// getter always returns the latest ctx's theme even after session replacement.
+let currentCtx: ExtensionContext | undefined;
 
 export default function (pi: ExtensionAPI): void {
   archResetTimings();
@@ -58,6 +57,9 @@ export default function (pi: ExtensionAPI): void {
   pi.on("session_start", async (_event, ctx: ExtensionContext) => {
     archTime(`session_start (factory was ${Date.now() - _moduleEvalAt}ms ago)`);
 
+    // Update module-level context ref so lazy-loaded callbacks always see current session
+    currentCtx = ctx;
+
     // ── Parallel lazy-load all three packages (saves ~100ms vs sequential) ──
     const [diffMod, ipMod, saMod] = await Promise.all([
       import("@pi-archimedes/diff").catch((e) => { console.error("[archimedes] diff load failed:", e); return null; }),
@@ -66,26 +68,28 @@ export default function (pi: ExtensionAPI): void {
     ]);
     archTime("3 packages loaded in parallel");
 
-    if (diffMod && !registeredLazy.has("diff")) {
-      diffMod.registerDiffTools(pi, () => ctx.ui.theme, () => loadDiffConfig());
-      registeredLazy.add("diff");
+    // Each session_start fires on a fresh Extension (pi creates a new
+    // ExtensionRunner per session). Registration is safe to — and must —
+    // run every time. The registeredLazy guard was removed because it
+    // prevented subagent/diff/image-paste from being registered after
+    // /new, /fork, /resume: jiti caches the compiled module, so the guard
+    // persisted across sessions while each new session creates a fresh
+    // Extension with empty tools/commands maps.
+    if (diffMod) {
+      diffMod.registerDiffTools(pi, () => currentCtx!.ui.theme, () => loadDiffConfig());
     }
     if (ipMod) {
-      // initImagePasteSession must run every session_start (it captures the new ctx)
-      // but the actual handler registration via pi.on("input", ...) must only happen once.
-      if (!registeredLazy.has("image-paste")) {
-        ipMod.registerImagePaste(pi);
-        imagePasteShutdown = ipMod.shutdownImagePaste;
-        registeredLazy.add("image-paste");
-      }
+      // registerImagePaste calls pi.on("input", ...) and pi.registerShortcut()
+      // on the current Extension. Since each session replacement creates a
+      // new Extension with its own handler list, there is no accumulation.
+      ipMod.registerImagePaste(pi);
+      imagePasteShutdown = ipMod.shutdownImagePaste;
+      // initImagePasteSession must run every session_start (captures fresh ctx)
       ipMod.initImagePasteSession(ctx);
     }
     if (saMod) {
-      if (!registeredLazy.has("subagent")) {
-        saMod.registerSubagent(pi);
-        saMod.registerAgentsCommand(pi);
-        registeredLazy.add("subagent");
-      }
+      saMod.registerSubagent(pi);
+      saMod.registerAgentsCommand(pi);
     }
   });