@mrclrchtr/supi-claude-md 1.1.3 → 1.3.0

package/README.md

@@ -10,11 +10,7 @@ Then it helps you keep those files in shape — audit quality, flag stale sectio
 
 ### Context that travels
 
-Reads, writes, edits, LSP operations — any time the agent touches a file, it picks up the nearest `CLAUDE.md` or `AGENTS.md` in that directory. Conventions arrive exactly when they're needed, not dumped upfront.
-
-### Smart about when to refresh
-
-First-time discovery always injects. Re-reads wait a configurable number of turns and skip when the context window is too full. No flooding.
+Reads, writes, edits, LSP operations — any time the agent touches a file, it picks up the nearest `CLAUDE.md` or `AGENTS.md` in that directory. Each subdirectory's context is injected once (on first discovery) and available for the rest of the session.
 
 ### CLAUDE.md maintenance
 
@@ -37,14 +33,10 @@ Configure via `/supi-settings` or directly in config:
 {
   "claude-md": {
     "subdirs": true,
-    "rereadInterval": 3,
-    "contextThreshold": 80,
     "fileNames": ["CLAUDE.md", "AGENTS.md"]
   }
 }
 ```
 
 - `subdirs` — toggle subdirectory discovery on/off
-- `rereadInterval` — turns between re-reading a directory's context (0 = never re-read)
-- `contextThreshold` — skip re-reads when context usage is above this percent
 - `fileNames` — which filenames to look for (comma-separated)

package/node_modules/@mrclrchtr/supi-core/README.md

@@ -12,7 +12,12 @@ pnpm add @mrclrchtr/supi-core
 
 ## Package role
 
-`@mrclrchtr/supi-core` is a library package. It does **not** register a pi extension and is not meant to be installed as a standalone pi package.
+`@mrclrchtr/supi-core` now has two explicit surfaces:
+
+- `@mrclrchtr/supi-core/api` — shared library helpers for other SuPi packages
+- `@mrclrchtr/supi-core/extension` — a minimal pi extension that registers `/supi-settings`
+
+`pi.extensions` still points at the real file path `./src/extension.ts` inside the package. The `/api` and `/extension` paths are consumer-facing package exports, not manifest aliases.
 
 ## What it provides
 
@@ -59,7 +64,7 @@ Main helpers:
 ## Example
 
 ```ts
