@mrclrchtr/supi-context 1.3.0 → 1.4.0

package/src/prompt-inference.ts

@@ -1,4 +1,3 @@
-import { existsSync, readFileSync } from "node:fs";
 import type {
   BuildSystemPromptOptions,
   ExtensionCommandContext,
@@ -75,12 +74,28 @@ function deriveContextFiles(systemPrompt: string): Array<{ path: string; content
 
   const contextFiles: Array<{ path: string; content: string }> = [];
   const headingRegex = /^##\s+(.+)$/gm;
-  for (const match of projectContext.matchAll(headingRegex)) {
+
+  let match = headingRegex.exec(projectContext);
+  while (match !== null) {
     const filePath = match[1].trim();
-    if (!isLikelyContextFileHeading(filePath) || !existsSync(filePath)) {
-      continue;
+    const contentStart = match.index + match[0].length;
+
+    const nextMatch = headingRegex.exec(projectContext);
+    const contentEnd = nextMatch ? nextMatch.index : projectContext.length;
+
+    let content = projectContext.slice(contentStart, contentEnd);
+    if (content.startsWith("\n\n")) {
+      content = content.slice(2);
+    }
+    if (content.endsWith("\n\n")) {
+      content = content.slice(0, -2);
+    }
+
+    if (isLikelyContextFileHeading(filePath)) {
+      contextFiles.push({ path: filePath, content });
     }
-    contextFiles.push({ path: filePath, content: readFileSync(filePath, "utf-8") });
+
+    match = nextMatch;
   }
 
   return contextFiles;
@@ -111,21 +126,30 @@ export function deriveOptionsFromSystemPrompt(
   ctx: ExtensionCommandContext,
   cachedOptions: BuildSystemPromptOptions | undefined,
 ): BuildSystemPromptOptions | undefined {
+  const systemPrompt = ctx.getSystemPrompt();
+  const derivedFiles = deriveContextFiles(systemPrompt);
+  const derivedSkills = deriveSkills(systemPrompt);
+
   if (cachedOptions) {
-    return cachedOptions;
+    const hasFiles = cachedOptions.contextFiles && cachedOptions.contextFiles.length > 0;
+    const hasSkills = cachedOptions.skills && cachedOptions.skills.length > 0;
+    if (hasFiles && hasSkills) {
+      return cachedOptions;
+    }
+    return {
+      ...cachedOptions,
+      contextFiles: hasFiles ? cachedOptions.contextFiles : derivedFiles,
+      skills: hasSkills ? cachedOptions.skills : derivedSkills,
+    };
   }
 
-  const systemPrompt = ctx.getSystemPrompt();
-  const contextFiles = deriveContextFiles(systemPrompt);
-  const skills = deriveSkills(systemPrompt);
-
-  if (contextFiles.length === 0 && skills.length === 0) {
+  if (derivedFiles.length === 0 && derivedSkills.length === 0) {
     return undefined;
   }
 
   return {
     cwd: ctx.cwd,
-    contextFiles,
-    skills,
+    contextFiles: derivedFiles,
+    skills: derivedSkills,
   };
 }

package/src/renderer.ts

@@ -1,8 +1,36 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { Container, Spacer, Text } from "@earendil-works/pi-tui";
+import { Text } from "@earendil-works/pi-tui";
 import type { ContextAnalysis } from "./analysis.ts";
 import { formatContextReport } from "./format.ts";
 
+type Theme = Parameters<Parameters<ExtensionAPI["registerMessageRenderer"]>[1]>[2];
+
+class ContextReportComponent {
+  private cachedWidth?: number;
+  private cachedLines?: string[];
+
+  constructor(
+    private readonly analysis: ContextAnalysis,
+    private readonly theme: Theme,
+  ) {}
+
+  render(width: number): string[] {
+    if (this.cachedLines && this.cachedWidth === width) {
+      return this.cachedLines;
+    }
+
+    const lines = formatContextReport(this.analysis, this.theme, width);
+    this.cachedWidth = width;
+    this.cachedLines = lines;
+    return lines;
+  }
+
+  invalidate(): void {
+    this.cachedWidth = undefined;
+    this.cachedLines = undefined;
+  }
+}
+
 export function registerContextRenderer(pi: ExtensionAPI): void {
   pi.registerMessageRenderer("supi-context", (message, _renderOptions, theme) => {
     const analysis = (message.details as { analysis?: ContextAnalysis } | undefined)?.analysis;
@@ -10,17 +38,6 @@ export function registerContextRenderer(pi: ExtensionAPI): void {
       return new Text(theme.fg("dim", "No context analysis data"), 1, 0);
     }
 
-    const lines = formatContextReport(analysis, theme);
-    const container = new Container();
-
-    for (const line of lines) {
-      if (line === "") {
-        container.addChild(new Spacer(1));
-      } else {
-        container.addChild(new Text(line, 0, 0));
-      }
-    }
-
-    return container;
+    return new ContextReportComponent(analysis, theme);
   });
 }