@raingor/pi-web-switch 0.4.1 → 0.4.2

package/src/components/dashboard/DashboardPage.tsx

@@ -67,9 +67,10 @@ interface UsageRangeData {
     totalCost: number;
     totalRequests: number;
   }[];
+  notice?: "no-config" | "api-error";
 }
 
-type SourceKey = "all" | "pi" | "cindy-pi" | "claude" | "codex" | "opencode" | "gemini" | "grok";
+type SourceKey = "all" | "pi" | "cindy-pi" | "claude" | "codex" | "opencode" | "gemini" | "grok" | "atomcode" | "copilot";
 type RangeKey = "today" | "7d" | "30d" | "custom";
 type TabKey = "log" | "provider" | "model";
 type SortDir = "asc" | "desc";
@@ -116,21 +117,35 @@ function formatCostShort(n: number): string {
 }
 
 function formatDateShort(dateStr: string): string {
-  const d = new Date(dateStr + "T00:00:00");
-  return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+  // Parse as a China-time (UTC+8) calendar date and format in that timezone.
+  const [y, m, dNum] = dateStr.split("-").map(Number);
+  if (!y || !m || !dNum) return dateStr;
+  const d = new Date(Date.UTC(y, m - 1, dNum));
+  return d.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric",
+    timeZone: "Asia/Shanghai",
+  });
 }
 
