@hienlh/ppm 0.20.4 → 0.20.6

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/api.ts

@@ -62,7 +62,7 @@ export type ChatWsServerMessage =
   | { type: "text"; content: string; parentToolUseId?: string }
   | { type: "thinking"; content: string; parentToolUseId?: string }
   | { type: "tool_use"; tool: string; input: unknown; toolUseId?: string; parentToolUseId?: string }
-  | { type: "tool_result"; output: string; isError?: boolean; toolUseId?: string; parentToolUseId?: string }
+  | { type: "tool_result"; output: string; isError?: boolean; exitCode?: number; toolUseId?: string; parentToolUseId?: string }
   | { type: "bash_output"; toolUseId: string; content: string; lineCount: number }
   | { type: "background_registry"; sessionId: string; shells: BackgroundShell[] }
   | { type: "subagent_status"; toolUseId: string; status: import("../shared/background-agent-status").BackgroundAgentStatus }

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>;
@@ -180,7 +186,7 @@ export type ChatEvent =
        *  Absent on a launched-but-unfinished agent — the card renders that as still running. */
       bgStatus?: import("../shared/background-agent-status").BackgroundAgentStatus;
     }
-  | { type: "tool_result"; output: string; isError?: boolean; toolUseId?: string; parentToolUseId?: string }
+  | { type: "tool_result"; output: string; isError?: boolean; exitCode?: number; toolUseId?: string; parentToolUseId?: string }
   | { type: "approval_request"; requestId: string; tool: string; input: unknown }
   | { type: "error"; message: string }
   | { type: "done"; sessionId: string; resultSubtype?: ResultSubtype; numTurns?: number; contextWindowPct?: number; costUsd?: number; lastMessageUuid?: string; usage?: import("../shared/turn-usage").TurnUsage }

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/chat/message-list.tsx

