@mrclrchtr/supi-extras 1.4.0 → 1.6.0

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-core/src/api.ts

@@ -49,6 +49,7 @@ export {
   redactDebugData,
   resetDebugRegistry,
 } from "./debug-registry.ts";
+export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
 export type { KnownRootEntry } from "./project-roots.ts";
 export {
   buildKnownRootsMap,
@@ -63,6 +64,7 @@ export {
   sortRootsBySpecificity,
   walkProject,
 } from "./project-roots.ts";
+export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export { getActiveBranchEntries } from "./session-utils.ts";
 export { registerSettingsCommand } from "./settings/settings-command.ts";
 export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";

package/node_modules/@mrclrchtr/supi-core/src/index.ts

@@ -49,6 +49,7 @@ export {
   redactDebugData,
   resetDebugRegistry,
 } from "./debug-registry.ts";
+export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
 export type { KnownRootEntry } from "./project-roots.ts";
 export {
   buildKnownRootsMap,
@@ -63,6 +64,7 @@ export {
   sortRootsBySpecificity,
   walkProject,
 } from "./project-roots.ts";
+export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export { getActiveBranchEntries } from "./session-utils.ts";
 export { registerSettingsCommand } from "./settings/settings-command.ts";
 export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";

package/node_modules/@mrclrchtr/supi-core/src/path-utils.ts

@@ -0,0 +1,40 @@
+import * as path from "node:path";
+
+/** Strip pi's optional leading `@` file-path prefix from a tool input. */
+export function stripToolPathPrefix(target: string): string {
+  return target.startsWith("@") ? target.slice(1) : target;
+}
+
+/**
+ * Resolve a tool-style file path from a session cwd.
+ *
+ * Built-in pi file tools accept a leading `@` prefix in path arguments, so
+ * shared SuPi path helpers normalize that prefix before resolving relative
+ * paths.
+ */
+export function resolveToolPath(cwd: string, target: string): string {
+  return path.resolve(cwd, stripToolPathPrefix(target));
+}
+
+/** Convert a file path to a file:// URI. */
+export function fileToUri(filePath: string): string {
+  const resolved = path.resolve(filePath);
+  if (process.platform === "win32") {
+    return `file:///${resolved.replace(/\\/g, "/")}`;
+  }
+  return `file://${resolved}`;
+}
+
+/** Convert a file:// URI to a file path. */
+export function uriToFile(uri: string): string {
+  if (!uri.startsWith("file://")) return uri;
+  let filePath = decodeURIComponent(uri.slice(7));
+  if (
+    process.platform === "win32" &&
+    filePath.startsWith("/") &&
+    /^[A-Za-z]:/.test(filePath.slice(1))
+  ) {
+    filePath = filePath.slice(1);
+  }
+  return filePath;
+}

package/node_modules/@mrclrchtr/supi-core/src/registry-utils.ts

@@ -5,8 +5,20 @@
 // Without this, each symlink path gets its own module copy and its own Map,
 // so registrations from one instance are invisible to consumers in another.
 
+import * as path from "node:path";
+
 const SYMBOL_PREFIX = "@mrclrchtr/supi-core/";
 
+function getGlobalRegistryMap<T>(name: string): Map<string, T> {
+  const key = Symbol.for(SYMBOL_PREFIX + name);
+  let map = (globalThis as Record<symbol, unknown>)[key] as Map<string, T> | undefined;
+  if (!map) {
+    map = new Map<string, T>();
+    (globalThis as Record<symbol, unknown>)[key] = map;
+  }
+  return map;
+}
+
 /**
  * Create a named registry backed by `globalThis` + `Symbol.for`.
  *
@@ -18,16 +30,7 @@ const SYMBOL_PREFIX = "@mrclrchtr/supi-core/";
  * @returns An object with `register`, `getAll`, and `clear` functions.
  */
 export function createRegistry<T>(name: string) {
-  const key = Symbol.for(SYMBOL_PREFIX + name);
-
-  const getMap = (): Map<string, T> => {
-    let map = (globalThis as Record<symbol, unknown>)[key] as Map<string, T> | undefined;
-    if (!map) {
-      map = new Map<string, T>();
-      (globalThis as Record<symbol, unknown>)[key] = map;
-    }
-    return map;
-  };
+  const getMap = (): Map<string, T> => getGlobalRegistryMap<T>(name);
 
   return {
     /**
@@ -52,3 +55,32 @@ export function createRegistry<T>(name: string) {
     },
   };
 }
+
+/**
+ * Create a named session-state registry keyed by normalized cwd.
+ *
+ * This helper is intended for session-scoped runtime services that should be
+ * shared across duplicate jiti module instances while keeping package-specific
+ * state unions and convenience wrappers local to the calling package.
+ */
+export function createSessionStateRegistry<TState>(name: string) {
+  const getMap = (): Map<string, TState> => getGlobalRegistryMap<TState>(name);
+  const normalizeCwd = (cwd: string): string => path.resolve(cwd);
+
+  return {
+    /** Get the current state for one session cwd. */
+    get: (cwd: string): TState | undefined => {
+      return getMap().get(normalizeCwd(cwd));
+    },
+
+    /** Store the current state for one session cwd. */
+    set: (cwd: string, state: TState): void => {
+      getMap().set(normalizeCwd(cwd), state);
+    },
+
+    /** Clear the current state for one session cwd. */
+    clear: (cwd: string): void => {
+      getMap().delete(normalizeCwd(cwd));
+    },
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-extras",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "SuPi extras — command aliases, skill shorthand, tab spinner, /supi-stash prompt stash with TUI overlay, and other small utilities",
   "license": "MIT",
   "repository": {
@@ -21,7 +21,7 @@
   ],
   "dependencies": {
     "clipboardy": "^5.3.1",
-    "@mrclrchtr/supi-core": "1.4.0"
+    "@mrclrchtr/supi-core": "1.6.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/src/tab-spinner.ts

@@ -15,6 +15,7 @@ import { formatTitle, signalDone } from "@mrclrchtr/supi-core/api";
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 const AGENT_END_SETTLE_MS = 200;
 
+// biome-ignore lint/complexity/noExcessiveLinesPerFunction: spinner state and event wiring are intentionally colocated
 export default function tabSpinner(pi: ExtensionAPI) {
   let timer: ReturnType<typeof setInterval> | null = null;
   let pendingAgentEndTimer: ReturnType<typeof setTimeout> | null = null;
@@ -24,10 +25,13 @@ export default function tabSpinner(pi: ExtensionAPI) {
   let pendingAgentEnd = false;
   let askUserActive = 0;
   let currentCtx: ExtensionContext | undefined;
+  let cachedSessionName: string | undefined;
+  let cachedCwd: string | undefined;
+  const unregisterBusHandlers: Array<() => void> = [];
 
-  /** Build the current base title from session name and cwd. */
+  /** Build the current base title from cached cwd plus the latest safe session name lookup. */
   function title() {
-    return formatTitle(pi.getSessionName(), currentCtx?.cwd);
+    return formatTitle(getSessionNameSafe(), cachedCwd);
   }
 
   function clearPendingAgentEnd() {
@@ -38,42 +42,86 @@ export default function tabSpinner(pi: ExtensionAPI) {
     }
   }
 
-  /** Restore the base title immediately. */
-  function stop() {
-    clearPendingAgentEnd();
+  function clearSpinnerTimer() {
     if (timer) {
       clearInterval(timer);
       timer = null;
     }
+  }
+
+  function handleStaleContext() {
+    clearPendingAgentEnd();
+    clearSpinnerTimer();
+    activeCount = 0;
+    hasActiveAgent = false;
+    currentCtx = undefined;
+  }
+
+  function rememberContext(ctx: ExtensionContext) {
+    currentCtx = ctx;
+    cachedCwd = ctx.cwd;
+    cachedSessionName = getSessionNameSafe();
+  }
+
+  function getSessionNameSafe(): string | undefined {
+    try {
+      const next = pi.getSessionName();
+      if (next !== undefined) {
+        cachedSessionName = next;
+      }
+      return cachedSessionName;
+    } catch {
+      handleStaleContext();
+      return cachedSessionName;
+    }
+  }
+
+  function safelySetTitle(nextTitle: string) {
+    if (!currentCtx) return;
+    try {
+      currentCtx.ui.setTitle(nextTitle);
+    } catch {
+      handleStaleContext();
+    }
+  }
+
+  /** Restore the base title immediately. */
+  function stop() {
+    clearPendingAgentEnd();
+    clearSpinnerTimer();
     frame = 0;
-    if (currentCtx) currentCtx.ui.setTitle(title());
+    const baseTitle = title();
+    safelySetTitle(baseTitle);
   }
 
   /** Show the ✓ done symbol in the title and play the terminal bell. */
   function showDone() {
     clearPendingAgentEnd();
-    if (timer) {
-      clearInterval(timer);
-      timer = null;
-    }
+    clearSpinnerTimer();
     frame = 0;
-    if (currentCtx) signalDone(currentCtx, title());
+    const baseTitle = title();
+    if (!currentCtx) return;
+    try {
+      signalDone(currentCtx, baseTitle);
+    } catch {
+      handleStaleContext();
+    }
   }
 
   /** Start the spinner interval. Overwrites any ✓ shown. */
   function start() {
-    if (timer) return;
-    if (!currentCtx) return;
+    if (timer || !currentCtx) return;
     timer = setInterval(() => {
       const icon = SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
-      currentCtx?.ui.setTitle(`${icon} ${title()}`);
+      const baseTitle = title();
+      safelySetTitle(`${icon} ${baseTitle}`);
       frame++;
     }, 80);
   }
 
   function increment(ctx: ExtensionContext) {
     clearPendingAgentEnd();
-    currentCtx = ctx;
+    rememberContext(ctx);
     activeCount++;
     if (activeCount === 1 && askUserActive === 0) start();
   }
@@ -81,7 +129,7 @@ export default function tabSpinner(pi: ExtensionAPI) {
   function resumePendingAgent(ctx: ExtensionContext) {
     if (!pendingAgentEnd) return;
     clearPendingAgentEnd();
-    currentCtx = ctx;
+    rememberContext(ctx);
     hasActiveAgent = true;
     if (askUserActive === 0) start();
   }
@@ -113,6 +161,16 @@ export default function tabSpinner(pi: ExtensionAPI) {
     pendingAgentEndTimer.unref?.();
   }
 
+  function unregisterEvents() {
+    for (const unregister of unregisterBusHandlers.splice(0)) {
+      unregister();
+    }
+  }
+
+  pi.on("session_start", async (_event, ctx) => {
+    rememberContext(ctx);
+  });
+
   pi.on("agent_start", async (_event, ctx) => {
     if (pendingAgentEnd) {
       resumePendingAgent(ctx);
@@ -124,39 +182,39 @@ export default function tabSpinner(pi: ExtensionAPI) {
 
   pi.on("turn_start", async (_event, ctx) => resumePendingAgent(ctx));
 
-  pi.on("agent_end", async (event, _ctx) => {
+  pi.on("agent_end", async (event) => {
     const retryAwareEvent = event as { willRetry?: boolean };
-    // Extension events do not currently type `willRetry`, but honor it when
-    // present and otherwise rely on the short settle window plus turn_start.
     if (retryAwareEvent.willRetry) return;
     hasActiveAgent = false;
     agentEnded();
   });
 
   pi.on("session_shutdown", async (_event, ctx) => {
+    unregisterEvents();
     activeCount = 0;
-    currentCtx = ctx;
+    rememberContext(ctx);
     stop();
+    currentCtx = undefined;
   });
 
-  pi.events.on("supi:working:start", () => {
-    if (currentCtx) increment(currentCtx);
-  });
-  pi.events.on("supi:working:end", () => decrement());
-
-  pi.events.on("supi:ask-user:start", () => {
-    askUserActive++;
-    // Pause the spinner so ask_user's attention title (set via signalWaiting)
-    // is visible to the user instead of being overwritten on the next tick.
-    if (timer) {
-      clearInterval(timer);
-      timer = null;
-    }
-  });
-
-  pi.events.on("supi:ask-user:end", () => {
-    askUserActive = Math.max(0, askUserActive - 1);
-    // Resume the spinner if the agent (or background work) is still running.
-    if (askUserActive === 0 && activeCount > 0) start();
-  });
+  unregisterBusHandlers.push(
+    pi.events.on("supi:working:start", () => {
+      if (currentCtx) increment(currentCtx);
+    }),
+  );
+  unregisterBusHandlers.push(pi.events.on("supi:working:end", () => decrement()));
+
+  unregisterBusHandlers.push(
+    pi.events.on("supi:ask-user:start", () => {
+      askUserActive++;
+      clearSpinnerTimer();
+    }),
+  );
+
+  unregisterBusHandlers.push(
+    pi.events.on("supi:ask-user:end", () => {
+      askUserActive = Math.max(0, askUserActive - 1);
+      if (askUserActive === 0 && activeCount > 0) start();
+    }),
+  );
 }