@tablestore/tablestore-agent-cli 0.1.9 → 0.2.1

package/dist/dashboard-runtime/dashboard/src/components/documents/doc-upload-dialog.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState, useCallback, useMemo, useRef } from "react";
-import { Upload, X, FileText, ChevronDown, ChevronRight, FolderOpen } from "lucide-react";
+import { Upload, X, FileText, ChevronDown, ChevronRight, FolderOpen, Cloud } from "lucide-react";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -24,9 +24,23 @@ import {
 import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
 import { Checkbox } from "@/components/ui/checkbox";
 import { useUploadDocuments } from "@/hooks/use-upload-documents";
+import { useOssImport } from "@/hooks/use-oss-import";
+import {
+  filterFolderFiles,
+  parseExtensionList,
+  type RecursiveExtensionRules,
+} from "@/lib/extension-filter";
+import { buildFolderGlobs } from "@/lib/glob-filter";
+import { partitionSelection, type OssSelection } from "@/lib/oss-selection";
 import { cn } from "@/lib/utils";
 import type { MetadataField } from "@/types/knowledge-base";
 
+import {
+  OssImportTab,
+  EMPTY_OSS_FILTER,
+  type OssImportFilterState,
+} from "./oss-import-tab";
+
 interface DocUploadDialogProps {
   knowledgeBaseName: string;
   metadataFields?: MetadataField[];
@@ -35,7 +49,7 @@ interface DocUploadDialogProps {
   onOpenChange: (open: boolean) => void;
 }
 
-type UploadMode = "file" | "folder";
+type UploadMode = "file" | "folder" | "oss";
 
 /** Convert form string values to typed values based on field type */
 function convertMetadataValues(
@@ -75,25 +89,6 @@ function convertMetadataValues(
   return result;
 }
 
-/**
- * Normalize an extension-list input like ".md, pdf , .TXT" into a lowercase
- * array of dotted suffixes: [".md", ".pdf", ".txt"]. Empty tokens are
- * dropped and a leading dot is added when the user omits it.
- */
-function parseExtensionList(raw: string): string[] {
-  return raw
-    .split(",")
-    .map((s) => s.trim().toLowerCase())
-    .filter(Boolean)
-    .map((ext) => (ext.startsWith(".") ? ext : `.${ext}`));
-}
-
-interface FolderFilterOptions {
-  include: string[];
-  exclude: string[];
-  recursive: boolean;
-}
-
 /**
  * Minimal subset of the FileSystemEntry API we rely on. Typescript ships
  * loose types under DOM lib, but they don't reliably expose
@@ -195,27 +190,6 @@ function extractEntries(items: DataTransferItemList): FsEntry[] {
   return out;
 }
 
-/** Apply include / exclude / recursive filters to a batch of picked files. */
-function filterFolderFiles(list: File[], opts: FolderFilterOptions): File[] {
-  const { include, exclude, recursive } = opts;
-  return list.filter((file) => {
-    const relPath = file.webkitRelativePath || file.name;
-    // Depth is the number of slashes in the relative path; a top-level file
-    // inside the picked folder has exactly one ("<root>/<name>").
-    const depth = (relPath.match(/\//g) || []).length;
-    if (!recursive && depth > 1) return false;
-
-    const lowerName = file.name.toLowerCase();
-    if (include.length > 0 && !include.some((ext) => lowerName.endsWith(ext))) {
-      return false;
-    }
-    if (exclude.length > 0 && exclude.some((ext) => lowerName.endsWith(ext))) {
-      return false;
-    }
-    return true;
-  });
-}
-
 export function DocUploadDialog({
   knowledgeBaseName,
   metadataFields,
@@ -240,6 +214,13 @@ export function DocUploadDialog({
   const folderInputRef = useRef<HTMLInputElement | null>(null);
   const fileInputRef = useRef<HTMLInputElement | null>(null);
 
+  // OSS-mode state. Selection lives here (not in OssImportTab) so that
+  // tab-mode switches can reset it cleanly via resetForm().
+  const [ossSelection, setOssSelection] = useState<OssSelection>([]);
+  const [ossFilter, setOssFilter] = useState<OssImportFilterState>(EMPTY_OSS_FILTER);
+
+  const ossImport = useOssImport();
+
   const hasSchemaFields = metadataFields && metadataFields.length > 0;
   const uploadDocuments = useUploadDocuments();
 
@@ -252,7 +233,7 @@ export function DocUploadDialog({
         include: includeList,
         exclude: excludeList,
         recursive,
-      }),
+      } satisfies RecursiveExtensionRules),
     [folderRaw, includeList, excludeList, recursive],
   );
 
@@ -432,6 +413,8 @@ export function DocUploadDialog({
     setMode("file");
     setFiles([]);
     setFolderRaw([]);
+    setOssSelection([]);
+    setOssFilter(EMPTY_OSS_FILTER);
     setIncludeInput("");
     setExcludeInput("");
     setRecursive(true);
@@ -444,9 +427,17 @@ export function DocUploadDialog({
   const handleModeChange = useCallback((next: string) => {
     const nextMode = next as UploadMode;
     setMode(nextMode);
-    // Wipe the other tab's picks to avoid accidental submission of stale data.
-    if (nextMode === "file") setFolderRaw([]);
-    else setFiles([]);
+    // Wipe other tabs' picks to avoid accidental submission of stale data.
+    if (nextMode === "file") {
+      setFolderRaw([]);
+      setOssSelection([]);
+    } else if (nextMode === "folder") {
+      setFiles([]);
+      setOssSelection([]);
+    } else {
+      setFiles([]);
+      setFolderRaw([]);
+    }
   }, []);
 
   const updateMetadataField = useCallback((fieldName: string, value: string) => {
@@ -461,6 +452,91 @@ export function DocUploadDialog({
   }, [hasSchemaFields, metadataValues, metadataFields]);
 
   async function handleSubmit() {
+    // ---- OSS branch — early return, leaves the local-files/folder branch below intact ----
+    if (mode === "oss") {
+      const { fileKeys, folderPrefixes } = partitionSelection(ossSelection);
+      if (fileKeys.length === 0 && folderPrefixes.length === 0) {
+        toast.error("请在 OSS 浏览器中至少选择一个文件或文件夹");
+        return;
+      }
+
+      let metadata: Record<string, unknown> | undefined;
+      if (hasSchemaFields) {
+        const converted = convertMetadataValues(metadataValues, metadataFields!);
+        if (Object.keys(converted).length > 0) metadata = converted;
+      } else if (metadataJson.trim()) {
+        try {
+          metadata = JSON.parse(metadataJson) as Record<string, unknown>;
+        } catch {
+          toast.error("Metadata JSON 格式不正确");
+          return;
+        }
+      }
+
+      try {
+        // Translate the four free-text inputs into the server's glob form.
+        // Filters only travel on folder items; the hook ignores them when
+        // there is no folder selection, so the "filter applies to folder
+        // selections only" semantic is enforced once, in one place.
+        const { inclusionFilters, exclusionFilters } = buildFolderGlobs(ossFilter);
+        const result = await ossImport.mutateAsync({
+          knowledgeBaseName,
+          fileKeys,
+          folderPrefixes,
+          inclusionFilters,
+          exclusionFilters,
+          subspace: subspace || undefined,
+          metadata,
+        });
+        const details = result.documentDetails ?? [];
+        const failed = details.filter((d) => d.status.toLowerCase() === "failed");
+
+        // Distinguish "filter excluded everything" from a successful import.
+        if (details.length === 0) {
+          toast.warning("未导入任何文件", {
+            description:
+              folderPrefixes.length > 0
+                ? "选中的文件夹经过过滤后没有匹配项，请放宽过滤规则"
+                : "选择列表为空",
+          });
+          resetForm();
+          onOpenChange(false);
+          return;
+        }
+
+        if (failed.length === 0) {
+          toast.success(`成功导入 ${details.length} 个文档`);
+        } else if (failed.length < details.length) {
+          const reasons = [
+            ...new Set(failed.map((d) => d.failureReason).filter(Boolean)),
+          ];
+          toast.warning(
+            `${details.length - failed.length} 个导入成功，${failed.length} 个失败`,
+            { description: reasons.length > 0 ? reasons.slice(0, 3).join("; ") : undefined },
+          );
+        } else {
+          // All failed: show the first few distinct failureReasons so the user
+          // can diagnose without digging into devtools. The most common cause
+          // (until we surface it in the UI) is a server-side validation: e.g.
+          // unsupported file type, invalid OSS URI, bucket-endpoint mismatch.
+          const reasons = [
+            ...new Set(failed.map((d) => d.failureReason).filter(Boolean)),
+          ];
+          toast.error(`全部 ${failed.length} 个文档导入失败`, {
+            description:
+              reasons.length > 0 ? reasons.slice(0, 3).join("; ") : undefined,
+          });
+        }
+        resetForm();
+        onOpenChange(false);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : "OSS 导入失败";
+        toast.error(message);
+      }
+      return;
+    }
+    // ---- end OSS branch; the existing handleSubmit body continues below this point unchanged ----
+
     if (effectiveFiles.length === 0) {
       toast.error(
         mode === "folder"
@@ -572,7 +648,7 @@ export function DocUploadDialog({
 
         <div className="space-y-4 min-w-0">
           <Tabs value={mode} onValueChange={handleModeChange}>
-            <TabsList className="grid w-full grid-cols-2">
+            <TabsList className="grid w-full grid-cols-3">
               <TabsTrigger value="file" className="gap-2">
                 <FileText className="h-3.5 w-3.5" />
                 按文件
@@ -581,6 +657,10 @@ export function DocUploadDialog({
                 <FolderOpen className="h-3.5 w-3.5" />
                 按文件夹
               </TabsTrigger>
+              <TabsTrigger value="oss" className="gap-2">
+                <Cloud className="h-3.5 w-3.5" />
+                从 OSS 导入
+              </TabsTrigger>
             </TabsList>
 
             {/* ---- File mode ---- */}
@@ -765,6 +845,16 @@ export function DocUploadDialog({
                 </div>
               )}
             </TabsContent>
+
+            {/* ---- OSS mode ---- */}
+            <TabsContent value="oss" className="space-y-3">
+              <OssImportTab
+                selection={ossSelection}
+                onSelectionChange={setOssSelection}
+                filter={ossFilter}
+                onFilterChange={setOssFilter}
+              />
+            </TabsContent>
           </Tabs>
 
           {/* 子空间 */}
@@ -876,19 +966,30 @@ export function DocUploadDialog({
               resetForm();
               onOpenChange(false);
             }}
-            disabled={uploadDocuments.isPending}
+            disabled={uploadDocuments.isPending || ossImport.isPending}
           >
             取消
           </Button>
           <Button
             onClick={handleSubmit}
-            disabled={effectiveFiles.length === 0 || uploadDocuments.isPending}
+            disabled={
+              (mode === "oss" && ossSelection.length === 0) ||
+              (mode !== "oss" && effectiveFiles.length === 0) ||
+              uploadDocuments.isPending ||
+              ossImport.isPending
+            }
           >
-            {uploadDocuments.isPending
-              ? uploadDocuments.progress
-                ? `上传中 ${uploadDocuments.progress.completedFiles}/${uploadDocuments.progress.totalFiles}`
-                : "准备上传..."
-              : `上传 ${effectiveFiles.length} 个文件`}
+            {mode === "oss"
+              ? ossImport.isPending
+                ? ossImport.progress
+                  ? `导入中 ${ossImport.progress.completedItems}/${ossImport.progress.totalItems}`
+                  : "提交中…"
+                : `导入 ${ossSelection.length} 项`
+              : uploadDocuments.isPending
+                ? uploadDocuments.progress
+                  ? `上传中 ${uploadDocuments.progress.completedFiles}/${uploadDocuments.progress.totalFiles}`
+                  : "准备上传..."
+                : `上传 ${effectiveFiles.length} 个文件`}
           </Button>
         </DialogFooter>
       </DialogContent>

package/dist/dashboard-runtime/dashboard/src/components/documents/oss-browser.tsx

@@ -0,0 +1,264 @@
+"use client";
+
+import { useEffect, useMemo, useState } from "react";
+import {
+  ChevronRight,
+  Database,
+  FileText,
+  Folder,
+  RefreshCw,
+} from "lucide-react";
+
+import { Checkbox } from "@/components/ui/checkbox";
+import { EmptyState } from "@/components/ui/empty-state";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { useOssList } from "@/hooks/use-oss-list";
+import {
+  isFileSelected,
+  isFolderSelected,
+  toggleFile,
+  toggleFolder,
+  type OssSelection,
+} from "@/lib/oss-selection";
+import { cn } from "@/lib/utils";
+
+interface OssBrowserProps {
+  selection: OssSelection;
+  onSelectionChange: (next: OssSelection) => void;
+}
+
+const SEARCH_DEBOUNCE_MS = 250;
+
+/** Format a byte count as "1.2 MB" / "344 KB" / "12 B" with one decimal. */
+function formatBytes(n: number): string {
+  if (!Number.isFinite(n) || n <= 0) return "—";
+  const units = ["B", "KB", "MB", "GB"];
+  let i = 0;
+  let v = n;
+  while (v >= 1024 && i < units.length - 1) {
+    v /= 1024;
+    i++;
+  }
+  return `${v.toFixed(i === 0 ? 0 : 1)} ${units[i]}`;
+}
+
+/** Slice a prefix into breadcrumb segments. "" → [], "docs/2026/" → [docs, 2026]. */
+function breadcrumbSegments(prefix: string): { label: string; prefix: string }[] {
+  if (!prefix) return [];
+  const trimmed = prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
+  const parts = trimmed.split("/");
+  const out: { label: string; prefix: string }[] = [];
+  let acc = "";
+  for (const p of parts) {
+    acc += `${p}/`;
+    out.push({ label: p, prefix: acc });
+  }
+  return out;
+}
+
+/**
+ * Single-level OSS file/folder picker. The component owns navigation
+ * (`prefix`, `search`) and lifts selection up; the parent decides how the
+ * selection turns into a submission.
+ *
+ * Empty / error states render inline so a misconfigured OSS doesn't kick
+ * the user out of the upload dialog — they can switch back to a local tab.
+ */
+export function OssBrowser({ selection, onSelectionChange }: OssBrowserProps) {
+  const [prefix, setPrefix] = useState("");
+  const [searchInput, setSearchInput] = useState("");
+  const [search, setSearch] = useState("");
+
+  // Debounce search to keep keystrokes off the wire.
+  useEffect(() => {
+    const id = setTimeout(() => setSearch(searchInput.trim()), SEARCH_DEBOUNCE_MS);
+    return () => clearTimeout(id);
+  }, [searchInput]);
+
+  const {
+    folders,
+    files,
+    isLoading,
+    isFetchingNextPage,
+    hasNextPage,
+    fetchNextPage,
+    refetch,
+    error,
+    errorCode,
+  } = useOssList({ prefix, search });
+
+  const breadcrumbs = useMemo(() => breadcrumbSegments(prefix), [prefix]);
+
+  // ---------- Empty / error branches ----------
+
+  if (errorCode === "OSS_NOT_CONFIGURED") {
+    return (
+      <EmptyState
+        icon={<Database />}
+        title="尚未配置 OSS"
+        description="请先在「实例配置」中绑定 OSS 端点和 Bucket，再回到此处导入。"
+      />
+    );
+  }
+
+  if (error) {
+    return (
+      <EmptyState
+        icon={<Database />}
+        title={
+          errorCode === "OSS_FORBIDDEN"
+            ? "无访问权限"
+            : errorCode === "OSS_BUCKET_NOT_FOUND"
+              ? "Bucket 不存在"
+              : "OSS 列举失败"
+        }
+        description={error.message}
+        action={
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => refetch()}
+          >
+            <RefreshCw className="mr-1 h-3.5 w-3.5" />
+            重试
+          </Button>
+        }
+      />
+    );
+  }
+
+  // ---------- Main layout ----------
+
+  const totalRowCount = folders.length + files.length;
+
+  return (
+    <div className="rounded-md border border-[hsl(var(--border))] bg-[hsl(var(--surface))]">
+      {/* Breadcrumb + search */}
+      <div className="flex items-center gap-2 border-b border-[hsl(var(--border))] px-3 py-2 text-xs">
+        <button
+          type="button"
+          className="text-[hsl(var(--muted-foreground))] hover:text-[hsl(var(--foreground))]"
+          onClick={() => setPrefix("")}
+        >
+          /
+        </button>
+        {breadcrumbs.map((seg, i) => (
+          <span key={seg.prefix} className="flex items-center gap-1">
+            <span className="text-[hsl(var(--muted-foreground))]">/</span>
+            <button
+              type="button"
+              className={cn(
+                "hover:text-[hsl(var(--foreground))]",
+                i === breadcrumbs.length - 1
+                  ? "text-[hsl(var(--foreground))] font-medium"
+                  : "text-[hsl(var(--muted-foreground))]",
+              )}
+              onClick={() => setPrefix(seg.prefix)}
+            >
+              {seg.label}
+            </button>
+          </span>
+        ))}
+        <Input
+          value={searchInput}
+          onChange={(e) => setSearchInput(e.target.value)}
+          placeholder="搜索当前目录"
+          className="ml-auto h-7 w-44 text-xs"
+        />
+      </div>
+
+      {/* Status bar */}
+      <div className="flex items-center justify-between border-b border-[hsl(var(--border))] px-3 py-1.5 text-xs text-[hsl(var(--muted-foreground))]">
+        <span>{totalRowCount} 个对象</span>
+        <span>已选 {selection.length} 项</span>
+      </div>
+
+      {/* Rows */}
+      <div className="max-h-72 overflow-y-auto">
+        {isLoading ? (
+          <div className="px-3 py-6 text-center text-xs text-[hsl(var(--muted-foreground))]">
+            加载中…
+          </div>
+        ) : totalRowCount === 0 ? (
+          <div className="px-3 py-8 text-center text-xs text-[hsl(var(--muted-foreground))]">
+            当前目录为空
+          </div>
+        ) : (
+          <>
+            {folders.map((f) => {
+              const checked = isFolderSelected(selection, f.prefix);
+              return (
+                <div
+                  key={f.prefix}
+                  className={cn(
+                    "group flex items-center gap-2 px-3 py-1.5 text-sm transition-colors hover:bg-[hsl(var(--accent))] cursor-pointer",
+                    checked && "bg-[hsl(var(--primary-soft))]",
+                  )}
+                  onClick={() => setPrefix(f.prefix)}
+                >
+                  <Checkbox
+                    checked={checked}
+                    onCheckedChange={() =>
+                      onSelectionChange(toggleFolder(selection, { prefix: f.prefix }))
+                    }
+                    onClick={(e) => e.stopPropagation()}
+                  />
+                  <Folder className="h-3.5 w-3.5 shrink-0 text-[hsl(var(--muted-foreground))]" />
+                  <span className="flex-1 truncate">{f.name}</span>
+                  <ChevronRight className="h-3.5 w-3.5 shrink-0 text-[hsl(var(--muted-foreground))] opacity-0 transition-opacity group-hover:opacity-100" />
+                </div>
+              );
+            })}
+            {files.map((f) => {
+              const checked = isFileSelected(selection, f.ossKey);
+              return (
+                <div
+                  key={f.ossKey}
+                  className={cn(
+                    "flex items-center gap-2 px-3 py-1.5 text-sm transition-colors hover:bg-[hsl(var(--accent))] cursor-pointer",
+                    checked && "bg-[hsl(var(--primary-soft))]",
+                  )}
+                  onClick={() =>
+                    onSelectionChange(
+                      toggleFile(selection, { ossKey: f.ossKey, size: f.size }),
+                    )
+                  }
+                >
+                  <Checkbox
+                    checked={checked}
+                    onCheckedChange={() =>
+                      onSelectionChange(
+                        toggleFile(selection, { ossKey: f.ossKey, size: f.size }),
+                      )
+                    }
+                    onClick={(e) => e.stopPropagation()}
+                  />
+                  <FileText className="h-3.5 w-3.5 shrink-0 text-[hsl(var(--muted-foreground))]" />
+                  <span className="flex-1 truncate">{f.name}</span>
+                  <span className="shrink-0 text-xs text-[hsl(var(--muted-foreground))]">
+                    {formatBytes(f.size)}
+                  </span>
+                </div>
+              );
+            })}
+            {hasNextPage && (
+              <div className="px-3 py-2 text-center">
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  onClick={fetchNextPage}
+                  disabled={isFetchingNextPage}
+                >
+                  {isFetchingNextPage ? "加载中…" : "加载更多"}
+                </Button>
+              </div>
+            )}
+          </>
+        )}
+      </div>
+    </div>
+  );
+}