-function localDateStr(d: Date): string {
-  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+function cnTodayStr(): string {
+  // "YYYY-MM-DD" in China time (UTC+8), independent of system timezone.
+  return new Intl.DateTimeFormat("en-CA", {
+    timeZone: "Asia/Shanghai",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+  }).format(new Date());
 }
 
 /** Previous period of equal length, for period-over-period trends. */
 function getPrevRange(range: RangeKey): { from: string; to: string } | null {
-  const now = new Date();
   const shift = (days: number) => {
-    const d = new Date(now);
-    d.setDate(d.getDate() - days);
-    return localDateStr(d);
+    // Start from China-time "today" and shift by whole days using UTC math.
+    const [y, m, dNum] = cnTodayStr().split("-").map(Number);
+    const t = Date.UTC(y ?? 0, (m ?? 1) - 1, dNum ?? 1) - days * 86400000;
+    const d = new Date(t);
+    return `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}-${String(d.getUTCDate()).padStart(2, "0")}`;
   };
   if (range === "today") return { from: shift(1), to: shift(1) };
   if (range === "7d") return { from: shift(13), to: shift(7) };
@@ -290,7 +305,7 @@ export function DashboardPage() {
 
   const customInvalid = range === "custom" && !!customFrom && !!customTo && customFrom > customTo;
 
-  const fetchData = useCallback(() => {
+  const fetchData = useCallback((force = false) => {
     if (!initialized || customInvalid) return;
     let baseUrl = "/api/pi/usage-range";
     if (source === "all") baseUrl = "/api/pi/all-usage-range";
@@ -300,7 +315,10 @@ export function DashboardPage() {
     else if (source === "opencode") baseUrl = "/api/pi/opencode-usage-range";
     else if (source === "gemini") baseUrl = "/api/pi/gemini-usage-range";
     else if (source === "grok") baseUrl = "/api/pi/grok-usage-range";
-    let url = `${baseUrl}?range=${range}`;
+    else if (source === "atomcode") baseUrl = "/api/pi/atomcode-usage-range";
+    else if (source === "copilot") baseUrl = "/api/pi/copilot-usage-range";
+    // force=true adds refresh=1 so the API rescan bypasses its 30s session cache
+    let url = `${baseUrl}?range=${range}${force ? "&refresh=1" : ""}`;
     if (range === "custom" && customFrom) {
       url += `&from=${customFrom}&to=${customTo || customFrom}`;
     }
@@ -342,7 +360,7 @@ export function DashboardPage() {
     return () => clearInterval(id);
   }, [autoRefresh, refreshInterval, fetchData]);
 
-  const today = new Date().toISOString().split("T")[0];
+  const today = cnTodayStr();
 
   // Chart data: hourly for "today", daily for 7d/30d/custom
   const rawBreakdown = range === "today" ? data?.hourlyBreakdown : data?.dailyBreakdown;
@@ -408,6 +426,8 @@ export function DashboardPage() {
           { key: "opencode" as SourceKey, label: "dashboard.source_opencode", icon: "🔷" },
           { key: "gemini" as SourceKey, label: "dashboard.source_gemini", icon: "✨" },
           { key: "grok" as SourceKey, label: "dashboard.source_grok", icon: "🌀" },
+          { key: "atomcode" as SourceKey, label: "dashboard.source_atomcode", icon: "⚛️" },
+          { key: "copilot" as SourceKey, label: "dashboard.source_copilot", icon: "🐙" },
         ]).map((s) => (
           <button
             key={s.key}
@@ -432,6 +452,18 @@ export function DashboardPage() {
             {data ? t("dashboard.requests_count", String(data.requestLog.length), formatCost(data.totalCost, currency)) : ""}
             {lastUpdated && <span className="ml-2">· {t("dashboard.last_updated", lastUpdated)}</span>}
           </p>
+          {data?.notice && (
+            <p
+              className="mt-1 inline-flex items-center gap-1.5 rounded-lg border px-2.5 py-1 text-xs"
+              style={{
+                borderColor: data.notice === "no-config" ? "#f59e0b" : "#ef4444",
+                color: data.notice === "no-config" ? "#f59e0b" : "#f87171",
+                backgroundColor: data.notice === "no-config" ? "#f59e0b11" : "#ef444411",
+              }}
+            >
+              {data.notice === "no-config" ? t("dashboard.copilot_not_configured") : t("dashboard.copilot_api_error")}
+            </p>
+          )}
         </div>
         <div className="flex items-center gap-2">
           <button
@@ -444,7 +476,7 @@ export function DashboardPage() {
             {currency}
           </button>
           <button
-            onClick={() => { fetchData(); }}
+            onClick={() => { fetchData(true); }}
             className="flex items-center gap-1.5 rounded-lg border px-3 py-1.5 text-xs font-medium transition-colors hover:bg-gray-800/30"
             style={{ borderColor: "var(--card-border)", color: "var(--muted-text)", backgroundColor: "var(--card-bg)" }}
             title={t("dashboard.refresh_now")}

package/src/components/layout/Sidebar.tsx

@@ -4,10 +4,9 @@ import {
   Settings,
   History,
   Brain,
-  Globe,
   Plug,
   Users,
-  MessageSquare,
+  Globe,
 } from "lucide-react";
 import { cn } from "@/lib/utils";
 import { useTranslation, LANGUAGES } from "@/lib/i18n";
@@ -15,7 +14,6 @@ import { useState } from "react";
 
 const navItems = [
   { to: "/", icon: LayoutDashboard, key: "nav.dashboard" },
-  { to: "/chat", icon: MessageSquare, key: "nav.chat" },
   { to: "/sessions", icon: History, key: "nav.sessions" },
   { to: "/memory", icon: Brain, key: "nav.memory" },
   { to: "/providers", icon: Plug, key: "nav.providers_models" },
@@ -35,10 +33,21 @@ export function Sidebar() {
         borderColor: "var(--sidebar-border)",
       }}
     >
-      {/* Logo */}
+      {/* Logo — pt-12 leaves room for the macOS traffic-light buttons in the
+          immersive (hiddenInset) title bar so they don't overlap the logo.
+          WebkitAppRegion: drag restores window dragging since the native
+          title bar is hidden. */}
       <div
-        className="flex items-center gap-3 border-b px-6 py-5"
-        style={{ borderColor: "var(--sidebar-border)" }}
+        className="flex items-center gap-3 border-b px-6 pt-12 pb-5"
+        style={{
+          borderColor: "var(--sidebar-border)",
+          userSelect: "none",
+          WebkitUserSelect: "none",
+          // Electron-only: lets the user drag the frameless (hiddenInset) window
+          // from the sidebar header. TypeScript doesn't know the non-standard
+          // -webkit-app-region property, so cast it explicitly.
+          ...({ WebkitAppRegion: "drag" } as React.CSSProperties),
+        }}
       >
         <img src="/pi.svg" alt="pi-switch" className="h-9 w-9 rounded-lg" />
         <div>

package/src/components/providers/ProvidersModelsPage.tsx

@@ -115,11 +115,11 @@ interface ParsedImport {
 }
 
 const IMPORT_LABEL_RE =
-  /(?<![\w/.\-])(apikey|api_key|api-key|key|token|secret|密钥|金鑰|baseurl|base_url|base-url|url|endpoint|地址|接口|provider|name|名称|名稱|供应商|供應商|model_ids?|modelids?|models?|模型)\s*[:：](?!\/\/)/gi;
+  /(?<![\w/.\-])(apikey|api_key|api-key|keys?|token|secret|密钥|金鑰|baseurl|base_url|base-url|url|endpoint|地址|接口|provider|name|名称|名稱|供应商|供應商|model_ids?|modelids?|models?|模型)\s*[:：](?!\/\/)/gi;
 
 function importField(label: string): "name" | "baseUrl" | "apiKey" | "models" {
   const l = label.toLowerCase();
-  if (/^(apikey|api_key|api-key|key|token|secret|密钥|金鑰)$/.test(l)) return "apiKey";
+  if (/^(apikey|api_key|api-key|keys?|token|secret|密钥|金鑰)$/.test(l)) return "apiKey";
   if (/^(baseurl|base_url|base-url|url|endpoint|地址|接口)$/.test(l)) return "baseUrl";
   if (/^(provider|name|名称|名稱|供应商|供應商)$/.test(l)) return "name";
   return "models";
@@ -658,6 +658,9 @@ function ProviderDetail({ provider, onDelete, onDuplicate, onRenamed }: { provid
   const [supportsDeveloperRole, setSupportsDeveloperRole] = useState(
     provider.compat?.supportsDeveloperRole ?? false
   );
+  const [supportsFinishReason, setSupportsFinishReason] = useState(
+    provider.compat?.supportsFinishReason ?? true
+  );
   const [saveState, setSaveState] = useState<"idle" | "saving" | "saved" | "error">("idle");
 
   // ─── Quick add (inline, one-liner) ───
@@ -857,7 +860,7 @@ function ProviderDetail({ provider, onDelete, onDuplicate, onRenamed }: { provid
   const urlInvalid = baseUrl.trim() !== "" && !isValidHttpUrl(baseUrl.trim());
 
   const dirty =
-    (isCustom && (providerName !== (provider.name ?? "") || baseUrl !== (provider.baseUrl ?? "") || api !== (provider.api ?? "openai-completions") || supportsDeveloperRole !== (provider.compat?.supportsDeveloperRole ?? true))) ||
+    (isCustom && (providerName !== (provider.name ?? "") || baseUrl !== (provider.baseUrl ?? "") || api !== (provider.api ?? "openai-completions") || supportsDeveloperRole !== (provider.compat?.supportsDeveloperRole ?? true) || supportsFinishReason !== (provider.compat?.supportsFinishReason ?? true))) ||
     (!isCustom && (baseUrl !== (provider.baseUrl ?? "") || api !== (provider.api ?? "openai-completions"))) ||
     apiKey !== savedKey;
 
@@ -870,7 +873,7 @@ function ProviderDetail({ provider, onDelete, onDuplicate, onRenamed }: { provid
         baseUrl: baseUrl || undefined,
         api,
         apiKey: apiKey || undefined,
-        compat: { supportsDeveloperRole },
+        compat: { ...provider.compat, supportsDeveloperRole, supportsFinishReason },
       };
       // pi's model picker shows the provider key, not the display name, so
       // rename the key too when the name changes (references get rewritten).
@@ -1050,6 +1053,21 @@ function ProviderDetail({ provider, onDelete, onDuplicate, onRenamed }: { provid
         </label>
       </div>
 
+      {/* Finish Reason Support */}
+      <div className="flex items-center gap-2">
+        <input
+          id="supports-finish-reason"
+          type="checkbox"
+          checked={supportsFinishReason}
+          onChange={(e) => setSupportsFinishReason(e.target.checked)}
+          className="rounded border-gray-600 bg-gray-800 text-blue-500"
+        />
+        <label htmlFor="supports-finish-reason" className="text-sm text-gray-400">
+          <span>{t("compat.supports_finish_reason")}</span>
+          <span className="ml-2 text-xs text-gray-500">{t("compat.supports_finish_reason_desc")}</span>
+        </label>
+      </div>
+
       {/* Save / Test / Feedback row */}
       <div className="flex flex-wrap items-center gap-3">
         {dirty && (
@@ -1742,6 +1760,23 @@ function ModelForm({ initial, onSubmit, onCancel }: ModelFormProps) {
             onChange={(e) => setContextWindow(parseInt(e.target.value) || DEFAULT_CONTEXT_WINDOW)}
             className="mt-1 w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-2 text-sm text-white"
           />
+          <div className="mt-1 flex flex-wrap gap-1">
+            {[32_768, 128_000, 200_000, 1_000_000].map((v) => (
+              <button
+                key={v}
+                type="button"
+                onClick={() => setContextWindow(v)}
+                className={cn(
+                  "rounded border px-1.5 py-0.5 text-[10px] font-mono transition-colors",
+                  (form.contextWindow ?? DEFAULT_CONTEXT_WINDOW) === v
+                    ? "border-blue-500 bg-blue-500/20 text-blue-300"
+                    : "border-gray-700 bg-gray-800 text-gray-400 hover:border-gray-500 hover:text-gray-200"
+                )}
+              >
+                {formatTokens(v)}
+              </button>
+            ))}
+          </div>
         </div>
         <div>
           <label className="block text-xs font-medium text-gray-400">{t("models.max_tokens")}</label>
@@ -1751,6 +1786,23 @@ function ModelForm({ initial, onSubmit, onCancel }: ModelFormProps) {
             onChange={(e) => setMaxTokens(parseInt(e.target.value) || DEFAULT_MAX_TOKENS)}
             className="mt-1 w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-2 text-sm text-white"
           />
+          <div className="mt-1 flex flex-wrap gap-1">
+            {[4096, 8192, 16_384, 32_768, 65_536, 131_072].map((v) => (
+              <button
+                key={v}
+                type="button"
+                onClick={() => setMaxTokens(v)}
+                className={cn(
+                  "rounded border px-1.5 py-0.5 text-[10px] font-mono transition-colors",
+                  (form.maxTokens ?? DEFAULT_MAX_TOKENS) === v
+                    ? "border-blue-500 bg-blue-500/20 text-blue-300"
+                    : "border-gray-700 bg-gray-800 text-gray-400 hover:border-gray-500 hover:text-gray-200"
+                )}
+              >
+                {formatTokens(v)}
+              </button>
+            ))}
+          </div>
         </div>
       </div>
 

package/src/components/sessions/SessionsPage.tsx

@@ -3,7 +3,7 @@ import { useConfigStore } from "@/store/config-store";
 import { useTranslation } from "@/lib/i18n";
 import {
   History, MessageSquare, Clock, ChevronDown, ChevronRight, Trash2, AlertTriangle,
-  Shield, RefreshCw, Undo2, Eye, Folder, FolderOpen, FileText, Search,
+  Shield, RefreshCw, Undo2, Eye, Folder, FolderOpen, FileText, Search, ArchiveX,
 } from "lucide-react";
 import { Modal } from "@/components/ui/Modal";
 
@@ -466,7 +466,7 @@ function findParentProjectPath(node: TreeNode): string {
 
 export function SessionsPage() {
   const { t } = useTranslation();
-  const { initialized } = useConfigStore();
+  const { initialized, settings } = useConfigStore();
   const [tab, setTab] = useState<"sessions" | "trash">("sessions");
   const [groups, setGroups] = useState<ProjectGroup[]>([]);
   const [trash, setTrash] = useState<TrashEntry[]>([]);
@@ -480,6 +480,7 @@ export function SessionsPage() {
   const [selectedTrash, setSelectedTrash] = useState<Set<string>>(new Set());
   const [purgeTarget, setPurgeTarget] = useState<"batch" | TrashEntry | null>(null);
   const [purging, setPurging] = useState(false);
+  const [expiring, setExpiring] = useState(false);
   // Preview modal state
   const [previewTarget, setPreviewTarget] = useState<SessionInfo | null>(null);
   const [preview, setPreview] = useState<{ messages: PreviewMessage[]; total: number } | null>(null);
@@ -575,6 +576,27 @@ export function SessionsPage() {
     loadAll();
   };
 
+  const handleAutoExpire = async () => {
+    setExpiring(true);
+    try {
+      const res = await fetch("/api/pi/session/auto-expire", { method: "POST" });
+      const result = await res.json();
+      if (result.success) {
+        const count = result.expired?.length ?? 0;
+        alert(count > 0
+          ? t("sessions.auto_expire_success", String(count))
+          : t("sessions.auto_expire_none"));
+        loadAll();
+      } else {
+        alert(t("sessions.auto_expire_error", result.error || "unknown"));
+      }
+    } catch {
+      alert(t("sessions.auto_expire_error", "network"));
+    } finally {
+      setExpiring(false);
+    }
+  };
+
   const openPreview = (session: SessionInfo) => {
     setPreviewTarget(session);
     setPreview(null);
@@ -701,6 +723,18 @@ function countExpandableNodes(nodes: TreeNode[]): number {
             <RefreshCw className={refreshing ? "h-3.5 w-3.5 animate-spin" : "h-3.5 w-3.5"} />
             {t("sessions.refresh")}
           </button>
+          {tab === "sessions" && groups.length > 0 && (
+            <button
+              onClick={handleAutoExpire}
+              disabled={expiring}
+              className="flex items-center gap-1.5 rounded-lg border px-3 py-1.5 text-xs font-medium transition-colors"
+              style={{ borderColor: "var(--card-border)", color: "var(--muted-text)", backgroundColor: "var(--card-bg)", opacity: expiring ? 0.6 : 1 }}
+              title={t("sessions.auto_expire_tooltip", String(settings?.sessionExpiryDays ?? 7))}
+            >
+              <ArchiveX className={expiring ? "h-3.5 w-3.5 animate-spin" : "h-3.5 w-3.5"} />
+              {t("sessions.auto_expire")}
+            </button>
+          )}
         </div>
       </div>
 

package/src/components/settings/SettingsPage.tsx

@@ -27,6 +27,7 @@ import {
   CloudDownload,
   RefreshCw,
   ZoomIn,
+  KeyRound,
 } from "lucide-react";
 
 type SettingsTab = "appearance" | "models" | "advanced";
@@ -116,6 +117,37 @@ export function SettingsPage() {
   const [updateError, setUpdateError] = useState(false);
   const [applying, setApplying] = useState(false);
   const [applyMessage, setApplyMessage] = useState<{ ok: number; failNames: string[] } | null>(null);
+  // GitHub Copilot usage API config (username + classic PAT).
+  const [copilotCfg, setCopilotCfg] = useState<{ username: string; token: string }>({ username: "", token: "" });
+  const [copilotSaving, setCopilotSaving] = useState(false);
+  const [copilotMsg, setCopilotMsg] = useState<{ ok: boolean; text: string } | null>(null);
+
+  useEffect(() => {
+    fetch("/api/pi/copilot-config")
+      .then((r) => r.json())
+      .then((cfg: { username?: string; token?: string }) =>
+        setCopilotCfg({ username: cfg.username ?? "", token: cfg.token ?? "" })
+      )
+      .catch(() => {});
+  }, []);
+
+  const handleSaveCopilot = async () => {
+    setCopilotSaving(true);
+    setCopilotMsg(null);
+    try {
+      const res = await fetch("/api/pi/copilot-config", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(copilotCfg),
+      });
+      const { success } = (await res.json()) as { success: boolean };
+      setCopilotMsg({ ok: !!success, text: success ? t("settings.copilot_saved") : t("settings.copilot_save_failed") });
+    } catch {
+      setCopilotMsg({ ok: false, text: t("settings.copilot_save_failed") });
+    } finally {
+      setCopilotSaving(false);
+    }
+  };
 
   const handleCheckUpdates = async () => {
     setCheckingUpdates(true);
@@ -563,6 +595,46 @@ export function SettingsPage() {
             })()}
           </Card>
 
+          <Card icon={KeyRound} title={t("settings.copilot_title")} desc={t("settings.copilot_desc")}>
+            <div className="max-w-md space-y-3">
+              <div>
+                <label className="mb-1 block text-xs text-gray-500">{t("settings.copilot_username")}</label>
+                <input
+                  type="text"
+                  value={copilotCfg.username}
+                  onChange={(e) => setCopilotCfg({ ...copilotCfg, username: e.target.value })}
+                  placeholder="octocat"
+                  className="w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-1.5 text-sm text-white placeholder-gray-600"
+                />
+              </div>
+              <div>
+                <label className="mb-1 block text-xs text-gray-500">{t("settings.copilot_token")}</label>
+                <input
+                  type="password"
+                  value={copilotCfg.token}
+                  onChange={(e) => setCopilotCfg({ ...copilotCfg, token: e.target.value })}
+                  placeholder="ghp_…"
+                  className="w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-1.5 text-sm text-white placeholder-gray-600"
+                />
+              </div>
+              <div className="flex items-center gap-3">
+                <button
+                  onClick={handleSaveCopilot}
+                  disabled={copilotSaving}
+                  className="flex items-center gap-1.5 rounded-lg border border-gray-700 bg-gray-800 px-4 py-1.5 text-sm text-gray-300 hover:bg-gray-700 disabled:opacity-60"
+                >
+                  {copilotSaving ? t("settings.copilot_saving") : t("settings.copilot_save")}
+                </button>
+                {copilotMsg && (
+                  <span className={cn("text-xs", copilotMsg.ok ? "text-emerald-400" : "text-red-400")}>
+                    {copilotMsg.text}
+                  </span>
+                )}
+              </div>
+              <p className="text-[11px] leading-relaxed text-gray-500">{t("settings.copilot_token_hint")}</p>
+            </div>
+          </Card>
+
           <Card icon={Package} title={t("settings.packages")}>
             {(settings?.packages ?? []).length > 0 && (
               <div className="mb-4 flex flex-wrap gap-1.5">

package/src/lib/translations/en.ts

@@ -64,7 +64,6 @@ const en: Record<string, string> = {
 
   "nav.sessions": "Sessions",
   "nav.memory": "Memory",
-  "nav.chat": "Chat",
   "nav.settings": "Settings",
   "app.subtitle": "Configuration Manager",
   "app.version": "pi-switch v0.1.0",
@@ -110,6 +109,10 @@ const en: Record<string, string> = {
   "dashboard.source_opencode": "OpenCode",
   "dashboard.source_gemini": "Gemini",
   "dashboard.source_grok": "Grok",
+  "dashboard.source_atomcode": "AtomCode",
+  "dashboard.source_copilot": "Copilot",
+  "dashboard.copilot_not_configured": "GitHub Copilot not configured — add username & token in Settings → Advanced",
+  "dashboard.copilot_api_error": "Failed to fetch Copilot usage from GitHub API — check token and billing platform",
   "dashboard.requests_count": "{0} requests · {1} total cost",
   "dashboard.range.today": "Today",
   "dashboard.range.7d": "7 Days",
@@ -200,6 +203,8 @@ const en: Record<string, string> = {
   "compat.desc": "Override default behavior for OpenAI-compatible providers that don't support certain features.",
   "compat.supports_developer_role": "Supports developer role",
   "compat.supports_developer_role_desc": "Send system prompt as 'developer' role (for reasoning models). Disable if the API only accepts 'system' role.",
+  "compat.supports_finish_reason": "Strict finish_reason check",
+  "compat.supports_finish_reason_desc": "Require streamed responses to include finish_reason, otherwise fail. Disable to infer the stop reason automatically when the upstream drops the stream (common with free models).",
   "compat.supports_reasoning_effort": "Supports reasoning_effort",
   "compat.supports_reasoning_effort_desc": "Send reasoning_effort parameter. Disable if the API does not support it.",
 
@@ -237,6 +242,11 @@ const en: Record<string, string> = {
   "sessions.delete_error": "Error deleting session",
   "sessions.load_failed": "Failed to load sessions",
   "sessions.refresh": "Refresh",
+  "sessions.auto_expire": "Auto-Expire",
+  "sessions.auto_expire_tooltip": "Move sessions inactive for {0} days to trash",
+  "sessions.auto_expire_success": "Moved {0} expired sessions to trash",
+  "sessions.auto_expire_none": "No expired sessions found",
+  "sessions.auto_expire_error": "Auto-expire failed: {0}",
   "sessions.expand_all": "Expand All",
   "sessions.collapse_all": "Collapse All",
   "sessions.more_count": "{0} more",
@@ -302,6 +312,15 @@ const en: Record<string, string> = {
   "settings.ui_zoom_desc": "Scale the entire interface by percentage (50%–200%)",
   "settings.ui_zoom_reset": "Reset",
   "settings.enabled_models_desc": "Click a tag to enable or disable a model",
+  "settings.copilot_title": "GitHub Copilot",
+  "settings.copilot_desc": "Track Copilot usage from the GitHub billing API (premium requests / AI credits)",
+  "settings.copilot_username": "GitHub username",
+  "settings.copilot_token": "Token (classic PAT)",
+  "settings.copilot_save": "Save",
+  "settings.copilot_saving": "Saving…",
+  "settings.copilot_saved": "Saved — usage will refresh on next dashboard load",
+  "settings.copilot_save_failed": "Save failed",
+  "settings.copilot_token_hint": "Create a classic personal access token at github.com/settings/tokens (fine-grained tokens are not supported by the billing usage endpoints). Copilot usage only appears for accounts on the enhanced billing platform.",
   "settings.updates_title": "Update Check",
   "settings.updates_desc": "Check npm for new versions of pi core and installed extensions.",
   "settings.check_updates": "Check for Updates",
@@ -350,63 +369,6 @@ const en: Record<string, string> = {
   "loading.error_title": "Failed to Load Configuration",
   "loading.retry": "Retry",
 
-  // Chat
-  "chat.sessions": "Sessions",
-  "chat.new_session": "New session",
-  "chat.loading": "Loading...",
-  "chat.no_sessions": "No sessions yet. Click + to start a new chat.",
-  "chat.welcome_title": "Welcome to Pi Chat",
-  "chat.welcome_desc": "Select a session from the sidebar, or click + to start a new chat session in a project directory.",
-  "chat.select_cwd": "Select Working Directory",
-  "chat.cancel": "Cancel",
-  "chat.start_chat": "Start Chat",
-  "chat.delete_confirm": "Delete this session? This cannot be undone.",
-  "chat.delete": "Delete",
-  "chat.loading_session": "Loading session...",
-  "chat.thinking": "Thinking...",
-  "chat.running_tool": "Running tool...",
-  "chat.running_command": "Running command...",
-  "chat.send_message": "Send a message... (/ for commands, ! for bash)",
-  "chat.type_to_steer": "Type to steer...",
-  "chat.compacting": "Compacting context...",
-  "chat.compaction_failed": "Compaction failed: {0}",
-  "chat.retrying": "Retrying ({0}/{1}){2}",
-  "chat.steering_queued": "{0} steering, {1} follow-up queued",
-  "chat.recall": "Recall",
-  "chat.default_tools": "Default tools",
-  "chat.all_tools": "All tools",
-  "chat.no_tools": "No tools",
-  "chat.auto": "Auto",
-  "chat.no_model": "No model",
-  "chat.no_models_available": "No models available. Check your model configuration.",
-  "chat.search_models": "Search models...",
-  "chat.no_models_found": "No models found",
-  "chat.models_count": "{0} models",
-  "chat.models_filtered": "{0} of {1} models",
-  "chat.attach_image": "Attach image",
-  "chat.tool_preset": "Tool preset",
-  "chat.compact_context": "Compact context",
-  "chat.stop": "Stop",
-  "chat.send": "Send",
-  "chat.fork_from_here": "Fork from here",
-  "chat.show_less": "Show less",
-  "chat.show_more": "Show {0} more characters",
-  "chat.tool_call": "tool call",
-  "chat.thinking_collapsed": "Thinking (collapsed)",
-  "chat.thinking_label": "Thinking",
-  "chat.result": "result",
-  "chat.error_label": "(error)",
-  "chat.exit_code": "exit",
-  "chat.msg_count": "{0} msg",
-  "chat.untitled": "Untitled",
-  "chat.just_now": "just now",
-  "chat.min_ago": "{0}m ago",
-  "chat.hr_ago": "{0}h ago",
-  "chat.day_ago": "{0}d ago",
-  "chat.invalid_directory": "Invalid directory",
-  "chat.expand_all": "Expand all",
-  "chat.collapse_all": "Collapse all",
-
   // Language Switcher
   "language.label": "Language",
   "language.en": "English",