@hienlh/ppm 0.20.5 → 0.20.7

package/src/services/provider-shared-context.ts

@@ -0,0 +1,152 @@
+import { readdir, open, realpath, stat } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { homedir } from "node:os";
+import { createHash } from "node:crypto";
+import type { AIProvider } from "../types/chat.ts";
+import { readCodexNativeMemory } from "./codex-native-memory.ts";
+
+type Source = { path: string; directory?: boolean; indexOnly?: boolean };
+const MAX_FILES = 48;
+const MAX_FILE_BYTES = 4_000;
+const MAX_CONTEXT_CHARS = 12_000;
+
+/** Explicit instruction sources only: never scan provider settings, auth or transcripts. */
+export async function buildSharedProviderContext(
+  projectPath: string,
+  providers: AIProvider[],
+  options: { userHome?: string; codexHomes?: string[]; recipientProviderId?: string } = {},
+): Promise<string> {
+  const project = resolve(projectPath);
+  const canonicalProject = (await realpath(project).catch(() => project)).normalize("NFC");
+  const home = options.userHome ?? homedir();
+  const claudeHome = options.userHome ? join(home, ".claude") : process.env.CLAUDE_CONFIG_DIR || join(home, ".claude");
+  const claudeMemory = join(claudeHome, "projects", canonicalProject.replace(/[^a-zA-Z0-9]/g, "-"), "memory");
+  const recipient = options.recipientProviderId;
+  const sources: Source[] = [
+    // Native indexes come first so rules cannot crowd out existing memories.
+    ...(recipient === "claude" ? [] : [
+      { path: claudeMemory, directory: true, indexOnly: true },
+      { path: join(project, "CLAUDE.md") },
+      { path: join(project, "CLAUDE.local.md") },
+      { path: join(claudeHome, "CLAUDE.md") },
+      { path: join(claudeHome, "rules"), directory: true },
+    ]),
+    ...(recipient === "codex" ? [] : [{ path: join(project, "AGENTS.md") }]),
+  ];
+  let codexHomes = options.codexHomes;
+  if (!codexHomes) {
+    codexHomes = [join(home, ".codex")];
+    if (!options.userHome) {
+      if (process.env.CODEX_HOME) codexHomes.push(process.env.CODEX_HOME);
+      const { listCodexAccounts } = await import("./codex-account.service.ts");
+      codexHomes.push(...listCodexAccounts().map((account) => account.home));
+    }
+  }
+  for (const codexHome of recipient === "codex" ? [] : new Set(codexHomes)) {
+    sources.push({ path: join(codexHome, "AGENTS.md") });
+  }
+  const ids = new Set(["claude", "codex", "cursor", ...providers.map((p) => p.id)]);
+  for (const id of ids) {
+    if (!/^[a-z0-9_-]+$/i.test(id)) continue;
+    // Only known native loaders are excluded: new providers still get their
+    // conventional sources until their adapter explicitly handles native loading.
+    if (!(id === recipient && ["claude", "codex", "cursor"].includes(id))) {
+      sources.push({ path: join(project, `.${id}`, "rules"), directory: true });
+    }
+    if (!(id === "claude" && recipient === "claude")) {
+      sources.push({ path: join(project, `.${id}`, "memory"), directory: true, indexOnly: true });
+    }
+  }
+  for (const provider of providers) {
+    try { sources.push(...(provider.getSharedContextSources?.(project) ?? [])); }
+    catch { /* An unavailable provider must not prevent other providers from chatting. */ }
+  }
+
+  const seen = new Set<string>();
+  const sections: string[] = [];
+  const available: string[] = [];
+  const revision = createHash("sha256");
+  let remaining = MAX_CONTEXT_CHARS;
+  let nativeBudget = 4_000;
+  // Codex already loads its own native memory; share it with other runtimes.
+  for (const memory of recipient === "codex" ? [] : readCodexNativeMemory(canonicalProject, codexHomes)) {
+    revision.update(memory.path).update(memory.content);
+    if (nativeBudget < 512) continue;
+    const content = memory.content.slice(0, nativeBudget - 256);
+    const section = `Native Codex memory record: ${JSON.stringify(memory.path)}\n${content}\n${content.length < memory.content.length ? "[Excerpt; the original record has more content.]\n" : ""}`;
+    sections.push(section);
+    remaining -= section.length;
+    nativeBudget -= section.length;
+  }
+  let count = 0;
+  let visited = 0;
+  async function fingerprintTopics(path: string, depth = 0): Promise<void> {
+    if (depth > 3 || visited >= 256) return;
+    visited++;
+    try {
+      const entries = (await readdir(path, { withFileTypes: true })).sort((a, b) => a.name.localeCompare(b.name));
+      for (const entry of entries.slice(0, MAX_FILES)) {
+        const child = join(path, entry.name);
+        if (entry.isDirectory()) await fingerprintTopics(child, depth + 1);
+        else if (entry.isFile() && /\.(md|mdc)$/i.test(entry.name)) {
+          const info = await stat(child);
+          revision.update(JSON.stringify([child, info.size, info.mtimeMs, info.ctimeMs]));
+        }
+      }
+    } catch { /* Optional topic folders may disappear while being edited. */ }
+  }
+  async function collect(source: Source, depth = 0): Promise<void> {
+    if (count >= MAX_FILES || depth > 3 || visited >= 256) return;
+    visited++;
+    try {
+      const path = await realpath(source.path);
+      const key = process.platform === "win32" ? path.toLowerCase() : path;
+      if (seen.has(key)) return;
+      seen.add(key);
+      if (source.directory) {
+        available.push(`Native source directory: ${JSON.stringify(path)}`);
+        if (source.indexOnly) {
+          await fingerprintTopics(path);
+          await collect({ path: join(path, "MEMORY.md") }, depth + 1);
+          return;
+        }
+        const entries = (await readdir(path, { withFileTypes: true })).sort((a, b) =>
+          Number(b.name.toLowerCase() === "memory.md") - Number(a.name.toLowerCase() === "memory.md") || a.name.localeCompare(b.name));
+        for (const entry of entries.slice(0, MAX_FILES)) {
+          // Do not follow directory symlinks into unrelated projects or account state.
+          if (entry.isDirectory()) await collect({ path: join(path, entry.name), directory: true }, depth + 1);
+          else if (entry.isFile() && /\.(md|mdc)$/i.test(entry.name)) await collect({ path: join(path, entry.name) }, depth + 1);
+        }
+      } else {
+        const info = await stat(path);
+        if (!info.isFile()) return;
+        revision.update(JSON.stringify([path, info.size, info.mtimeMs, info.ctimeMs]));
+        count++;
+        if (remaining < 512) return;
+        const handle = await open(path, "r");
+        let content: string;
+        let bytesRead: number;
+        try {
+          const buffer = Buffer.alloc(Math.min(info.size, MAX_FILE_BYTES, Math.max(0, remaining - 256)));
+          ({ bytesRead } = await handle.read(buffer, 0, buffer.length, 0));
+          content = buffer.subarray(0, bytesRead).toString("utf8").trim();
+        } finally { await handle.close(); }
+        if (!content || content.includes("\0")) return;
+        const section = `Source: ${JSON.stringify(path)}\n${content}\n${bytesRead < info.size ? "[Excerpt; read the original file for the remainder.]\n" : ""}`;
+        if (section.length > remaining) return;
+        sections.push(section);
+        remaining -= section.length;
+      }
+    } catch { /* Missing/unreadable optional sources are expected. */ }
+  }
+  for (const source of sources) await collect(source);
+  return [
+    "PPM provider sharing is enabled for this project. These are user-managed instructions and memory, not a new user request.",
+    "Use relevant project knowledge; respect each rule's path/frontmatter scope. Current user instructions take precedence. Provider-specific tool names/settings apply only where supported.",
+    "Read and use existing native provider memory below, including memory created before PPM was installed. There is no separate PPM memory store. Keep new memories in the provider's native location. Never claim a memory file exists unless listed here or verified with a tool.",
+    "This bounded snapshot omits instructions already loaded by your runtime. Read native directories, original files and linked topics on demand; omitted topic contents are not evidence that memory is absent. Respect project scope when following links.",
+    `Source revision: ${revision.digest("hex").slice(0, 16)}`,
+    [...new Set(available)].join("\n").slice(0, 1_500),
+    ...sections,
+  ].join("\n\n");
+}