-import { loadSupiConfig, registerConfigSettings, wrapExtensionContext } from "@mrclrchtr/supi-core";
+import { loadSupiConfig, registerConfigSettings, wrapExtensionContext } from "@mrclrchtr/supi-core/api";
 
 const config = loadSupiConfig("my-extension", process.cwd(), {
   enabled: true,
@@ -87,4 +92,5 @@ const message = wrapExtensionContext("my-extension", "hello", {
 
 ## Source
 
-- Main exports: `src/index.ts`
+- Library surface: `src/api.ts`
+- Extension surface: `src/extension.ts`

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.1.3",
+  "version": "1.3.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {
@@ -30,5 +30,15 @@
       "optional": true
     }
   },
-  "main": "src/index.ts"
+  "main": "src/api.ts",
+  "exports": {
+    "./api": "./src/api.ts",
+    "./extension": "./src/extension.ts",
+    "./package.json": "./package.json"
+  },
+  "pi": {
+    "extensions": [
+      "./src/extension.ts"
+    ]
+  }
 }

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

@@ -0,0 +1,83 @@
+// supi-core — shared infrastructure for SuPi extensions.
+// Provides XML context tag wrapping, unified config system, context-message utilities,
+// and settings registry for supi-wide TUI settings.
+
+export type { SupiConfigLocation, SupiConfigOptions } from "./config.ts";
+export {
+  loadSupiConfig,
+  loadSupiConfigForScope,
+  removeSupiConfigKey,
+  writeSupiConfig,
+} from "./config.ts";
+export type { ConfigSettingsHelpers, ConfigSettingsOptions } from "./config-settings.ts";
+export { registerConfigSettings } from "./config-settings.ts";
+export type { ContextMessageLike } from "./context-messages.ts";
+export {
+  findLastUserMessageIndex,
+  getContextToken,
+  getPromptContent,
+  pruneAndReorderContextMessages,
+  restorePromptContent,
+} from "./context-messages.ts";
+export type { ContextProvider } from "./context-provider-registry.ts";
+export {
+  clearRegisteredContextProviders,
+  getRegisteredContextProviders,
+  registerContextProvider,
+} from "./context-provider-registry.ts";
+export { wrapExtensionContext } from "./context-tag.ts";
+export type {
+  DebugAgentAccess,
+  DebugEvent,
+  DebugEventInput,
+  DebugEventQuery,
+  DebugEventQueryResult,
+  DebugEventView,
+  DebugLevel,
+  DebugNotifyLevel,
+  DebugRegistryConfig,
+  DebugSummary,
+} from "./debug-registry.ts";
+export {
+  clearDebugEvents,
+  configureDebugRegistry,
+  DEBUG_REGISTRY_DEFAULTS,
+  getDebugEvents,
+  getDebugRegistryConfig,
+  getDebugSummary,
+  recordDebugEvent,
+  redactDebugData,
+  resetDebugRegistry,
+} from "./debug-registry.ts";
+export type { KnownRootEntry } from "./project-roots.ts";
+export {
+  buildKnownRootsMap,
+  byPathDepth,
+  dedupeTopmostRoots,
+  findProjectRoot,
+  isWithin,
+  isWithinOrEqual,
+  mergeKnownRoots,
+  resolveKnownRoot,
+  segmentCount,
+  sortRootsBySpecificity,
+  walkProject,
+} from "./project-roots.ts";
+export { getActiveBranchEntries } from "./session-utils.ts";
+export { registerSettingsCommand } from "./settings-command.ts";
+export type { SettingsScope, SettingsSection } from "./settings-registry.ts";
+export {
+  clearRegisteredSettings,
+  getRegisteredSettings,
+  registerSettings,
+} from "./settings-registry.ts";
+export { createInputSubmenu, openSettingsOverlay } from "./settings-ui.ts";
+export type { TitleTarget } from "./terminal.ts";
+export {
+  DONE_SYMBOL,
+  formatTitle,
+  signalBell,
+  signalDone,
+  signalWaiting,
+  WAITING_SYMBOL,
+} from "./terminal.ts";

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

@@ -0,0 +1 @@
+export { registerSettingsCommand as default } from "./settings-command.ts";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-claude-md",
-  "version": "1.1.3",
+  "version": "1.3.0",
   "description": "SuPi claude-md extension — automatic subdirectory context injection for pi",
   "license": "MIT",
   "repository": {
@@ -21,7 +21,7 @@
     "!__tests__"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "1.1.3"
+    "@mrclrchtr/supi-core": "1.3.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"
@@ -40,8 +40,13 @@
   },
   "pi": {
     "extensions": [
-      "./src/claude-md.ts"
+      "./src/extension.ts"
     ]
   },
-  "main": "src/index.ts"
+  "main": "src/api.ts",
+  "exports": {
+    "./api": "./src/api.ts",
+    "./extension": "./src/extension.ts",
+    "./package.json": "./package.json"
+  }
 }

package/src/api.ts

@@ -0,0 +1 @@
+export { default } from "./claude-md.ts";

package/src/claude-md.ts

@@ -13,17 +13,17 @@ import type {
   ExtensionContext,
   SessionCompactEvent,
   SessionStartEvent,
-  TurnEndEvent,
 } from "@earendil-works/pi-coding-agent";
 import { loadClaudeMdConfig } from "./config.ts";
+import type { DiscoveredContextFile } from "./discovery.ts";
 import {
   extractPathFromToolEvent,
   filterAlreadyLoaded,
   findSubdirContextFiles,
 } from "./discovery.ts";
 import { registerClaudeMdSettings } from "./settings-registration.ts";
-import { type ClaudeMdState, createInitialState, reconstructState } from "./state.ts";
-import type { ContextUsage, InjectionCheckOptions } from "./subdirectory.ts";
+import type { ClaudeMdState } from "./state.ts";
+import { createInitialState, reconstructState } from "./state.ts";
 import { formatSubdirContext, shouldInjectSubdir } from "./subdirectory.ts";
 
 const baseDir = dirname(dirname(fileURLToPath(import.meta.url)));
@@ -39,10 +39,8 @@ export default function claudeMdExtension(pi: ExtensionAPI) {
 
     try {
       const branch = ctx.sessionManager.getBranch();
-
       if (branch.length > 0) {
         const reconstructed = reconstructState(branch);
-        state.completedTurns = reconstructed.completedTurns;
         state.injectedDirs = reconstructed.injectedDirs;
       }
     } catch {
@@ -50,15 +48,6 @@ export default function claudeMdExtension(pi: ExtensionAPI) {
     }
   });
 