@@ -1180,7 +1180,7 @@ function InterleavedEvents({ events, isStreaming, projectName, bashPartialOutput
     if (g.kind === "tool" && !g.result && g.tool.type === "tool_use") {
       const embedded = (g.tool as any).result;
       if (embedded) {
-        g.result = { type: "tool_result", output: embedded.output, isError: embedded.isError } as ChatEvent;
+        g.result = { type: "tool_result", output: embedded.output, isError: embedded.isError, exitCode: embedded.exitCode } as ChatEvent;
       }
     }
   }

package/src/web/components/chat/tool-cards.tsx

@@ -175,6 +175,11 @@ export function ToolCard({
   const { toolName, input } = extractToolInfo(tool);
   const hasResult = result?.type === "tool_result";
   const isError = hasResult && !!(result as any).isError;
+  // Codex sends an exit code for shell tools. Keep it visible: output can contain
+  // useful rows even when PowerShell recorded a non-terminating error and exited 1.
+  const exitCode = hasResult && typeof (result as any).exitCode === "number"
+    ? (result as any).exitCode as number
+    : undefined;
   const hasAnswers = toolName === "AskUserQuestion" && !!(input as any)?.answers;
   const wasApproved = tool.type === "approval_request" && (tool as any).approved != null;
   const isSubagent = (toolName === "Agent" || toolName === "Task") && tool.type === "tool_use";
@@ -256,6 +261,11 @@ export function ToolCard({
           {bgRunning && (
             <span className="text-[10px] text-primary">running…</span>
           )}
+          {exitCode != null && (
+            <span className={`text-[10px] font-mono ${exitCode === 0 ? "text-text-3" : "text-error"}`}>
+              exit {exitCode}
+            </span>
+          )}
           {isError || bgFailed
             ? <XCircle className="size-3.5 text-error" />
             : isDone

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>
+  );
+}

package/src/web/hooks/use-chat.ts

@@ -1,6 +1,6 @@
 import { useState, useCallback, useRef, useEffect, useMemo, startTransition } from "react";
 import { useWebSocket } from "./use-websocket";
-import { api, getAuthToken, projectUrl } from "@/lib/api-client";
+import { api, projectUrl } from "@/lib/api-client";
 import { flattenWithExpansions, prefixPreCompactIds } from "@/lib/flatten-expansions";
 import { useStreamingStore } from "@/stores/streaming-store";
 import { usePanelStore } from "@/stores/panel-store";
@@ -188,6 +188,12 @@ export function useChat(
   const pendingMessageRef = useRef<string | null>(null);
   const sendRef = useRef<(data: string) => void>(() => {});
   const refetchRef = useRef<(() => void) | null>(null);
+  const historyActivityRef = useRef(0);
+  const historyReconciledRef = useRef(0);
+  const turnFinalizedRef = useRef(false);
+  const historyRequestRef = useRef<AbortController | null>(null);
+  const queuedReplayMessagesRef = useRef<MessageEvent[]>([]);
+  const handleMessageRef = useRef<((event: MessageEvent) => void) | null>(null);
   /** True while replaying turn_events — suppresses setPendingApproval */
   const isReplayingRef = useRef(false);
   /** toolUseIds of AskUserQuestion tool_use events. The approval_request event
@@ -712,6 +718,7 @@ export function useChat(
         const finalContent = streamingContentRef.current;
         const finalEvents = [...streamingEventsRef.current];
         const finalAccount = streamingAccountRef.current;
+        turnFinalizedRef.current = !!finalContent || finalEvents.length > 0;
         const doneUuid = ev.lastMessageUuid as string | undefined;
         const doneUsage = ev.usage;
         setMessages((prev) => {
@@ -765,6 +772,11 @@ export function useChat(
     // Ignore keepalive pings
     if ((data as any).type === "ping") return;
 
+    if (isReplayingRef.current) {
+      queuedReplayMessagesRef.current.push(event);
+      return;
+    }
+
     // file:changed, session:unread_changed and jira:* are app-wide and now arrive
     // on the global bus (`use-global-events.ts`) instead of here — a chat socket is
     // not guaranteed to exist since chat tabs mount lazily.
@@ -773,6 +785,7 @@ export function useChat(
     // bubble. The sender never receives this echo (server excludes the sender),
     // so no dedupe against the optimistic append is needed.
     if ((data as any).type === "user_message") {
+      historyActivityRef.current++;
       const content = (data as any).content as string;
       setMessages((prev) => {
         const last = prev[prev.length - 1];
@@ -829,12 +842,21 @@ export function useChat(
     // Handle phase transitions from BE
     if ((data as any).type === "phase_changed") {
       const p = (data as any).phase as SessionPhase;
+      const wasActive = phaseRef.current !== "idle";
+      if (!wasActive && p !== "idle") turnFinalizedRef.current = false;
+      if (p !== "idle") historyActivityRef.current++;
       setPhase(p);
       phaseRef.current = p;
       setConnectingElapsed(p === "connecting" ? ((data as any).elapsed ?? 0) : 0);
       // Safety: idle phase means no turn running — ensure compact indicator does not linger.
       // BE should broadcast compact_status=done too, but this is a belt-and-braces clear.
-      if (p === "idle") setCompactStatus(null);
+      if (p === "idle") {
+        setCompactStatus(null);
+        setStatusMessage(null);
+        // Completion can arrive after lost content/done frames. Reconcile once
+        // the turn is idle so the answer appears without a manual reload.
+        if (wasActive && !turnFinalizedRef.current) refetchRef.current?.();
+      }
       return;
     }
 
@@ -844,7 +866,9 @@ export function useChat(
       setConnectedSessionId((data as any).sessionId ?? sessionIdRef.current);
       const state = data as any;
       const p = state.phase as SessionPhase;
+      if (p !== "idle") historyActivityRef.current++;
       const wasIdle = phaseRef.current === "idle";
+      if (wasIdle && p !== "idle") turnFinalizedRef.current = false;
       setPhase(p);
       phaseRef.current = p;
       if (state.sessionTitle) setSessionTitle(state.sessionTitle);
@@ -895,6 +919,7 @@ export function useChat(
 
     // Handle turn_events (reconnect sync with rAF chunking)
     if ((data as any).type === "turn_events") {
+      historyActivityRef.current++;
       const events = (data as any).events as unknown[];
       const userMessage = (data as any).userMessage as string | null;
       if (!events?.length && !userMessage) { setIsReconnecting(false); return; }
@@ -961,6 +986,10 @@ export function useChat(
           replayRafRef.current = 0;
           isReplayingRef.current = false;
           setIsReconnecting(false);
+          // Preserve websocket order: live text/done must follow the snapshot,
+          // even when rebuilding a large snapshot takes several frames.
+          const queued = queuedReplayMessagesRef.current.splice(0);
+          for (const message of queued) handleMessageRef.current?.(message);
         }
       };
       replayRafRef.current = requestAnimationFrame(processChunk);
@@ -970,6 +999,7 @@ export function useChat(
     // Route content events through processStreamEvent
     processStreamEvent(data);
   }, [processStreamEvent]);
+  handleMessageRef.current = handleMessage;
 
   const wsUrl = sessionId && projectName
     ? `/ws/project/${encodeURIComponent(projectName)}/chat/${sessionId}`
@@ -979,6 +1009,14 @@ export function useChat(
     url: wsUrl,
     onMessage: handleMessage,
     autoConnect: !!sessionId && !!projectName,
+    idleTimeoutMs: 45_000, // Server sends a heartbeat every 15 seconds.
+    onConnectionChange: (connected) => {
+      if (!connected) {
+        setIsConnected(false);
+        setIsReconnecting(true);
+      }
+      // session_state, rather than TCP open, confirms chat synchronization.
+    },
   });
 
   // Keep sendRef in sync so handleMessage can flush queued messages
@@ -987,6 +1025,9 @@ export function useChat(
   // Load history and reset state when session changes
   useEffect(() => {
     let cancelled = false;
+    const historyReconciled = historyReconciledRef.current;
+    turnFinalizedRef.current = false;
+    historyActivityRef.current++;
 
     // Keep the user's unconfirmed model/thinking picks across the draft→real transition
     // (null → id), but drop them when switching between two existing sessions so one
@@ -1060,7 +1101,7 @@ export function useChat(
           `${projectUrl(projectName)}/chat/sessions/${sessionId}/messages?providerId=${providerId}`,
         )
         .then((data: any) => {
-          if (cancelled) return;
+          if (cancelled || historyReconciledRef.current !== historyReconciled) return;
           // Tolerate the pre-versionMap shape (a bare array): a browser running a
           // cached bundle from before the upgrade would otherwise render an empty
           // history with no error.
@@ -1093,7 +1134,9 @@ export function useChat(
           historyLoadedAtRef.current = Date.now();
         })
         .catch(() => {
-          if (!cancelled) setMessages((prev) => prev.filter((m) => !staleIds.has(m.id)));
+          if (!cancelled && historyReconciledRef.current === historyReconciled) {
+            setMessages((prev) => prev.filter((m) => !staleIds.has(m.id)));
+          }
         })
         .finally(() => {
           if (!cancelled) setMessagesLoading(false);
@@ -1104,6 +1147,14 @@ export function useChat(
 
     return () => {
       cancelled = true;
+      historyRequestRef.current?.abort();
+      historyRequestRef.current = null;
+      if (syncRafRef.current) clearTimeout(syncRafRef.current);
+      syncRafRef.current = 0;
+      if (replayRafRef.current) cancelAnimationFrame(replayRafRef.current);
+      replayRafRef.current = 0;
+      isReplayingRef.current = false;
+      queuedReplayMessagesRef.current = [];
     };
   }, [sessionId, providerId, projectName, updateTeamActivity, loadTeamDetail]);
 
@@ -1112,8 +1163,10 @@ export function useChat(
       // An attachment-only message is legitimate now that images travel with it: the
       // caller may have nothing to say beyond the picture.
       if (!content.trim() && !opts?.images?.length) return;
+      historyActivityRef.current++;
 
       const isFollowUp = phaseRef.current !== "idle";
+      turnFinalizedRef.current = false;
 
       if (isFollowUp) {
         // Cancel pending throttled sync before finalizing
@@ -1302,30 +1355,34 @@ export function useChat(
   }, [wsReconnect]);
 
   const refetchMessages = useCallback(() => {
-    if (!sessionId || !projectName) return;
+    if (!sessionId || !projectName || phaseRef.current !== "idle") return;
+    historyRequestRef.current?.abort();
+    const request = new AbortController();
+    historyRequestRef.current = request;
+    const activity = historyActivityRef.current;
     // No setMessagesLoading(true) here — keep current messages visible while
     // fetching in the background (stale-while-revalidate). The initial load
     // in the session-change useEffect already handles the first-time loading screen.
-    fetch(`${projectUrl(projectName)}/chat/sessions/${sessionId}/messages?providerId=${providerId}`, {
-      headers: { Authorization: `Bearer ${getAuthToken()}` },
-    })
-      .then((r) => r.json())
-      .then((json: any) => {
+    api.get<any>(`${projectUrl(projectName)}/chat/sessions/${sessionId}/messages?providerId=${providerId}`, { signal: request.signal })
+      .then((data: any) => {
         // A turn may have started while this fetch was in flight (e.g. edit→fork
         // swaps the session, session_state arrives idle and triggers this refetch,
         // then the queued edited message sends and moves phase off idle). The
         // fetched history predates that send, so replacing now would drop the
         // just-sent user message — leaving it missing until a manual reload.
-        if (phaseRef.current !== "idle") return;
+        if (request.signal.aborted || historyRequestRef.current !== request
+          || historyActivityRef.current !== activity || phaseRef.current !== "idle"
+          || sessionIdRef.current !== sessionId || projectNameRef.current !== projectName
+          || isReplayingRef.current) return;
         // Same back-compat unwrap as the initial load above.
-        const payload = json.ok
-          ? (Array.isArray(json.data) ? { messages: json.data, versionMap: undefined } : json.data)
-          : null;
+        const payload = Array.isArray(data) ? { messages: data, versionMap: undefined } : data;
         // versionMap is refreshed independently of the length guard below: an
         // edit changes the branch tree without necessarily changing history
         // length, and the `n/m` counts must not go stale.
         if (payload?.versionMap) setVersionMap(payload.versionMap);
         if (Array.isArray(payload?.messages) && payload.messages.length > 0) {
+          historyReconciledRef.current++;
+          if (syncRafRef.current) { clearTimeout(syncRafRef.current); syncRafRef.current = 0; }
           setMessages(payload.messages);
           streamingContentRef.current = "";
           streamingEventsRef.current = [];

package/src/web/hooks/use-websocket.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef, useCallback } from "react";
-import { WsClient } from "@/lib/ws-client";
+import { WsClient, type WsClientOptions } from "@/lib/ws-client";
 
-interface UseWebSocketOptions {
+interface UseWebSocketOptions extends WsClientOptions {
   url: string;
   onMessage?: (event: MessageEvent) => void;
   autoConnect?: boolean;
@@ -11,16 +11,23 @@ export function useWebSocket({
   url,
   onMessage,
   autoConnect = true,
+  idleTimeoutMs,
+  onConnectionChange,
 }: UseWebSocketOptions) {
   const clientRef = useRef<WsClient | null>(null);
+  const onMessageRef = useRef(onMessage);
+  const onConnectionChangeRef = useRef(onConnectionChange);
+  onMessageRef.current = onMessage;
+  onConnectionChangeRef.current = onConnectionChange;
 
   useEffect(() => {
-    const client = new WsClient(url);
+    const client = new WsClient(url, {
+      idleTimeoutMs,
+      onConnectionChange: (connected) => onConnectionChangeRef.current?.(connected),
+    });
     clientRef.current = client;
 
-    if (onMessage) {
-      client.onMessage(onMessage);
-    }
+    client.onMessage((event) => onMessageRef.current?.(event));
 
     if (autoConnect) {
       client.connect();
@@ -30,7 +37,7 @@ export function useWebSocket({
       client.disconnect();
       clientRef.current = null;
     };
-  }, [url, autoConnect]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [url, autoConnect, idleTimeoutMs]);
 
   const send = useCallback((data: string | ArrayBuffer) => {
     clientRef.current?.send(data);

package/src/web/lib/api-settings.ts

@@ -205,11 +205,14 @@ export interface AIProviderSettings {
   system_prompt?: string;
   agent_teams?: boolean;
   context_1m?: boolean;
+  model_context_window?: number | null;
+  model_auto_compact_token_limit?: number | null;
   inherit_claude_mcp?: boolean;
 }
 
 export interface AISettings {
   default_provider: string;
+  share_provider_context?: boolean;
   providers: Record<string, AIProviderSettings>;
 }