@agent-native/core 0.99.3 → 0.100.1

package/corpus/core/src/client/agent-page/types.ts

@@ -0,0 +1,18 @@
+/**
+ * Shared contracts for the full-page Agent surface (`AgentTabsPage`).
+ *
+ * Ownership note for concurrent implementation work: the page shell and the
+ * Files/MCP/Connect tabs may ADD exports here; the Context and Jobs tab
+ * implementations consume these types but must not edit this file.
+ */
+
+/** Which configuration scope the page-level toggle is showing. */
+export type AgentPageScope = "user" | "org";
+
+/** Props every Agent page tab receives from the page shell. */
+export interface AgentPageTabProps {
+  /** Current scope selected by the page-level Personal/Organization toggle. */
+  scope: AgentPageScope;
+  /** Whether the current user can administer org-scoped agent config. */
+  canManageOrg?: boolean;
+}

package/corpus/core/src/client/agent-page/use-jobs.ts

@@ -0,0 +1,150 @@
+import { useQueryClient } from "@tanstack/react-query";
+
+import { useActionMutation, useActionQuery } from "../use-action.js";
+
+export type JobsScope = "user" | "org";
+
+export interface RecurringJob {
+  id: string;
+  name: string;
+  path: string;
+  scope: "personal" | "organization";
+  schedule: string;
+  scheduleDescription: string;
+  instructions: string;
+  enabled: boolean;
+  lastRun: string | null;
+  lastStatus: string | null;
+  lastError: string | null;
+  nextRun: string | null;
+  createdBy: string | null;
+  canUpdate: boolean;
+}
+
+export interface Automation {
+  id: string;
+  name: string;
+  path: string;
+  scope: "personal" | "organization";
+  triggerType: "event" | "schedule";
+  event: string | null;
+  schedule: string | null;
+  scheduleDescription: string | null;
+  condition: string | null;
+  body: string;
+  enabled: boolean;
+  lastRun: string | null;
+  lastStatus: string | null;
+  lastError: string | null;
+  nextRun: string | null;
+  createdBy: string | null;
+  canUpdate: boolean;
+}
+
+export type ManageJobInput = {
+  operation: "update" | "delete";
+  name: string;
+  scope: "personal" | "organization";
+  enabled?: boolean;
+};
+
+export type ManageAutomationInput = {
+  operation: "update" | "delete";
+  name: string;
+  scope: "personal" | "organization";
+  enabled?: boolean;
+};
+
+function recurringParams(scope: JobsScope) {
+  return { scope: scope === "org" ? "organization" : "personal" } as const;
+}
+
+function automationParams(scope: JobsScope) {
+  return { scope: scope === "org" ? "organization" : "personal" } as const;
+}
+
+export function useRecurringJobs(scope: JobsScope) {
+  return useActionQuery<RecurringJob[]>(
+    "list-recurring-jobs",
+    recurringParams(scope),
+    { staleTime: 5_000 },
+  );
+}
+
+export function useAutomations(scope: JobsScope) {
+  return useActionQuery<Automation[]>(
+    "list-automations",
+    automationParams(scope),
+    { staleTime: 5_000 },
+  );
+}
+
+export function useManageRecurringJob(scope: JobsScope) {
+  const queryClient = useQueryClient();
+  const params = recurringParams(scope);
+  const queryKey = ["action", "list-recurring-jobs", params] as const;
+
+  return useActionMutation<
+    { deleted?: boolean; name: string; enabled?: boolean },
+    ManageJobInput
+  >("manage-recurring-job", {
+    onMutate: async (variables) => {
+      await queryClient.cancelQueries({ queryKey });
+      const previous = queryClient.getQueryData<RecurringJob[]>(queryKey);
+      queryClient.setQueryData<RecurringJob[]>(queryKey, (current) => {
+        if (!current) return current;
+        if (variables.operation === "delete") {
+          return current.filter((job) => job.name !== variables.name);
+        }
+        return current.map((job) =>
+          job.name === variables.name && variables.enabled !== undefined
+            ? { ...job, enabled: variables.enabled }
+            : job,
+        );
+      });
+      return { previous };
+    },
+    onError: (_error, _variables, context) => {
+      const rollback = context as { previous?: RecurringJob[] } | undefined;
+      if (rollback && "previous" in rollback) {
+        queryClient.setQueryData(queryKey, rollback.previous);
+      }
+    },
+  });
+}
+
+export function useManageAutomation(scope: JobsScope) {
+  const queryClient = useQueryClient();
+  const params = automationParams(scope);
+  const queryKey = ["action", "list-automations", params] as const;
+
+  return useActionMutation<
+    { deleted?: boolean; name: string; enabled?: boolean },
+    ManageAutomationInput
+  >("manage-automation", {
+    onMutate: async (variables) => {
+      await queryClient.cancelQueries({ queryKey });
+      const previous = queryClient.getQueryData<Automation[]>(queryKey);
+      queryClient.setQueryData<Automation[]>(queryKey, (current) => {
+        if (!current) return current;
+        if (variables.operation === "delete") {
+          return current.filter(
+            (automation) => automation.name !== variables.name,
+          );
+        }
+        return current.map((automation) =>
+          automation.name === variables.name && variables.enabled !== undefined
+            ? { ...automation, enabled: variables.enabled }
+            : automation,
+        );
+      });
+      return { previous };
+    },
+    onError: (_error, _variables, context) => {
+      const rollback = context as { previous?: Automation[] } | undefined;
+      if (rollback && "previous" in rollback) {
+        queryClient.setQueryData(queryKey, rollback.previous);
+      }
+    },
+  });
+}

