pi-message-sidebar 1.2.0 → 1.3.0

package/message-sidebar.ts

@@ -125,8 +125,8 @@ export default function messageSidebar(pi: ExtensionAPI): void {
 
     ctx.ui.onTerminalInput((data) => {
       // Slash commands such as /goal mutate session entries without firing
-      // turn events; a coalesced refresh on any keystroke keeps the dock live.
-      scheduleRefresh();
+      // turn events. Refresh on submit, not every keystroke.
+      if (matchesKey(data, "return") || matchesKey(data, "enter")) scheduleRefresh();
       if (tui && !isSidebarVisible(tui.terminal.columns) && sidebar?.isFocused()) {
         sidebar.setFocused(false);
         tui.requestRender();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-message-sidebar",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Persistent responsive message history sidebar for Pi",
   "keywords": [
     "pi-package",

package/src/goal.ts

@@ -15,22 +15,26 @@ type BranchEntry = { type?: string; customType?: string; data?: unknown };
 
 const GOAL_ENTRY_TYPE = "pi-codex-goal";
 
-function isThreadGoal(value: unknown): value is ThreadGoal {
-  const goal = value as ThreadGoal | null;
+function isThreadGoal(value: unknown): value is RawGoal {
+  const goal = value as RawGoal | null;
+  if (!goal || typeof goal !== "object") return false;
+  const usage = goal.usage as { tokensUsed?: unknown; activeSeconds?: unknown } | undefined;
   return (
-    !!goal &&
-    typeof goal === "object" &&
     typeof goal.goalId === "string" &&
     typeof goal.objective === "string" &&
     (goal.status === "active" || goal.status === "paused" || goal.status === "budgetLimited" || goal.status === "complete") &&
     (goal.tokenBudget === null || typeof goal.tokenBudget === "number") &&
-    typeof goal.tokensUsed === "number" &&
-    typeof goal.activeSeconds === "number" &&
     typeof goal.createdAt === "number" &&
-    typeof goal.updatedAt === "number"
+    typeof goal.updatedAt === "number" &&
+    typeof usage?.tokensUsed === "number" &&
+    typeof usage.activeSeconds === "number"
   );
 }
 
+type RawGoal = Omit<ThreadGoal, "tokensUsed" | "activeSeconds"> & {
+  usage: { tokensUsed: number; activeSeconds: number };
+};
+
 /**
  * Reconstructs the current thread goal from pi-codex-goal session entries.
  * Mirrors reconstructGoal() from pi-codex-goal dist/state.js (schema version 1):
@@ -46,31 +50,51 @@ export function readThreadGoal(entries: Iterable<BranchEntry>): ThreadGoal | nul
     if (data.kind === "clear") {
       goal = null;
     } else if (data.kind === "set" && isThreadGoal(data.goal)) {
-      goal = { ...(data.goal as ThreadGoal) };
+      const raw = data.goal as RawGoal;
+      goal = {
+        goalId: raw.goalId,
+        objective: raw.objective,
+        status: raw.status,
+        tokenBudget: raw.tokenBudget,
+        tokensUsed: raw.usage.tokensUsed,
+        activeSeconds: raw.usage.activeSeconds,
+        createdAt: raw.createdAt,
+        updatedAt: raw.updatedAt,
+      };
     } else if (data.kind === "usage" && goal) {
       const usage = data.usage as { tokensUsed?: number; activeSeconds?: number } | undefined;
       const updatedAt = data.updatedAt;
+      const status = data.status;
       if (data.goalId !== goal.goalId) continue;
+      if (status !== "active" && status !== "budgetLimited") continue;
       if (goal.status !== "active" && goal.status !== "budgetLimited") continue;
-      if (goal.status === "budgetLimited" && data.status === "active") continue;
+      if (goal.status === "budgetLimited" && status === "active") continue;
       if (typeof updatedAt !== "number" || typeof usage?.tokensUsed !== "number" || typeof usage.activeSeconds !== "number") continue;
       if (updatedAt < goal.updatedAt || usage.tokensUsed < goal.tokensUsed || usage.activeSeconds < goal.activeSeconds) continue;
-      goal = { ...goal, status: data.status as ThreadGoal["status"], tokensUsed: usage.tokensUsed, activeSeconds: usage.activeSeconds, updatedAt } as ThreadGoal;
+      const current: ThreadGoal = goal;
+      goal = {
+        ...current,
+        status,
+        tokensUsed: usage.tokensUsed,
+        activeSeconds: usage.activeSeconds,
+        updatedAt,
+      };
     }
   }
   return goal;
 }
 
-type GoalCache = { key: string; goal: ThreadGoal | null };
-let cache: GoalCache | null = null;
+type GoalCache = { branch: object; key: string; goal: ThreadGoal | null };
+const cache = new WeakMap<ExtensionContext, GoalCache>();
 
 /** Cached readThreadGoal over the current session branch. */
 export function readSessionGoal(ctx: ExtensionContext): ThreadGoal | null {
   const branch = ctx.sessionManager.getBranch();
   const last = branch.at(-1);
   const key = `${branch.length}:${last?.id ?? ""}:${last?.timestamp ?? ""}`;
-  if (cache && cache.key === key) return cache.goal;
+  const previous = cache.get(ctx);
+  if (previous?.branch === branch && previous.key === key) return previous.goal;
   const goal = readThreadGoal(branch);
-  cache = { key, goal };
+  cache.set(ctx, { branch, key, goal });
   return goal;
 }