@yourgpt/copilot-sdk 2.1.4 → 2.1.5-alpha.1

package/dist/{chunk-7PKGRYHY.js → chunk-5Q72LZ5H.js}

@@ -1,6 +1,7 @@
-import { ThreadManager, isConsoleCaptureActive, startConsoleCapture, isNetworkCaptureActive, startNetworkCapture, stopConsoleCapture, stopNetworkCapture, isScreenshotSupported, captureScreenshot, getConsoleLogs, getNetworkRequests, clearConsoleLogs, clearNetworkRequests, formatLogsForAI, formatRequestsForAI, detectIntent, zodToJsonSchema, streamSSE, zodObjectToInputSchema } from './chunk-37KEHUCE.js';
+import { ThreadManager, createLogger, zodToJsonSchema, isConsoleCaptureActive, startConsoleCapture, isNetworkCaptureActive, startNetworkCapture, stopConsoleCapture, stopNetworkCapture, isScreenshotSupported, captureScreenshot, getConsoleLogs, getNetworkRequests, clearConsoleLogs, clearNetworkRequests, formatLogsForAI, formatRequestsForAI, detectIntent, streamSSE, zodObjectToInputSchema } from './chunk-UXJ6LIZB.js';
 import { createMCPClient, MCPToolAdapter } from './chunk-EWVQWTNV.js';
-import { createContext, useRef, useState, useCallback, useEffect, useMemo, useContext, useSyncExternalStore } from 'react';
+import { SkillRegistry } from './chunk-VNLLW3ZI.js';
+import React2, { createContext, useRef, useState, useCallback, useEffect, useMemo, useContext, useSyncExternalStore } from 'react';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import * as z from 'zod';
 
@@ -119,15 +120,6 @@ function parseSSELine(line) {
 function isStreamDone(chunk) {
   return chunk.type === "done" || chunk.type === "error";
 }
-function requiresToolExecution(chunk) {
-  if (chunk.type === "done" && chunk.requiresAction) {
-    return true;
-  }
-  if (chunk.type === "tool_calls") {
-    return true;
-  }
-  return false;
-}
 
 // src/chat/functions/stream/processChunk.ts
 function processStreamChunk(chunk, state) {
@@ -262,13 +254,14 @@ function createStreamState(messageId) {
 function generateMessageId() {
   return `msg-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
 }
-function createUserMessage(content, attachments) {
+function createUserMessage(content, attachments, options) {
   return {
     id: generateMessageId(),
     role: "user",
     content,
     attachments,
-    createdAt: /* @__PURE__ */ new Date()
+    createdAt: /* @__PURE__ */ new Date(),
+    ...options?.parentId !== void 0 ? { parentId: options.parentId } : {}
   };
 }
 function streamStateToMessage(state) {
@@ -307,12 +300,13 @@ function streamStateToMessage(state) {
     metadata: Object.keys(metadata).length > 0 ? metadata : void 0
   };
 }
-function createEmptyAssistantMessage(id) {
+function createEmptyAssistantMessage(id, options) {
   return {
     id: generateMessageId(),
     role: "assistant",
     content: "",
-    createdAt: /* @__PURE__ */ new Date()
+    createdAt: /* @__PURE__ */ new Date(),
+    ...options?.parentId !== void 0 ? { parentId: options.parentId } : {}
   };
 }
 
@@ -381,6 +375,7 @@ var HttpTransport = class {
           tools: request.tools,
           actions: request.actions,
           streaming: this.config.streaming,
+          __skills: request.__skills,
           ...resolved.configBody,
           ...request.body
         }),
@@ -521,17 +516,443 @@ var HttpTransport = class {
   }
 };
 
-// src/chat/classes/AbstractChat.ts
-function buildToolResultContentForAI(result, tool2, args) {
-  if (typeof result === "string") return result;
-  const typedResult = result;
+// src/chat/optimizations.ts
+var DEFAULT_CHARS_PER_TOKEN = 4;
+var DEFAULT_SAFETY_MARGIN = 1.2;
+var DEFAULT_INPUT_HEADROOM_RATIO = 0.75;
+var DEFAULT_SYSTEM_PROMPT_SHARE = 0.15;
+var DEFAULT_HISTORY_SHARE = 0.5;
+var DEFAULT_TOOL_RESULTS_SHARE = 0.3;
+var DEFAULT_TOOL_DEFINITIONS_SHARE = 0.05;
+var DEFAULT_MAX_TOOL_RESULT_CONTEXT_SHARE = 0.3;
+var DEFAULT_TOOL_RESULT_HARD_MAX_CHARS = 4e5;
+var DEFAULT_TOOL_RESULT_MIN_KEEP_CHARS = 2e3;
+var DEFAULT_TOOL_RESULT_STRATEGY = "head-tail";
+var DEFAULT_RECENT_HISTORY_PRESERVE = 6;
+var TOOL_RESULT_TRUNCATION_NOTICE = "\n\n[tool result truncated to fit prompt budget]";
+var TOOL_RESULT_COMPACTION_NOTICE = "[tool result compacted to preserve context budget]";
+var SYSTEM_PROMPT_TRUNCATION_NOTICE = "\n\n[system prompt truncated to fit prompt budget]";
+var HISTORY_SUMMARY_HEADER = "Conversation summary of earlier context:";
+var HISTORY_SUMMARY_COMPACTION_NOTICE = "\n\n[summary compacted to preserve context continuity]";
+var DEFAULT_SUMMARY_TRIGGER = 12;
+var DEFAULT_SUMMARY_CHUNK_SIZE = 10;
+var DEFAULT_SUMMARY_MAX_CHARS = 1600;
+var SUMMARY_STOP_WORDS = /* @__PURE__ */ new Set([
+  "about",
+  "after",
+  "again",
+  "also",
+  "because",
+  "been",
+  "before",
+  "being",
+  "could",
+  "from",
+  "have",
+  "into",
+  "just",
+  "more",
+  "need",
+  "only",
+  "over",
+  "same",
+  "some",
+  "than",
+  "that",
+  "their",
+  "them",
+  "then",
+  "there",
+  "these",
+  "they",
+  "this",
+  "those",
+  "through",
+  "under",
+  "very",
+  "want",
+  "were",
+  "what",
+  "when",
+  "where",
+  "which",
+  "while",
+  "with",
+  "would",
+  "your"
+]);
+function clampRatio(value, fallback) {
+  if (!Number.isFinite(value)) {
+    return fallback;
+  }
+  return Math.min(1, Math.max(0, value));
+}
+function unique(values) {
+  return [...new Set(values)];
+}
+function stringifyContent(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (value == null) {
+    return "";
+  }
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+function normalizeWhitespace(text) {
+  return text.replace(/\s+/g, " ").trim();
+}
+function abbreviateText(text, maxChars = 220) {
+  const normalized = normalizeWhitespace(text);
+  if (!normalized) {
+    return "";
+  }
+  if (normalized.length <= maxChars) {
+    return normalized;
+  }
+  return `${normalized.slice(0, Math.max(1, maxChars - 3)).trimEnd()}...`;
+}
+function tokenize(text) {
+  return text.toLowerCase().replace(/[^a-z0-9_\s-]/g, " ").split(/\s+/).filter((token) => token.length > 1);
+}
+function estimateTokens(text, charsPerToken = DEFAULT_CHARS_PER_TOKEN) {
+  if (!text) {
+    return 0;
+  }
+  return Math.ceil(text.length / Math.max(1, charsPerToken));
+}
+function estimateMessageTokens(message, charsPerToken = DEFAULT_CHARS_PER_TOKEN) {
+  const content = typeof message.content === "string" ? message.content : JSON.stringify(message.content ?? "");
+  const toolCalls = message.tool_calls ? JSON.stringify(message.tool_calls) : "";
+  const attachments = message.attachments ? JSON.stringify(message.attachments) : "";
+  return estimateTokens(
+    `${message.role}
+${content}
+${toolCalls}
+${attachments}`,
+    charsPerToken
+  );
+}
+function estimateToolTokens(tool2, charsPerToken = DEFAULT_CHARS_PER_TOKEN) {
+  return estimateTokens(JSON.stringify(tool2), charsPerToken);
+}
+function buildToolQuery(messages) {
+  return messages.filter(
+    (message) => message.role === "user" || message.role === "assistant"
+  ).slice(-3).map((message) => message.content).filter(Boolean).join(" ");
+}
+function matchesSelector(tool2, selector, activeProfile) {
+  const normalized = selector.trim().toLowerCase();
+  if (!normalized) {
+    return false;
+  }
+  if (normalized === "*" || normalized === "all") {
+    return true;
+  }
+  if (normalized === tool2.name.toLowerCase()) {
+    return true;
+  }
+  if (normalized.startsWith("group:")) {
+    return (tool2.group ?? "").toLowerCase() === normalized.slice(6);
+  }
+  if (normalized.startsWith("category:")) {
+    return (tool2.category ?? "").toLowerCase() === normalized.slice(9);
+  }
+  if (normalized.startsWith("profile:")) {
+    return (tool2.profiles ?? []).map((value) => value.toLowerCase()).includes(normalized.slice(8));
+  }
+  if (activeProfile && normalized === activeProfile.toLowerCase()) {
+    return (tool2.profiles ?? []).map((value) => value.toLowerCase()).includes(normalized);
+  }
+  return false;
+}
+function scoreTool(tool2, queryTokens, activeProfile) {
+  const haystack = [
+    tool2.name,
+    tool2.description,
+    tool2.category,
+    tool2.group,
+    ...tool2.profiles ?? [],
+    ...tool2.searchKeywords ?? []
+  ].filter(Boolean).join(" ").toLowerCase();
+  let score = tool2.deferLoading ? 0 : 2;
+  if (activeProfile && tool2.profiles?.includes(activeProfile)) {
+    score += 2;
+  }
+  for (const token of queryTokens) {
+    if (tool2.name.toLowerCase() === token) {
+      score += 6;
+    } else if (tool2.name.toLowerCase().includes(token)) {
+      score += 4;
+    } else if (haystack.includes(token)) {
+      score += 2;
+    }
+  }
+  return score;
+}
+function truncateText(text, maxChars, strategy, notice = TOOL_RESULT_TRUNCATION_NOTICE) {
+  if (text.length <= maxChars) {
+    return text;
+  }
+  const bodyBudget = Math.max(1, maxChars - notice.length);
+  if (strategy === "head") {
+    return text.slice(0, bodyBudget) + notice;
+  }
+  if (strategy === "head-tail" || strategy === "smart") {
+    const tailLooksImportant = strategy === "smart" ? /\b(error|exception|failed|traceback|summary|result|done|complete)\b/i.test(
+      text.slice(-2e3)
+    ) : true;
+    if (tailLooksImportant && bodyBudget > 32) {
+      const tailBudget = Math.min(Math.floor(bodyBudget * 0.3), 4e3);
+      const headBudget = Math.max(1, bodyBudget - tailBudget - 32);
+      return text.slice(0, headBudget) + "\n\n[... omitted ...]\n\n" + text.slice(-tailBudget) + notice;
+    }
+  }
+  return text.slice(0, bodyBudget) + notice;
+}
+function isHistorySummaryMessage(message) {
+  return message.role === "system" && typeof message.content === "string" && message.content.startsWith(HISTORY_SUMMARY_HEADER);
+}
+function collectTopKeywords(messages) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const message of messages) {
+    if (message.role !== "user") {
+      continue;
+    }
+    for (const token of tokenize(stringifyContent(message.content))) {
+      if (token.length < 3 || SUMMARY_STOP_WORDS.has(token)) {
+        continue;
+      }
+      counts.set(token, (counts.get(token) ?? 0) + 1);
+    }
+  }
+  return [...counts.entries()].sort((left, right) => {
+    const countDiff = right[1] - left[1];
+    if (countDiff !== 0) {
+      return countDiff;
+    }
+    return left[0].localeCompare(right[0]);
+  }).slice(0, 5).map(([token]) => token);
+}
+function collectToolCallNames(messages) {
+  const toolCallNames = /* @__PURE__ */ new Map();
+  for (const message of messages) {
+    if (message.role !== "assistant" || !message.tool_calls?.length) {
+      continue;
+    }
+    for (const toolCall of message.tool_calls) {
+      const parsedToolCall = toolCall;
+      if (parsedToolCall.id && parsedToolCall.function?.name) {
+        toolCallNames.set(parsedToolCall.id, parsedToolCall.function.name);
+      }
+    }
+  }
+  return toolCallNames;
+}
+function compressSummaryContent(content, maxChars, fallbackBehavior) {
+  if (content.length <= maxChars) {
+    return content;
+  }
+  if (fallbackBehavior === "error") {
+    throw new Error("History summary exceeded configured continuity budget.");
+  }
+  if (fallbackBehavior === "statistical") {
+    const lines = content.split("\n");
+    const retained = lines.filter(
+      (line) => /^(Conversation summary|Stats:|- Messages compacted:|- User turns compacted:|- Assistant turns compacted:|- Tool results compacted:|- Latest user request before preserved window:|- Latest assistant response before preserved window:)/.test(
+        line
+      )
+    );
+    const statistical = retained.join("\n");
+    if (statistical.length <= maxChars) {
+      return statistical;
+    }
+  }
+  return truncateText(
+    content,
+    maxChars,
+    "head",
+    HISTORY_SUMMARY_COMPACTION_NOTICE
+  );
+}
+function buildHistorySummary(messages, summarization, maxChars = DEFAULT_SUMMARY_MAX_CHARS) {
+  if (messages.length === 0) {
+    return null;
+  }
+  if (summarization?.enabled === false) {
+    return null;
+  }
+  const previousSummaries = messages.filter(isHistorySummaryMessage);
+  const rawMessages = messages.filter(
+    (message) => !isHistorySummaryMessage(message)
+  );
+  const focusWindowSize = Math.max(
+    1,
+    summarization?.chunkSize ?? DEFAULT_SUMMARY_CHUNK_SIZE
+  );
+  const detailedThreshold = Math.max(
+    1,
+    summarization?.triggerAt ?? DEFAULT_SUMMARY_TRIGGER
+  );
+  const focusMessages = rawMessages.slice(-focusWindowSize);
+  const userMessages = rawMessages.filter((message) => message.role === "user");
+  const assistantMessages = rawMessages.filter(
+    (message) => message.role === "assistant"
+  );
+  const toolMessages = rawMessages.filter((message) => message.role === "tool");
+  const recentUser = abbreviateText(stringifyContent(userMessages.at(-1)?.content), 240) || "n/a";
+  const recentAssistant = abbreviateText(stringifyContent(assistantMessages.at(-1)?.content), 240) || "n/a";
+  const recentUserGoals = userMessages.slice(-3).map((message) => abbreviateText(stringifyContent(message.content), 180)).filter(Boolean);
+  const recentAssistantNotes = assistantMessages.map((message) => abbreviateText(stringifyContent(message.content), 180)).filter(Boolean).slice(-2);
+  const toolCallNames = collectToolCallNames(rawMessages);
+  const toolActivity = unique([
+    ...focusMessages.filter((message) => message.role === "assistant").flatMap(
+      (message) => (message.tool_calls ?? []).map((toolCall) => {
+        const parsedToolCall = toolCall;
+        return parsedToolCall.function?.name;
+      }).filter((name) => Boolean(name))
+    ),
+    ...toolMessages.slice(-2).map((message) => {
+      const toolName = message.tool_call_id ? toolCallNames.get(message.tool_call_id) : void 0;
+      const snippet = abbreviateText(stringifyContent(message.content), 120);
+      return toolName && snippet ? `${toolName}: ${snippet}` : toolName ?? snippet;
+    }).filter(Boolean)
+  ]).slice(-4);
+  const priorSummaryCarryForward = previousSummaries.map(
+    (message) => abbreviateText(
+      stringifyContent(message.content).replace(
+        `${HISTORY_SUMMARY_HEADER}
+`,
+        ""
+      ),
+      180
+    )
+  ).filter(Boolean).slice(-2);
+  const topKeywords = rawMessages.length >= detailedThreshold ? collectTopKeywords(
+    focusMessages.length > 0 ? focusMessages : rawMessages
+  ) : [];
+  const lines = [
+    HISTORY_SUMMARY_HEADER,
+    "Stats:",
+    `- Messages compacted: ${messages.length}`,
+    `- User turns compacted: ${userMessages.length}`,
+    `- Assistant turns compacted: ${assistantMessages.length}`,
+    `- Tool results compacted: ${toolMessages.length}`
+  ];
+  if (previousSummaries.length > 0) {
+    lines.push(`- Previous summaries merged: ${previousSummaries.length}`);
+  }
+  if (rawMessages.length > focusMessages.length) {
+    lines.push(
+      `- Older compacted messages outside the detailed window: ${rawMessages.length - focusMessages.length}`
+    );
+  }
+  if (topKeywords.length > 0) {
+    lines.push(`- Recurring user topics: ${topKeywords.join(", ")}`);
+  }
+  if (recentUser !== "n/a") {
+    lines.push(`- Latest user request before preserved window: ${recentUser}`);
+  }
+  if (recentAssistant !== "n/a") {
+    lines.push(
+      `- Latest assistant response before preserved window: ${recentAssistant}`
+    );
+  }
+  if (recentUserGoals.length > 0) {
+    lines.push("Carry forward user goals:");
+    for (const goal of recentUserGoals) {
+      lines.push(`- ${goal}`);
+    }
+  }
+  if (recentAssistantNotes.length > 0) {
+    lines.push("Carry forward assistant commitments:");
+    for (const note of recentAssistantNotes) {
+      lines.push(`- ${note}`);
+    }
+  }
+  if (toolActivity.length > 0) {
+    lines.push("Recent tool activity:");
+    for (const item of toolActivity) {
+      lines.push(`- ${item}`);
+    }
+  }
+  if (priorSummaryCarryForward.length > 0) {
+    lines.push("Earlier carried-forward context:");
+    for (const item of priorSummaryCarryForward) {
+      lines.push(`- ${item}`);
+    }
+  }
+  const content = compressSummaryContent(
+    lines.join("\n"),
+    maxChars,
+    summarization?.fallbackBehavior
+  );
+  return {
+    role: "system",
+    content
+  };
+}
+function buildToolDefinitions(selectedTools) {
+  if (selectedTools.length === 0) {
+    return void 0;
+  }
+  return selectedTools.map((tool2) => ({
+    name: tool2.name,
+    description: tool2.description,
+    category: tool2.category,
+    group: tool2.group,
+    deferLoading: tool2.deferLoading,
+    profiles: tool2.profiles,
+    searchKeywords: tool2.searchKeywords,
+    inputSchema: tool2.inputSchema
+  }));
+}
+function resolveTruncationConfig(params) {
+  const charsPerToken = params.config?.contextManagement?.tokenEstimation?.charsPerToken ?? DEFAULT_CHARS_PER_TOKEN;
+  const contextWindowTokens = params.config?.contextBudget?.budget?.contextWindowTokens;
+  const globalConfig = params.config?.toolResultConfig?.truncation;
+  const perToolConfig = params.tool?.resultConfig?.truncation;
+  const merged = { ...globalConfig, ...perToolConfig };
+  const hardMaxChars = merged.hardMaxChars ?? (contextWindowTokens ? Math.floor(
+    contextWindowTokens * clampRatio(
+      merged.maxContextShare,
+      DEFAULT_MAX_TOOL_RESULT_CONTEXT_SHARE
+    ) * charsPerToken
+  ) : DEFAULT_TOOL_RESULT_HARD_MAX_CHARS);
+  return {
+    enabled: merged.enabled ?? true,
+    maxContextShare: clampRatio(
+      merged.maxContextShare,
+      DEFAULT_MAX_TOOL_RESULT_CONTEXT_SHARE
+    ),
+    hardMaxChars: Math.max(1, hardMaxChars),
+    minKeepChars: Math.max(
+      256,
+      merged.minKeepChars ?? DEFAULT_TOOL_RESULT_MIN_KEEP_CHARS
+    ),
+    strategy: merged.strategy ?? DEFAULT_TOOL_RESULT_STRATEGY,
+    preserveErrors: merged.preserveErrors ?? true
+  };
+}
+function buildToolResultContent(result, tool2, args) {
+  if (typeof result === "string") {
+    return result;
+  }
+  const typedResult = result ?? null;
   const responseMode = typedResult?._aiResponseMode ?? tool2?.aiResponseMode ?? "full";
   if (typedResult?._aiContent) {
     return JSON.stringify(typedResult._aiContent);
   }
   let aiContext = typedResult?._aiContext;
   if (!aiContext && tool2?.aiContext) {
-    aiContext = typeof tool2.aiContext === "function" ? tool2.aiContext(typedResult, args ?? {}) : tool2.aiContext;
+    aiContext = typeof tool2.aiContext === "function" ? tool2.aiContext(
+      typedResult ?? { success: true },
+      args ?? {}
+    ) : tool2.aiContext;
   }
   switch (responseMode) {
     case "none":
@@ -539,7 +960,7 @@ function buildToolResultContentForAI(result, tool2, args) {
     case "brief":
       return aiContext ?? "[Tool executed successfully]";
     case "full":
-    default:
+    default: {
       if (aiContext) {
         const {
           _aiResponseMode,
@@ -557,18 +978,526 @@ Full data: ${JSON.stringify(dataOnly)}`;
         return JSON.stringify(dataOnly);
       }
       return JSON.stringify(result);
+    }
+  }
+}
+function buildToolResultContentForPrompt(result, tool2, args, config) {
+  const text = buildToolResultContent(result, tool2, args);
+  const truncation = resolveTruncationConfig({ tool: tool2, config });
+  if (!truncation.enabled) {
+    return text;
+  }
+  if (truncation.preserveErrors && typeof result === "object" && result !== null && "error" in result && typeof result.error === "string") {
+    return text;
+  }
+  const maxChars = Math.max(truncation.minKeepChars, truncation.hardMaxChars);
+  return truncateText(text, maxChars, truncation.strategy);
+}
+function sliceHistoryToMaxMessages(params) {
+  const { historyMessages, maxMessages, pruneStrategy, summarization } = params;
+  if (!maxMessages || historyMessages.length <= maxMessages) {
+    return historyMessages;
+  }
+  const dropped = historyMessages.slice(
+    0,
+    historyMessages.length - maxMessages
+  );
+  const kept = historyMessages.slice(-maxMessages);
+  if (pruneStrategy === "summarize") {
+    const summary = buildHistorySummary(dropped, summarization);
+    return summary ? [summary, ...kept] : kept;
+  }
+  return kept;
+}
+function compactHistoryToTokenBudget(params) {
+  const {
+    maxTokens,
+    preserveRecent,
+    charsPerToken,
+    pruneStrategy,
+    summarization
+  } = params;
+  let historyMessages = params.historyMessages;
+  if (!maxTokens) {
+    return historyMessages;
+  }
+  const getHistoryTokens = () => historyMessages.reduce(
+    (sum, message) => sum + estimateMessageTokens(message, charsPerToken),
+    0
+  );
+  while (historyMessages.length > 1 && getHistoryTokens() > maxTokens) {
+    const prunableCount = Math.max(0, historyMessages.length - preserveRecent);
+    if (prunableCount <= 0) {
+      const firstMessage = historyMessages[0];
+      if (isHistorySummaryMessage(firstMessage) && typeof firstMessage.content === "string") {
+        const compactedSummary = compressSummaryContent(
+          firstMessage.content,
+          Math.max(400, Math.floor(maxTokens * charsPerToken * 0.25)),
+          summarization?.fallbackBehavior
+        );
+        if (compactedSummary !== firstMessage.content) {
+          historyMessages = [
+            { ...firstMessage, content: compactedSummary },
+            ...historyMessages.slice(1)
+          ];
+          continue;
+        }
+      }
+      historyMessages = historyMessages.slice(1);
+      continue;
+    }
+    const pruned = historyMessages.slice(0, prunableCount);
+    const kept = historyMessages.slice(prunableCount);
+    if (pruneStrategy === "summarize") {
+      const summary = buildHistorySummary(
+        pruned,
+        summarization,
+        Math.max(500, Math.floor(maxTokens * charsPerToken * 0.35))
+      );
+      historyMessages = summary ? [summary, ...kept] : kept;
+    } else {
+      historyMessages = kept;
+    }
+  }
+  return historyMessages;
+}
+function compactToolResultsToBudget(params) {
+  let toolResultMessages = params.toolResultMessages;
+  if (!params.maxTokens) {
+    return toolResultMessages;
+  }
+  const getToolResultTokens = () => toolResultMessages.reduce(
+    (sum, message) => sum + estimateMessageTokens(message, params.charsPerToken),
+    0
+  );
+  while (toolResultMessages.length > 0 && getToolResultTokens() > params.maxTokens) {
+    const index = toolResultMessages.findIndex(
+      (message) => message.content !== TOOL_RESULT_COMPACTION_NOTICE
+    );
+    if (index === -1) {
+      break;
+    }
+    toolResultMessages = toolResultMessages.map(
+      (message, currentIndex) => currentIndex === index ? { ...message, content: TOOL_RESULT_COMPACTION_NOTICE } : message
+    );
+  }
+  return toolResultMessages;
+}
+function fitToolsToBudget(params) {
+  let tools = params.tools;
+  if (!tools?.length || !params.maxTokens) {
+    return tools;
+  }
+  const getToolTokens = () => tools.reduce(
+    (sum, tool2) => sum + estimateToolTokens(tool2, params.charsPerToken),
+    0
+  );
+  while (tools.length > 0 && getToolTokens() > params.maxTokens) {
+    tools = tools.slice(0, -1);
   }
+  return tools;
+}
+function truncateSystemPromptToBudget(params) {
+  const { systemPrompt, maxTokens, charsPerToken } = params;
+  if (!systemPrompt || !maxTokens) {
+    return systemPrompt;
+  }
+  const maxChars = maxTokens * charsPerToken;
+  if (systemPrompt.length <= maxChars) {
+    return systemPrompt;
+  }
+  return truncateText(
+    systemPrompt,
+    maxChars,
+    "head",
+    SYSTEM_PROMPT_TRUNCATION_NOTICE
+  );
+}
+function calculateBuckets(params) {
+  const systemPromptTokens = estimateTokens(
+    params.systemPrompt ?? "",
+    params.charsPerToken
+  );
+  const historyTokens = params.historyMessages.reduce(
+    (sum, message) => sum + estimateMessageTokens(message, params.charsPerToken),
+    0
+  );
+  const toolResultsTokens = params.toolResultMessages.reduce(
+    (sum, message) => sum + estimateMessageTokens(message, params.charsPerToken),
+    0
+  );
+  const toolDefinitionTokens = (params.requestTools ?? []).reduce(
+    (sum, tool2) => sum + estimateToolTokens(tool2, params.charsPerToken),
+    0
+  );
+  const total = systemPromptTokens + historyTokens + toolResultsTokens + toolDefinitionTokens;
+  const budget = Number.isFinite(params.availableBudget) ? params.availableBudget : total;
+  const toPart = (tokens) => ({
+    tokens,
+    percent: budget > 0 ? Number((tokens / budget * 100).toFixed(2)) : 0
+  });
+  return {
+    total: toPart(total),
+    breakdown: {
+      systemPrompt: toPart(systemPromptTokens),
+      history: toPart(historyTokens),
+      toolResults: toPart(toolResultsTokens),
+      tools: toPart(toolDefinitionTokens)
+    },
+    budget: {
+      available: budget,
+      remaining: Math.max(0, budget - total)
+    },
+    warnings: unique(params.warnings)
+  };
+}
+function mergeBucketsInOriginalOrder(params) {
+  const historyQueue = [...params.historyMessages];
+  const toolQueue = [...params.toolResultMessages];
+  return params.transformedMessages.flatMap((message) => {
+    if (message.role === "tool") {
+      const nextTool = toolQueue.shift();
+      return nextTool ? [nextTool] : [];
+    }
+    const nextHistory = historyQueue.shift();
+    return nextHistory ? [nextHistory] : [];
+  });
 }