package/corpus/core/src/client/context-xray/ContextMeter.tsx

@@ -4,6 +4,10 @@ import type {
   ContextManifest,
   ContextSegmentStatus,
 } from "../../shared/context-xray.js";
+import {
+  manifestConversationTokens,
+  manifestSystemTokens,
+} from "../../shared/context-xray.js";
 import {
   Popover,
   PopoverContent,
@@ -61,9 +65,11 @@ function ContextDonut({ pct, advisory }: { pct: number; advisory: boolean }) {
 
 export function ContextMeter({
   threadId,
+  manifest: providedManifest,
   enabled = true,
 }: {
   threadId?: string | null;
+  manifest?: ContextManifest | null;
   enabled?: boolean;
 }) {
   const [open, setOpen] = useState(false);
@@ -71,7 +77,7 @@ export function ContextMeter({
     Map<string, ContextSegmentStatus>
   >(new Map());
   const currentThreadId = useRef(threadId);
-  const shouldQuery = Boolean(threadId && enabled);
+  const shouldQuery = Boolean(threadId && enabled && !providedManifest);
   const query = useActionQuery(
     "context-manifest-get",
     shouldQuery && threadId ? { threadId } : undefined,
@@ -99,13 +105,21 @@ export function ContextMeter({
     }
   }, [enabled, threadId]);
 
-  const manifest = query.data;
+  const manifest = providedManifest ?? query.data;
   const contextWindow = resolveContextWindow(manifest?.model);
   const pct = manifest
     ? Math.min(100, Math.round((manifest.totalTokens / contextWindow) * 100))
     : 0;
+  const systemTokens = manifest ? manifestSystemTokens(manifest) : 0;
+  const conversationTokens = manifest
+    ? manifestConversationTokens(manifest)
+    : 0;
 
-  if (!shouldQuery || !threadId || !manifest || manifest.rawTokens <= 0) {
+  if (
+    (!shouldQuery && !providedManifest) ||
+    !manifest ||
+    (manifest.rawTokens <= 0 && manifest.totalTokens <= 0)
+  ) {
     return null;
   }
 
@@ -139,9 +153,9 @@ export function ContextMeter({
                 type="button"
                 aria-label={`Context ${pct}%, ${formatTokens(
                   manifest.totalTokens,
-                )}. Open Context X-Ray.`}
+                )}${systemTokens > 0 ? ` total: ${formatTokens(systemTokens)} system + ${formatTokens(conversationTokens)} conversation` : ""}. Open Context X-Ray.`}
                 className={cn(
-                  "flex size-7 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+                  "flex size-7 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
                   open && "bg-accent/60 text-foreground",
                 )}
               >
@@ -151,6 +165,9 @@ export function ContextMeter({
           </TooltipTrigger>
           <TooltipContent>
             Context {pct}% · {formatTokens(manifest.totalTokens)}
+            {systemTokens > 0
+              ? ` (${formatTokens(systemTokens)} system + ${formatTokens(conversationTokens)} conversation)`
+              : ""}
           </TooltipContent>
         </Tooltip>
         <PopoverContent

package/corpus/core/src/client/context-xray/ContextTreemap.tsx

@@ -1,7 +1,10 @@
 import { useEffect, useRef, useState } from "react";
 import { Treemap } from "recharts";
 
-import type { ContextManifestSegment } from "../../shared/context-xray.js";
+import type {
+  ContextManifestSegment,
+  ContextManifestSystemSection,
+} from "../../shared/context-xray.js";
 import { formatTokens, groupFill } from "./format.js";
 
 interface TreemapDatum {
@@ -47,9 +50,11 @@ function TreemapContent(props: any) {
 
 export function ContextTreemap({
   segments,
+  systemSections = [],
   onSelect,
 }: {
   segments: ContextManifestSegment[];
+  systemSections?: ContextManifestSystemSection[];
   onSelect?: (segmentId: string) => void;
 }) {
   const containerRef = useRef<HTMLDivElement>(null);
@@ -62,6 +67,16 @@ export function ContextTreemap({
       group: segment.group,
       segmentId: segment.segmentId,
     }));
+  data.push(
+    ...systemSections
+      .filter((section) => section.tokenCount > 0)
+      .map((section) => ({
+        name: section.label,
+        size: section.tokenCount,
+        group: `System · ${section.governance}`,
+        segmentId: section.segmentId,
+      })),
+  );
 
   useEffect(() => {
     const element = containerRef.current;

package/corpus/core/src/client/context-xray/ContextXRayPanel.tsx

@@ -2,6 +2,7 @@ import {
   IconChartTreemap,
   IconChevronDown,
   IconChevronRight,
+  IconLock,
   IconListDetails,
 } from "@tabler/icons-react";
 import { useMemo, useState } from "react";
@@ -9,13 +10,19 @@ import { useMemo, useState } from "react";
 import type {
   ContextManifest,
   ContextManifestSegment,
+  ContextManifestSystemSection,
   ContextSegmentStatus,
 } from "../../shared/context-xray.js";
+import {
+  manifestConversationTokens,
+  manifestSystemTokens,
+} from "../../shared/context-xray.js";
 import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
 } from "../components/ui/tooltip.js";
+import { useT } from "../i18n.js";
 import { cn } from "../utils.js";
 import { ContextSegmentRow } from "./ContextSegmentRow.js";
 import { ContextTreemap } from "./ContextTreemap.js";
@@ -72,6 +79,69 @@ function groupedSegments(segments: ContextManifestSegment[]): Group[] {
   });
 }
 
+const GOVERNANCE_ORDER = ["required", "inherited", "user"] as const;
+
+function governanceLabel(
+  governance: ContextManifestSystemSection["governance"],
+  t: (key: string, options?: Record<string, unknown>) => string,
+): string {
+  switch (governance) {
+    case "required":
+      return t("contextXray.governance.required", {
+        defaultValue: "Required",
+      });
+    case "inherited":
+      return t("contextXray.governance.inherited", {
+        defaultValue: "Inherited",
+      });
+    case "user":
+      return t("contextXray.governance.user", {
+        defaultValue: "Your context",
+      });
+  }
+}
+
+function sourceLabel(section: ContextManifestSystemSection): string {
+  return (
+    section.sourceRef?.path ??
+    section.sourceRef?.resourceId ??
+    section.sourceRef?.scope ??
+    "framework"
+  );
+}
+
+function SystemSectionRow({
+  section,
+  totalTokens,
+}: {
+  section: ContextManifestSystemSection;
+  totalTokens: number;
+}) {
+  const share =
+    totalTokens > 0 ? Math.round((section.tokenCount / totalTokens) * 100) : 0;
+  return (
+    <div className="flex min-h-12 items-start gap-2 rounded-sm px-2 py-1.5">
+      <span className="mt-1 flex size-6 shrink-0 items-center justify-center rounded-md text-muted-foreground">
+        <IconLock className="h-3.5 w-3.5" />
+      </span>
+      <div className="min-w-0 flex-1">
+        <div className="truncate text-[13px] font-medium leading-5 text-foreground">
+          {section.label}
+        </div>
+        <div className="truncate text-[11px] text-muted-foreground">
+          {sourceLabel(section)} · {formatTokens(section.tokenCount)} tokens ·{" "}
+          {share}%{section.tokenMethod === "estimate" ? " · estimated" : ""}
+        </div>
+        {section.preview ? (
+          <div className="mt-0.5 line-clamp-2 text-[11px] text-muted-foreground/80">
+            {section.preview}
+          </div>
+        ) : null}
+      </div>
+    </div>
+  );
+}
+
 export function ContextXRayPanel({
   manifest,
   optimistic,
@@ -85,6 +155,7 @@ export function ContextXRayPanel({
   onEvict: (segmentId: string) => void;
   onRestore: (segmentId: string) => void;
 }) {
+  const t = useT();
   const [mode, setMode] = useState<"list" | "map">("list");
   const [collapsed, setCollapsed] = useState<Set<string>>(new Set());
   const segments = useMemo(
@@ -92,6 +163,33 @@ export function ContextXRayPanel({
     [manifest.segments, optimistic],
   );
   const groups = useMemo(() => groupedSegments(segments), [segments]);
+  const systemSections = manifest.systemSections ?? [];
+  const systemGroups = useMemo(() => {
+    const grouped = new Map<
+      ContextManifestSystemSection["governance"],
+      ContextManifestSystemSection[]
+    >();
+    for (const section of systemSections) {
+      const list = grouped.get(section.governance) ?? [];
+      list.push(section);
+      grouped.set(section.governance, list);
+    }
+    return GOVERNANCE_ORDER.flatMap((governance) => {
+      const sections = grouped.get(governance);
+      return sections && sections.length > 0
+        ? [
+            {
+              governance,
+              sections,
+              tokens: sections.reduce(
+                (sum, section) => sum + section.tokenCount,
+                0,
+              ),
+            },
+          ]
+        : [];
+    });
+  }, [systemSections]);
   const contextWindow = resolveContextWindow(manifest.model);
   const pct = Math.min(
     100,
@@ -100,8 +198,12 @@ export function ContextXRayPanel({
   const headroom = Math.max(0, contextWindow - manifest.totalTokens);
   const pinned = segments.filter((s) => s.status === "pinned").length;
   const evicted = segments.filter((s) => s.status === "evicted").length;
+  const systemTokens = manifestSystemTokens(manifest);
+  const conversationTokens = manifestConversationTokens(manifest);
   const details = [
     `${formatTokens(headroom)} free`,
+    systemTokens > 0 ? `${formatTokens(systemTokens)} system` : null,
+    `${formatTokens(conversationTokens)} conversation`,
     pinned > 0 ? `${pinned} pinned` : null,
     evicted > 0 ? `${evicted} evicted` : null,
     manifest.tokenCountMethod === "estimate" ? "estimated" : null,
@@ -150,7 +252,7 @@ export function ContextXRayPanel({
                   onClick={() => setMode("list")}
                   aria-label="Show context list"
                   className={cn(
-                    "flex size-7 items-center justify-center rounded text-muted-foreground",
+                    "flex size-7 cursor-pointer items-center justify-center rounded text-muted-foreground",
                     mode === "list"
                       ? "bg-background text-foreground shadow-sm"
                       : "hover:text-foreground",
@@ -168,7 +270,7 @@ export function ContextXRayPanel({
                   onClick={() => setMode("map")}
                   aria-label="Show context map"
                   className={cn(
-                    "flex size-7 items-center justify-center rounded text-muted-foreground",
+                    "flex size-7 cursor-pointer items-center justify-center rounded text-muted-foreground",
                     mode === "map"
                       ? "bg-background text-foreground shadow-sm"
                       : "hover:text-foreground",
@@ -185,6 +287,7 @@ export function ContextXRayPanel({
         {mode === "map" ? (
           <ContextTreemap
             segments={segments}
+            systemSections={systemSections}
             onSelect={(segmentId) => {
               const segment = segments.find((s) => s.segmentId === segmentId);
               if (segment) setCollapsed(new Set());
@@ -192,6 +295,68 @@ export function ContextXRayPanel({
           />
         ) : (
           <div className="divide-y divide-border/60">
+            {systemGroups.length > 0 && (
+              <div>
+                <div className="px-1.5 pb-1 pt-2 text-[10px] font-semibold uppercase tracking-[0.12em] text-muted-foreground">
+                  {t("contextXray.systemOrdered", {
+                    defaultValue: "System · ordered, not evictable",
+                  })}
+                </div>
+                {systemGroups.map((group) => {
+                  const groupKey = `system:${group.governance}`;
+                  const isCollapsed = collapsed.has(groupKey);
+                  return (
+                    <div key={groupKey}>
+                      <button
+                        type="button"
+                        onClick={() => {
+                          setCollapsed((prev) => {
+                            const next = new Set(prev);
+                            if (next.has(groupKey)) next.delete(groupKey);
+                            else next.add(groupKey);
+                            return next;
+                          });
+                        }}
+                        className="flex w-full cursor-pointer items-center gap-2 rounded-sm px-1.5 py-2 text-left hover:bg-accent/35"
+                      >
+                        {isCollapsed ? (
+                          <IconChevronRight className="h-3.5 w-3.5 text-muted-foreground" />
+                        ) : (
+                          <IconChevronDown className="h-3.5 w-3.5 text-muted-foreground" />
+                        )}
+                        <IconLock className="h-3 w-3 text-muted-foreground" />
+                        <span className="min-w-0 flex-1 truncate text-xs font-medium">
+                          {governanceLabel(group.governance, t)}
+                        </span>
+                        <span className="text-[11px] text-muted-foreground">
+                          {formatTokens(group.tokens)} ·{" "}
+                          {manifest.totalTokens > 0
+                            ? Math.round(
+                                (group.tokens / manifest.totalTokens) * 100,
+                              )
+                            : 0}
+                          %
+                        </span>
+                      </button>
+                      {!isCollapsed && (
+                        <div className="pb-1">
+                          {group.sections
+                            .slice()
+                            .sort((a, b) => b.tokenCount - a.tokenCount)
+                            .map((section) => (
+                              <SystemSectionRow
+                                key={section.segmentId}
+                                section={section}
+                                totalTokens={manifest.totalTokens}
+                              />
+                            ))}
+                        </div>
+                      )}
+                    </div>
+                  );
+                })}
+              </div>
+            )}
             {groups.map((group) => {
               const isCollapsed = collapsed.has(group.name);
               return (
@@ -206,7 +371,7 @@ export function ContextXRayPanel({
                         return next;
                       });
                     }}
-                    className="flex w-full items-center gap-2 rounded-sm px-1.5 py-2 text-left hover:bg-accent/35"
+                    className="flex w-full cursor-pointer items-center gap-2 rounded-sm px-1.5 py-2 text-left hover:bg-accent/35"
                   >
                     {isCollapsed ? (
                       <IconChevronRight className="h-3.5 w-3.5 text-muted-foreground" />

package/corpus/core/src/client/context-xray/format.ts

@@ -41,6 +41,9 @@ export function groupColor(group: string): string {
   if (group === "Files read") return "bg-sky-500";
   if (group === "Thinking") return "bg-violet-500";
   if (group === "Task & instructions") return "bg-rose-500";
+  if (group === "System · required") return "bg-slate-700";
+  if (group === "System · inherited") return "bg-indigo-500";
+  if (group === "System · user") return "bg-teal-500";
   return "bg-slate-400";
 }
 
@@ -50,5 +53,8 @@ export function groupFill(group: string): string {
   if (group === "Files read") return "#0ea5e9";
   if (group === "Thinking") return "#8b5cf6";
   if (group === "Task & instructions") return "#f43f5e";
+  if (group === "System · required") return "#334155";
+  if (group === "System · inherited") return "#6366f1";
+  if (group === "System · user") return "#14b8a6";
   return "#94a3b8";
 }

package/corpus/core/src/client/index.ts

@@ -594,6 +594,11 @@ export {
   type AgentPanelProps,
   type AgentSidebarProps,
 } from "./AgentPanel.js";
+export {
+  AgentTabsPage,
+  type AgentTabsPageProps,
+} from "./agent-page/AgentTabsPage.js";
+export type { AgentPageScope, AgentPageTabProps } from "./agent-page/types.js";
 export {
   AGENT_CHAT_HOME_HANDOFF_TTL_MS,
   AGENT_CHAT_VIEW_TRANSITION_CLASS,
@@ -838,6 +843,7 @@ export {
   type ResourceTreeProps,
   type ResourceEditorProps,
 } from "./resources/index.js";
+export type { ResourcesPanelProps } from "./resources/ResourcesPanel.js";
 export {
   HistoryTimeline,
   VersionHistoryPanel,

package/corpus/core/src/client/resources/ResourcesPanel.tsx

@@ -1004,15 +1004,34 @@ Workspace resources are for files users intentionally add, edit, or manage. Agen
 const WORKSPACE_RESOURCE_OWNER = "__workspace__";
 const SHARED_RESOURCE_OWNER = "__shared__";
 
-export function ResourcesPanel() {
+export interface ResourcesPanelProps {
+  /** Hide the virtual MCP folder when Files is hosted by the Agent page. */
+  showMcpServers?: boolean;
+  /** Optional page-level scope to mirror in the resource toolbar. */
+  scope?: ResourceScope;
+}
+
+export function resolveInitialResourceScope(
+  requestedScope: ResourceScope | undefined,
+  canEditOrg: boolean,
+): ResourceScope {
+  if (requestedScope === "shared") return "shared";
+  if (requestedScope === "personal") return "personal";
+  return canEditOrg ? "shared" : "personal";
+}
+
+export function ResourcesPanel({
+  showMcpServers = true,
+  scope: requestedScope,
+}: ResourcesPanelProps = {}) {
   const { data: org } = useOrg();
   // Non-admin org members get read-only access to organization resources.
   // Solo deployments (no orgId) behave as owner — users can edit their own.
   const canEditOrg =
     !org?.orgId || org.role === "owner" || org.role === "admin";
 
-  const [activeScope, setActiveScope] = useState<ResourceScope>(
-    canEditOrg ? "shared" : "personal",
+  const [activeScope, setActiveScope] = useState<ResourceScope>(() =>
+    resolveInitialResourceScope(requestedScope, canEditOrg),
   );
   const [selectedResourceId, setSelectedResourceId] = useState<string | null>(
     null,
@@ -1074,27 +1093,31 @@ export function ResourcesPanel() {
   // `handleSelect` and `handleDelete` below recognize to route back to
   // the MCP endpoints.
   const personalTree = withAgentScratchFolder(
-    withMcpServersFolder(
-      personalTreeQuery.data ?? [],
-      mcpServersQuery.data?.user ?? [],
-      {
-        builtins: (builtinCapabilitiesQuery.data?.capabilities ?? []).map(
-          (capability) => ({ capability, scope: "user" as const }),
-        ),
-      },
-    ),
+    showMcpServers
+      ? withMcpServersFolder(
+          personalTreeQuery.data ?? [],
+          mcpServersQuery.data?.user ?? [],
+          {
+            builtins: (builtinCapabilitiesQuery.data?.capabilities ?? []).map(
+              (capability) => ({ capability, scope: "user" as const }),
+            ),
+          },
+        )
+      : (personalTreeQuery.data ?? []),
     { show: showAgentScratch },
   );
   const sharedTree = withAgentScratchFolder(
-    withMcpServersFolder(
-      sharedTreeQuery.data ?? [],
-      mcpServersQuery.data?.org ?? [],
-      {
-        builtins: (builtinCapabilitiesQuery.data?.capabilities ?? []).map(
-          (capability) => ({ capability, scope: "org" as const }),
-        ),
-      },
-    ),
+    showMcpServers
+      ? withMcpServersFolder(
+          sharedTreeQuery.data ?? [],
+          mcpServersQuery.data?.org ?? [],
+          {
+            builtins: (builtinCapabilitiesQuery.data?.capabilities ?? []).map(
+              (capability) => ({ capability, scope: "org" as const }),
+            ),
+          },
+        )
+      : (sharedTreeQuery.data ?? []),
     { show: showAgentScratch },
   );
   const workspaceTree = workspaceTreeQuery.data ?? [];
@@ -1132,10 +1155,15 @@ export function ResourcesPanel() {
 
   // Sync activeScope once the org role arrives (canEditOrg is resolved async).
   useEffect(() => {
-    if (!canEditOrg && activeScope === "shared") {
+    if (!requestedScope && !canEditOrg && activeScope === "shared") {
       setActiveScope("personal");
     }
-  }, [canEditOrg, activeScope]);
+  }, [canEditOrg, activeScope, requestedScope]);
+
+  useEffect(() => {
+    if (!requestedScope) return;
+    setActiveScope(requestedScope);
+  }, [requestedScope]);
   // Virtual MCP ids aren't in the resources store — skip the fetch so
   // useResource doesn't 404-flash.
   const resourceQuery = useResource(