Kept formatting
' + + '{promptHistory.notice.text}
} {workspaceID && references.files.length > 0 && fileReferenceUnavailableReason &&{fileReferenceUnavailableReason} {t(" 已选引用与草稿会保留；先移除项目文件引用，即可发送补充文字和上传附件。", " Your references and draft are kept. Remove project file references to send text and uploaded attachments.")}
} diff --git a/web/src/v2/components/file-context.test.tsx b/web/src/v2/components/file-context.test.tsx index 9c00159a..90271835 100644 --- a/web/src/v2/components/file-context.test.tsx +++ b/web/src/v2/components/file-context.test.tsx @@ -8,9 +8,22 @@ import type { PropsWithChildren } from "react"; import { APIRequestError, type APIClient } from "../../api/client"; import { V2Composer } from "./composer"; import { useV2ThreadTurn, useV2ThreadSubmissions } from "../use-thread-turn"; -import { v2FileReferenceKey } from "./file-context"; +import { v2FileReferenceKey, withV2FileReference } from "./file-context"; +import type { WorkspaceExplorerView } from "../../api/types"; const digest = "a".repeat(64); +it("shares the four-file limit and same-path replacement across reference entry points", () => { + const files = Array.from({ length: 4 }, (_, index) => ({ id: `ref-${index}`, path: `${index}.md`, digest, + partial: false, redacted: false })); + const incoming = { path: "new.md", provenance: { content_sha256: "b".repeat(64) }, truncated: true, redaction_count: 1 } as WorkspaceExplorerView; + expect(() => withV2FileReference(files, incoming, "最多四个")).toThrow("最多四个"); + expect(files).toHaveLength(4); + const replaced = withV2FileReference(files, { ...incoming, path: "2.md" }, "最多四个"); + expect(replaced).toHaveLength(4); + expect(replaced.at(-1)).toMatchObject({ path: "2.md", digest: "b".repeat(64), partial: true, redacted: true }); + expect(replaced.at(-1)?.id).not.toBe("ref-2"); +}); + function setup() { const workspaceExplore = vi.fn(async (_workspace: string, path: string) => ({ protocol_version: "workspace_explorer.v1", workspace_id: "workspace-1", path, diff --git a/web/src/v2/components/file-context.tsx b/web/src/v2/components/file-context.tsx index 7e42378d..283cd96f 100644 --- a/web/src/v2/components/file-context.tsx +++ b/web/src/v2/components/file-context.tsx @@ -3,6 +3,7 @@ import { createPortal } from "react-dom"; import { useQuery, useQueryClient } from "@tanstack/react-query"; import { X } from "lucide-react"; import type { APIClient } from "../../api/client"; +import type { WorkspaceExplorerView } from "../../api/types"; import { WorkspaceExplorer } from "../../components/workspace-explorer"; import { useModalFocusTrap } from "../../hooks/use-modal-focus-trap"; import { useV2DraftDocument } from "../draft-context"; @@ -16,6 +17,14 @@ export interface V2FileReference { redacted: boolean; } +export function withV2FileReference(files: V2FileReference[], file: WorkspaceExplorerView, limitMessage: string): V2FileReference[] { + if (files.length >= 4 && !files.some(({ path }) => path === file.path)) throw new Error(limitMessage); + return [...files.filter(({ path }) => path !== file.path), { + id: globalThis.crypto.randomUUID(), path: file.path, digest: file.provenance.content_sha256, + partial: file.truncated, redacted: file.redaction_count > 0, + }]; +} + export const v2FileReferenceKey = (workspaceID: string, threadID: string) => ["v2", "draft-files", workspaceID, threadID] as const; @@ -75,14 +84,11 @@ export function V2FileContext({ client, workspaceID, files, onChange, disabled, {error &&{error}
}{target.parent}
+ {error}
: directory.isError ? +{t("无法列出此目录，输入已保留。", "Unable to list this directory. Your input is kept.")}
: + reading ?{t("正在读取文件…", "Reading file…")}
: + directory.isPending ?{t("正在列出目录…", "Listing directory…")}
: + !entries.length ?{t("当前目录没有匹配项。", "No matches in this directory.")}
: null} + {directory.data?.truncated &&{t("仅列出部分目录条目；可输入完整父目录路径。", "Only part of this directory is listed. You can type the full parent path.")}
} +{t("↑↓ 选择 · Enter / Tab 补全 · Esc 关闭", "↑↓ select · Enter / Tab complete · Esc close")}
+