+var ChatContextOptimizer = class {
+  constructor(config) {
+    this.lastContextUsage = null;
+    this.config = config;
+    this.activeProfile = config?.toolProfiles?.defaultProfile;
+  }
+  updateConfig(config) {
+    this.config = config;
+    if (!this.activeProfile) {
+      this.activeProfile = config?.toolProfiles?.defaultProfile;
+    }
+  }
+  setActiveProfile(profile) {
+    this.activeProfile = profile?.trim() || void 0;
+  }
+  getContextUsage() {
+    return this.lastContextUsage;
+  }
+  prepare(params) {
+    const charsPerToken = this.config?.contextManagement?.tokenEstimation?.charsPerToken ?? DEFAULT_CHARS_PER_TOKEN;
+    const safetyMargin = this.config?.contextManagement?.tokenEstimation?.safetyMargin ?? DEFAULT_SAFETY_MARGIN;
+    const warnings = [];
+    const contextManagement = this.config?.contextManagement;
+    const contextBudget = this.config?.contextBudget;
+    const allTools = params.tools ?? [];
+    const selectedTools = this.selectTools(allTools, params.messages);
+    const transformedMessages = this.transformMessages(
+      params.messages,
+      allTools
+    );
+    const preserveRecent = contextManagement?.summarization?.preserveRecent ?? DEFAULT_RECENT_HISTORY_PRESERVE;
+    let buckets = {
+      systemPrompt: params.systemPrompt,
+      transformedMessages,
+      historyMessages: transformedMessages.filter(
+        (message) => message.role !== "tool"
+      ),
+      toolResultMessages: transformedMessages.filter(
+        (message) => message.role === "tool"
+      ),
+      requestTools: buildToolDefinitions(selectedTools)
+    };
+    if (contextManagement?.enabled) {
+      buckets.historyMessages = sliceHistoryToMaxMessages({
+        historyMessages: buckets.historyMessages,
+        maxMessages: contextManagement.history?.maxMessages,
+        pruneStrategy: contextManagement.history?.pruneStrategy,
+        summarization: contextManagement?.summarization
+      });
+    }
+    const budgetConfig = contextBudget?.budget;
+    const contextWindowTokens = budgetConfig?.contextWindowTokens;
+    const inputHeadroomRatio = clampRatio(
+      budgetConfig?.inputHeadroomRatio,
+      DEFAULT_INPUT_HEADROOM_RATIO
+    );
+    const availableBudget = contextWindowTokens ? Math.max(1, Math.floor(contextWindowTokens * inputHeadroomRatio)) : Number.POSITIVE_INFINITY;
+    const sharedBudget = Number.isFinite(availableBudget) ? availableBudget : void 0;
+    const systemPromptBudget = sharedBudget ? Math.max(
+      1,
+      Math.floor(
+        sharedBudget * clampRatio(
+          budgetConfig?.systemPromptShare,
+          DEFAULT_SYSTEM_PROMPT_SHARE
+        )
+      )
+    ) : void 0;
+    const historyBudgetByShare = sharedBudget ? Math.max(
+      1,
+      Math.floor(
+        sharedBudget * clampRatio(budgetConfig?.historyShare, DEFAULT_HISTORY_SHARE)
+      )
+    ) : void 0;
+    const historyBudgetByConfig = contextManagement?.enabled && contextManagement.history?.maxTokens ? Math.floor(contextManagement.history.maxTokens / safetyMargin) : void 0;
+    const historyBudget = historyBudgetByShare && historyBudgetByConfig ? Math.min(historyBudgetByShare, historyBudgetByConfig) : historyBudgetByShare ?? historyBudgetByConfig;
+    const toolResultsBudget = sharedBudget ? Math.max(
+      1,
+      Math.floor(
+        sharedBudget * clampRatio(
+          budgetConfig?.toolResultsShare,
+          DEFAULT_TOOL_RESULTS_SHARE
+        )
+      )
+    ) : void 0;
+    const toolDefinitionsBudget = sharedBudget ? Math.max(
+      1,
+      Math.floor(
+        sharedBudget * clampRatio(
+          budgetConfig?.toolDefinitionsShare,
+          DEFAULT_TOOL_DEFINITIONS_SHARE
+        )
+      )
+    ) : void 0;
+    if (contextBudget?.enabled) {
+      buckets.systemPrompt = truncateSystemPromptToBudget({
+        systemPrompt: buckets.systemPrompt,
+        maxTokens: systemPromptBudget,
+        charsPerToken
+      });
+    }
+    buckets.historyMessages = compactHistoryToTokenBudget({
+      historyMessages: buckets.historyMessages,
+      maxTokens: historyBudget,
+      preserveRecent,
+      charsPerToken,
+      pruneStrategy: contextManagement?.history?.pruneStrategy,
+      summarization: contextManagement?.summarization
+    });
+    buckets.toolResultMessages = compactToolResultsToBudget({
+      toolResultMessages: buckets.toolResultMessages,
+      maxTokens: toolResultsBudget,
+      charsPerToken
+    });
+    buckets.requestTools = fitToolsToBudget({
+      tools: buckets.requestTools,
+      maxTokens: toolDefinitionsBudget,
+      charsPerToken
+    });
+    let usage = calculateBuckets({
+      ...buckets,
+      charsPerToken,
+      availableBudget,
+      warnings
+    });
+    if (Number.isFinite(availableBudget) && usage.total.tokens > availableBudget) {
+      buckets.toolResultMessages = compactToolResultsToBudget({
+        toolResultMessages: buckets.toolResultMessages,
+        maxTokens: Math.max(
+          1,
+          usage.breakdown.toolResults.tokens - usage.total.tokens + availableBudget
+        ),
+        charsPerToken
+      });
+      usage = calculateBuckets({
+        ...buckets,
+        charsPerToken,
+        availableBudget,
+        warnings
+      });
+      if (usage.total.tokens > availableBudget) {
+        const overflow = usage.total.tokens - availableBudget;
+        buckets.historyMessages = compactHistoryToTokenBudget({
+          historyMessages: buckets.historyMessages,
+          maxTokens: Math.max(1, usage.breakdown.history.tokens - overflow),
+          preserveRecent,
+          charsPerToken,
+          pruneStrategy: contextManagement?.history?.pruneStrategy
+        });
+        usage = calculateBuckets({
+          ...buckets,
+          charsPerToken,
+          availableBudget,
+          warnings
+        });
+      }
+      if (usage.total.tokens > availableBudget) {
+        buckets.requestTools = fitToolsToBudget({
+          tools: buckets.requestTools,
+          maxTokens: Math.max(
+            1,
+            usage.breakdown.tools.tokens - (usage.total.tokens - availableBudget)
+          ),
+          charsPerToken
+        });
+        usage = calculateBuckets({
+          ...buckets,
+          charsPerToken,
+          availableBudget,
+          warnings
+        });
+      }
+    }
+    if (Number.isFinite(availableBudget) && usage.total.tokens > availableBudget) {
+      warnings.push(
+        `Prompt budget exceeded: using ${usage.total.tokens} tokens of ${availableBudget}.`
+      );
+      usage = {
+        ...usage,
+        warnings: unique(warnings)
+      };
+      if (contextBudget?.enforcement?.mode === "error") {
+        throw new Error(warnings[warnings.length - 1]);
+      }
+      contextBudget?.enforcement?.onBudgetExceeded?.(usage);
+    } else {
+      usage = {
+        ...usage,
+        warnings: unique(warnings)
+      };
+    }
+    contextBudget?.monitoring?.onUsageUpdate?.(usage);
+    this.lastContextUsage = usage;
+    return {
+      messages: mergeBucketsInOriginalOrder(buckets),
+      tools: buckets.requestTools,
+      contextUsage: usage,
+      warnings: usage.warnings
+    };
+  }
+  selectTools(tools, messages) {
+    if (!tools.length) {
+      return [];
+    }
+    const available = tools.filter((tool2) => tool2.available !== false);
+    const profileConfig = this.config?.toolProfiles;
+    if (!profileConfig?.enabled) {
+      return available;
+    }
+    const activeProfile = this.activeProfile ?? profileConfig.defaultProfile;
+    const includeUnprofiled = profileConfig.includeUnprofiled ?? true;
+    const profile = activeProfile ? profileConfig.profiles?.[activeProfile] : void 0;
+    let filtered = available;
+    if (profile?.include?.length) {
+      filtered = filtered.filter(
+        (tool2) => profile.include.some(
+          (selector) => matchesSelector(tool2, selector, activeProfile)
+        ) || !!activeProfile && tool2.profiles?.includes(activeProfile)
+      );
+    } else if (activeProfile) {
+      filtered = filtered.filter((tool2) => {
+        if (tool2.profiles?.length) {
+          return tool2.profiles.includes(activeProfile);
+        }
+        return includeUnprofiled;
+      });
+    }
+    if (profile?.exclude?.length) {
+      filtered = filtered.filter(
+        (tool2) => !profile.exclude.some(
+          (selector) => matchesSelector(tool2, selector, activeProfile)
+        )
+      );
+    }
+    if (!profileConfig.dynamicSelection?.enabled) {
+      return filtered;
+    }
+    const maxTools = Math.max(
+      1,
+      Math.min(
+        profileConfig.dynamicSelection.maxTools ?? filtered.length,
+        filtered.length
+      )
+    );
+    const queryTokens = tokenize(buildToolQuery(messages));
+    return [...filtered].sort((left, right) => {
+      const scoreDiff = scoreTool(right, queryTokens, activeProfile) - scoreTool(left, queryTokens, activeProfile);
+      if (scoreDiff !== 0) {
+        return scoreDiff;
+      }
+      return left.name.localeCompare(right.name);
+    }).slice(0, maxTools);
+  }
+  transformMessages(messages, allTools) {
+    const toolCallMap = /* @__PURE__ */ new Map();
+    for (const message of messages) {
+      if (message.role !== "assistant" || !message.toolCalls?.length) {
+        continue;
+      }
+      for (const toolCall of message.toolCalls) {
+        try {
+          toolCallMap.set(toolCall.id, {
+            toolName: toolCall.function.name,
+            args: JSON.parse(toolCall.function.arguments)
+          });
+        } catch {
+          toolCallMap.set(toolCall.id, {
+            toolName: toolCall.function.name,
+            args: {}
+          });
+        }
+      }
+    }
+    const toolDefMap = new Map(
+      allTools.map((tool2) => [tool2.name, tool2])
+    );
+    return messages.map((message) => {
+      if (message.role !== "tool") {
+        return {
+          role: message.role,
+          content: message.content,
+          tool_calls: message.toolCalls,
+          tool_call_id: message.toolCallId,
+          attachments: message.attachments
+        };
+      }
+      const toolCall = message.toolCallId ? toolCallMap.get(message.toolCallId) : void 0;
+      const tool2 = toolCall ? toolDefMap.get(toolCall.toolName) : void 0;
+      let content = message.content;
+      try {
+        const parsed = JSON.parse(message.content);
+        content = buildToolResultContentForPrompt(
+          parsed,
+          tool2,
+          toolCall?.args ?? {},
+          this.config
+        );
+      } catch {
+        content = buildToolResultContentForPrompt(
+          message.content,
+          tool2,
+          toolCall?.args ?? {},
+          this.config
+        );
+      }
+      return {
+        role: message.role,
+        content,
+        tool_call_id: message.toolCallId
+      };
+    });
+  }
+};
+
+// src/chat/classes/AbstractChat.ts
 var AbstractChat = class {
   constructor(init) {
+    this.lastContextUsage = null;
     // Event handlers
     this.eventHandlers = /* @__PURE__ */ new Map();
     // Current streaming state
     this.streamState = null;
+    /**
+     * Inline skills from the client (sent on every request for server to merge)
+     */
+    this.inlineSkills = [];
     /**
      * Dynamic context from useAIContext hook
      */
     this.dynamicContext = "";
+    /**
+     * Optional transform applied to messages just before building the HTTP request.
+     * Used by the message-history / compaction system to send a pruned message list
+     * without mutating the in-memory store (which keeps the full history for display).
+     */
+    this.requestMessageTransform = null;
     this._isDisposed = false;
     this.config = {
       runtimeUrl: init.runtimeUrl,
@@ -578,7 +1507,8 @@ var AbstractChat = class {
       headers: init.headers,
       body: init.body,
       threadId: init.threadId,
-      debug: init.debug
+      debug: init.debug,
+      optimization: init.optimization
     };
     this.state = init.state ?? new SimpleChatState();
     this.transport = init.transport ?? new HttpTransport({
@@ -588,6 +1518,7 @@ var AbstractChat = class {
       streaming: init.streaming ?? true
     });
     this.callbacks = init.callbacks ?? {};
+    this.optimizer = new ChatContextOptimizer(init.optimization);
     if (init.initialMessages?.length) {
       this.state.setMessages(init.initialMessages);
     }
@@ -619,20 +1550,42 @@ var AbstractChat = class {
   /**
    * Send a message
    * Returns false if a request is already in progress
+   *
+   * @param content - Message content
+   * @param attachments - Optional attachments
+   * @param options - Optional branching options
+   * @param options.editMessageId - Edit flow: new message branches from the
+   *   same parent as this message ID, creating a parallel conversation path
    */
-  async sendMessage(content, attachments) {
+  async sendMessage(content, attachments, options) {
     if (this.isBusy) {
       this.debug("sendMessage", "Blocked - request already in progress");
       return false;
     }
-    this.debug("sendMessage", { content, attachments });
+    this.debug("sendMessage", { content, attachments, options });
     try {
       this.resolveUnresolvedToolCalls();
-      const userMessage = createUserMessage(content, attachments);
+      let newParentId;
+      const visibleMessages = this.state.messages;
+      if (options?.editMessageId && this.state.setCurrentLeaf) {
+        const allMessages = this.state.getAllMessages?.() ?? this.state.messages;
+        const target = allMessages.find((m) => m.id === options.editMessageId);
+        if (target && target.parentId !== void 0) {
+          newParentId = target.parentId;
+          this.state.setCurrentLeaf(
+            typeof target.parentId === "string" ? target.parentId : null
+          );
+        }
+      } else if (visibleMessages.length > 0) {
+        newParentId = visibleMessages[visibleMessages.length - 1].id;
+      }
+      const userMessage = createUserMessage(content, attachments, {
+        parentId: newParentId
+      });
       this.state.pushMessage(userMessage);
       this.state.status = "submitted";
       this.state.error = void 0;
-      this.callbacks.onMessagesChange?.(this.state.messages);
+      this.callbacks.onMessagesChange?.(this._allMessages());
       this.callbacks.onStatusChange?.("submitted");
       await Promise.resolve();
       await this.processRequest();
@@ -669,20 +1622,25 @@ var AbstractChat = class {
         "resolveUnresolvedToolCalls",
         `Adding ${unresolvedIds.length} missing tool results`
       );
+      const visibleMsgs = this.state.messages;
+      let errorChainParentId = visibleMsgs.length > 0 ? visibleMsgs[visibleMsgs.length - 1].id : void 0;
       for (const toolCallId of unresolvedIds) {
+        const toolMessageId = generateMessageId();
         const toolMessage = {
-          id: generateMessageId(),
+          id: toolMessageId,
           role: "tool",
           content: JSON.stringify({
             success: false,
             error: "Tool execution was interrupted. Please try again."
           }),
           toolCallId,
-          createdAt: /* @__PURE__ */ new Date()
+          createdAt: /* @__PURE__ */ new Date(),
+          ...errorChainParentId !== void 0 ? { parentId: errorChainParentId } : {}
         };
         this.state.pushMessage(toolMessage);
+        errorChainParentId = toolMessageId;
       }
-      this.callbacks.onMessagesChange?.(this.state.messages);
+      this.callbacks.onMessagesChange?.(this._allMessages());
     }
   }
   /**
@@ -696,6 +1654,8 @@ var AbstractChat = class {
     this.debug("continueWithToolResults", toolResults);
     try {
       const attachmentsToAdd = [];
+      const visibleMessages = this.state.messages;
+      let chainParentId = visibleMessages.length > 0 ? visibleMessages[visibleMessages.length - 1].id : void 0;
       for (const { toolCallId, result } of toolResults) {
         const typedResult = result;
         let messageContent;
@@ -712,14 +1672,17 @@ var AbstractChat = class {
         } else {
           messageContent = typeof result === "string" ? result : JSON.stringify(result);
         }
+        const toolMessageId = generateMessageId();
         const toolMessage = {
-          id: generateMessageId(),
+          id: toolMessageId,
           role: "tool",
           content: messageContent,
           toolCallId,
-          createdAt: /* @__PURE__ */ new Date()
+          createdAt: /* @__PURE__ */ new Date(),
+          ...chainParentId !== void 0 ? { parentId: chainParentId } : {}
         };
         this.state.pushMessage(toolMessage);
+        chainParentId = toolMessageId;
       }
       if (attachmentsToAdd.length > 0) {
         this.debug(
@@ -731,14 +1694,15 @@ var AbstractChat = class {
           role: "user",
           content: "Here's my screen:",
           attachments: attachmentsToAdd,
-          createdAt: /* @__PURE__ */ new Date()
+          createdAt: /* @__PURE__ */ new Date(),
+          ...chainParentId !== void 0 ? { parentId: chainParentId } : {}
         };
         this.state.pushMessage(userMessage);
       }
       this.state.status = "submitted";
-      this.callbacks.onMessagesChange?.(this.state.messages);
+      this.callbacks.onMessagesChange?.(this._allMessages());
       this.callbacks.onStatusChange?.("submitted");
-      await Promise.resolve();
+      await new Promise((resolve) => setTimeout(resolve, 0));
       await this.processRequest();
     } catch (error) {
       this.handleError(error);
@@ -767,30 +1731,58 @@ var AbstractChat = class {
     this.callbacks.onMessagesChange?.(messages);
   }
   /**
-   * Regenerate last response
+   * Regenerate last response.
+   *
+   * Branch-aware: when the state supports branching (setCurrentLeaf is available),
+   * regenerate creates a new sibling response instead of destroying the original.
+   * The old response is preserved and navigable via switchBranch().
+   *
+   * Legacy fallback: when branching is not available, uses old slice() behavior.
    */
   async regenerate(messageId) {
+    if (this.isBusy) return;
     const messages = this.state.messages;
-    let targetIndex = messages.length - 1;
+    let targetMessage;
     if (messageId) {
-      targetIndex = messages.findIndex((m) => m.id === messageId);
+      targetMessage = messages.find((m) => m.id === messageId);
+      if (!targetMessage) {
+        targetMessage = this.state.getAllMessages?.().find((m) => m.id === messageId);
+      }
     } else {
       for (let i = messages.length - 1; i >= 0; i--) {
         if (messages[i].role === "assistant") {
-          targetIndex = i;
+          targetMessage = messages[i];
           break;
         }
       }
     }
+    if (!targetMessage) return;
+    if (targetMessage.parentId !== void 0 && this.state.setCurrentLeaf) {
+      this.state.setCurrentLeaf(targetMessage.parentId ?? null);
+      this.callbacks.onMessagesChange?.(this._allMessages());
+      this.state.status = "submitted";
+      await Promise.resolve();
+      await this.processRequest();
+      return;
+    }
+    const targetIndex = messages.indexOf(targetMessage);
     if (targetIndex > 0) {
       this.state.setMessages(messages.slice(0, targetIndex));
-      this.callbacks.onMessagesChange?.(this.state.messages);
+      this.callbacks.onMessagesChange?.(this._allMessages());
       await this.processRequest();
     }
   }
   // ============================================
   // Event Handling
   // ============================================
+  /**
+   * Returns all messages across all branches when the state supports it
+   * (branch-aware), otherwise returns the visible path.
+   * Use this whenever firing onMessagesChange so inactive branches are not lost.
+   */
+  _allMessages() {
+    return this.state.getAllMessages?.() ?? this.state.messages;
+  }
   /**
    * Subscribe to events
    */
@@ -822,10 +1814,32 @@ var AbstractChat = class {
    */
   async processRequest() {
     const request = this.buildRequest();
+    let preCreatedMessageId;
+    if (this.config.streaming !== false) {
+      const visibleMessages = this.state.messages;
+      const currentLeafId = visibleMessages.length > 0 ? visibleMessages[visibleMessages.length - 1].id : void 0;
+      const preMsg = createEmptyAssistantMessage(void 0, {
+        parentId: currentLeafId
+      });
+      this.state.pushMessage(preMsg);
+      this.callbacks.onMessagesChange?.(this._allMessages());
+      preCreatedMessageId = preMsg.id;
+    }
     const response = await this.transport.send(request);
     if (this.isAsyncIterable(response)) {
-      await this.handleStreamResponse(response);
+      await this.handleStreamResponse(response, preCreatedMessageId);
     } else {
+      if (preCreatedMessageId) {
+        const id = preCreatedMessageId;
+        const visibleMsgs = this.state.messages;
+        const placeholderIdx = visibleMsgs.findIndex((m) => m.id === id);
+        const intendedLeafId = placeholderIdx > 0 ? visibleMsgs[placeholderIdx - 1].id : null;
+        const allMsgs = this.state.getAllMessages?.() ?? this.state.messages;
+        this.state.setMessages(allMsgs.filter((m) => m.id !== id));
+        if (intendedLeafId && this.state.setCurrentLeaf) {
+          this.state.setCurrentLeaf(intendedLeafId);
+        }
+      }
       this.handleJsonResponse(response);
     }
   }
@@ -836,19 +1850,50 @@ var AbstractChat = class {
     this.config.tools = tools;
   }
   /**
-   * Set dynamic context (appended to system prompt)
+   * Update prompt/tool optimization behavior.
    */
-  setContext(context) {
-    this.dynamicContext = context;
-    this.debug("Context updated", { length: context.length });
+  setOptimizationConfig(config) {
+    this.config.optimization = config;
+    this.optimizer.updateConfig(config);
   }
   /**
-   * Set system prompt dynamically
-   * This allows updating the system prompt after initialization
+   * Select the active tool profile for future requests.
    */
-  setSystemPrompt(prompt) {
-    this.config.systemPrompt = prompt;
-    this.debug("System prompt updated", { length: prompt.length });
+  setToolProfile(profile) {
+    this.optimizer.setActiveProfile(profile);
+  }
+  /**
+   * Get the most recent prompt context usage snapshot.
+   */
+  getContextUsage() {
+    return this.lastContextUsage;
+  }
+  /**
+   * Set inline skills (called by SkillProvider via React layer)
+   */
+  setInlineSkills(skills) {
+    this.inlineSkills = skills;
+    this.debug("Inline skills updated", { count: skills.length });
+  }
+  /**
+   * Set (or clear) the per-request message transform.
+   * Pass null to disable.
+   */
+  setRequestMessageTransform(fn) {
+    this.requestMessageTransform = fn;
+  }
+  /**
+   * Set dynamic context (appended to system prompt)
+   */
+  setContext(context) {
+    this.dynamicContext = context;
+  }
+  /**
+   * Set system prompt dynamically
+   * This allows updating the system prompt after initialization
+   */
+  setSystemPrompt(prompt) {
+    this.config.systemPrompt = prompt;
   }
   /**
    * Set headers configuration
@@ -859,7 +1904,6 @@ var AbstractChat = class {
     if (this.transport.setHeaders && headers !== void 0) {
       this.transport.setHeaders(headers);
     }
-    this.debug("Headers config updated");
   }
   /**
    * Set URL configuration
@@ -870,7 +1914,6 @@ var AbstractChat = class {
     if (this.transport.setUrl) {
       this.transport.setUrl(url);
     }
-    this.debug("URL config updated");
   }
   /**
    * Set body configuration
@@ -881,110 +1924,88 @@ var AbstractChat = class {
     if (this.transport.setBody && body !== void 0) {
       this.transport.setBody(body);
     }
-    this.debug("Body config updated");
   }
   /**
    * Build the request payload
    */
   buildRequest() {
-    const tools = this.config.tools?.filter((tool2) => tool2.available !== false).map((tool2) => ({
-      name: tool2.name,
-      description: tool2.description,
-      inputSchema: tool2.inputSchema
-    }));
-    const toolCallMap = /* @__PURE__ */ new Map();
-    for (const msg of this.state.messages) {
-      if (msg.role === "assistant" && msg.toolCalls) {
-        for (const tc of msg.toolCalls) {
-          try {
-            const args = tc.function?.arguments ? JSON.parse(tc.function.arguments) : {};
-            toolCallMap.set(tc.id, { toolName: tc.function.name, args });
-          } catch {
-            toolCallMap.set(tc.id, { toolName: tc.function.name, args: {} });
-          }
-        }
-      }
-    }
-    const toolDefMap = /* @__PURE__ */ new Map();
-    if (this.config.tools) {
-      for (const tool2 of this.config.tools) {
-        toolDefMap.set(tool2.name, {
-          name: tool2.name,
-          aiResponseMode: tool2.aiResponseMode,
-          aiContext: tool2.aiContext
-        });
-      }
-    }
-    return {
-      messages: this.state.messages.map((m) => {
-        if (m.role === "tool" && m.content && m.toolCallId) {
-          try {
-            const fullResult = JSON.parse(m.content);
-            const toolCallInfo = toolCallMap.get(m.toolCallId);
-            const toolDef = toolCallInfo ? toolDefMap.get(toolCallInfo.toolName) : void 0;
-            const toolArgs = toolCallInfo?.args;
-            const transformedContent = buildToolResultContentForAI(
-              fullResult,
-              toolDef,
-              toolArgs
-            );
-            return {
-              role: m.role,
-              content: transformedContent,
-              tool_call_id: m.toolCallId
-            };
-          } catch (e) {
-            this.debug("Failed to parse tool message JSON", {
-              content: m.content?.slice(0, 100),
-              error: e instanceof Error ? e.message : String(e)
-            });
-            return {
-              role: m.role,
-              content: m.content,
-              tool_call_id: m.toolCallId
-            };
-          }
-        }
-        return {
-          role: m.role,
-          content: m.content,
-          tool_calls: m.toolCalls,
-          tool_call_id: m.toolCallId,
-          attachments: m.attachments
-        };
-      }),
-      threadId: this.config.threadId,
-      systemPrompt: this.dynamicContext ? `${this.config.systemPrompt || ""}
+    const systemPrompt = this.dynamicContext ? `${this.config.systemPrompt || ""}
 
 ## Current App Context:
-${this.dynamicContext}`.trim() : this.config.systemPrompt,
+${this.dynamicContext}`.trim() : this.config.systemPrompt;
+    const rawMessages = this.requestMessageTransform ? this.requestMessageTransform(
+      this.state.messages
+    ) : this.state.messages;
+    const optimized = this.optimizer.prepare({
+      messages: rawMessages,
+      tools: this.config.tools,
+      systemPrompt
+    });
+    this.lastContextUsage = optimized.contextUsage;
+    this.callbacks.onContextUsageChange?.(optimized.contextUsage);
+    return {
+      messages: optimized.messages,
+      threadId: this.config.threadId,
+      systemPrompt,
       llm: this.config.llm,
-      tools: tools?.length ? tools : void 0
+      tools: this.config.tools?.length ? this.config.tools.map((tool2) => ({
+        name: tool2.name,
+        description: tool2.description,
+        category: tool2.category,
+        group: tool2.group,
+        deferLoading: tool2.deferLoading,
+        profiles: tool2.profiles,
+        searchKeywords: tool2.searchKeywords,
+        inputSchema: tool2.inputSchema
+      })) : void 0,
+      __skills: this.inlineSkills.length ? this.inlineSkills : void 0
     };
   }
   /**
    * Handle streaming response
    */
-  async handleStreamResponse(stream) {
+  async handleStreamResponse(stream, preCreatedMessageId) {
     this.state.status = "streaming";
     this.callbacks.onStatusChange?.("streaming");
-    const assistantMessage = createEmptyAssistantMessage();
-    this.state.pushMessage(assistantMessage);
+    let assistantMessage;
+    if (preCreatedMessageId) {
+      const existing = this.state.messages.find(
+        (m) => m.id === preCreatedMessageId
+      );
+      if (existing) {
+        assistantMessage = existing;
+      } else {
+        assistantMessage = createEmptyAssistantMessage();
+        this.state.pushMessage(assistantMessage);
+      }
+    } else {
+      assistantMessage = createEmptyAssistantMessage();
+      this.state.pushMessage(assistantMessage);
+    }
     this.streamState = createStreamState(assistantMessage.id);
     this.callbacks.onMessageStart?.(assistantMessage.id);
-    this.debug("handleStreamResponse", "Starting to process stream");
+    this.debugGroup("handleStreamResponse");
+    this.debug("Starting to process stream");
     let chunkCount = 0;
     let toolCallsEmitted = false;
+    let pendingClientToolCalls;
     for await (const chunk of stream) {
       chunkCount++;
-      this.debug("chunk", { count: chunkCount, type: chunk.type });
+      if (chunk.type !== "message:delta") {
+        this.debug("chunk", { count: chunkCount, type: chunk.type });
+      }
       if (chunk.type === "error") {
         const error = new Error(chunk.message || "Stream error");
         this.handleError(error);
         return;
       }
       if (chunk.type === "message:end" && this.streamState?.content) {
-        this.debug("message:end mid-stream - finalizing current turn");
+        this.debug("message:end mid-stream", {
+          messageId: this.streamState.messageId,
+          contentLength: this.streamState.content.length,
+          toolCallsInState: this.streamState.toolCalls?.length ?? 0,
+          chunkCount
+        });
         const turnMessage = streamStateToMessage(this.streamState);
         const toolCallsHidden = {};
         for (const [id, result] of this.streamState.toolResults) {
@@ -1000,7 +2021,11 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
         }
         this.state.updateMessageById(
           this.streamState.messageId,
-          () => turnMessage
+          (existing) => ({
+            ...turnMessage,
+            ...existing.parentId !== void 0 ? { parentId: existing.parentId } : {},
+            ...existing.childrenIds !== void 0 ? { childrenIds: existing.childrenIds } : {}
+          })
         );
         this.callbacks.onMessageFinish?.(turnMessage);
         this.streamState = null;
@@ -1015,6 +2040,93 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
         continue;
       }
       if (!this.streamState) {
+        if (chunk.type === "tool_calls") {
+          pendingClientToolCalls = chunk.toolCalls;
+          this.debug("tool_calls (post-message:end, stored as pending)", {
+            count: pendingClientToolCalls?.length,
+            ids: pendingClientToolCalls?.map((tc) => tc.id)
+          });
+          continue;
+        }
+        if (chunk.type === "done") {
+          this.debug("done (post-message:end)", {
+            hasPendingToolCalls: !!pendingClientToolCalls?.length,
+            pendingCount: pendingClientToolCalls?.length ?? 0,
+            doneMessagesCount: chunk.messages?.length ?? 0,
+            requiresAction: chunk.requiresAction,
+            toolCallsEmitted
+          });
+          if (chunk.messages?.length) {
+            const pendingIds = new Set(
+              (pendingClientToolCalls ?? []).filter((tc) => tc?.id).map((tc) => tc.id)
+            );
+            const messagesToInsert = [];
+            let clientAssistantToolCalls;
+            for (const msg of chunk.messages) {
+              if (msg.role === "assistant" && msg.tool_calls?.length && pendingIds.size > 0 && msg.tool_calls.every(
+                (tc) => pendingIds.has(tc?.id ?? "")
+              )) {
+                clientAssistantToolCalls = msg.tool_calls;
+                continue;
+              }
+              if (msg.role === "assistant" && !msg.tool_calls?.length) continue;
+              messagesToInsert.push({
+                id: generateMessageId(),
+                role: msg.role,
+                content: msg.content ?? "",
+                toolCalls: msg.tool_calls,
+                toolCallId: msg.tool_call_id,
+                createdAt: /* @__PURE__ */ new Date()
+              });
+            }
+            if (clientAssistantToolCalls) {
+              const currentMessages = this.state.messages;
+              for (let i = currentMessages.length - 1; i >= 0; i--) {
+                if (currentMessages[i].role === "assistant") {
+                  this.state.updateMessageById(
+                    currentMessages[i].id,
+                    (m) => ({
+                      ...m,
+                      toolCalls: clientAssistantToolCalls
+                    })
+                  );
+                  break;
+                }
+              }
+            }
+            if (messagesToInsert.length > 0) {
+              const currentMessages = this.state.messages;
+              let insertIdx = currentMessages.length;
+              for (let i = currentMessages.length - 1; i >= 0; i--) {
+                if (currentMessages[i].role === "assistant") {
+                  insertIdx = i;
+                  break;
+                }
+              }
+              this.state.setMessages([
+                ...currentMessages.slice(0, insertIdx),
+                ...messagesToInsert,
+                ...currentMessages.slice(insertIdx)
+              ]);
+            }
+          }
+          if (!toolCallsEmitted && pendingClientToolCalls?.length) {
+            toolCallsEmitted = true;
+            this.debug("emit toolCalls (post-message:end path)", {
+              count: pendingClientToolCalls.length,
+              names: pendingClientToolCalls.map(
+                (tc) => tc.function?.name ?? tc.name
+              )
+            });
+            this.emit("toolCalls", { toolCalls: pendingClientToolCalls });
+          } else {
+            this.debug("skip emit toolCalls (post-message:end path)", {
+              toolCallsEmitted,
+              hasPending: !!pendingClientToolCalls?.length
+            });
+          }
+          continue;
+        }
         this.debug("warning", "streamState is null, skipping chunk");
         continue;
       }
@@ -1050,22 +2162,38 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
       const updatedMessage = streamStateToMessage(this.streamState);
       this.state.updateMessageById(
         this.streamState.messageId,
-        () => updatedMessage
+        // Preserve parentId/childrenIds from the existing placeholder so the
+        // branch tree structure (activeChildMap) is not corrupted when
+        // setCurrentLeaf() walks up the chain later.
+        (existing) => ({
+          ...updatedMessage,
+          ...existing.parentId !== void 0 ? { parentId: existing.parentId } : {},
+          ...existing.childrenIds !== void 0 ? { childrenIds: existing.childrenIds } : {}
+        })
       );
       if (chunk.type === "message:delta") {
         this.callbacks.onMessageDelta?.(assistantMessage.id, chunk.content);
       }
-      if (requiresToolExecution(chunk) && !toolCallsEmitted) {
-        toolCallsEmitted = true;
-        this.debug("toolCalls", { toolCalls: updatedMessage.toolCalls });
-        this.emit("toolCalls", { toolCalls: updatedMessage.toolCalls });
-      }
       if (isStreamDone(chunk)) {
-        this.debug("streamDone", { chunk });
+        this.debug("streamDone", {
+          chunkType: chunk.type,
+          requiresAction: chunk.requiresAction,
+          doneMessagesCount: chunk.messages?.length ?? 0,
+          streamToolCallsCount: this.streamState?.toolCalls?.length ?? 0,
+          toolCallsEmitted,
+          chunkCount
+        });
         if (chunk.type === "done" && chunk.messages?.length) {
           this.debug("processDoneMessages", {
-            count: chunk.messages.length
+            count: chunk.messages.length,
+            roles: chunk.messages.map(
+              (m) => `${m.role}${m.tool_calls?.length ? `[${m.tool_calls.length}tc]` : ""}`
+            )
           });
+          const currentStreamToolCallIds = new Set(
+            this.streamState?.toolCalls?.map((toolCall) => toolCall.id) ?? []
+          );
+          const messagesToInsert = [];
           const toolCallsHidden = {};
           if (this.streamState?.toolResults) {
             for (const [id, result] of this.streamState.toolResults) {
@@ -1075,7 +2203,12 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
             }
           }
           for (const msg of chunk.messages) {
-            if (msg.role === "assistant") {
+            if (msg.role === "assistant" && !msg.tool_calls?.length) {
+              continue;
+            }
+            if (msg.role === "assistant" && msg.tool_calls?.length && msg.tool_calls.every(
+              (toolCall) => currentStreamToolCallIds.has(toolCall.id)
+            )) {
               continue;
             }
             let metadata;
@@ -1091,7 +2224,60 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
               createdAt: /* @__PURE__ */ new Date(),
               metadata
             };
-            this.state.pushMessage(message);
+            messagesToInsert.push(message);
+          }
+          if (messagesToInsert.length > 0) {
+            const currentMessages = this.state.messages;
+            const currentStreamIndex = this.streamState ? currentMessages.findIndex(
+              (message) => message.id === this.streamState.messageId
+            ) : -1;
+            if (currentStreamIndex === -1) {
+              this.state.setMessages([...currentMessages, ...messagesToInsert]);
+            } else {
+              this.state.setMessages([
+                ...currentMessages.slice(0, currentStreamIndex),
+                ...messagesToInsert,
+                ...currentMessages.slice(currentStreamIndex)
+              ]);
+            }
+          }
+          this.debug("requiresAction check", {
+            requiresAction: chunk.requiresAction,
+            toolCallsEmitted,
+            updatedMessageToolCallsCount: updatedMessage.toolCalls?.length ?? 0,
+            messagesToInsertCount: messagesToInsert.length
+          });
+          if (chunk.requiresAction && !toolCallsEmitted) {
+            let clientToolCalls = updatedMessage.toolCalls;
+            if (!clientToolCalls?.length && messagesToInsert.length > 0) {
+              for (let i = messagesToInsert.length - 1; i >= 0; i--) {
+                const m = messagesToInsert[i];
+                if (m.role === "assistant" && m.toolCalls?.length) {
+                  clientToolCalls = m.toolCalls;
+                  this.debug("clientToolCalls from messagesToInsert", {
+                    index: i,
+                    count: clientToolCalls?.length
+                  });
+                  break;
+                }
+              }
+            }
+            if (clientToolCalls?.length) {
+              toolCallsEmitted = true;
+              this.debug("emit toolCalls (normal done path)", {
+                count: clientToolCalls.length,
+                names: clientToolCalls.map((tc) => tc.function?.name ?? tc.name)
+              });
+              this.emit("toolCalls", { toolCalls: clientToolCalls });
+            } else {
+              this.debug("requiresAction=true but no clientToolCalls found", {
+                updatedMessageToolCalls: updatedMessage.toolCalls,
+                messagesToInsert: messagesToInsert.map((m) => ({
+                  role: m.role,
+                  hasToolCalls: !!m.toolCalls?.length
+                }))
+              });
+            }
           }
         }
         break;
@@ -1116,15 +2302,22 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
           toolCallsHidden
         };
       }
-      this.state.updateMessageById(
-        this.streamState.messageId,
-        () => finalMessage
-      );
+      this.state.updateMessageById(this.streamState.messageId, (existing) => ({
+        ...finalMessage,
+        ...existing.parentId !== void 0 ? { parentId: existing.parentId } : {},
+        ...existing.childrenIds !== void 0 ? { childrenIds: existing.childrenIds } : {}
+      }));
       if (!finalMessage.content && (!finalMessage.toolCalls || finalMessage.toolCalls.length === 0)) {
         this.debug("warning", "Empty response - no content and no tool calls");
       }
     }
-    this.callbacks.onMessagesChange?.(this.state.messages);
+    this.callbacks.onMessagesChange?.(this._allMessages());
+    this.debugGroupEnd();
+    this.debug("stream end", {
+      toolCallsEmitted,
+      totalChunks: chunkCount,
+      messagesInState: this.state.messages.length
+    });
     if (!toolCallsEmitted) {
       this.state.status = "ready";
       this.callbacks.onStatusChange?.("ready");
@@ -1145,6 +2338,7 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
         }
       }
     }
+    let currentParentId = this.state.messages.length > 0 ? this.state.messages[this.state.messages.length - 1].id : void 0;
     for (const msg of response.messages ?? []) {
       let metadata;
       if (msg.role === "assistant" && msg.tool_calls && toolCallHiddenMap.size > 0) {
@@ -1167,11 +2361,15 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
         // CRITICAL: Preserve toolCallId for tool messages (fixes Anthropic API errors)
         toolCallId: msg.tool_call_id,
         createdAt: /* @__PURE__ */ new Date(),
-        metadata
+        metadata,
+        // Preserve branch tree structure: each message is a child of the
+        // current leaf so the tree is not corrupted for non-streaming mode.
+        ...currentParentId !== void 0 ? { parentId: currentParentId } : {}
       };
       this.state.pushMessage(message);
+      currentParentId = message.id;
     }
-    this.callbacks.onMessagesChange?.(this.state.messages);
+    this.callbacks.onMessagesChange?.(this._allMessages());
     const hasToolCalls = response.requiresAction && this.state.messages.length > 0 && this.state.messages[this.state.messages.length - 1]?.toolCalls?.length;
     if (hasToolCalls) {
       const lastMessage = this.state.messages[this.state.messages.length - 1];
@@ -1194,14 +2392,25 @@ ${this.dynamicContext}`.trim() : this.config.systemPrompt,
     this.callbacks.onStatusChange?.("error");
     this.emit("error", { error });
   }
-  /**
-   * Debug logging
-   */
+  get log() {
+    if (!this._log) {
+      this._log = createLogger("streaming", () => this.config.debug ?? false);
+    }
+    return this._log;
+  }
   debug(action, data) {
-    if (this.config.debug) {
-      console.log(`[AbstractChat] ${action}`, data);
+    this.log(action, data);
+  }
+  debugGroup(label, collapsed = true) {
+    if (collapsed) {
+      this.log.groupCollapsed(label);
+    } else {
+      this.log.group(label);
     }
   }
+  debugGroupEnd() {
+    this.log.groupEnd();
+  }
   /**
    * Type guard for async iterable
    */
@@ -1412,19 +2621,18 @@ var AbstractAgentLoop = class {
     this._isCancelled = false;
     this._isProcessing = true;
     this.setIteration(this._iteration + 1);
-    const results = [];
-    for (const toolCall of toolCalls) {
-      if (this._isCancelled || this.abortController.signal.aborted) {
-        results.push({
-          toolCallId: toolCall.id,
-          success: false,
-          error: "Tool execution cancelled"
-        });
-        continue;
-      }
-      const result = await this.executeSingleTool(toolCall);
-      results.push(result);
-    }
+    const results = await Promise.all(
+      toolCalls.map((toolCall) => {
+        if (this._isCancelled || this.abortController.signal.aborted) {
+          return Promise.resolve({
+            toolCallId: toolCall.id,
+            success: false,
+            error: "Tool execution cancelled"
+          });
+        }
+        return this.executeSingleTool(toolCall);
+      })
+    );
     this._isProcessing = false;
     return results;
   }
@@ -1742,6 +2950,7 @@ var ChatWithTools = class {
       streaming: config.streaming,
       headers: config.headers,
       body: config.body,
+      optimization: config.optimization,
       threadId: config.threadId,
       debug: config.debug,
       initialMessages: config.initialMessages,
@@ -1756,6 +2965,7 @@ var ChatWithTools = class {
         onMessageFinish: callbacks.onMessageFinish,
         onToolCalls: callbacks.onToolCalls,
         onFinish: callbacks.onFinish,
+        onContextUsageChange: callbacks.onContextUsageChange,
         // Server-side tool callbacks - track in agentLoop for UI display
         // IMPORTANT: Only track tools that are NOT registered client-side
         // Client-side tools are tracked via executeToolCalls() path
@@ -1923,14 +3133,17 @@ var ChatWithTools = class {
   /**
    * Send a message
    * Returns false if a request is already in progress
+   *
+   * @param options.editMessageId - Edit flow: new message branches from the
+   *   same parent as this message ID
    */
-  async sendMessage(content, attachments) {
+  async sendMessage(content, attachments, options) {
     if (this.isLoading) {
       this.debug("sendMessage blocked - request already in progress");
       return false;
     }
     this.agentLoop.resetIterations();
-    return await this.chat.sendMessage(content, attachments);
+    return await this.chat.sendMessage(content, attachments, options);
   }
   /**
    * Stop generation and cancel any running tools
@@ -1965,6 +3178,25 @@ var ChatWithTools = class {
   setTools(tools) {
     this.chat.setTools(tools);
   }
+  /**
+   * Update prompt/tool optimization controls.
+   */
+  setOptimizationConfig(config) {
+    this.config.optimization = config;
+    this.chat.setOptimizationConfig(config);
+  }
+  /**
+   * Set the active tool profile used for request-time tool selection.
+   */
+  setToolProfile(profile) {
+    this.chat.setToolProfile(profile);
+  }
+  /**
+   * Get the most recent prompt context usage snapshot.
+   */
+  getContextUsage() {
+    return this.chat.getContextUsage();
+  }
   /**
    * Set dynamic context (from useAIContext hook)
    */
@@ -1998,6 +3230,15 @@ var ChatWithTools = class {
   setBody(body) {
     this.chat.setBody(body);
   }
+  setRequestMessageTransform(fn) {
+    this.chat.setRequestMessageTransform(fn);
+  }
+  /**
+   * Set inline skills (forwarded to underlying chat instance)
+   */
+  setInlineSkills(skills) {
+    this.chat.setInlineSkills(skills);
+  }
   // ============================================
   // Tool Registration
   // ============================================
@@ -2074,16 +3315,307 @@ var ChatWithTools = class {
   // Private
   // ============================================
   debug(message, ...args) {
-    if (this.config.debug) {
-      console.log(`[ChatWithTools] ${message}`, ...args);
+    createLogger("tools", () => this.config.debug ?? false)(
+      message,
+      args.length === 1 ? args[0] : args.length > 1 ? args : void 0
+    );
+  }
+};
+
+// src/chat/branching/MessageTree.ts
+var _MessageTree = class _MessageTree {
+  constructor(messages) {
+    /** All messages by ID */
+    this.nodeMap = /* @__PURE__ */ new Map();
+    /** parentKey → ordered list of child IDs (insertion order = oldest-first) */
+    this.childrenOf = /* @__PURE__ */ new Map();
+    /** parentKey → currently-active child ID */
+    this.activeChildMap = /* @__PURE__ */ new Map();
+    /** Current leaf message ID (tip of the active path) */
+    this._currentLeafId = null;
+    /** Cached visible messages — invalidated on every mutation */
+    this._visibleCache = null;
+    if (messages?.length) {
+      this._buildFromMessages(messages);
+    }
+  }
+  // ============================================
+  // Static Migration Helpers
+  // ============================================
+  /**
+   * Convert a legacy flat array (no parentId) to a tree-linked array.
+   *
+   * Rules:
+   * - Tool messages get parentId = the owning assistant message's id
+   *   (matched via toolCallId → toolCall.id).
+   * - All other messages get parentId of the previous non-tool message
+   *   (or null for the first message).
+   *
+   * Returns a new array with parentId/childrenIds filled in.
+   * Does NOT mutate the original messages.
+   */
+  static fromFlatArray(messages) {
+    if (messages.length === 0) return messages;
+    const alreadyLinked = messages.some((m) => m.parentId !== void 0);
+    if (alreadyLinked) return messages;
+    const result = [];
+    let prevNonToolId = null;
+    const assistantById = /* @__PURE__ */ new Map();
+    for (const msg of messages) {
+      if (msg.role === "assistant") {
+        assistantById.set(msg.id, msg);
+      }
+    }
+    for (const msg of messages) {
+      if (msg.role === "tool" && msg.toolCallId) {
+        let ownerAssistantId = null;
+        for (const [, assistant] of assistantById) {
+          if (assistant.toolCalls?.some((tc) => tc.id === msg.toolCallId)) {
+            ownerAssistantId = assistant.id;
+            break;
+          }
+        }
+        result.push({
+          ...msg,
+          parentId: ownerAssistantId ?? prevNonToolId,
+          childrenIds: []
+        });
+      } else {
+        result.push({
+          ...msg,
+          parentId: prevNonToolId,
+          childrenIds: []
+        });
+        prevNonToolId = msg.id;
+      }
+    }
+    const childrenMap = /* @__PURE__ */ new Map();
+    for (const msg of result) {
+      const parentKey = msg.parentId == null ? _MessageTree.ROOT_KEY : msg.parentId;
+      if (!childrenMap.has(parentKey)) {
+        childrenMap.set(parentKey, []);
+      }
+      childrenMap.get(parentKey).push(msg.id);
+    }
+    return result.map((msg) => ({
+      ...msg,
+      childrenIds: childrenMap.get(msg.id) ?? []
+    }));
+  }
+  // ============================================
+  // Core Queries
+  // ============================================
+  /**
+   * Returns the visible path (root → current leaf) — what the UI renders
+   * and what gets sent to the API.
+   *
+   * Backward-compat: if NO message has parentId set (all undefined),
+   * falls back to insertion order (legacy linear mode).
+   */
+  getVisibleMessages() {
+    if (this._visibleCache !== null) return this._visibleCache;
+    if (this.nodeMap.size === 0) {
+      this._visibleCache = [];
+      return this._visibleCache;
+    }
+    const hasTreeStructure = Array.from(this.nodeMap.values()).some(
+      (m) => m.parentId !== void 0
+    );
+    this._visibleCache = hasTreeStructure ? this._getActivePath().map((id) => this.nodeMap.get(id)) : Array.from(this.nodeMap.values());
+    return this._visibleCache;
+  }
+  _invalidateCache() {
+    this._visibleCache = null;
+  }
+  /**
+   * Returns ALL messages across every branch (for persistence / ThreadManager).
+   */
+  getAllMessages() {
+    return Array.from(this.nodeMap.values());
+  }
+  /**
+   * Branch navigation info for the UI navigator.
+   * Returns null if the message has no siblings (only child).
+   */
+  getBranchInfo(messageId) {
+    const msg = this.nodeMap.get(messageId);
+    if (!msg) return null;
+    const parentKey = this._parentKey(msg.parentId);
+    const siblings = this.childrenOf.get(parentKey) ?? [];
+    if (siblings.length <= 1) return null;
+    const siblingIndex = siblings.indexOf(messageId);
+    return {
+      siblingIndex,
+      totalSiblings: siblings.length,
+      siblingIds: [...siblings],
+      hasPrevious: siblingIndex > 0,
+      hasNext: siblingIndex < siblings.length - 1
+    };
+  }
+  get currentLeafId() {
+    return this._currentLeafId;
+  }
+  get hasBranches() {
+    for (const children of this.childrenOf.values()) {
+      if (children.length > 1) return true;
+    }
+    return false;
+  }
+  // ============================================
+  // Mutations
+  // ============================================
+  /**
+   * Insert a new message.
+   * - Updates childrenOf and nodeMap.
+   * - New branch becomes active (activeChildMap updated).
+   * - Updates current leaf.
+   */
+  addMessage(message) {
+    this.nodeMap.set(message.id, message);
+    const parentKey = this._parentKey(message.parentId);
+    if (!this.childrenOf.has(parentKey)) {
+      this.childrenOf.set(parentKey, []);
+    }
+    const siblings = this.childrenOf.get(parentKey);
+    if (!siblings.includes(message.id)) {
+      siblings.push(message.id);
+    }
+    this.activeChildMap.set(parentKey, message.id);
+    this._currentLeafId = this._walkToLeaf(message.id);
+    this._invalidateCache();
+    return message;
+  }
+  /**
+   * Navigate: make messageId the active child at its parent fork,
+   * then walk to its leaf and update currentLeafId.
+   */
+  switchBranch(messageId) {
+    const msg = this.nodeMap.get(messageId);
+    if (!msg) return;
+    const parentKey = this._parentKey(msg.parentId);
+    this.activeChildMap.set(parentKey, messageId);
+    this._currentLeafId = this._walkToLeaf(messageId);
+    this._invalidateCache();
+  }
+  /**
+   * Update message content in-place (streaming updates).
+   * No tree structure change.
+   */
+  updateMessage(id, updater) {
+    const existing = this.nodeMap.get(id);
+    if (!existing) return false;
+    this.nodeMap.set(id, updater(existing));
+    this._invalidateCache();
+    return true;
+  }
+  /**
+   * Set current leaf explicitly.
+   * Used by regenerate() to rewind the active path before pushing a new message.
+   */
+  setCurrentLeaf(leafId) {
+    this._currentLeafId = leafId;
+    if (leafId === null) return;
+    const msg = this.nodeMap.get(leafId);
+    if (!msg) return;
+    let current = msg;
+    while (current) {
+      const parentKey = this._parentKey(current.parentId);
+      this.activeChildMap.set(parentKey, current.id);
+      if (current.parentId == null || current.parentId === void 0) break;
+      current = this.nodeMap.get(current.parentId);
+    }
+    this._invalidateCache();
+  }
+  /**
+   * Rebuild entire tree from a message array.
+   * Used by setMessages().
+   */
+  reset(messages) {
+    this.nodeMap.clear();
+    this.childrenOf.clear();
+    this.activeChildMap.clear();
+    this._currentLeafId = null;
+    this._invalidateCache();
+    if (messages.length > 0) {
+      this._buildFromMessages(messages);
+    }
+  }
+  // ============================================
+  // Private Helpers
+  // ============================================
+  _buildFromMessages(messages) {
+    const linked = messages.some((m) => m.parentId !== void 0) ? messages : _MessageTree.fromFlatArray(messages);
+    for (const msg of linked) {
+      this.nodeMap.set(msg.id, msg);
+      const parentKey = this._parentKey(msg.parentId);
+      if (!this.childrenOf.has(parentKey)) {
+        this.childrenOf.set(parentKey, []);
+      }
+      const siblings = this.childrenOf.get(parentKey);
+      if (!siblings.includes(msg.id)) {
+        siblings.push(msg.id);
+      }
+    }
+    for (const [parentKey, children] of this.childrenOf) {
+      if (children.length > 0) {
+        this.activeChildMap.set(parentKey, children[children.length - 1]);
+      }
     }
+    const path = this._getActivePath();
+    this._currentLeafId = path.length > 0 ? path[path.length - 1] : null;
+  }
+  _parentKey(parentId) {
+    if (parentId == null || parentId === void 0) {
+      return _MessageTree.ROOT_KEY;
+    }
+    return parentId;
+  }
+  /**
+   * Walk forward from a message along active children to find the leaf.
+   */
+  _walkToLeaf(fromId) {
+    let current = fromId;
+    while (true) {
+      const children = this.childrenOf.get(current);
+      if (!children || children.length === 0) break;
+      const activeChild = this.activeChildMap.get(current);
+      if (!activeChild) break;
+      if (!this.nodeMap.has(activeChild)) break;
+      current = activeChild;
+    }
+    return current;
+  }
+  /**
+   * Walk the active path from root to the current leaf.
+   */
+  _getActivePath() {
+    const path = [];
+    const visited = /* @__PURE__ */ new Set();
+    const rootChildren = this.childrenOf.get(_MessageTree.ROOT_KEY) ?? [];
+    if (rootChildren.length === 0) return path;
+    let activeId = this.activeChildMap.get(_MessageTree.ROOT_KEY);
+    if (!activeId) {
+      activeId = rootChildren[rootChildren.length - 1];
+    }
+    let current = activeId;
+    while (current && !visited.has(current)) {
+      if (!this.nodeMap.has(current)) break;
+      visited.add(current);
+      path.push(current);
+      const activeChild = this.activeChildMap.get(current);
+      if (!activeChild || !this.nodeMap.has(activeChild)) break;
+      current = activeChild;
+    }
+    return path;
   }
 };
+/** Sentinel key used for root-level messages (parentId === null) */
+_MessageTree.ROOT_KEY = "__root__";
+var MessageTree = _MessageTree;
 
 // src/react/internal/ReactChatState.ts
 var ReactChatState = class {
   constructor(initialMessages) {
-    this._messages = [];
     this._status = "ready";
     this._error = void 0;
     // Callbacks for React subscriptions (useSyncExternalStore)
@@ -2109,15 +3641,19 @@ var ReactChatState = class {
         this.subscribers.delete(callback);
       };
     };
-    if (initialMessages) {
-      this._messages = initialMessages;
-    }
+    this.tree = new MessageTree(initialMessages);
   }
   // ============================================
-  // Getters
+  // Getters — visible path only
   // ============================================
+  /**
+   * Returns the VISIBLE PATH (active branch) — what the UI renders
+   * and what gets sent to the API.
+   *
+   * For all messages across all branches, use getAllMessages().
+   */
   get messages() {
-    return this._messages;
+    return this.tree.getVisibleMessages();
   }
   get status() {
     return this._status;
@@ -2129,7 +3665,7 @@ var ReactChatState = class {
   // Setters (trigger reactivity)
   // ============================================
   set messages(value) {
-    this._messages = value;
+    this.tree.reset(value);
     this.notify();
   }
   set status(value) {
@@ -2144,65 +3680,104 @@ var ReactChatState = class {
   // Mutations
   // ============================================
   pushMessage(message) {
-    this._messages = [...this._messages, message];
+    this.tree.addMessage(message);
     this.notify();
   }
   popMessage() {
-    this._messages = this._messages.slice(0, -1);
+    const leafId = this.tree.currentLeafId;
+    if (!leafId) return;
+    const allMessages = this.tree.getAllMessages().filter((m) => m.id !== leafId);
+    const leaf = this.tree.getAllMessages().find((m) => m.id === leafId);
+    const newLeafId = leaf && leaf.parentId !== void 0 && leaf.parentId !== null ? leaf.parentId : null;
+    this.tree.reset(allMessages);
+    if (newLeafId) {
+      this.tree.setCurrentLeaf(newLeafId);
+    }
     this.notify();
   }
   replaceMessage(index, message) {
-    this._messages = this._messages.map((m, i) => i === index ? message : m);
+    const visible = this.tree.getVisibleMessages();
+    const target = visible[index];
+    if (!target) return;
+    this.tree.updateMessage(target.id, () => message);
     this.notify();
   }
   updateLastMessage(updater) {
-    if (this._messages.length === 0) return;
-    const lastIndex = this._messages.length - 1;
-    const lastMessage = this._messages[lastIndex];
-    this._messages = [
-      ...this._messages.slice(0, lastIndex),
-      updater(lastMessage)
-    ];
+    const leafId = this.tree.currentLeafId;
+    if (!leafId) return;
+    this.tree.updateMessage(leafId, updater);
     this.notify();
   }
   updateMessageById(id, updater) {
-    const index = this._messages.findIndex((m) => m.id === id);
-    if (index === -1) return false;
-    this._messages = this._messages.map(
-      (m, i) => i === index ? updater(m) : m
-    );
-    this.notify();
-    return true;
+    const updated = this.tree.updateMessage(id, updater);
+    if (updated) this.notify();
+    return updated;
   }
   setMessages(messages) {
-    this._messages = messages;
+    this.tree.reset(messages);
     this.notify();
   }
   clearMessages() {
-    this._messages = [];
+    this.tree.reset([]);
     this.notify();
   }
   // ============================================
-  // Private Methods
+  // Branching API
   // ============================================
-  notify() {
-    this.subscribers.forEach((cb) => cb());
+  /**
+   * Returns ALL messages across all branches.
+   * Use this for persistence (ThreadManager save).
+   */
+  getAllMessages() {
+    return this.tree.getAllMessages();
   }
   /**
-   * Cleanup subscriptions
+   * Get branch navigation info for a message.
+   * Returns null if the message has no siblings.
    */
-  dispose() {
-    this.subscribers.clear();
+  getBranchInfo(messageId) {
+    return this.tree.getBranchInfo(messageId);
   }
   /**
-   * Revive after dispose (for React StrictMode compatibility)
-   * Subscribers will be re-added automatically via useSyncExternalStore
+   * Navigate to a sibling branch.
+   * Triggers re-render via notify().
    */
-  revive() {
+  switchBranch(messageId) {
+    this.tree.switchBranch(messageId);
+    this.notify();
   }
-};
-function createReactChatState(initialMessages) {
-  return new ReactChatState(initialMessages);
+  /**
+   * Set the current leaf (used by regenerate() to rewind active path).
+   * Triggers re-render via notify().
+   */
+  setCurrentLeaf(leafId) {
+    this.tree.setCurrentLeaf(leafId);
+    this.notify();
+  }
+  get hasBranches() {
+    return this.tree.hasBranches;
+  }
+  // ============================================
+  // Private Methods
+  // ============================================
+  notify() {
+    this.subscribers.forEach((cb) => cb());
+  }
+  /**
+   * Cleanup subscriptions
+   */
+  dispose() {
+    this.subscribers.clear();
+  }
+  /**
+   * Revive after dispose (for React StrictMode compatibility)
+   * Subscribers will be re-added automatically via useSyncExternalStore
+   */
+  revive() {
+  }
+};
+function createReactChatState(initialMessages) {
+  return new ReactChatState(initialMessages);
 }
 
 // src/react/internal/ReactChatWithTools.ts
@@ -2218,6 +3793,33 @@ var ReactChatWithTools = class extends ChatWithTools {
     };
     this.reactState = reactState;
   }
+  // ============================================
+  // Branching API — pass-throughs to ReactChatState
+  // ============================================
+  /**
+   * Navigate to a sibling branch.
+   */
+  switchBranch(messageId) {
+    this.reactState.switchBranch(messageId);
+  }
+  /**
+   * Get branch navigation info for a message.
+   */
+  getBranchInfo(messageId) {
+    return this.reactState.getBranchInfo(messageId);
+  }
+  /**
+   * Get all messages across all branches (for persistence).
+   */
+  getAllMessages() {
+    return this.reactState.getAllMessages();
+  }
+  /**
+   * Whether any message has siblings (branching has occurred).
+   */
+  get hasBranches() {
+    return this.reactState.hasBranches;
+  }
   /**
    * Dispose and cleanup
    */
@@ -2508,22 +4110,919 @@ function useMCPTools(config) {
       }
     }
     return () => {
-      for (const toolName of registeredToolsRef.current) {
-        unregisterTool(toolName);
+      for (const toolName of registeredToolsRef.current) {
+        unregisterTool(toolName);
+      }
+      registeredToolsRef.current = [];
+    };
+  }, [
+    autoRegister,
+    mcpClient.isConnected,
+    toolDefinitions,
+    registerTool,
+    unregisterTool
+  ]);
+  return {
+    ...mcpClient,
+    toolDefinitions
+  };
+}
+var defaultTokenUsage = {
+  current: 0,
+  max: 128e3,
+  percentage: 0,
+  isApproaching: false
+};
+var defaultCompactionState = {
+  rollingSummary: null,
+  lastCompactionAt: null,
+  compactionCount: 0,
+  totalTokensSaved: 0,
+  workingMemory: [],
+  displayMessageCount: 0,
+  llmMessageCount: 0
+};
+var defaultMessageHistoryConfig = {
+  strategy: "none",
+  maxContextTokens: 128e3,
+  reserveForResponse: 4096,
+  compactionThreshold: 0.75,
+  recentBuffer: 10,
+  toolResultMaxChars: 1e4,
+  persistSession: false,
+  storageKey: "copilot-session"
+};
+var MessageHistoryContext = createContext({
+  config: defaultMessageHistoryConfig,
+  tokenUsage: defaultTokenUsage,
+  compactionState: defaultCompactionState
+});
+function useMessageHistoryContext() {
+  return useContext(MessageHistoryContext);
+}
+
+// src/react/message-history/message-utils.ts
+function toDisplayMessage(msg) {
+  return {
+    ...msg,
+    timestamp: msg.createdAt instanceof Date ? msg.createdAt.getTime() : Date.now()
+  };
+}
+function toLLMMessage(msg) {
+  if (isCompactionMarker(msg)) {
+    return {
+      role: "system",
+      content: `[Previous conversation summary]
+${msg.content}`
+    };
+  }
+  const base = {
+    role: msg.role,
+    content: msg.content
+  };
+  if (msg.toolCalls?.length) {
+    base.tool_calls = msg.toolCalls;
+  }
+  if (msg.toolCallId) {
+    base.tool_call_id = msg.toolCallId;
+  }
+  return base;
+}
+function toLLMMessages(messages) {
+  return messages.map(toLLMMessage);
+}
+function keepToolPairsAtomic(messages) {
+  if (messages.length === 0) return messages;
+  const firstIdx = messages.findIndex((msg, i) => {
+    if (msg.role !== "assistant" || !msg.toolCalls?.length) return false;
+    const toolCallIds = new Set(msg.toolCalls.map((tc) => tc.id));
+    const resultIds = new Set(
+      messages.slice(i + 1).filter((m) => m.role === "tool" && m.toolCallId).map((m) => m.toolCallId)
+    );
+    return [...toolCallIds].some((id) => !resultIds.has(id));
+  });
+  if (firstIdx === -1) return messages;
+  return messages.slice(firstIdx);
+}
+function findSafeWindowStart(messages, desiredStart) {
+  for (let i = desiredStart; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg.role === "user" || msg.role === "assistant" && !msg.toolCalls?.length) {
+      return i;
+    }
+  }
+  return desiredStart;
+}
+function isCompactionMarker(msg) {
+  return msg.role === "system" && msg.type === "compaction-marker";
+}
+
+// src/react/message-history/token-counter.ts
+function estimateMessageTokens2(msg) {
+  let chars = msg.content?.length ?? 0;
+  if (msg.tool_calls?.length) {
+    for (const tc of msg.tool_calls) {
+      chars += JSON.stringify(tc).length;
+    }
+  }
+  return Math.ceil(chars / 3.5) + 4;
+}
+function estimateMessagesTokens(messages) {
+  return messages.reduce((sum, msg) => sum + estimateMessageTokens2(msg), 0);
+}
+function estimateTokens2(messages, mode = "fast") {
+  if (mode === "off") return 0;
+  return estimateMessagesTokens(messages);
+}
+
+// src/react/message-history/strategies/sliding-window.ts
+function applySlidingWindow(messages, options) {
+  const { tokenBudget, recentBuffer } = options;
+  if (messages.length === 0) return messages;
+  const systemMessages = messages.filter(
+    (m) => m.role === "system" || isCompactionMarker(m)
+  );
+  const conversationMessages = messages.filter(
+    (m) => m.role !== "system" && !isCompactionMarker(m)
+  );
+  const systemTokens = estimateMessagesTokens(toLLMMessages(systemMessages));
+  const remainingBudget = tokenBudget - systemTokens;
+  if (conversationMessages.length === 0) return systemMessages;
+  const recentStart = Math.max(0, conversationMessages.length - recentBuffer);
+  const recent = conversationMessages.slice(recentStart);
+  const older = conversationMessages.slice(0, recentStart);
+  const allTokens = estimateMessagesTokens(toLLMMessages(conversationMessages));
+  if (allTokens <= remainingBudget) {
+    return messages;
+  }
+  const recentTokens = estimateMessagesTokens(toLLMMessages(recent));
+  let available = remainingBudget - recentTokens;
+  const included = [];
+  for (let i = older.length - 1; i >= 0; i--) {
+    const msgTokens = estimateMessagesTokens(toLLMMessages([older[i]]));
+    if (available - msgTokens < 0) break;
+    included.unshift(older[i]);
+    available -= msgTokens;
+  }
+  const combined = [...included, ...recent];
+  const safeStart = findSafeWindowStart(combined, 0);
+  const safeWindow = combined.slice(safeStart);
+  return [...systemMessages, ...safeWindow];
+}
+function truncateToolResults(messages, maxChars) {
+  if (maxChars === 0) return messages;
+  return messages.map((msg) => {
+    if (msg.role !== "tool") return msg;
+    if (!msg.content || msg.content.length <= maxChars) return msg;
+    return {
+      ...msg,
+      content: msg.content.slice(0, maxChars) + `
+[truncated \u2014 original ${msg.content.length} chars, limit ${maxChars}]`
+    };
+  });
+}
+
+// src/react/message-history/strategies/selective-prune.ts
+function applySelectivePrune(displayMessages, recentBuffer, options = {}) {
+  const {
+    toolResultAgeTurns = 3,
+    stripOldReasoning = true,
+    deduplicateSkills = true
+  } = options;
+  const cutoff = Math.max(0, displayMessages.length - recentBuffer);
+  const seenSkillContent = /* @__PURE__ */ new Set();
+  return displayMessages.map((msg, idx) => {
+    const llm = toLLMMessage(msg);
+    const isOld = idx < cutoff;
+    if (deduplicateSkills && msg.role === "system" && llm.content) {
+      const key = llm.content.slice(0, 100);
+      if (seenSkillContent.has(key)) {
+        return { ...llm, content: "[skill instruction \u2014 deduplicated]" };
+      }
+      seenSkillContent.add(key);
+    }
+    if (!isOld) return llm;
+    if (stripOldReasoning && msg.role === "assistant" && msg.thinking) {
+      llm.content = llm.content;
+    }
+    if (msg.role === "tool" && llm.content) {
+      const originalSize = llm.content.length;
+      if (originalSize > 500) {
+        const stub = buildToolResultStub(msg, llm.content);
+        return {
+          role: "tool",
+          tool_call_id: llm.tool_call_id,
+          content: JSON.stringify(stub)
+        };
+      }
+    }
+    return llm;
+  });
+}
+function buildToolResultStub(msg, content) {
+  return {
+    type: "compacted-tool-result",
+    toolName: msg.metadata?.toolName ?? "tool",
+    toolCallId: msg.toolCallId ?? "",
+    args: msg.metadata?.toolArgs ?? {},
+    executedAt: msg.timestamp,
+    status: content.includes('"error"') ? "error" : "success",
+    originalSize: content.length,
+    summary: buildSummary(content),
+    extract: content.slice(0, 200)
+  };
+}
+function buildSummary(content) {
+  try {
+    const parsed = JSON.parse(content);
+    if (parsed?.message) return String(parsed.message).slice(0, 120);
+    if (parsed?.error) return `Error: ${String(parsed.error).slice(0, 100)}`;
+    if (Array.isArray(parsed)) return `Array result \u2014 ${parsed.length} items`;
+    const keys = Object.keys(parsed).slice(0, 3).join(", ");
+    return `Object result \u2014 keys: ${keys}`;
+  } catch {
+    return content.slice(0, 120);
+  }
+}
+
+// src/react/message-history/strategies/summary-buffer.ts
+function buildSummaryBufferContext(displayMessages, compactionState, options) {
+  const { recentBuffer } = options;
+  const systemMessages = displayMessages.filter(
+    (m) => m.role === "system" || isCompactionMarker(m)
+  );
+  const conversationMessages = displayMessages.filter(
+    (m) => m.role !== "system" && !isCompactionMarker(m)
+  );
+  const recentStart = Math.max(0, conversationMessages.length - recentBuffer);
+  const recentMessages = conversationMessages.slice(recentStart);
+  const result = [];
+  if (compactionState.workingMemory.length > 0) {
+    result.push({
+      role: "system",
+      content: `[Working memory \u2014 always active]
+${compactionState.workingMemory.join("\n")}`
+    });
+  }
+  if (compactionState.rollingSummary) {
+    result.push({
+      role: "system",
+      content: `[Previous conversation summary]
+${compactionState.rollingSummary}`
+    });
+  }
+  result.push(...toLLMMessages(systemMessages));
+  result.push(...toLLMMessages(recentMessages));
+  return result;
+}
+async function runCompaction(displayMessages, compactionState, options) {
+  const { recentBuffer, compactionUrl, summarizer } = options;
+  const conversationMessages = displayMessages.filter(
+    (m) => m.role !== "system" && !isCompactionMarker(m)
+  );
+  const cutoff = Math.max(0, conversationMessages.length - recentBuffer);
+  const toSummarize = conversationMessages.slice(0, cutoff);
+  if (toSummarize.length === 0) {
+    return { llmMessages: toLLMMessages(displayMessages) };
+  }
+  const llmToSummarize = toLLMMessages(toSummarize);
+  const originalTokens = estimateMessagesTokens(llmToSummarize);
+  let newSummary;
+  if (summarizer) {
+    newSummary = await summarizer(llmToSummarize);
+  } else if (compactionUrl) {
+    newSummary = await fetchSummary(compactionUrl, {
+      messages: llmToSummarize,
+      existingSummary: compactionState.rollingSummary,
+      workingMemory: compactionState.workingMemory
+    });
+  } else {
+    newSummary = buildFallbackSummary(
+      llmToSummarize,
+      compactionState.rollingSummary
+    );
+  }
+  const summaryTokens = Math.ceil(newSummary.length / 3.5);
+  const tokensSaved = Math.max(0, originalTokens - summaryTokens);
+  return {
+    llmMessages: buildSummaryBufferContext(
+      displayMessages,
+      { ...compactionState, rollingSummary: newSummary },
+      options
+    ),
+    newSummary,
+    tokensSaved,
+    messagesSummarized: toSummarize.length
+  };
+}
+async function fetchSummary(url, body) {
+  const res = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body)
+  });
+  if (!res.ok) {
+    throw new Error(`Compaction endpoint returned ${res.status}`);
+  }
+  const data = await res.json();
+  if (!data?.summary) {
+    throw new Error("Compaction endpoint did not return { summary: string }");
+  }
+  return data.summary;
+}
+function buildFallbackSummary(messages, existingSummary) {
+  const lines = messages.filter((m) => m.role === "user" || m.role === "assistant").map((m) => `${m.role}: ${(m.content ?? "").slice(0, 200)}`).join("\n");
+  return existingSummary ? `${existingSummary}
+
+[Additional context]
+${lines}` : lines;
+}
+
+// src/react/message-history/session-persistence.ts
+var IDB_DB_NAME = "copilot-sdk";
+var IDB_STORE = "sessions";
+var IDB_VERSION = 1;
+function saveCompactionState(storageKey, state) {
+  try {
+    localStorage.setItem(
+      `${storageKey}-state`,
+      JSON.stringify({ ...state, _savedAt: Date.now() })
+    );
+  } catch {
+  }
+}
+function loadCompactionState(storageKey) {
+  try {
+    const raw = localStorage.getItem(`${storageKey}-state`);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw);
+    delete parsed._savedAt;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function clearCompactionState(storageKey) {
+  try {
+    localStorage.removeItem(`${storageKey}-state`);
+  } catch {
+  }
+}
+function openDB() {
+  return new Promise((resolve, reject) => {
+    const req = indexedDB.open(IDB_DB_NAME, IDB_VERSION);
+    req.onupgradeneeded = () => {
+      req.result.createObjectStore(IDB_STORE, { keyPath: "sessionId" });
+    };
+    req.onsuccess = () => resolve(req.result);
+    req.onerror = () => reject(req.error);
+  });
+}
+async function saveDisplayMessages(storageKey, messages) {
+  try {
+    const db = await openDB();
+    const tx = db.transaction(IDB_STORE, "readwrite");
+    tx.objectStore(IDB_STORE).put({
+      sessionId: storageKey,
+      messages,
+      savedAt: Date.now()
+    });
+    await new Promise((res, rej) => {
+      tx.oncomplete = () => res();
+      tx.onerror = () => rej(tx.error);
+    });
+    db.close();
+  } catch {
+  }
+}
+async function loadDisplayMessages(storageKey) {
+  try {
+    const db = await openDB();
+    const tx = db.transaction(IDB_STORE, "readonly");
+    const req = tx.objectStore(IDB_STORE).get(storageKey);
+    const result = await new Promise((res, rej) => {
+      req.onsuccess = () => res(req.result);
+      req.onerror = () => rej(req.error);
+    });
+    db.close();
+    return result?.messages ?? null;
+  } catch {
+    return null;
+  }
+}
+async function clearDisplayMessages(storageKey) {
+  try {
+    const db = await openDB();
+    const tx = db.transaction(IDB_STORE, "readwrite");
+    tx.objectStore(IDB_STORE).delete(storageKey);
+    await new Promise((res, rej) => {
+      tx.oncomplete = () => res();
+      tx.onerror = () => rej(tx.error);
+    });
+    db.close();
+  } catch {
+  }
+}
+async function clearSession(storageKey) {
+  clearCompactionState(storageKey);
+  await clearDisplayMessages(storageKey);
+}
+
+// src/react/message-history/useMessageHistory.ts
+var DEFAULT_COMPACTION_STATE = {
+  rollingSummary: null,
+  lastCompactionAt: null,
+  compactionCount: 0,
+  totalTokensSaved: 0,
+  workingMemory: [],
+  displayMessageCount: 0,
+  llmMessageCount: 0
+};
+function useMessageHistory(options = {}) {
+  const { messages } = useCopilot();
+  const ctx = useMessageHistoryContext();
+  const config = useMemo(
+    () => ({ ...defaultMessageHistoryConfig, ...ctx.config, ...options }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+      ctx.config,
+      options.strategy,
+      options.maxContextTokens,
+      options.recentBuffer,
+      options.compactionThreshold
+    ]
+  );
+  const storageKey = config.storageKey ?? "copilot-session";
+  const strategy = options.skipCompaction ? "none" : config.strategy ?? "none";
+  const [compactionState, setCompactionState] = useState(() => {
+    if (config.persistSession) {
+      return loadCompactionState(storageKey) ?? DEFAULT_COMPACTION_STATE;
+    }
+    return DEFAULT_COMPACTION_STATE;
+  });
+  const displayMessages = useMemo(
+    () => messages.map(toDisplayMessage),
+    [messages]
+  );
+  const restoredRef = useRef(false);
+  useEffect(() => {
+    if (!config.persistSession || restoredRef.current) return;
+    restoredRef.current = true;
+    loadDisplayMessages(storageKey).then((saved) => {
+      if (saved?.length && messages.length === 0) ;
+    });
+  }, [config.persistSession, storageKey, messages.length]);
+  useEffect(() => {
+    if (!config.persistSession || displayMessages.length === 0) return;
+    saveDisplayMessages(storageKey, displayMessages);
+  }, [config.persistSession, storageKey, displayMessages]);
+  const llmMessages = useMemo(() => {
+    const maxTokens = config.maxContextTokens ?? 128e3;
+    const reserve = config.reserveForResponse ?? 4096;
+    const tokenBudget = maxTokens - reserve;
+    const recentBuffer = config.recentBuffer ?? 10;
+    const maxChars = config.toolResultMaxChars ?? 1e4;
+    let result;
+    switch (strategy) {
+      case "sliding-window": {
+        const windowed = applySlidingWindow(displayMessages, {
+          tokenBudget,
+          recentBuffer
+        });
+        result = truncateToolResults(toLLMMessages(windowed), maxChars);
+        break;
+      }
+      case "selective-prune": {
+        result = truncateToolResults(
+          applySelectivePrune(displayMessages, recentBuffer),
+          maxChars
+        );
+        break;
+      }
+      case "summary-buffer": {
+        result = truncateToolResults(
+          buildSummaryBufferContext(displayMessages, compactionState, {
+            recentBuffer,
+            compactionThreshold: config.compactionThreshold ?? 0.75,
+            compactionUrl: config.compactionUrl,
+            summarizer: options.summarizer
+          }),
+          maxChars
+        );
+        break;
+      }
+      default:
+        result = truncateToolResults(toLLMMessages(displayMessages), maxChars);
+    }
+    return result;
+  }, [displayMessages, compactionState, strategy, config, options.summarizer]);
+  const tokenUsage = useMemo(() => {
+    const mode = options.tokenEstimation ?? "fast";
+    const current = estimateTokens2(toLLMMessages(displayMessages), mode);
+    const max = config.maxContextTokens ?? 128e3;
+    const threshold = config.compactionThreshold ?? 0.75;
+    const percentage = current / max;
+    return { current, max, percentage, isApproaching: percentage >= threshold };
+  }, [
+    displayMessages,
+    config.maxContextTokens,
+    config.compactionThreshold,
+    options.tokenEstimation
+  ]);
+  useEffect(() => {
+    if (config.onTokenUsage && tokenUsage.current > 0) {
+      config.onTokenUsage(tokenUsage);
+    }
+  }, [tokenUsage, config.onTokenUsage]);
+  useEffect(() => {
+    if (config.persistSession) {
+      saveCompactionState(storageKey, {
+        ...compactionState,
+        displayMessageCount: displayMessages.length,
+        llmMessageCount: llmMessages.length
+      });
+    }
+  }, [
+    config.persistSession,
+    storageKey,
+    compactionState,
+    displayMessages.length,
+    llmMessages.length
+  ]);
+  const isCompactingRef = useRef(false);
+  const [isCompacting, setIsCompacting] = useState(false);
+  useEffect(() => {
+    if (strategy !== "summary-buffer" || options.skipCompaction || isCompactingRef.current || !tokenUsage.isApproaching)
+      return;
+    isCompactingRef.current = true;
+    setIsCompacting(true);
+    runCompaction(displayMessages, compactionState, {
+      recentBuffer: config.recentBuffer ?? 10,
+      tokenBudget: (config.maxContextTokens ?? 128e3) - (config.reserveForResponse ?? 4096),
+      compactionThreshold: config.compactionThreshold ?? 0.75,
+      compactionUrl: config.compactionUrl,
+      summarizer: options.summarizer
+    }).then((result) => {
+      if (result.newSummary) {
+        const event = {
+          type: "auto",
+          compactionCount: compactionState.compactionCount + 1,
+          messagesSummarized: result.messagesSummarized ?? 0,
+          tokensSaved: result.tokensSaved ?? 0,
+          timestamp: Date.now()
+        };
+        setCompactionState((prev) => ({
+          ...prev,
+          rollingSummary: result.newSummary,
+          lastCompactionAt: Date.now(),
+          compactionCount: prev.compactionCount + 1,
+          totalTokensSaved: prev.totalTokensSaved + (result.tokensSaved ?? 0)
+        }));
+        config.onCompaction?.(event);
+      }
+    }).finally(() => {
+      isCompactingRef.current = false;
+      setIsCompacting(false);
+    });
+  }, [tokenUsage.isApproaching, strategy]);
+  const compactSession = useCallback(
+    async (instructions) => {
+      if (strategy !== "summary-buffer") return;
+      const result = await runCompaction(displayMessages, compactionState, {
+        recentBuffer: config.recentBuffer ?? 10,
+        tokenBudget: (config.maxContextTokens ?? 128e3) - (config.reserveForResponse ?? 4096),
+        compactionThreshold: config.compactionThreshold ?? 0.75,
+        compactionUrl: config.compactionUrl,
+        summarizer: options.summarizer ? (msgs) => options.summarizer(msgs) : instructions ? (msgs) => fetchWithInstructions(config.compactionUrl, msgs, instructions) : void 0
+      });
+      if (result.newSummary) {
+        const event = {
+          type: "manual",
+          compactionCount: compactionState.compactionCount + 1,
+          messagesSummarized: result.messagesSummarized ?? 0,
+          tokensSaved: result.tokensSaved ?? 0,
+          timestamp: Date.now()
+        };
+        setCompactionState((prev) => ({
+          ...prev,
+          rollingSummary: result.newSummary,
+          lastCompactionAt: Date.now(),
+          compactionCount: prev.compactionCount + 1,
+          totalTokensSaved: prev.totalTokensSaved + (result.tokensSaved ?? 0)
+        }));
+        config.onCompaction?.(event);
+      }
+    },
+    [displayMessages, compactionState, config, strategy, options.summarizer]
+  );
+  const addToWorkingMemory = useCallback((fact) => {
+    setCompactionState((prev) => ({
+      ...prev,
+      workingMemory: [...prev.workingMemory, fact]
+    }));
+  }, []);
+  const clearWorkingMemory = useCallback(() => {
+    setCompactionState((prev) => ({ ...prev, workingMemory: [] }));
+  }, []);
+  const resetSession = useCallback(async () => {
+    setCompactionState(DEFAULT_COMPACTION_STATE);
+    if (config.persistSession) {
+      await clearSession(storageKey);
+    }
+  }, [config.persistSession, storageKey]);
+  return {
+    displayMessages,
+    llmMessages,
+    tokenUsage,
+    isCompacting,
+    compactionState: {
+      ...compactionState,
+      displayMessageCount: displayMessages.length,
+      llmMessageCount: llmMessages.length
+    },
+    compactSession,
+    addToWorkingMemory,
+    clearWorkingMemory,
+    resetSession
+  };
+}
+async function fetchWithInstructions(url, messages, instructions) {
+  const res = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ messages, instructions })
+  });
+  const data = await res.json();
+  return data.summary;
+}
+var SkillContext = createContext(null);
+function useSkillContext() {
+  const ctx = useContext(SkillContext);
+  if (!ctx) {
+    throw new Error("useSkillContext must be used within <SkillProvider>");
+  }
+  return ctx;
+}
+function useAIContext(item) {
+  const { addContext, removeContext } = useCopilot();
+  const contextIdRef = useRef(null);
+  const serializedData = typeof item.data === "string" ? item.data : JSON.stringify(item.data);
+  useEffect(() => {
+    const formattedValue = typeof item.data === "string" ? item.data : JSON.stringify(item.data, null, 2);
+    const contextString = item.description ? `${item.description}:
+${formattedValue}` : `${item.key}:
+${formattedValue}`;
+    contextIdRef.current = addContext(contextString, item.parentId);
+    return () => {
+      if (contextIdRef.current) {
+        removeContext(contextIdRef.current);
+        contextIdRef.current = null;
+      }
+    };
+  }, [
+    item.key,
+    serializedData,
+    item.description,
+    item.parentId,
+    addContext,
+    removeContext
+  ]);
+  return contextIdRef.current ?? void 0;
+}
+function useAIContexts(items) {
+  const { addContext, removeContext } = useCopilot();
+  const contextIdsRef = useRef([]);
+  const serializedItems = JSON.stringify(
+    items.map((item) => ({
+      key: item.key,
+      data: item.data,
+      description: item.description,
+      parentId: item.parentId
+    }))
+  );
+  useEffect(() => {
+    contextIdsRef.current.forEach((id) => removeContext(id));
+    contextIdsRef.current = [];
+    const parsedItems = JSON.parse(serializedItems);
+    for (const item of parsedItems) {
+      const formattedValue = typeof item.data === "string" ? item.data : JSON.stringify(item.data, null, 2);
+      const contextString = item.description ? `${item.description}:
+${formattedValue}` : `${item.key}:
+${formattedValue}`;
+      const id = addContext(contextString, item.parentId);
+      contextIdsRef.current.push(id);
+    }
+    return () => {
+      contextIdsRef.current.forEach((id) => removeContext(id));
+      contextIdsRef.current = [];
+    };
+  }, [serializedItems, addContext, removeContext]);
+}
+function isZodSchema(value) {
+  if (value === null || typeof value !== "object") return false;
+  const obj = value;
+  return "_def" in obj && typeof obj._def === "object" || "_zod" in obj && typeof obj._zod === "object" || "~standard" in obj;
+}
+function useTool(config, dependencies = []) {
+  const { registerTool, unregisterTool } = useCopilot();
+  const configRef = useRef(config);
+  configRef.current = config;
+  const inputSchema = useMemo(() => {
+    if (isZodSchema(config.inputSchema)) {
+      return zodToJsonSchema(config.inputSchema);
+    }
+    return config.inputSchema;
+  }, [config.inputSchema]);
+  useEffect(() => {
+    const tool2 = {
+      name: config.name,
+      description: config.description,
+      location: "client",
+      inputSchema,
+      handler: async (params, context) => {
+        return configRef.current.handler(params, context);
+      },
+      render: config.render,
+      available: config.available ?? true,
+      needsApproval: config.needsApproval,
+      approvalMessage: config.approvalMessage,
+      hidden: config.hidden,
+      deferLoading: config.deferLoading,
+      profiles: config.profiles,
+      searchKeywords: config.searchKeywords,
+      group: config.group,
+      category: config.category,
+      resultConfig: config.resultConfig,
+      title: config.title,
+      executingTitle: config.executingTitle,
+      completedTitle: config.completedTitle,
+      aiResponseMode: config.aiResponseMode,
+      aiContext: config.aiContext
+    };
+    registerTool(tool2);
+    return () => {
+      unregisterTool(config.name);
+    };
+  }, [config.name, inputSchema, ...dependencies]);
+}
+function useTools(tools) {
+  const { registerTool, unregisterTool } = useCopilot();
+  const registeredToolsRef = useRef([]);
+  const toolsRef = useRef(tools);
+  toolsRef.current = tools;
+  const toolsKey = Object.keys(tools).sort().join(",");
+  useEffect(() => {
+    const currentTools = toolsRef.current;
+    const toolNames = [];
+    for (const [name, toolDef] of Object.entries(currentTools)) {
+      const fullTool = {
+        ...toolDef,
+        name
+        // Use the key as the name
+      };
+      registerTool(fullTool);
+      toolNames.push(name);
+    }
+    registeredToolsRef.current = toolNames;
+    return () => {
+      for (const name of registeredToolsRef.current) {
+        unregisterTool(name);
+      }
+      registeredToolsRef.current = [];
+    };
+  }, [toolsKey]);
+}
+function SkillContextInjector({
+  registry,
+  skills
+}) {
+  const catalog = useMemo(() => registry.buildCatalog(), [skills]);
+  const eagerContent = useMemo(() => registry.buildEagerContent(), [skills]);
+  useAIContext({
+    key: "__skill_catalog__",
+    description: "Skills the AI can load on demand",
+    data: catalog ? `You have access to specialized skills. Call load_skill({ name }) when relevant.
+
+${catalog}` : ""
+  });
+  useAIContext({
+    key: "__skill_eager__",
+    description: "Always-active skill instructions",
+    data: eagerContent
+  });
+  return null;
+}
+function SkillRequestSync({ skills }) {
+  const { setInlineSkills } = useCopilot();
+  useEffect(() => {
+    const inlineSkills = skills.filter((s) => s.source.type === "inline").map((s) => ({
+      name: s.name,
+      description: s.description,
+      content: s.content,
+      strategy: s.strategy
+    }));
+    setInlineSkills(inlineSkills);
+  }, [skills, setInlineSkills]);
+  return null;
+}
+function SkillToolRegistrar({
+  registry,
+  skills
+}) {
+  useTool(
+    {
+      name: "load_skill",
+      description: "Load a skill by name to get full instructions for a specialized task.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          name: {
+            type: "string",
+            description: "The name of the skill to load."
+          }
+        },
+        required: ["name"]
+      },
+      handler: async ({ name }) => {
+        const skill = registry.get(name);
+        if (!skill) {
+          const available = registry.getAuto().map((s) => s.name).join(", ") || "none";
+          return {
+            success: false,
+            error: `Skill "${name}" not found. Available skills: ${available}`
+          };
+        }
+        const sourceTypeMap = {
+          inline: "client-inline",
+          url: "remote-url",
+          file: "server-dir"
+        };
+        return {
+          success: true,
+          name: skill.name,
+          description: skill.description,
+          strategy: skill.strategy ?? "auto",
+          content: skill.content,
+          source: sourceTypeMap[skill.source.type]
+        };
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [skills]
+  );
+  return null;
+}
+function SkillProvider({
+  children,
+  skills: skillsProp
+}) {
+  const registryRef = useRef(null);
+  if (registryRef.current === null) {
+    registryRef.current = new SkillRegistry();
+  }
+  const registry = registryRef.current;
+  const [skills, setSkills] = useState([]);
+  useEffect(() => {
+    if (!skillsProp?.length) return;
+    for (const def of skillsProp) {
+      if (def.source.type !== "inline") {
+        console.warn(
+          `[copilot-sdk/skills] Client-side SkillProvider only supports inline skills. Skill "${def.name}" has source type "${def.source.type}" and will be skipped. Use loadSkills() on the server for file/url skills.`
+        );
+        continue;
+      }
+      const resolved = {
+        ...def,
+        content: def.source.content
+      };
+      registry.register(resolved);
+    }
+    setSkills(registry.getAll());
+    return () => {
+      for (const def of skillsProp ?? []) {
+        registry.unregister(def.name);
       }
-      registeredToolsRef.current = [];
+      setSkills(registry.getAll());
     };
-  }, [
-    autoRegister,
-    mcpClient.isConnected,
-    toolDefinitions,
-    registerTool,
-    unregisterTool
-  ]);
-  return {
-    ...mcpClient,
-    toolDefinitions
-  };
+  }, [skillsProp]);
+  const register = useCallback((skill) => {
+    registry.register(skill);
+    setSkills(registry.getAll());
+  }, []);
+  const unregister = useCallback((name) => {
+    registry.unregister(name);
+    setSkills(registry.getAll());
+  }, []);
+  const contextValue = useMemo(
+    () => ({ registry, register, unregister, skills }),
+    [register, unregister, skills]
+  );
+  return /* @__PURE__ */ jsxs(SkillContext.Provider, { value: contextValue, children: [
+    /* @__PURE__ */ jsx(SkillContextInjector, { registry, skills }),
+    /* @__PURE__ */ jsx(SkillToolRegistrar, { registry, skills }),
+    /* @__PURE__ */ jsx(SkillRequestSync, { skills }),
+    children
+  ] });
 }
 function MCPConnection({ config }) {
   useMCPTools({
@@ -2537,6 +5036,123 @@ function MCPConnection({ config }) {
   });
   return null;
 }
+var COMPACTING_MARKER_ID = "__compacting-in-progress__";
+function MessageHistoryBridge({
+  chatRef
+}) {
+  const { compactionState, tokenUsage } = useMessageHistory();
+  const ctx = useMessageHistoryContext();
+  const loaderAddedRef = useRef(false);
+  const prevCompactionCountRef = useRef(compactionState.compactionCount);
+  useEffect(() => {
+    if (!tokenUsage.isApproaching) {
+      loaderAddedRef.current = false;
+      return;
+    }
+    if (loaderAddedRef.current) return;
+    const chat = chatRef.current;
+    if (!chat) return;
+    const alreadyAdded = chat.messages.some(
+      (m) => m.id === COMPACTING_MARKER_ID
+    );
+    if (alreadyAdded) return;
+    loaderAddedRef.current = true;
+    const loading = {
+      id: COMPACTING_MARKER_ID,
+      role: "system",
+      content: "Compacting conversation\u2026",
+      createdAt: /* @__PURE__ */ new Date(),
+      metadata: { type: "compaction-marker", compacting: true }
+    };
+    chat.setMessages([...chat.messages, loading]);
+  }, [tokenUsage.isApproaching]);
+  useEffect(() => {
+    if (compactionState.compactionCount <= prevCompactionCountRef.current)
+      return;
+    prevCompactionCountRef.current = compactionState.compactionCount;
+    loaderAddedRef.current = false;
+    const chat = chatRef.current;
+    if (!chat) return;
+    const hasLoader = chat.messages.some((m) => m.id === COMPACTING_MARKER_ID);
+    const base = hasLoader ? chat.messages.map(
+      (m) => m.id === COMPACTING_MARKER_ID ? {
+        ...m,
+        id: `compaction-marker-${compactionState.compactionCount}`,
+        content: `Conversation compacted \u2014 context window refreshed`,
+        metadata: { type: "compaction-marker", compacting: false }
+      } : m
+    ) : [
+      ...chat.messages,
+      {
+        id: `compaction-marker-${compactionState.compactionCount}`,
+        role: "system",
+        content: `Conversation compacted \u2014 context window refreshed`,
+        createdAt: /* @__PURE__ */ new Date(),
+        metadata: { type: "compaction-marker", compacting: false }
+      }
+    ];
+    chat.setMessages(base);
+  }, [compactionState.compactionCount]);
+  const compactionStateRef = useRef(compactionState);
+  compactionStateRef.current = compactionState;
+  const configRef = useRef(ctx.config);
+  configRef.current = ctx.config;
+  useEffect(() => {
+    const chat = chatRef.current;
+    if (!chat) return;
+    chat.setRequestMessageTransform((allMessages) => {
+      if (allMessages.length === 0) return allMessages;
+      let lastUserIdx = -1;
+      for (let i = allMessages.length - 1; i >= 0; i--) {
+        if (allMessages[i].role === "user") {
+          lastUserIdx = i;
+          break;
+        }
+      }
+      if (lastUserIdx === -1) return allMessages;
+      const historyMessages = allMessages.slice(0, lastUserIdx);
+      const currentTurn = allMessages.slice(lastUserIdx);
+      if (historyMessages.length === 0) return allMessages;
+      const cfg = configRef.current;
+      const cs = compactionStateRef.current;
+      const recentBuffer = cfg.recentBuffer ?? 10;
+      const isCompactionMsg = (m) => m.metadata?.["type"] === "compaction-marker";
+      const windowedHistory = [];
+      if (cs.workingMemory.length > 0) {
+        windowedHistory.push({
+          id: "working-memory",
+          role: "system",
+          content: `[Working memory \u2014 always active]
+${cs.workingMemory.join("\n")}`,
+          createdAt: /* @__PURE__ */ new Date()
+        });
+      }
+      if (cs.rollingSummary) {
+        windowedHistory.push({
+          id: "rolling-summary",
+          role: "system",
+          content: `[Previous conversation summary]
+${cs.rollingSummary}`,
+          createdAt: /* @__PURE__ */ new Date()
+        });
+      }
+      const systemMsgs = historyMessages.filter(
+        (m) => m.role === "system" && !isCompactionMsg(m)
+      );
+      windowedHistory.push(...systemMsgs);
+      const conversationMsgs = historyMessages.filter(
+        (m) => m.role !== "system"
+      );
+      const recentStart = Math.max(0, conversationMsgs.length - recentBuffer);
+      windowedHistory.push(...conversationMsgs.slice(recentStart));
+      return [...windowedHistory, ...currentTurn];
+    });
+    return () => {
+      chatRef.current?.setRequestMessageTransform(null);
+    };
+  }, []);
+  return null;
+}
 var CopilotContext = createContext(null);
 function useCopilot() {
   const context = useContext(CopilotContext);
@@ -2560,11 +5176,14 @@ function CopilotProvider({
   debug = false,
   maxIterations,
   maxIterationsMessage,
-  mcpServers
+  mcpServers,
+  optimization,
+  messageHistory,
+  skills
 }) {
   const debugLog = useCallback(
-    (...args) => {
-      if (debug) console.log("[Copilot SDK]", ...args);
+    (action, data) => {
+      createLogger("provider", () => debug ?? false)(action, data);
     },
     [debug]
   );
@@ -2604,7 +5223,8 @@ function CopilotProvider({
         body,
         debug,
         maxIterations,
-        maxIterationsMessage
+        maxIterationsMessage,
+        optimization
       },
       {
         onToolExecutionsChange: (executions) => {
@@ -2614,6 +5234,9 @@ function CopilotProvider({
         onApprovalRequired: (execution) => {
           debugLog("Tool approval required:", execution.name);
         },
+        onContextUsageChange: (usage) => {
+          setContextUsage(usage);
+        },
         onError: (error2) => {
           if (error2) onError?.(error2);
         }
@@ -2644,19 +5267,27 @@ function CopilotProvider({
       debugLog("URL config updated from prop");
     }
   }, [runtimeUrl, debugLog]);
+  const EMPTY_MESSAGES = useRef([]);
+  const getMessagesSnapshot = useCallback(() => chatRef.current.messages, []);
+  const getServerMessagesSnapshot = useCallback(
+    () => EMPTY_MESSAGES.current,
+    []
+  );
+  const getStatusSnapshot = useCallback(() => chatRef.current.status, []);
+  const getErrorSnapshot = useCallback(() => chatRef.current.error, []);
   const messages = useSyncExternalStore(
     chatRef.current.subscribe,
-    () => chatRef.current.messages,
-    () => chatRef.current.messages
+    getMessagesSnapshot,
+    getServerMessagesSnapshot
   );
   const status = useSyncExternalStore(
     chatRef.current.subscribe,
-    () => chatRef.current.status,
+    getStatusSnapshot,
     () => "ready"
   );
   const errorFromChat = useSyncExternalStore(
     chatRef.current.subscribe,
-    () => chatRef.current.error,
+    getErrorSnapshot,
     () => void 0
   );
   const error = errorFromChat ?? null;
@@ -2679,9 +5310,15 @@ function CopilotProvider({
     },
     []
   );
-  const registeredTools = chatRef.current?.tools ?? [];
-  const pendingApprovals = toolExecutions.filter(
-    (e) => e.approvalStatus === "required"
+  const registeredTools = useMemo(
+    () => chatRef.current?.tools ?? [],
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [toolExecutions]
+    // re-derive when tool executions change (tools change alongside)
+  );
+  const pendingApprovals = useMemo(
+    () => toolExecutions.filter((e) => e.approvalStatus === "required"),
+    [toolExecutions]
   );
   const actionsRef = useRef(/* @__PURE__ */ new Map());
   const [actionsVersion, setActionsVersion] = useState(0);
@@ -2699,6 +5336,8 @@ function CopilotProvider({
   );
   const contextTreeRef = useRef([]);
   const contextIdCounter = useRef(0);
+  const [contextChars, setContextChars] = useState(0);
+  const [contextUsage, setContextUsage] = useState(null);
   const addContext = useCallback(
     (context, parentId) => {
       const id = `ctx-${++contextIdCounter.current}`;
@@ -2709,6 +5348,7 @@ function CopilotProvider({
       );
       const contextString = printTree(contextTreeRef.current);
       chatRef.current?.setContext(contextString);
+      setContextChars(contextString.length);
       debugLog("Context added:", id);
       return id;
     },
@@ -2719,6 +5359,7 @@ function CopilotProvider({
       contextTreeRef.current = removeNode(contextTreeRef.current, id);
       const contextString = printTree(contextTreeRef.current);
       chatRef.current?.setContext(contextString);
+      setContextChars(contextString.length);
       debugLog("Context removed:", id);
     },
     [debugLog]
@@ -2730,6 +5371,13 @@ function CopilotProvider({
     },
     [debugLog]
   );
+  const setInlineSkills = useCallback(
+    (skills2) => {
+      chatRef.current?.setInlineSkills(skills2);
+      debugLog("Inline skills updated", { count: skills2.length });
+    },
+    [debugLog]
+  );
   const sendMessage = useCallback(
     async (content, attachments) => {
       debugLog("Sending message:", content);
@@ -2749,15 +5397,46 @@ function CopilotProvider({
   const regenerate = useCallback(async (messageId) => {
     await chatRef.current?.regenerate(messageId);
   }, []);
+  const switchBranch = useCallback((messageId) => {
+    chatRef.current?.switchBranch(messageId);
+  }, []);
+  const getBranchInfo = useCallback(
+    (messageId) => chatRef.current?.getBranchInfo(messageId) ?? null,
+    []
+  );
+  const editMessage = useCallback(
+    async (messageId, newContent) => {
+      await chatRef.current?.sendMessage(newContent, void 0, {
+        editMessageId: messageId
+      });
+    },
+    []
+  );
+  const getHasBranchesSnapshot = useCallback(
+    () => chatRef.current.hasBranches,
+    []
+  );
+  const hasBranches = useSyncExternalStore(
+    chatRef.current.subscribe,
+    getHasBranchesSnapshot,
+    () => false
+  );
+  const getAllMessages = useCallback(
+    () => chatRef.current?.getAllMessages?.() ?? [],
+    []
+  );
   useEffect(() => {
     if (onMessagesChange && messages.length > 0) {
-      const coreMessages = messages.map((m) => ({
+      const allUIMessages = chatRef.current?.getAllMessages?.() ?? messages;
+      const coreMessages = allUIMessages.map((m) => ({
         id: m.id,
         role: m.role,
         content: m.content,
         created_at: m.createdAt,
         tool_calls: m.toolCalls,
         tool_call_id: m.toolCallId,
+        parent_id: m.parentId,
+        children_ids: m.childrenIds,
         metadata: {
           attachments: m.attachments,
           thinking: m.thinking
@@ -2789,6 +5468,12 @@ function CopilotProvider({
       clearMessages,
       setMessages,
       regenerate,
+      // Branching
+      switchBranch,
+      getBranchInfo,
+      editMessage,
+      hasBranches,
+      getAllMessages,
       // Tool execution
       registerTool,
       unregisterTool,
@@ -2804,8 +5489,12 @@ function CopilotProvider({
       // AI Context
       addContext,
       removeContext,
+      contextChars,
+      contextUsage,
       // System Prompt
       setSystemPrompt,
+      // Skills
+      setInlineSkills,
       // Config
       threadId,
       runtimeUrl,
@@ -2821,6 +5510,11 @@ function CopilotProvider({
       clearMessages,
       setMessages,
       regenerate,
+      switchBranch,
+      getBranchInfo,
+      editMessage,
+      hasBranches,
+      getAllMessages,
       registerTool,
       unregisterTool,
       registeredTools,
@@ -2833,16 +5527,41 @@ function CopilotProvider({
       registeredActions,
       addContext,
       removeContext,
+      contextChars,
+      contextUsage,
       setSystemPrompt,
+      setInlineSkills,
       threadId,
       runtimeUrl,
       toolsConfig
     ]
   );
-  return /* @__PURE__ */ jsxs(CopilotContext.Provider, { value: contextValue, children: [
+  const messageHistoryContextValue = React2.useMemo(
+    () => ({
+      config: { ...defaultMessageHistoryConfig, ...messageHistory },
+      tokenUsage: {
+        current: 0,
+        max: messageHistory?.maxContextTokens ?? 128e3,
+        percentage: 0,
+        isApproaching: false
+      },
+      compactionState: {
+        rollingSummary: null,
+        lastCompactionAt: null,
+        compactionCount: 0,
+        totalTokensSaved: 0,
+        workingMemory: [],
+        displayMessageCount: 0,
+        llmMessageCount: 0
+      }
+    }),
+    [messageHistory]
+  );
+  return /* @__PURE__ */ jsx(MessageHistoryContext.Provider, { value: messageHistoryContextValue, children: /* @__PURE__ */ jsxs(CopilotContext.Provider, { value: contextValue, children: [
     mcpServers?.map((config) => /* @__PURE__ */ jsx(MCPConnection, { config }, config.name)),
-    children
-  ] });
+    messageHistory?.strategy && messageHistory.strategy !== "none" && /* @__PURE__ */ jsx(MessageHistoryBridge, { chatRef }),
+    skills ? /* @__PURE__ */ jsx(SkillProvider, { skills, children }) : children
+  ] }) });
 }
 function useAIActions(actions) {
   const { registerAction, unregisterAction } = useCopilot();
@@ -2860,61 +5579,6 @@ function useAIActions(actions) {
 function useAIAction(action) {
   useAIActions([action]);
 }
-function useAIContext(item) {
-  const { addContext, removeContext } = useCopilot();
-  const contextIdRef = useRef(null);
-  const serializedData = typeof item.data === "string" ? item.data : JSON.stringify(item.data);
-  useEffect(() => {
-    const formattedValue = typeof item.data === "string" ? item.data : JSON.stringify(item.data, null, 2);
-    const contextString = item.description ? `${item.description}:
-${formattedValue}` : `${item.key}:
-${formattedValue}`;
-    contextIdRef.current = addContext(contextString, item.parentId);
-    return () => {
-      if (contextIdRef.current) {
-        removeContext(contextIdRef.current);
-        contextIdRef.current = null;
-      }
-    };
-  }, [
-    item.key,
-    serializedData,
-    item.description,
-    item.parentId,
-    addContext,
-    removeContext
-  ]);
-  return contextIdRef.current ?? void 0;
-}
-function useAIContexts(items) {
-  const { addContext, removeContext } = useCopilot();
-  const contextIdsRef = useRef([]);
-  const serializedItems = JSON.stringify(
-    items.map((item) => ({
-      key: item.key,
-      data: item.data,
-      description: item.description,
-      parentId: item.parentId
-    }))
-  );
-  useEffect(() => {
-    contextIdsRef.current.forEach((id) => removeContext(id));
-    contextIdsRef.current = [];
-    const parsedItems = JSON.parse(serializedItems);
-    for (const item of parsedItems) {
-      const formattedValue = typeof item.data === "string" ? item.data : JSON.stringify(item.data, null, 2);
-      const contextString = item.description ? `${item.description}:
-${formattedValue}` : `${item.key}:
-${formattedValue}`;
-      const id = addContext(contextString, item.parentId);
-      contextIdsRef.current.push(id);
-    }
-    return () => {
-      contextIdsRef.current.forEach((id) => removeContext(id));
-      contextIdsRef.current = [];
-    };
-  }, [serializedItems, addContext, removeContext]);
-}
 function useAITools(options = {}) {
   const {
     screenshot = false,
@@ -3159,69 +5823,6 @@ function useAITools(options = {}) {
     ]
   );
 }
-function isZodSchema(value) {
-  if (value === null || typeof value !== "object") return false;
-  const obj = value;
-  return "_def" in obj && typeof obj._def === "object" || "_zod" in obj && typeof obj._zod === "object" || "~standard" in obj;
-}
-function useTool(config, dependencies = []) {
-  const { registerTool, unregisterTool } = useCopilot();
-  const configRef = useRef(config);
-  configRef.current = config;
-  const inputSchema = useMemo(() => {
-    if (isZodSchema(config.inputSchema)) {
-      return zodToJsonSchema(config.inputSchema);
-    }
-    return config.inputSchema;
-  }, [config.inputSchema]);
-  useEffect(() => {
-    const tool2 = {
-      name: config.name,
-      description: config.description,
-      location: "client",
-      inputSchema,
-      handler: async (params, context) => {
-        return configRef.current.handler(params, context);
-      },
-      render: config.render,
-      available: config.available ?? true,
-      needsApproval: config.needsApproval,
-      approvalMessage: config.approvalMessage,
-      hidden: config.hidden
-    };
-    registerTool(tool2);
-    return () => {
-      unregisterTool(config.name);
-    };
-  }, [config.name, inputSchema, ...dependencies]);
-}
-function useTools(tools) {
-  const { registerTool, unregisterTool } = useCopilot();
-  const registeredToolsRef = useRef([]);
-  const toolsRef = useRef(tools);
-  toolsRef.current = tools;
-  const toolsKey = Object.keys(tools).sort().join(",");
-  useEffect(() => {
-    const currentTools = toolsRef.current;
-    const toolNames = [];
-    for (const [name, toolDef] of Object.entries(currentTools)) {
-      const fullTool = {
-        ...toolDef,
-        name
-        // Use the key as the name
-      };
-      registerTool(fullTool);
-      toolNames.push(name);
-    }
-    registeredToolsRef.current = toolNames;
-    return () => {
-      for (const name of registeredToolsRef.current) {
-        unregisterTool(name);
-      }
-      registeredToolsRef.current = [];
-    };
-  }, [toolsKey]);
-}
 function convertZodSchema(schema, _toolName) {
   try {
     const zodWithJsonSchema = z;
@@ -4409,6 +7010,94 @@ function createToolIntentHandler(callTool) {
     }
   };
 }
+function getLastResponseUsage(messages) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (msg.role === "assistant" && msg.metadata?.usage) {
+      const u = msg.metadata.usage;
+      const prompt = u.prompt_tokens ?? 0;
+      const completion = u.completion_tokens ?? 0;
+      return {
+        prompt_tokens: prompt,
+        completion_tokens: completion,
+        total_tokens: u.total_tokens ?? prompt + completion
+      };
+    }
+  }
+  return null;
+}
+function useContextStats() {
+  const { contextChars, contextUsage, registeredTools, messages } = useCopilot();
+  const toolCount = useMemo(() => registeredTools.length, [registeredTools]);
+  const messageCount = useMemo(
+    () => messages.filter((m) => m.role !== "system").length,
+    [messages]
+  );
+  const totalTokens = useMemo(() => {
+    if (contextUsage) return contextUsage.total.tokens;
+    return Math.ceil(contextChars / 3.5);
+  }, [contextUsage, contextChars]);
+  const usagePercent = useMemo(() => {
+    if (contextUsage) return contextUsage.total.percent;
+    return 0;
+  }, [contextUsage]);
+  const lastResponseUsage = useMemo(
+    () => getLastResponseUsage(messages),
+    [messages]
+  );
+  return {
+    contextUsage,
+    totalTokens,
+    usagePercent,
+    contextChars,
+    toolCount,
+    messageCount,
+    lastResponseUsage
+  };
+}
+var DEV_CONTENT_WARN_THRESHOLD = 2e3;
+function useSkill(skill) {
+  const { register, unregister } = useSkillContext();
+  if (process.env.NODE_ENV !== "production" && skill.source.type === "inline" && skill.source.content.length > DEV_CONTENT_WARN_THRESHOLD) {
+    console.warn(
+      `[copilot-sdk/skills] Inline skill "${skill.name}" has ${skill.source.content.length} characters. Inline skills are sent on every request \u2014 keep them under ${DEV_CONTENT_WARN_THRESHOLD} characters. Consider using a file or URL skill instead.`
+    );
+  }
+  useEffect(() => {
+    if (skill.source.type !== "inline") {
+      console.warn(
+        `[copilot-sdk/skills] useSkill only supports inline skills client-side. Skill "${skill.name}" has source type "${skill.source.type}" and will be skipped.`
+      );
+      return;
+    }
+    const resolved = {
+      ...skill,
+      content: skill.source.content
+    };
+    register(resolved);
+    return () => {
+      unregister(skill.name);
+    };
+  }, [
+    skill.name,
+    skill.source.type === "inline" ? skill.source.content : "",
+    skill.strategy,
+    skill.description
+  ]);
+}
+function useSkillStatus() {
+  const { skills, registry } = useSkillContext();
+  const has = useCallback(
+    (name) => registry.has(name),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [skills]
+  );
+  return {
+    skills,
+    count: skills.length,
+    has
+  };
+}
 
 // src/react/utils/permission-storage.ts
 var DEFAULT_KEY_PREFIX = "yourgpt-permissions";
@@ -4561,6 +7250,34 @@ var ReactChat = class extends AbstractChat {
     return this.on("error", handler);
   }
   // ============================================
+  // Branching API — pass-throughs to ReactChatState
+  // ============================================
+  /**
+   * Navigate to a sibling branch (makes it the active path).
+   */
+  switchBranch(messageId) {
+    this.reactState.switchBranch(messageId);
+  }
+  /**
+   * Get branch navigation info for a message.
+   * Returns null if the message has no siblings.
+   */
+  getBranchInfo(messageId) {
+    return this.reactState.getBranchInfo(messageId);
+  }
+  /**
+   * Get all messages across all branches (for persistence).
+   */
+  getAllMessages() {
+    return this.reactState.getAllMessages();
+  }
+  /**
+   * Whether any message has siblings (branching has occurred).
+   */
+  get hasBranches() {
+    return this.reactState.hasBranches;
+  }
+  // ============================================
   // Override dispose to clean up state
   // ============================================
   dispose() {
@@ -4620,6 +7337,11 @@ function useChat(config) {
     () => void 0
     // Server snapshot
   );
+  const hasBranches = useSyncExternalStore(
+    chatRef.current.subscribe,
+    () => chatRef.current.hasBranches,
+    () => false
+  );
   const isLoading = status === "streaming" || status === "submitted";
   const sendMessage = useCallback(
     async (content, attachments) => {
@@ -4646,6 +7368,24 @@ function useChat(config) {
     },
     []
   );
+  const switchBranch = useCallback((messageId) => {
+    chatRef.current?.switchBranch(messageId);
+  }, []);
+  const getBranchInfo = useCallback(
+    (messageId) => {
+      return chatRef.current?.getBranchInfo(messageId) ?? null;
+    },
+    []
+  );
+  const editMessage = useCallback(
+    async (messageId, newContent) => {
+      await chatRef.current?.sendMessage(newContent, void 0, {
+        editMessageId: messageId
+      });
+      setInput("");
+    },
+    []
+  );
   useEffect(() => {
     return () => {
       chatRef.current?.dispose();
@@ -4664,10 +7404,20 @@ function useChat(config) {
     setMessages,
     regenerate,
     continueWithToolResults,
-    chatRef
+    chatRef,
+    // Branching
+    switchBranch,
+    getBranchInfo,
+    editMessage,
+    hasBranches
   };
 }
 
-export { AbstractAgentLoop, AbstractChat, CopilotProvider, ReactChat, ReactChatState, ReactThreadManager, ReactThreadManagerState, createMessageIntentHandler, createPermissionStorage, createReactChat, createReactChatState, createReactThreadManager, createReactThreadManagerState, createSessionPermissionCache, createToolIntentHandler, formatKnowledgeResultsForAI, initialAgentLoopState, searchKnowledgeBase, useAIAction, useAIActions, useAIContext, useAIContexts, useAITools, useAgent, useCapabilities, useChat, useCopilot, useDevLogger, useFeatureSupport, useKnowledgeBase, useMCPClient, useMCPTools, useMCPUIIntents, useSuggestions, useSupportedMediaTypes, useThreadManager, useTool, useToolExecutor, useToolWithSchema, useTools, useToolsWithSchema };
-//# sourceMappingURL=chunk-7PKGRYHY.js.map
-//# sourceMappingURL=chunk-7PKGRYHY.js.map
+// src/react/skill/define-skill.ts
+function defineSkill(def) {
+  return def;
+}
+
+export { AbstractAgentLoop, AbstractChat, CopilotProvider, MessageHistoryContext, MessageTree, ReactChat, ReactChatState, ReactThreadManager, ReactThreadManagerState, SkillProvider, createMessageIntentHandler, createPermissionStorage, createReactChat, createReactChatState, createReactThreadManager, createReactThreadManagerState, createSessionPermissionCache, createToolIntentHandler, defaultMessageHistoryConfig, defineSkill, formatKnowledgeResultsForAI, initialAgentLoopState, isCompactionMarker, keepToolPairsAtomic, searchKnowledgeBase, toDisplayMessage, toLLMMessage, toLLMMessages, useAIAction, useAIActions, useAIContext, useAIContexts, useAITools, useAgent, useCapabilities, useChat, useContextStats, useCopilot, useDevLogger, useFeatureSupport, useKnowledgeBase, useMCPClient, useMCPTools, useMCPUIIntents, useMessageHistory, useMessageHistoryContext, useSkill, useSkillStatus, useSuggestions, useSupportedMediaTypes, useThreadManager, useTool, useToolExecutor, useToolWithSchema, useTools, useToolsWithSchema };
+//# sourceMappingURL=chunk-5Q72LZ5H.js.map
+//# sourceMappingURL=chunk-5Q72LZ5H.js.map