-  // ── Turn tracking ──────────────────────────────────────────
-
-  pi.on("turn_end", async (event: TurnEndEvent, _ctx: ExtensionContext) => {
-    const msg = event.message as { stopReason?: string };
-    if (msg?.stopReason === "stop") {
-      state.completedTurns++;
-    }
-  });
-
   // ── Compaction ─────────────────────────────────────────────
 
   pi.on("session_compact", async (_event: SessionCompactEvent, _ctx: ExtensionContext) => {
@@ -96,17 +85,11 @@ export default function claudeMdExtension(pi: ExtensionAPI) {
     );
     if (found.length === 0) return;
 
-    const dirsToInject = collectStaleDirs(found, {
-      injectedDirs: state.injectedDirs,
-      currentTurn: state.completedTurns,
-      rereadInterval: config.rereadInterval,
-      contextThreshold: config.contextThreshold,
-      contextUsage: _ctx.getContextUsage() as ContextUsage | undefined,
-    });
+    const dirsToInject = collectFreshDirs(found, state.injectedDirs);
     if (dirsToInject.size === 0) return;
 
     const filesToInject = Array.from(dirsToInject.values()).flat();
-    const contextText = formatSubdirContext(filesToInject, state.completedTurns);
+    const contextText = formatSubdirContext(filesToInject);
     if (!contextText) return;
 
     updateInjectedDirTracking(state, dirsToInject);
@@ -135,13 +118,13 @@ function captureNativePaths(
   }
 }
 
-function collectStaleDirs(
-  found: ReturnType<typeof findSubdirContextFiles>,
-  injectionOpts: InjectionCheckOptions,
-): Map<string, typeof found> {
-  const dirsToInject = new Map<string, typeof found>();
+function collectFreshDirs(
+  found: DiscoveredContextFile[],
+  injectedDirs: Set<string>,
+): Map<string, DiscoveredContextFile[]> {
+  const dirsToInject = new Map<string, DiscoveredContextFile[]>();
   for (const file of found) {
-    if (shouldInjectSubdir(file.dir, injectionOpts)) {
+    if (shouldInjectSubdir(file.dir, injectedDirs)) {
       const existing = dirsToInject.get(file.dir) ?? [];
       existing.push(file);
       dirsToInject.set(file.dir, existing);
@@ -152,12 +135,9 @@ function collectStaleDirs(
 
 function updateInjectedDirTracking(
   state: ClaudeMdState,
-  dirsToInject: Map<string, Array<{ dir: string; relativePath: string }>>,
+  dirsToInject: Map<string, DiscoveredContextFile[]>,
 ): void {
-  for (const [dir, files] of dirsToInject) {
-    const firstFile = files[0];
-    if (firstFile) {
-      state.injectedDirs.set(dir, { turn: state.completedTurns, file: firstFile.relativePath });
-    }
+  for (const dir of dirsToInject.keys()) {
+    state.injectedDirs.add(dir);
   }
 }

package/src/config.ts

@@ -2,19 +2,13 @@
 //
 // Config shape (in supi shared config, "claude-md" section):
 // {
-//   "rereadInterval": 3,      // turns between subdirectory re-reads (0 = off)
-//   "contextThreshold": 80,    // skip injection when context % >= threshold
 //   "subdirs": true,           // enable subdirectory context discovery
 //   "fileNames": ["CLAUDE.md", "AGENTS.md"]  // context file names to look for
 // }
 
-import { loadSupiConfig } from "@mrclrchtr/supi-core";
+import { loadSupiConfig } from "@mrclrchtr/supi-core/api";
 
 export interface ClaudeMdConfig {
-  /** Turns between re-reading previously injected subdirectory context. 0 = disabled. Default: 3 */
-  rereadInterval: number;
-  /** Skip injection when context window usage % >= threshold. 0 = always skip, 100 = never skip. Default: 80 */
-  contextThreshold: number;
   /** Enable subdirectory context discovery. Default: true */
   subdirs: boolean;
   /** Context file names to look for (first match per directory). Default: ["CLAUDE.md", "AGENTS.md"] */
@@ -22,8 +16,6 @@ export interface ClaudeMdConfig {
 }
 
 export const CLAUDE_MD_DEFAULTS: ClaudeMdConfig = {
-  rereadInterval: 3,
-  contextThreshold: 80,
   subdirs: true,
   fileNames: ["CLAUDE.md", "AGENTS.md"],
 };

package/src/extension.ts

@@ -0,0 +1 @@
+export { default } from "./claude-md.ts";

package/src/settings-registration.ts

@@ -5,33 +5,9 @@ import {
   type ConfigSettingsHelpers,
   createInputSubmenu,
   registerConfigSettings,
-} from "@mrclrchtr/supi-core";
+} from "@mrclrchtr/supi-core/api";
 import { CLAUDE_MD_DEFAULTS, type ClaudeMdConfig } from "./config.ts";
 
-const THRESHOLD_VALUES = [
-  "0",
-  "5",
-  "10",
-  "15",
-  "20",
-  "25",
-  "30",
-  "35",
-  "40",
-  "45",
-  "50",
-  "55",
-  "60",
-  "65",
-  "70",
-  "75",
-  "80",
-  "85",
-  "90",
-  "95",
-  "100",
-];
-
 // ── Settings registration ────────────────────────────────────
 
 export function registerClaudeMdSettings(): void {
@@ -58,16 +34,6 @@ function handleSettingChange(
       helpers.set("subdirs", value === "on");
       break;
     }
-    case "rereadInterval": {
-      const num = Number.parseInt(value, 10);
-      helpers.set("rereadInterval", Number.isNaN(num) ? 0 : num);
-      break;
-    }
-    case "contextThreshold": {
-      const num = Number.parseInt(value, 10);
-      helpers.set("contextThreshold", Number.isNaN(num) ? 80 : num);
-      break;
-    }
     case "fileNames": {
       const names = value
         .split(",")
@@ -92,21 +58,6 @@ function buildClaudeMdSettingItems(settings: ClaudeMdConfig): SettingItem[] {
       currentValue: settings.subdirs ? "on" : "off",
       values: ["on", "off"],
     },
-    {
-      id: "rereadInterval",
-      label: "Subdirectory Re-read Interval",
-      description: "Turns between re-reading previously injected subdirectory context (0 = off)",
-      currentValue: String(settings.rereadInterval),
-      submenu: (currentValue, done) =>
-        createInputSubmenu(currentValue, "Interval (0 = off):", done),
-    },
-    {
-      id: "contextThreshold",
-      label: "Context Threshold",
-      description: "Skip injection when context window usage % ≥ threshold (100 = never skip)",
-      currentValue: String(settings.contextThreshold),
-      values: THRESHOLD_VALUES,
-    },
     {
       id: "fileNames",
       label: "Context File Names",

package/src/state.ts

@@ -5,18 +5,9 @@
 
 import type { SessionEntry } from "@earendil-works/pi-coding-agent";
 
-export interface InjectedDir {
-  /** Turn number when this directory's context was last injected */
-  turn: number;
-  /** Relative path of the context file that was injected */
-  file: string;
-}
-
 export interface ClaudeMdState {
-  /** Count of completed assistant turns (stopReason: "stop") */
-  completedTurns: number;
-  /** Map of directory path → injection info */
-  injectedDirs: Map<string, InjectedDir>;
+  /** Set of directory paths whose context has already been injected */
+  injectedDirs: Set<string>;
   /** Set of paths already loaded by pi natively (dedup) */
   nativeContextPaths: Set<string>;
   /** Whether this is the first before_agent_start (for native path capture) */
@@ -25,41 +16,27 @@ export interface ClaudeMdState {
 
 export function createInitialState(): ClaudeMdState {
   return {
-    completedTurns: 0,
-    injectedDirs: new Map(),
+    injectedDirs: new Set(),
     nativeContextPaths: new Set(),
     firstAgentStart: true,
   };
 }
 
-const CONTEXT_TAG_REGEX =
-  /<extension-context\s+source="supi-claude-md"\s+file="([^"]+)"\s+turn="(\d+)">/g;
+const CONTEXT_TAG_REGEX = /<extension-context\s+source="supi-claude-md"\s+file="([^"]+)"[^>]*>/g;
 
 export function reconstructState(branch: SessionEntry[]): {
-  completedTurns: number;
-  injectedDirs: Map<string, InjectedDir>;
+  injectedDirs: Set<string>;
 } {
-  let completedTurns = 0;
-  const injectedDirs = new Map<string, InjectedDir>();
+  const injectedDirs = new Set<string>();
 
   for (const entry of branch) {
-    if (isCompletedAssistantTurn(entry)) completedTurns++;
-
     const toolResultContent = getToolResultContent(entry);
     if (toolResultContent) {
       extractInjectedDirs(toolResultContent, injectedDirs);
     }
   }
 
-  return { completedTurns, injectedDirs };
-}
-
-function isCompletedAssistantTurn(entry: SessionEntry): boolean {
-  return (
-    entry.type === "message" &&
-    entry.message.role === "assistant" &&
-    entry.message.stopReason === "stop"
-  );
+  return { injectedDirs };
 }
 
 function getToolResultContent(entry: SessionEntry): unknown {
@@ -69,7 +46,7 @@ function getToolResultContent(entry: SessionEntry): unknown {
   return entry.message.content;
 }
 
-function extractInjectedDirs(content: unknown, injectedDirs: Map<string, InjectedDir>): void {
+function extractInjectedDirs(content: unknown, injectedDirs: Set<string>): void {
   const parts = content as Array<{ type?: string; text?: string }> | undefined;
   if (!parts) return;
 
@@ -80,15 +57,14 @@ function extractInjectedDirs(content: unknown, injectedDirs: Map<string, Injecte
   }
 }
 
-function parseContextTags(text: string, injectedDirs: Map<string, InjectedDir>): void {
+function parseContextTags(text: string, injectedDirs: Set<string>): void {
   const matches = text.matchAll(CONTEXT_TAG_REGEX);
   for (const match of matches) {
     const file = match[1];
-    const turn = Number.parseInt(match[2] ?? "0", 10);
     if (file) {
       const lastSlash = Math.max(file.lastIndexOf("/"), file.lastIndexOf("\\"));
       const dir = lastSlash >= 0 ? file.substring(0, lastSlash) : ".";
-      injectedDirs.set(dir, { turn, file });
+      injectedDirs.add(dir);
     }
   }
 }

package/src/subdirectory.ts

@@ -1,27 +1,17 @@
 // Subdirectory context injection logic.
 //
 // Handles formatting discovered context files into <extension-context> blocks
-// and determining whether injection should occur based on staleness.
+// and determining whether injection should occur.
 
 import * as fs from "node:fs";
-import { wrapExtensionContext } from "@mrclrchtr/supi-core";
+import { wrapExtensionContext } from "@mrclrchtr/supi-core/api";
 import type { DiscoveredContextFile } from "./discovery.ts";
-import type { InjectedDir } from "./state.ts";
-
-/**
- * Context usage info from pi's ctx.getContextUsage().
- */
-export interface ContextUsage {
-  tokens: number | null;
-  contextWindow: number;
-  percent: number | null;
-}
 
 /**
  * Format discovered context files into <extension-context> blocks.
  * Each file is read and wrapped individually.
  */
-export function formatSubdirContext(files: DiscoveredContextFile[], turn: number): string {
+export function formatSubdirContext(files: DiscoveredContextFile[]): string {
   const parts: string[] = [];
 
   for (const file of files) {
@@ -31,7 +21,6 @@ export function formatSubdirContext(files: DiscoveredContextFile[], turn: number
         parts.push(
           wrapExtensionContext("supi-claude-md", content, {
             file: file.relativePath,
-            turn,
           }),
         );
       }
@@ -43,42 +32,10 @@ export function formatSubdirContext(files: DiscoveredContextFile[], turn: number
   return parts.join("\n\n");
 }
 
-export interface InjectionCheckOptions {
-  injectedDirs: Map<string, InjectedDir>;
-  currentTurn: number;
-  rereadInterval: number;
-  contextThreshold: number;
-  contextUsage?: ContextUsage;
-}
-
 /**
  * Determine if subdirectory context should be injected.
- * Returns true if:
- * - The directory has not been injected yet (always, even under context pressure)
- * - The directory was injected but is stale (turn delta >= rereadInterval)
- *   AND context usage is below the threshold
- * - rereadInterval is 0 (disabled — always false for re-injections)
+ * Returns true only if the directory has not been injected yet.
  */
-export function shouldInjectSubdir(dir: string, options: InjectionCheckOptions): boolean {
-  const { injectedDirs, currentTurn, rereadInterval, contextThreshold, contextUsage } = options;
-
-  // Never-injected directory: always inject (even when rereadInterval is 0)
-  // First-time discovery is always allowed regardless of context pressure
-  const injected = injectedDirs.get(dir);
-  if (!injected) return true;
-
-  // Already-injected directory: skip if reread is disabled
-  if (rereadInterval === 0) return false;
-
-  // Re-injection: skip when context usage is at or above threshold
-  if (
-    contextThreshold < 100 &&
-    contextUsage &&
-    contextUsage.percent != null &&
-    contextUsage.percent >= contextThreshold
-  ) {
-    return false;
-  }
-
-  return currentTurn - injected.turn >= rereadInterval;
+export function shouldInjectSubdir(dir: string, injectedDirs: Set<string>): boolean {
+  return !injectedDirs.has(dir);
 }