fix(provider): use native upgrade commands and recalc usage status

- switch Claude and OpenCode update commands to their native CLIs
- derive provider usage status from current windows and drop stale warnings
- use the latest user message for thread activity and restyle quoted context labels

Author: tyulyukov

apps/server/src/provider/providerVersionLifecycle.test.ts

@@ -45,7 +45,7 @@ describe("providerVersionLifecycle", () => {
       status: "behind_latest",
       currentVersion: "2.1.110",
       latestVersion: "2.1.117",
-      updateCommand: "npm install -g @anthropic-ai/claude-code@latest",
+      updateCommand: "claude upgrade",
       canUpdate: true,
       message: "Install the update now or review provider settings.",
     });

apps/server/src/provider/providerVersionLifecycle.ts

@@ -31,10 +31,10 @@ const PROVIDER_VERSION_LIFECYCLES = {
   claudeAgent: {
     provider: "claudeAgent",
     packageName: "@anthropic-ai/claude-code",
-    updateCommand: "npm install -g @anthropic-ai/claude-code@latest",
-    updateExecutable: "npm",
-    updateArgs: ["install", "-g", "@anthropic-ai/claude-code@latest"],
-    updateLockKey: "npm-global",
+    updateCommand: "claude upgrade",
+    updateExecutable: "claude",
+    updateArgs: ["upgrade"],
+    updateLockKey: "claude",
   },
   cursor: {
     provider: "cursor",
@@ -47,10 +47,10 @@ const PROVIDER_VERSION_LIFECYCLES = {
   opencode: {
     provider: "opencode",
     packageName: "opencode-ai",
-    updateCommand: "npm install -g opencode-ai@latest",
-    updateExecutable: "npm",
-    updateArgs: ["install", "-g", "opencode-ai@latest"],
-    updateLockKey: "npm-global",
+    updateCommand: "opencode upgrade",
+    updateExecutable: "opencode",
+    updateArgs: ["upgrade"],
+    updateLockKey: "opencode",
   },
 } as const satisfies Record<ProviderKind, ProviderVersionLifecycle>;
 

apps/web/src/components/ChatView.tsx

@@ -106,6 +106,7 @@ import {
   useStore,
 } from "../store";
 import {
+  createSidebarThreadSummarySelectorByRef,
   createProjectSelectorByRef,
   createThreadSelectorByRef,
   createThreadSelectorAcrossEnvironments,
@@ -320,12 +321,16 @@ const threadPlanCatalogCache = new LRUCache<{
   entry: ThreadPlanCatalogEntry;
 }>(MAX_THREAD_PLAN_CATALOG_CACHE_ENTRIES, MAX_THREAD_PLAN_CATALOG_CACHE_MEMORY_BYTES);
 
-function deriveActiveThreadActivityIso(thread: Thread): string {
+function deriveActiveThreadActivityIso(
+  thread: Thread,
+  latestUserMessageAt: string | null | undefined,
+): string | undefined {
+  if (latestUserMessageAt) return latestUserMessageAt;
   for (let i = thread.messages.length - 1; i >= 0; i--) {
     const message = thread.messages[i];
     if (message?.role === "user") return message.createdAt;
   }
-  return thread.updatedAt ?? thread.createdAt;
+  return undefined;
 }
 
 function estimateThreadPlanCatalogEntrySize(thread: Thread): number {
@@ -767,6 +772,9 @@ export default function ChatView({
         : scopeThreadRef("" as EnvironmentId, threadId),
     [activeThreadEnvironmentId, threadId],
   );
+  const activeSidebarThreadSummary = useStore(
+    useMemo(() => createSidebarThreadSummarySelectorByRef(threadRef), [threadRef]),
+  );
   const setStoreThreadError = useStore((store) => store.setError);
   const markThreadVisited = useUiStateStore((store) => store.markThreadVisited);
   const activeThreadLastVisitedAt = useUiStateStore(
@@ -4790,7 +4798,10 @@ export default function ChatView({
           activeThreadId={activeThread.id}
           activeThreadEnvironmentId={activeThreadEnvironmentId!}
           activeThreadTitle={activeThread.title}
-          activeThreadActivityAt={deriveActiveThreadActivityIso(activeThread)}
+          activeThreadActivityAt={deriveActiveThreadActivityIso(
+            activeThread,
+            activeSidebarThreadSummary?.latestUserMessageAt,
+          )}
           activeProjectName={activeProject?.name}
           activeProjectCwd={activeProject?.cwd ?? null}
           isGitRepo={isGitRepo}

apps/web/src/components/chat/UserMessageQuotedContextLabel.tsx

@@ -42,12 +42,12 @@ function QuotedContextEntry({ ctx, panelId }: { ctx: ParsedQuotedContextEntry; p
     "rounded-md rounded-l-none border-l-2 transition-colors",
     isDiff
       ? "border-emerald-400/70 bg-emerald-500/8 hover:bg-emerald-500/12 dark:border-emerald-400/70 dark:bg-emerald-400/8 dark:hover:bg-emerald-400/12"
-      : "border-violet-400/70 bg-violet-500/8 hover:bg-violet-500/12 dark:border-violet-400/70 dark:bg-violet-400/8 dark:hover:bg-violet-400/12",
+      : "border-primary/60 bg-primary/15 hover:bg-primary/20",
   );
 
   const headerClass = cn(
     "flex w-full items-center gap-1.5 rounded-md rounded-l-none px-2.5 py-1.5 text-left text-xs font-medium",
-    isDiff ? "text-emerald-700 dark:text-emerald-300" : "text-violet-700 dark:text-violet-300",
+    isDiff ? "text-emerald-700 dark:text-emerald-300" : "text-primary",
   );
 
   const headerInner = (

apps/web/src/components/settings/SettingsPanels.tsx

@@ -147,7 +147,7 @@ const PROVIDER_SETTINGS: readonly InstallProviderSettings[] = [
     title: "Claude",
     binaryPlaceholder: "Claude binary path",
     binaryDescription: "Path to the Claude binary",
-    defaultUpdateCommand: "npm install -g @anthropic-ai/claude-code@latest",
+    defaultUpdateCommand: "claude upgrade",
   },
   {
     provider: "cursor",
@@ -162,7 +162,7 @@ const PROVIDER_SETTINGS: readonly InstallProviderSettings[] = [
     title: "OpenCode",
     binaryPlaceholder: "OpenCode binary path",
     binaryDescription: "Path to the OpenCode binary",
-    defaultUpdateCommand: "npm install -g opencode-ai@latest",
+    defaultUpdateCommand: "opencode upgrade",
     serverUrlPlaceholder: "http://127.0.0.1:4096",
     serverUrlDescription: "Leave blank to let MarCode spawn the server when needed",
     serverPasswordPlaceholder: "Server password (optional)",

apps/web/src/lib/providerUsage.test.ts

@@ -40,6 +40,55 @@ describe("providerUsage", () => {
     ]);
   });
 
+  it("does not keep an old Claude warning after the same window resets", () => {
+    const snapshot = deriveLatestProviderUsageSnapshot([
+      makeActivity("activity-1", {
+        type: "rate_limit_event",
+        rate_limit_info: {
+          status: "allowed_warning",
+          resetsAt: 1776582000,
+          rateLimitType: "five_hour",
+          utilization: 0.97,
+        },
+      }),
+      makeActivity("activity-2", {
+        type: "rate_limit_event",
+        rate_limit_info: {
+          status: "allowed",
+          resetsAt: 1776600000,
+          rateLimitType: "five_hour",
+          utilization: 0,
+        },
+      }),
+    ]);
+
+    expect(snapshot?.providerLabel).toBe("Claude");
+    expect(snapshot?.status).toBe("ok");
+    expect(snapshot?.windows).toEqual([
+      {
+        label: "Session (5 hrs)",
+        usedPercent: 0,
+        resetsAt: 1776600000,
+      },
+    ]);
+  });
+
+  it("marks current provider usage as rejected at 90 percent or higher", () => {
+    const snapshot = deriveLatestProviderUsageSnapshot([
+      makeActivity("activity-1", {
+        type: "rate_limit_event",
+        rate_limit_info: {
+          status: "allowed_warning",
+          resetsAt: 1776582000,
+          rateLimitType: "five_hour",
+          utilization: 0.97,
+        },
+      }),
+    ]);
+
+    expect(snapshot?.status).toBe("rejected");
+  });
+
   it("derives Codex primary and secondary rate-limit windows", () => {
     const snapshot = deriveLatestProviderUsageSnapshot([
       makeActivity("activity-1", {

apps/web/src/lib/providerUsage.ts

@@ -60,6 +60,19 @@ const CLAUDE_WINDOW_LABELS: Record<string, string> = {
   overage: "Overage",
 };
 
+function statusFromWindows(
+  windows: ReadonlyArray<RateLimitWindow>,
+): ProviderUsageSnapshot["status"] {
+  const maxPercent = Math.max(...windows.map((window) => window.usedPercent), 0);
+  if (maxPercent >= 90) {
+    return "rejected";
+  }
+  if (maxPercent >= 70) {
+    return "warning";
+  }
+  return "ok";
+}
+
 function normalizeClaudeRateLimitEvent(
   payload: Record<string, unknown>,
 ): Omit<ProviderUsageSnapshot, "updatedAt"> | null {
@@ -103,13 +116,10 @@ function normalizeClaudeRateLimitEvent(
     return null;
   }
 
-  const status: ProviderUsageSnapshot["status"] =
-    statusRaw === "rejected" ? "rejected" : statusRaw === "allowed_warning" ? "warning" : "ok";
-
   return {
     providerLabel: "Claude",
     windows,
-    status,
+    status: statusFromWindows(windows),
   };
 }
 
@@ -189,14 +199,10 @@ function normalizeCodexRateLimits(
     return null;
   }
 
-  const maxPercent = Math.max(...windows.map((w) => w.usedPercent));
-  const status: ProviderUsageSnapshot["status"] =
-    maxPercent >= 100 ? "rejected" : maxPercent >= 80 ? "warning" : "ok";
-
   return {
     providerLabel: "Codex",
     windows,
-    status,
+    status: statusFromWindows(windows),
   };
 }
 
@@ -257,7 +263,6 @@ export function deriveLatestProviderUsageSnapshot(
 ): ProviderUsageSnapshot | null {
   const windowsByLabel = new Map<string, RateLimitWindow>();
   let providerLabel: string | null = null;
-  let latestStatus: ProviderUsageSnapshot["status"] = "ok";
   let latestUpdatedAt: string | null = null;
 
   // Walk backwards so the first match for each label wins (most recent).
@@ -274,7 +279,6 @@ export function deriveLatestProviderUsageSnapshot(
 
     if (providerLabel === null) {
       providerLabel = result.providerLabel;
-      latestStatus = result.status;
       latestUpdatedAt = activity.createdAt;
     }
 
@@ -288,23 +292,18 @@ export function deriveLatestProviderUsageSnapshot(
         windowsByLabel.set(window.label, window);
       }
     }
-
-    // Escalate status if a worse status was seen in an older event.
-    if (result.status === "rejected") {
-      latestStatus = "rejected";
-    } else if (result.status === "warning" && latestStatus === "ok") {
-      latestStatus = "warning";
-    }
   }
 
   if (providerLabel === null || windowsByLabel.size === 0 || latestUpdatedAt === null) {
     return null;
   }
 
+  const windows = Array.from(windowsByLabel.values());
+
   return {
     providerLabel,
-    windows: Array.from(windowsByLabel.values()),
-    status: latestStatus,
+    windows,
+    status: statusFromWindows(windows),
     updatedAt: latestUpdatedAt,
   };
 }