@tablestore/tablestore-agent-cli 0.3.1 → 0.4.0

package/dist/dashboard-runtime/dashboard/src/components/memory/memory-scope-bar.tsx

@@ -1,10 +1,12 @@
 "use client";
 
 import { useEffect, useMemo, useRef, useState } from "react";
+import Link from "next/link";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import {
   Check,
   ChevronDown,
+  ChevronRight,
   ChevronUp,
   ChevronsUpDown,
   RotateCcw,
@@ -14,7 +16,6 @@ import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import {
   Command,
-  CommandEmpty,
   CommandGroup,
   CommandInput,
   CommandItem,
@@ -35,17 +36,26 @@ import {
 } from "@/lib/memory";
 import {
   clearRecentMemoryScopes,
-  excludeRecentMemoryScopes,
   isAllWildcardMemoryScope,
   readRecentMemoryScopes,
   rememberRecentMemoryScope,
 } from "@/lib/memory-scope-history";
 import { useAllMemoryStoreScopes } from "@/hooks/use-memory-store-scopes";
 import { cn } from "@/lib/utils";
+import { buildScopeWorkspaceHref, toExactScope } from "@/lib/scope-workspace";
 import { useI18n } from "@/i18n/i18n-context";
-import type { TranslateFn } from "@/i18n/i18n-context";
+import type { MessageKey, TranslateFn } from "@/i18n/i18n-context";
 import { useDataScopeKey } from "@/providers/runtime-context-provider";
 import type { MemoryScope } from "@/types/memory";
+import { ScopeHierarchyPicker } from "./scope-hierarchy-picker";
+import {
+  filterScopeTuples,
+  normalizeHierarchicalScope,
+  scopeBreadcrumb,
+  scopeGranularity,
+  type ScopeGranularity,
+  type ScopeLevel,
+} from "@/lib/scope-hierarchy";
 
 const FIELD_KEYS: Array<{
   key: keyof MemoryScope;
@@ -70,6 +80,21 @@ const WILDCARD_SCOPE: MemoryScope = {
 };
 const NO_SCOPES: MemoryScope[] = [];
 
+const ALL_CHILDREN_KEY: Record<ScopeLevel, MessageKey> = {
+  app: "memory.scopeHierarchy.allApps",
+  tenant: "memory.scopeHierarchy.allTenants",
+  agent: "memory.scopeHierarchy.allAgents",
+  run: "memory.scopeHierarchy.allRuns",
+};
+
+const GRANULARITY_KEY: Record<ScopeGranularity, MessageKey> = {
+  all: "memory.scopeHierarchy.allRange",
+  app: "memory.scopeHierarchy.appRange",
+  tenant: "memory.scopeHierarchy.tenantRange",
+  agent: "memory.scopeHierarchy.agentRange",
+  run: "memory.scopeHierarchy.runRange",
+};
+
 type RecentMemoryScopeStorage = Pick<
   Storage,
   "getItem" | "setItem" | "removeItem"
@@ -108,15 +133,7 @@ export function isMemoryScopeSelected(
 export function normalizeMemoryScopeForApply(
   scope: MemoryScope,
 ): MemoryScope | null {
-  const appId = (scope.appId ?? "").trim();
-  if (!appId) return null;
-
-  return {
-    appId,
-    tenantId: (scope.tenantId ?? "").trim() || undefined,
-    agentId: (scope.agentId ?? "").trim() || undefined,
-    runId: (scope.runId ?? "").trim() || undefined,
-  };
+  return normalizeHierarchicalScope(scope);
 }
 
 export function MemoryScopeBar({
@@ -146,6 +163,11 @@ export function MemoryScopeBar({
   const [pickerOpen, setPickerOpen] = useState(false);
 
   const storeName = pathname.split("/").filter(Boolean)[1];
+  const exactScope = toExactScope(currentScope);
+  const workspaceHref =
+    allowScopeDiscovery && storeName && exactScope
+      ? buildScopeWorkspaceHref(decodeURIComponent(storeName), exactScope)
+      : null;
   const recentScopeId =
     allowScopeDiscovery && storeName
       ? JSON.stringify([dataScopeKey, storeName])
@@ -157,6 +179,8 @@ export function MemoryScopeBar({
   const recentScopes =
     recentState.scopeId === recentScopeId ? recentState.scopes : NO_SCOPES;
   const hasWildcard = hasWildcardScope(currentScope);
+  const currentBreadcrumb = scopeBreadcrumb(currentScope);
+  const currentGranularity = scopeGranularity(currentScope);
 
   // Hydrate browser history separately from the online inventory. Carrying
   // the composite identity in state prevents one render of the old runtime or
@@ -202,10 +226,6 @@ export function MemoryScopeBar({
     enabled: allowScopeDiscovery,
   });
   const knownScopes = scopeQuery.data?.items ?? NO_SCOPES;
-  const knownScopesWithoutRecent = useMemo(
-    () => excludeRecentMemoryScopes(knownScopes, recentScopes),
-    [knownScopes, recentScopes],
-  );
   const knownTruncated = scopeQuery.data?.truncated ?? false;
   const isWildcardSelected = isAllWildcardMemoryScope(currentScope);
 
@@ -260,7 +280,7 @@ export function MemoryScopeBar({
 
   function pickFromList(scope: MemoryScope) {
     if (!applyScope(scope)) return;
-    setDraft(scope);
+    setDraft(normalizeHierarchicalScope(scope) ?? scope);
     setPickerOpen(false);
     setExpanded(false);
   }
@@ -270,18 +290,40 @@ export function MemoryScopeBar({
       <CardContent className="p-4">
         {/* Collapsed: scope chips + picker + edit toggle */}
         <div className="flex items-center justify-between gap-4">
-          <div className="flex flex-wrap items-center gap-3">
+          <div className="flex min-w-0 flex-wrap items-center gap-3">
             <Settings2 className="h-4 w-4 text-muted-foreground" />
-            {FIELDS.map(({ key, label }) => (
-              <div key={key} className="flex items-center gap-1.5">
-                <span className="text-xs font-medium text-muted-foreground">
-                  {label}
-                </span>
-                <span className="rounded-md bg-[hsl(var(--muted))] px-2.5 py-1 text-xs font-mono text-[hsl(var(--foreground))]">
-                  {currentScope[key] ?? "—"}
-                </span>
-              </div>
-            ))}
+            <div className="flex min-w-0 items-center gap-1 overflow-x-auto">
+              {currentBreadcrumb.map((item, index) => (
+                <div
+                  key={item.level}
+                  className="flex min-w-0 items-center gap-1"
+                >
+                  {index > 0 ? (
+                    <ChevronRight className="h-3 w-3 shrink-0 text-muted-foreground" />
+                  ) : null}
+                  <span
+                    className={cn(
+                      "max-w-36 truncate rounded px-1.5 py-1 text-xs",
+                      item.concrete
+                        ? "font-mono font-medium text-[hsl(var(--foreground))]"
+                        : "text-muted-foreground",
+                    )}
+                    title={
+                      item.concrete
+                        ? item.value
+                        : t(ALL_CHILDREN_KEY[item.level])
+                    }
+                  >
+                    {item.concrete
+                      ? item.value
+                      : t(ALL_CHILDREN_KEY[item.level])}
+                  </span>
+                </div>
+              ))}
+            </div>
+            <span className="rounded-full bg-[hsl(var(--muted))] px-2 py-1 text-[10px] font-medium text-muted-foreground">
+              {t(GRANULARITY_KEY[currentGranularity])}
+            </span>
           </div>
           <div className="flex shrink-0 items-center gap-2">
             {hasWildcard && (
@@ -289,13 +331,20 @@ export function MemoryScopeBar({
                 {t("memory.scopeBar.readOnly")}
               </span>
             )}
+            {workspaceHref ? (
+              <Button asChild size="sm" variant="secondary">
+                <Link href={workspaceHref}>
+                  {t("memory.scopeBar.openWorkspace")}
+                </Link>
+              </Button>
+            ) : null}
             {allowScopeDiscovery ? (
               <ScopePicker
                 open={pickerOpen}
                 onOpenChange={setPickerOpen}
                 currentScope={currentScope}
                 recentScopes={recentScopes}
-                knownScopes={knownScopesWithoutRecent}
+                knownScopes={knownScopes}
                 isLoading={scopeQuery.isLoading}
                 isError={scopeQuery.isError}
                 isFetching={scopeQuery.isFetching}
@@ -423,9 +472,19 @@ function ScopePicker({
     ? t("memory.common.allData")
     : scopeLabel(currentScope);
   const searchInputRef = useRef<HTMLInputElement>(null);
+  const [search, setSearch] = useState("");
+  const visibleRecentScopes = useMemo(
+    () => filterScopeTuples(recentScopes, search),
+    [recentScopes, search],
+  );
+
+  function handleOpenChange(next: boolean) {
+    onOpenChange(next);
+    if (!next) setSearch("");
+  }
 
   return (
-    <Popover open={open} onOpenChange={onOpenChange}>
+    <Popover open={open} onOpenChange={handleOpenChange}>
       <PopoverTrigger asChild>
         <Button
           variant="outline"
@@ -437,20 +496,15 @@ function ScopePicker({
         </Button>
       </PopoverTrigger>
       <PopoverContent align="end" className="w-[420px] p-0">
-        <Command shouldFilter>
+        <Command shouldFilter={false}>
           <CommandInput
             ref={searchInputRef}
             placeholder={t("memory.common.searchScopePlaceholder")}
             className="text-xs"
+            value={search}
+            onValueChange={setSearch}
           />
           <CommandList className="max-h-[360px]">
-            <CommandEmpty>
-              {isLoading
-                ? t("common.loading")
-                : isError
-                  ? t("memory.scopeCombobox.loadFailed")
-                  : t("memory.common.noMatchingScope")}
-            </CommandEmpty>
             <CommandGroup heading={t("memory.common.presets")}>
               <CommandItem
                 value="* wildcard 全部数据"
@@ -468,13 +522,13 @@ function ScopePicker({
                 </span>
               </CommandItem>
             </CommandGroup>
-            {recentScopes.length > 0 && (
+            {visibleRecentScopes.length > 0 && (
               <CommandGroup
                 heading={t("memory.common.recentScopes", {
-                  count: recentScopes.length,
+                  count: visibleRecentScopes.length,
                 })}
               >
-                {recentScopes.map((scope) => {
+                {visibleRecentScopes.map((scope) => {
                   const label = scopeLabel(scope);
                   const identity = memoryScopeIdentity(scope);
                   const isSelected = isMemoryScopeSelected(scope, currentScope);
@@ -497,41 +551,19 @@ function ScopePicker({
                 })}
               </CommandGroup>
             )}
-            {knownScopes.length > 0 && (
-              <CommandGroup
-                heading={
-                  truncated
-                    ? t("memory.common.knownScopesTruncated", {
-                        count: knownScopes.length,
-                      })
-                    : t("memory.common.knownScopes", {
-                        count: knownScopes.length,
-                      })
-                }
-              >
-                {knownScopes.map((scope) => {
-                  const label = scopeLabel(scope);
-                  const identity = memoryScopeIdentity(scope);
-                  const isSelected = isMemoryScopeSelected(scope, currentScope);
-                  return (
-                    <CommandItem
-                      key={`known-${identity}`}
-                      value={`known ${identity} ${label}`}
-                      onSelect={() => onPickScope(scope)}
-                      className="text-xs"
-                    >
-                      <Check
-                        className={cn(
-                          "mr-2 h-3.5 w-3.5",
-                          isSelected ? "opacity-100" : "opacity-0",
-                        )}
-                      />
-                      <span className="font-mono truncate">{label}</span>
-                    </CommandItem>
-                  );
-                })}
-              </CommandGroup>
-            )}
+            <ScopeHierarchyPicker
+              scopes={knownScopes}
+              currentScope={currentScope}
+              search={search}
+              onSearchChange={setSearch}
+              onApply={onPickScope}
+              loading={isLoading}
+              error={isError}
+              truncated={truncated}
+              onRetry={onRefresh}
+              allowPartial
+              t={t}
+            />
           </CommandList>
           <div className="flex items-center justify-between border-t border-[hsl(var(--border-light))] px-2 py-1.5 text-[10px] text-muted-foreground">
             <span>

package/dist/dashboard-runtime/dashboard/src/components/memory/scope-combobox.tsx

@@ -1,17 +1,10 @@
 "use client";
 
 import { useMemo, useState } from "react";
-import { Check, ChevronsUpDown } from "lucide-react";
+import { ChevronsUpDown } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
-import {
-  Command,
-  CommandEmpty,
-  CommandGroup,
-  CommandInput,
-  CommandItem,
-  CommandList,
-} from "@/components/ui/command";
+import { Command, CommandInput, CommandList } from "@/components/ui/command";
 import {
   Popover,
   PopoverContent,
@@ -22,6 +15,8 @@ import { scopeLabel } from "@/lib/memory";
 import { cn } from "@/lib/utils";
 import { useI18n, type MessageKey } from "@/i18n/i18n-context";
 import type { MemoryScope } from "@/types/memory";
+import { ScopeHierarchyPicker } from "./scope-hierarchy-picker";
+import type { ScopeLevel } from "@/lib/scope-hierarchy";
 
 const WILDCARD: MemoryScope = {
   appId: "*",
@@ -108,12 +103,18 @@ export function ScopeCombobox({
   disabled,
   placeholder,
   className,
+  allowPartial = false,
+  currentScope = WILDCARD,
+  maxLevel = "run",
 }: {
   memoryStoreName: string | undefined;
   onPick: (scope: MemoryScope) => void;
   disabled?: boolean;
   placeholder?: string;
   className?: string;
+  allowPartial?: boolean;
+  currentScope?: MemoryScope;
+  maxLevel?: ScopeLevel;
 }) {
   const { t } = useI18n();
   const [open, setOpen] = useState(false);
@@ -131,8 +132,8 @@ export function ScopeCombobox({
     placeholder ?? t("memory.scopeCombobox.defaultPlaceholder");
 
   const matches = useMemo(() => filterScopes(scopes, search), [scopes, search]);
-  const visible = matches.slice(0, windowSize);
-  const hasMore = visible.length < matches.length;
+  const shownCount = Math.min(matches.length, windowSize);
+  const hasMore = shownCount < matches.length;
 
   const showMore = () => setWindowSize((n) => n + SCOPE_WINDOW_SIZE);
 
@@ -184,44 +185,24 @@ export function ScopeCombobox({
               if (hasMore && isNearListBottom(e.currentTarget)) showMore();
             }}
           >
-            <CommandEmpty>
-              {query.isLoading
-                ? t("common.loading")
-                : query.isError
-                  ? t("memory.scopeCombobox.loadFailed")
-                  : search
-                    ? t("memory.common.noMatchingScope")
-                    : t("memory.scopeCombobox.empty")}
-            </CommandEmpty>
-            {visible.length > 0 && (
-              // 标题只报命中数；服务端截断由状态条统一表达，避免「仅前 3 条」
-              // 这种把搜索命中数说成服务端上限的读法。
-              <CommandGroup
-                heading={t("memory.common.knownScopes", {
-                  count: matches.length,
-                })}
-              >
-                {visible.map((scope, idx) => {
-                  const label = scopeLabel(scope);
-                  return (
-                    <CommandItem
-                      key={`${label}-${idx}`}
-                      value={label}
-                      onSelect={() => {
-                        onPick(scope);
-                        handleOpenChange(false);
-                      }}
-                      className="text-xs"
-                    >
-                      <Check className="mr-2 h-3.5 w-3.5 opacity-0" />
-                      <span className="min-w-0 truncate font-mono">
-                        {label}
-                      </span>
-                    </CommandItem>
-                  );
-                })}
-              </CommandGroup>
-            )}
+            <ScopeHierarchyPicker
+              scopes={matches}
+              currentScope={currentScope}
+              search={search}
+              onSearchChange={setSearch}
+              onApply={(scope) => {
+                onPick(scope);
+                handleOpenChange(false);
+              }}
+              loading={query.isLoading}
+              error={query.isError}
+              truncated={truncated}
+              onRetry={() => query.refetch()}
+              allowPartial={allowPartial}
+              optionLimit={windowSize}
+              maxLevel={maxLevel}
+              t={t}
+            />
           </CommandList>
           {/* 状态条留在 CommandList 之外：它不属于 [cmdk-list]，因此永远不会
               被搜索过滤掉或被 cmdk 的排序搬走。 */}
@@ -236,7 +217,7 @@ export function ScopeCombobox({
                 }),
                 // 各 key 只会用到其中一部分占位符，多余的会被 interpolate 忽略。
                 {
-                  shown: visible.length,
+                  shown: shownCount,
                   total: matches.length,
                   count: matches.length,
                 },