package/src/shared/provider-context.ts

@@ -0,0 +1,13 @@
+const START = "<ppm-shared-context>";
+const END = "</ppm-shared-context>";
+
+/** Transport metadata is not part of the user's message, even in native transcripts. */
+export function withSharedContext(message: string, context?: string): string {
+  return context ? `${START}\n${context.replaceAll(END, "[end context]")}\n${END}\n\n${message}` : message;
+}
+
+export function stripSharedContext(message: string): string {
+  if (!message.startsWith(`${START}\n`)) return message;
+  const end = message.indexOf(`${END}\n\n`);
+  return end < 0 ? "" : message.slice(end + END.length + 2);
+}

package/src/types/chat.ts

@@ -1,4 +1,6 @@
 export interface SendMessageOpts {
+  /** PPM's bounded, project-scoped shared instructions; kept separate from user text. */
+  sharedContext?: string;
   permissionMode?: import("./config").PermissionMode | string;
   priority?: 'now' | 'next' | 'later';
   images?: Array<{ data: string; mediaType: string }>;
@@ -25,6 +27,10 @@ export interface SendMessageOpts {
 export interface AIProvider {
   id: string;
   name: string;
+  /** Handles opts.sharedContext without using it as the user's saved message/title. */
+  supportsSharedContext?: boolean;
+  /** Additional instruction/memory sources; never return credentials or transcripts. */
+  getSharedContextSources?(projectPath: string): Array<{ path: string; directory?: boolean }>;
 
   // Session lifecycle (required)
   createSession(config: SessionConfig): Promise<Session>;

package/src/types/config.ts

@@ -76,6 +76,8 @@ export interface ProjectConfig {
 
 export interface AIConfig {
   default_provider: string;
+  /** Share project rules and memory between providers. Unset defaults to true. */
+  share_provider_context?: boolean;
   providers: Record<string, AIProviderConfig>;
 }
 
@@ -109,6 +111,10 @@ export interface AIProviderConfig {
 
   // CLI-specific (Cursor, Codex, Gemini)
   cli_command?: string;
+
+  // Codex config overrides in tokens. Null/unset inherits Codex's configuration.
+  model_context_window?: number | null;
+  model_auto_compact_token_limit?: number | null;
 }
 
 /**
@@ -134,6 +140,7 @@ export const DEFAULT_CONFIG: PpmConfig = {
   projects: [],
   ai: {
     default_provider: "claude",
+    share_provider_context: true,
     providers: {
       claude: {
         type: "agent-sdk",
@@ -203,6 +210,7 @@ function migrateThemeValue(theme: unknown): ThemeConfig | null {
 /** Validate AI provider config fields. Returns array of error messages (empty = valid). */
 export function validateAIProviderConfig(config: Partial<AIProviderConfig>): string[] {
   const errors: string[] = [];
+  errors.push(...validateCodexContextConfig(config));
   if (config.type != null && !VALID_TYPES.includes(config.type as any)) {
     errors.push(`type must be one of: ${VALID_TYPES.join(", ")}`);
   }
@@ -254,6 +262,22 @@ export function validateAIProviderConfig(config: Partial<AIProviderConfig>): str
   return errors;
 }
 
+/** Also validate the merged provider config so partial updates cannot break the pair. */
+export function validateCodexContextConfig(config: Partial<AIProviderConfig>): string[] {
+  const errors: string[] = [];
+  for (const key of ["model_context_window", "model_auto_compact_token_limit"] as const) {
+    const value = config[key];
+    if (value != null && (!Number.isSafeInteger(value) || value < 1)) {
+      errors.push(`${key} must be a positive safe integer or null`);
+    }
+  }
+  if (config.model_context_window != null && config.model_auto_compact_token_limit != null
+    && config.model_auto_compact_token_limit > config.model_context_window) {
+    errors.push("model_auto_compact_token_limit must not exceed model_context_window");
+  }
+  return errors;
+}
+
 /** Validate default_provider references an existing provider key */
 export function validateDefaultProvider(defaultProvider: string, providers: Record<string, unknown>): string | null {
   if (!providers[defaultProvider]) {
@@ -269,6 +293,11 @@ export function validateDefaultProvider(defaultProvider: string, providers: Reco
 export function sanitizeConfig(config: PpmConfig): boolean {
   let dirty = false;
 
+  if (typeof config.ai.share_provider_context !== "boolean") {
+    config.ai.share_provider_context = true;
+    dirty = true;
+  }
+
   // Migrate/repair theme (legacy string → {style, mode})
   const migrated = migrateThemeValue(config.theme);
   if (migrated) {

package/src/web/components/chat/chat-history-bar.tsx

@@ -279,8 +279,11 @@ export function ChatHistoryBar({
   // Usage badge display — Claude (SDK) and Codex both expose usage limits
   const isClaudeProvider = !providerId || providerId === "claude";
   const isCodexProvider = providerId === "codex";
-  const fiveHourPct = usageInfo.fiveHour != null ? Math.round(usageInfo.fiveHour * 100) : null;
-  const sevenDayPct = usageInfo.sevenDay != null ? Math.round(usageInfo.sevenDay * 100) : null;
+  // Account events can arrive before the new quota snapshot. Never attach the
+  // previous account's numbers to the newly selected account's name.
+  const usageMatchesAccount = !pickedAccountId || pickedAccountId === usageInfo.activeAccountId;
+  const fiveHourPct = usageMatchesAccount && usageInfo.fiveHour != null ? Math.round(usageInfo.fiveHour * 100) : null;
+  const sevenDayPct = usageMatchesAccount && usageInfo.sevenDay != null ? Math.round(usageInfo.sevenDay * 100) : null;
   const worstPct = Math.max(fiveHourPct ?? 0, sevenDayPct ?? 0);
   const usageColor = fiveHourPct != null || sevenDayPct != null ? pctColor(worstPct) : "text-text-subtle";
   // Order matters, and the obvious order is wrong. With no session, the usage endpoint has
@@ -288,7 +291,7 @@ export function ChatHistoryBar({
   // so letting it win would show a name that has nothing to do with this tab, which is the
   // exact confusion the claim exists to remove. The claim (and, once a turn is running, the
   // account the stream reports) is specific to this chat and outranks it.
-  const accountLabel = pickedAccountLabel ?? usageInfo.activeAccountLabel ?? null;
+  const accountLabel = pickedAccountLabel ?? (usageMatchesAccount ? usageInfo.activeAccountLabel : null) ?? null;
 
   return (
     <div className="border-b border-border/50">

package/src/web/components/chat/chat-tab.tsx

@@ -262,6 +262,13 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
     if (liveAccount) setServingAccount(liveAccount);
   }, [liveAccount]);
 
+  // Automatic rotation keeps the same session id, so useUsage's polling scope
+  // does not change. Re-read its binding as soon as the stream names an account.
+  const liveAccountId = liveAccount?.id;
+  useEffect(() => {
+    if (liveAccountId) void reloadUsage();
+  }, [liveAccountId, reloadUsage]);
+
   // A different conversation has a different account; carrying this one's over would label
   // it wrongly until the next turn corrected it.
   useEffect(() => { setServingAccount(null); }, [sessionId]);

package/src/web/components/settings/ai-settings-section.tsx

@@ -14,6 +14,7 @@ import { getAISettings, updateAISettings, type AISettings } from "@/lib/api-sett
 import { api } from "@/lib/api-client";
 import { ProviderBadge } from "@/components/chat/provider-selector";
 import { openSettings } from "./open-settings";
+import { CodexContextSettings } from "./codex-context-settings";
 import type { ModelOption } from "../../../types/chat";
 
 const EFFORT_OPTIONS = [
@@ -73,23 +74,26 @@ export function AISettingsSection({ compact }: { compact?: boolean } = {}) {
   const config = settings?.providers[activeTab];
   const isSdkProvider = config?.type === "agent-sdk" || (!config?.type && activeTab === "claude");
 
-  const handleSave = async (field: string, value: unknown) => {
-    if (!settings) return;
+  const handleSettingsSave = async (patch: Partial<AISettings>) => {
+    if (!settings) return false;
     setSaving(true);
     setError(null);
     try {
-      const updated = await updateAISettings({
-        providers: { [activeTab]: { [field]: value } },
-      });
+      const updated = await updateAISettings(patch);
       setSettings(updated);
       setRevision((r) => r + 1);
+      return true;
     } catch (e) {
       setError((e as Error).message);
+      return false;
     } finally {
       setSaving(false);
     }
   };
 
+  const handleSave = (field: string, value: unknown) =>
+    handleSettingsSave({ providers: { [activeTab]: { [field]: value } } });
+
   const labelSize = compact ? "text-[11px]" : "text-sm";
   const headingSize = compact ? "text-xs" : "text-sm";
   const gapSize = compact ? "space-y-2" : "space-y-4";
@@ -116,6 +120,25 @@ export function AISettingsSection({ compact }: { compact?: boolean } = {}) {
     <div className={gapSize}>
       <h3 className={`${headingSize} font-medium text-text-secondary`}>AI Settings</h3>
 
+      <div className="flex items-start justify-between gap-3 rounded-md border border-border p-3">
+        <div className={fieldGap}>
+          <Label htmlFor="ai-share-provider-context" className={compact ? labelSize : undefined}>
+            Share rules and memory between providers
+          </Label>
+          <p id="ai-share-provider-context-description" className={`${compact ? "text-[9px]" : "text-[11px]"} text-muted-foreground`}>
+            Share project rules and memory, plus global instruction files, across providers.
+            Applies from the next project-chat message. Turning off keeps context already sent.
+          </p>
+        </div>
+        <Switch
+          id="ai-share-provider-context"
+          aria-describedby="ai-share-provider-context-description"
+          checked={settings.share_provider_context ?? true}
+          disabled={saving}
+          onCheckedChange={(checked) => handleSettingsSave({ share_provider_context: checked })}
+        />
+      </div>
+
       {/* Provider tabs */}
       {providerTabs.length > 1 && (
         <div className="flex gap-0.5 border-b border-border/50 -mx-1 px-1">
@@ -173,6 +196,12 @@ export function AISettingsSection({ compact }: { compact?: boolean } = {}) {
           </div>
         )}
 
+        {activeTab === "codex" && (
+          <CodexContextSettings key={JSON.stringify([config?.model_context_window, config?.model_auto_compact_token_limit])} config={config}
+            compact={compact} saving={saving}
+            onSave={(patch) => handleSettingsSave({ providers: { codex: patch } })} />
+        )}
+
         {/* SDK-specific fields */}
         {isSdkProvider && (
           <>

package/src/web/components/settings/codex-context-settings.tsx

@@ -0,0 +1,100 @@
+import { useState, type FormEvent } from "react";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import type { AIProviderSettings } from "@/lib/api-settings";
+
+type ContextSettings = Pick<AIProviderSettings, "model_context_window" | "model_auto_compact_token_limit">;
+
+interface Props {
+  config?: ContextSettings;
+  compact?: boolean;
+  saving: boolean;
+  onSave: (settings: ContextSettings) => Promise<boolean>;
+}
+
+const WINDOW_PRESETS = [128000, 272000, 400000, 512000, 872000, 1000000];
+const COMPACT_PRESETS = [100000, 200000, 230000, 350000, 450000, 750000, 900000];
+
+function TokenLimitSelect({ id, label, value, presets, disabled, compact, onChange }: {
+  id: string; label: string; value: string; presets: number[]; disabled: boolean;
+  compact?: boolean; onChange: (value: string) => void;
+}) {
+  const [custom, setCustom] = useState(Boolean(value) && !presets.includes(Number(value)));
+  const size = compact ? "text-[11px]" : "text-sm";
+  return (
+    <div className="space-y-1">
+      <Label htmlFor={id} className={size}>{label}</Label>
+      <select id={id} value={custom ? "custom" : value || "default"} disabled={disabled}
+        aria-describedby="codex-context-help"
+        className={`w-full min-h-11 sm:min-h-0 rounded-md border border-input bg-background px-3 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50 ${compact ? "h-7" : "h-9"} ${size}`}
+        onChange={(e) => {
+          const next = e.target.value;
+          setCustom(next === "custom");
+          if (next !== "custom") onChange(next === "default" ? "" : next);
+        }}>
+        <option value="default">Codex default</option>
+        {presets.map((tokens) => <option key={tokens} value={String(tokens)}>
+          {tokens === 1000000 ? "1M" : `${tokens / 1000}K`} tokens
+        </option>)}
+        <option value="custom">Custom...</option>
+      </select>
+      {custom && <Input id={`${id}-custom`} aria-label={`Custom ${label.toLowerCase()}`}
+        type="number" min={1} step={1} required value={value} disabled={disabled}
+        placeholder="Enter tokens" aria-describedby="codex-context-help"
+        className={`min-h-11 sm:min-h-0 ${compact ? "h-7 text-[11px]" : ""}`}
+        onChange={(e) => onChange(e.target.value)} />}
+    </div>
+  );
+}
+
+export function CodexContextSettings({ config, compact, saving, onSave }: Props) {
+  const [windowTokens, setWindowTokens] = useState(String(config?.model_context_window ?? ""));
+  const [compactTokens, setCompactTokens] = useState(String(config?.model_auto_compact_token_limit ?? ""));
+  const [error, setError] = useState<string | null>(null);
+  const textSize = compact ? "text-[11px]" : "text-sm";
+  const helpSize = compact ? "text-[9px]" : "text-[11px]";
+
+  async function save(event: FormEvent) {
+    event.preventDefault();
+    const windowValue = windowTokens.trim() ? Number(windowTokens) : null;
+    const compactValue = compactTokens.trim() ? Number(compactTokens) : null;
+    if ([windowValue, compactValue].some((v) => v !== null && (!Number.isSafeInteger(v) || v <= 0))) {
+      setError("Enter positive whole numbers of tokens, or leave blank for Codex defaults.");
+      return;
+    }
+    if (windowValue !== null && compactValue !== null && compactValue > windowValue) {
+      setError("Auto-compact threshold must not exceed the context window.");
+      return;
+    }
+    setError(null);
+    await onSave({ model_context_window: windowValue, model_auto_compact_token_limit: compactValue });
+  }
+
+  return (
+    <form onSubmit={save} className="space-y-2 rounded-md border border-border p-3">
+      <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+        <TokenLimitSelect id="codex-context-window" label="Context window (tokens)"
+          value={windowTokens} presets={WINDOW_PRESETS} disabled={saving} compact={compact}
+          onChange={(value) => { setWindowTokens(value); setError(null); }} />
+        <TokenLimitSelect id="codex-compact-threshold" label="Auto-compact threshold (tokens)"
+          value={compactTokens} presets={COMPACT_PRESETS} disabled={saving} compact={compact}
+          onChange={(value) => { setCompactTokens(value); setError(null); }} />
+      </div>
+      <p id="codex-context-help" className={`${helpSize} text-muted-foreground`}>
+        Choose Codex default to use Codex configuration and model defaults, or Custom to enter a value.
+        Presets are shortcuts, not a list of limits supported by your model;
+        increasing these values does not unlock a larger context window.
+        Applies to new sessions and sessions resumed after a PPM restart.
+      </p>
+      {error && <p role="alert" className={`${textSize} text-error`}>{error}</p>}
+      <div className="flex flex-wrap items-center justify-between gap-2">
+        <a href="https://learn.chatgpt.com/docs/config-file/config-reference" target="_blank" rel="noreferrer"
+          className={`${helpSize} text-primary underline`}>Codex context documentation</a>
+        <button type="submit" disabled={saving}
+          className={`min-h-11 sm:min-h-0 rounded-md border border-border px-3 py-1.5 hover:bg-surface-elevated disabled:opacity-50 ${textSize}`}>
+          {saving ? "Saving..." : "Save context settings"}
+        </button>
+      </div>
+    </form>
+  );
+}