@charzhu/openjaw-agent 0.2.6 → 0.2.8

package/dist/main.js

@@ -204,7 +204,7 @@ var init_config = __esm({
   "src/config.ts"() {
     "use strict";
     init_packageRoot();
-    DEFAULT_COPILOT_OAUTH_CLIENT_ID = "Ov23li8tweQw6odWQebz";
+    DEFAULT_COPILOT_OAUTH_CLIENT_ID = "Iv1.b507a08c87ecfe98";
     DEFAULT_CONFIG = {
       llm: {
         provider: "anthropic",
@@ -1884,6 +1884,85 @@ var init_openai = __esm({
   }
 });
 
+// src/copilot-token.ts
+function normalizeCopilotEnterpriseDomain(value) {
+  return value.replace(/^https?:\/\//, "").replace(/\/+$/, "");
+}
+function copilotApiBase(enterpriseUrl) {
+  return enterpriseUrl ? `https://copilot-api.${normalizeCopilotEnterpriseDomain(enterpriseUrl)}` : "https://api.githubcopilot.com";
+}
+function copilotTokenEndpoint(enterpriseUrl) {
+  if (!enterpriseUrl) return "https://api.github.com/copilot_internal/v2/token";
+  const domain = normalizeCopilotEnterpriseDomain(enterpriseUrl);
+  const apiDomain = domain.startsWith("api.") ? domain : `api.${domain}`;
+  return `https://${apiDomain}/copilot_internal/v2/token`;
+}
+function decodeQueryComponent(value) {
+  return decodeURIComponent(value.replace(/\+/g, "%20"));
+}
+function copilotApiBaseFromToken(token) {
+  for (const part of token.split(";")) {
+    const rawProxyEndpoint = part.startsWith("proxy-ep=") ? part.slice("proxy-ep=".length) : void 0;
+    if (!rawProxyEndpoint) continue;
+    const proxyEndpoint = decodeQueryComponent(rawProxyEndpoint).trim().replace(/\/+$/, "");
+    if (!proxyEndpoint) return void 0;
+    if (proxyEndpoint.startsWith("http://") || proxyEndpoint.startsWith("https://")) return proxyEndpoint;
+    const host = proxyEndpoint.startsWith("proxy.") ? `api.${proxyEndpoint.slice("proxy.".length)}` : proxyEndpoint.startsWith("api.") ? proxyEndpoint : `api.${proxyEndpoint}`;
+    return `https://${host}`;
+  }
+  return void 0;
+}
+async function exchangeGitHubTokenForCopilotToken(githubAccess, enterpriseUrl, signal) {
+  const res = await fetch(copilotTokenEndpoint(enterpriseUrl), {
+    headers: {
+      "Accept": "application/json",
+      "Authorization": `Bearer ${githubAccess}`,
+      "User-Agent": COPILOT_USER_AGENT,
+      "Editor-Version": COPILOT_EDITOR_VERSION,
+      "Editor-Plugin-Version": COPILOT_EDITOR_PLUGIN_VERSION,
+      "Copilot-Integration-Id": COPILOT_INTEGRATION_ID
+    },
+    signal
+  });
+  const text = await res.text();
+  if (!res.ok) {
+    let message = text;
+    try {
+      const parsed = JSON.parse(text);
+      message = parsed.error_description || parsed.message || text;
+    } catch {
+    }
+    throw new Error(`GitHub Copilot token request failed: ${res.status}${message ? ` ${message.slice(0, 160)}` : ""}`);
+  }
+  const body = JSON.parse(text);
+  if (!body.token || typeof body.expires_at !== "number") {
+    throw new Error("GitHub Copilot token response was missing token or expires_at.");
+  }
+  return {
+    githubAccess,
+    copilotAccess: body.token,
+    copilotExpires: body.expires_at * 1e3,
+    copilotApiBaseUrl: copilotApiBaseFromToken(body.token) ?? copilotApiBase(enterpriseUrl),
+    enterpriseUrl
+  };
+}
+var COPILOT_USER_AGENT, COPILOT_EDITOR_VERSION, COPILOT_EDITOR_PLUGIN_VERSION, COPILOT_INTEGRATION_ID;
+var init_copilot_token = __esm({
+  "src/copilot-token.ts"() {
+    "use strict";
+    COPILOT_USER_AGENT = "GitHubCopilotChat/0.35.0";
+    COPILOT_EDITOR_VERSION = "vscode/1.107.0";
+    COPILOT_EDITOR_PLUGIN_VERSION = "copilot-chat/0.35.0";
+    COPILOT_INTEGRATION_ID = "vscode-chat";
+    __name(normalizeCopilotEnterpriseDomain, "normalizeCopilotEnterpriseDomain");
+    __name(copilotApiBase, "copilotApiBase");
+    __name(copilotTokenEndpoint, "copilotTokenEndpoint");
+    __name(decodeQueryComponent, "decodeQueryComponent");
+    __name(copilotApiBaseFromToken, "copilotApiBaseFromToken");
+    __name(exchangeGitHubTokenForCopilotToken, "exchangeGitHubTokenForCopilotToken");
+  }
+});
+
 // src/provider-auth.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join5 } from "node:path";
@@ -2024,12 +2103,6 @@ var init_types = __esm({
 });
 
 // src/providers/copilot.ts
-function normalizeCopilotEnterpriseDomain(value) {
-  return value.replace(/^https?:\/\//, "").replace(/\/+$/, "");
-}
-function copilotApiBase(enterpriseUrl) {
-  return enterpriseUrl ? `https://copilot-api.${normalizeCopilotEnterpriseDomain(enterpriseUrl)}` : "https://api.githubcopilot.com";
-}
 function shouldUseResponsesApi(modelID) {
   const normalized = modelID.toLowerCase();
   const match = /^gpt-(\d+)/.exec(normalized);
@@ -2079,6 +2152,12 @@ function toResponsesTool(tool) {
     parameters: normalizeObjectSchema2(tool.parameters)
   };
 }
+function endpointSupported(endpoints, target) {
+  return endpoints?.some((endpoint) => endpoint.trim().toLowerCase() === target) ?? false;
+}
+function copilotSupportsResponsesWebSocket(modelInfo) {
+  return endpointSupported(modelInfo?.supportedEndpoints, "ws:/responses");
+}
 function toAnthropicTool(tool) {
   assertToolName(tool.name);
   return {
@@ -2113,6 +2192,16 @@ function safeJsonParse(value) {
     return {};
   }
 }
+async function loadWebSocket() {
+  const { createRequire } = await import("node:module");
+  return createRequire(import.meta.url)("ws");
+}
+function responsesWebSocketUrl(baseUrl) {
+  const url = new URL(`${baseUrl.replace(/\/+$/, "")}/responses`);
+  if (url.protocol === "https:") url.protocol = "wss:";
+  else if (url.protocol === "http:") url.protocol = "ws:";
+  return url.toString();
+}
 function valueAtPath(value, path3) {
   let current = value;
   for (const key of path3) {
@@ -2121,6 +2210,24 @@ function valueAtPath(value, path3) {
   }
   return current;
 }
+function firstStringAtAny(value, paths2) {
+  for (const path3 of paths2) {
+    const candidate = valueAtPath(value, path3);
+    if (typeof candidate === "string" && candidate.trim()) return candidate;
+  }
+  return void 0;
+}
+function valueContainsAny(value, needles) {
+  if (typeof value === "string") {
+    const normalized = value.toLowerCase();
+    return needles.some((needle) => normalized.includes(needle));
+  }
+  if (Array.isArray(value)) return value.some((item) => valueContainsAny(item, needles));
+  if (value && typeof value === "object") {
+    return Object.values(value).some((item) => valueContainsAny(item, needles));
+  }
+  return false;
+}
 function firstPositiveIntegerAtAny(value, paths2) {
   for (const path3 of paths2) {
     const candidate = valueAtPath(value, path3);
@@ -2151,25 +2258,68 @@ function readCopilotOutputTokens(capabilities) {
 function readCopilotReasoningEfforts(capabilities) {
   return normalizeReasoningEfforts(valueAtPath(capabilities, ["supports", "reasoning_effort"]));
 }
+function copilotModelItems(body) {
+  if (Array.isArray(body.data) && body.data.length > 0) return body.data;
+  if (Array.isArray(body.models)) return body.models;
+  return [];
+}
+function isDisabledPolicyValue(value) {
+  return ["disabled", "blocked", "denied", "unavailable", "off"].includes(value.toLowerCase());
+}
+function policyAllows(policy) {
+  if (policy === void 0 || policy === null) return true;
+  if (typeof policy === "boolean") return policy;
+  if (typeof policy === "string") return !isDisabledPolicyValue(policy);
+  if (!policy || typeof policy !== "object" || Array.isArray(policy)) return true;
+  const record = policy;
+  if (record.enabled === false) return false;
+  return !["state", "status", "result"].some((key) => {
+    const value = record[key];
+    return typeof value === "string" && isDisabledPolicyValue(value);
+  });
+}
+function isChatCapable(model) {
+  if (model.id?.toLowerCase().includes("embedding")) return false;
+  if (!model.capabilities) return true;
+  if (valueContainsAny(model.capabilities, ["embedding", "embeddings"])) return false;
+  const kind = firstStringAtAny(model.capabilities, [["type"], ["kind"], ["family"]]);
+  return !kind || !["embedding", "embeddings", "completion", "completions"].includes(kind.toLowerCase());
+}
 function buildReasoning(effort, modelInfo) {
   const supported = modelInfo?.supportedReasoningEfforts?.map((option) => option.effort) ?? [];
   const selected = effort && supported.includes(effort) ? effort : void 0;
   const effective = selected ?? modelInfo?.defaultReasoningEffort;
   return effective ? { effort: effective } : void 0;
 }
+function collectResponsesOutputItem(item, accumulator) {
+  if (item.type === "message" && !accumulator.sawTextDelta) {
+    for (const block of item.content ?? []) {
+      if ((block.type === "output_text" || block.type === "text") && block.text) {
+        accumulator.text = (accumulator.text ?? "") + block.text;
+      }
+    }
+  } else if (item.type === "function_call" && item.name) {
+    accumulator.toolCalls.push({
+      id: item.call_id || item.id || `call_${accumulator.toolCalls.length}`,
+      name: item.name,
+      input: safeJsonParse(item.arguments)
+    });
+  }
+}
 function parseCopilotModels(body) {
-  const items = Array.isArray(body.data) ? body.data : [];
+  const items = copilotModelItems(body);
   const models = [];
   for (const item of items) {
-    if (!item.id || item.model_picker_enabled === false || item.policy?.state === "disabled") continue;
-    const visionMedia = item.capabilities?.limits?.vision?.supported_media_types ?? [];
+    if (!item.id || item.model_picker_enabled === false || !policyAllows(item.policy) || !isChatCapable(item)) continue;
+    const visionMedia = valueAtPath(item.capabilities, ["limits", "vision", "supported_media_types"]);
     const supportedReasoning = readCopilotReasoningEfforts(item.capabilities);
     models.push({
       id: item.id,
       name: item.name,
       supportedEndpoints: item.supported_endpoints ?? [],
-      supportsVision: item.capabilities?.supports?.vision === true || visionMedia.some((media) => media.startsWith("image/")),
-      supportsToolCalls: item.capabilities?.supports?.tool_calls !== false,
+      supportsResponsesWebSocket: copilotSupportsResponsesWebSocket({ supportedEndpoints: item.supported_endpoints ?? [] }),
+      supportsVision: valueAtPath(item.capabilities, ["supports", "vision"]) === true || Array.isArray(visionMedia) && visionMedia.some((media) => typeof media === "string" && media.startsWith("image/")),
+      supportsToolCalls: valueAtPath(item.capabilities, ["supports", "tool_calls"]) !== false,
       contextWindow: readCopilotContextWindow(item.capabilities),
       outputTokens: readCopilotOutputTokens(item.capabilities),
       supportedReasoningEfforts: supportedReasoning.map((effort) => ({ effort, description: effort })),
@@ -2178,32 +2328,46 @@ function parseCopilotModels(body) {
   }
   return models;
 }
-var COPILOT_PROVIDER, USER_AGENT, OPENAI_TOOL_NAME2, CopilotProvider;
+var COPILOT_PROVIDER, USER_AGENT, OPENAI_TOOL_NAME2, COPILOT_TOKEN_EXPIRY_SAFETY_MARGIN_MS, RESPONSES_WEBSOCKET_CONNECT_TIMEOUT_MS, RESPONSES_WEBSOCKET_IDLE_TIMEOUT_MS, CopilotProvider;
 var init_copilot = __esm({
   "src/providers/copilot.ts"() {
     "use strict";
+    init_copilot_token();
     init_provider_auth();
     init_types();
+    init_copilot_token();
     COPILOT_PROVIDER = "github-copilot";
     USER_AGENT = "openjaw-agent/0.1.0";
     OPENAI_TOOL_NAME2 = /^[A-Za-z0-9_-]{1,64}$/;
-    __name(normalizeCopilotEnterpriseDomain, "normalizeCopilotEnterpriseDomain");
-    __name(copilotApiBase, "copilotApiBase");
+    COPILOT_TOKEN_EXPIRY_SAFETY_MARGIN_MS = 6e4;
+    RESPONSES_WEBSOCKET_CONNECT_TIMEOUT_MS = 1e4;
+    RESPONSES_WEBSOCKET_IDLE_TIMEOUT_MS = 12e4;
     __name(shouldUseResponsesApi, "shouldUseResponsesApi");
     __name(normalizeObjectSchema2, "normalizeObjectSchema");
     __name(assertToolName, "assertToolName");
     __name(toChatTool, "toChatTool");
     __name(toResponsesTool, "toResponsesTool");
+    __name(endpointSupported, "endpointSupported");
+    __name(copilotSupportsResponsesWebSocket, "copilotSupportsResponsesWebSocket");
     __name(toAnthropicTool, "toAnthropicTool");
     __name(hasImageContent, "hasImageContent");
     __name(openAIUserContent, "openAIUserContent");
     __name(safeJsonParse, "safeJsonParse");
+    __name(loadWebSocket, "loadWebSocket");
+    __name(responsesWebSocketUrl, "responsesWebSocketUrl");
     __name(valueAtPath, "valueAtPath");
+    __name(firstStringAtAny, "firstStringAtAny");
+    __name(valueContainsAny, "valueContainsAny");
     __name(firstPositiveIntegerAtAny, "firstPositiveIntegerAtAny");
     __name(readCopilotContextWindow, "readCopilotContextWindow");
     __name(readCopilotOutputTokens, "readCopilotOutputTokens");
     __name(readCopilotReasoningEfforts, "readCopilotReasoningEfforts");
+    __name(copilotModelItems, "copilotModelItems");
+    __name(isDisabledPolicyValue, "isDisabledPolicyValue");
+    __name(policyAllows, "policyAllows");
+    __name(isChatCapable, "isChatCapable");
     __name(buildReasoning, "buildReasoning");
+    __name(collectResponsesOutputItem, "collectResponsesOutputItem");
     __name(parseCopilotModels, "parseCopilotModels");
     CopilotProvider = class {
       static {
@@ -2212,6 +2376,7 @@ var init_copilot = __esm({
       name = COPILOT_PROVIDER;
       config;
       modelCache = null;
+      responsesWebSocketDisabled = false;
       constructor(config) {
         this.config = config;
       }
@@ -2228,39 +2393,74 @@ var init_copilot = __esm({
       }
       async chat(options) {
         const modelInfo = await this.resolveModelInfo(this.config.model);
-        if (modelInfo?.supportedEndpoints.includes("/v1/messages") || this.config.model.toLowerCase().startsWith("claude-")) {
-          return this.chatAnthropicMessages(options);
-        }
         if (this.shouldRouteToResponses(modelInfo)) {
           return this.chatResponses(options, modelInfo);
         }
+        if (this.shouldRouteToAnthropicMessages(modelInfo)) {
+          return this.chatAnthropicMessages(options);
+        }
         return this.chatCompletions(options);
       }
       shouldRouteToResponses(modelInfo) {
         if (this.config.use_responses_api === false) return false;
         if (modelInfo?.supportedEndpoints.length) {
-          return modelInfo.supportedEndpoints.includes("/responses");
+          return endpointSupported(modelInfo.supportedEndpoints, "/responses");
         }
         return shouldUseResponsesApi(this.config.model);
       }
+      shouldRouteToAnthropicMessages(modelInfo) {
+        if (modelInfo?.supportedEndpoints.length) return false;
+        return this.config.model.toLowerCase().startsWith("claude-");
+      }
+      copilotBaseUrl(credential) {
+        if (this.config.base_url) return this.config.base_url.replace(/\/+$/, "");
+        if (credential?.type === "oauth" && credential.copilotApiBaseUrl) return credential.copilotApiBaseUrl.replace(/\/+$/, "");
+        const enterpriseUrl = this.config.copilot_enterprise_url || (credential?.type === "oauth" ? credential.enterpriseUrl : void 0);
+        return copilotApiBase(enterpriseUrl);
+      }
+      async resolveCopilotAuth(signal) {
+        if (this.config.api_key && this.config.api_key !== "proxy-token") {
+          return { token: this.config.api_key, baseUrl: this.copilotBaseUrl() };
+        }
+        const credential = getProviderCredential(COPILOT_PROVIDER);
+        if (credential?.type !== "oauth") {
+          throw new Error("GitHub Copilot is not connected. Run /connect github-copilot first.");
+        }
+        if (credential.copilotAccess && credential.copilotExpires && credential.copilotExpires > Date.now() + COPILOT_TOKEN_EXPIRY_SAFETY_MARGIN_MS) {
+          return { token: credential.copilotAccess, baseUrl: this.copilotBaseUrl(credential) };
+        }
+        const githubAccess = credential.githubAccess || credential.refresh || credential.access;
+        const enterpriseUrl = this.config.copilot_enterprise_url || credential.enterpriseUrl;
+        const exchanged = await exchangeGitHubTokenForCopilotToken(githubAccess, enterpriseUrl, signal);
+        saveProviderCredential({
+          ...credential,
+          access: exchanged.copilotAccess,
+          refresh: exchanged.githubAccess,
+          expires: exchanged.copilotExpires,
+          githubAccess: exchanged.githubAccess,
+          copilotAccess: exchanged.copilotAccess,
+          copilotExpires: exchanged.copilotExpires,
+          copilotApiBaseUrl: exchanged.copilotApiBaseUrl,
+          enterpriseUrl
+        });
+        return { token: exchanged.copilotAccess, baseUrl: this.config.base_url?.replace(/\/+$/, "") ?? exchanged.copilotApiBaseUrl };
+      }
       resolveGitHubToken() {
         if (this.config.api_key && this.config.api_key !== "proxy-token") return this.config.api_key;
         const credential = getProviderCredential(COPILOT_PROVIDER);
-        if (credential?.type === "oauth") return credential.access || credential.refresh;
+        if (credential?.type === "oauth") return credential.githubAccess || credential.refresh || credential.access;
         throw new Error("GitHub Copilot is not connected. Run /connect github-copilot first.");
       }
-      resolveCopilotToken() {
-        return this.resolveGitHubToken();
+      async resolveCopilotToken(signal) {
+        return (await this.resolveCopilotAuth(signal)).token;
       }
-      baseUrl() {
-        if (this.config.base_url) return this.config.base_url.replace(/\/+$/, "");
-        const credential = getProviderCredential(COPILOT_PROVIDER);
-        const enterpriseUrl = this.config.copilot_enterprise_url || (credential?.type === "oauth" ? credential.enterpriseUrl : void 0);
-        return copilotApiBase(enterpriseUrl);
+      async baseUrl(signal) {
+        return (await this.resolveCopilotAuth(signal)).baseUrl;
       }
-      async headers(options, extra) {
+      async headers(options, extra, auth) {
+        const resolvedAuth = auth ?? await this.resolveCopilotAuth(options.signal);
         const headers = {
-          "Authorization": `Bearer ${await this.resolveCopilotToken()}`,
+          "Authorization": `Bearer ${resolvedAuth.token}`,
           "Content-Type": "application/json",
           "User-Agent": USER_AGENT,
           "Editor-Version": "OpenJaw/0.1.0",
@@ -2274,15 +2474,17 @@ var init_copilot = __esm({
         return headers;
       }
       async fetchModelInfo() {
-        const res = await fetch(`${this.baseUrl()}/models`, {
+        const signal = AbortSignal.timeout(1e4);
+        const auth = await this.resolveCopilotAuth(signal);
+        const res = await fetch(`${auth.baseUrl}/models`, {
           headers: {
-            "Authorization": `Bearer ${await this.resolveCopilotToken()}`,
+            "Authorization": `Bearer ${auth.token}`,
             "User-Agent": USER_AGENT,
             "Editor-Version": "OpenJaw/0.1.0",
             "Editor-Plugin-Version": "OpenJaw/0.1.0",
             "Copilot-Integration-Id": "vscode-chat"
           },
-          signal: AbortSignal.timeout(1e4)
+          signal
         });
         if (!res.ok) {
           const detail = await res.text().catch(() => "");
@@ -2304,6 +2506,7 @@ var init_copilot = __esm({
               id: modelID,
               name: modelID,
               supportedEndpoints: ["/v1/messages"],
+              supportsResponsesWebSocket: false,
               supportsVision: true,
               supportsToolCalls: true
             };
@@ -2311,6 +2514,102 @@ var init_copilot = __esm({
           return null;
         }
       }
+      shouldUseResponsesWebSocket(modelInfo) {
+        return !this.responsesWebSocketDisabled && copilotSupportsResponsesWebSocket(modelInfo);
+      }
+      disableResponsesWebSocket() {
+        this.responsesWebSocketDisabled = true;
+      }
+      buildResponsesRequestBody(options, modelInfo) {
+        const reasoning = buildReasoning(options.reasoningEffort, modelInfo);
+        return {
+          model: this.config.model,
+          input: this.buildResponsesInput(options),
+          instructions: Array.isArray(options.systemPrompt) ? options.systemPrompt.map((block) => block.text).join("\n\n") : options.systemPrompt,
+          tools: options.tools.length > 0 ? options.tools.map(toResponsesTool) : void 0,
+          ...reasoning && { reasoning, include: ["reasoning.encrypted_content"] }
+        };
+      }
+      buildResponsesWebSocketRequest(requestBody) {
+        return {
+          type: "response.create",
+          ...requestBody,
+          tools: requestBody.tools ?? [],
+          tool_choice: requestBody.tools?.length ? "auto" : "none",
+          parallel_tool_calls: true,
+          store: false,
+          stream: true,
+          include: requestBody.include ?? []
+        };
+      }
+      async chatResponsesWebSocket(options, requestBody) {
+        const auth = await this.resolveCopilotAuth(options.signal);
+        const headers = await this.headers(options, void 0, auth);
+        const WebSocket2 = await loadWebSocket();
+        const ws = new WebSocket2(responsesWebSocketUrl(auth.baseUrl), {
+          headers,
+          handshakeTimeout: RESPONSES_WEBSOCKET_CONNECT_TIMEOUT_MS
+        });
+        const request = JSON.stringify(this.buildResponsesWebSocketRequest(requestBody));
+        return new Promise((resolve5, reject) => {
+          const accumulator = { sawTextDelta: false, text: null, toolCalls: [] };
+          let settled = false;
+          const timeout = setTimeout(() => {
+            if (settled) return;
+            settled = true;
+            ws.close();
+            reject(new Error("Responses WebSocket idle timeout"));
+          }, RESPONSES_WEBSOCKET_IDLE_TIMEOUT_MS);
+          const finish = /* @__PURE__ */ __name((value) => {
+            if (settled) return;
+            settled = true;
+            clearTimeout(timeout);
+            ws.close();
+            resolve5(value);
+          }, "finish");
+          const fail = /* @__PURE__ */ __name((error) => {
+            if (settled) return;
+            settled = true;
+            clearTimeout(timeout);
+            ws.close();
+            reject(error instanceof Error ? error : new Error(String(error)));
+          }, "fail");
+          options.signal?.addEventListener("abort", () => fail(options.signal?.reason ?? new DOMException("Aborted", "AbortError")), { once: true });
+          ws.addEventListener("open", () => ws.send(request));
+          ws.addEventListener("error", (event) => fail(event.error ?? event.message ?? "Responses WebSocket error"));
+          ws.addEventListener("close", (event) => {
+            if (!settled) fail(new Error(`Responses WebSocket closed before completion (${event.code ?? "unknown"})`));
+          });
+          ws.addEventListener("message", (event) => {
+            try {
+              const text = typeof event.data === "string" ? event.data : Buffer.isBuffer(event.data) ? event.data.toString("utf8") : String(event.data);
+              const parsed = JSON.parse(text);
+              const type = String(parsed.type ?? "");
+              if (type === "response.output_text.delta" && typeof parsed.delta === "string") {
+                accumulator.sawTextDelta = true;
+                accumulator.text = (accumulator.text ?? "") + parsed.delta;
+              } else if (type === "response.output_item.done" && parsed.item && typeof parsed.item === "object") {
+                collectResponsesOutputItem(parsed.item, accumulator);
+              } else if (type === "response.failed") {
+                fail(new Error(JSON.stringify(parsed.response ?? parsed)));
+              } else if (type === "response.incomplete") {
+                fail(new Error("Responses WebSocket returned incomplete response"));
+              } else if (type === "response.completed") {
+                const response = parsed.response && typeof parsed.response === "object" ? parsed.response : {};
+                const usage2 = response.usage && typeof response.usage === "object" ? response.usage : void 0;
+                finish({
+                  text: accumulator.text,
+                  toolCalls: accumulator.toolCalls,
+                  stopReason: accumulator.toolCalls.length > 0 ? "tool_use" : "end",
+                  usage: this.usage(usage2?.input_tokens, usage2?.output_tokens)
+                });
+              }
+            } catch (error) {
+              fail(error);
+            }
+          });
+        });
+      }
       buildChatMessages(options) {
         const messages = [
           {
@@ -2362,7 +2661,7 @@ var init_copilot = __esm({
           tool_choice: options.tools.length > 0 ? "auto" : void 0,
           temperature: this.config.temperature
         };
-        const res = await fetch(`${this.baseUrl()}/chat/completions`, {
+        const res = await fetch(`${await this.baseUrl(options.signal)}/chat/completions`, {
           method: "POST",
           headers: await this.headers(options),
           body: JSON.stringify(requestBody),
@@ -2406,15 +2705,16 @@ var init_copilot = __esm({
         return input;
       }
       async chatResponses(options, modelInfo) {
-        const reasoning = buildReasoning(options.reasoningEffort, modelInfo);
-        const requestBody = {
-          model: this.config.model,
-          input: this.buildResponsesInput(options),
-          instructions: Array.isArray(options.systemPrompt) ? options.systemPrompt.map((block) => block.text).join("\n\n") : options.systemPrompt,
-          tools: options.tools.length > 0 ? options.tools.map(toResponsesTool) : void 0,
-          ...reasoning && { reasoning, include: ["reasoning.encrypted_content"] }
-        };
-        const res = await fetch(`${this.baseUrl()}/responses`, {
+        const requestBody = this.buildResponsesRequestBody(options, modelInfo);
+        if (this.shouldUseResponsesWebSocket(modelInfo)) {
+          try {
+            return await this.chatResponsesWebSocket(options, requestBody);
+          } catch (err) {
+            if (options.signal?.aborted) throw err;
+            this.disableResponsesWebSocket();
+          }
+        }
+        const res = await fetch(`${await this.baseUrl(options.signal)}/responses`, {
           method: "POST",
           headers: await this.headers(options),
           body: JSON.stringify(requestBody),
@@ -2493,7 +2793,7 @@ var init_copilot = __esm({
           messages: this.buildAnthropicMessages(options),
           tools: options.tools.length > 0 ? options.tools.map(toAnthropicTool) : void 0
         };
-        const res = await fetch(`${this.baseUrl()}/v1/messages`, {
+        const res = await fetch(`${await this.baseUrl(options.signal)}/v1/messages`, {
           method: "POST",
           headers: await this.headers(options, {
             "anthropic-version": "2023-06-01",
@@ -2803,6 +3103,34 @@ var init_cost_tracker = __esm({
   }
 });
 
+// src/domain/usage.ts
+var ZERO, contextPercent, formatContextPercent;
+var init_usage = __esm({
+  "src/domain/usage.ts"() {
+    "use strict";
+    ZERO = { calls: 0, input: 0, output: 0, total: 0 };
+    contextPercent = /* @__PURE__ */ __name((used, max) => {
+      if (!Number.isFinite(used) || !Number.isFinite(max) || used <= 0 || max <= 0) {
+        return 0;
+      }
+      const raw = used / max * 100;
+      return raw < 10 ? Math.round(raw * 10) / 10 : Math.round(raw);
+    }, "contextPercent");
+    formatContextPercent = /* @__PURE__ */ __name((pct) => {
+      if (pct == null || !Number.isFinite(pct) || pct <= 0) {
+        return "0%";
+      }
+      if (pct < 0.1) {
+        return "<0.1%";
+      }
+      if (pct < 10) {
+        return `${pct.toFixed(1).replace(/\.0$/, "")}%`;
+      }
+      return `${Math.round(pct)}%`;
+    }, "formatContextPercent");
+  }
+});
+
 // src/context-manager.ts
 function contextKey(provider, model) {
   return `${provider}\0${model}`;
@@ -2824,6 +3152,7 @@ var CONTEXT_WINDOWS, DEFAULT_CONTEXT_WINDOW, ContextManager;
 var init_context_manager = __esm({
   "src/context-manager.ts"() {
     "use strict";
+    init_usage();
     CONTEXT_WINDOWS = {
       "claude-sonnet-4": 2e5,
       "claude-sonnet-4.5": 2e5,
@@ -2877,7 +3206,7 @@ var init_context_manager = __esm({
         const liveContextWindow = this.activeProvider ? this.liveModelContextWindows.get(contextKey(this.activeProvider, model)) : void 0;
         return getContextWindow(model, { contextWindow: liveContextWindow });
       }
-      /** Update from actual API response usage */
+      /** Update latest effective context footprint from actual API response usage. */
       updateFromUsage(usage2) {
         this.lastTotalTokens = usage2.inputTokens + usage2.outputTokens + usage2.cacheReadTokens + usage2.cacheCreationTokens;
       }
@@ -2897,7 +3226,7 @@ var init_context_manager = __esm({
       /** Get context usage as percentage */
       getUsagePercent(model) {
         const limit = this.getContextWindow(model);
-        return limit > 0 ? Math.round(this.lastTotalTokens / limit * 100) : 0;
+        return contextPercent(this.lastTotalTokens, limit);
       }
       /** Format context display string */
       formatContext(model) {
@@ -3796,13 +4125,18 @@ async function completeCopilotDeviceFlow(flow, signal) {
     }
     const body = await res.json();
     if (body.access_token) {
+      const copilotToken = await exchangeGitHubTokenForCopilotToken(body.access_token, flow.enterpriseUrl, signal);
       const now2 = (/* @__PURE__ */ new Date()).toISOString();
       saveProviderCredential({
         type: "oauth",
         provider: "github-copilot",
-        access: body.access_token,
-        refresh: body.access_token,
-        expires: 0,
+        access: copilotToken.copilotAccess,
+        refresh: copilotToken.githubAccess,
+        expires: copilotToken.copilotExpires,
+        githubAccess: copilotToken.githubAccess,
+        copilotAccess: copilotToken.copilotAccess,
+        copilotExpires: copilotToken.copilotExpires,
+        copilotApiBaseUrl: copilotToken.copilotApiBaseUrl,
         enterpriseUrl: flow.enterpriseUrl,
         createdAt: now2,
         updatedAt: now2
@@ -3810,7 +4144,7 @@ async function completeCopilotDeviceFlow(flow, signal) {
       return {
         provider: "github-copilot",
         enterpriseUrl: flow.enterpriseUrl,
-        baseUrl: copilotApiBase(flow.enterpriseUrl)
+        baseUrl: copilotToken.copilotApiBaseUrl
       };
     }
     if (body.error === "authorization_pending") continue;
@@ -3826,7 +4160,7 @@ var init_copilot_auth = __esm({
   "src/copilot-auth.ts"() {
     "use strict";
     init_provider_auth();
-    init_copilot();
+    init_copilot_token();
     OAUTH_POLLING_SAFETY_MARGIN_MS = 3e3;
     __name(isOAuthAbortError, "isOAuthAbortError");
     __name(oauthDomain, "oauthDomain");
@@ -8977,9 +9311,9 @@ var init_outlook_graph = __esm({
         const wellKnown = WELL_KNOWN_FOLDERS[lower];
         if (wellKnown)
           return wellKnown;
-        const cached8 = this.folderIdCache.get(lower);
-        if (cached8)
-          return cached8;
+        const cached7 = this.folderIdCache.get(lower);
+        if (cached7)
+          return cached7;
         try {
           const result = await this.graphGet(`/me/mailFolders?$filter=displayName eq '${folderName.replace(/'/g, "''")}'&$top=1`);
           if (result.value.length > 0) {
@@ -9337,9 +9671,9 @@ var init_db = __esm({
 import { createHash as createHash2 } from "node:crypto";
 function encodeAtom(word, dim2 = HRR_DIM) {
   const cacheKey = `${word}:${dim2}`;
-  const cached8 = atomCache.get(cacheKey);
-  if (cached8)
-    return cached8;
+  const cached7 = atomCache.get(cacheKey);
+  if (cached7)
+    return cached7;
   const phases = new Float64Array(dim2);
   const bytesNeeded = dim2 * 4;
   const chunks = [];
@@ -12555,9 +12889,9 @@ ${loopContent}` : loopContent;
        */
       async findChannelByName(searchTerm) {
         const searchLower = searchTerm.toLowerCase();
-        const cached8 = this.channelIdCache.get(searchLower);
-        if (cached8) {
-          return { ...cached8, displayName: searchTerm };
+        const cached7 = this.channelIdCache.get(searchLower);
+        if (cached7) {
+          return { ...cached7, displayName: searchTerm };
         }
         try {
           const teamsData = await this.graphGet("/v1.0/me/joinedTeams");
@@ -12737,9 +13071,9 @@ ${loopContent}` : loopContent;
        * Results are cached per chat ID.
        */
       async getChatMembers(chatOrChannelId) {
-        const cached8 = this.chatMembersCache.get(chatOrChannelId);
-        if (cached8)
-          return cached8;
+        const cached7 = this.chatMembersCache.get(chatOrChannelId);
+        if (cached7)
+          return cached7;
         try {
           let endpoint;
           if (this.contextType === "channel" && this.currentChannelTeamId && chatOrChannelId === this.currentChannelId) {
@@ -12977,9 +13311,9 @@ ${loopContent}` : loopContent;
        */
       async resolveChannelIds(teamName, channelName) {
         const cacheKey = `${teamName}/${channelName}`;
-        const cached8 = this.channelIdCache.get(cacheKey);
-        if (cached8)
-          return cached8;
+        const cached7 = this.channelIdCache.get(cacheKey);
+        if (cached7)
+          return cached7;
         const teamsData = await this.graphGet("/v1.0/me/joinedTeams");
         const team = teamsData.value?.find((t) => t.displayName.toLowerCase() === teamName.toLowerCase());
         if (!team) {
@@ -19971,38 +20305,64 @@ var init_frontmatter = __esm({
 });
 
 // src/skills/registry.ts
-import { existsSync as existsSync14, readFileSync as readFileSync14, readdirSync as readdirSync2 } from "node:fs";
+import { existsSync as existsSync14, readFileSync as readFileSync14, readdirSync as readdirSync2, statSync } from "node:fs";
 import { join as join22 } from "node:path";
 import { homedir as homedir12 } from "node:os";
+function skillRoots() {
+  return rootsOverride ?? { bundledDir: packageSkillsDir(), userDir: DEFAULT_USER_DIR };
+}
 function discoverSkills() {
-  if (cachedSkills) return cachedSkills;
+  const signature = buildRegistrySignature();
+  if (cachedSkills?.signature === signature) return cachedSkills.skills;
+  const roots = skillRoots();
   const byName2 = /* @__PURE__ */ new Map();
-  loadSkillsFromDir(packageSkillsDir(), "bundled", byName2);
-  loadSkillsFromDir(USER_DIR, "user", byName2);
-  cachedSkills = [...byName2.values()].sort((a, b) => a.name.localeCompare(b.name));
-  return cachedSkills;
+  loadFlatSkillsFromDir(roots.bundledDir, "bundled", 0, byName2);
+  loadFlatSkillsFromDir(roots.userDir, "user", 1, byName2);
+  loadPackagedSkillsFromDir(roots.userDir, byName2);
+  const skills = [...byName2.values()].map((entry) => entry.skill).sort((a, b) => a.name.localeCompare(b.name));
+  cachedSkills = { signature, skills };
+  return skills;
 }
 function loadSkillBody(skillName) {
-  const skills = discoverSkills();
-  const skill = skills.find((s) => s.name === skillName);
+  const skill = findSkill(skillName);
   if (!skill) return null;
   try {
     const content = readFileSync14(skill.filePath, "utf-8").trim();
-    const parsed = parseSkillFile(content, skill.name + ".md");
+    const parsed = parseSkillFile(content, `${skill.name}.md`);
     return parsed.body;
   } catch {
     return null;
   }
 }
+function loadSkillPrompt(skillName) {
+  const skill = findSkill(skillName);
+  const body = skill ? loadSkillBody(skill.name) : null;
+  if (!skill || !body) return null;
+  return `# Skill Runtime Context
+
+Skill name: ${skill.name}
+Skill file: ${skill.filePath}
+Skill root directory: ${skill.rootDir}
+
+${body}`;
+}
 function findSkill(name) {
   const skills = discoverSkills();
-  const exact = skills.find((s) => s.name === name);
+  const normalized = normalizeSkillName(name);
+  const exact = skills.find((s) => s.name === normalized);
   if (exact) return exact;
-  const lower = name.toLowerCase();
-  const ci = skills.find((s) => s.name.toLowerCase() === lower);
+  const ci = skills.find((s) => s.name.toLowerCase() === normalized.toLowerCase());
   if (ci) return ci;
-  const partial = skills.find((s) => s.name.startsWith(lower) || lower.startsWith(s.name));
-  return partial || null;
+  const matches = findSkillMatches(normalized);
+  return matches.length === 1 ? matches[0] : null;
+}
+function findSkillMatches(name) {
+  const normalized = normalizeSkillName(name).toLowerCase();
+  if (!normalized) return [];
+  return discoverSkills().filter((skill) => {
+    const skillName = skill.name.toLowerCase();
+    return skillName.startsWith(normalized) || normalized.startsWith(skillName);
+  });
 }
 function getSkillListing() {
   const skills = discoverSkills();
@@ -20017,52 +20377,145 @@ function getSkillListing() {
 function clearSkillRegistry() {
   cachedSkills = null;
 }
-function loadSkillsFromDir(dir2, source, out) {
-  if (!existsSync14(dir2)) return;
+function normalizeSkillName(name) {
+  return name.trim().replace(/^\/+/, "").toLowerCase();
+}
+function loadFlatSkillsFromDir(dir2, source, priority, out) {
+  for (const entry of safeReadDir(dir2)) {
+    if (!entry.isFile() || !isMarkdown(entry.name)) continue;
+    const filePath = join22(dir2, entry.name);
+    const skill = parseSkillAtPath(filePath, dir2, entry.name, source, entry.name);
+    if (skill) putSkill(out, skill, priority);
+  }
+}
+function loadPackagedSkillsFromDir(dir2, out) {
+  for (const entry of safeReadDir(dir2)) {
+    if (!entry.isDirectory()) continue;
+    const rootDir = join22(dir2, entry.name);
+    const entrypoint = findPackageEntrypoint(rootDir);
+    if (!entrypoint) continue;
+    const filePath = join22(rootDir, entrypoint);
+    const skill = parseSkillAtPath(filePath, rootDir, entrypoint, "user", `${entry.name}.md`);
+    if (skill) putSkill(out, skill, 2);
+  }
+}
+function findPackageEntrypoint(dir2) {
+  const entries = safeReadDir(dir2).filter((entry) => entry.isFile());
+  const entrypoint = ENTRYPOINT_NAMES.find((name) => entries.some((entry) => entry.name.toLowerCase() === name.toLowerCase()));
+  if (entrypoint) return entries.find((entry) => entry.name.toLowerCase() === entrypoint.toLowerCase())?.name ?? entrypoint;
+  const readme = entries.find((entry) => entry.name.toLowerCase() === "readme.md");
+  if (readme) return readme.name;
+  const markdown = entries.filter((entry) => isMarkdown(entry.name));
+  return markdown.length === 1 ? markdown[0].name : null;
+}
+function parseSkillAtPath(filePath, rootDir, entrypoint, source, fallbackFilename) {
   try {
-    const files = readdirSync2(dir2).filter((f) => f.endsWith(".md")).sort();
-    for (const file2 of files) {
-      const filePath = join22(dir2, file2);
-      try {
-        const content = readFileSync14(filePath, "utf-8").trim();
-        if (!content) continue;
-        const parsed = parseSkillFile(content, file2);
-        out.set(parsed.meta.name, {
-          name: parsed.meta.name,
-          meta: parsed.meta,
-          filePath,
-          source,
-          hasFrontmatter: parsed.hasFrontmatter
-        });
-      } catch {
+    const content = readFileSync14(filePath, "utf-8").trim();
+    if (!content) return null;
+    const parsed = parseSkillFile(content, fallbackFilename);
+    const name = normalizeSkillName(parsed.meta.name);
+    if (!name) return null;
+    return {
+      name,
+      meta: { ...parsed.meta, name },
+      filePath,
+      rootDir,
+      entrypoint,
+      source,
+      hasFrontmatter: parsed.hasFrontmatter
+    };
+  } catch {
+    return null;
+  }
+}
+function putSkill(out, skill, priority) {
+  const existing = out.get(skill.name);
+  if (!existing || priority >= existing.priority) {
+    out.set(skill.name, { priority, skill });
+  }
+}
+function safeReadDir(dir2) {
+  if (!existsSync14(dir2)) return [];
+  try {
+    return readdirSync2(dir2, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+  } catch {
+    return [];
+  }
+}
+function buildRegistrySignature() {
+  const roots = skillRoots();
+  return [signatureForDir(roots.bundledDir), signatureForDir(roots.userDir)].join("|");
+}
+function signatureForDir(dir2) {
+  if (!existsSync14(dir2)) return `${dir2}:missing`;
+  const parts = [];
+  try {
+    for (const entry of safeReadDir(dir2)) {
+      const fullPath = join22(dir2, entry.name);
+      if (entry.isFile()) {
+        if (!isMarkdown(entry.name)) continue;
+        parts.push(fileSignature(fullPath, `f:${entry.name}`));
+      } else if (entry.isDirectory()) {
+        parts.push(fileSignature(fullPath, `d:${entry.name}`));
+        for (const child of safeReadDir(fullPath)) {
+          if (child.isFile() && isMarkdown(child.name)) {
+            parts.push(fileSignature(join22(fullPath, child.name), `d:${entry.name}/${child.name}`));
+          }
+        }
       }
     }
   } catch {
+    return `${dir2}:unreadable`;
+  }
+  return `${dir2}:${parts.join(",")}`;
+}
+function isMarkdown(name) {
+  return name.toLowerCase().endsWith(".md");
+}
+function fileSignature(path3, label) {
+  try {
+    const stat2 = statSync(path3);
+    return `${label}:${stat2.mtimeMs}:${stat2.size}`;
+  } catch {
+    return `${label}:missing`;
   }
 }
-var USER_DIR, cachedSkills;
+var DEFAULT_USER_DIR, ENTRYPOINT_NAMES, cachedSkills, rootsOverride;
 var init_registry2 = __esm({
   "src/skills/registry.ts"() {
     "use strict";
     init_frontmatter();
     init_packageRoot();
-    USER_DIR = join22(homedir12(), ".openjaw-agent", "skills");
+    DEFAULT_USER_DIR = join22(homedir12(), ".openjaw-agent", "skills");
+    ENTRYPOINT_NAMES = ["SKILL.md", "skill.md"];
     cachedSkills = null;
+    rootsOverride = null;
+    __name(skillRoots, "skillRoots");
     __name(discoverSkills, "discoverSkills");
     __name(loadSkillBody, "loadSkillBody");
+    __name(loadSkillPrompt, "loadSkillPrompt");
     __name(findSkill, "findSkill");
+    __name(findSkillMatches, "findSkillMatches");
     __name(getSkillListing, "getSkillListing");
     __name(clearSkillRegistry, "clearSkillRegistry");
-    __name(loadSkillsFromDir, "loadSkillsFromDir");
+    __name(normalizeSkillName, "normalizeSkillName");
+    __name(loadFlatSkillsFromDir, "loadFlatSkillsFromDir");
+    __name(loadPackagedSkillsFromDir, "loadPackagedSkillsFromDir");
+    __name(findPackageEntrypoint, "findPackageEntrypoint");
+    __name(parseSkillAtPath, "parseSkillAtPath");
+    __name(putSkill, "putSkill");
+    __name(safeReadDir, "safeReadDir");
+    __name(buildRegistrySignature, "buildRegistrySignature");
+    __name(signatureForDir, "signatureForDir");
+    __name(isMarkdown, "isMarkdown");
+    __name(fileSignature, "fileSignature");
   }
 });
 
 // src/prompts/skills.ts
 function getSkillsSection() {
-  if (cached7 !== void 0) return cached7;
   const skills = discoverSkills();
   if (skills.length === 0) {
-    cached7 = null;
     return null;
   }
   const listing = getSkillListing();
@@ -20077,15 +20530,17 @@ New skills must be saved to \`~/.openjaw-agent/skills/\` (user skills directory)
 Do NOT write skills to the project's bundled skills/ directory.
 
 ${listing}`;
-  cached7 = content;
-  return cached7;
+  return content;
+}
+function clearSkillsCache() {
+  clearSkillRegistry();
 }
-var cached7;
 var init_skills = __esm({
   "src/prompts/skills.ts"() {
     "use strict";
     init_registry2();
     __name(getSkillsSection, "getSkillsSection");
+    __name(clearSkillsCache, "clearSkillsCache");
   }
 });
 
@@ -20776,8 +21231,8 @@ Options: ${chunk.choices.join(" | ")}` : "";
             if (fileName.startsWith("oj-") || fileName.endsWith(".log") || fileName.endsWith(".tmp")) continue;
             if (existsSync16(resolvedPath)) {
               try {
-                const { statSync: statSync4 } = await import("node:fs");
-                const stat2 = statSync4(resolvedPath);
+                const { statSync: statSync5 } = await import("node:fs");
+                const stat2 = statSync5(resolvedPath);
                 if (stat2.isFile() && stat2.size < 50 * 1024 * 1024) {
                   const ext = resolvedPath.split(".").pop()?.toLowerCase() || "";
                   const contentType = MIME_TYPES[ext] || "application/octet-stream";
@@ -21629,10 +22084,10 @@ var init_mcp_client = __esm({
               let tokenExpiry = 0;
               if (copilotTokenFile) {
                 try {
-                  const cached8 = JSON.parse(readFileSync17(copilotTokenFile, "utf-8"));
-                  cachedToken = cached8.accessToken;
-                  cachedRefreshToken = cached8.refreshToken;
-                  tokenExpiry = cached8.expiresAt || 0;
+                  const cached7 = JSON.parse(readFileSync17(copilotTokenFile, "utf-8"));
+                  cachedToken = cached7.accessToken;
+                  cachedRefreshToken = cached7.refreshToken;
+                  tokenExpiry = cached7.expiresAt || 0;
                 } catch {
                 }
               }
@@ -21771,11 +22226,31 @@ async function runCopilotResponsesSearch(input, llm, startedAt) {
   if (!credential || credential.type !== "oauth") {
     throw new Error("GitHub Copilot is not connected. Run /connect github-copilot first.");
   }
-  const baseUrl = llm.base_url?.replace(/\/+$/, "") ?? copilotApiBase(credential.enterpriseUrl);
+  let copilotAccess = credential.copilotAccess;
+  let copilotApiBaseUrl = credential.copilotApiBaseUrl;
+  if (!copilotAccess || !credential.copilotExpires || credential.copilotExpires <= Date.now() + COPILOT_TOKEN_EXPIRY_SAFETY_MARGIN_MS2) {
+    const exchanged = await exchangeGitHubTokenForCopilotToken(
+      credential.githubAccess || credential.refresh || credential.access,
+      credential.enterpriseUrl
+    );
+    copilotAccess = exchanged.copilotAccess;
+    copilotApiBaseUrl = exchanged.copilotApiBaseUrl;
+    saveProviderCredential({
+      ...credential,
+      access: exchanged.copilotAccess,
+      refresh: exchanged.githubAccess,
+      expires: exchanged.copilotExpires,
+      githubAccess: exchanged.githubAccess,
+      copilotAccess: exchanged.copilotAccess,
+      copilotExpires: exchanged.copilotExpires,
+      copilotApiBaseUrl: exchanged.copilotApiBaseUrl
+    });
+  }
+  const baseUrl = llm.base_url?.replace(/\/+$/, "") ?? copilotApiBaseUrl?.replace(/\/+$/, "") ?? copilotApiBase(credential.enterpriseUrl);
   const headers = {
-    "Authorization": `Bearer ${credential.access || credential.refresh}`,
+    "Authorization": `Bearer ${copilotAccess}`,
     "Content-Type": "application/json",
-    "User-Agent": COPILOT_USER_AGENT,
+    "User-Agent": COPILOT_USER_AGENT2,
     "Editor-Version": "OpenJaw/0.1.0",
     "Editor-Plugin-Version": "OpenJaw/0.1.0",
     "Copilot-Integration-Id": "vscode-chat",
@@ -22002,15 +22477,16 @@ function limitAndDedupe(results, max) {
 function truncate(text) {
   return text.length > 200 ? text.slice(0, 200) + "\u2026" : text;
 }
-var COPILOT_USER_AGENT, DEFAULT_TIMEOUT_MS;
+var COPILOT_USER_AGENT2, DEFAULT_TIMEOUT_MS, COPILOT_TOKEN_EXPIRY_SAFETY_MARGIN_MS2;
 var init_web_search = __esm({
   "src/web-search.ts"() {
     "use strict";
     init_web_search_types();
+    init_copilot_token();
     init_provider_auth();
-    init_copilot();
-    COPILOT_USER_AGENT = "openjaw-agent/0.1.0";
+    COPILOT_USER_AGENT2 = "openjaw-agent/0.1.0";
     DEFAULT_TIMEOUT_MS = 45e3;
+    COPILOT_TOKEN_EXPIRY_SAFETY_MARGIN_MS2 = 6e4;
     __name(createWebSearchExecutor, "createWebSearchExecutor");
     __name(runCopilotResponsesSearch, "runCopilotResponsesSearch");
     __name(runOpenAIResponsesSearch, "runOpenAIResponsesSearch");
@@ -26423,7 +26899,7 @@ function createSkillTool(config, toolRegistry, systemPromptFn) {
   };
 }
 async function executeSkill(skillName, args, config, toolRegistry, systemPromptFn) {
-  const body = loadSkillBody(skillName);
+  const body = loadSkillPrompt(skillName);
   if (!body) {
     return { success: false, error: `Could not load skill content for "${skillName}"` };
   }
@@ -26786,8 +27262,8 @@ var init_teams = __esm({
             if (fileName.startsWith("oj-") || fileName.endsWith(".log") || fileName.endsWith(".tmp")) continue;
             if (existsSync25(filePath)) {
               try {
-                const { statSync: statSync4 } = await import("node:fs");
-                const stat2 = statSync4(filePath);
+                const { statSync: statSync5 } = await import("node:fs");
+                const stat2 = statSync5(filePath);
                 if (stat2.isFile() && stat2.size < 50 * 1024 * 1024) {
                   await this.sendFileToSelfChat(filePath);
                   sentFiles.add(filePath);
@@ -27346,8 +27822,8 @@ var init_feishu = __esm({
             this.emit({ type: "system", content: `\u{1F50D} Found path: ${filePath} (exists: ${exists})` });
             if (exists) {
               try {
-                const { statSync: statSync4 } = await import("node:fs");
-                const stat2 = statSync4(filePath);
+                const { statSync: statSync5 } = await import("node:fs");
+                const stat2 = statSync5(filePath);
                 if (stat2.isFile() && stat2.size < 30 * 1024 * 1024) {
                   const fileType = this.getFeishuFileType(fileName);
                   this.emit({ type: "system", content: `\u{1F4E4} Uploading to Feishu: ${fileName} (${(stat2.size / 1024).toFixed(0)}KB, type=${fileType})` });
@@ -27443,7 +27919,7 @@ __export(wechat_exports, {
   sniffMediaKind: () => sniffMediaKind,
   validateMediaForUpload: () => validateMediaForUpload
 });
-import { existsSync as existsSync27, readFileSync as readFileSync26, writeFileSync as writeFileSync18, unlinkSync as unlinkSync7, statSync as statSync2 } from "node:fs";
+import { existsSync as existsSync27, readFileSync as readFileSync26, writeFileSync as writeFileSync18, unlinkSync as unlinkSync7, statSync as statSync3 } from "node:fs";
 import { mkdirSync as mkdirSync16 } from "node:fs";
 import { extname as extname3, join as join35 } from "node:path";
 import { homedir as homedir21 } from "node:os";
@@ -28314,7 +28790,7 @@ Scan URL manually: ${qrUrl}` });
           attemptedFiles.add(dedupKey);
           attempted++;
           try {
-            const stat2 = statSync2(filePath);
+            const stat2 = statSync3(filePath);
             if (!stat2.isFile() || stat2.size > 30 * 1024 * 1024) continue;
             if (stat2.size === 0) {
               this.emit({ type: "system", content: `\u26A0 WeChat skipped empty file: ${fileName}` });
@@ -29314,12 +29790,40 @@ var init_bootstrap = __esm({
   }
 });
 
+// src/usageSnapshot.ts
+function usageSnapshot(agentLoop) {
+  const cost = agentLoop.costTracker.getSessionCost();
+  const contextMax = agentLoop.contextManager.getContextWindow(agentLoop.model);
+  const contextUsed = agentLoop.contextManager.lastPromptTokens;
+  return {
+    cache_read: cost.totalCacheReadTokens,
+    cache_write: cost.totalCacheCreationTokens,
+    calls: cost.turns,
+    context_max: contextMax,
+    context_percent: contextPercent(contextUsed, contextMax),
+    context_used: contextUsed,
+    cost_status: "estimated",
+    cost_usd: cost.totalCostUSD,
+    input: cost.totalInputTokens,
+    model: agentLoop.model,
+    output: cost.totalOutputTokens,
+    total: cost.totalInputTokens + cost.totalOutputTokens + cost.totalCacheReadTokens + cost.totalCacheCreationTokens
+  };
+}
+var init_usageSnapshot = __esm({
+  "src/usageSnapshot.ts"() {
+    "use strict";
+    init_usage();
+    __name(usageSnapshot, "usageSnapshot");
+  }
+});
+
 // src/eventBridge.ts
 import { randomUUID as randomUUID11 } from "node:crypto";
 async function streamAgentRun(options) {
   const { agentLoop, bus, imageData, systemPrompt, text } = options;
   const sid = agentLoop.sessionId;
-  const state = newState();
+  const state = newState(agentLoop);
   bus.emitEvent({
     payload: { kind: "thinking", text: "thinking\u2026" },
     session_id: sid,
@@ -29409,11 +29913,13 @@ function translateChunk(chunk, state, bus, sid) {
     }
   }
 }
-var newState, ensureMessageOpen, closeMessage;
+var newState, ensureMessageOpen, closeMessage, safeUsageSnapshot;
 var init_eventBridge = __esm({
   "src/eventBridge.ts"() {
     "use strict";
-    newState = /* @__PURE__ */ __name(() => ({
+    init_usageSnapshot();
+    newState = /* @__PURE__ */ __name((agentLoop) => ({
+      agentLoop,
       messageOpen: false,
       pendingAnswer: "",
       toolIds: /* @__PURE__ */ new Map()
@@ -29426,8 +29932,9 @@ var init_eventBridge = __esm({
     }, "ensureMessageOpen");
     closeMessage = /* @__PURE__ */ __name((state, bus, sid, text) => {
       if (state.messageOpen || text) {
+        const usage2 = safeUsageSnapshot(state.agentLoop);
         bus.emitEvent({
-          payload: { text: text ?? state.pendingAnswer },
+          payload: { text: text ?? state.pendingAnswer, ...usage2 ? { usage: usage2 } : {} },
           session_id: sid,
           type: "message.complete"
         });
@@ -29435,6 +29942,13 @@ var init_eventBridge = __esm({
         state.pendingAnswer = "";
       }
     }, "closeMessage");
+    safeUsageSnapshot = /* @__PURE__ */ __name((agentLoop) => {
+      try {
+        return usageSnapshot(agentLoop);
+      } catch {
+        return void 0;
+      }
+    }, "safeUsageSnapshot");
     __name(streamAgentRun, "streamAgentRun");
     __name(translateChunk, "translateChunk");
   }
@@ -29514,15 +30028,6 @@ var init_env = __esm({
   }
 });
 
-// src/domain/usage.ts
-var ZERO;
-var init_usage = __esm({
-  "src/domain/usage.ts"() {
-    "use strict";
-    ZERO = { calls: 0, input: 0, output: 0, total: 0 };
-  }
-});
-
 // src/theme.ts
 function parseHex(h) {
   const m = /^#?([0-9a-f]{6})$/i.exec(h);
@@ -29692,6 +30197,14 @@ function normalizeThemeForAnsiLightTerminal(theme, env2 = process.env, isLight =
   }
   return { ...theme, color };
 }
+function isBuiltinSkinName(value) {
+  return BUILTIN_SKINS.some((skin) => skin.name === value);
+}
+function themeForBuiltinSkin(name) {
+  if (name === "dark") return DARK_THEME;
+  if (name === "light") return LIGHT_THEME;
+  return DEFAULT_THEME;
+}
 function fromSkin(colors, branding, bannerLogo = "", bannerHero = "", toolPrefix = "", helpHeader = "") {
   const d = DEFAULT_THEME;
   const c = /* @__PURE__ */ __name((k) => colors[k], "c");
@@ -29749,7 +30262,7 @@ function fromSkin(colors, branding, bannerLogo = "", bannerHero = "", toolPrefix
     bannerHero
   }, process.env, DEFAULT_LIGHT_MODE);
 }
-var XTERM_6_LEVELS, ANSI_LIGHT_MAX_LUMINANCE, ANSI_LIGHT_TARGET_LUMINANCE, ANSI_LIGHT_MIN_SATURATION, ANSI_MUTED_BUCKET, ANSI_NORMALIZED_FOREGROUNDS, ANSI_MUTED_FOREGROUNDS, BRAND, cleanPromptSymbol, DARK_THEME, LIGHT_THEME, TRUE_RE2, FALSE_RE2, LIGHT_DEFAULT_TERM_PROGRAMS, LUMA_LIGHT_THRESHOLD, HEX_3_RE, HEX_6_RE, DEFAULT_LIGHT_MODE, DEFAULT_THEME;
+var XTERM_6_LEVELS, ANSI_LIGHT_MAX_LUMINANCE, ANSI_LIGHT_TARGET_LUMINANCE, ANSI_LIGHT_MIN_SATURATION, ANSI_MUTED_BUCKET, ANSI_NORMALIZED_FOREGROUNDS, ANSI_MUTED_FOREGROUNDS, BRAND, cleanPromptSymbol, DARK_THEME, LIGHT_THEME, TRUE_RE2, FALSE_RE2, LIGHT_DEFAULT_TERM_PROGRAMS, LUMA_LIGHT_THRESHOLD, HEX_3_RE, HEX_6_RE, DEFAULT_LIGHT_MODE, DEFAULT_THEME, BUILTIN_SKINS;
 var init_theme = __esm({
   "src/theme.ts"() {
     "use strict";
@@ -29901,6 +30414,13 @@ var init_theme = __esm({
       process.env,
       DEFAULT_LIGHT_MODE
     );
+    BUILTIN_SKINS = [
+      { name: "default", description: "Auto-detect terminal light/dark preference" },
+      { name: "dark", description: "OpenJaw dark coral theme" },
+      { name: "light", description: "Light terminal theme" }
+    ];
+    __name(isBuiltinSkinName, "isBuiltinSkinName");
+    __name(themeForBuiltinSkin, "themeForBuiltinSkin");
     __name(fromSkin, "fromSkin");
   }
 });
@@ -31669,11 +32189,11 @@ function sliceAnsi(str, start, end) {
   }
   if (end !== void 0) {
     const key = `${start}|${end}|${str}`;
-    const cached8 = sliceCache.get(key);
-    if (cached8 !== void 0) {
+    const cached7 = sliceCache.get(key);
+    if (cached7 !== void 0) {
       sliceCache.delete(key);
-      sliceCache.set(key, cached8);
-      return cached8;
+      sliceCache.set(key, cached7);
+      return cached7;
     }
     const result = computeSlice(str, start, end);
     if (sliceCache.size >= SLICE_CACHE_LIMIT) {
@@ -31728,11 +32248,11 @@ function computeSlice(str, start, end) {
   return result;
 }
 function lineWidth(line) {
-  const cached8 = cache.get(line);
-  if (cached8 !== void 0) {
+  const cached7 = cache.get(line);
+  if (cached7 !== void 0) {
     cache.delete(line);
-    cache.set(line, cached8);
-    return cached8;
+    cache.set(line, cached7);
+    return cached7;
   }
   const width = stringWidth(line);
   if (cache.size >= MAX_CACHE_SIZE) {
@@ -31749,11 +32269,11 @@ function evictLineWidthCache(keepRatio = 0) {
 }
 function memoizedWrap(text, maxWidth, wrapType) {
   const key = `${maxWidth}|${wrapType}|${text}`;
-  const cached8 = wrapCache.get(key);
-  if (cached8 !== void 0) {
+  const cached7 = wrapCache.get(key);
+  if (cached7 !== void 0) {
     wrapCache.delete(key);
-    wrapCache.set(key, cached8);
-    return cached8;
+    wrapCache.set(key, cached7);
+    return cached7;
   }
   const result = computeWrap(text, maxWidth, wrapType);
   if (wrapCache.size >= WRAP_CACHE_LIMIT) {
@@ -33713,9 +34233,9 @@ function collectRemovedRects(parent, removed, underAbsolute = false) {
   }
   const elem = removed;
   const isAbsolute2 = underAbsolute || elem.style.position === "absolute";
-  const cached8 = nodeCache.get(elem);
-  if (cached8) {
-    addPendingClear(parent, cached8, isAbsolute2);
+  const cached7 = nodeCache.get(elem);
+  if (cached7) {
+    addPendingClear(parent, cached7, isAbsolute2);
     nodeCache.delete(elem);
   }
   for (const child of elem.childNodes) {
@@ -35835,31 +36355,31 @@ function renderNodeToOutput(node, output, {
     if (y < 0 && node.style.position === "absolute") {
       y = 0;
     }
-    const cached8 = nodeCache.get(node);
-    if (!node.dirty && !skipSelfBlit && node.pendingScrollDelta === void 0 && cached8 && cached8.x === x && cached8.y === y && cached8.width === width && cached8.height === height && prevScreen) {
+    const cached7 = nodeCache.get(node);
+    if (!node.dirty && !skipSelfBlit && node.pendingScrollDelta === void 0 && cached7 && cached7.x === x && cached7.y === y && cached7.width === width && cached7.height === height && prevScreen) {
       const fx = Math.floor(x);
       const fy = Math.floor(y);
       const fw = Math.floor(width);
       const fh = Math.floor(height);
       output.blit(prevScreen, fx, fy, fw, fh);
       if (node.style.position === "absolute") {
-        absoluteRectsCur.push(cached8);
+        absoluteRectsCur.push(cached7);
       }
       blitEscapingAbsoluteDescendants(node, output, prevScreen, fx, fy, fw, fh);
       return;
     }
-    const positionChanged = cached8 !== void 0 && (cached8.x !== x || cached8.y !== y || cached8.width !== width || cached8.height !== height);
+    const positionChanged = cached7 !== void 0 && (cached7.x !== x || cached7.y !== y || cached7.width !== width || cached7.height !== height);
     if (positionChanged) {
       layoutShifted = true;
       absoluteOverlayMoved ||= node.style.position === "absolute";
     }
-    if (cached8 && (node.dirty || positionChanged)) {
+    if (cached7 && (node.dirty || positionChanged)) {
       output.clear(
         {
-          x: Math.floor(cached8.x),
-          y: Math.floor(cached8.y),
-          width: Math.floor(cached8.width),
-          height: Math.floor(cached8.height)
+          x: Math.floor(cached7.x),
+          y: Math.floor(cached7.y),
+          width: Math.floor(cached7.width),
+          height: Math.floor(cached7.height)
         },
         node.style.position === "absolute"
       );
@@ -36034,7 +36554,7 @@ function renderNodeToOutput(node, output, {
             const delta = contentCached.y - contentY;
             const regionTop = Math.floor(y + contentYoga.getComputedTop());
             const regionBottom = regionTop + innerHeight - 1;
-            if (cached8?.y === y && cached8.height === height && innerHeight > 0 && Math.abs(delta) < innerHeight) {
+            if (cached7?.y === y && cached7.height === height && innerHeight > 0 && Math.abs(delta) < innerHeight) {
               hint = { top: regionTop, bottom: regionBottom, delta };
               scrollHint = hint;
             } else {
@@ -36334,13 +36854,13 @@ function blitEscapingAbsoluteDescendants(node, output, prevScreen, px, py, pw, p
     }
     const elem = child;
     if (elem.style.position === "absolute") {
-      const cached8 = nodeCache.get(elem);
-      if (cached8) {
-        absoluteRectsCur.push(cached8);
-        const cx = Math.floor(cached8.x);
-        const cy = Math.floor(cached8.y);
-        const cw = Math.floor(cached8.width);
-        const ch = Math.floor(cached8.height);
+      const cached7 = nodeCache.get(elem);
+      if (cached7) {
+        absoluteRectsCur.push(cached7);
+        const cx = Math.floor(cached7.x);
+        const cy = Math.floor(cached7.y);
+        const cw = Math.floor(cached7.width);
+        const ch = Math.floor(cached7.height);
         if (cx < px || cy < py || cx + cw > pr || cy + ch > pb) {
           output.blit(prevScreen, cx, cy, cw, ch);
         }
@@ -36356,20 +36876,20 @@ function renderScrolledChildren(node, output, offsetX, offsetY, hasRemovedChild,
     const childElem = childNode;
     const cy = childElem.yogaNode;
     if (cy) {
-      const cached8 = nodeCache.get(childElem);
+      const cached7 = nodeCache.get(childElem);
       let top;
       let height;
-      if (cached8?.top !== void 0 && !childElem.dirty && cumHeightShift === 0) {
-        top = cached8.top;
-        height = cached8.height;
+      if (cached7?.top !== void 0 && !childElem.dirty && cumHeightShift === 0) {
+        top = cached7.top;
+        height = cached7.height;
       } else {
         top = cy.getComputedTop();
         height = cy.getComputedHeight();
         if (childElem.dirty) {
-          cumHeightShift += height - (cached8 ? cached8.height : 0);
+          cumHeightShift += height - (cached7 ? cached7.height : 0);
         }
-        if (cached8) {
-          cached8.top = top;
+        if (cached7) {
+          cached7.top = top;
         }
       }
       const bottom = top + height;
@@ -38779,11 +39299,11 @@ var init_entry_exports = __esm({
           return rawStringWidth(str);
         }
       }
-      const cached8 = widthCache.get(str);
-      if (cached8 !== void 0) {
+      const cached7 = widthCache.get(str);
+      if (cached7 !== void 0) {
         widthCache.delete(str);
-        widthCache.set(str, cached8);
-        return cached8;
+        widthCache.set(str, cached7);
+        return cached7;
       }
       const w = rawStringWidth(str);
       if (widthCache.size >= WIDTH_CACHE_LIMIT) {
@@ -40888,9 +41408,9 @@ $ npm install --save-dev react-devtools-core
         if (char.length === 1) {
           const code = char.charCodeAt(0);
           if (code < 128) {
-            const cached8 = this.ascii[code];
-            if (cached8 !== -1) {
-              return cached8;
+            const cached7 = this.ascii[code];
+            if (cached7 !== -1) {
+              return cached7;
             }
             const index2 = this.strings.length;
             this.strings.push(char);
@@ -45907,6 +46427,7 @@ var fmt, money, stub, eventLine, parseScheduleInput, showUsage, openjawCommands;
 var init_openjaw = __esm({
   "src/app/slash/commands/openjaw.ts"() {
     "use strict";
+    init_usage();
     init_overlayStore();
     fmt = /* @__PURE__ */ __name((n) => (n ?? 0).toLocaleString(), "fmt");
     money = /* @__PURE__ */ __name((n) => `$${(n ?? 0).toFixed(4)}`, "money");
@@ -46154,7 +46675,7 @@ var init_openjaw = __esm({
           if (!r.context_max) {
             return ctx.transcript.sys("context usage unavailable");
           }
-          ctx.transcript.sys(`context: ${fmt(r.context_used)} / ${fmt(r.context_max)} (${r.context_percent ?? 0}%)`);
+          ctx.transcript.sys(`context: ${fmt(r.context_used)} / ${fmt(r.context_max)} (${formatContextPercent(r.context_percent)})`);
         }), "run")
       },
       {
@@ -47057,6 +47578,8 @@ var init_session2 = __esm({
     init_slash();
     init_platform();
     init_text();
+    init_theme();
+    init_usage();
     init_interfaces();
     init_overlayStore();
     init_uiStore();
@@ -47275,10 +47798,18 @@ var init_session2 = __esm({
         help: "switch theme skin (fires skin.changed)",
         name: "skin",
         run: /* @__PURE__ */ __name((arg, ctx) => {
-          if (!arg) {
-            return ctx.gateway.rpc("config.get", { key: "skin" }).then(ctx.guarded((r) => ctx.transcript.sys(`skin: ${r.value || "default"}`)));
+          const value = arg.trim().toLowerCase();
+          if (!value || value === "list") {
+            return ctx.transcript.panel("Skins", [
+              { rows: BUILTIN_SKINS.map((skin) => [skin.name, skin.description]) },
+              { text: "Use /skin <name> to apply a skin." }
+            ]);
+          }
+          if (!isBuiltinSkinName(value)) {
+            return ctx.transcript.sys(`usage: /skin <${BUILTIN_SKINS.map((s) => s.name).join("|")}>`);
           }
-          ctx.gateway.rpc("config.set", { key: "skin", value: arg }).then(ctx.guarded((r) => r.value && ctx.transcript.sys(`skin \u2192 ${r.value}`)));
+          patchUiState({ theme: themeForBuiltinSkin(value) });
+          ctx.gateway.rpc("config.set", { key: "skin", value }).then(ctx.guarded(() => ctx.transcript.sys(`skin \u2192 ${value}`)));
         }, "run")
       },
       {
@@ -47445,7 +47976,7 @@ var init_session2 = __esm({
             }
             const sections = [{ rows }];
             if (r.context_max) {
-              sections.push({ text: `Context: ${f(r.context_used)} / ${f(r.context_max)} (${r.context_percent}%)` });
+              sections.push({ text: `Context: ${f(r.context_used)} / ${f(r.context_max)} (${formatContextPercent(r.context_percent)})` });
             }
             if (r.compressions) {
               sections.push({ text: `Compressions: ${r.compressions}` });
@@ -47569,6 +48100,14 @@ function buildSlashCompletions(text) {
   if (!text.startsWith("/")) {
     return { items: [], replace_from: 1 };
   }
+  const skinArgMatch = /^\/skin\s+([^\s]*)$/i.exec(text);
+  if (skinArgMatch) {
+    const prefix = skinArgMatch[1]?.toLowerCase() ?? "";
+    return {
+      items: BUILTIN_SKINS.filter((skin) => skin.name.startsWith(prefix)).map((skin) => ({ display: skin.name, meta: skin.description, text: skin.name })),
+      replace_from: text.length - (skinArgMatch[1]?.length ?? 0)
+    };
+  }
   const needle = text.slice(1).toLowerCase();
   const seen = /* @__PURE__ */ new Set();
   const items = [];
@@ -47587,6 +48126,19 @@ function buildSlashCompletions(text) {
       });
     }
   }
+  if (needle.length > 0) {
+    for (const skill of discoverSkills()) {
+      if (!skill.name.toLowerCase().startsWith(needle)) continue;
+      const command = `/${skill.name}`;
+      if (seen.has(command)) continue;
+      seen.add(command);
+      items.push({
+        display: command,
+        meta: `skill \xB7 ${skill.meta.whenToUse || skill.meta.description || ""}`,
+        text: command
+      });
+    }
+  }
   items.sort((a, b) => {
     const aExact = a.text.slice(1).toLowerCase() === needle ? -1 : 0;
     const bExact = b.text.slice(1).toLowerCase() === needle ? -1 : 0;
@@ -47643,6 +48195,8 @@ var init_catalog = __esm({
     init_ops();
     init_session2();
     init_setup();
+    init_registry2();
+    init_theme();
     CATEGORIZED = [
       { category: "Core", commands: coreCommands },
       { category: "Session", commands: sessionCommands },
@@ -47663,7 +48217,7 @@ var init_catalog = __esm({
 // src/rpcHandlers.ts
 import { spawn as spawn7 } from "node:child_process";
 import { randomUUID as randomUUID13 } from "node:crypto";
-import { existsSync as existsSync31, mkdirSync as mkdirSync17, readFileSync as readFileSync28, rmSync, statSync as statSync3, writeFileSync as writeFileSync19 } from "node:fs";
+import { existsSync as existsSync31, mkdirSync as mkdirSync17, readFileSync as readFileSync28, rmSync, statSync as statSync4, writeFileSync as writeFileSync19 } from "node:fs";
 import { homedir as homedir28 } from "node:os";
 import { basename as basename3, extname as extname4, join as join42 } from "node:path";
 function registerRpcHandlers(options) {
@@ -48356,8 +48910,7 @@ ${helpMessage}` : field.label;
     return { cancelled: true, slug: entry.slug };
   });
   bus.registerRpc("commands.catalog", () => {
-    const skillCount = toolRegistry.listTools().filter((t) => /^skill[:_-]/i.test(t.name)).length;
-    return buildCommandsCatalog({ skillCount });
+    return buildCommandsCatalog({ skillCount: discoverSkills().length });
   });
   bus.registerRpc("completion.query", () => ({
     items: []
@@ -48365,14 +48918,9 @@ ${helpMessage}` : field.label;
   bus.registerRpc("complete.slash", (params) => buildSlashCompletions(String(params.text ?? "")));
   bus.registerRpc("complete.path", (params) => buildPathCompletions(String(params.word ?? "")));
   bus.registerRpc("skills.catalog", () => {
-    const tools = toolRegistry.listTools();
-    const skillTools = tools.filter((t) => /^skill[:_-]/i.test(t.name));
     return {
-      categories: ["skills"],
-      skills: skillTools.map((t) => ({
-        description: t.description,
-        name: t.name.replace(/^skill[:_-]/i, "")
-      }))
+      categories: Object.keys(registrySkillsByCategory()).sort(),
+      skills: listRegistrySkills()
     };
   });
   bus.registerRpc("tools.list", () => ({
@@ -48404,11 +48952,11 @@ ${helpMessage}` : field.label;
       return { output: lines.join("\n") };
     }
     if (head === "skills") {
-      const skills = toolRegistry.listTools().filter((t) => /^skill[:_-]/i.test(t.name)).map((t) => ({ description: t.description, name: t.name.replace(/^skill[:_-]/i, "") }));
+      const skills = listRegistrySkills();
       if (!skills.length) {
-        return { output: "no skills registered" };
+        return { output: "no skills available" };
       }
-      const lines = [`${skills.length} skills registered`, ""];
+      const lines = [`${skills.length} skills available`, ""];
       for (const s of skills.sort((a, b) => a.name.localeCompare(b.name))) {
         const desc = s.description ? ` \u2014 ${s.description}` : "";
         lines.push(`  ${s.name}${desc}`);
@@ -48684,7 +49232,7 @@ ${helpMessage}` : field.label;
     const meta = agentLoop.getSessionMeta();
     const tools = toolRegistry.listTools();
     const cost = `$${usage2.cost_usd.toFixed(4)}`;
-    const ctx = usage2.context_max > 0 ? `${usage2.context_percent}% (${usage2.context_used}/${usage2.context_max})` : "?";
+    const ctx = usage2.context_max > 0 ? `${formatContextPercent(usage2.context_percent)} (${usage2.context_used}/${usage2.context_max})` : "?";
     const lines = [
       `Session: ${meta.id}`,
       `Title:   ${meta.summary || "(untitled)"}`,
@@ -48814,7 +49362,7 @@ ${helpMessage}` : field.label;
     let fileSize = 0;
     try {
       buffer = readFileSync28(path3);
-      fileSize = statSync3(path3).size;
+      fileSize = statSync4(path3).size;
     } catch (err) {
       throw new Error(`image.attach: ${err instanceof Error ? err.message : String(err)}`);
     }
@@ -48909,9 +49457,9 @@ ${helpMessage}` : field.label;
   bus.registerRpc("spawn_tree.load", () => ({ subagents: [] }));
   bus.registerRpc("skills.reload", async () => {
     try {
-      await mcpManager.connect();
-      const skillCount = toolRegistry.listTools().filter((t) => /^skill[:_-]/i.test(t.name)).length;
-      return { output: `Skills reloaded \xB7 ${skillCount} skills registered` };
+      clearSkillsCache();
+      const skillCount = discoverSkills().length;
+      return { output: `Skills reloaded \xB7 ${skillCount} skills available` };
     } catch (err) {
       return { output: `skills reload failed: ${err instanceof Error ? err.message : String(err)}` };
     }
@@ -48919,18 +49467,28 @@ ${helpMessage}` : field.label;
   bus.registerRpc("skills.manage", (params) => {
     const action2 = String(params.action ?? "").toLowerCase();
     const query = String(params.query ?? "").trim().toLowerCase();
-    const skillTools = toolRegistry.listTools().filter((t) => /^skill[:_-]/i.test(t.name)).map((t) => ({ description: t.description, name: t.name.replace(/^skill[:_-]/i, "") }));
+    const skills = listRegistrySkills();
     if (action2 === "list") {
-      return { skills: skillTools.length ? { installed: skillTools.map((s) => s.name) } : {} };
+      return { skills: registrySkillsByCategory() };
     }
     if (action2 === "inspect") {
-      const hit = skillTools.find((s) => s.name.toLowerCase() === query);
+      const hit = query ? findSkill(query) : null;
       if (!hit) return { info: null };
-      return { info: { category: "installed", description: hit.description, name: hit.name } };
+      return {
+        info: {
+          category: hit.source,
+          description: skillDescription(hit),
+          entrypoint: hit.entrypoint,
+          name: hit.name,
+          path: hit.filePath,
+          root_dir: hit.rootDir,
+          source: hit.source
+        }
+      };
     }
     if (action2 === "search") {
       if (!query) return { results: [] };
-      const results = skillTools.filter((s) => s.name.toLowerCase().includes(query) || (s.description ?? "").toLowerCase().includes(query)).map((s) => ({ description: s.description, name: s.name }));
+      const results = skills.filter((s) => s.name.toLowerCase().includes(query) || (s.description ?? "").toLowerCase().includes(query)).map((s) => ({ description: s.description, name: s.name }));
       return { results };
     }
     if (action2 === "install") {
@@ -48954,8 +49512,30 @@ ${helpMessage}` : field.label;
       unknown: names.length ? names : [`/tools ${action2 || "?"} is not yet wired in the new TUI \u2014 use the legacy --legacy-ui flag for full toolset toggles`]
     };
   });
-  bus.registerRpc("command.dispatch", (params) => {
+  bus.registerRpc("command.dispatch", async (params) => {
     const name = String(params.name ?? "").trim();
+    const arg = String(params.arg ?? "").trim();
+    if (name) {
+      const skill = findSkill(name);
+      if (skill) {
+        if (!toolRegistry.getTool("invoke_skill")) {
+          return { output: "skill invocation is unavailable: invoke_skill tool is not registered", type: "exec" };
+        }
+        try {
+          const result = await toolRegistry.execute("invoke_skill", { skill: skill.name, args: arg });
+          return { output: formatSkillExecutionResult(result), type: "exec" };
+        } catch (err) {
+          return { output: `skill failed (${skill.name}): ${err instanceof Error ? err.message : String(err)}`, type: "exec" };
+        }
+      }
+      const matches = findSkillMatches(name);
+      if (matches.length > 1) {
+        return {
+          output: `ambiguous skill command /${name}: ${matches.slice(0, 8).map((s) => s.name).join(", ")}${matches.length > 8 ? ", \u2026" : ""}`,
+          type: "exec"
+        };
+      }
+    }
     return { output: name ? `unknown command: /${name}` : "(no command)", type: "exec" };
   });
   bus.registerRpc("delegation.status", () => ({ delegated: [], paused: false }));
@@ -48985,7 +49565,7 @@ ${helpMessage}` : field.label;
     }
   };
 }
-var PROVIDERS2, PROVIDER_LABELS, PROVIDER_AUTH, isProviderAuthenticated, buildProviderOption, fetchLiveModels, parseReasoningEffortInput, reasoningEffortsForModel, resolveReasoningEffortForModel, BRIDGE_SOURCES, isBridgeSource, inferBridgeSource, bridgeLabels, bridgeEventLabels, stripBridgeGlyph, firstLogLine, bridgeUser, formatBridgeText, runProcess, contentToText, sessionMessageToMarkdown, usageSnapshot, sessionInfoSnapshot, MCP_TOOL_PREFIX, MAX_TOTAL_TOOLS, syncMcpTools;
+var PROVIDERS2, PROVIDER_LABELS, PROVIDER_AUTH, isProviderAuthenticated, buildProviderOption, fetchLiveModels, parseReasoningEffortInput, skillDescription, listRegistrySkills, registrySkillsByCategory, formatSkillExecutionResult, reasoningEffortsForModel, resolveReasoningEffortForModel, BRIDGE_SOURCES, isBridgeSource, inferBridgeSource, bridgeLabels, bridgeEventLabels, stripBridgeGlyph, firstLogLine, bridgeUser, formatBridgeText, runProcess, contentToText, sessionMessageToMarkdown, sessionInfoSnapshot, MCP_TOOL_PREFIX, MAX_TOTAL_TOOLS, syncMcpTools;
 var init_rpcHandlers = __esm({
   "src/rpcHandlers.ts"() {
     "use strict";
@@ -49004,6 +49584,10 @@ var init_rpcHandlers = __esm({
     init_models_static();
     init_providers();
     init_types();
+    init_skills();
+    init_registry2();
+    init_usage();
+    init_usageSnapshot();
     init_registry3();
     PROVIDERS2 = ["anthropic", "openai", "github-copilot"];
     PROVIDER_LABELS = {
@@ -49104,6 +49688,38 @@ var init_rpcHandlers = __esm({
       }
       return { clear: false, effort: normalized };
     }, "parseReasoningEffortInput");
+    skillDescription = /* @__PURE__ */ __name((skill) => skill.meta.whenToUse || skill.meta.description || "", "skillDescription");
+    listRegistrySkills = /* @__PURE__ */ __name(() => discoverSkills().map((skill) => ({
+      category: skill.source,
+      description: skillDescription(skill),
+      entrypoint: skill.entrypoint,
+      name: skill.name,
+      path: skill.filePath,
+      root_dir: skill.rootDir,
+      source: skill.source
+    })), "listRegistrySkills");
+    registrySkillsByCategory = /* @__PURE__ */ __name(() => {
+      const grouped = {};
+      for (const skill of discoverSkills()) {
+        const category = skill.source;
+        grouped[category] ??= [];
+        grouped[category].push(skill.name);
+      }
+      for (const skills of Object.values(grouped)) {
+        skills.sort((a, b) => a.localeCompare(b));
+      }
+      return grouped;
+    }, "registrySkillsByCategory");
+    formatSkillExecutionResult = /* @__PURE__ */ __name((value) => {
+      if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return typeof value === "string" ? value : JSON.stringify(value ?? null);
+      }
+      const result = value;
+      if (result.success === false) {
+        return `skill failed${result.skill ? ` (${String(result.skill)})` : ""}: ${String(result.error ?? "unknown error")}`;
+      }
+      return typeof result.result === "string" ? result.result : JSON.stringify(result);
+    }, "formatSkillExecutionResult");
     reasoningEffortsForModel = /* @__PURE__ */ __name((model) => model?.supportedReasoningEfforts?.map((option) => option.effort) ?? [], "reasoningEffortsForModel");
     resolveReasoningEffortForModel = /* @__PURE__ */ __name((model, requested) => {
       const supported = reasoningEffortsForModel(model);
@@ -49207,25 +49823,6 @@ ${raw}`;
       }
       return [];
     }, "sessionMessageToMarkdown");
-    usageSnapshot = /* @__PURE__ */ __name((agentLoop) => {
-      const cost = agentLoop.costTracker.getSessionCost();
-      const contextMax = agentLoop.contextManager.getContextWindow(agentLoop.model);
-      const contextUsed = agentLoop.contextManager.lastPromptTokens;
-      return {
-        cache_read: cost.totalCacheReadTokens,
-        cache_write: cost.totalCacheCreationTokens,
-        calls: cost.turns,
-        context_max: contextMax,
-        context_percent: contextMax > 0 ? Math.round(contextUsed / contextMax * 100) : 0,
-        context_used: contextUsed,
-        cost_status: "estimated",
-        cost_usd: cost.totalCostUSD,
-        input: cost.totalInputTokens,
-        model: agentLoop.model,
-        output: cost.totalOutputTokens,
-        total: cost.totalInputTokens + cost.totalOutputTokens + cost.totalCacheReadTokens + cost.totalCacheCreationTokens
-      };
-    }, "usageSnapshot");
     sessionInfoSnapshot = /* @__PURE__ */ __name((agentLoop, toolRegistry) => ({
       cwd: process.cwd(),
       model: agentLoop.model,
@@ -49483,7 +50080,7 @@ var init_gatewayContext = __esm({
 });
 
 // src/domain/paths.ts
-var shortCwd, fmtCwdBranch;
+var shortCwd, fullCwdBranch;
 var init_paths = __esm({
   "src/domain/paths.ts"() {
     "use strict";
@@ -49492,13 +50089,7 @@ var init_paths = __esm({
       const p = h && cwd.startsWith(h) ? `~${cwd.slice(h.length)}` : cwd;
       return p.length <= max ? p : `\u2026${p.slice(-(max - 1))}`;
     }, "shortCwd");
-    fmtCwdBranch = /* @__PURE__ */ __name((cwd, branch, max = 40) => {
-      if (!branch) {
-        return shortCwd(cwd, max);
-      }
-      const tag = ` (${branch.length > 16 ? `\u2026${branch.slice(-15)}` : branch})`;
-      return `${shortCwd(cwd, Math.max(8, max - tag.length))}${tag}`;
-    }, "fmtCwdBranch");
+    fullCwdBranch = /* @__PURE__ */ __name((cwd, branch) => branch ? `${cwd} (${branch})` : cwd, "fullCwdBranch");
   }
 });
 
@@ -49866,9 +50457,9 @@ var init_useVirtualHistory = __esm({
       viewportHeight
     }) => itemCount > 0 && viewportHeight > 0 && !sticky && !liveTailActive, "shouldSetVirtualClamp");
     ensureVirtualItemHeight = /* @__PURE__ */ __name((heights, key, index, estimate, estimateHeight) => {
-      const cached8 = heights.get(key);
-      if (cached8 !== void 0) {
-        return Math.max(1, Math.floor(cached8));
+      const cached7 = heights.get(key);
+      if (cached7 !== void 0) {
+        return Math.max(1, Math.floor(cached7));
       }
       const seeded = Math.max(1, Math.floor(estimateHeight?.(index, key) ?? estimate));
       heights.set(key, seeded);
@@ -51800,7 +52391,7 @@ function createSlashHandler(ctx) {
         }
       }
     }
-    gw.request("slash.exec", { command: cmd.slice(1), session_id: sid }).then((r) => {
+    const renderSlashExec = /* @__PURE__ */ __name((r) => {
       if (stale()) {
         return;
       }
@@ -51809,33 +52400,41 @@ function createSlashHandler(ctx) {
 ${body}` : body;
       const long = text.length > 180 || text.split("\n").filter(Boolean).length > 2;
       long ? page(text, parsed.name[0].toUpperCase() + parsed.name.slice(1)) : sys(text);
-    }).catch(() => {
-      gw.request("command.dispatch", { arg: parsed.arg, name: parsed.name, session_id: sid }).then((raw) => {
-        if (stale()) {
-          return;
-        }
-        const d = asCommandDispatch(raw);
-        if (!d) {
-          return sys("error: invalid response: command.dispatch");
-        }
-        if (d.type === "exec" || d.type === "plugin") {
-          return sys(d.output || "(no output)");
-        }
-        if (d.type === "alias") {
-          return handler(`/${d.target}${argTail}`);
-        }
-        if (d.type === "skill") {
+    }, "renderSlashExec");
+    const runSlashExec = /* @__PURE__ */ __name(() => {
+      gw.request("slash.exec", { command: cmd.slice(1), session_id: sid }).then(renderSlashExec).catch(guardedErr);
+    }, "runSlashExec");
+    const skillHint = findSkill(parsed.name);
+    if (skillHint) {
+      sys(`\u26A1 loading skill: ${skillHint.name}`);
+    }
+    gw.request("command.dispatch", { arg: parsed.arg, name: parsed.name, session_id: sid }).then((raw) => {
+      if (stale()) {
+        return;
+      }
+      const d = asCommandDispatch(raw);
+      if (!d) {
+        return runSlashExec();
+      }
+      if (d.type === "exec" || d.type === "plugin") {
+        return sys(d.output || "(no output)");
+      }
+      if (d.type === "alias") {
+        return handler(`/${d.target}${argTail}`);
+      }
+      if (d.type === "skill") {
+        if (!skillHint || skillHint.name !== d.name) {
           sys(`\u26A1 loading skill: ${d.name}`);
-          return d.message?.trim() ? send(d.message) : sys(`/${parsed.name}: skill payload missing message`);
         }
-        if (d.type === "send") {
-          if (d.notice?.trim()) {
-            sys(d.notice);
-          }
-          return d.message?.trim() ? send(d.message) : sys(`/${parsed.name}: empty message`);
+        return d.message?.trim() ? send(d.message) : sys(`/${parsed.name}: skill payload missing message`);
+      }
+      if (d.type === "send") {
+        if (d.notice?.trim()) {
+          sys(d.notice);
         }
-      }).catch(guardedErr);
-    });
+        return d.message?.trim() ? send(d.message) : sys(`/${parsed.name}: empty message`);
+      }
+    }).catch(runSlashExec);
     return true;
   }, "handler");
   return handler;
@@ -51845,6 +52444,7 @@ var init_createSlashHandler = __esm({
     "use strict";
     init_slash();
     init_rpc();
+    init_registry2();
     init_registry4();
     init_uiStore();
     __name(createSlashHandler, "createSlashHandler");
@@ -53462,6 +54062,13 @@ var init_paste = __esm({
 
 // src/app/useSubmission.ts
 import { useCallback as useCallback9, useEffect as useEffect11, useRef as useRef12 } from "react";
+function resolveCompletionSubmit(value, row, replaceFrom) {
+  if (!row?.text) return null;
+  const text = value.startsWith("/") && row.text.startsWith("/") ? row.text.slice(1) : row.text;
+  const next = value.slice(0, replaceFrom) + text;
+  if (next === value) return null;
+  return { next, submit: value.startsWith("/") && row.text.startsWith("/") && row.meta?.startsWith("skill \xB7") === true };
+}
 function useSubmission(opts) {
   const {
     appendMessage,
@@ -53686,12 +54293,9 @@ function useSubmission(opts) {
     (value) => {
       if (composerState.completions.length) {
         const row = composerState.completions[composerState.compIdx];
-        if (row?.text) {
-          const text = value.startsWith("/") && row.text.startsWith("/") ? row.text.slice(1) : row.text;
-          const next = value.slice(0, composerState.compReplace) + text;
-          if (next !== value) {
-            return composerActions.setInput(next);
-          }
+        const completion = resolveCompletionSubmit(value, row, composerState.compReplace);
+        if (completion) {
+          return completion.submit ? dispatchSubmission(completion.next) : composerActions.setInput(completion.next);
         }
       }
       if (!value.trim() && !composerState.inputBuf.length) {
@@ -53748,6 +54352,7 @@ var init_useSubmission = __esm({
       return (value) => value.replace(PASTE_SNIPPET_RE, (tok) => byLabel.get(tok)?.shift() ?? tok);
     }, "expandSnips");
     spliceMatches = /* @__PURE__ */ __name((text, matches, results) => matches.reduceRight((acc, m, i) => acc.slice(0, m.index) + results[i] + acc.slice(m.index + m[0].length), text), "spliceMatches");
+    __name(resolveCompletionSubmit, "resolveCompletionSubmit");
     __name(useSubmission, "useSubmission");
   }
 });
@@ -54332,7 +54937,7 @@ function useMainApp(gw) {
   const gitBranch = useGitBranch(cwd);
   const appStatus = useMemo7(
     () => ({
-      cwdLabel: fmtCwdBranch(cwd, gitBranch),
+      cwdLabel: fullCwdBranch(cwd, gitBranch),
       goodVibesTick,
       sessionStartedAt: ui.sid ? sessionStartedAt : null,
       showStickyPrompt: !!stickyPrompt,
@@ -55402,7 +56007,7 @@ import { useStore as useStore5 } from "@nanostores/react";
 import { useEffect as useEffect14, useMemo as useMemo10, useRef as useRef15, useState as useState15 } from "react";
 import unicodeSpinners from "unicode-animations";
 import { Fragment as Fragment4, jsx as jsx19, jsxs as jsxs10 } from "react/jsx-runtime";
-function FaceTicker({ color, startedAt }) {
+function useTickerText(startedAt) {
   const ui = useStore5($uiState);
   const style = ui.indicatorStyle;
   const [tick, setTick] = useState15(() => Math.floor(Math.random() * 1e3));
@@ -55425,11 +56030,7 @@ function FaceTicker({ color, startedAt }) {
   const verb = VERBS[verbTick % VERBS.length] ?? "";
   const verbSegment = showVerb ? ` ${padVerb(verb)}` : "";
   const durationSegment = startedAt ? ` \xB7 ${fmtDuration(now2 - startedAt)}` : "";
-  return /* @__PURE__ */ jsxs10(Text9, { color, children: [
-    frame,
-    verbSegment,
-    durationSegment
-  ] });
+  return `${frame}${verbSegment}${durationSegment}`;
 }
 function ctxBarColor(pct, t) {
   if (pct == null) {
@@ -55451,6 +56052,27 @@ function ctxBar(pct, w = 10) {
   const filled = Math.round(p / 100 * w);
   return "\u2588".repeat(filled) + "\u2591".repeat(w - filled);
 }
+function fitVisible(text, width) {
+  if (width <= 0) return "";
+  if (stringWidth(text) <= width) return text + " ".repeat(width - stringWidth(text));
+  let out = "";
+  for (const ch of Array.from(text)) {
+    if (stringWidth(out + ch + "\u2026") > width) break;
+    out += ch;
+  }
+  return out + "\u2026" + " ".repeat(Math.max(0, width - stringWidth(out + "\u2026")));
+}
+function truncateTailVisible(text, width) {
+  return fitVisible(text, width);
+}
+function cwdBranchWidth(cols) {
+  const desired = Math.max(18, Math.floor(cols * 0.38));
+  const maxByCols = Math.max(6, cols - 24);
+  return Math.max(6, Math.min(64, desired, maxByCols));
+}
+function buildActivityText(status, width) {
+  return fitVisible(`  ${status}`, width);
+}
 function SpawnHud({ t }) {
   const delegation = useStore5($delegationState);
   const subagents = useTurnSelector((state) => state.subagents);
@@ -55515,12 +56137,14 @@ function GoodVibesHeart({ tick, t }) {
   }
   return /* @__PURE__ */ jsx19(Text9, { color, children: "\u2665" });
 }
+function ActivityStatusLine({ busy, cols, status, statusColor: statusColor2, turnStartedAt }) {
+  const tickerStatus = useTickerText(busy ? turnStartedAt : null);
+  const text = buildActivityText(busy ? tickerStatus : status, cols);
+  return /* @__PURE__ */ jsx19(Box_default, { height: 1, width: cols, children: /* @__PURE__ */ jsx19(Text9, { color: statusColor2, children: text }) });
+}
 function StatusRule({
   cwdLabel,
   cols,
-  busy,
-  status,
-  statusColor: statusColor2,
   model,
   modelFast,
   modelReasoningEffort,
@@ -55528,7 +56152,6 @@ function StatusRule({
   bgCount,
   sessionStartedAt,
   showCost,
-  turnStartedAt,
   voiceLabel,
   t
 }) {
@@ -55536,29 +56159,15 @@ function StatusRule({
   const barColor = ctxBarColor(pct, t);
   const ctxLabel = usage2.context_max ? `${fmtK(usage2.context_used ?? 0)}/${fmtK(usage2.context_max)}` : usage2.total > 0 ? `${fmtK(usage2.total)} tok` : "";
   const bar = usage2.context_max ? ctxBar(pct) : "";
-  const leftWidth = Math.max(12, cols - cwdLabel.length - 3);
-  return /* @__PURE__ */ jsxs10(Box_default, { height: 1, children: [
-    /* @__PURE__ */ jsx19(Box_default, { flexShrink: 1, width: leftWidth, children: /* @__PURE__ */ jsxs10(Text9, { color: t.color.border, wrap: "truncate-end", children: [
-      "\u2500 ",
-      busy ? /* @__PURE__ */ jsx19(FaceTicker, { color: statusColor2, startedAt: turnStartedAt }) : /* @__PURE__ */ jsx19(Text9, { color: statusColor2, children: status }),
-      /* @__PURE__ */ jsxs10(Text9, { color: t.color.systemNote, children: [
-        " \u2502 ",
-        modelLabel(model, modelReasoningEffort, modelFast)
-      ] }),
-      ctxLabel ? /* @__PURE__ */ jsxs10(Text9, { color: t.color.systemNote, children: [
-        " \u2502 ",
-        ctxLabel
-      ] }) : null,
-      bar ? /* @__PURE__ */ jsxs10(Text9, { color: t.color.systemNote, children: [
-        " \u2502 ",
-        /* @__PURE__ */ jsxs10(Text9, { color: barColor, children: [
-          "[",
-          bar,
-          "]"
-        ] }),
-        " ",
-        /* @__PURE__ */ jsx19(Text9, { color: barColor, children: pct != null ? `${pct}%` : "" })
-      ] }) : null,
+  const cwdWidth = cwdBranchWidth(cols);
+  const modelText = modelLabel(model, modelReasoningEffort, modelFast);
+  return /* @__PURE__ */ jsxs10(Box_default, { height: 1, width: cols, children: [
+    /* @__PURE__ */ jsx19(Text9, { color: t.color.border, children: "\u2500 " }),
+    /* @__PURE__ */ jsx19(Box_default, { flexShrink: 0, width: cwdWidth, children: /* @__PURE__ */ jsx19(Text9, { color: t.color.systemNote, children: truncateTailVisible(cwdLabel, cwdWidth) }) }),
+    /* @__PURE__ */ jsx19(Box_default, { flexShrink: 1, children: /* @__PURE__ */ jsxs10(Text9, { color: t.color.systemNote, wrap: "truncate-end", children: [
+      modelText ? ` \u2502 ${modelText}` : "",
+      ctxLabel ? ` \u2502 ${ctxLabel}` : "",
+      bar ? /* @__PURE__ */ jsx19(Text9, { color: barColor, children: statusContextMeter(bar, pct) }) : null,
       sessionStartedAt ? /* @__PURE__ */ jsxs10(Text9, { color: t.color.systemNote, children: [
         " \u2502 ",
         /* @__PURE__ */ jsx19(SessionDuration, { startedAt: sessionStartedAt })
@@ -55590,9 +56199,7 @@ function StatusRule({
         " \u2502 $",
         usage2.cost_usd.toFixed(4)
       ] }) : null
-    ] }) }),
-    /* @__PURE__ */ jsx19(Text9, { color: t.color.border, children: " \u2500 " }),
-    /* @__PURE__ */ jsx19(Text9, { color: t.color.systemNote, children: cwdLabel })
+    ] }) })
   ] });
 }
 function FloatBox({ children, color }) {
@@ -55667,7 +56274,7 @@ function TranscriptScrollbar({ focused = false, scrollRef, t }) {
     }
   );
 }
-var FACE_TICK_MS, VERB_PAD_LEN, padVerb, EMOJI_FRAMES, ASCII_FRAMES, SPINNER_TICK_MS, renderIndicator, effortLabel, shortModelLabel, modelLabel;
+var FACE_TICK_MS, VERB_PAD_LEN, padVerb, EMOJI_FRAMES, ASCII_FRAMES, SPINNER_TICK_MS, renderIndicator, statusContextPercent, statusContextMeter, effortLabel, shortModelLabel, modelLabel;
 var init_appChrome = __esm({
   "src/components/appChrome.tsx"() {
     "use strict";
@@ -55678,6 +56285,7 @@ var init_appChrome = __esm({
     init_faces();
     init_verbs();
     init_messages();
+    init_usage();
     init_viewport();
     init_subagentTree();
     init_text();
@@ -55710,9 +56318,15 @@ var init_appChrome = __esm({
       const frame = spinner.frames[tick % spinner.frames.length] ?? "\u280B";
       return { frame, intervalMs: Math.max(SPINNER_TICK_MS, spinner.interval), showVerb: false };
     }, "renderIndicator");
-    __name(FaceTicker, "FaceTicker");
+    __name(useTickerText, "useTickerText");
     __name(ctxBarColor, "ctxBarColor");
     __name(ctxBar, "ctxBar");
+    statusContextPercent = /* @__PURE__ */ __name((pct) => formatContextPercent(pct).padStart(5), "statusContextPercent");
+    statusContextMeter = /* @__PURE__ */ __name((bar, pct) => ` \u2502 [${bar}] ${statusContextPercent(pct)}`, "statusContextMeter");
+    __name(fitVisible, "fitVisible");
+    __name(truncateTailVisible, "truncateTailVisible");
+    __name(cwdBranchWidth, "cwdBranchWidth");
+    __name(buildActivityText, "buildActivityText");
     __name(SpawnHud, "SpawnHud");
     __name(SessionDuration, "SessionDuration");
     effortLabel = /* @__PURE__ */ __name((effort) => {
@@ -55722,6 +56336,7 @@ var init_appChrome = __esm({
     shortModelLabel = /* @__PURE__ */ __name((model) => model.split("/").pop().replace(/^claude[-_]/, "").replace(/^anthropic[-_]/, "").replace(/[-_]/g, " ").replace(/\b(\d+)\s+(\d+)\b/g, "$1.$2").trim(), "shortModelLabel");
     modelLabel = /* @__PURE__ */ __name((model, effort, fast) => [shortModelLabel(model), effortLabel(effort), fast ? "fast" : ""].filter(Boolean).join(" "), "modelLabel");
     __name(GoodVibesHeart, "GoodVibesHeart");
+    __name(ActivityStatusLine, "ActivityStatusLine");
     __name(StatusRule, "StatusRule");
     __name(FloatBox, "FloatBox");
     __name(StickyPromptTracker, "StickyPromptTracker");
@@ -59890,9 +60505,9 @@ function MdImpl({ compact, t, text }) {
   const nodes = useMemo14(() => {
     const bucket = cacheBucket(t);
     const cacheKey = `${compact ? "1" : "0"}|${text}`;
-    const cached8 = cacheGet(bucket, cacheKey);
-    if (cached8) {
-      return cached8;
+    const cached7 = cacheGet(bucket, cacheKey);
+    if (cached7) {
+      return cached7;
     }
     const lines = ensureEmojiPresentation(text).split("\n");
     const nodes2 = [];
@@ -61928,26 +62543,34 @@ var init_appLayout = __esm({
       if (ui.statusBar !== at) {
         return null;
       }
-      return /* @__PURE__ */ jsx41(Box_default, { marginTop: at === "top" ? 1 : 0, children: /* @__PURE__ */ jsx41(
-        StatusRule,
-        {
-          bgCount: ui.bgTasks.size,
-          busy: ui.busy,
-          cols: composer.cols,
-          cwdLabel: status.cwdLabel,
-          model: ui.info?.model ?? "",
-          modelFast: ui.info?.fast || ui.info?.service_tier === "priority",
-          modelReasoningEffort: ui.info?.reasoning_effort,
-          sessionStartedAt: status.sessionStartedAt,
-          showCost: ui.showCost,
-          status: ui.status,
-          statusColor: status.statusColor,
-          t: ui.theme,
-          turnStartedAt: status.turnStartedAt,
-          usage: ui.usage,
-          voiceLabel: status.voiceLabel
-        }
-      ) });
+      return /* @__PURE__ */ jsxs28(Box_default, { flexDirection: "column", marginTop: at === "top" ? 1 : 0, children: [
+        /* @__PURE__ */ jsx41(
+          ActivityStatusLine,
+          {
+            busy: ui.busy,
+            cols: composer.cols,
+            status: ui.status,
+            statusColor: status.statusColor,
+            turnStartedAt: status.turnStartedAt
+          }
+        ),
+        /* @__PURE__ */ jsx41(
+          StatusRule,
+          {
+            bgCount: ui.bgTasks.size,
+            cols: composer.cols,
+            cwdLabel: status.cwdLabel,
+            model: ui.info?.model ?? "",
+            modelFast: ui.info?.fast || ui.info?.service_tier === "priority",
+            modelReasoningEffort: ui.info?.reasoning_effort,
+            sessionStartedAt: status.sessionStartedAt,
+            showCost: ui.showCost,
+            t: ui.theme,
+            usage: ui.usage,
+            voiceLabel: status.voiceLabel
+          }
+        )
+      ] });
     }, "StatusRulePane"));
     AppLayout = memo7(/* @__PURE__ */ __name(function AppLayout2({
       actions,