mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-20 04:36:53 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d4f62d6f6 | ||
|
|
43808216e6 | ||
|
|
f66bb7af73 | ||
|
|
ae86d56a7d | ||
|
|
1cee103b1c | ||
|
|
3c3b6880e4 | ||
|
|
0b84402c83 | ||
|
|
61a61abc7c | ||
|
|
fc878775c2 | ||
|
|
7acf736300 | ||
|
|
9d50301a43 | ||
|
|
7f185ca23c | ||
|
|
94582c9001 | ||
|
|
41b73feeab |
@@ -54,5 +54,6 @@ jobs:
|
||||
platforms: linux/amd64,linux/arm64
|
||||
context: .
|
||||
push: true
|
||||
provenance: false
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
@@ -8,6 +8,7 @@ WORKDIR /app
|
||||
COPY package.json bun.lock ./
|
||||
COPY --parents packages/*/package.json ./
|
||||
COPY --parents apps/*/package.json ./
|
||||
COPY patches/ ./patches/
|
||||
|
||||
# Install dependencies (including devDependencies for build tools)
|
||||
RUN bun install --frozen-lockfile
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/agent-app",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"bin": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/cli",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"bin": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/transcode-app",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"bin": {
|
||||
|
||||
@@ -80,6 +80,10 @@ apps/web/e2e/
|
||||
| Owner drags a file into a folder and a folder into another folder | `tests/project/move-folder-file.spec.ts` |
|
||||
| Owner drags a file onto a file to create a version stack | `tests/project/version-stack-create.spec.ts` |
|
||||
| Owner drags a file onto a version stack to add a new version | `tests/project/version-stack-add-version.spec.ts` |
|
||||
| Owner manages version stack: removes version from 3-version stack | `tests/project/version-stack-manage.spec.ts` |
|
||||
| Owner removes version from 2-version stack which dissolves into standalone files | `tests/project/version-stack-manage.spec.ts` |
|
||||
| Dissolving a shared version stack renders the remaining standalone file name on the share page | `tests/project/version-stack-manage.spec.ts` |
|
||||
| Moving a shared file into a shared version stack leaves only 1 stack card on the share page | `tests/project/version-stack-manage.spec.ts` |
|
||||
| Owner searches the file list by an English name keyword | `tests/project/search-file-list.spec.ts` |
|
||||
| Owner searches the file list by Chinese, Japanese, and Korean name keywords | `tests/project/search-file-list.spec.ts` |
|
||||
| Owner searches the file list with a keyword and a filter condition | `tests/project/search-file-list.spec.ts` |
|
||||
|
||||
@@ -0,0 +1,233 @@
|
||||
import { expect, test } from '../../fixtures'
|
||||
import { seedFile } from '../../helpers/assets'
|
||||
import { dragCard } from '../../helpers/dnd'
|
||||
import { apiAddAssetsToShare, apiCreateShare, fileCard } from '../../helpers/files'
|
||||
|
||||
test('owner manages versions: removes a version from a 3-version stack', async ({
|
||||
project,
|
||||
prisma,
|
||||
}) => {
|
||||
const { page, projectId, rootFolderId } = project
|
||||
|
||||
const fileA = await seedFile(prisma, projectId, rootFolderId, `e2e-mng-a-${Date.now()}`)
|
||||
const fileB = await seedFile(prisma, projectId, rootFolderId, `e2e-mng-b-${Date.now()}`)
|
||||
const fileC = await seedFile(prisma, projectId, rootFolderId, `e2e-mng-c-${Date.now()}`)
|
||||
|
||||
await page.goto(`/projects/${projectId}`)
|
||||
await expect(fileCard(page, fileA.name)).toBeVisible()
|
||||
await expect(fileCard(page, fileB.name)).toBeVisible()
|
||||
await expect(fileCard(page, fileC.name)).toBeVisible()
|
||||
|
||||
// 1. Create a 3-version stack: B on A -> stack (v2), then C on stack -> stack (v3)
|
||||
await dragCard(page, fileCard(page, fileB.name), fileCard(page, fileA.name))
|
||||
await expect(page.getByText('v2', { exact: true })).toBeVisible()
|
||||
|
||||
await dragCard(page, fileCard(page, fileC.name), fileCard(page, fileB.name))
|
||||
await expect(page.getByText('v3', { exact: true })).toBeVisible()
|
||||
|
||||
const stack = await prisma.asset.findFirstOrThrow({
|
||||
where: { projectId, parentId: rootFolderId, type: 'version_stack' },
|
||||
})
|
||||
expect(stack.fileCount).toBe(3)
|
||||
|
||||
// 2. Navigate to file viewer for the stack
|
||||
await page.goto(`/projects/${projectId}/files/${stack.id}`)
|
||||
|
||||
// 3. Open breadcrumb menu and click "Manage versions..."
|
||||
// Click on the asset name / badge dropdown trigger
|
||||
await page.getByRole('button', { name: new RegExp(fileC.name) }).click()
|
||||
// Hover or click on Versions sub-menu trigger
|
||||
await page.getByRole('menuitem', { name: 'Versions', exact: true }).hover()
|
||||
// Click "Manage versions..."
|
||||
await page.getByRole('button', { name: /manage versions$/i }).click()
|
||||
|
||||
// 4. Verify Manage versions dialog is visible with all 3 versions
|
||||
const dialog = page.getByRole('dialog')
|
||||
await expect(dialog).toBeVisible()
|
||||
await expect(dialog.getByText('Manage versions')).toBeVisible()
|
||||
await expect(dialog.getByText(fileA.name)).toBeVisible()
|
||||
await expect(dialog.getByText(fileB.name)).toBeVisible()
|
||||
await expect(dialog.getByText(fileC.name)).toBeVisible()
|
||||
|
||||
// 5. Remove fileB from stack: hover its row and click Remove from stack
|
||||
const rowB = dialog.locator('div.group', { hasText: fileB.name })
|
||||
await rowB.hover()
|
||||
const moreButton = rowB.getByRole('button', { name: 'More options' })
|
||||
await moreButton.click()
|
||||
await page.getByRole('menuitem', { name: /remove from stack/i }).click()
|
||||
|
||||
// 6. Verify toast and that fileB is removed from dialog
|
||||
await expect(page.getByText(/version removed from stack/i)).toBeVisible()
|
||||
await expect(dialog.getByText(fileB.name)).not.toBeVisible()
|
||||
await expect(dialog.getByText(fileA.name)).toBeVisible()
|
||||
await expect(dialog.getByText(fileC.name)).toBeVisible()
|
||||
|
||||
// DB: stack now has 2 versions (fileA and fileC), and fileB is standalone in root folder
|
||||
await expect
|
||||
.poll(async () => {
|
||||
const s = await prisma.asset.findUnique({ where: { id: stack.id } })
|
||||
return s?.fileCount
|
||||
})
|
||||
.toBe(2)
|
||||
|
||||
const updatedFileB = await prisma.asset.findUnique({ where: { id: fileB.id } })
|
||||
expect(updatedFileB?.parentId).toBe(rootFolderId)
|
||||
})
|
||||
|
||||
test('owner removes version from 2-version stack dissolving the stack into standalone files', async ({
|
||||
project,
|
||||
prisma,
|
||||
}) => {
|
||||
const { page, projectId, rootFolderId } = project
|
||||
|
||||
const fileA = await seedFile(prisma, projectId, rootFolderId, `e2e-dis-a-${Date.now()}`)
|
||||
const fileB = await seedFile(prisma, projectId, rootFolderId, `e2e-dis-b-${Date.now()}`)
|
||||
|
||||
await page.goto(`/projects/${projectId}`)
|
||||
await dragCard(page, fileCard(page, fileB.name), fileCard(page, fileA.name))
|
||||
await expect(page.getByText('v2', { exact: true })).toBeVisible()
|
||||
|
||||
const stack = await prisma.asset.findFirstOrThrow({
|
||||
where: { projectId, parentId: rootFolderId, type: 'version_stack' },
|
||||
})
|
||||
|
||||
// Open file view
|
||||
await page.goto(`/projects/${projectId}/files/${stack.id}`)
|
||||
|
||||
// Open breadcrumb menu and click "Manage versions..."
|
||||
await page.getByRole('button', { name: new RegExp(fileB.name) }).click()
|
||||
await page.getByRole('menuitem', { name: 'Versions', exact: true }).hover()
|
||||
await page.getByRole('button', { name: /manage versions$/i }).click()
|
||||
|
||||
const dialog = page.getByRole('dialog')
|
||||
await expect(dialog).toBeVisible()
|
||||
|
||||
// Remove fileB -> stack dissolves -> only fileA remains
|
||||
const rowB = dialog.locator('div.group', { hasText: fileB.name })
|
||||
await rowB.hover()
|
||||
const moreButton = rowB.getByRole('button', { name: 'More options' })
|
||||
await moreButton.click()
|
||||
await page.getByRole('menuitem', { name: /remove from stack/i }).click()
|
||||
|
||||
// Dialog should close automatically when stack dissolves
|
||||
await expect(dialog).not.toBeVisible()
|
||||
|
||||
// DB: stack asset is deleted
|
||||
await expect
|
||||
.poll(async () => {
|
||||
const s = await prisma.asset.findUnique({ where: { id: stack.id } })
|
||||
return s === null
|
||||
})
|
||||
.toBe(true)
|
||||
|
||||
// Both fileA and fileB are now standalone files in rootFolder
|
||||
const updatedFileA = await prisma.asset.findUnique({ where: { id: fileA.id } })
|
||||
const updatedFileB = await prisma.asset.findUnique({ where: { id: fileB.id } })
|
||||
expect(updatedFileA?.parentId).toBe(rootFolderId)
|
||||
expect(updatedFileB?.parentId).toBe(rootFolderId)
|
||||
})
|
||||
|
||||
test('dissolving a shared version stack renders the remaining standalone file name on the share page', async ({
|
||||
project,
|
||||
prisma,
|
||||
}) => {
|
||||
const { page, projectId, rootFolderId } = project
|
||||
|
||||
const fileA = await seedFile(prisma, projectId, rootFolderId, `e2e-shd-a-${Date.now()}`)
|
||||
const fileB = await seedFile(prisma, projectId, rootFolderId, `e2e-shd-b-${Date.now()}`)
|
||||
|
||||
await page.goto(`/projects/${projectId}`)
|
||||
await dragCard(page, fileCard(page, fileB.name), fileCard(page, fileA.name))
|
||||
await expect(page.getByText('v2', { exact: true })).toBeVisible()
|
||||
|
||||
const stack = await prisma.asset.findFirstOrThrow({
|
||||
where: { projectId, parentId: rootFolderId, type: 'version_stack' },
|
||||
})
|
||||
|
||||
// Share the version stack
|
||||
await fileCard(page, fileB.name).click({ button: 'right' })
|
||||
await page.getByRole('menuitem', { name: 'Create Share Link' }).click()
|
||||
const toast = page.locator('[data-sonner-toast]').filter({ hasText: 'Share link created' })
|
||||
await expect(toast).toBeVisible()
|
||||
|
||||
const share = await prisma.shareLink.findFirstOrThrow({
|
||||
where: { projectId },
|
||||
orderBy: { createdAt: 'desc' },
|
||||
})
|
||||
|
||||
// Open file viewer for the stack
|
||||
await page.goto(`/projects/${projectId}/files/${stack.id}`)
|
||||
|
||||
// Open breadcrumb menu and click "Manage versions"
|
||||
await page.getByRole('button', { name: new RegExp(fileB.name) }).click()
|
||||
await page.getByRole('menuitem', { name: 'Versions', exact: true }).hover()
|
||||
await page.getByRole('button', { name: /manage versions$/i }).click()
|
||||
|
||||
const dialog = page.getByRole('dialog')
|
||||
await expect(dialog).toBeVisible()
|
||||
|
||||
// Remove fileB -> stack dissolves -> only fileA remains
|
||||
const rowB = dialog.locator('div.group', { hasText: fileB.name })
|
||||
await rowB.hover()
|
||||
const moreButton = rowB.getByRole('button', { name: 'More options' })
|
||||
await moreButton.click()
|
||||
await page.getByRole('menuitem', { name: /remove from stack/i }).click()
|
||||
|
||||
await expect(dialog).not.toBeVisible()
|
||||
|
||||
// Navigate to public share page: verify fileA is displayed with its non-empty name
|
||||
await page.goto(`/share/${share.id}`)
|
||||
await expect(fileCard(page, fileA.name)).toBeVisible()
|
||||
await expect(fileCard(page, fileB.name)).not.toBeVisible()
|
||||
})
|
||||
|
||||
test('moving a shared file into a shared version stack leaves only 1 stack card on the share page', async ({
|
||||
project,
|
||||
prisma,
|
||||
}) => {
|
||||
const { page, projectId, rootFolderId } = project
|
||||
|
||||
const fileA = await seedFile(prisma, projectId, rootFolderId, `e2e-mvsh-a-${Date.now()}`)
|
||||
const fileB = await seedFile(prisma, projectId, rootFolderId, `e2e-mvsh-b-${Date.now()}`)
|
||||
const fileC = await seedFile(prisma, projectId, rootFolderId, `e2e-mvsh-c-${Date.now()}`)
|
||||
|
||||
await page.goto(`/projects/${projectId}`)
|
||||
|
||||
// 1. Create a version stack from file B and file A (stack has v2, displays file B)
|
||||
await dragCard(page, fileCard(page, fileB.name), fileCard(page, fileA.name))
|
||||
await expect(page.getByText('v2', { exact: true })).toBeVisible()
|
||||
|
||||
const stack = await prisma.asset.findFirstOrThrow({
|
||||
where: { projectId, parentId: rootFolderId, type: 'version_stack' },
|
||||
})
|
||||
|
||||
// 2. Create a share link and add both stack AB and file C to it
|
||||
const share = await apiCreateShare(project.context.request, projectId, `Test Share ${Date.now()}`)
|
||||
await apiAddAssetsToShare(project.context.request, share.id, [stack.id, fileC.id])
|
||||
|
||||
// Verify initial share page has both stack and file C
|
||||
await page.goto(`/share/${share.id}`)
|
||||
await expect(fileCard(page, fileB.name)).toBeVisible()
|
||||
await expect(fileCard(page, fileC.name)).toBeVisible()
|
||||
|
||||
// 3. In project page, drop file C onto stack card (displays file B)
|
||||
await page.goto(`/projects/${projectId}`)
|
||||
await dragCard(page, fileCard(page, fileC.name), fileCard(page, fileB.name))
|
||||
await expect(page.getByText('v3', { exact: true })).toBeVisible()
|
||||
|
||||
// 4. Return to public share page: now only 1 card exists (the stack showing file C with v3)
|
||||
await page.goto(`/share/${share.id}`)
|
||||
await expect(page.getByText('v3', { exact: true })).toBeVisible()
|
||||
await expect(fileCard(page, fileC.name)).toBeVisible()
|
||||
await expect(fileCard(page, fileB.name)).not.toBeVisible()
|
||||
|
||||
// DB: share rootFolder fileCount is 1 and exactly 1 symlink exists
|
||||
const symlinks = await prisma.asset.findMany({
|
||||
where: { parentId: share.rootFolderId, type: 'symlink' },
|
||||
})
|
||||
expect(symlinks).toHaveLength(1)
|
||||
expect(symlinks[0].targetId).toBe(stack.id)
|
||||
|
||||
const updatedShareRoot = await prisma.asset.findUnique({ where: { id: share.rootFolderId } })
|
||||
expect(updatedShareRoot?.fileCount).toBe(1)
|
||||
})
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/web-app",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
},
|
||||
"apps/agent": {
|
||||
"name": "@shumai/agent-app",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"bin": {
|
||||
"shumai-agent": "./src/index.ts",
|
||||
},
|
||||
@@ -45,7 +45,7 @@
|
||||
},
|
||||
"apps/cli": {
|
||||
"name": "@shumai/cli",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"bin": {
|
||||
"shumai-cli": "./src/index.ts",
|
||||
},
|
||||
@@ -60,7 +60,7 @@
|
||||
},
|
||||
"apps/transcode": {
|
||||
"name": "@shumai/transcode-app",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"bin": {
|
||||
"shumai-transcode": "./src/index.ts",
|
||||
},
|
||||
@@ -72,7 +72,7 @@
|
||||
},
|
||||
"apps/web": {
|
||||
"name": "@shumai/web-app",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@shumai/agent": "workspace:*",
|
||||
"@shumai/api": "workspace:*",
|
||||
@@ -92,7 +92,7 @@
|
||||
},
|
||||
"packages/agent": {
|
||||
"name": "@shumai/agent",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@anthropic-ai/sandbox-runtime": "0.0.66",
|
||||
"@earendil-works/pi-agent-core": "0.82.1",
|
||||
@@ -102,12 +102,12 @@
|
||||
"@shumai/db": "workspace:*",
|
||||
"@shumai/dtos": "workspace:*",
|
||||
"@shumai/workflow-core": "workspace:*",
|
||||
"@sinclair/typebox": "0.34.49",
|
||||
"@temporalio/activity": "1.17.2",
|
||||
"@temporalio/worker": "1.17.2",
|
||||
"@temporalio/workflow": "1.17.2",
|
||||
"adm-zip": "0.5.17",
|
||||
"jittered-fractional-indexing": "1.0.1",
|
||||
"typebox": "1.1.38",
|
||||
"ulid": "3.0.2",
|
||||
"zod": "4.4.3",
|
||||
},
|
||||
@@ -117,7 +117,7 @@
|
||||
},
|
||||
"packages/api": {
|
||||
"name": "@shumai/api",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@hono/zod-validator": "0.7.6",
|
||||
"@shumai/core": "workspace:*",
|
||||
@@ -131,7 +131,7 @@
|
||||
},
|
||||
"packages/core": {
|
||||
"name": "@shumai/core",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@earendil-works/pi-agent-core": "0.82.1",
|
||||
"@earendil-works/pi-ai": "0.82.1",
|
||||
@@ -166,7 +166,7 @@
|
||||
},
|
||||
"packages/db": {
|
||||
"name": "@shumai/db",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@earendil-works/pi-agent-core": "0.82.1",
|
||||
"@prisma/adapter-pg": "7.8.0",
|
||||
@@ -182,7 +182,7 @@
|
||||
},
|
||||
"packages/dtos": {
|
||||
"name": "@shumai/dtos",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@earendil-works/pi-agent-core": "0.82.1",
|
||||
"zod": "4.4.3",
|
||||
@@ -190,7 +190,7 @@
|
||||
},
|
||||
"packages/e2e": {
|
||||
"name": "@shumai/e2e",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@earendil-works/pi-agent-core": "0.82.1",
|
||||
"@google/genai": "1.52.0",
|
||||
@@ -205,11 +205,11 @@
|
||||
},
|
||||
"packages/tableprinter": {
|
||||
"name": "@shumai/tableprinter",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
},
|
||||
"packages/transcode": {
|
||||
"name": "@shumai/transcode",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@shumai/core": "workspace:*",
|
||||
"@shumai/db": "workspace:*",
|
||||
@@ -223,7 +223,7 @@
|
||||
},
|
||||
"packages/webui": {
|
||||
"name": "@shumai/webui",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@base-ui/react": "1.5.0",
|
||||
"@dnd-kit/abstract": "0.4.0",
|
||||
@@ -321,7 +321,7 @@
|
||||
},
|
||||
"packages/workflow-core": {
|
||||
"name": "@shumai/workflow-core",
|
||||
"version": "0.3.5",
|
||||
"version": "0.3.7",
|
||||
"dependencies": {
|
||||
"@shumai/core": "workspace:*",
|
||||
"@shumai/db": "workspace:*",
|
||||
@@ -333,6 +333,9 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
"patchedDependencies": {
|
||||
"@earendil-works/pi-ai@0.82.1": "patches/@earendil-works%2Fpi-ai@0.82.1.patch",
|
||||
},
|
||||
"packages": {
|
||||
"@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="],
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
"pages": [
|
||||
"using-shumai/agent-providers",
|
||||
"using-shumai/agents",
|
||||
"using-shumai/agents-md",
|
||||
"using-shumai/agent-skills",
|
||||
"using-shumai/agent-tools",
|
||||
"using-shumai/mcp-servers",
|
||||
|
||||
@@ -25,7 +25,7 @@ To protect your workspace environments and sensitive data, the sandbox enforces
|
||||
|
||||
## Domain Whitelisting
|
||||
|
||||
By default, sandboxed scripts cannot make network requests to the internet. Team Owners must explicitly authorize external APIs by managing domain access:
|
||||
By default, Network Sandbox is **disabled** (allowing all outbound network requests). Team Owners can toggle Network Sandbox **ON** in Sandbox Settings to enforce strict domain whitelisting:
|
||||
|
||||
### Allowed Domains
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
---
|
||||
title: AGENTS.md Context & Instructions
|
||||
description: Provide hierarchical, folder-specific instructions and context to AI agents.
|
||||
---
|
||||
|
||||
In addition to global agent system prompts and skills, Shumai allows you to define project-level and folder-level instructions using **`AGENTS.md`**.
|
||||
|
||||
When an AI agent (such as a Chat Agent or Autofill Agent) operates within a project or folder, Shumai automatically loads the corresponding `AGENTS.md` files to provide context, operational rules, and project-specific knowledge.
|
||||
|
||||
---
|
||||
|
||||
## Hierarchical Traversal & Inheritance
|
||||
|
||||
Shumai uses a hierarchical context model for `AGENTS.md`:
|
||||
|
||||
- **Upward Traversal**: When an agent works on a file or folder, Shumai traverses the folder tree upwards from the current folder all the way to the **project root level**.
|
||||
- **Combined Context**: All `AGENTS.md` files found along this path are loaded into the agent's context in order (from the project root down to the current folder).
|
||||
- **Layered Rules**: This lets you define broad, project-wide rules and guidelines at the project root `AGENTS.md`, while adding specific rules, vocabulary, or autofill hints in nested subfolder `AGENTS.md` files.
|
||||
|
||||
---
|
||||
|
||||
## What to Include in AGENTS.md
|
||||
|
||||
You can use `AGENTS.md` to define any instructions you want the agent to follow when working in that folder or project:
|
||||
|
||||
- **Project & Folder Overview**: Describe what assets are stored in the folder and how they relate to the broader project.
|
||||
- **Agent Behavioral Rules**: Specify guardrails, tone, required formats, or things the agent should and shouldn't do when answering queries or leaving comments.
|
||||
- **Terminology & Domain Knowledge**: Define specialized vocabulary, acronyms, brand naming conventions, or project-specific jargon.
|
||||
- **Metadata & Autofill Instructions**: Guide the **Autofill Agent** on how to summarize assets, generate tags, or populate specific custom metadata fields for files in this folder.
|
||||
|
||||
---
|
||||
|
||||
## Accessing and Editing AGENTS.md
|
||||
|
||||
### Opening the Editor
|
||||
|
||||
To view or edit `AGENTS.md`:
|
||||
|
||||
1. Open any project or folder in the Shumai web application.
|
||||
2. Click the **`AGENTS.md`** button in the top navigation toolbar, or right-click any folder in the file browser and choose **AGENTS.md**.
|
||||
3. A dedicated WYSIWYG Markdown editor opens with full formatting support (headings, lists, code blocks, bold/italics, and links).
|
||||
|
||||
### Auto-Save
|
||||
|
||||
As you make changes in the editor, Shumai automatically saves your edits in the background with visual save status indicators (`Saving...`, `Saved`).
|
||||
|
||||
---
|
||||
|
||||
## Permissions & Read-Only Mode
|
||||
|
||||
- **Viewing**: All team members who have read access to the project can view `AGENTS.md`.
|
||||
- **Editing**: **Only Team Owners** are permitted to create, edit, or delete `AGENTS.md` files.
|
||||
- **Read-Only State**: Non-owner members will see a clear read-only indicator in the toolbar explaining that only team owners can edit instructions for the file.
|
||||
+4
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "shumai",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"repository": {
|
||||
@@ -65,5 +65,8 @@
|
||||
"typescript-eslint": "8.60.1",
|
||||
"vite-tsconfig-paths": "6.1.1",
|
||||
"vitest": "4.1.8"
|
||||
},
|
||||
"patchedDependencies": {
|
||||
"@earendil-works/pi-ai@0.82.1": "patches/@earendil-works%2Fpi-ai@0.82.1.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/agent",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
@@ -14,12 +14,12 @@
|
||||
"@shumai/db": "workspace:*",
|
||||
"@shumai/dtos": "workspace:*",
|
||||
"@shumai/workflow-core": "workspace:*",
|
||||
"@sinclair/typebox": "0.34.49",
|
||||
"@temporalio/activity": "1.17.2",
|
||||
"@temporalio/worker": "1.17.2",
|
||||
"@temporalio/workflow": "1.17.2",
|
||||
"adm-zip": "0.5.17",
|
||||
"jittered-fractional-indexing": "1.0.1",
|
||||
"typebox": "1.1.38",
|
||||
"ulid": "3.0.2",
|
||||
"zod": "4.4.3"
|
||||
},
|
||||
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
updateCommentActivity,
|
||||
getAgentChatContextActivity,
|
||||
getAgentAutofillContextActivity,
|
||||
getAssetAutofillContextActivity,
|
||||
getAssetActivity,
|
||||
getCommentActivity,
|
||||
getProjectAutofillFieldsActivity,
|
||||
@@ -19,6 +18,7 @@ import {
|
||||
generateSessionNameActivity,
|
||||
type GenerateSessionNameParams,
|
||||
getUserTeamInfoActivity,
|
||||
formatProjectContextPrompt,
|
||||
} from './agent'
|
||||
import * as piAgent from '../index'
|
||||
import { type AgentHarness, type Session } from '@earendil-works/pi-agent-core'
|
||||
@@ -460,58 +460,7 @@ describe('Agent Activities', () => {
|
||||
expect(res.usage.inputTokens).toBe(5)
|
||||
})
|
||||
|
||||
it('should include agentContext in the autofill prompt when provided', async () => {
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
content: [{ type: 'text', text: 'Captured' }],
|
||||
usage: { input: 5, output: 5 },
|
||||
}),
|
||||
}
|
||||
const mockSession = {
|
||||
getEntries: vi.fn().mockResolvedValue([]),
|
||||
getStorage: vi.fn().mockReturnValue({ sessionId: 'mock-session-id' }),
|
||||
}
|
||||
|
||||
vi.mocked(piAgent.createAgentSession).mockImplementation(async (config: unknown) => {
|
||||
const params = config as {
|
||||
customTools: Array<{
|
||||
name: string
|
||||
execute: (id: string, args: Record<string, unknown>) => Promise<unknown>
|
||||
}>
|
||||
}
|
||||
const tool = params.customTools.find((t) => t.name === 'autofill_metadata')
|
||||
if (tool) {
|
||||
await tool.execute('1', { f1: 'val' })
|
||||
}
|
||||
return {
|
||||
session: mockSession as unknown as Session<DatabaseSessionMetadata>,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Mock AgentHarness instance for activity test
|
||||
harness: mockHarness as unknown as AgentHarness<any, any, any, any>,
|
||||
}
|
||||
})
|
||||
|
||||
const context = {
|
||||
agent: { id: 'b1', provider: { name: 'google' }, modelRef: { modelId: 'gemini' } },
|
||||
dbProviders: [],
|
||||
teamSkills: [],
|
||||
allowedDomains: [],
|
||||
} as unknown as AgentExecutionContext
|
||||
|
||||
await autofillAiActivity({
|
||||
teamId: 't1',
|
||||
images: [],
|
||||
fields: [{ id: 'f1', config: { name: 'F1', type: 'text' } }],
|
||||
context,
|
||||
agentContext: 'Generated using gemini',
|
||||
})
|
||||
|
||||
const capturedPrompt = mockHarness.prompt.mock.calls[0]?.[0] ?? ''
|
||||
expect(capturedPrompt).toContain('Generated using gemini')
|
||||
expect(capturedPrompt).toContain('<context>')
|
||||
})
|
||||
|
||||
it('should not include agentContext in the autofill prompt when absent', async () => {
|
||||
it('should use the base autofill prompt without any creation-context injection', async () => {
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
@@ -557,6 +506,7 @@ describe('Agent Activities', () => {
|
||||
})
|
||||
|
||||
const capturedPrompt = mockHarness.prompt.mock.calls[0]?.[0] ?? ''
|
||||
expect(capturedPrompt).toContain('Analyze the provided images and extract metadata.')
|
||||
expect(capturedPrompt).not.toContain('<context>')
|
||||
})
|
||||
})
|
||||
@@ -1342,8 +1292,7 @@ describe('Agent Database Activities Integration', () => {
|
||||
key: 'field_key_1',
|
||||
scope: 'TEAM',
|
||||
teamId: team.id,
|
||||
aiAutofill: true,
|
||||
config: { name: 'Title Extractor', type: 'text' },
|
||||
config: { name: 'Title Extractor', type: 'text', autofillSource: 'CONTENT' },
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1363,37 +1312,6 @@ describe('Agent Database Activities Integration', () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe('getAssetAutofillContextActivity', () => {
|
||||
it('should return the stored autofill context for an asset', async () => {
|
||||
const withContext = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'ctx.png',
|
||||
type: AssetType.file,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
autofillContext: 'Generated using gemini',
|
||||
},
|
||||
})
|
||||
|
||||
const ctx = await getAssetAutofillContextActivity(withContext.id)
|
||||
expect(ctx).toBe('Generated using gemini')
|
||||
})
|
||||
|
||||
it('should return null when the asset has no autofill context', async () => {
|
||||
const noContext = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'plain.png',
|
||||
type: AssetType.file,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
},
|
||||
})
|
||||
|
||||
const ctx = await getAssetAutofillContextActivity(noContext.id)
|
||||
expect(ctx).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
describe('executeAgentToolActivity', () => {
|
||||
beforeEach(() => {
|
||||
vi.spyOn(authzService, 'hasPermission').mockResolvedValue()
|
||||
@@ -1553,7 +1471,17 @@ describe('Agent Database Activities Integration', () => {
|
||||
expect(uploadService.triggerPostUploadWorkflows).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should persist autofillContext on the created file when context is provided', async () => {
|
||||
it('should persist metadata on the created file when metadata map is provided', async () => {
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'prompt',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Prompt', type: 'text', autofillSource: 'CREATION_CONTEXT' },
|
||||
},
|
||||
})
|
||||
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'WorkspaceFolder',
|
||||
@@ -1574,16 +1502,46 @@ describe('Agent Database Activities Integration', () => {
|
||||
name: 'ctx.txt',
|
||||
size: 100,
|
||||
contentType: 'text/plain',
|
||||
context: 'Generated using gemini',
|
||||
metadata: { prompt: 'Generated using gemini' },
|
||||
},
|
||||
userId: user.id,
|
||||
})
|
||||
|
||||
const created = await prisma.asset.findUnique({ where: { id: res.id } })
|
||||
expect(created?.autofillContext).toBe('Generated using gemini')
|
||||
const val = await prisma.assetMetadataValue.findFirst({
|
||||
where: { assetId: res.id, fieldKey: 'prompt' },
|
||||
})
|
||||
expect(val?.stringValue).toBe('Generated using gemini')
|
||||
})
|
||||
|
||||
it('should not set autofillContext when context is not provided', async () => {
|
||||
it('should persist select and selectMulti metadata with dynamic newOption', async () => {
|
||||
const selectField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'provider',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'Provider',
|
||||
type: 'select',
|
||||
autofillSource: 'CREATION_CONTEXT',
|
||||
select: { options: [{ id: 'openai', displayName: 'OpenAI', color: '#f43f5e' }] },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
const multiField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'tags',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'Tags',
|
||||
type: 'selectMulti',
|
||||
autofillSource: 'CREATION_CONTEXT',
|
||||
selectMulti: { options: [{ id: 'tag1', displayName: 'Tag 1', color: '#3b82f6' }] },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'WorkspaceFolder',
|
||||
@@ -1600,16 +1558,80 @@ describe('Agent Database Activities Integration', () => {
|
||||
toolName: 'create_file',
|
||||
args: {
|
||||
parent: folder.id,
|
||||
s3Key: 'uploads/plain.txt',
|
||||
name: 'plain.txt',
|
||||
s3Key: 'uploads/new_opt.txt',
|
||||
name: 'new_opt.txt',
|
||||
size: 100,
|
||||
contentType: 'text/plain',
|
||||
metadata: {
|
||||
provider: { newOption: { value: 'Kling' } },
|
||||
tags: ['tag1', { newOption: { value: 'Tag 2' } }],
|
||||
},
|
||||
},
|
||||
userId: user.id,
|
||||
})
|
||||
|
||||
const created = await prisma.asset.findUnique({ where: { id: res.id } })
|
||||
expect(created?.autofillContext).toBeNull()
|
||||
// Verify select field
|
||||
const providerVal = await prisma.assetMetadataValue.findFirst({
|
||||
where: { assetId: res.id, fieldKey: selectField.key },
|
||||
})
|
||||
expect(providerVal?.stringValue).toBe('kling')
|
||||
|
||||
// Verify select field config was updated with new option
|
||||
const updatedSelectField = await prisma.metadataField.findUnique({
|
||||
where: { key: selectField.key },
|
||||
})
|
||||
const selectOpts =
|
||||
(updatedSelectField?.config as PrismaJson.FieldConfig)?.select?.options || []
|
||||
expect(selectOpts.some((o) => o.displayName === 'Kling' && o.id === 'kling')).toBe(true)
|
||||
|
||||
// Verify selectMulti field
|
||||
const tagsVal = await prisma.assetMetadataValue.findFirst({
|
||||
where: { assetId: res.id, fieldKey: multiField.key },
|
||||
})
|
||||
expect(tagsVal?.jsonValue).toEqual(['tag1', 'tag-2'])
|
||||
|
||||
// Verify selectMulti field config was updated with new option
|
||||
const updatedMultiField = await prisma.metadataField.findUnique({
|
||||
where: { key: multiField.key },
|
||||
})
|
||||
const multiOpts =
|
||||
(updatedMultiField?.config as PrismaJson.FieldConfig)?.selectMulti?.options || []
|
||||
expect(multiOpts.some((o) => o.displayName === 'Tag 2' && o.id === 'tag-2')).toBe(true)
|
||||
})
|
||||
|
||||
it('should reject metadata with keys that are not valid in this project', async () => {
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'WorkspaceFolder',
|
||||
type: AssetType.folder,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
fileCount: 0,
|
||||
sizeByte: 0,
|
||||
},
|
||||
})
|
||||
|
||||
await expect(
|
||||
executeAgentToolActivity({
|
||||
taskId: 'task-1',
|
||||
toolName: 'create_file',
|
||||
args: {
|
||||
parent: folder.id,
|
||||
s3Key: 'uploads/ctx.txt',
|
||||
name: 'ctx.txt',
|
||||
size: 100,
|
||||
contentType: 'text/plain',
|
||||
metadata: { prompt: 'ok', unknownKey: 'not allowed' },
|
||||
},
|
||||
userId: user.id,
|
||||
}),
|
||||
).rejects.toThrow(/not valid in this project/)
|
||||
|
||||
// No metadata value should have been written for the unknown key
|
||||
const val = await prisma.assetMetadataValue.findFirst({
|
||||
where: { fieldKey: 'unknownKey' },
|
||||
})
|
||||
expect(val).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1720,7 +1742,17 @@ describe('Agent Database Activities Integration', () => {
|
||||
expect(Number(updatedStack?.sizeByte)).toBe(350)
|
||||
})
|
||||
|
||||
it('should persist autofillContext when creating a new version stack', async () => {
|
||||
it('should persist metadata on the created version when metadata map is provided', async () => {
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'prompt',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Prompt', type: 'text', autofillSource: 'CREATION_CONTEXT' },
|
||||
},
|
||||
})
|
||||
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'WorkspaceFolder',
|
||||
@@ -1752,45 +1784,51 @@ describe('Agent Database Activities Integration', () => {
|
||||
name: 'v2.txt',
|
||||
size: 300,
|
||||
contentType: 'text/plain',
|
||||
context: 'Generated using seedance',
|
||||
metadata: { prompt: 'Generated using seedance' },
|
||||
},
|
||||
userId: user.id,
|
||||
})
|
||||
|
||||
const created = await prisma.asset.findUnique({ where: { id: res.id } })
|
||||
expect(created?.autofillContext).toBe('Generated using seedance')
|
||||
const val = await prisma.assetMetadataValue.findFirst({
|
||||
where: { assetId: res.id, fieldKey: 'prompt' },
|
||||
})
|
||||
expect(val?.stringValue).toBe('Generated using seedance')
|
||||
})
|
||||
|
||||
it('should persist autofillContext when adding to an existing version stack', async () => {
|
||||
it('should persist select and selectMulti newOption metadata in create_version', async () => {
|
||||
const selectField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'versionProvider',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'Version Provider',
|
||||
type: 'select',
|
||||
autofillSource: 'CREATION_CONTEXT',
|
||||
select: { options: [{ id: 'openai', displayName: 'OpenAI', color: '#f43f5e' }] },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'WorkspaceFolder',
|
||||
type: AssetType.folder,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'VersionStack',
|
||||
type: AssetType.version_stack,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
parentId: folder.id,
|
||||
fileCount: 1,
|
||||
sizeByte: 100,
|
||||
sizeByte: 200,
|
||||
},
|
||||
})
|
||||
|
||||
const existingFileVersion = await prisma.asset.create({
|
||||
const fileAsset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'v1.txt',
|
||||
type: AssetType.file,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
parentId: stack.id,
|
||||
sizeByte: 100,
|
||||
parentId: folder.id,
|
||||
sizeByte: 200,
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1798,137 +1836,28 @@ describe('Agent Database Activities Integration', () => {
|
||||
taskId: 'task-1',
|
||||
toolName: 'create_version',
|
||||
args: {
|
||||
parent: existingFileVersion.id,
|
||||
parent: fileAsset.id,
|
||||
s3Key: 'uploads/v2.txt',
|
||||
name: 'v2.txt',
|
||||
size: 250,
|
||||
size: 300,
|
||||
contentType: 'text/plain',
|
||||
context: 'Generated using sora2',
|
||||
},
|
||||
userId: user.id,
|
||||
})
|
||||
|
||||
const created = await prisma.asset.findUnique({ where: { id: res.id } })
|
||||
expect(created?.autofillContext).toBe('Generated using sora2')
|
||||
})
|
||||
})
|
||||
|
||||
describe('list_autofill_fields', () => {
|
||||
it('should return only aiAutofill fields with their options', async () => {
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'WorkspaceFolder',
|
||||
type: AssetType.folder,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
},
|
||||
})
|
||||
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'source',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
aiAutofill: true,
|
||||
config: {
|
||||
name: 'Source',
|
||||
type: 'select',
|
||||
select: {
|
||||
options: [
|
||||
{ id: 'gemini', displayName: 'Gemini', color: '#ffffff' },
|
||||
{ id: 'seedance', displayName: 'Seedance', color: '#ffffff' },
|
||||
],
|
||||
},
|
||||
metadata: {
|
||||
versionProvider: { newOption: { value: 'Midjourney' } },
|
||||
},
|
||||
description: 'Generation source',
|
||||
},
|
||||
})
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'title',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
aiAutofill: true,
|
||||
config: { name: 'Title', type: 'text' },
|
||||
},
|
||||
})
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'manual_notes',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
aiAutofill: false,
|
||||
config: { name: 'Manual Notes', type: 'text' },
|
||||
},
|
||||
})
|
||||
|
||||
const res = await executeAgentToolActivity({
|
||||
taskId: 'task-1',
|
||||
toolName: 'list_autofill_fields',
|
||||
args: { parent: folder.id },
|
||||
userId: user.id,
|
||||
})
|
||||
|
||||
expect(res.fields).toHaveLength(2)
|
||||
const source = res.fields.find((f: { name: string }) => f.name === 'Source')
|
||||
expect(source?.name).toBe('Source')
|
||||
expect(source?.type).toBe('select')
|
||||
expect(source?.description).toBe('Generation source')
|
||||
expect(source?.options).toEqual([{ displayName: 'Gemini' }, { displayName: 'Seedance' }])
|
||||
expect(res.fields.find((f: { name: string }) => f.name === 'Manual Notes')).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should resolve the project through the ancestor chain', async () => {
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root',
|
||||
type: AssetType.folder,
|
||||
status: AssetStatus.uploaded,
|
||||
projectId: project.id,
|
||||
},
|
||||
const val = await prisma.assetMetadataValue.findFirst({
|
||||
where: { assetId: res.id, fieldKey: selectField.key },
|
||||
})
|
||||
const subFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Sub',
|
||||
type: AssetType.folder,
|
||||
status: AssetStatus.uploaded,
|
||||
parentId: rootFolder.id,
|
||||
},
|
||||
expect(val?.stringValue).toBe('midjourney')
|
||||
|
||||
const updatedField = await prisma.metadataField.findUnique({
|
||||
where: { key: selectField.key },
|
||||
})
|
||||
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'title_2',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
aiAutofill: true,
|
||||
config: { name: 'Title 2', type: 'text' },
|
||||
},
|
||||
})
|
||||
|
||||
const res = await executeAgentToolActivity({
|
||||
taskId: 'task-1',
|
||||
toolName: 'list_autofill_fields',
|
||||
args: { parent: subFolder.id },
|
||||
userId: user.id,
|
||||
})
|
||||
|
||||
expect(res.fields.length).toBeGreaterThan(0)
|
||||
})
|
||||
|
||||
it('should fail when parent is missing', async () => {
|
||||
await expect(
|
||||
executeAgentToolActivity({
|
||||
taskId: 'task-1',
|
||||
toolName: 'list_autofill_fields',
|
||||
args: {},
|
||||
userId: user.id,
|
||||
}),
|
||||
).rejects.toThrow('parent parameter is required')
|
||||
const opts = (updatedField?.config as PrismaJson.FieldConfig)?.select?.options || []
|
||||
expect(opts.some((o) => o.displayName === 'Midjourney' && o.id === 'midjourney')).toBe(true)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -2113,4 +2042,113 @@ describe('Agent Database Activities Integration', () => {
|
||||
expect(piAgent.createAgentSession).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('Nested AGENTS.md prompt injection', () => {
|
||||
it('formatProjectContextPrompt formats context files into XML project_context block', () => {
|
||||
expect(formatProjectContextPrompt([])).toBe('')
|
||||
|
||||
const formatted = formatProjectContextPrompt([
|
||||
{ path: '/AGENTS.md', content: 'Root rules' },
|
||||
{ path: '/subfolder/AGENTS.md', content: 'Subfolder rules' },
|
||||
])
|
||||
|
||||
expect(formatted).toBe(
|
||||
'\n\n<project_context>\n\nProject-specific instructions and guidelines:\n\n<project_instructions path="/AGENTS.md">\nRoot rules\n</project_instructions>\n\n<project_instructions path="/subfolder/AGENTS.md">\nSubfolder rules\n</project_instructions>\n\n</project_context>',
|
||||
)
|
||||
})
|
||||
|
||||
it('agentChatActivity injects nested AGENTS.md instructions into systemPrompt', async () => {
|
||||
const user = await prisma.user.create({
|
||||
data: { name: 'User_Chat_Md', email: `chat-md-${Date.now()}@example.com` },
|
||||
})
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Team_Chat_Md_' + Date.now() },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Project_Chat_Md', teamId: team.id },
|
||||
})
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root',
|
||||
type: AssetType.root,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
await prisma.assetAgentMd.create({
|
||||
data: {
|
||||
assetId: rootFolder.id,
|
||||
content: '# Root Policy',
|
||||
},
|
||||
})
|
||||
const subfolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'subfolder',
|
||||
type: AssetType.folder,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
await prisma.assetAgentMd.create({
|
||||
data: {
|
||||
assetId: subfolder.id,
|
||||
content: '# Subfolder Policy',
|
||||
},
|
||||
})
|
||||
|
||||
const mockHarness = {
|
||||
subscribe: vi.fn(),
|
||||
prompt: vi.fn().mockResolvedValue({
|
||||
content: [{ type: 'text', text: 'Chat reply' }],
|
||||
usage: { input: 10, output: 20 },
|
||||
}),
|
||||
}
|
||||
const mockSession = {
|
||||
getEntries: vi.fn().mockResolvedValue([]),
|
||||
getStorage: vi.fn().mockReturnValue({ sessionId: 'mock-session-id' }),
|
||||
}
|
||||
|
||||
vi.mocked(piAgent.createAgentSession).mockResolvedValue({
|
||||
session: mockSession as unknown as Session<DatabaseSessionMetadata>,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Mock AgentHarness instance for activity test
|
||||
harness: mockHarness as unknown as AgentHarness<any, any, any, any>,
|
||||
})
|
||||
|
||||
const context = {
|
||||
agent: { id: 'agent-1', provider: { name: 'google' }, modelRef: { modelId: 'gemini' } },
|
||||
dbProviders: [],
|
||||
teamSkills: [],
|
||||
allowedDomains: [],
|
||||
} as unknown as AgentExecutionContext
|
||||
|
||||
await agentChatActivity({
|
||||
teamId: team.id,
|
||||
agentId: 'agent-1',
|
||||
message: 'Hello',
|
||||
imageUrls: [],
|
||||
projectId: project.id,
|
||||
folderId: subfolder.id,
|
||||
assetId: subfolder.id,
|
||||
sessionId: 'mock-session-id',
|
||||
userId: user.id,
|
||||
context,
|
||||
})
|
||||
|
||||
expect(piAgent.createAgentSession).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
systemPrompt: expect.stringContaining('<project_context>'),
|
||||
}),
|
||||
)
|
||||
|
||||
const lastCall = vi.mocked(piAgent.createAgentSession).mock.calls.at(-1)
|
||||
const systemPromptArg = lastCall?.[0].systemPrompt as string
|
||||
expect(systemPromptArg).toContain(
|
||||
'<project_instructions path="/AGENTS.md">\n# Root Policy\n</project_instructions>',
|
||||
)
|
||||
expect(systemPromptArg).toContain(
|
||||
'<project_instructions path="/subfolder/AGENTS.md">\n# Subfolder Policy\n</project_instructions>',
|
||||
)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -65,6 +65,18 @@ export interface AgentExecutionContext {
|
||||
allowedDomains: string[]
|
||||
}
|
||||
|
||||
export function formatProjectContextPrompt(
|
||||
contextFiles: Array<{ path: string; content: string }>,
|
||||
): string {
|
||||
if (contextFiles.length === 0) return ''
|
||||
let prompt = '\n\n<project_context>\n\nProject-specific instructions and guidelines:\n\n'
|
||||
for (const { path: filePath, content } of contextFiles) {
|
||||
prompt += `<project_instructions path="${filePath}">\n${content}\n</project_instructions>\n\n`
|
||||
}
|
||||
prompt += '</project_context>'
|
||||
return prompt
|
||||
}
|
||||
|
||||
async function executeAgentPrompt(params: {
|
||||
taskId?: string
|
||||
teamId: string
|
||||
@@ -74,6 +86,8 @@ async function executeAgentPrompt(params: {
|
||||
agentsInstruction: string
|
||||
sessionId?: string
|
||||
userId?: string
|
||||
projectId?: string
|
||||
assetId?: string
|
||||
userCommentId?: string | null
|
||||
tools?: AgentTool[]
|
||||
context: AgentExecutionContext
|
||||
@@ -104,7 +118,7 @@ shumai has its own cloud file system. If a user asks you to perform file system
|
||||
|
||||
If you need to create files in the local filesystem (for example, a temporary file for uploading), only the '.pi' folder in the current directory has write permissions. Do NOT attempt to create files in any other directories.
|
||||
|
||||
When creating a file or version, first use 'list_autofill_fields' to inspect the project's AI-autofillable metadata fields. If relevant metadata depends on information unavailable from the file content (for example, the AI model or prompt used to generate the asset), include a context in the 'context' field of 'create_file' or 'create_version'. Keep the context short and only include information relevant to those fields.`
|
||||
When creating a file or version, you may attach metadata (for example, the AI model or prompt used to generate the asset). The allowed field keys and value types are declared directly in the 'metadata' parameter of the 'create_file' and 'create_version' tools.`
|
||||
|
||||
if (agent.soul) {
|
||||
systemPrompt = `${systemPrompt}\n\nAgent Personality and Core Instructions:\n${agent.soul}`
|
||||
@@ -113,6 +127,40 @@ When creating a file or version, first use 'list_autofill_fields' to inspect the
|
||||
// Note: params.agentsInstruction is no longer appended to systemPrompt here.
|
||||
// Instead, it is persisted as a custom message session entry in the conversation history below.
|
||||
|
||||
let targetAssetId = params.assetId
|
||||
if (!targetAssetId) {
|
||||
if (params.userCommentId) {
|
||||
const comment = await prisma.assetComment.findUnique({
|
||||
where: { id: params.userCommentId },
|
||||
select: { assetId: true },
|
||||
})
|
||||
if (comment?.assetId) {
|
||||
targetAssetId = comment.assetId
|
||||
}
|
||||
} else if (params.taskId) {
|
||||
const task = await prisma.workflowTask.findUnique({
|
||||
where: { id: params.taskId },
|
||||
select: { assetId: true },
|
||||
})
|
||||
if (task?.assetId) {
|
||||
targetAssetId = task.assetId
|
||||
}
|
||||
} else if (params.projectId) {
|
||||
const project = await prisma.project.findUnique({
|
||||
where: { id: params.projectId },
|
||||
select: { rootFolderId: true },
|
||||
})
|
||||
if (project?.rootFolderId) {
|
||||
targetAssetId = project.rootFolderId
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const contextFiles = targetAssetId ? await assetService.getNestedAgentsMd(targetAssetId) : []
|
||||
if (contextFiles.length > 0) {
|
||||
systemPrompt += formatProjectContextPrompt(contextFiles)
|
||||
}
|
||||
|
||||
const modelConfig = agent.modelRef?.config
|
||||
if (modelConfig?.input) {
|
||||
systemPrompt += `\n\nYour current model supports the following input types: ${modelConfig.input.join(', ')}.`
|
||||
@@ -144,6 +192,7 @@ When creating a file or version, first use 'list_autofill_fields' to inspect the
|
||||
allowedDomains,
|
||||
sessionId: params.sessionId,
|
||||
userId: params.userId,
|
||||
projectId: params.projectId,
|
||||
userCommentId: params.userCommentId,
|
||||
customTools: [...(params.tools || []), ...mcpTools],
|
||||
providers: dbProviders.map((p) => ({
|
||||
@@ -347,6 +396,7 @@ export interface AgentChatParams {
|
||||
imageUrls: string[]
|
||||
projectId: string
|
||||
folderId: string
|
||||
assetId?: string
|
||||
agentsInstruction?: string
|
||||
sessionId: string
|
||||
userId?: string
|
||||
@@ -411,6 +461,8 @@ export async function agentChatActivity(params: AgentChatParams) {
|
||||
agentsInstruction: params.agentsInstruction || '',
|
||||
sessionId,
|
||||
userId: params.userId,
|
||||
projectId: params.projectId,
|
||||
assetId: params.assetId || params.folderId,
|
||||
userCommentId: params.userCommentId,
|
||||
context: params.context,
|
||||
attachedAssets: params.attachedAssets,
|
||||
@@ -422,17 +474,12 @@ export interface AutofillAiParams {
|
||||
images: string[]
|
||||
fields: AutofillField[]
|
||||
context: AgentExecutionContext
|
||||
agentContext?: string
|
||||
assetId?: string
|
||||
projectId?: string
|
||||
}
|
||||
|
||||
export async function autofillAiActivity(params: AutofillAiParams) {
|
||||
let prompt = 'Analyze the provided images and extract metadata.'
|
||||
if (params.agentContext && params.agentContext.trim()) {
|
||||
prompt +=
|
||||
'\n\nAdditional context about this file, provided during creation:\n' +
|
||||
`<context>\n${params.agentContext.trim()}\n</context>\n` +
|
||||
'Use this context to inform your answers, especially for fields that cannot be determined from the images alone (e.g. generation model/source).'
|
||||
}
|
||||
const prompt = 'Analyze the provided images and extract metadata.'
|
||||
const toolSchema = fieldsToTypeBoxSchema(params.fields)
|
||||
let capturedData: Record<string, unknown> | null = null
|
||||
|
||||
@@ -462,6 +509,8 @@ export async function autofillAiActivity(params: AutofillAiParams) {
|
||||
agentsInstruction: '',
|
||||
sessionId: undefined,
|
||||
userId: undefined,
|
||||
projectId: params.projectId,
|
||||
assetId: params.assetId,
|
||||
tools: [autofillTool],
|
||||
context: params.context,
|
||||
})
|
||||
@@ -900,7 +949,7 @@ export async function getAgentChatContextActivity(params: {
|
||||
const sandbox = await prisma.sandbox.findUnique({
|
||||
where: { teamId: params.teamId },
|
||||
})
|
||||
const allowedDomains = sandbox?.allowedDomains || []
|
||||
const allowedDomains = sandbox?.networkSandboxEnabled ? sandbox.allowedDomains : ['*']
|
||||
|
||||
return {
|
||||
agent,
|
||||
@@ -984,7 +1033,7 @@ export async function getAgentAutofillContextActivity(params: {
|
||||
const sandbox = await prisma.sandbox.findUnique({
|
||||
where: { teamId: params.teamId },
|
||||
})
|
||||
const allowedDomains = sandbox?.allowedDomains || []
|
||||
const allowedDomains = sandbox?.networkSandboxEnabled ? sandbox.allowedDomains : ['*']
|
||||
|
||||
return {
|
||||
agent: agentWithDetails,
|
||||
@@ -1043,15 +1092,7 @@ export async function getCommentActivity(commentId: string) {
|
||||
|
||||
export async function getProjectAutofillFieldsActivity(projectId: string) {
|
||||
const fields = await metadataService.listProjectFields('', projectId)
|
||||
return fields.filter((f) => f.field.aiAutofill).map((f) => f.field)
|
||||
}
|
||||
|
||||
export async function getAssetAutofillContextActivity(assetId: string): Promise<string | null> {
|
||||
const asset = await prisma.asset.findUnique({
|
||||
where: { id: assetId },
|
||||
select: { autofillContext: true },
|
||||
})
|
||||
return asset?.autofillContext ?? null
|
||||
return fields.filter((f) => f.field.config?.autofillSource === 'CONTENT').map((f) => f.field)
|
||||
}
|
||||
|
||||
export async function updateAssetMetadataActivity(params: {
|
||||
@@ -1100,7 +1141,37 @@ export interface ExecuteAgentToolParams {
|
||||
userId?: string
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
/**
|
||||
* Validates that every metadata key provided by the agent is a defined
|
||||
* CREATION_CONTEXT field of the project. Unknown keys are rejected with a
|
||||
* non-retryable failure so Temporal does not retry expected validation errors.
|
||||
*/
|
||||
async function validateCreationContextMetadata(
|
||||
userId: string,
|
||||
projectId: string,
|
||||
metadata: Record<string, unknown> | undefined,
|
||||
): Promise<void> {
|
||||
if (!metadata || Object.keys(metadata).length === 0) return
|
||||
|
||||
const fields = await metadataService.listProjectFields(userId, projectId)
|
||||
const allowedKeys = new Set(
|
||||
fields
|
||||
.filter((f) => f.field.config?.autofillSource === 'CREATION_CONTEXT')
|
||||
.map((f) => f.field.key),
|
||||
)
|
||||
const invalidKeys = Object.keys(metadata).filter((key) => !allowedKeys.has(key))
|
||||
if (invalidKeys.length > 0) {
|
||||
throw ApplicationFailure.create({
|
||||
message:
|
||||
`metadata contains keys that are not valid in this project: ${invalidKeys.join(', ')}. ` +
|
||||
"The valid metadata fields are fixed to the current conversation's project. " +
|
||||
'If the target folder or file belongs to a different project, call the tool WITHOUT the metadata parameter.',
|
||||
nonRetryable: true,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Activity return type is a union of tool result shapes
|
||||
export async function executeAgentToolActivity(params: ExecuteAgentToolParams): Promise<any> {
|
||||
const { toolName, args, userId } = params
|
||||
if (!userId) {
|
||||
@@ -1174,9 +1245,7 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
{ first: limit, after },
|
||||
)
|
||||
|
||||
const stackIds = assets
|
||||
.filter((a) => a.type === AssetType.version_stack && (!a.name || a.name === ''))
|
||||
.map((a) => a.id)
|
||||
const stackIds = assets.filter((a) => a.type === AssetType.version_stack).map((a) => a.id)
|
||||
|
||||
const latestVersionsMap = new Map<string, Prisma.AssetGetPayload<Record<string, never>>>()
|
||||
|
||||
@@ -1197,10 +1266,7 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
const latestVersion = latestVersionsMap.get(a.id)
|
||||
return {
|
||||
id: a.id,
|
||||
name:
|
||||
a.type === AssetType.version_stack && (!a.name || a.name === '')
|
||||
? (latestVersion?.name ?? a.name)
|
||||
: a.name,
|
||||
name: a.type === AssetType.version_stack ? (latestVersion?.name ?? a.name) : a.name,
|
||||
type: a.type,
|
||||
size:
|
||||
a.type === AssetType.version_stack && latestVersion
|
||||
@@ -1254,7 +1320,10 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
const name = args.name as string
|
||||
const fileSize = args.size as number
|
||||
const mimeType = args.contentType as string
|
||||
const context = typeof args.context === 'string' ? args.context : undefined
|
||||
const metadata =
|
||||
typeof args.metadata === 'object' && args.metadata !== null
|
||||
? (args.metadata as Record<string, unknown>)
|
||||
: undefined
|
||||
if (!parent || !s3Key || !name || fileSize === undefined || !mimeType) {
|
||||
throw ApplicationFailure.create({
|
||||
message: 'parent, s3Key, name, size, and contentType parameters are required',
|
||||
@@ -1288,6 +1357,9 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
})
|
||||
}
|
||||
|
||||
// Validate that any provided metadata keys are defined CREATION_CONTEXT fields
|
||||
await validateCreationContextMetadata(userId, parentAsset.projectId, metadata)
|
||||
|
||||
// Create asset via assetService
|
||||
const newFile = await assetService.createAsset({
|
||||
name,
|
||||
@@ -1304,12 +1376,14 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await assetService.updateAncestorsSize(tx as any, parent, fileSize)
|
||||
|
||||
// Persist autofill context provided by the agent (used by the autofill workflow)
|
||||
if (context) {
|
||||
await tx.asset.update({
|
||||
where: { id: newFile.id },
|
||||
data: { autofillContext: context },
|
||||
})
|
||||
// Persist creation context metadata provided by the agent
|
||||
if (metadata) {
|
||||
const metadataUpdates = Object.entries(metadata)
|
||||
.filter(([, value]) => value !== null)
|
||||
.map(([key, value]) => ({ key, value }))
|
||||
if (metadataUpdates.length > 0) {
|
||||
await metadataService.updateAssetMetadataInTx(tx, newFile.id, metadataUpdates)
|
||||
}
|
||||
}
|
||||
|
||||
// Trigger post-upload transcode and AI workflows
|
||||
@@ -1335,7 +1409,10 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
const name = args.name as string
|
||||
const fileSize = args.size as number
|
||||
const mimeType = args.contentType as string
|
||||
const context = typeof args.context === 'string' ? args.context : undefined
|
||||
const metadata =
|
||||
typeof args.metadata === 'object' && args.metadata !== null
|
||||
? (args.metadata as Record<string, unknown>)
|
||||
: undefined
|
||||
if (!parent || !s3Key || !name || fileSize === undefined || !mimeType) {
|
||||
throw ApplicationFailure.create({
|
||||
message: 'parent, s3Key, name, size, and contentType parameters are required',
|
||||
@@ -1361,6 +1438,9 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
})
|
||||
}
|
||||
|
||||
// Validate that any provided metadata keys are defined CREATION_CONTEXT fields
|
||||
await validateCreationContextMetadata(userId, parentFile.projectId, metadata)
|
||||
|
||||
// Authz check: verify Edit permission on the parent file (resource ID is parent file id)
|
||||
await authzService.hasPermission({
|
||||
user,
|
||||
@@ -1400,12 +1480,14 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
where: { id: newFile.id },
|
||||
data: { sortIndex: newSortIndex },
|
||||
})
|
||||
// Persist autofill context provided by the agent (used by the autofill workflow)
|
||||
if (context) {
|
||||
await tx.asset.update({
|
||||
where: { id: newFile.id },
|
||||
data: { autofillContext: context },
|
||||
})
|
||||
// Persist creation context metadata provided by the agent
|
||||
if (metadata) {
|
||||
const metadataUpdates = Object.entries(metadata)
|
||||
.filter(([, value]) => value !== null)
|
||||
.map(([key, value]) => ({ key, value }))
|
||||
if (metadataUpdates.length > 0) {
|
||||
await metadataService.updateAssetMetadataInTx(tx, newFile.id, metadataUpdates)
|
||||
}
|
||||
}
|
||||
// Increment stack's size (fileCount is incremented by createAsset already)
|
||||
const updatedStack = await tx.asset.update({
|
||||
@@ -1465,12 +1547,14 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
projectId: parentFile.projectId!,
|
||||
creatorId: userId,
|
||||
})
|
||||
// Persist autofill context provided by the agent (used by the autofill workflow)
|
||||
if (context) {
|
||||
await tx.asset.update({
|
||||
where: { id: newFile.id },
|
||||
data: { autofillContext: context },
|
||||
})
|
||||
// Persist creation context metadata provided by the agent
|
||||
if (metadata) {
|
||||
const metadataUpdates = Object.entries(metadata)
|
||||
.filter(([, value]) => value !== null)
|
||||
.map(([key, value]) => ({ key, value }))
|
||||
if (metadataUpdates.length > 0) {
|
||||
await metadataService.updateAssetMetadataInTx(tx, newFile.id, metadataUpdates)
|
||||
}
|
||||
}
|
||||
// Update ancestors' size (add size of the new file version)
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
@@ -1494,49 +1578,6 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
}
|
||||
}
|
||||
|
||||
case 'list_autofill_fields': {
|
||||
const parent = args.parent
|
||||
if (!parent) {
|
||||
throw ApplicationFailure.create({
|
||||
message: 'parent parameter is required',
|
||||
nonRetryable: true,
|
||||
})
|
||||
}
|
||||
|
||||
// Authz check
|
||||
await authzService.hasPermission({
|
||||
user,
|
||||
permission: Permission.Read,
|
||||
type: ResourceType.Asset,
|
||||
id: parent,
|
||||
})
|
||||
|
||||
// Resolve projectId from the parent asset (climb ancestor chain if needed)
|
||||
const projectId = await resolveAssetProjectId(parent)
|
||||
if (!projectId) {
|
||||
throw ApplicationFailure.create({
|
||||
message: `Could not resolve project for parent: ${parent}`,
|
||||
nonRetryable: true,
|
||||
})
|
||||
}
|
||||
|
||||
const fields = await metadataService.listProjectFields(userId, projectId)
|
||||
const autofillFields = fields
|
||||
.filter((f) => f.field.aiAutofill)
|
||||
.map((f) => ({
|
||||
name: f.field.config?.name,
|
||||
type: f.field.config?.type,
|
||||
description: f.field.description,
|
||||
options: (
|
||||
f.field.config?.select?.options ??
|
||||
f.field.config?.selectMulti?.options ??
|
||||
[]
|
||||
).map((o) => ({ displayName: o.displayName })),
|
||||
}))
|
||||
|
||||
return { fields: autofillFields }
|
||||
}
|
||||
|
||||
default:
|
||||
throw ApplicationFailure.create({
|
||||
message: `Unsupported tool name: ${toolName}`,
|
||||
@@ -1545,21 +1586,6 @@ export async function executeAgentToolActivity(params: ExecuteAgentToolParams):
|
||||
}
|
||||
}
|
||||
|
||||
async function resolveAssetProjectId(assetId: string): Promise<string | null> {
|
||||
let currentId: string | null = assetId
|
||||
while (currentId) {
|
||||
/* prettier-ignore */
|
||||
const assetNode = (await prisma.asset.findUnique({
|
||||
where: { id: currentId },
|
||||
select: { id: true, projectId: true, parentId: true },
|
||||
})) as { id: string; projectId: string | null; parentId: string | null } | null
|
||||
if (!assetNode) break
|
||||
if (assetNode.projectId) return assetNode.projectId
|
||||
currentId = assetNode.parentId
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
export interface GenerateSessionNameParams {
|
||||
teamId: string
|
||||
agentId: string
|
||||
|
||||
@@ -10,6 +10,8 @@ import { createSandboxedBashTool } from './tools/sandboxed-bash'
|
||||
import { SandboxManager, type SandboxAskCallback } from '@anthropic-ai/sandbox-runtime'
|
||||
import { prisma } from '@shumai/db'
|
||||
import { setupTestDbHooks } from '@shumai/db/test'
|
||||
import { type TSchema } from 'typebox'
|
||||
import { Value } from 'typebox/value'
|
||||
import * as path from 'path'
|
||||
import * as childProcess from 'node:child_process'
|
||||
import * as fs from 'fs'
|
||||
@@ -89,10 +91,16 @@ describe('Sandbox Network isolation integration', () => {
|
||||
setupTestDbHooks()
|
||||
|
||||
it('should register callback that pushes blocked hosts to database and propagates to bash tool', async () => {
|
||||
// 1. Create a team
|
||||
// 1. Create a team and enabled sandbox
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Test Sandbox Team' },
|
||||
})
|
||||
await prisma.sandbox.create({
|
||||
data: {
|
||||
teamId: team.id,
|
||||
networkSandboxEnabled: true,
|
||||
},
|
||||
})
|
||||
|
||||
// Ensure agent user and agent exist in database to avoid foreign key violation
|
||||
await prisma.user.create({
|
||||
@@ -198,6 +206,12 @@ describe('Sandbox Network isolation integration', () => {
|
||||
const team2 = await prisma.team.create({
|
||||
data: { name: 'Team 2' },
|
||||
})
|
||||
await prisma.sandbox.create({
|
||||
data: { teamId: team1.id, networkSandboxEnabled: true },
|
||||
})
|
||||
await prisma.sandbox.create({
|
||||
data: { teamId: team2.id, networkSandboxEnabled: true },
|
||||
})
|
||||
|
||||
// Ensure agent user and agents exist in database
|
||||
await prisma.user.create({
|
||||
@@ -290,6 +304,64 @@ describe('Sandbox Network isolation integration', () => {
|
||||
}
|
||||
})
|
||||
|
||||
it('should bypass domain blocking and pending domain recording when networkSandboxEnabled is false', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Disabled Sandbox Team' },
|
||||
})
|
||||
await prisma.sandbox.create({
|
||||
data: { teamId: team.id, networkSandboxEnabled: false },
|
||||
})
|
||||
|
||||
await prisma.user.create({
|
||||
data: {
|
||||
id: 'agent-disabled',
|
||||
name: 'Ai Agent Disabled',
|
||||
email: 'disabled@shumai.ai',
|
||||
type: 'agent',
|
||||
},
|
||||
})
|
||||
await prisma.agent.create({
|
||||
data: {
|
||||
id: 'agent-disabled',
|
||||
teamId: team.id,
|
||||
type: 'chat',
|
||||
config: { provider: 'openai', model: 'gpt-4' },
|
||||
},
|
||||
})
|
||||
|
||||
const initializeSpy = vi.spyOn(SandboxManager, 'initialize').mockResolvedValue()
|
||||
vi.spyOn(SandboxManager, 'wrapWithSandbox').mockImplementation(async (cmd) => cmd)
|
||||
|
||||
await createAgentSession({
|
||||
teamId: team.id,
|
||||
agentId: 'agent-disabled',
|
||||
providerName: 'google',
|
||||
modelId: 'gemini',
|
||||
systemPrompt: 'prompt',
|
||||
teamSkills: [],
|
||||
allowedDomains: ['*'],
|
||||
providers: mockProviders,
|
||||
})
|
||||
|
||||
expect(initializeSpy).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
network: expect.objectContaining({
|
||||
allowedDomains: ['*'],
|
||||
}),
|
||||
}),
|
||||
expect.any(Function),
|
||||
)
|
||||
|
||||
const callback = initializeSpy.mock.calls[0][1]
|
||||
const res = await callback!({ host: 'any-external-domain.com', port: 443 })
|
||||
expect(res).toBe(true)
|
||||
|
||||
const sandbox = await prisma.sandbox.findUnique({
|
||||
where: { teamId: team.id },
|
||||
})
|
||||
expect(sandbox?.pendingDomains).toEqual([])
|
||||
})
|
||||
|
||||
it('should pass thinkingLevel to AgentHarness and default to off', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Test Team' },
|
||||
@@ -814,6 +886,149 @@ describe('createAgentSession bash restriction for non-owner users', () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe('createAgentSession typed metadata schema', () => {
|
||||
setupTestDbHooks()
|
||||
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
async function setupSessionWithProject(opts: { withCreationFields: boolean }) {
|
||||
const team = await prisma.team.create({ data: { name: 'Typed Metadata Team' } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Typed Metadata Project', teamId: team.id },
|
||||
})
|
||||
const user = await prisma.user.create({
|
||||
data: { name: 'Typed Metadata User', email: 'typed-metadata@shumai.ai' },
|
||||
})
|
||||
await prisma.teamMember.create({
|
||||
data: { teamId: team.id, userId: user.id, role: 'owner' },
|
||||
})
|
||||
await prisma.user.create({
|
||||
data: {
|
||||
id: 'typed-metadata-agent',
|
||||
name: 'Ai Agent Typed Metadata',
|
||||
email: 'typed-metadata-agent@shumai.ai',
|
||||
type: 'agent',
|
||||
},
|
||||
})
|
||||
await prisma.agent.create({
|
||||
data: {
|
||||
id: 'typed-metadata-agent',
|
||||
teamId: team.id,
|
||||
type: 'chat',
|
||||
config: { provider: 'google', model: 'gemini' },
|
||||
},
|
||||
})
|
||||
|
||||
if (opts.withCreationFields) {
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'prompt',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Prompt', type: 'text', autofillSource: 'CREATION_CONTEXT' },
|
||||
},
|
||||
})
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'source',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: {
|
||||
name: 'Source',
|
||||
type: 'select',
|
||||
autofillSource: 'CREATION_CONTEXT',
|
||||
select: {
|
||||
options: [{ id: 'gemini', displayName: 'Gemini', color: '#ffffff' }],
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'manualNotes',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Manual Notes', type: 'text', autofillSource: 'NONE' },
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
const initializeSpy = vi.spyOn(SandboxManager, 'initialize').mockResolvedValue()
|
||||
try {
|
||||
const { harness } = await createAgentSession({
|
||||
teamId: team.id,
|
||||
agentId: 'typed-metadata-agent',
|
||||
providerName: 'google',
|
||||
modelId: 'gemini',
|
||||
systemPrompt: 'prompt',
|
||||
teamSkills: [],
|
||||
allowedDomains: [],
|
||||
providers: mockProviders,
|
||||
userId: user.id,
|
||||
projectId: project.id,
|
||||
})
|
||||
return { harness }
|
||||
} finally {
|
||||
initializeSpy.mockRestore()
|
||||
}
|
||||
}
|
||||
|
||||
it('should build create_file/create_version with the project CREATION_CONTEXT fields', async () => {
|
||||
const { harness } = await setupSessionWithProject({ withCreationFields: true })
|
||||
const tools = harness.getTools()
|
||||
|
||||
expect(tools.some((t) => t.name === 'list_autofill_fields')).toBe(false)
|
||||
|
||||
const createFile = tools.find((t) => t.name === 'create_file')
|
||||
const createVersion = tools.find((t) => t.name === 'create_version')
|
||||
expect(createFile).toBeDefined()
|
||||
expect(createVersion).toBeDefined()
|
||||
|
||||
const checkFile = (args: Record<string, unknown>) =>
|
||||
Value.Check(createFile!.parameters as unknown as TSchema, {
|
||||
parent: 'f1',
|
||||
path: '/tmp/x.md',
|
||||
data: null,
|
||||
...args,
|
||||
})
|
||||
const checkVersion = (args: Record<string, unknown>) =>
|
||||
Value.Check(createVersion!.parameters as unknown as TSchema, {
|
||||
parent: 'f1',
|
||||
path: '/tmp/x.md',
|
||||
...args,
|
||||
})
|
||||
|
||||
for (const check of [checkFile, checkVersion]) {
|
||||
// Declared CREATION_CONTEXT fields (all-required, nullable) validate; other keys do not
|
||||
expect(check({ metadata: { prompt: 'hello', source: null } })).toBe(true)
|
||||
expect(check({ metadata: { prompt: null, source: 'gemini' } })).toBe(true)
|
||||
expect(check({ metadata: null })).toBe(true)
|
||||
expect(check({ metadata: { prompt: null, source: null, manualNotes: 'no' } })).toBe(false)
|
||||
expect(check({ metadata: { prompt: null, source: null, bogus: 1 } })).toBe(false)
|
||||
expect(check({ metadata: { prompt: 'hello' } })).toBe(false)
|
||||
}
|
||||
})
|
||||
|
||||
it('should omit the metadata parameter when the project has no CREATION_CONTEXT fields', async () => {
|
||||
const { harness } = await setupSessionWithProject({ withCreationFields: false })
|
||||
const createFile = harness.getTools().find((t) => t.name === 'create_file')
|
||||
const createVersion = harness.getTools().find((t) => t.name === 'create_version')
|
||||
expect(createFile).toBeDefined()
|
||||
expect(createVersion).toBeDefined()
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- inspecting the runtime schema shape of the dynamically-built tool
|
||||
const fileProps = (createFile!.parameters as any).properties
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- inspecting the runtime schema shape of the dynamically-built tool
|
||||
const versionProps = (createVersion!.parameters as any).properties
|
||||
expect('metadata' in fileProps).toBe(false)
|
||||
expect('metadata' in versionProps).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('createAgentSession enabled skill filtering', () => {
|
||||
setupTestDbHooks()
|
||||
|
||||
|
||||
+92
-29
@@ -10,14 +10,14 @@ import { createModels, InMemoryCredentialStore } from '@earendil-works/pi-ai'
|
||||
import { builtinProviders } from '@earendil-works/pi-ai/providers/all'
|
||||
import { agentService } from '@shumai/core/src/agent/agent'
|
||||
import { prisma, type TeamMemberRole } from '@shumai/db'
|
||||
import { Type, type TSchema } from '@sinclair/typebox'
|
||||
import { Type, type TSchema } from 'typebox'
|
||||
import * as fs from 'fs'
|
||||
import * as os from 'os'
|
||||
import * as path from 'path'
|
||||
import { DatabaseSessionStorage } from './database-session-storage'
|
||||
import { metadataService } from '@shumai/core/src/metadata/metadata'
|
||||
import { createAnalyzeImageTool } from './tools/analyze-image'
|
||||
import { createCreateFileTool } from './tools/create-file'
|
||||
import { createListAutofillFieldsTool } from './tools/list-autofill-fields'
|
||||
import { createCreateFolderTool } from './tools/create-folder'
|
||||
import { createCreateVersionTool } from './tools/create-version'
|
||||
import { createDownloadAssetTool } from './tools/download-asset'
|
||||
@@ -102,6 +102,7 @@ export interface CreateAgentSessionParams {
|
||||
allowedDomains: string[]
|
||||
sessionId?: string
|
||||
userId?: string
|
||||
projectId?: string
|
||||
userCommentId?: string | null
|
||||
customTools?: AgentTool[]
|
||||
thinkingLevel?: string
|
||||
@@ -150,6 +151,7 @@ export async function createAgentSession(params: CreateAgentSessionParams) {
|
||||
allowedDomains,
|
||||
sessionId,
|
||||
userId,
|
||||
projectId,
|
||||
userCommentId: passedUserCommentId,
|
||||
customTools = [],
|
||||
thinkingLevel,
|
||||
@@ -188,6 +190,9 @@ export async function createAgentSession(params: CreateAgentSessionParams) {
|
||||
const sandbox = await prisma.sandbox.findUnique({
|
||||
where: { teamId },
|
||||
})
|
||||
if (sandbox && !sandbox.networkSandboxEnabled) {
|
||||
return true
|
||||
}
|
||||
const pendingDomains = sandbox?.pendingDomains || []
|
||||
if (!pendingDomains.includes(host)) {
|
||||
await prisma.sandbox.upsert({
|
||||
@@ -324,13 +329,13 @@ export async function createAgentSession(params: CreateAgentSessionParams) {
|
||||
|
||||
const systemTools: AgentTool[] = []
|
||||
if (userId) {
|
||||
const metadataSchema = await buildProjectMetadataSchema(projectId)
|
||||
systemTools.push(
|
||||
createListAssetsTool(userId),
|
||||
createCreateFolderTool(userId),
|
||||
createCreateFileTool(userId),
|
||||
createCreateVersionTool(userId),
|
||||
createCreateFileTool(userId, metadataSchema),
|
||||
createCreateVersionTool(userId, metadataSchema),
|
||||
createDownloadAssetTool(userId),
|
||||
createListAutofillFieldsTool(userId),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -410,58 +415,116 @@ export interface AutofillField {
|
||||
}
|
||||
|
||||
export function fieldsToTypeBoxSchema(fields: AutofillField[]) {
|
||||
const newOptionSchema = Type.Object(
|
||||
{
|
||||
newOption: Type.Object(
|
||||
{
|
||||
value: Type.String({
|
||||
minLength: 1,
|
||||
description:
|
||||
'The new option display name/value to create and select if none of the existing options match.',
|
||||
}),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
)
|
||||
|
||||
const properties: Record<string, TSchema> = {}
|
||||
for (const f of fields) {
|
||||
let schema: TSchema
|
||||
const fieldName = f.config.name
|
||||
const fieldDesc = f.description || fieldName
|
||||
const baseDescription = `The field '${fieldName}' represents ${fieldDesc}.`
|
||||
switch (f.config.type) {
|
||||
case 'text':
|
||||
case 'longText':
|
||||
schema = Type.String()
|
||||
schema = Type.String({ description: baseDescription })
|
||||
break
|
||||
case 'number':
|
||||
case 'rating':
|
||||
schema = Type.Number()
|
||||
schema = Type.Number({ description: baseDescription })
|
||||
break
|
||||
case 'toggle':
|
||||
schema = Type.Boolean()
|
||||
schema = Type.Boolean({ description: baseDescription })
|
||||
break
|
||||
case 'select': {
|
||||
const options = f.config.select?.options || []
|
||||
schema = Type.String({
|
||||
enum: options.map((o) => o.id),
|
||||
})
|
||||
const description =
|
||||
options.length > 0
|
||||
? `${baseDescription}\nSelect one existing option ID or provide {"newOption": {"value": "..."}} to create a new option.\n\nAvailable options:\n${options.map((o) => `- ${o.displayName} => ${o.id}`).join('\n')}`
|
||||
: `${baseDescription}\nProvide {"newOption": {"value": "..."}} with the desired option name.`
|
||||
if (options.length > 0) {
|
||||
const optionLines = options.map((o) => `- ${o.displayName} => ${o.id}`).join('\n')
|
||||
schema.description = `The field '${fieldName}' represents ${fieldDesc}.\nSelect one option and return the option ID as the value.\n\nAvailable options:\n${optionLines}`
|
||||
schema = Type.Union(
|
||||
[
|
||||
Type.String({
|
||||
enum: options.map((o) => o.id),
|
||||
}),
|
||||
newOptionSchema,
|
||||
],
|
||||
{ description },
|
||||
)
|
||||
} else {
|
||||
schema = Type.Object(newOptionSchema.properties, {
|
||||
additionalProperties: false,
|
||||
description,
|
||||
})
|
||||
}
|
||||
break
|
||||
}
|
||||
case 'selectMulti': {
|
||||
const options = f.config.selectMulti?.options || []
|
||||
schema = Type.Array(
|
||||
Type.String({
|
||||
enum: options.map((o) => o.id),
|
||||
}),
|
||||
)
|
||||
if (options.length > 0) {
|
||||
const optionLines = options.map((o) => `- ${o.displayName} => ${o.id}`).join('\n')
|
||||
schema.description = `The field '${fieldName}' represents ${fieldDesc}.\nSelect applicable options and return the option IDs as the value.\n\nAvailable options:\n${optionLines}`
|
||||
}
|
||||
const description =
|
||||
options.length > 0
|
||||
? `${baseDescription}\nSelect applicable option IDs or provide {"newOption": {"value": "..."}} objects for new options (e.g. ["opt1", {"newOption": {"value": "new_name"}}]).\n\nAvailable options:\n${options.map((o) => `- ${o.displayName} => ${o.id}`).join('\n')}`
|
||||
: `${baseDescription}\nProvide an array of {"newOption": {"value": "..."}} objects for new options.`
|
||||
const itemSchema =
|
||||
options.length > 0
|
||||
? Type.Union([
|
||||
Type.String({
|
||||
enum: options.map((o) => o.id),
|
||||
}),
|
||||
newOptionSchema,
|
||||
])
|
||||
: newOptionSchema
|
||||
schema = Type.Array(itemSchema, { description })
|
||||
break
|
||||
}
|
||||
default:
|
||||
schema = Type.String()
|
||||
schema = Type.String({ description: baseDescription })
|
||||
}
|
||||
|
||||
if (!schema.description) {
|
||||
schema.description = `The field '${fieldName}' represents ${fieldDesc}.`
|
||||
}
|
||||
properties[f.id] = schema
|
||||
// Every field is required but nullable: the agent must return each field key,
|
||||
// using `null` for values it does not know. Nulls are skipped when persisting.
|
||||
// This matches the OpenAI structured-outputs strict-mode convention (all
|
||||
// properties required, optionality expressed via `null`).
|
||||
properties[f.id] = Type.Union([schema, Type.Null()])
|
||||
}
|
||||
|
||||
return Type.Object(properties)
|
||||
return Type.Object(properties, { additionalProperties: false })
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the strict, all-optional metadata schema for the project's CREATION_CONTEXT
|
||||
* fields (the same field set the agent may attach when creating files/versions).
|
||||
* Returns undefined when no project is known or the project defines no fields, in
|
||||
* which case the `metadata` parameter is omitted from the tools entirely.
|
||||
*/
|
||||
async function buildProjectMetadataSchema(projectId?: string): Promise<TSchema | undefined> {
|
||||
if (!projectId) return undefined
|
||||
const fields = await metadataService.listProjectFields('', projectId)
|
||||
const creationFields: AutofillField[] = []
|
||||
for (const f of fields) {
|
||||
const config = f.field.config
|
||||
if (!config || config.autofillSource !== 'CREATION_CONTEXT') continue
|
||||
creationFields.push({
|
||||
id: f.field.key,
|
||||
config,
|
||||
description: f.field.description,
|
||||
})
|
||||
}
|
||||
if (creationFields.length === 0) return undefined
|
||||
return fieldsToTypeBoxSchema(creationFields)
|
||||
}
|
||||
|
||||
function escapeXml(str: string): string {
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { validateToolArguments } from '@earendil-works/pi-ai'
|
||||
import { createCreateFileTool } from './tools/create-file'
|
||||
import { fieldsToTypeBoxSchema } from './index'
|
||||
import { s3Service } from '@shumai/core/src/s3/s3'
|
||||
import { executeAgentToolWorkflow } from './tools/utils'
|
||||
|
||||
vi.mock('@shumai/core/src/s3/s3', () => ({
|
||||
s3Service: {
|
||||
uploadFileToKey: vi.fn(),
|
||||
putObject: vi.fn(),
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('./tools/utils', () => ({
|
||||
executeAgentToolWorkflow: vi.fn().mockResolvedValue({ id: 'file-1', name: 'test', type: 'file' }),
|
||||
}))
|
||||
|
||||
/**
|
||||
* Reproduce: pi-ai <= 0.82.1 runs its lenient coercion on typebox v1 schemas and
|
||||
* converts `null` in a `[string, null]` union into `""` (see
|
||||
* coerceWithUnionSchema in @earendil-works/pi-ai/dist/utils/validation.js).
|
||||
*
|
||||
* When the agent calls create_file with `path: null, data: {...}`, the harness
|
||||
* validates first: the `null` path becomes `""`, so the tool's
|
||||
* assertExactlyOneSource believes BOTH path and data were provided and throws
|
||||
* "Provide exactly one of ..." even though the call is valid.
|
||||
*
|
||||
* Fixed upstream in pi-ai 0.84.0 (#7328): values that already match a union arm
|
||||
* are preserved before coercion. This test should pass once @earendil-works/pi-ai
|
||||
* is upgraded to >= 0.84.0.
|
||||
*/
|
||||
describe('reproduce null coercion in harness tool validation', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
it('keeps path: null when data is provided (no false "exactly one" error)', async () => {
|
||||
const tool = createCreateFileTool('user-1')
|
||||
|
||||
const validated = validateToolArguments(
|
||||
{
|
||||
name: 'create_file',
|
||||
description: '',
|
||||
parameters: tool.parameters,
|
||||
} as Parameters<typeof validateToolArguments>[0],
|
||||
{
|
||||
type: 'toolCall',
|
||||
id: 'call-1',
|
||||
name: 'create_file',
|
||||
arguments: {
|
||||
parent: '01KYKNP52YERGJ6Q4GTPF5FRQF',
|
||||
path: null,
|
||||
data: { name: 'random_text.txt', content: 'hello' },
|
||||
},
|
||||
} as Parameters<typeof validateToolArguments>[1],
|
||||
) as { path?: unknown; data?: unknown }
|
||||
|
||||
// The `null` path must survive validation untouched; coercion to "" makes
|
||||
// the tool think both path and data were provided.
|
||||
expect(validated.path).toBeNull()
|
||||
expect(validated.data).toEqual({ name: 'random_text.txt', content: 'hello' })
|
||||
|
||||
// execute must accept the valid call (data-only) without throwing
|
||||
const result = await tool.execute('call-1', validated as never)
|
||||
expect(result.details).toEqual({ id: 'file-1', name: 'test', type: 'file' })
|
||||
expect(s3Service.putObject).toHaveBeenCalledTimes(1)
|
||||
expect(executeAgentToolWorkflow).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('keeps null metadata values (the "unknown" sentinel) through validation', () => {
|
||||
const tool = createCreateFileTool(
|
||||
'user-1',
|
||||
fieldsToTypeBoxSchema([{ id: 'prompt', config: { name: 'Prompt', type: 'text' } }]),
|
||||
)
|
||||
const validated = validateToolArguments(
|
||||
{
|
||||
name: 'create_file',
|
||||
description: '',
|
||||
parameters: tool.parameters,
|
||||
} as Parameters<typeof validateToolArguments>[0],
|
||||
{
|
||||
type: 'toolCall',
|
||||
id: 'call-1',
|
||||
name: 'create_file',
|
||||
arguments: {
|
||||
parent: 'folder-1',
|
||||
path: null,
|
||||
data: { name: 'a.md', content: 'x' },
|
||||
metadata: { prompt: null },
|
||||
},
|
||||
} as Parameters<typeof validateToolArguments>[1],
|
||||
) as { metadata?: Record<string, unknown> }
|
||||
|
||||
expect(validated.metadata).toEqual({ prompt: null })
|
||||
})
|
||||
})
|
||||
@@ -1,6 +1,22 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { type TSchema } from 'typebox'
|
||||
import { Value } from 'typebox/value'
|
||||
import { fieldsToTypeBoxSchema, type AutofillField } from './index'
|
||||
|
||||
interface AnyOfFieldSchema {
|
||||
type?: string
|
||||
enum?: string[]
|
||||
const?: string
|
||||
description?: string
|
||||
items?: { enum?: string[]; type?: string }
|
||||
anyOf?: AnyOfFieldSchema[]
|
||||
}
|
||||
|
||||
function propsOf(schema: TSchema): Record<string, { anyOf?: AnyOfFieldSchema[] }> {
|
||||
return (schema as unknown as { properties: Record<string, { anyOf?: AnyOfFieldSchema[] }> })
|
||||
.properties
|
||||
}
|
||||
|
||||
describe('fieldsToTypeBoxSchema', () => {
|
||||
it('converts text fields', () => {
|
||||
const fields: AutofillField[] = [
|
||||
@@ -8,10 +24,12 @@ describe('fieldsToTypeBoxSchema', () => {
|
||||
{ id: 'f2', config: { name: 'Desc', type: 'longText' } },
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(schema.properties.f1.type).toBe('string')
|
||||
expect(schema.properties.f1.description).toBe("The field 'Title' represents The title.")
|
||||
expect(schema.properties.f2.type).toBe('string')
|
||||
expect(schema.properties.f2.description).toBe("The field 'Desc' represents Desc.")
|
||||
const props = propsOf(schema)
|
||||
expect(props.f1.anyOf![0].type).toBe('string')
|
||||
expect(props.f1.anyOf![1].type).toBe('null')
|
||||
expect(props.f1.anyOf![0].description).toBe("The field 'Title' represents The title.")
|
||||
expect(props.f2.anyOf![0].type).toBe('string')
|
||||
expect(props.f2.anyOf![0].description).toBe("The field 'Desc' represents Desc.")
|
||||
})
|
||||
|
||||
it('converts numeric fields', () => {
|
||||
@@ -20,17 +38,18 @@ describe('fieldsToTypeBoxSchema', () => {
|
||||
{ id: 'f2', config: { name: 'Rating', type: 'rating' } },
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(schema.properties.f1.type).toBe('number')
|
||||
expect(schema.properties.f2.type).toBe('number')
|
||||
const props = propsOf(schema)
|
||||
expect(props.f1.anyOf![0].type).toBe('number')
|
||||
expect(props.f2.anyOf![0].type).toBe('number')
|
||||
})
|
||||
|
||||
it('converts toggle fields', () => {
|
||||
const fields: AutofillField[] = [{ id: 'f1', config: { name: 'Active', type: 'toggle' } }]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(schema.properties.f1.type).toBe('boolean')
|
||||
expect(propsOf(schema).f1.anyOf![0].type).toBe('boolean')
|
||||
})
|
||||
|
||||
it('converts select fields with enums and option descriptions', () => {
|
||||
it('converts select fields with enums, newOption support and option descriptions', () => {
|
||||
const fields: AutofillField[] = [
|
||||
{
|
||||
id: 'f1',
|
||||
@@ -48,14 +67,41 @@ describe('fieldsToTypeBoxSchema', () => {
|
||||
},
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(schema.properties.f1.type).toBe('string')
|
||||
expect(schema.properties.f1.enum).toEqual(['opt1', 'opt2'])
|
||||
expect(schema.properties.f1.description).toBe(
|
||||
"The field 'Species' represents Species of animal.\nSelect one option and return the option ID as the value.\n\nAvailable options:\n- Option 1 => opt1\n- Option 2 => opt2",
|
||||
const selectSchema = propsOf(schema).f1.anyOf![0]
|
||||
expect(selectSchema.anyOf![0].type).toBe('string')
|
||||
expect(selectSchema.anyOf![0].enum).toEqual(['opt1', 'opt2'])
|
||||
expect(selectSchema.anyOf![1].type).toBe('object')
|
||||
expect(selectSchema.description).toBe(
|
||||
'The field \'Species\' represents Species of animal.\nSelect one existing option ID or provide {"newOption": {"value": "..."}} to create a new option.\n\nAvailable options:\n- Option 1 => opt1\n- Option 2 => opt2',
|
||||
)
|
||||
// Declared option IDs, newOption objects, and null are valid
|
||||
expect(Value.Check(schema, { f1: 'opt1' })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: 'opt2' })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: { newOption: { value: 'kling' } } })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: null })).toBe(true)
|
||||
// Arbitrary strings or invalid objects are rejected
|
||||
expect(Value.Check(schema, { f1: 'not-an-option' })).toBe(false)
|
||||
expect(Value.Check(schema, { f1: { newOption: { foo: 'bar' } } })).toBe(false)
|
||||
})
|
||||
|
||||
it('converts selectMulti fields with array enums and option descriptions', () => {
|
||||
it('converts select fields with empty options to newOption schema only', () => {
|
||||
const fields: AutofillField[] = [
|
||||
{
|
||||
id: 'f1',
|
||||
config: {
|
||||
name: 'Provider',
|
||||
type: 'select',
|
||||
select: { options: [] },
|
||||
},
|
||||
},
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(Value.Check(schema, { f1: { newOption: { value: 'kling' } } })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: null })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: 'any-string' })).toBe(false)
|
||||
})
|
||||
|
||||
it('converts selectMulti fields with array enums, newOption support and option descriptions', () => {
|
||||
const fields: AutofillField[] = [
|
||||
{
|
||||
id: 'f1',
|
||||
@@ -72,11 +118,35 @@ describe('fieldsToTypeBoxSchema', () => {
|
||||
},
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(schema.properties.f1.type).toBe('array')
|
||||
expect(schema.properties.f1.items.enum).toEqual(['opt1', 'opt2'])
|
||||
expect(schema.properties.f1.description).toBe(
|
||||
"The field 'Tags' represents Tags.\nSelect applicable options and return the option IDs as the value.\n\nAvailable options:\n- Tag 1 => opt1\n- Tag 2 => opt2",
|
||||
const selectMultiSchema = propsOf(schema).f1.anyOf![0]
|
||||
expect(selectMultiSchema.type).toBe('array')
|
||||
expect(selectMultiSchema.description).toBe(
|
||||
'The field \'Tags\' represents Tags.\nSelect applicable option IDs or provide {"newOption": {"value": "..."}} objects for new options (e.g. ["opt1", {"newOption": {"value": "new_name"}}]).\n\nAvailable options:\n- Tag 1 => opt1\n- Tag 2 => opt2',
|
||||
)
|
||||
expect(Value.Check(schema, { f1: ['opt1', 'opt2'] })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: [{ newOption: { value: 'Tag 3' } }] })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: ['opt1', { newOption: { value: 'Tag 3' } }] })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: null })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: ['opt1', 'bad'] })).toBe(false)
|
||||
expect(Value.Check(schema, { f1: ['opt1', { newOption: { bad: 'value' } }] })).toBe(false)
|
||||
})
|
||||
|
||||
it('converts selectMulti fields with empty options to array of newOption schema', () => {
|
||||
const fields: AutofillField[] = [
|
||||
{
|
||||
id: 'f1',
|
||||
config: {
|
||||
name: 'Tags',
|
||||
type: 'selectMulti',
|
||||
selectMulti: { options: [] },
|
||||
},
|
||||
},
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(Value.Check(schema, { f1: [{ newOption: { value: 'Tag 1' } }] })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: [] })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: null })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: ['tag1'] })).toBe(false)
|
||||
})
|
||||
|
||||
it('defaults to string for unknown types', () => {
|
||||
@@ -85,6 +155,22 @@ describe('fieldsToTypeBoxSchema', () => {
|
||||
{ id: 'f1', config: { name: 'Unknown', type: 'invalid' } },
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
expect(schema.properties.f1.type).toBe('string')
|
||||
expect(propsOf(schema).f1.anyOf![0].type).toBe('string')
|
||||
})
|
||||
|
||||
it('marks every property required (nullable) and rejects unknown keys', () => {
|
||||
const fields: AutofillField[] = [
|
||||
{ id: 'f1', config: { name: 'Title', type: 'text' } },
|
||||
{ id: 'f2', config: { name: 'Rating', type: 'rating' } },
|
||||
]
|
||||
const schema = fieldsToTypeBoxSchema(fields)
|
||||
const props = propsOf(schema)
|
||||
// typebox v1 objects are strict by default: unknown keys are rejected
|
||||
expect(props.f1.anyOf![0].type).toBe('string')
|
||||
expect(props.f1.anyOf![1].type).toBe('null')
|
||||
expect(Value.Check(schema, { f1: 'x', f2: null })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: null, f2: 3 })).toBe(true)
|
||||
expect(Value.Check(schema, { f1: 'x' })).toBe(false)
|
||||
expect(Value.Check(schema, { f1: 'x', f2: null, extra: 1 })).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { type ImageContent } from '@earendil-works/pi-ai'
|
||||
import { prisma, WorkflowTaskType, WorkflowTaskStatus, type User } from '@shumai/db'
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
|
||||
import { createCreateFileTool } from './create-file'
|
||||
import { fieldsToTypeBoxSchema } from '../index'
|
||||
import { s3Service } from '@shumai/core/src/s3/s3'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
import { Value } from 'typebox/value'
|
||||
import * as fs from 'fs'
|
||||
import * as os from 'os'
|
||||
import * as path from 'path'
|
||||
@@ -44,7 +46,7 @@ describe('createCreateFileTool', () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-file-test.md')
|
||||
|
||||
const tool = createCreateFileTool('user-1')
|
||||
const result = await tool.execute('call-1', { parent: 'folder-1', path: filePath })
|
||||
const result = await tool.execute('call-1', { parent: 'folder-1', path: filePath, data: null })
|
||||
|
||||
expect(s3Service.uploadFileToKey).toHaveBeenCalledTimes(1)
|
||||
expect(s3Service.putObject).not.toHaveBeenCalled()
|
||||
@@ -70,37 +72,93 @@ describe('createCreateFileTool', () => {
|
||||
expect(result.details).toEqual({ id: 'file-1', name: 'test', type: 'file' })
|
||||
})
|
||||
|
||||
it('should forward the optional context to the agent tool workflow when provided', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-file-context.md')
|
||||
it('should forward the metadata to the agent tool workflow when provided', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-file-metadata.md')
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{ id: 'prompt', config: { name: 'Prompt', type: 'text' } },
|
||||
])
|
||||
|
||||
const tool = createCreateFileTool('user-1')
|
||||
const tool = createCreateFileTool('user-1', metadataSchema)
|
||||
await tool.execute('call-1', {
|
||||
parent: 'folder-1',
|
||||
path: filePath,
|
||||
context: 'Generated using gemini',
|
||||
data: null,
|
||||
metadata: { prompt: 'Generated using gemini' },
|
||||
})
|
||||
|
||||
expect(executeAgentToolWorkflow).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
args: expect.objectContaining({ context: 'Generated using gemini' }),
|
||||
args: expect.objectContaining({ metadata: { prompt: 'Generated using gemini' } }),
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('should not include context in args when not provided', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-file-no-context.md')
|
||||
it('should forward select and selectMulti newOption metadata', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-file-new-option.md')
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{
|
||||
id: 'provider',
|
||||
config: {
|
||||
name: 'Provider',
|
||||
type: 'select',
|
||||
select: { options: [{ id: 'openai', displayName: 'OpenAI', color: '#f43f5e' }] },
|
||||
},
|
||||
},
|
||||
{
|
||||
id: 'tags',
|
||||
config: {
|
||||
name: 'Tags',
|
||||
type: 'selectMulti',
|
||||
selectMulti: { options: [{ id: 'tag1', displayName: 'Tag 1', color: '#3b82f6' }] },
|
||||
},
|
||||
},
|
||||
])
|
||||
|
||||
const tool = createCreateFileTool('user-1')
|
||||
await tool.execute('call-1', { parent: 'folder-1', path: filePath })
|
||||
const tool = createCreateFileTool('user-1', metadataSchema)
|
||||
await tool.execute('call-1', {
|
||||
parent: 'folder-1',
|
||||
path: filePath,
|
||||
data: null,
|
||||
metadata: {
|
||||
provider: { newOption: { value: 'Kling' } },
|
||||
tags: ['tag1', { newOption: { value: 'Tag 2' } }],
|
||||
},
|
||||
})
|
||||
|
||||
expect(executeAgentToolWorkflow).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
args: expect.objectContaining({
|
||||
metadata: {
|
||||
provider: { newOption: { value: 'Kling' } },
|
||||
tags: ['tag1', { newOption: { value: 'Tag 2' } }],
|
||||
},
|
||||
}),
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('should not include metadata in args when metadata is null', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-file-no-metadata.md')
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{ id: 'prompt', config: { name: 'Prompt', type: 'text' } },
|
||||
])
|
||||
|
||||
const tool = createCreateFileTool('user-1', metadataSchema)
|
||||
await tool.execute('call-1', {
|
||||
parent: 'folder-1',
|
||||
path: filePath,
|
||||
data: null,
|
||||
metadata: null,
|
||||
})
|
||||
|
||||
const callArgs = vi.mocked(executeAgentToolWorkflow).mock.calls[0][0].args
|
||||
expect(callArgs).not.toHaveProperty('context')
|
||||
expect(callArgs).not.toHaveProperty('metadata')
|
||||
})
|
||||
|
||||
it('should throw when the local file does not exist', async () => {
|
||||
const tool = createCreateFileTool('user-1')
|
||||
await expect(
|
||||
tool.execute('call-1', { parent: 'folder-1', path: '/nonexistent/file.md' }),
|
||||
tool.execute('call-1', { parent: 'folder-1', path: '/nonexistent/file.md', data: null }),
|
||||
).rejects.toThrow('Local file not found at path: /nonexistent/file.md')
|
||||
expect(s3Service.uploadFileToKey).not.toHaveBeenCalled()
|
||||
expect(executeAgentToolWorkflow).not.toHaveBeenCalled()
|
||||
@@ -110,6 +168,7 @@ describe('createCreateFileTool', () => {
|
||||
const tool = createCreateFileTool('user-1')
|
||||
const result = await tool.execute('call-1', {
|
||||
parent: 'folder-1',
|
||||
path: null,
|
||||
data: { name: 'notes.md', content: '# Notes\n\nHello' },
|
||||
})
|
||||
|
||||
@@ -145,6 +204,7 @@ describe('createCreateFileTool', () => {
|
||||
const tool = createCreateFileTool('user-1')
|
||||
await tool.execute('call-1', {
|
||||
parent: 'folder-1',
|
||||
path: null,
|
||||
data: { name: 'script.ts', content: 'const x = 1' },
|
||||
})
|
||||
|
||||
@@ -162,6 +222,7 @@ describe('createCreateFileTool', () => {
|
||||
const tool = createCreateFileTool('user-1')
|
||||
await tool.execute('call-1', {
|
||||
parent: 'folder-1',
|
||||
path: null,
|
||||
data: { name: 'my/notes.md', content: 'hello' },
|
||||
})
|
||||
|
||||
@@ -183,9 +244,9 @@ describe('createCreateFileTool', () => {
|
||||
|
||||
it('should throw when neither "path" nor "data" is provided', async () => {
|
||||
const tool = createCreateFileTool('user-1')
|
||||
await expect(tool.execute('call-1', { parent: 'folder-1' })).rejects.toThrow(
|
||||
'Provide exactly one of "path" (a local file) or "data" (name and content).',
|
||||
)
|
||||
await expect(
|
||||
tool.execute('call-1', { parent: 'folder-1', path: null, data: null }),
|
||||
).rejects.toThrow('Provide exactly one of "path" (a local file) or "data" (name and content).')
|
||||
})
|
||||
|
||||
it('should throw when both "path" and "data" are provided', async () => {
|
||||
@@ -201,4 +262,58 @@ describe('createCreateFileTool', () => {
|
||||
expect(s3Service.putObject).not.toHaveBeenCalled()
|
||||
expect(executeAgentToolWorkflow).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should expose a strict, all-required (nullable) metadata schema when fields are provided', () => {
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{ id: 'prompt', config: { name: 'Prompt', type: 'text' } },
|
||||
{
|
||||
id: 'source',
|
||||
config: {
|
||||
name: 'Source',
|
||||
type: 'select',
|
||||
select: { options: [{ id: 'gemini', displayName: 'Gemini', color: '#ffffff' }] },
|
||||
},
|
||||
},
|
||||
{ id: 'rating', config: { name: 'Rating', type: 'rating' } },
|
||||
])
|
||||
|
||||
const tool = createCreateFileTool('user-1', metadataSchema)
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- inspecting the runtime schema shape of the dynamically-built tool
|
||||
const meta = (tool.parameters as any).properties.metadata
|
||||
// `metadata` is a nullable union: [strict object, null]
|
||||
const metaObject = meta.anyOf[0]
|
||||
|
||||
expect(meta).toBeDefined()
|
||||
expect(metaObject.required).toEqual(['prompt', 'source', 'rating'])
|
||||
expect(metaObject.additionalProperties).toBe(false)
|
||||
expect(metaObject.properties.prompt.anyOf[0].type).toBe('string')
|
||||
expect(metaObject.properties.prompt.anyOf[1].type).toBe('null')
|
||||
expect(metaObject.properties.source.anyOf[0].anyOf[0].enum).toEqual(['gemini'])
|
||||
expect(metaObject.properties.rating.anyOf[0].type).toBe('number')
|
||||
|
||||
// Every field must be present (use null when unknown); unknown keys and bad enums are rejected
|
||||
expect(Value.Check(meta, { prompt: 'hello', source: 'gemini', rating: 5 })).toBe(true)
|
||||
expect(
|
||||
Value.Check(meta, {
|
||||
prompt: 'hello',
|
||||
source: { newOption: { value: 'kling' } },
|
||||
rating: 5,
|
||||
}),
|
||||
).toBe(true)
|
||||
expect(Value.Check(meta, { prompt: null, source: null, rating: null })).toBe(true)
|
||||
expect(Value.Check(meta, { prompt: 'hello', source: null, rating: null })).toBe(true)
|
||||
expect(Value.Check(meta, { prompt: 'hello' })).toBe(false)
|
||||
expect(
|
||||
Value.Check(meta, { prompt: 'hello', source: 'gemini', rating: 5, unknownKey: 'x' }),
|
||||
).toBe(false)
|
||||
expect(Value.Check(meta, { prompt: 'hello', source: 'not-an-option', rating: null })).toBe(
|
||||
false,
|
||||
)
|
||||
})
|
||||
|
||||
it('should omit the metadata parameter when no schema is provided', () => {
|
||||
const tool = createCreateFileTool('user-1')
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- inspecting the runtime schema shape of the dynamically-built tool
|
||||
expect((tool.parameters as any).properties.metadata).toBeUndefined()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -2,69 +2,78 @@ import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { s3Service } from '@shumai/core/src/s3/s3'
|
||||
import { getFileMimeType, readFileMimeType } from '@shumai/core/src/utils/file-mime'
|
||||
import { sanitizeFilename } from '@shumai/core/src/utils/filename'
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type, type TSchema } from 'typebox'
|
||||
import * as fs from 'fs'
|
||||
import * as path from 'path'
|
||||
import { ulid } from 'ulid'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
|
||||
const createFileSchema = Type.Object({
|
||||
parent: Type.String({
|
||||
description: 'The parent folder ID under which to create the file. This parameter is required.',
|
||||
}),
|
||||
path: Type.Optional(
|
||||
Type.String({
|
||||
description:
|
||||
'The absolute or relative local path to an existing file on disk. Provide either this or "data", but not both.',
|
||||
}),
|
||||
),
|
||||
data: Type.Optional(
|
||||
Type.Object({
|
||||
name: Type.String({
|
||||
minLength: 1,
|
||||
description:
|
||||
'The desired name for the new file, including its extension (e.g. "notes.md").',
|
||||
}),
|
||||
content: Type.String({
|
||||
description: 'The full content of the file as a plain string.',
|
||||
}),
|
||||
}),
|
||||
),
|
||||
context: Type.Optional(
|
||||
Type.String({
|
||||
description:
|
||||
'Optional context passed to the AI metadata autofill workflow for fields that cannot be inferred from file content alone ' +
|
||||
'(e.g. the model or prompt used to generate the asset). ' +
|
||||
'Use list_autofill_fields first to check which fields can be autofilled. ' +
|
||||
'Keep the context short and only include information relevant to those fields.',
|
||||
}),
|
||||
),
|
||||
})
|
||||
interface CreateFileToolParams {
|
||||
parent: string
|
||||
path: string | null
|
||||
data: { name: string; content: string } | null
|
||||
metadata?: Record<string, unknown> | null
|
||||
}
|
||||
|
||||
function assertExactlyOneSource(params: {
|
||||
path?: string
|
||||
data?: { name: string; content: string }
|
||||
}) {
|
||||
const hasPath = params.path !== undefined
|
||||
const hasData = params.data !== undefined
|
||||
function assertExactlyOneSource(params: CreateFileToolParams) {
|
||||
const hasPath = params.path !== null
|
||||
const hasData = params.data !== null
|
||||
if (hasPath === hasData) {
|
||||
throw new Error('Provide exactly one of "path" (a local file) or "data" (name and content).')
|
||||
}
|
||||
return hasPath ? params.path! : params.data!
|
||||
}
|
||||
|
||||
export function createCreateFileTool(userId: string): AgentTool<typeof createFileSchema> {
|
||||
return {
|
||||
export function createCreateFileTool(userId: string, metadataSchema?: TSchema): AgentTool {
|
||||
const createFileSchema = Type.Object(
|
||||
{
|
||||
parent: Type.String({
|
||||
description:
|
||||
'The parent folder ID under which to create the file. This parameter is required.',
|
||||
}),
|
||||
path: Type.Union([
|
||||
Type.String({
|
||||
description:
|
||||
'The absolute or relative local path to an existing file on disk. Provide a value here OR in "data", but not both. Use null if you are providing "data".',
|
||||
}),
|
||||
Type.Null(),
|
||||
]),
|
||||
data: Type.Union([
|
||||
Type.Object(
|
||||
{
|
||||
name: Type.String({
|
||||
minLength: 1,
|
||||
description:
|
||||
'The desired name for the new file, including its extension (e.g. "notes.md").',
|
||||
}),
|
||||
content: Type.String({
|
||||
description: 'The full content of the file as a plain string.',
|
||||
}),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
),
|
||||
Type.Null(),
|
||||
]),
|
||||
...(metadataSchema ? { metadata: Type.Union([metadataSchema, Type.Null()]) } : {}),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
)
|
||||
|
||||
const tool: AgentTool = {
|
||||
name: 'create_file',
|
||||
label: 'Create File',
|
||||
description:
|
||||
'Create a new file under a folder. You MUST choose exactly ONE creation method: ' +
|
||||
'(1) provide "path" to upload an existing local file, OR ' +
|
||||
'(2) provide "data" with name and content to create a new text file. ' +
|
||||
'Never provide both "path" and "data" together. Never omit both.',
|
||||
'Set the unused parameter to null. ' +
|
||||
'The optional "metadata" parameter accepts only the CREATION_CONTEXT fields declared in its schema; never invent field keys, and use null for fields you do not know.',
|
||||
parameters: createFileSchema,
|
||||
execute: async (_toolCallId, params) => {
|
||||
const source = assertExactlyOneSource(params)
|
||||
// The harness validates tool args against `createFileSchema` before calling
|
||||
// execute, so `params` is guaranteed to match this shape.
|
||||
const p = params as CreateFileToolParams
|
||||
const source = assertExactlyOneSource(p)
|
||||
|
||||
let name: string
|
||||
let size: number
|
||||
@@ -99,15 +108,15 @@ export function createCreateFileTool(userId: string): AgentTool<typeof createFil
|
||||
const result = await executeAgentToolWorkflow({
|
||||
toolName: 'create_file',
|
||||
args: {
|
||||
parent: params.parent,
|
||||
parent: p.parent,
|
||||
s3Key,
|
||||
name,
|
||||
size,
|
||||
contentType: mimeType,
|
||||
...(params.context ? { context: params.context } : {}),
|
||||
...(p.metadata ? { metadata: p.metadata } : {}),
|
||||
},
|
||||
userId,
|
||||
assetId: params.parent,
|
||||
assetId: p.parent,
|
||||
})
|
||||
return {
|
||||
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
||||
@@ -115,4 +124,5 @@ export function createCreateFileTool(userId: string): AgentTool<typeof createFil
|
||||
}
|
||||
},
|
||||
}
|
||||
return tool
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
|
||||
import { createCreateVersionTool } from './create-version'
|
||||
import { fieldsToTypeBoxSchema } from '../index'
|
||||
import { s3Service } from '@shumai/core/src/s3/s3'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
import { Value } from 'typebox/value'
|
||||
import * as fs from 'fs'
|
||||
import * as os from 'os'
|
||||
import * as path from 'path'
|
||||
@@ -67,31 +69,80 @@ describe('createCreateVersionTool', () => {
|
||||
expect(result.details).toEqual({ id: 'file-1', name: 'v2', type: 'file' })
|
||||
})
|
||||
|
||||
it('should forward the optional context to the agent tool workflow when provided', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-version-context.md')
|
||||
it('should forward the metadata to the agent tool workflow when provided', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-version-metadata.md')
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{ id: 'prompt', config: { name: 'Prompt', type: 'text' } },
|
||||
])
|
||||
|
||||
const tool = createCreateVersionTool('user-1')
|
||||
const tool = createCreateVersionTool('user-1', metadataSchema)
|
||||
await tool.execute('call-1', {
|
||||
parent: 'file-1',
|
||||
path: filePath,
|
||||
context: 'Generated using gemini',
|
||||
metadata: { prompt: 'Generated using gemini' },
|
||||
})
|
||||
|
||||
expect(executeAgentToolWorkflow).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
args: expect.objectContaining({ context: 'Generated using gemini' }),
|
||||
args: expect.objectContaining({ metadata: { prompt: 'Generated using gemini' } }),
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('should not include context in args when not provided', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-version-no-context.md')
|
||||
it('should forward select and selectMulti newOption metadata', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-version-new-option.md')
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{
|
||||
id: 'provider',
|
||||
config: {
|
||||
name: 'Provider',
|
||||
type: 'select',
|
||||
select: { options: [{ id: 'openai', displayName: 'OpenAI', color: '#f43f5e' }] },
|
||||
},
|
||||
},
|
||||
{
|
||||
id: 'tags',
|
||||
config: {
|
||||
name: 'Tags',
|
||||
type: 'selectMulti',
|
||||
selectMulti: { options: [{ id: 'tag1', displayName: 'Tag 1', color: '#3b82f6' }] },
|
||||
},
|
||||
},
|
||||
])
|
||||
|
||||
const tool = createCreateVersionTool('user-1')
|
||||
await tool.execute('call-1', { parent: 'file-1', path: filePath })
|
||||
const tool = createCreateVersionTool('user-1', metadataSchema)
|
||||
await tool.execute('call-1', {
|
||||
parent: 'file-1',
|
||||
path: filePath,
|
||||
metadata: {
|
||||
provider: { newOption: { value: 'Kling' } },
|
||||
tags: ['tag1', { newOption: { value: 'Tag 2' } }],
|
||||
},
|
||||
})
|
||||
|
||||
expect(executeAgentToolWorkflow).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
args: expect.objectContaining({
|
||||
metadata: {
|
||||
provider: { newOption: { value: 'Kling' } },
|
||||
tags: ['tag1', { newOption: { value: 'Tag 2' } }],
|
||||
},
|
||||
}),
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
it('should not include metadata in args when metadata is null', async () => {
|
||||
const filePath = createTempFile('# Hello from disk', 'create-version-no-metadata.md')
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{ id: 'prompt', config: { name: 'Prompt', type: 'text' } },
|
||||
])
|
||||
|
||||
const tool = createCreateVersionTool('user-1', metadataSchema)
|
||||
await tool.execute('call-1', { parent: 'file-1', path: filePath, metadata: null })
|
||||
|
||||
const callArgs = vi.mocked(executeAgentToolWorkflow).mock.calls[0][0].args
|
||||
expect(callArgs).not.toHaveProperty('context')
|
||||
expect(callArgs).not.toHaveProperty('metadata')
|
||||
})
|
||||
|
||||
it('should throw when the local file does not exist', async () => {
|
||||
@@ -102,4 +153,34 @@ describe('createCreateVersionTool', () => {
|
||||
expect(s3Service.uploadFileToKey).not.toHaveBeenCalled()
|
||||
expect(executeAgentToolWorkflow).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should expose a strict, all-required (nullable) metadata schema when fields are provided', () => {
|
||||
const metadataSchema = fieldsToTypeBoxSchema([
|
||||
{ id: 'prompt', config: { name: 'Prompt', type: 'text' } },
|
||||
{ id: 'toggle', config: { name: 'Active', type: 'toggle' } },
|
||||
])
|
||||
|
||||
const tool = createCreateVersionTool('user-1', metadataSchema)
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- inspecting the runtime schema shape of the dynamically-built tool
|
||||
const meta = (tool.parameters as any).properties.metadata
|
||||
// `metadata` is a nullable union: [strict object, null]
|
||||
const metaObject = meta.anyOf[0]
|
||||
|
||||
expect(meta).toBeDefined()
|
||||
expect(metaObject.required).toEqual(['prompt', 'toggle'])
|
||||
expect(metaObject.additionalProperties).toBe(false)
|
||||
expect(metaObject.properties.prompt.anyOf[0].type).toBe('string')
|
||||
expect(metaObject.properties.prompt.anyOf[1].type).toBe('null')
|
||||
expect(metaObject.properties.toggle.anyOf[0].type).toBe('boolean')
|
||||
|
||||
expect(Value.Check(meta, { prompt: 'p', toggle: true })).toBe(true)
|
||||
expect(Value.Check(meta, { prompt: null, toggle: null })).toBe(true)
|
||||
expect(Value.Check(meta, { prompt: 'p', toggle: null, unknownKey: 'x' })).toBe(false)
|
||||
})
|
||||
|
||||
it('should omit the metadata parameter when no schema is provided', () => {
|
||||
const tool = createCreateVersionTool('user-1')
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- inspecting the runtime schema shape of the dynamically-built tool
|
||||
expect((tool.parameters as any).properties.metadata).toBeUndefined()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type, type TSchema } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
import * as fs from 'fs'
|
||||
@@ -8,36 +8,42 @@ import { readFileMimeType } from '@shumai/core/src/utils/file-mime'
|
||||
import { ulid } from 'ulid'
|
||||
import { sanitizeFilename } from '@shumai/core/src/utils/filename'
|
||||
|
||||
const createVersionSchema = Type.Object({
|
||||
parent: Type.String({
|
||||
description:
|
||||
'The parent file ID for which to create a new version. This parameter is required.',
|
||||
}),
|
||||
path: Type.String({
|
||||
description:
|
||||
'The absolute or relative local path to the file on disk. This parameter is required.',
|
||||
}),
|
||||
context: Type.Optional(
|
||||
Type.String({
|
||||
description:
|
||||
'Optional context passed to the AI metadata autofill workflow for fields that cannot be inferred from file content alone ' +
|
||||
'(e.g. the model or prompt used to generate the asset). ' +
|
||||
'Use list_autofill_fields first to check which fields can be autofilled. ' +
|
||||
'Keep the context short and only include information relevant to those fields.',
|
||||
}),
|
||||
),
|
||||
})
|
||||
interface CreateVersionToolParams {
|
||||
parent: string
|
||||
path: string
|
||||
metadata?: Record<string, unknown> | null
|
||||
}
|
||||
|
||||
export function createCreateVersionTool(userId: string): AgentTool<typeof createVersionSchema> {
|
||||
return {
|
||||
export function createCreateVersionTool(userId: string, metadataSchema?: TSchema): AgentTool {
|
||||
const createVersionSchema = Type.Object(
|
||||
{
|
||||
parent: Type.String({
|
||||
description:
|
||||
'The parent file ID for which to create a new version. This parameter is required.',
|
||||
}),
|
||||
path: Type.String({
|
||||
description:
|
||||
'The absolute or relative local path to the file on disk. This parameter is required.',
|
||||
}),
|
||||
...(metadataSchema ? { metadata: Type.Union([metadataSchema, Type.Null()]) } : {}),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
)
|
||||
|
||||
const tool: AgentTool = {
|
||||
name: 'create_version',
|
||||
label: 'Create Version',
|
||||
description: 'Create a new version of an existing file from a local file path.',
|
||||
description:
|
||||
'Create a new version of an existing file from a local file path. ' +
|
||||
'The optional "metadata" parameter accepts only the CREATION_CONTEXT fields declared in its schema; never invent field keys, and use null for fields you do not know.',
|
||||
parameters: createVersionSchema,
|
||||
execute: async (_toolCallId, params) => {
|
||||
const absolutePath = path.resolve(process.cwd(), params.path)
|
||||
// The harness validates tool args against `createVersionSchema` before calling
|
||||
// execute, so `params` is guaranteed to match this shape.
|
||||
const p = params as CreateVersionToolParams
|
||||
const absolutePath = path.resolve(process.cwd(), p.path)
|
||||
if (!fs.existsSync(absolutePath)) {
|
||||
throw new Error(`Local file not found at path: ${params.path}`)
|
||||
throw new Error(`Local file not found at path: ${p.path}`)
|
||||
}
|
||||
|
||||
const fileSize = fs.statSync(absolutePath).size
|
||||
@@ -50,15 +56,15 @@ export function createCreateVersionTool(userId: string): AgentTool<typeof create
|
||||
const result = await executeAgentToolWorkflow({
|
||||
toolName: 'create_version',
|
||||
args: {
|
||||
parent: params.parent,
|
||||
parent: p.parent,
|
||||
s3Key,
|
||||
name: path.basename(absolutePath),
|
||||
size: fileSize,
|
||||
contentType: mimeType,
|
||||
...(params.context ? { context: params.context } : {}),
|
||||
...(p.metadata ? { metadata: p.metadata } : {}),
|
||||
},
|
||||
userId,
|
||||
assetId: params.parent,
|
||||
assetId: p.parent,
|
||||
})
|
||||
return {
|
||||
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
||||
@@ -66,4 +72,5 @@ export function createCreateVersionTool(userId: string): AgentTool<typeof create
|
||||
}
|
||||
},
|
||||
}
|
||||
return tool
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { prisma, type User } from '@shumai/db'
|
||||
import { s3Service } from '@shumai/core/src/s3/s3'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { createListAutofillFieldsTool } from './list-autofill-fields'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
|
||||
vi.mock('./utils', () => ({
|
||||
executeAgentToolWorkflow: vi.fn().mockResolvedValue({
|
||||
fields: [{ name: 'Source', type: 'select', options: [{ displayName: 'Gemini' }] }],
|
||||
}),
|
||||
}))
|
||||
|
||||
describe('createListAutofillFieldsTool', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
it('should list autofill fields for the parent folder via the agent tool workflow', async () => {
|
||||
const tool = createListAutofillFieldsTool('user-1')
|
||||
const result = await tool.execute('call-1', { parent: 'folder-1' })
|
||||
|
||||
expect(executeAgentToolWorkflow).toHaveBeenCalledWith({
|
||||
toolName: 'list_autofill_fields',
|
||||
args: { parent: 'folder-1' },
|
||||
userId: 'user-1',
|
||||
assetId: 'folder-1',
|
||||
})
|
||||
|
||||
expect(result.details).toEqual({
|
||||
fields: [{ name: 'Source', type: 'select', options: [{ displayName: 'Gemini' }] }],
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -1,35 +0,0 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { executeAgentToolWorkflow } from './utils'
|
||||
|
||||
const listAutofillFieldsSchema = Type.Object({
|
||||
parent: Type.String({
|
||||
description:
|
||||
'The parent folder ID whose project autofillable metadata fields to list. This parameter is required.',
|
||||
}),
|
||||
})
|
||||
|
||||
export function createListAutofillFieldsTool(
|
||||
userId: string,
|
||||
): AgentTool<typeof listAutofillFieldsSchema> {
|
||||
return {
|
||||
name: 'list_autofill_fields',
|
||||
label: 'List Autofill Fields',
|
||||
description:
|
||||
'List the AI-autofillable metadata fields defined for the project of a parent folder, including their types and available options. ' +
|
||||
'Use this before creating a file or version so you can pass relevant context (e.g. the model or prompt used to generate the asset) to create_file/create_version.',
|
||||
parameters: listAutofillFieldsSchema,
|
||||
execute: async (_toolCallId, params) => {
|
||||
const result = await executeAgentToolWorkflow({
|
||||
toolName: 'list_autofill_fields',
|
||||
args: params,
|
||||
userId,
|
||||
assetId: params.parent,
|
||||
})
|
||||
return {
|
||||
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
||||
details: result,
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { type ImageContent } from '@earendil-works/pi-ai'
|
||||
import { prisma, WorkflowTaskType, WorkflowTaskStatus, type User } from '@shumai/db'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { prisma } from '@shumai/db'
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { agentService } from '@shumai/core/src/agent/agent'
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { prisma } from '@shumai/db'
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
|
||||
const readThreadSchema = Type.Object({
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { logger } from '@shumai/core/src/logger'
|
||||
import { SandboxManager } from '@anthropic-ai/sandbox-runtime'
|
||||
import { type AgentTool, type AgentToolResult } from '@earendil-works/pi-agent-core'
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { spawn } from 'node:child_process'
|
||||
import { OutputAccumulator } from '../utils/output-accumulator'
|
||||
import {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Type } from '@sinclair/typebox'
|
||||
import { Type } from 'typebox'
|
||||
import { type AgentTool } from '@earendil-works/pi-agent-core'
|
||||
import { type ImageContent } from '@earendil-works/pi-ai'
|
||||
import { prisma, WorkflowTaskType, WorkflowTaskStatus, type User } from '@shumai/db'
|
||||
|
||||
@@ -64,6 +64,7 @@ describe('Agent Autofill Workflow', () => {
|
||||
mockActivities.createCommentActivity.mockResolvedValue({ id: 'comment-placeholder-id' })
|
||||
mockActivities.getAssetActivity.mockResolvedValue({
|
||||
id: 'a1',
|
||||
projectId: 'p1',
|
||||
storageKey: { key: 'asset-key' },
|
||||
project: { id: 'p1', teamId: 't1' },
|
||||
mediaType: 'image/png',
|
||||
@@ -78,7 +79,6 @@ describe('Agent Autofill Workflow', () => {
|
||||
{ key: 'title', config: { name: 'Title', type: 'text' }, description: 'The title' },
|
||||
])
|
||||
mockActivities.getAgentAutofillContextActivity.mockResolvedValue({ agent: { id: 'b1' } })
|
||||
mockActivities.getAssetAutofillContextActivity.mockResolvedValue('Generated using gemini')
|
||||
mockActivities.autofillAiActivity.mockResolvedValue({
|
||||
text: '{"title":"Extracted Title"}',
|
||||
sessionId: 'session-123',
|
||||
@@ -118,6 +118,9 @@ describe('Agent Autofill Workflow', () => {
|
||||
status: 'processing',
|
||||
})
|
||||
|
||||
// Verify asset fetched
|
||||
expect(mockActivities.getAssetActivity).toHaveBeenCalledWith('a1')
|
||||
|
||||
// Verify placeholder comment created
|
||||
expect(mockActivities.createCommentActivity).toHaveBeenCalledWith({
|
||||
assetId: 'a1',
|
||||
@@ -140,11 +143,12 @@ describe('Agent Autofill Workflow', () => {
|
||||
expect(mockActivities.getAgentAutofillContextActivity).toHaveBeenCalledWith({
|
||||
teamId: 't1',
|
||||
})
|
||||
expect(mockActivities.getAssetAutofillContextActivity).toHaveBeenCalledWith('a1')
|
||||
|
||||
// Verify AI autofill called with mapped fields
|
||||
expect(mockActivities.autofillAiActivity).toHaveBeenCalledWith({
|
||||
teamId: 't1',
|
||||
assetId: 'a1',
|
||||
projectId: 'p1',
|
||||
images: ['/tmp/test-dir/1.webp'],
|
||||
fields: [
|
||||
{
|
||||
@@ -154,7 +158,6 @@ describe('Agent Autofill Workflow', () => {
|
||||
},
|
||||
],
|
||||
context: { agent: { id: 'b1' } },
|
||||
agentContext: 'Generated using gemini',
|
||||
})
|
||||
|
||||
// Verify task usage update
|
||||
@@ -195,42 +198,6 @@ describe('Agent Autofill Workflow', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it('should run autofill without agentContext when the asset has no context', async () => {
|
||||
mockActivities.getAssetAutofillContextActivity.mockResolvedValue(null)
|
||||
|
||||
const task = await prisma.workflowTask.create({
|
||||
data: {
|
||||
type: 'ai_metadata_autofill',
|
||||
status: 'pending',
|
||||
assetId: 'a1',
|
||||
payload: {
|
||||
projectId: 'p1',
|
||||
agent: { sessionId: 's1', agentId: 'agent-1' },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await agentAutofillMedia(task)
|
||||
|
||||
expect(mockActivities.getAssetAutofillContextActivity).toHaveBeenCalledWith('a1')
|
||||
expect(mockActivities.autofillAiActivity).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
teamId: 't1',
|
||||
images: ['/tmp/test-dir/1.webp'],
|
||||
fields: [
|
||||
{
|
||||
id: 'title',
|
||||
config: { name: 'Title', type: 'text' },
|
||||
description: 'The title',
|
||||
},
|
||||
],
|
||||
context: { agent: { id: 'b1' } },
|
||||
}),
|
||||
)
|
||||
const aiCallArgs = mockActivities.autofillAiActivity.mock.calls[0][0]
|
||||
expect(aiCallArgs).not.toHaveProperty('agentContext')
|
||||
})
|
||||
|
||||
it('should complete early if no image files could be extracted', async () => {
|
||||
mockActivities.extractAiMetadataActivity.mockResolvedValue([])
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@ export async function agentAutofillMedia(task: WorkflowTask): Promise<void> {
|
||||
extractAiMetadataActivity,
|
||||
getProjectAutofillFieldsActivity,
|
||||
getAgentAutofillContextActivity,
|
||||
getAssetAutofillContextActivity,
|
||||
autofillAiActivity,
|
||||
updateTaskUsageActivity,
|
||||
updateAssetMetadataActivity,
|
||||
@@ -132,17 +131,12 @@ export async function agentAutofillMedia(task: WorkflowTask): Promise<void> {
|
||||
teamId,
|
||||
})
|
||||
|
||||
// 3c. Fetch Agent-Provided Autofill Context (from create_file/create_version)
|
||||
const agentContext = await executeActivity(
|
||||
agentWorkerQueue,
|
||||
getAssetAutofillContextActivity,
|
||||
asset.id,
|
||||
)
|
||||
|
||||
// 4. Call AI Service
|
||||
const aiResult = await executeActivity(agentWorkerQueue, autofillAiActivity, {
|
||||
teamId,
|
||||
images: generatedFiles,
|
||||
assetId: asset.id,
|
||||
projectId: asset.projectId ?? undefined,
|
||||
fields: fields.map(
|
||||
(f: { key: string; config: Record<string, unknown>; description?: string | null }) => ({
|
||||
id: f.key,
|
||||
@@ -151,7 +145,6 @@ export async function agentAutofillMedia(task: WorkflowTask): Promise<void> {
|
||||
}),
|
||||
),
|
||||
context,
|
||||
...(agentContext ? { agentContext } : {}),
|
||||
})
|
||||
|
||||
if (aiResult.usage) {
|
||||
@@ -166,10 +159,12 @@ export async function agentAutofillMedia(task: WorkflowTask): Promise<void> {
|
||||
|
||||
// 6. Update Asset Metadata
|
||||
const result = JSON.parse(aiResult.text)
|
||||
const metadataUpdates = Object.entries(result).map(([key, value]) => ({
|
||||
key,
|
||||
value,
|
||||
}))
|
||||
const metadataUpdates = Object.entries(result)
|
||||
.filter(([, value]) => value !== null)
|
||||
.map(([key, value]) => ({
|
||||
key,
|
||||
value,
|
||||
}))
|
||||
|
||||
if (metadataUpdates.length > 0) {
|
||||
await executeActivity(agentWorkerQueue, updateAssetMetadataActivity, {
|
||||
|
||||
@@ -150,6 +150,7 @@ describe('Agent Chat Workflow', () => {
|
||||
agentsInstruction: expectedInstruction1,
|
||||
sessionId: 'session-123',
|
||||
folderId: 'parent-folder-id',
|
||||
assetId: 'a1',
|
||||
}),
|
||||
)
|
||||
|
||||
|
||||
@@ -202,6 +202,7 @@ export async function agentChat(task: WorkflowTask): Promise<void> {
|
||||
imageUrls: attachmentImageUrls,
|
||||
projectId: payload.projectId,
|
||||
folderId,
|
||||
assetId: asset.id,
|
||||
agentsInstruction: instruction,
|
||||
sessionId,
|
||||
userId: payload.agent?.userId,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/api",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -310,4 +310,59 @@ describe('folder api', () => {
|
||||
beforeIndex: 'index-1',
|
||||
})
|
||||
})
|
||||
|
||||
it('GET /folders/:folderId/agentsmd', async () => {
|
||||
vi.spyOn(assetService, 'getAgentsMd').mockResolvedValue('# Folder Guidelines')
|
||||
|
||||
const app = new Hono().use('*', authMiddleware).route('/', folderRoute)
|
||||
const res = await app.request('/folders/test-id/agentsmd')
|
||||
|
||||
expect(res.status).toBe(200)
|
||||
const json = await res.json()
|
||||
expect(json.content).toBe('# Folder Guidelines')
|
||||
|
||||
expect(authzService.hasPermission).toHaveBeenCalledWith({
|
||||
user: { id: 'user1', name: 'Test User' },
|
||||
permission: Permission.Read,
|
||||
type: ResourceType.Asset,
|
||||
id: 'test-id',
|
||||
})
|
||||
expect(assetService.getAgentsMd).toHaveBeenCalledWith('test-id')
|
||||
})
|
||||
|
||||
it('PATCH /folders/:folderId/agentsmd', async () => {
|
||||
vi.spyOn(assetService, 'updateAgentsMd').mockResolvedValue({ content: '# Updated Guidelines' })
|
||||
|
||||
const app = new Hono().use('*', authMiddleware).route('/', folderRoute)
|
||||
const res = await app.request('/folders/test-id/agentsmd', {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ content: '# Updated Guidelines' }),
|
||||
})
|
||||
|
||||
expect(res.status).toBe(200)
|
||||
const json = await res.json()
|
||||
expect(json.content).toBe('# Updated Guidelines')
|
||||
|
||||
expect(authzService.hasPermission).toHaveBeenCalledWith({
|
||||
user: { id: 'user1', name: 'Test User' },
|
||||
permission: Permission.Admin,
|
||||
type: ResourceType.Asset,
|
||||
id: 'test-id',
|
||||
})
|
||||
expect(assetService.updateAgentsMd).toHaveBeenCalledWith('test-id', '# Updated Guidelines')
|
||||
})
|
||||
|
||||
it('PATCH /folders/:folderId/agentsmd rejects oversized content', async () => {
|
||||
const mockUpdate = vi.spyOn(assetService, 'updateAgentsMd').mockResolvedValue({ content: '' })
|
||||
const app = new Hono().use('*', authMiddleware).route('/', folderRoute)
|
||||
const res = await app.request('/folders/test-id/agentsmd', {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ content: 'x'.repeat(100_001) }),
|
||||
})
|
||||
|
||||
expect(res.status).toBe(400)
|
||||
expect(mockUpdate).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
updateFolderRequestSchema,
|
||||
deleteFoldersRequestSchema,
|
||||
restoreFoldersRequestSchema,
|
||||
updateAgentsMdRequestSchema,
|
||||
} from '@shumai/dtos'
|
||||
import { listChildrenRequestSchema, updateAssetOrderRequestSchema, AuditAction } from '@shumai/dtos'
|
||||
import { searchRequestSchema } from '@shumai/dtos'
|
||||
@@ -189,5 +190,48 @@ const route = new Hono<{ Variables: { user: User } }>()
|
||||
const result = await searchService.search(folderId, req)
|
||||
return c.json(result)
|
||||
})
|
||||
.get('/folders/:folderId/agentsmd', async (c) => {
|
||||
const folderId = c.req.param('folderId')
|
||||
const user = c.get('user')
|
||||
|
||||
await authzService.hasPermission({
|
||||
user,
|
||||
permission: Permission.Read,
|
||||
type: ResourceType.Asset,
|
||||
id: folderId,
|
||||
})
|
||||
|
||||
const content = await assetService.getAgentsMd(folderId)
|
||||
return c.json({ content })
|
||||
})
|
||||
.patch(
|
||||
'/folders/:folderId/agentsmd',
|
||||
zValidator('json', updateAgentsMdRequestSchema),
|
||||
async (c) => {
|
||||
const folderId = c.req.param('folderId')
|
||||
const user = c.get('user')
|
||||
const req = c.req.valid('json')
|
||||
|
||||
await authzService.hasPermission({
|
||||
user,
|
||||
permission: Permission.Admin,
|
||||
type: ResourceType.Asset,
|
||||
id: folderId,
|
||||
})
|
||||
|
||||
const res = await assetService.updateAgentsMd(folderId, req.content)
|
||||
|
||||
const ctx = await assetService.getAssetContext(folderId)
|
||||
await auditLogService.logAction({
|
||||
action: AuditAction.folder_update,
|
||||
teamId: ctx.teamId,
|
||||
userId: user.id,
|
||||
projectId: ctx.projectId,
|
||||
itemId: folderId,
|
||||
})
|
||||
|
||||
return c.json(res)
|
||||
},
|
||||
)
|
||||
|
||||
export default route
|
||||
|
||||
@@ -46,10 +46,9 @@ describe('metadata api', () => {
|
||||
const mockField = {
|
||||
key: 'field1',
|
||||
scope: 'TEAM',
|
||||
config: { name: 'Test Field', type: 'text' },
|
||||
config: { name: 'Test Field', type: 'text', autofillSource: 'CONTENT' },
|
||||
readOnly: false,
|
||||
description: 'desc',
|
||||
aiAutofill: true,
|
||||
}
|
||||
|
||||
// Using any here because mocking complex service return types or Hono context is overly verbose for this test.
|
||||
@@ -62,7 +61,7 @@ describe('metadata api', () => {
|
||||
expect(json).toHaveLength(1)
|
||||
expect(json[0].id).toBe('field1')
|
||||
expect(json[0].config.name).toBe('Test Field')
|
||||
expect(json[0].aiAutofill).toBe(true)
|
||||
expect(json[0].config.autofillSource).toBe('CONTENT')
|
||||
expect(authzService.hasPermission).toHaveBeenCalledWith({
|
||||
user: expect.anything(),
|
||||
permission: Permission.Read,
|
||||
@@ -75,10 +74,9 @@ describe('metadata api', () => {
|
||||
const mockField = {
|
||||
key: 'newfield',
|
||||
scope: 'TEAM',
|
||||
config: { name: 'New Field', type: 'text' },
|
||||
config: { name: 'New Field', type: 'text', autofillSource: 'CONTENT' },
|
||||
readOnly: false,
|
||||
description: 'desc',
|
||||
aiAutofill: true,
|
||||
}
|
||||
|
||||
// Using any here because mocking complex service return types or Hono context is overly verbose for this test.
|
||||
@@ -88,8 +86,7 @@ describe('metadata api', () => {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
config: { name: 'New Field', type: 'text' },
|
||||
aiAutofill: true,
|
||||
config: { name: 'New Field', type: 'text', autofillSource: 'CONTENT' },
|
||||
description: 'desc',
|
||||
}),
|
||||
})
|
||||
@@ -115,10 +112,9 @@ describe('metadata api', () => {
|
||||
const mockField = {
|
||||
key: 'field1',
|
||||
scope: 'PROJECT',
|
||||
config: { name: 'Project Field', type: 'text' },
|
||||
config: { name: 'Project Field', type: 'text', autofillSource: 'NONE' },
|
||||
readOnly: false,
|
||||
description: 'desc',
|
||||
aiAutofill: false,
|
||||
}
|
||||
|
||||
vi.mocked(metadataService.listProjectFields).mockResolvedValue([
|
||||
@@ -198,10 +194,9 @@ describe('metadata api', () => {
|
||||
const mockField = {
|
||||
key: 'f1',
|
||||
scope: 'TEAM',
|
||||
config: { name: 'Updated Field', type: 'text' },
|
||||
config: { name: 'Updated Field', type: 'text', autofillSource: 'CONTENT' },
|
||||
readOnly: false,
|
||||
description: 'desc',
|
||||
aiAutofill: true,
|
||||
teamId: 't1',
|
||||
}
|
||||
|
||||
@@ -214,8 +209,7 @@ describe('metadata api', () => {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
config: { name: 'Updated Field', type: 'text' },
|
||||
aiAutofill: true,
|
||||
config: { name: 'Updated Field', type: 'text', autofillSource: 'CONTENT' },
|
||||
description: 'desc',
|
||||
}),
|
||||
})
|
||||
|
||||
@@ -27,7 +27,6 @@ function toFieldInfo(
|
||||
readOnly: f.readOnly,
|
||||
visible: visible,
|
||||
description: f.description,
|
||||
aiAutofill: f.aiAutofill,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -93,7 +93,6 @@ function toFieldInfo(
|
||||
readOnly: f.readOnly,
|
||||
visible: visible,
|
||||
description: f.description,
|
||||
aiAutofill: f.aiAutofill,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -292,6 +292,7 @@ describe('team api', () => {
|
||||
|
||||
it('GET /teams/:teamId/sandbox returns sandbox settings', async () => {
|
||||
mockGetSandboxSettings.mockResolvedValue({
|
||||
networkSandboxEnabled: false,
|
||||
allowedDomains: ['example.com'],
|
||||
pendingDomains: ['pending.com'],
|
||||
})
|
||||
@@ -300,6 +301,7 @@ describe('team api', () => {
|
||||
|
||||
expect(res.status).toBe(200)
|
||||
const data = await res.json()
|
||||
expect(data.networkSandboxEnabled).toBe(false)
|
||||
expect(data.allowedDomains).toEqual(['example.com'])
|
||||
expect(data.pendingDomains).toEqual(['pending.com'])
|
||||
expect(authzService.hasPermission).toHaveBeenCalledWith(
|
||||
@@ -314,6 +316,7 @@ describe('team api', () => {
|
||||
|
||||
it('PUT /teams/:teamId/sandbox updates sandbox settings', async () => {
|
||||
mockUpdateSandboxSettings.mockResolvedValue({
|
||||
networkSandboxEnabled: true,
|
||||
allowedDomains: ['new.com'],
|
||||
pendingDomains: ['new-pending.com'],
|
||||
})
|
||||
@@ -321,11 +324,16 @@ describe('team api', () => {
|
||||
const res = await app.request('/teams/t1/sandbox', {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ allowedDomains: ['new.com'], pendingDomains: ['new-pending.com'] }),
|
||||
body: JSON.stringify({
|
||||
networkSandboxEnabled: true,
|
||||
allowedDomains: ['new.com'],
|
||||
pendingDomains: ['new-pending.com'],
|
||||
}),
|
||||
})
|
||||
|
||||
expect(res.status).toBe(200)
|
||||
const data = await res.json()
|
||||
expect(data.networkSandboxEnabled).toBe(true)
|
||||
expect(data.allowedDomains).toEqual(['new.com'])
|
||||
expect(data.pendingDomains).toEqual(['new-pending.com'])
|
||||
expect(authzService.hasPermission).toHaveBeenCalledWith(
|
||||
@@ -336,6 +344,7 @@ describe('team api', () => {
|
||||
}),
|
||||
)
|
||||
expect(mockUpdateSandboxSettings).toHaveBeenCalledWith('t1', {
|
||||
networkSandboxEnabled: true,
|
||||
allowedDomains: ['new.com'],
|
||||
pendingDomains: ['new-pending.com'],
|
||||
})
|
||||
|
||||
@@ -32,12 +32,14 @@ vi.mock('./middleware/auth', () => ({
|
||||
describe('versionStack api', () => {
|
||||
let mockCreateVersionStack: any // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
let mockChangeStackFileVersion: any // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
let mockRemoveVersionFromStack: any // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
let mockGetAsset: any // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
let mockGetStackVersions: any // eslint-disable-line @typescript-eslint/no-explicit-any
|
||||
|
||||
beforeEach(() => {
|
||||
mockCreateVersionStack = vi.spyOn(versionStackService, 'createVersionStack')
|
||||
mockChangeStackFileVersion = vi.spyOn(versionStackService, 'changeStackFileVersion')
|
||||
mockRemoveVersionFromStack = vi.spyOn(versionStackService, 'removeVersionFromStack')
|
||||
mockGetAsset = vi.spyOn(assetService, 'getAsset')
|
||||
mockGetStackVersions = vi.spyOn(assetService, 'getStackVersions')
|
||||
vi.mocked(authzService.hasPermission).mockResolvedValue(undefined)
|
||||
@@ -146,4 +148,30 @@ describe('versionStack api', () => {
|
||||
expect(mockGetStackVersions).toHaveBeenCalledWith('stack1')
|
||||
})
|
||||
})
|
||||
|
||||
describe('DELETE /version_stacks/:stackId/versions/:versionId', () => {
|
||||
it('should remove version from stack and return 200', async () => {
|
||||
mockRemoveVersionFromStack.mockResolvedValue()
|
||||
|
||||
const app = new Hono().use('*', authMiddleware).route('/', versionStackRoute)
|
||||
|
||||
const res = await app.request('/version_stacks/stack1/versions/v1', {
|
||||
method: 'DELETE',
|
||||
})
|
||||
|
||||
expect(res.status).toBe(200)
|
||||
|
||||
expect(authzService.hasPermission).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
type: ResourceType.Asset,
|
||||
id: 'stack1',
|
||||
permission: Permission.Edit,
|
||||
}),
|
||||
)
|
||||
expect(mockRemoveVersionFromStack).toHaveBeenCalledWith({
|
||||
stackId: 'stack1',
|
||||
fileId: 'v1',
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -75,5 +75,24 @@ const route = app
|
||||
const versions = await assetService.getStackVersions(stackId)
|
||||
return c.json(versions)
|
||||
})
|
||||
.delete('/version_stacks/:stackId/versions/:versionId', async (c) => {
|
||||
const stackId = c.req.param('stackId')
|
||||
const versionId = c.req.param('versionId')
|
||||
const user = c.get('user')
|
||||
|
||||
await authzService.hasPermission({
|
||||
user,
|
||||
permission: Permission.Edit,
|
||||
type: ResourceType.Asset,
|
||||
id: stackId,
|
||||
})
|
||||
|
||||
await versionStackService.removeVersionFromStack({
|
||||
stackId,
|
||||
fileId: versionId,
|
||||
})
|
||||
|
||||
return new Response(null, { status: 200 })
|
||||
})
|
||||
|
||||
export default route
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/core",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -2830,4 +2830,615 @@ describe('AssetService — natural sort by name', () => {
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
describe('AGENTS.md methods', () => {
|
||||
it('getAgentsMd returns null when no agentmd is set', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Team_AgentsMd_' + Date.now() },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Project_AgentsMd', teamId: team.id },
|
||||
})
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Folder_No_Md',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
const content = await assetService.getAgentsMd(folder.id)
|
||||
expect(content).toBeNull()
|
||||
})
|
||||
|
||||
it('updateAgentsMd updates and getAgentsMd retrieves agentmd, and empty deletes', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Team_AgentsMd2_' + Date.now() },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Project_AgentsMd2', teamId: team.id },
|
||||
})
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Folder_With_Md',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
const updateResult = await assetService.updateAgentsMd(folder.id, '# Custom Guidelines')
|
||||
expect(updateResult).toEqual({ content: '# Custom Guidelines' })
|
||||
|
||||
const content = await assetService.getAgentsMd(folder.id)
|
||||
expect(content).toBe('# Custom Guidelines')
|
||||
|
||||
let folderInfo = await assetService.getAsset({ assetId: folder.id })
|
||||
expect(folderInfo?.hasAgentsMd).toBe(true)
|
||||
|
||||
// Empty string deletes the record
|
||||
const clearResult = await assetService.updateAgentsMd(folder.id, ' ')
|
||||
expect(clearResult).toEqual({ content: '' })
|
||||
|
||||
const emptyContent = await assetService.getAgentsMd(folder.id)
|
||||
expect(emptyContent).toBeNull()
|
||||
|
||||
folderInfo = await assetService.getAsset({ assetId: folder.id })
|
||||
expect(folderInfo?.hasAgentsMd).toBe(false)
|
||||
})
|
||||
|
||||
it('getNestedAgentsMd traverses hierarchy from root to leaf and formats virtual paths', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Team_NestedMd_' + Date.now() },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Project_NestedMd', teamId: team.id },
|
||||
})
|
||||
|
||||
// 1. Root folder
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root Folder',
|
||||
type: AssetType.root,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
await prisma.assetAgentMd.create({
|
||||
data: {
|
||||
assetId: rootFolder.id,
|
||||
content: '# Root Instructions\nFollow global rules.',
|
||||
},
|
||||
})
|
||||
|
||||
// 2. Subfolder 1: marketing (has agentmd)
|
||||
const marketingFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'marketing',
|
||||
type: AssetType.folder,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
await prisma.assetAgentMd.create({
|
||||
data: {
|
||||
assetId: marketingFolder.id,
|
||||
content: '# Marketing Instructions\nTone must be upbeat.',
|
||||
},
|
||||
})
|
||||
|
||||
// 3. Subfolder 2: campaigns (no agentmd)
|
||||
const campaignsFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'campaigns',
|
||||
type: AssetType.folder,
|
||||
parentId: marketingFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
// 4. Subfolder 3: video-ads (has agentmd)
|
||||
const videoAdsFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'video-ads',
|
||||
type: AssetType.folder,
|
||||
parentId: campaignsFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
await prisma.assetAgentMd.create({
|
||||
data: {
|
||||
assetId: videoAdsFolder.id,
|
||||
content: '# Video Ads Instructions\nInclude resolution tags.',
|
||||
},
|
||||
})
|
||||
|
||||
// 5. File inside video-ads
|
||||
const fileAsset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'ad_clip.mp4',
|
||||
type: AssetType.file,
|
||||
parentId: videoAdsFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
const nestedFromLeaf = await assetService.getNestedAgentsMd(fileAsset.id)
|
||||
expect(nestedFromLeaf).toEqual([
|
||||
{
|
||||
path: '/AGENTS.md',
|
||||
content: '# Root Instructions\nFollow global rules.',
|
||||
},
|
||||
{
|
||||
path: '/marketing/AGENTS.md',
|
||||
content: '# Marketing Instructions\nTone must be upbeat.',
|
||||
},
|
||||
{
|
||||
path: '/marketing/campaigns/video-ads/AGENTS.md',
|
||||
content: '# Video Ads Instructions\nInclude resolution tags.',
|
||||
},
|
||||
])
|
||||
|
||||
const nestedFromMarketing = await assetService.getNestedAgentsMd(marketingFolder.id)
|
||||
expect(nestedFromMarketing).toEqual([
|
||||
{
|
||||
path: '/AGENTS.md',
|
||||
content: '# Root Instructions\nFollow global rules.',
|
||||
},
|
||||
{
|
||||
path: '/marketing/AGENTS.md',
|
||||
content: '# Marketing Instructions\nTone must be upbeat.',
|
||||
},
|
||||
])
|
||||
})
|
||||
|
||||
it('rejects get/update agentsmd on non-folder assets', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Team_AgentsMd_Type_' + Date.now() },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Project_AgentsMd_Type', teamId: team.id },
|
||||
})
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root',
|
||||
type: AssetType.root,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
const fileAsset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'doc.pdf',
|
||||
type: AssetType.file,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
await expect(assetService.getAgentsMd(fileAsset.id)).rejects.toThrow(
|
||||
'AGENTS.md can only be stored on folders',
|
||||
)
|
||||
await expect(assetService.updateAgentsMd(fileAsset.id, '# Nope')).rejects.toThrow(
|
||||
'AGENTS.md can only be stored on folders',
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
describe('reparentAssets into version_stack with sharelink symlinks', () => {
|
||||
it('deduplicates symlinks when both Stack A and File B are in the sharelink and File B is moved into Stack A', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team ' + Date.now() } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const user = await prisma.user.create({
|
||||
data: { name: 'Test User', email: `test-${Date.now()}@example.com` },
|
||||
})
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
const shareRoot = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'ShareRoot',
|
||||
type: AssetType.share_root,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
fileCount: 2,
|
||||
},
|
||||
})
|
||||
|
||||
const fileA1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'fileA1.txt',
|
||||
type: AssetType.file,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 100,
|
||||
sortIndex: 'a0',
|
||||
},
|
||||
})
|
||||
const fileA2 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'fileA2.txt',
|
||||
type: AssetType.file,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 100,
|
||||
sortIndex: 'a1',
|
||||
},
|
||||
})
|
||||
const fileB = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'fileB.txt',
|
||||
type: AssetType.file,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 200,
|
||||
sortIndex: 'a2',
|
||||
},
|
||||
})
|
||||
|
||||
// Create Stack A from fileA1 and fileA2
|
||||
const stackA = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
fileCount: 2,
|
||||
sizeByte: 200,
|
||||
},
|
||||
})
|
||||
await prisma.asset.update({ where: { id: fileA1.id }, data: { parentId: stackA.id } })
|
||||
await prisma.asset.update({ where: { id: fileA2.id }, data: { parentId: stackA.id } })
|
||||
|
||||
// Create symlinks in shareRoot for both Stack A and File B
|
||||
const symlinkStackA = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: stackA.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
const symlinkFileB = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileB.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: fileB.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
// Move File B into Stack A
|
||||
await assetService.reparentAssets({
|
||||
newParentId: stackA.id,
|
||||
assetIds: [fileB.id],
|
||||
creatorId: user.id,
|
||||
})
|
||||
|
||||
// Verify: File B's symlink was deleted, only Stack A's symlink remains
|
||||
expect(await prisma.asset.findUnique({ where: { id: symlinkFileB.id } })).toBeNull()
|
||||
const remainingSymlinks = await prisma.asset.findMany({
|
||||
where: { parentId: shareRoot.id, type: AssetType.symlink },
|
||||
})
|
||||
expect(remainingSymlinks).toHaveLength(1)
|
||||
expect(remainingSymlinks[0].id).toBe(symlinkStackA.id)
|
||||
expect(remainingSymlinks[0].targetId).toBe(stackA.id)
|
||||
|
||||
// ShareRoot fileCount was decremented from 2 to 1
|
||||
const updatedShareRoot = await prisma.asset.findUnique({ where: { id: shareRoot.id } })
|
||||
expect(updatedShareRoot?.fileCount).toBe(1)
|
||||
})
|
||||
|
||||
it('repoints symlink to Stack A when only File B is in sharelink and File B is moved into Stack A', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team ' + Date.now() } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const user = await prisma.user.create({
|
||||
data: { name: 'Test User', email: `test-${Date.now()}@example.com` },
|
||||
})
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
const shareRoot = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'ShareRoot',
|
||||
type: AssetType.share_root,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
fileCount: 1,
|
||||
},
|
||||
})
|
||||
|
||||
const fileA1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'fileA1.txt',
|
||||
type: AssetType.file,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 100,
|
||||
sortIndex: 'a0',
|
||||
},
|
||||
})
|
||||
const stackA = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
fileCount: 1,
|
||||
sizeByte: 100,
|
||||
},
|
||||
})
|
||||
await prisma.asset.update({ where: { id: fileA1.id }, data: { parentId: stackA.id } })
|
||||
|
||||
const fileB = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'fileB.txt',
|
||||
type: AssetType.file,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 200,
|
||||
sortIndex: 'a1',
|
||||
},
|
||||
})
|
||||
|
||||
// Create symlink for File B only
|
||||
const symlinkFileB = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileB.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: fileB.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
// Move File B into Stack A
|
||||
await assetService.reparentAssets({
|
||||
newParentId: stackA.id,
|
||||
assetIds: [fileB.id],
|
||||
creatorId: user.id,
|
||||
})
|
||||
|
||||
// Verify: symlinkFileB now points to stackA.id
|
||||
const updatedSymlink = await prisma.asset.findUnique({ where: { id: symlinkFileB.id } })
|
||||
expect(updatedSymlink?.targetId).toBe(stackA.id)
|
||||
|
||||
// Listing assets for shareRoot returns Stack A with latest version name
|
||||
const result = await assetService.listChildren({
|
||||
assetId: shareRoot.id,
|
||||
assetType: AssetType.file,
|
||||
})
|
||||
expect(result.data).toHaveLength(1)
|
||||
expect(result.data[0].name).toBe(fileB.name) // fileB is the latest version
|
||||
})
|
||||
})
|
||||
|
||||
describe('updateAssetName', () => {
|
||||
it('renames the latest version child file and returns updated AssetInfo when given a version stack ID', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team ' + Date.now() } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
fileCount: 2,
|
||||
sizeByte: 300,
|
||||
},
|
||||
})
|
||||
|
||||
const fileV1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'v1.mp4',
|
||||
type: AssetType.file,
|
||||
parentId: stack.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 100,
|
||||
sortIndex: 'b0',
|
||||
},
|
||||
})
|
||||
|
||||
const fileV2 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'v2.mp4',
|
||||
type: AssetType.file,
|
||||
parentId: stack.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 200,
|
||||
sortIndex: 'a0', // latest version
|
||||
},
|
||||
})
|
||||
|
||||
const updated = await assetService.updateAssetName({
|
||||
id: stack.id,
|
||||
name: 'v2-renamed.mp4',
|
||||
})
|
||||
|
||||
expect(updated.id).toBe(stack.id)
|
||||
expect(updated.name).toBe('v2-renamed.mp4')
|
||||
expect(updated.versionStack?.versions[0]?.name).toBe('v2-renamed.mp4')
|
||||
|
||||
const dbFileV2 = await prisma.asset.findUnique({ where: { id: fileV2.id } })
|
||||
expect(dbFileV2?.name).toBe('v2-renamed.mp4')
|
||||
|
||||
const dbFileV1 = await prisma.asset.findUnique({ where: { id: fileV1.id } })
|
||||
expect(dbFileV1?.name).toBe('v1.mp4')
|
||||
|
||||
const dbStack = await prisma.asset.findUnique({ where: { id: stack.id } })
|
||||
expect(dbStack?.name).toBe('')
|
||||
})
|
||||
|
||||
it('preserves the renamed filename when a version stack dissolves', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team ' + Date.now() } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const rootFolder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Root',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: rootFolder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
fileCount: 2,
|
||||
sizeByte: 300,
|
||||
sortIndex: 's0',
|
||||
},
|
||||
})
|
||||
|
||||
const fileV1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'v1.mp4',
|
||||
type: AssetType.file,
|
||||
parentId: stack.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 100,
|
||||
sortIndex: 'b0',
|
||||
},
|
||||
})
|
||||
|
||||
const fileV2 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'v2.mp4',
|
||||
type: AssetType.file,
|
||||
parentId: stack.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
sizeByte: 200,
|
||||
sortIndex: 'a0',
|
||||
},
|
||||
})
|
||||
|
||||
await assetService.updateAssetName({
|
||||
id: stack.id,
|
||||
name: 'v2-renamed.mp4',
|
||||
})
|
||||
|
||||
// Remove v1 from stack -> stack dissolves and v2 becomes standalone file
|
||||
const { versionStackService } = await import('../versionStack/versionStack')
|
||||
await versionStackService.removeVersionFromStack({
|
||||
stackId: stack.id,
|
||||
fileId: fileV1.id,
|
||||
})
|
||||
|
||||
const remainingFile = await prisma.asset.findUnique({ where: { id: fileV2.id } })
|
||||
expect(remainingFile?.parentId).toBe(rootFolder.id)
|
||||
expect(remainingFile?.name).toBe('v2-renamed.mp4')
|
||||
})
|
||||
|
||||
it('throws an error if version stack has no active versions to rename', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team ' + Date.now() } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const emptyStack = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
await expect(
|
||||
assetService.updateAssetName({
|
||||
id: emptyStack.id,
|
||||
name: 'new-name.mp4',
|
||||
}),
|
||||
).rejects.toThrow('No active version found in stack to rename')
|
||||
})
|
||||
|
||||
it('renames a regular file and folder correctly', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team ' + Date.now() } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const folder = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Original Folder',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
const file = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'original.png',
|
||||
type: AssetType.file,
|
||||
parentId: folder.id,
|
||||
projectId: project.id,
|
||||
status: AssetStatus.uploaded,
|
||||
},
|
||||
})
|
||||
|
||||
const updatedFolder = await assetService.updateAssetName({
|
||||
id: folder.id,
|
||||
name: 'Renamed Folder',
|
||||
})
|
||||
expect(updatedFolder.name).toBe('Renamed Folder')
|
||||
|
||||
const updatedFile = await assetService.updateAssetName({
|
||||
id: file.id,
|
||||
name: 'renamed.png',
|
||||
})
|
||||
expect(updatedFile.name).toBe('renamed.png')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -22,6 +22,7 @@ import { HTTPException } from 'hono/http-exception'
|
||||
import { logger } from '@shumai/core/src/logger'
|
||||
import { PaginatedData, paginateQuery, PaginationParams } from '@shumai/core/src/pagination'
|
||||
import { s3Service } from '@shumai/core/src/s3/s3'
|
||||
import { dedupeSymlinksToTarget } from './symlink'
|
||||
import { watermarkService } from '@shumai/core/src/watermark/watermark'
|
||||
import { generateKeyBetween } from 'jittered-fractional-indexing'
|
||||
import { getAvatarUrl } from '@shumai/core/src/user/avatar'
|
||||
@@ -160,6 +161,9 @@ export class AssetService {
|
||||
const count = await tx.asset.count({ where: { parentId: stack.id } })
|
||||
|
||||
if (count === 0) {
|
||||
await tx.asset.deleteMany({
|
||||
where: { targetId: stack.id, type: AssetType.symlink },
|
||||
})
|
||||
if (stack.parentId) {
|
||||
await tx.asset.update({
|
||||
where: { id: stack.parentId },
|
||||
@@ -174,9 +178,14 @@ export class AssetService {
|
||||
if (!lastChild) return
|
||||
if (!stack.parentId) throw new Error('Stack has no parent')
|
||||
|
||||
await tx.asset.updateMany({
|
||||
where: { targetId: stack.id, type: AssetType.symlink },
|
||||
data: { targetId: lastChild.id, name: lastChild.name },
|
||||
})
|
||||
|
||||
await tx.asset.update({
|
||||
where: { id: lastChild.id },
|
||||
data: { parentId: stack.parentId, sortIndex: null },
|
||||
data: { parentId: stack.parentId, sortIndex: stack.sortIndex },
|
||||
})
|
||||
await tx.asset.delete({ where: { id: stack.id } })
|
||||
}
|
||||
@@ -273,6 +282,14 @@ export class AssetService {
|
||||
firstSortIndex = newSortIndex
|
||||
}
|
||||
|
||||
if (newParent.type === AssetType.version_stack) {
|
||||
await dedupeSymlinksToTarget(tx, {
|
||||
targetIds: req.assetIds,
|
||||
newTargetId: newParent.id,
|
||||
name: '',
|
||||
})
|
||||
}
|
||||
|
||||
const oldParent = await tx.asset.findUnique({
|
||||
where: { id: oldParentId },
|
||||
})
|
||||
@@ -579,6 +596,12 @@ export class AssetService {
|
||||
},
|
||||
})
|
||||
|
||||
// Update existing symlinks pointing to destFile or sourceAsset
|
||||
await dedupeSymlinksToTarget(tx, {
|
||||
targetIds: [destFile.id, sourceAsset.id],
|
||||
newTargetId: stack.id,
|
||||
})
|
||||
|
||||
const oldParent = await tx.asset.findUnique({ where: { id: oldParentId } })
|
||||
if (oldParent) {
|
||||
await this.dissolveStackIfEmpty(tx, oldParent)
|
||||
@@ -932,9 +955,42 @@ export class AssetService {
|
||||
}
|
||||
|
||||
async updateAssetName(req: UpdateAssetNameRequest): Promise<AssetInfo> {
|
||||
const asset = await this.prismaClient.asset.update({
|
||||
const existing = await this.prismaClient.asset.findUnique({
|
||||
where: { id: req.id },
|
||||
include: { target: true },
|
||||
})
|
||||
if (!existing) throw new Error('Asset not found')
|
||||
|
||||
let targetType = existing.type
|
||||
let targetId = existing.id
|
||||
|
||||
if (existing.type === AssetType.symlink && existing.target) {
|
||||
targetType = existing.target.type
|
||||
targetId = existing.target.id
|
||||
}
|
||||
|
||||
if (targetType === AssetType.version_stack) {
|
||||
const latestChild = await this.prismaClient.asset.findFirst({
|
||||
where: { parentId: targetId, isDeleted: false },
|
||||
orderBy: { sortIndex: 'asc' },
|
||||
select: { id: true },
|
||||
})
|
||||
if (!latestChild) {
|
||||
throw new Error('No active version found in stack to rename')
|
||||
}
|
||||
await this.prismaClient.asset.update({
|
||||
where: { id: latestChild.id },
|
||||
data: { name: req.name },
|
||||
})
|
||||
} else {
|
||||
await this.prismaClient.asset.update({
|
||||
where: { id: req.id },
|
||||
data: { name: req.name },
|
||||
})
|
||||
}
|
||||
|
||||
const asset = await this.prismaClient.asset.findUnique({
|
||||
where: { id: req.id },
|
||||
data: { name: req.name },
|
||||
include: {
|
||||
creator: true,
|
||||
metadataValues: true,
|
||||
@@ -960,6 +1016,8 @@ export class AssetService {
|
||||
storageKey: true,
|
||||
},
|
||||
})
|
||||
if (!asset) throw new Error('Asset not found')
|
||||
|
||||
const infos = await this.toAssetInfos([asset as unknown as AssetWithIncludes])
|
||||
return infos[0]
|
||||
}
|
||||
@@ -1592,6 +1650,15 @@ export class AssetService {
|
||||
}
|
||||
}
|
||||
|
||||
const agentMdRecords =
|
||||
assets.length > 0
|
||||
? await this.prismaClient.assetAgentMd.findMany({
|
||||
where: { assetId: { in: assets.map((a) => a.id) } },
|
||||
select: { assetId: true },
|
||||
})
|
||||
: []
|
||||
const hasAgentMdSet = new Set(agentMdRecords.map((r) => r.assetId))
|
||||
|
||||
const result: AssetInfo[] = []
|
||||
for (const a of assets) {
|
||||
let latestVersion:
|
||||
@@ -1620,6 +1687,7 @@ export class AssetService {
|
||||
id: v.id,
|
||||
name: v.name,
|
||||
previewUrl: preview?.thumbnailUrl || null,
|
||||
createdAt: v.createdAt.toISOString(),
|
||||
creator: v.creator
|
||||
? {
|
||||
id: v.creator.id,
|
||||
@@ -1735,9 +1803,12 @@ export class AssetService {
|
||||
result.push({
|
||||
id: a.id,
|
||||
name:
|
||||
a.type === AssetType.version_stack && (a.name === '' || !a.name)
|
||||
a.type === AssetType.version_stack ||
|
||||
(a.type === AssetType.symlink && a.target?.type === AssetType.version_stack)
|
||||
? latestVersion.name
|
||||
: a.name,
|
||||
: a.type === AssetType.symlink
|
||||
? a.name || latestVersion.name || a.target?.name || ''
|
||||
: a.name,
|
||||
sizeByte: Number(latestVersion.sizeByte),
|
||||
fileCount: latestVersion.fileCount,
|
||||
type: a.type,
|
||||
@@ -1753,6 +1824,7 @@ export class AssetService {
|
||||
creator,
|
||||
fieldValues,
|
||||
sortIndex: a.sortIndex,
|
||||
hasAgentsMd: hasAgentMdSet.has(a.id),
|
||||
media: media as unknown as AssetInfo['media'],
|
||||
versionStack,
|
||||
})
|
||||
@@ -1766,7 +1838,8 @@ export class AssetService {
|
||||
version: number
|
||||
name: string
|
||||
previewUrl: string | null
|
||||
creator: { id: string; name: string | null } | null
|
||||
createdAt: string
|
||||
creator: { id: string; name: string | null; image?: string | null } | null
|
||||
}>
|
||||
> {
|
||||
const versions = await this.prismaClient.asset.findMany({
|
||||
@@ -1787,6 +1860,7 @@ export class AssetService {
|
||||
version: versions.length - i,
|
||||
name: v.name,
|
||||
previewUrl: preview?.thumbnailUrl || null,
|
||||
createdAt: v.createdAt.toISOString(),
|
||||
creator: v.creator
|
||||
? {
|
||||
id: v.creator.id,
|
||||
@@ -2164,6 +2238,108 @@ export class AssetService {
|
||||
completionLastChangedBy,
|
||||
}
|
||||
}
|
||||
|
||||
async getAgentsMd(assetId: string): Promise<string | null> {
|
||||
const asset = await this.prismaClient.asset.findUnique({
|
||||
where: { id: assetId },
|
||||
select: { type: true },
|
||||
})
|
||||
if (!asset) throw new Error('Asset not found')
|
||||
if (asset.type !== AssetType.folder && asset.type !== AssetType.root) {
|
||||
throw new Error('AGENTS.md can only be stored on folders')
|
||||
}
|
||||
const record = await this.prismaClient.assetAgentMd.findUnique({
|
||||
where: { assetId },
|
||||
select: { content: true },
|
||||
})
|
||||
return record?.content ?? null
|
||||
}
|
||||
|
||||
async updateAgentsMd(assetId: string, content: string): Promise<{ content: string }> {
|
||||
const asset = await this.prismaClient.asset.findUnique({
|
||||
where: { id: assetId },
|
||||
select: { id: true, type: true },
|
||||
})
|
||||
if (!asset) throw new Error('Asset not found')
|
||||
if (asset.type !== AssetType.folder && asset.type !== AssetType.root) {
|
||||
throw new Error('AGENTS.md can only be stored on folders')
|
||||
}
|
||||
const trimmed = content.trim()
|
||||
if (trimmed.length === 0) {
|
||||
await this.prismaClient.assetAgentMd.deleteMany({
|
||||
where: { assetId },
|
||||
})
|
||||
return { content: '' }
|
||||
}
|
||||
const record = await this.prismaClient.assetAgentMd.upsert({
|
||||
where: { assetId },
|
||||
create: { assetId, content },
|
||||
update: { content },
|
||||
select: { content: true },
|
||||
})
|
||||
return { content: record.content }
|
||||
}
|
||||
|
||||
async getNestedAgentsMd(assetId: string): Promise<Array<{ path: string; content: string }>> {
|
||||
let currentId: string | null = assetId
|
||||
const nodes: Array<{
|
||||
id: string
|
||||
name: string
|
||||
type: AssetType
|
||||
parentId: string | null
|
||||
}> = []
|
||||
|
||||
while (currentId) {
|
||||
const node: {
|
||||
id: string
|
||||
name: string
|
||||
type: AssetType
|
||||
parentId: string | null
|
||||
} | null = await this.prismaClient.asset.findUnique({
|
||||
where: { id: currentId },
|
||||
select: { id: true, name: true, type: true, parentId: true },
|
||||
})
|
||||
if (!node) break
|
||||
nodes.unshift(node)
|
||||
currentId = node.parentId
|
||||
}
|
||||
|
||||
if (nodes.length === 0) return []
|
||||
|
||||
const agentMds = await this.prismaClient.assetAgentMd.findMany({
|
||||
where: { assetId: { in: nodes.map((n) => n.id) } },
|
||||
select: { assetId: true, content: true },
|
||||
})
|
||||
const agentMdMap = new Map(agentMds.map((m) => [m.assetId, m.content]))
|
||||
|
||||
const results: Array<{ path: string; content: string }> = []
|
||||
let currentFolderPath = ''
|
||||
|
||||
for (let i = 0; i < nodes.length; i++) {
|
||||
const node = nodes[i]
|
||||
let virtualPath: string
|
||||
|
||||
if (node.type === AssetType.root || i === 0) {
|
||||
currentFolderPath = ''
|
||||
virtualPath = '/AGENTS.md'
|
||||
} else {
|
||||
currentFolderPath = currentFolderPath
|
||||
? `${currentFolderPath}/${node.name}`
|
||||
: `/${node.name}`
|
||||
virtualPath = `${currentFolderPath}/AGENTS.md`
|
||||
}
|
||||
|
||||
const content = agentMdMap.get(node.id)
|
||||
if (content && content.trim().length > 0) {
|
||||
results.push({
|
||||
path: virtualPath,
|
||||
content: content.trim(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return results
|
||||
}
|
||||
}
|
||||
|
||||
export const assetService = new AssetService()
|
||||
|
||||
@@ -0,0 +1,249 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { prisma } from '@shumai/db'
|
||||
import { setupTestDbHooks } from '@shumai/db/test'
|
||||
import { AssetType } from '@shumai/db'
|
||||
import { dedupeSymlinksToTarget } from './symlink'
|
||||
|
||||
async function setupShareFolder(projectId: string, fileCount: number) {
|
||||
const shareRoot = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'share-root',
|
||||
type: AssetType.share_root,
|
||||
projectId,
|
||||
status: 'uploaded',
|
||||
fileCount,
|
||||
},
|
||||
})
|
||||
return shareRoot
|
||||
}
|
||||
|
||||
describe('dedupeSymlinksToTarget', () => {
|
||||
setupTestDbHooks()
|
||||
|
||||
async function setupProject() {
|
||||
const team = await prisma.team.create({ data: { name: 'Team ' + Date.now() } })
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'Project ' + Date.now(), teamId: team.id },
|
||||
})
|
||||
const root = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'root',
|
||||
type: AssetType.folder,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
const fileA = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'a.txt',
|
||||
type: AssetType.file,
|
||||
parentId: root.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 10,
|
||||
},
|
||||
})
|
||||
const fileB = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'b.txt',
|
||||
type: AssetType.file,
|
||||
parentId: root.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 20,
|
||||
},
|
||||
})
|
||||
return { project, root, fileA, fileB }
|
||||
}
|
||||
|
||||
it('repoints one symlink per parent and deletes duplicates, decrementing fileCount once', async () => {
|
||||
const { project, root, fileA, fileB } = await setupProject()
|
||||
const shareRoot = await setupShareFolder(project.id, 2)
|
||||
|
||||
const symA = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileA.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: fileA.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
const symB = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileB.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: fileB.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: root.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
fileCount: 2,
|
||||
sizeByte: 30,
|
||||
},
|
||||
})
|
||||
|
||||
await prisma.$transaction((tx) =>
|
||||
dedupeSymlinksToTarget(tx, { targetIds: [fileA.id, fileB.id], newTargetId: stack.id }),
|
||||
)
|
||||
|
||||
// First symlink repointed to the stack, second deleted
|
||||
const repointed = await prisma.asset.findUnique({ where: { id: symA.id } })
|
||||
expect(repointed?.targetId).toBe(stack.id)
|
||||
expect(await prisma.asset.findUnique({ where: { id: symB.id } })).toBeNull()
|
||||
|
||||
// fileCount decremented exactly once (2 -> 1)
|
||||
const updatedShareRoot = await prisma.asset.findUnique({ where: { id: shareRoot.id } })
|
||||
expect(updatedShareRoot?.fileCount).toBe(1)
|
||||
})
|
||||
|
||||
it('deletes a file symlink when the parent already shows the stack', async () => {
|
||||
const { project, root, fileA } = await setupProject()
|
||||
const shareRoot = await setupShareFolder(project.id, 2)
|
||||
|
||||
const stack = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: root.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
fileCount: 1,
|
||||
sizeByte: 10,
|
||||
},
|
||||
})
|
||||
// Share already contains a symlink to the stack
|
||||
const stackSymlink = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: stack.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
// And a symlink to the file being moved into the stack
|
||||
const fileSymlink = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileA.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: fileA.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
|
||||
await prisma.$transaction((tx) =>
|
||||
dedupeSymlinksToTarget(tx, { targetIds: [fileA.id], newTargetId: stack.id }),
|
||||
)
|
||||
|
||||
// File symlink deleted, stack symlink untouched
|
||||
expect(await prisma.asset.findUnique({ where: { id: fileSymlink.id } })).toBeNull()
|
||||
const updatedStackSymlink = await prisma.asset.findUnique({ where: { id: stackSymlink.id } })
|
||||
expect(updatedStackSymlink?.targetId).toBe(stack.id)
|
||||
|
||||
// fileCount decremented once (2 -> 1)
|
||||
const updatedShareRoot = await prisma.asset.findUnique({ where: { id: shareRoot.id } })
|
||||
expect(updatedShareRoot?.fileCount).toBe(1)
|
||||
})
|
||||
|
||||
it('repoints symlinks in different share folders without changing fileCounts', async () => {
|
||||
const { project, root, fileA, fileB } = await setupProject()
|
||||
const share1 = await setupShareFolder(project.id, 1)
|
||||
const share2 = await setupShareFolder(project.id, 1)
|
||||
|
||||
const sym1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileA.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: share1.id,
|
||||
targetId: fileA.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
const sym2 = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileB.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: share2.id,
|
||||
targetId: fileB.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: root.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
fileCount: 2,
|
||||
sizeByte: 30,
|
||||
},
|
||||
})
|
||||
|
||||
await prisma.$transaction((tx) =>
|
||||
dedupeSymlinksToTarget(tx, { targetIds: [fileA.id, fileB.id], newTargetId: stack.id }),
|
||||
)
|
||||
|
||||
expect((await prisma.asset.findUnique({ where: { id: sym1.id } }))?.targetId).toBe(stack.id)
|
||||
expect((await prisma.asset.findUnique({ where: { id: sym2.id } }))?.targetId).toBe(stack.id)
|
||||
expect((await prisma.asset.findUnique({ where: { id: share1.id } }))?.fileCount).toBe(1)
|
||||
expect((await prisma.asset.findUnique({ where: { id: share2.id } }))?.fileCount).toBe(1)
|
||||
})
|
||||
|
||||
it('sets the provided name on repointed symlinks', async () => {
|
||||
const { project, root, fileA } = await setupProject()
|
||||
const shareRoot = await setupShareFolder(project.id, 1)
|
||||
|
||||
const sym = await prisma.asset.create({
|
||||
data: {
|
||||
name: fileA.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: shareRoot.id,
|
||||
targetId: fileA.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await prisma.asset.create({
|
||||
data: {
|
||||
name: '',
|
||||
type: AssetType.version_stack,
|
||||
parentId: root.id,
|
||||
projectId: project.id,
|
||||
status: 'uploaded',
|
||||
fileCount: 1,
|
||||
sizeByte: 10,
|
||||
},
|
||||
})
|
||||
|
||||
await prisma.$transaction((tx) =>
|
||||
dedupeSymlinksToTarget(tx, {
|
||||
targetIds: [fileA.id],
|
||||
newTargetId: stack.id,
|
||||
name: '',
|
||||
}),
|
||||
)
|
||||
|
||||
const updatedSym = await prisma.asset.findUnique({ where: { id: sym.id } })
|
||||
expect(updatedSym?.targetId).toBe(stack.id)
|
||||
expect(updatedSym?.name).toBe('')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,58 @@
|
||||
import { Prisma } from '@shumai/db'
|
||||
import { AssetType } from '@shumai/db'
|
||||
|
||||
interface DedupeSymlinksParams {
|
||||
/** Files being merged into a version stack — symlinks pointing at them are the candidates. */
|
||||
targetIds: string[]
|
||||
/** The version stack the files are moving into. */
|
||||
newTargetId: string
|
||||
/** Optional name to set on repointed symlinks ('' for stacks — display name comes from the latest version). */
|
||||
name?: string
|
||||
}
|
||||
|
||||
/**
|
||||
* When files are merged into a version stack, symlinks in share folders that
|
||||
* pointed at those files must either be repointed to the stack (one per parent)
|
||||
* or deleted as duplicates. Per parent folder: if the parent already shows the
|
||||
* stack (either before this call or after the first repoint), delete the
|
||||
* incoming symlink and decrement the parent's fileCount; otherwise repoint the
|
||||
* first symlink to the stack.
|
||||
*/
|
||||
export async function dedupeSymlinksToTarget(
|
||||
tx: Prisma.TransactionClient,
|
||||
{ targetIds, newTargetId, name }: DedupeSymlinksParams,
|
||||
): Promise<void> {
|
||||
const existingSymlinks = await tx.asset.findMany({
|
||||
where: { targetId: { in: targetIds }, type: AssetType.symlink },
|
||||
})
|
||||
if (existingSymlinks.length === 0) return
|
||||
|
||||
// Parents that already display the stack (or will after the first repoint).
|
||||
const stackSymlinkParents = new Set(
|
||||
(
|
||||
await tx.asset.findMany({
|
||||
where: { targetId: newTargetId, type: AssetType.symlink },
|
||||
select: { parentId: true },
|
||||
})
|
||||
)
|
||||
.map((s) => s.parentId)
|
||||
.filter((id): id is string => !!id),
|
||||
)
|
||||
|
||||
for (const symlink of existingSymlinks) {
|
||||
if (!symlink.parentId) continue
|
||||
if (stackSymlinkParents.has(symlink.parentId)) {
|
||||
await tx.asset.delete({ where: { id: symlink.id } })
|
||||
await tx.asset.update({
|
||||
where: { id: symlink.parentId },
|
||||
data: { fileCount: { decrement: 1 } },
|
||||
})
|
||||
} else {
|
||||
stackSymlinkParents.add(symlink.parentId)
|
||||
await tx.asset.update({
|
||||
where: { id: symlink.id },
|
||||
data: { targetId: newTargetId, ...(name !== undefined ? { name } : {}) },
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,7 +87,7 @@ describe('MetadataService', () => {
|
||||
expect(projectFields[2].visible).toBe(false)
|
||||
})
|
||||
|
||||
it('AIAutofillAndDescription', async () => {
|
||||
it('AutofillSourceAndDescription', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'test-team' },
|
||||
})
|
||||
@@ -103,24 +103,22 @@ describe('MetadataService', () => {
|
||||
key: 'teamfield1',
|
||||
scope: 'TEAM',
|
||||
team: { connect: { id: team.id } },
|
||||
config: { name: 'Test Team Field', type: 'text' },
|
||||
aiAutofill: true,
|
||||
config: { name: 'Test Team Field', type: 'text', autofillSource: 'CONTENT' },
|
||||
description: desc,
|
||||
},
|
||||
})
|
||||
|
||||
const newDesc = 'Updated description'
|
||||
const updatedTeamField = await metadataService.updateTeamField(team.id, teamField.key, {
|
||||
config: { name: 'Test Team Field', type: 'text' },
|
||||
aiAutofill: false,
|
||||
config: { name: 'Test Team Field', type: 'text', autofillSource: 'NONE' },
|
||||
description: newDesc,
|
||||
})
|
||||
expect(updatedTeamField.aiAutofill).toBe(false)
|
||||
expect(updatedTeamField.config?.autofillSource).toBe('NONE')
|
||||
expect(updatedTeamField.description).toBe(newDesc)
|
||||
// IDOR test
|
||||
await expect(
|
||||
metadataService.updateTeamField('wrong-team-id', teamField.key, {
|
||||
config: { name: 'Hack', type: 'text' },
|
||||
config: { name: 'Hack', type: 'text', autofillSource: 'NONE' },
|
||||
}),
|
||||
).rejects.toThrow('Field does not belong to this team')
|
||||
})
|
||||
@@ -261,4 +259,294 @@ describe('MetadataService', () => {
|
||||
const multiVal = values.find((v) => v.fieldKey === userMultiField.key)
|
||||
expect(multiVal?.jsonValue).toEqual(multiUserIds)
|
||||
})
|
||||
|
||||
it('should dynamically create new options for select fields and store option id', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'test-team' },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'test-project', teamId: team.id },
|
||||
})
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'test-asset',
|
||||
project: { connect: { id: project.id } },
|
||||
type: 'file',
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
},
|
||||
})
|
||||
|
||||
const selectField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'ai_provider',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'AI Provider',
|
||||
type: 'select',
|
||||
select: {
|
||||
options: [
|
||||
{ id: 'openai', displayName: 'OpenAI', color: '#f43f5e' },
|
||||
{ id: 'google', displayName: 'Google', color: '#3b82f6' },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// 1. Add new option 'Kling AI'
|
||||
await metadataService.updateAssetMetadata(asset.id, [
|
||||
{ key: selectField.key, value: { newOption: { value: 'Kling AI' } } },
|
||||
])
|
||||
|
||||
// Verify option added to field config
|
||||
const updatedField = await prisma.metadataField.findUnique({
|
||||
where: { key: selectField.key },
|
||||
})
|
||||
const options = (updatedField?.config as PrismaJson.FieldConfig)?.select?.options || []
|
||||
expect(options).toHaveLength(3)
|
||||
const klingOpt = options.find((o) => o.displayName === 'Kling AI')
|
||||
expect(klingOpt).toBeDefined()
|
||||
expect(klingOpt?.id).toBe('kling-ai')
|
||||
expect(klingOpt?.color).toBeDefined()
|
||||
|
||||
// Verify asset metadata value stores the option ID
|
||||
const val = await prisma.assetMetadataValue.findUnique({
|
||||
where: {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
assetId_fieldKey: {
|
||||
assetId: asset.id,
|
||||
fieldKey: selectField.key,
|
||||
},
|
||||
},
|
||||
})
|
||||
expect(val?.stringValue).toBe('kling-ai')
|
||||
|
||||
// 2. Deduplication: passing 'kling ai' case-insensitively should reuse existing 'kling-ai'
|
||||
await metadataService.updateAssetMetadata(asset.id, [
|
||||
{ key: selectField.key, value: { newOption: { value: 'kling ai' } } },
|
||||
])
|
||||
const updatedField2 = await prisma.metadataField.findUnique({
|
||||
where: { key: selectField.key },
|
||||
})
|
||||
const options2 = (updatedField2?.config as PrismaJson.FieldConfig)?.select?.options || []
|
||||
expect(options2).toHaveLength(3) // Not 4!
|
||||
})
|
||||
|
||||
it('should dynamically create new options for selectMulti fields and store array of option ids', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'test-team' },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'test-project', teamId: team.id },
|
||||
})
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'test-asset',
|
||||
project: { connect: { id: project.id } },
|
||||
type: 'file',
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
},
|
||||
})
|
||||
|
||||
const selectMultiField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'tags',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'Tags',
|
||||
type: 'selectMulti',
|
||||
selectMulti: {
|
||||
options: [{ id: 'tag1', displayName: 'Tag 1', color: '#f43f5e' }],
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// Pass mixed existing and new option
|
||||
await metadataService.updateAssetMetadata(asset.id, [
|
||||
{
|
||||
key: selectMultiField.key,
|
||||
value: ['tag1', { newOption: { value: 'Tag 2' } }],
|
||||
},
|
||||
])
|
||||
|
||||
// Verify option added to field config
|
||||
const updatedField = await prisma.metadataField.findUnique({
|
||||
where: { key: selectMultiField.key },
|
||||
})
|
||||
const options = (updatedField?.config as PrismaJson.FieldConfig)?.selectMulti?.options || []
|
||||
expect(options).toHaveLength(2)
|
||||
const tag2Opt = options.find((o) => o.displayName === 'Tag 2')
|
||||
expect(tag2Opt).toBeDefined()
|
||||
expect(tag2Opt?.id).toBe('tag-2')
|
||||
|
||||
// Verify asset metadata value stores array of IDs
|
||||
const val = await prisma.assetMetadataValue.findUnique({
|
||||
where: {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
assetId_fieldKey: {
|
||||
assetId: asset.id,
|
||||
fieldKey: selectMultiField.key,
|
||||
},
|
||||
},
|
||||
})
|
||||
expect(val?.jsonValue).toEqual(['tag1', 'tag-2'])
|
||||
})
|
||||
|
||||
it('should reject invalid newOption value format', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'test-team' },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'test-project', teamId: team.id },
|
||||
})
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'test-asset',
|
||||
project: { connect: { id: project.id } },
|
||||
type: 'file',
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
},
|
||||
})
|
||||
|
||||
const selectField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'field_opt',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: { name: 'Field Opt', type: 'select' },
|
||||
},
|
||||
})
|
||||
|
||||
await expect(
|
||||
metadataService.updateAssetMetadata(asset.id, [
|
||||
{ key: selectField.key, value: { newOption: { value: ' ' } } },
|
||||
]),
|
||||
).rejects.toThrow('value must be a non-empty string')
|
||||
})
|
||||
|
||||
it('should handle ID collisions by appending numeric suffix', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'test-team' },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'test-project', teamId: team.id },
|
||||
})
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'test-asset',
|
||||
project: { connect: { id: project.id } },
|
||||
type: 'file',
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
},
|
||||
})
|
||||
|
||||
const selectField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'collision_test',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'Collision Test',
|
||||
type: 'select',
|
||||
select: {
|
||||
options: [
|
||||
{ id: 'kling-ai', displayName: 'Old Kling AI', color: '#f43f5e' },
|
||||
{ id: 'kling-ai-1', displayName: 'Old Kling AI Suffix 1', color: '#3b82f6' },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// Now adding a new option with different displayName whose slug collides with 'kling-ai'
|
||||
await metadataService.updateAssetMetadata(asset.id, [
|
||||
{ key: selectField.key, value: { newOption: { value: 'Kling AI Unique' } } },
|
||||
])
|
||||
|
||||
const updatedField = await prisma.metadataField.findUnique({
|
||||
where: { key: selectField.key },
|
||||
})
|
||||
const options = (updatedField?.config as PrismaJson.FieldConfig)?.select?.options || []
|
||||
const newOpt = options.find((o) => o.displayName === 'Kling AI Unique')
|
||||
expect(newOpt).toBeDefined()
|
||||
expect(newOpt?.id).toBe('kling-ai-unique')
|
||||
|
||||
// Test when baseId and candidateId-1 exist, next should be candidateId-2
|
||||
const collisionField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'collision_base',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'Collision Base',
|
||||
type: 'select',
|
||||
select: {
|
||||
options: [
|
||||
{ id: 'custom-tool', displayName: 'First Tool', color: '#f43f5e' },
|
||||
{ id: 'custom-tool-1', displayName: 'Second Tool', color: '#3b82f6' },
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// displayName is 'Custom Tool' which has baseId 'custom-tool' (not matching display names 'First Tool' / 'Second Tool')
|
||||
await metadataService.updateAssetMetadata(asset.id, [
|
||||
{ key: collisionField.key, value: { newOption: { value: 'Custom Tool' } } },
|
||||
])
|
||||
|
||||
const updatedCollisionField = await prisma.metadataField.findUnique({
|
||||
where: { key: collisionField.key },
|
||||
})
|
||||
const collisionOpts =
|
||||
(updatedCollisionField?.config as PrismaJson.FieldConfig)?.select?.options || []
|
||||
const resolvedNewOpt = collisionOpts.find((o) => o.displayName === 'Custom Tool')
|
||||
expect(resolvedNewOpt).toBeDefined()
|
||||
expect(resolvedNewOpt?.id).toBe('custom-tool-2')
|
||||
})
|
||||
|
||||
it('should reject non-string and non-newOption items in selectMulti array', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'test-team' },
|
||||
})
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'test-project', teamId: team.id },
|
||||
})
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'test-asset',
|
||||
project: { connect: { id: project.id } },
|
||||
type: 'file',
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
},
|
||||
})
|
||||
|
||||
const selectMultiField = await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'tags_invalid_items',
|
||||
scope: 'PROJECT',
|
||||
project: { connect: { id: project.id } },
|
||||
config: {
|
||||
name: 'Tags',
|
||||
type: 'selectMulti',
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
// Passing invalid items like number or null
|
||||
await expect(
|
||||
metadataService.updateAssetMetadata(asset.id, [
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{ key: selectMultiField.key, value: ['tag1', 123 as any] },
|
||||
]),
|
||||
).rejects.toThrow('expected string or {newOption}')
|
||||
})
|
||||
})
|
||||
|
||||
@@ -10,6 +10,36 @@ import { ulid } from 'ulid'
|
||||
import { assetService } from '../asset/asset'
|
||||
import { systemFields } from './system_fields'
|
||||
|
||||
export const FIELD_COLORS = [
|
||||
'#f43f5e', // rose
|
||||
'#ec4899', // pink
|
||||
'#d946ef', // fuchsia
|
||||
'#a855f7', // purple
|
||||
'#8b5cf6', // violet
|
||||
'#6366f1', // indigo
|
||||
'#3b82f6', // blue
|
||||
'#0ea5e9', // sky
|
||||
'#06b6d4', // cyan
|
||||
'#14b8a6', // teal
|
||||
'#10b981', // emerald
|
||||
'#22c55e', // green
|
||||
'#84cc16', // lime
|
||||
'#eab308', // yellow
|
||||
'#f59e0b', // amber
|
||||
'#f97316', // orange
|
||||
'#71717a', // zinc
|
||||
'#64748b', // slate
|
||||
]
|
||||
|
||||
export function getNextOptionColor(existingOptions: PrismaJson.SelectOption[] = []): string {
|
||||
const usedColors = new Set(existingOptions.map((o) => o.color))
|
||||
const available = FIELD_COLORS.filter((c) => !usedColors.has(c))
|
||||
if (available.length > 0) {
|
||||
return available[0]
|
||||
}
|
||||
return FIELD_COLORS[existingOptions.length % FIELD_COLORS.length]
|
||||
}
|
||||
|
||||
export class MetadataService {
|
||||
constructor(private client: typeof prisma = prisma) {}
|
||||
async syncSystemFields(): Promise<void> {
|
||||
@@ -43,7 +73,6 @@ export class MetadataService {
|
||||
scope: 'TEAM',
|
||||
teamId: teamId,
|
||||
config: req.config,
|
||||
aiAutofill: req.aiAutofill,
|
||||
description: req.description,
|
||||
},
|
||||
})
|
||||
@@ -89,7 +118,6 @@ export class MetadataService {
|
||||
where: { id: field.id },
|
||||
data: {
|
||||
config: req.config,
|
||||
aiAutofill: req.aiAutofill ?? field.aiAutofill,
|
||||
description: req.description ?? field.description,
|
||||
},
|
||||
})
|
||||
@@ -125,7 +153,6 @@ export class MetadataService {
|
||||
projectId: projectId,
|
||||
teamId: p.teamId,
|
||||
config: req.config,
|
||||
aiAutofill: req.aiAutofill,
|
||||
description: req.description,
|
||||
},
|
||||
})
|
||||
@@ -239,7 +266,6 @@ export class MetadataService {
|
||||
where: { id: field.id },
|
||||
data: {
|
||||
config: req.config,
|
||||
aiAutofill: req.aiAutofill ?? field.aiAutofill,
|
||||
description: req.description ?? field.description,
|
||||
},
|
||||
})
|
||||
@@ -262,84 +288,211 @@ export class MetadataService {
|
||||
assetId: string,
|
||||
reqs: UpdateAssetMetadataRequest[],
|
||||
allowReadOnly = false,
|
||||
): Promise<void> {
|
||||
await this.client.$transaction(async (tx) => {
|
||||
await this.updateAssetMetadataInternal(tx, assetId, reqs, allowReadOnly)
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Same as {@link updateAssetMetadata} but runs inside the caller's transaction,
|
||||
* keeping the metadata write atomic with the surrounding changes.
|
||||
*/
|
||||
async updateAssetMetadataInTx(
|
||||
tx: Prisma.TransactionClient,
|
||||
assetId: string,
|
||||
reqs: UpdateAssetMetadataRequest[],
|
||||
allowReadOnly = false,
|
||||
): Promise<void> {
|
||||
await this.updateAssetMetadataInternal(tx, assetId, reqs, allowReadOnly)
|
||||
}
|
||||
|
||||
private async resolveOrCreateOption(
|
||||
client: Prisma.TransactionClient | typeof prisma,
|
||||
field: Prisma.MetadataFieldGetPayload<Record<string, never>>,
|
||||
rawOption: unknown,
|
||||
): Promise<string> {
|
||||
if (
|
||||
typeof rawOption !== 'object' ||
|
||||
rawOption === null ||
|
||||
!('newOption' in rawOption) ||
|
||||
typeof (rawOption as { newOption?: unknown }).newOption !== 'object' ||
|
||||
(rawOption as { newOption?: unknown }).newOption === null
|
||||
) {
|
||||
throw new Error(`Invalid newOption object for field ${field.key}`)
|
||||
}
|
||||
|
||||
const value = (rawOption as { newOption: { value?: unknown } }).newOption.value
|
||||
if (typeof value !== 'string' || !value.trim()) {
|
||||
throw new Error(
|
||||
`Invalid newOption value for field ${field.key}: value must be a non-empty string`,
|
||||
)
|
||||
}
|
||||
|
||||
const trimmedValue = value.trim()
|
||||
const config = (field.config ?? {}) as PrismaJson.FieldConfig
|
||||
const isMulti = config.type === 'selectMulti'
|
||||
const existingOptions: PrismaJson.SelectOption[] =
|
||||
(isMulti ? config.selectMulti?.options : config.select?.options) ?? []
|
||||
|
||||
// 1. Check for case-insensitive match against existing options (id or displayName)
|
||||
const existing = existingOptions.find(
|
||||
(opt) =>
|
||||
opt.id.toLowerCase() === trimmedValue.toLowerCase() ||
|
||||
opt.displayName.toLowerCase() === trimmedValue.toLowerCase(),
|
||||
)
|
||||
if (existing) {
|
||||
return existing.id
|
||||
}
|
||||
|
||||
// 2. Generate slug id
|
||||
let baseId = trimmedValue.toLowerCase().replace(/\s+/g, '-')
|
||||
if (!baseId) {
|
||||
baseId = ulid().toLowerCase()
|
||||
}
|
||||
|
||||
let candidateId = baseId
|
||||
let suffix = 1
|
||||
while (existingOptions.some((opt) => opt.id === candidateId)) {
|
||||
candidateId = `${baseId}-${suffix}`
|
||||
suffix++
|
||||
}
|
||||
|
||||
const newOption: PrismaJson.SelectOption = {
|
||||
id: candidateId,
|
||||
displayName: trimmedValue,
|
||||
color: getNextOptionColor(existingOptions),
|
||||
}
|
||||
|
||||
const updatedOptions = [...existingOptions, newOption]
|
||||
const updatedConfig: PrismaJson.FieldConfig = {
|
||||
...config,
|
||||
name: config.name ?? field.key,
|
||||
type: config.type ?? (isMulti ? 'selectMulti' : 'select'),
|
||||
...(isMulti
|
||||
? { selectMulti: { ...(config.selectMulti ?? {}), options: updatedOptions } }
|
||||
: { select: { ...(config.select ?? {}), options: updatedOptions } }),
|
||||
}
|
||||
|
||||
await client.metadataField.update({
|
||||
where: { key: field.key },
|
||||
data: { config: updatedConfig },
|
||||
})
|
||||
|
||||
// Update in-memory field.config for subsequent iterations in the same transaction
|
||||
field.config = updatedConfig
|
||||
|
||||
return candidateId
|
||||
}
|
||||
|
||||
private async updateAssetMetadataInternal(
|
||||
client: Prisma.TransactionClient | typeof prisma,
|
||||
assetId: string,
|
||||
reqs: UpdateAssetMetadataRequest[],
|
||||
allowReadOnly: boolean,
|
||||
): Promise<void> {
|
||||
const resolvedAssetId = await assetService.resolveLatestVersionId(assetId)
|
||||
|
||||
await this.client.$transaction(async (tx) => {
|
||||
for (const req of reqs) {
|
||||
const field = await tx.metadataField.findUnique({
|
||||
where: { key: req.key },
|
||||
})
|
||||
if (field?.readOnly && !allowReadOnly) {
|
||||
throw new Error(`Field ${field.key} is read-only`)
|
||||
}
|
||||
|
||||
const value = req.value
|
||||
let stringValue: string | null = null
|
||||
let numberValue: number | null = null
|
||||
let booleanValue: boolean | null = null
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
let jsonValue: any = null
|
||||
let dateValue: Date | null = null
|
||||
|
||||
if (typeof value === 'string') {
|
||||
// Check if it's a valid ISO date string
|
||||
const date = new Date(value)
|
||||
if (!isNaN(date.getTime()) && value.includes('T') && value.includes('-')) {
|
||||
dateValue = date
|
||||
} else {
|
||||
stringValue = value
|
||||
}
|
||||
} else if (typeof value === 'number') {
|
||||
numberValue = value
|
||||
} else if (typeof value === 'boolean') {
|
||||
booleanValue = value
|
||||
} else if (value instanceof Date) {
|
||||
dateValue = value
|
||||
} else if (Array.isArray(value)) {
|
||||
jsonValue = value
|
||||
} else if (value === null) {
|
||||
// all null
|
||||
} else if (typeof value === 'object') {
|
||||
jsonValue = value
|
||||
} else {
|
||||
stringValue = String(value)
|
||||
}
|
||||
|
||||
await tx.assetMetadataValue.upsert({
|
||||
where: {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
assetId_fieldKey: {
|
||||
assetId: resolvedAssetId,
|
||||
fieldKey: req.key,
|
||||
},
|
||||
},
|
||||
create: {
|
||||
assetId: resolvedAssetId,
|
||||
fieldKey: req.key,
|
||||
stringValue,
|
||||
numberValue,
|
||||
booleanValue,
|
||||
jsonValue,
|
||||
dateValue,
|
||||
},
|
||||
update: {
|
||||
stringValue,
|
||||
numberValue,
|
||||
booleanValue,
|
||||
jsonValue,
|
||||
dateValue,
|
||||
},
|
||||
})
|
||||
for (const req of reqs) {
|
||||
const field = await client.metadataField.findUnique({
|
||||
where: { key: req.key },
|
||||
})
|
||||
if (field?.readOnly && !allowReadOnly) {
|
||||
throw new Error(`Field ${field.key} is read-only`)
|
||||
}
|
||||
|
||||
// Touch asset
|
||||
await tx.asset.update({
|
||||
where: { id: resolvedAssetId },
|
||||
data: {
|
||||
updatedAt: new Date(),
|
||||
let value = req.value
|
||||
const config = field?.config as PrismaJson.FieldConfig | null
|
||||
|
||||
if (
|
||||
field &&
|
||||
config?.type === 'select' &&
|
||||
typeof value === 'object' &&
|
||||
value !== null &&
|
||||
'newOption' in value
|
||||
) {
|
||||
value = await this.resolveOrCreateOption(client, field, value)
|
||||
} else if (field && config?.type === 'selectMulti' && Array.isArray(value)) {
|
||||
const resolvedList: string[] = []
|
||||
for (const item of value) {
|
||||
if (typeof item === 'object' && item !== null && 'newOption' in item) {
|
||||
const resolvedId = await this.resolveOrCreateOption(client, field, item)
|
||||
resolvedList.push(resolvedId)
|
||||
} else if (typeof item === 'string') {
|
||||
resolvedList.push(item)
|
||||
} else {
|
||||
throw new Error(
|
||||
`Invalid option value for field ${field.key}: expected string or {newOption}`,
|
||||
)
|
||||
}
|
||||
}
|
||||
value = resolvedList
|
||||
}
|
||||
|
||||
let stringValue: string | null = null
|
||||
let numberValue: number | null = null
|
||||
let booleanValue: boolean | null = null
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
let jsonValue: any = null
|
||||
let dateValue: Date | null = null
|
||||
|
||||
if (typeof value === 'string') {
|
||||
// Check if it's a valid ISO date string
|
||||
const date = new Date(value)
|
||||
if (!isNaN(date.getTime()) && value.includes('T') && value.includes('-')) {
|
||||
dateValue = date
|
||||
} else {
|
||||
stringValue = value
|
||||
}
|
||||
} else if (typeof value === 'number') {
|
||||
numberValue = value
|
||||
} else if (typeof value === 'boolean') {
|
||||
booleanValue = value
|
||||
} else if (value instanceof Date) {
|
||||
dateValue = value
|
||||
} else if (Array.isArray(value)) {
|
||||
jsonValue = value
|
||||
} else if (value === null) {
|
||||
// all null
|
||||
} else if (typeof value === 'object') {
|
||||
jsonValue = value
|
||||
} else {
|
||||
stringValue = String(value)
|
||||
}
|
||||
|
||||
await client.assetMetadataValue.upsert({
|
||||
where: {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
assetId_fieldKey: {
|
||||
assetId: resolvedAssetId,
|
||||
fieldKey: req.key,
|
||||
},
|
||||
},
|
||||
create: {
|
||||
assetId: resolvedAssetId,
|
||||
fieldKey: req.key,
|
||||
stringValue,
|
||||
numberValue,
|
||||
booleanValue,
|
||||
jsonValue,
|
||||
dateValue,
|
||||
},
|
||||
update: {
|
||||
stringValue,
|
||||
numberValue,
|
||||
booleanValue,
|
||||
jsonValue,
|
||||
dateValue,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
// Touch asset
|
||||
await client.asset.update({
|
||||
where: { id: resolvedAssetId },
|
||||
data: {
|
||||
updatedAt: new Date(),
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,31 +296,36 @@ describe('TeamService', () => {
|
||||
name: 'Settings Team',
|
||||
})
|
||||
|
||||
// Should have default settings
|
||||
// Should have default settings (networkSandboxEnabled is false by default for new teams)
|
||||
const settings = await teamService.getSandboxSettings(team.id)
|
||||
expect(settings.networkSandboxEnabled).toBe(false)
|
||||
expect(settings.allowedDomains).toContain('github.com')
|
||||
expect(settings.pendingDomains).toEqual([])
|
||||
|
||||
// Should update settings
|
||||
const updated = await teamService.updateSandboxSettings(team.id, {
|
||||
networkSandboxEnabled: true,
|
||||
allowedDomains: ['example.com'],
|
||||
pendingDomains: ['pending.com'],
|
||||
})
|
||||
expect(updated.networkSandboxEnabled).toBe(true)
|
||||
expect(updated.allowedDomains).toEqual(['example.com'])
|
||||
expect(updated.pendingDomains).toEqual(['pending.com'])
|
||||
|
||||
// Should persist to DB
|
||||
const persisted = await teamService.getSandboxSettings(team.id)
|
||||
expect(persisted.networkSandboxEnabled).toBe(true)
|
||||
expect(persisted.allowedDomains).toEqual(['example.com'])
|
||||
expect(persisted.pendingDomains).toEqual(['pending.com'])
|
||||
})
|
||||
|
||||
it('should return empty allowedDomains if sandbox is missing for old team', async () => {
|
||||
it('should return default settings if sandbox is missing for old team', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'Old Team' },
|
||||
})
|
||||
|
||||
const settings = await teamService.getSandboxSettings(team.id)
|
||||
expect(settings.networkSandboxEnabled).toBe(false)
|
||||
expect(settings.allowedDomains).toEqual([])
|
||||
expect(settings.pendingDomains).toEqual([])
|
||||
})
|
||||
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
GetMeResponse,
|
||||
UserInfo,
|
||||
SandboxSettings,
|
||||
UpdateSandboxSettingsRequest,
|
||||
} from '@shumai/dtos'
|
||||
|
||||
export class TeamService {
|
||||
@@ -330,25 +331,38 @@ export class TeamService {
|
||||
where: { teamId },
|
||||
})
|
||||
return {
|
||||
networkSandboxEnabled: sandbox?.networkSandboxEnabled ?? false,
|
||||
allowedDomains: sandbox?.allowedDomains || [],
|
||||
pendingDomains: sandbox?.pendingDomains || [],
|
||||
}
|
||||
}
|
||||
|
||||
async updateSandboxSettings(teamId: string, settings: SandboxSettings): Promise<SandboxSettings> {
|
||||
async updateSandboxSettings(
|
||||
teamId: string,
|
||||
settings: UpdateSandboxSettingsRequest,
|
||||
): Promise<SandboxSettings> {
|
||||
const sandbox = await prisma.sandbox.upsert({
|
||||
where: { teamId },
|
||||
create: {
|
||||
teamId,
|
||||
allowedDomains: settings.allowedDomains,
|
||||
pendingDomains: settings.pendingDomains,
|
||||
networkSandboxEnabled: settings.networkSandboxEnabled ?? false,
|
||||
allowedDomains: settings.allowedDomains ?? [],
|
||||
pendingDomains: settings.pendingDomains ?? [],
|
||||
},
|
||||
update: {
|
||||
allowedDomains: settings.allowedDomains,
|
||||
pendingDomains: settings.pendingDomains,
|
||||
...(settings.networkSandboxEnabled !== undefined && {
|
||||
networkSandboxEnabled: settings.networkSandboxEnabled,
|
||||
}),
|
||||
...(settings.allowedDomains !== undefined && {
|
||||
allowedDomains: settings.allowedDomains,
|
||||
}),
|
||||
...(settings.pendingDomains !== undefined && {
|
||||
pendingDomains: settings.pendingDomains,
|
||||
}),
|
||||
},
|
||||
})
|
||||
return {
|
||||
networkSandboxEnabled: sandbox.networkSandboxEnabled,
|
||||
allowedDomains: sandbox.allowedDomains,
|
||||
pendingDomains: sandbox.pendingDomains,
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { describe, it, expect, beforeEach } from 'vitest'
|
||||
import { prisma } from '@shumai/db'
|
||||
import { setupTestDbHooks } from '@shumai/db/test'
|
||||
import { VersionStackService } from './versionStack'
|
||||
import { assetService } from '../asset/asset'
|
||||
import { AssetType } from '@shumai/db'
|
||||
|
||||
describe('VersionStackService', () => {
|
||||
@@ -207,4 +208,299 @@ describe('VersionStackService', () => {
|
||||
expect(children.map((c) => c.id).includes(file3.id)).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('removeVersionFromStack', () => {
|
||||
it('removes a version from a 3-version stack and turns it into a standalone file adjacent to the stack', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team' } })
|
||||
const proj = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const user = await prisma.user.create({
|
||||
data: { name: 'Test User', email: `test-${Date.now()}@example.com` },
|
||||
})
|
||||
const root = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'root',
|
||||
type: AssetType.folder,
|
||||
status: 'uploaded',
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
},
|
||||
})
|
||||
const parent = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Parent Folder',
|
||||
type: AssetType.folder,
|
||||
projectId: proj.id,
|
||||
parentId: root.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
fileCount: 3,
|
||||
},
|
||||
})
|
||||
|
||||
const file1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'file1.txt',
|
||||
type: AssetType.file,
|
||||
parentId: parent.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
sortIndex: 'a0',
|
||||
},
|
||||
})
|
||||
const file2 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'file2.txt',
|
||||
type: AssetType.file,
|
||||
parentId: parent.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 200,
|
||||
},
|
||||
})
|
||||
const file3 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'file3.txt',
|
||||
type: AssetType.file,
|
||||
parentId: parent.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 300,
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await service.createVersionStack({
|
||||
fileIds: [file1.id, file2.id, file3.id],
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
})
|
||||
|
||||
// Stack should have 3 versions
|
||||
expect(stack.fileCount).toBe(3)
|
||||
expect(Number(stack.sizeByte)).toBe(600)
|
||||
|
||||
// Parent fileCount should be 1 (the stack)
|
||||
const parentBefore = await prisma.asset.findUnique({ where: { id: parent.id } })
|
||||
expect(parentBefore?.fileCount).toBe(1)
|
||||
|
||||
// Remove file2 from stack
|
||||
await service.removeVersionFromStack({
|
||||
stackId: stack.id,
|
||||
fileId: file2.id,
|
||||
})
|
||||
|
||||
// File2 should now be in parent folder
|
||||
const updatedFile2 = await prisma.asset.findUnique({ where: { id: file2.id } })
|
||||
expect(updatedFile2?.parentId).toBe(parent.id)
|
||||
expect(updatedFile2?.sortIndex).toBeDefined()
|
||||
expect(updatedFile2!.sortIndex! > stack.sortIndex!).toBe(true)
|
||||
|
||||
// Parent fileCount should be 2 (stack + file2)
|
||||
const updatedParent = await prisma.asset.findUnique({ where: { id: parent.id } })
|
||||
expect(updatedParent?.fileCount).toBe(2)
|
||||
|
||||
// Stack should still exist with 2 versions (file1 and file3)
|
||||
const updatedStack = await prisma.asset.findUnique({ where: { id: stack.id } })
|
||||
expect(updatedStack).toBeDefined()
|
||||
expect(updatedStack?.fileCount).toBe(2)
|
||||
expect(Number(updatedStack?.sizeByte)).toBe(400)
|
||||
|
||||
const remainingChildren = await prisma.asset.findMany({
|
||||
where: { parentId: stack.id },
|
||||
})
|
||||
expect(remainingChildren).toHaveLength(2)
|
||||
expect(remainingChildren.map((c) => c.id).sort()).toEqual([file1.id, file3.id].sort())
|
||||
})
|
||||
|
||||
it('dissolves the version stack when removing down to 1 remaining version', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team' } })
|
||||
const proj = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const user = await prisma.user.create({
|
||||
data: { name: 'Test User', email: `test-${Date.now()}@example.com` },
|
||||
})
|
||||
const root = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'root',
|
||||
type: AssetType.folder,
|
||||
status: 'uploaded',
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
},
|
||||
})
|
||||
const parent = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'Parent Folder',
|
||||
type: AssetType.folder,
|
||||
projectId: proj.id,
|
||||
parentId: root.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
fileCount: 2,
|
||||
},
|
||||
})
|
||||
|
||||
const file1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'file1.txt',
|
||||
type: AssetType.file,
|
||||
parentId: parent.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
sortIndex: 'a0',
|
||||
},
|
||||
})
|
||||
const file2 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'file2.txt',
|
||||
type: AssetType.file,
|
||||
parentId: parent.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 200,
|
||||
},
|
||||
})
|
||||
|
||||
const stack = await service.createVersionStack({
|
||||
fileIds: [file1.id, file2.id],
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
})
|
||||
|
||||
// Remove file2 from stack
|
||||
await service.removeVersionFromStack({
|
||||
stackId: stack.id,
|
||||
fileId: file2.id,
|
||||
})
|
||||
|
||||
// Stack asset should be deleted
|
||||
const deletedStack = await prisma.asset.findUnique({ where: { id: stack.id } })
|
||||
expect(deletedStack).toBeNull()
|
||||
|
||||
// File1 should now be in parent folder and inherited stack's sortIndex
|
||||
const updatedFile1 = await prisma.asset.findUnique({ where: { id: file1.id } })
|
||||
expect(updatedFile1?.parentId).toBe(parent.id)
|
||||
expect(updatedFile1?.sortIndex).toBe('a0')
|
||||
|
||||
// File2 should also be in parent folder
|
||||
const updatedFile2 = await prisma.asset.findUnique({ where: { id: file2.id } })
|
||||
expect(updatedFile2?.parentId).toBe(parent.id)
|
||||
|
||||
// Parent fileCount should be 2
|
||||
const updatedParent = await prisma.asset.findUnique({ where: { id: parent.id } })
|
||||
expect(updatedParent?.fileCount).toBe(2)
|
||||
})
|
||||
|
||||
it('updates share link symlinks when normal asset becomes version stack and when stack dissolves back to normal asset', async () => {
|
||||
const team = await prisma.team.create({ data: { name: 'Test Team' } })
|
||||
const proj = await prisma.project.create({
|
||||
data: { name: 'Test Project', teamId: team.id },
|
||||
})
|
||||
const user = await prisma.user.create({
|
||||
data: { name: 'Test User', email: `test-${Date.now()}@example.com` },
|
||||
})
|
||||
const root = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'root',
|
||||
type: AssetType.folder,
|
||||
status: 'uploaded',
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
},
|
||||
})
|
||||
const shareRoot = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'share-root',
|
||||
type: AssetType.share_root,
|
||||
status: 'uploaded',
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
fileCount: 0,
|
||||
},
|
||||
})
|
||||
const shareLink = await prisma.shareLink.create({
|
||||
data: {
|
||||
name: 'My Share',
|
||||
projectId: proj.id,
|
||||
rootFolderId: shareRoot.id,
|
||||
creatorId: user.id,
|
||||
},
|
||||
})
|
||||
|
||||
const file1 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'file1.txt',
|
||||
type: AssetType.file,
|
||||
parentId: root.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 100,
|
||||
},
|
||||
})
|
||||
const file2 = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'file2.txt',
|
||||
type: AssetType.file,
|
||||
parentId: root.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
sizeByte: 200,
|
||||
},
|
||||
})
|
||||
|
||||
// Add file1 to share link (create symlink)
|
||||
const symlink = await prisma.asset.create({
|
||||
data: {
|
||||
name: file1.name,
|
||||
type: AssetType.symlink,
|
||||
parentId: shareLink.rootFolderId,
|
||||
targetId: file1.id,
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
status: 'uploaded',
|
||||
},
|
||||
})
|
||||
|
||||
// 1. Group file1 and file2 into a version stack
|
||||
const stack = await service.createVersionStack({
|
||||
fileIds: [file1.id, file2.id],
|
||||
projectId: proj.id,
|
||||
creatorId: user.id,
|
||||
})
|
||||
|
||||
// Symlink in share link should now point to stack.id
|
||||
const symlinkAfterStack = await prisma.asset.findUnique({ where: { id: symlink.id } })
|
||||
expect(symlinkAfterStack?.targetId).toBe(stack.id)
|
||||
|
||||
// 2. Remove file2 from stack -> stack dissolves -> only file1 remains
|
||||
await service.removeVersionFromStack({
|
||||
stackId: stack.id,
|
||||
fileId: file2.id,
|
||||
})
|
||||
|
||||
// Symlink in share link should now point directly to file1.id and have file1's name
|
||||
const symlinkAfterDissolve = await prisma.asset.findUnique({ where: { id: symlink.id } })
|
||||
expect(symlinkAfterDissolve?.targetId).toBe(file1.id)
|
||||
expect(symlinkAfterDissolve?.name).toBe(file1.name)
|
||||
|
||||
// Listing share link files returns file1 with correct name
|
||||
const shareFiles = await assetService.listChildren({
|
||||
assetId: shareLink.rootFolderId,
|
||||
assetType: AssetType.file,
|
||||
})
|
||||
expect(shareFiles.data).toHaveLength(1)
|
||||
expect(shareFiles.data[0].name).toBe(file1.name)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
import { generateKeyBetween } from 'jittered-fractional-indexing'
|
||||
import { prisma } from '@shumai/db'
|
||||
import { type Asset, AssetType } from '@shumai/db'
|
||||
import { ChangeStackFileVersionParams, CreateVersionStackParams } from '@shumai/dtos'
|
||||
import {
|
||||
ChangeStackFileVersionParams,
|
||||
CreateVersionStackParams,
|
||||
RemoveStackVersionParams,
|
||||
} from '@shumai/dtos'
|
||||
import { dedupeSymlinksToTarget } from '../asset/symlink'
|
||||
|
||||
function generateSortIndex(previous?: string | null): string {
|
||||
if (!previous) return generateKeyBetween(null, null)
|
||||
@@ -95,6 +100,9 @@ export class VersionStackService {
|
||||
},
|
||||
})
|
||||
|
||||
// Update existing symlinks pointing to any of the stacked files
|
||||
await dedupeSymlinksToTarget(tx, { targetIds: fileIds, newTargetId: stack.id })
|
||||
|
||||
return stack
|
||||
})
|
||||
}
|
||||
@@ -127,7 +135,7 @@ export class VersionStackService {
|
||||
|
||||
if (beforeId === '-1') {
|
||||
const lastFile = await tx.asset.findFirst({
|
||||
where: { parentId: stackId },
|
||||
where: { parentId: stackId, id: { not: fileId } },
|
||||
orderBy: { sortIndex: 'desc' },
|
||||
})
|
||||
newSortIndex = generateKeyBetween(lastFile?.sortIndex || null, null)
|
||||
@@ -145,6 +153,7 @@ export class VersionStackService {
|
||||
const prevFile = await tx.asset.findFirst({
|
||||
where: {
|
||||
parentId: stackId,
|
||||
id: { not: fileId },
|
||||
sortIndex: {
|
||||
lt: beforeFile.sortIndex!,
|
||||
},
|
||||
@@ -168,6 +177,123 @@ export class VersionStackService {
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
async removeVersionFromStack(params: RemoveStackVersionParams): Promise<void> {
|
||||
const { stackId, fileId } = params
|
||||
|
||||
await this.prismaClient.$transaction(async (tx) => {
|
||||
const stack = await tx.asset.findUnique({
|
||||
where: { id: stackId },
|
||||
})
|
||||
if (!stack) {
|
||||
throw new Error('stack not found')
|
||||
}
|
||||
if (stack.type !== AssetType.version_stack) {
|
||||
throw new Error('asset is not a version stack')
|
||||
}
|
||||
if (!stack.parentId) {
|
||||
throw new Error('stack has no parent')
|
||||
}
|
||||
|
||||
const fileToRemove = await tx.asset.findUnique({
|
||||
where: { id: fileId },
|
||||
})
|
||||
if (!fileToRemove) {
|
||||
throw new Error('file not found')
|
||||
}
|
||||
if (fileToRemove.parentId !== stackId) {
|
||||
throw new Error('file is not in the stack')
|
||||
}
|
||||
|
||||
// Find next sibling in parent folder after the stack to insert the removed file adjacent to the stack
|
||||
const nextSibling = await tx.asset.findFirst({
|
||||
where: {
|
||||
parentId: stack.parentId,
|
||||
id: { not: stack.id },
|
||||
sortIndex: {
|
||||
gt: stack.sortIndex || '',
|
||||
},
|
||||
},
|
||||
orderBy: { sortIndex: 'asc' },
|
||||
})
|
||||
|
||||
let newSortIndex: string
|
||||
try {
|
||||
newSortIndex = generateKeyBetween(stack.sortIndex || null, nextSibling?.sortIndex || null)
|
||||
} catch {
|
||||
newSortIndex = generateKeyBetween(null, null)
|
||||
}
|
||||
|
||||
await tx.asset.update({
|
||||
where: { id: fileId },
|
||||
data: {
|
||||
parentId: stack.parentId,
|
||||
sortIndex: newSortIndex,
|
||||
},
|
||||
})
|
||||
|
||||
// Increment parent folder fileCount for the newly standalone file
|
||||
await tx.asset.update({
|
||||
where: { id: stack.parentId },
|
||||
data: {
|
||||
fileCount: { increment: 1 },
|
||||
},
|
||||
})
|
||||
|
||||
// Remaining files in stack
|
||||
const remainingFiles = await tx.asset.findMany({
|
||||
where: { parentId: stackId, isDeleted: false, id: { not: fileId } },
|
||||
orderBy: { sortIndex: 'asc' },
|
||||
})
|
||||
|
||||
if (remainingFiles.length > 1) {
|
||||
let totalSize = 0
|
||||
for (const f of remainingFiles) {
|
||||
totalSize += Number(f.sizeByte)
|
||||
}
|
||||
await tx.asset.update({
|
||||
where: { id: stack.id },
|
||||
data: {
|
||||
fileCount: remainingFiles.length,
|
||||
sizeByte: totalSize,
|
||||
},
|
||||
})
|
||||
} else if (remainingFiles.length === 1) {
|
||||
const lastChild = remainingFiles[0]
|
||||
|
||||
// Update symlinks pointing to stack.id to point to the single remaining child
|
||||
await tx.asset.updateMany({
|
||||
where: { targetId: stack.id, type: AssetType.symlink },
|
||||
data: { targetId: lastChild.id, name: lastChild.name },
|
||||
})
|
||||
|
||||
// Reparent the single remaining child to stack.parentId, keeping stack's sortIndex
|
||||
await tx.asset.update({
|
||||
where: { id: lastChild.id },
|
||||
data: {
|
||||
parentId: stack.parentId,
|
||||
sortIndex: stack.sortIndex,
|
||||
},
|
||||
})
|
||||
|
||||
// Delete the stack asset (parent folder file count is unchanged: -1 stack, +1 remaining child)
|
||||
await tx.asset.delete({
|
||||
where: { id: stack.id },
|
||||
})
|
||||
} else {
|
||||
await tx.asset.deleteMany({
|
||||
where: { targetId: stack.id, type: AssetType.symlink },
|
||||
})
|
||||
await tx.asset.delete({
|
||||
where: { id: stack.id },
|
||||
})
|
||||
await tx.asset.update({
|
||||
where: { id: stack.parentId },
|
||||
data: { fileCount: { decrement: 1 } },
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export const versionStackService = new VersionStackService()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/db",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
-- Backfill autofillSource in config JSON where ai_autofill is true
|
||||
UPDATE "metadata_fields"
|
||||
SET "config" = jsonb_set(COALESCE("config", '{}'::jsonb), '{autofillSource}', '"CONTENT"')
|
||||
WHERE "ai_autofill" = true;
|
||||
|
||||
UPDATE "metadata_fields"
|
||||
SET "config" = jsonb_set(COALESCE("config", '{}'::jsonb), '{autofillSource}', '"NONE"')
|
||||
WHERE "ai_autofill" = false OR "ai_autofill" IS NULL;
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
/*
|
||||
Warnings:
|
||||
|
||||
- You are about to drop the column `autofill_context` on the `assets` table. All the data in the column will be lost.
|
||||
- You are about to drop the column `ai_autofill` on the `metadata_fields` table. All the data in the column will be lost.
|
||||
|
||||
*/
|
||||
-- AlterTable
|
||||
ALTER TABLE "assets" DROP COLUMN "autofill_context";
|
||||
|
||||
-- AlterTable
|
||||
ALTER TABLE "metadata_fields" DROP COLUMN "ai_autofill";
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "sandboxes" ADD COLUMN "network_sandbox_enabled" BOOLEAN NOT NULL DEFAULT false;
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
-- Data migration: set network_sandbox_enabled to true for existing legacy sandbox records
|
||||
UPDATE "sandboxes" SET "network_sandbox_enabled" = true;
|
||||
@@ -0,0 +1,2 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "assets" ADD COLUMN "agentmd" TEXT;
|
||||
@@ -0,0 +1,21 @@
|
||||
/*
|
||||
Warnings:
|
||||
|
||||
- You are about to drop the column `agentmd` on the `assets` table. All the data in the column will be lost.
|
||||
|
||||
*/
|
||||
-- AlterTable
|
||||
ALTER TABLE "assets" DROP COLUMN "agentmd";
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "asset_agentmd" (
|
||||
"asset_id" TEXT NOT NULL,
|
||||
"content" TEXT NOT NULL,
|
||||
"created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
"updated_at" TIMESTAMP(3) NOT NULL,
|
||||
|
||||
CONSTRAINT "asset_agentmd_pkey" PRIMARY KEY ("asset_id")
|
||||
);
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "asset_agentmd" ADD CONSTRAINT "asset_agentmd_asset_id_fkey" FOREIGN KEY ("asset_id") REFERENCES "assets"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
@@ -263,11 +263,12 @@ model Team {
|
||||
}
|
||||
|
||||
model Sandbox {
|
||||
id String @id @default(ulid())
|
||||
allowedDomains String[] @default(["npmjs.org", "*.npmjs.org", "registry.npmjs.org", "registry.yarnpkg.com", "pypi.org", "*.pypi.org", "github.com", "*.github.com", "api.github.com", "raw.githubusercontent.com"])
|
||||
pendingDomains String[] @default([]) @map("pending_domains")
|
||||
createdAt DateTime @default(now()) @map("created_at")
|
||||
updatedAt DateTime @updatedAt @map("updated_at")
|
||||
id String @id @default(ulid())
|
||||
networkSandboxEnabled Boolean @default(false) @map("network_sandbox_enabled")
|
||||
allowedDomains String[] @default(["npmjs.org", "*.npmjs.org", "registry.npmjs.org", "registry.yarnpkg.com", "pypi.org", "*.pypi.org", "github.com", "*.github.com", "api.github.com", "raw.githubusercontent.com"])
|
||||
pendingDomains String[] @default([]) @map("pending_domains")
|
||||
createdAt DateTime @default(now()) @map("created_at")
|
||||
updatedAt DateTime @updatedAt @map("updated_at")
|
||||
|
||||
teamId String @unique @map("team_id")
|
||||
team Team @relation("TeamToSandbox", fields: [teamId], references: [id], onDelete: Cascade)
|
||||
@@ -450,7 +451,6 @@ model Asset {
|
||||
transcodeTaskId String? @map("transcode_task_id")
|
||||
/// [MediaInfo]
|
||||
media Json?
|
||||
autofillContext String? @map("autofill_context")
|
||||
isDeleted Boolean @default(false) @map("is_deleted")
|
||||
deletedAt DateTime? @map("deleted_at")
|
||||
sortIndex String? @map("sort_index")
|
||||
@@ -490,6 +490,7 @@ model Asset {
|
||||
shareLinkRootFolder ShareLink? @relation("ShareLinkToRootFolder")
|
||||
agentSessions AgentSession[] @relation("AssetToAgentSession")
|
||||
watermarkFiles WatermarkFile[] @relation("AssetToWatermarkFile")
|
||||
agentMd AssetAgentMd? @relation("AssetToAgentMd")
|
||||
|
||||
@@map("assets")
|
||||
@@index([type])
|
||||
@@ -537,6 +538,17 @@ model AssetMetadataValue {
|
||||
@@map("asset_metadata_values")
|
||||
}
|
||||
|
||||
model AssetAgentMd {
|
||||
assetId String @id @map("asset_id")
|
||||
content String @db.Text
|
||||
createdAt DateTime @default(now()) @map("created_at")
|
||||
updatedAt DateTime @updatedAt @map("updated_at")
|
||||
|
||||
asset Asset @relation("AssetToAgentMd", fields: [assetId], references: [id], onDelete: Cascade)
|
||||
|
||||
@@map("asset_agentmd")
|
||||
}
|
||||
|
||||
model AssetComment {
|
||||
id String @id @default(ulid())
|
||||
message String?
|
||||
@@ -622,9 +634,8 @@ model MetadataField {
|
||||
scope MetadataFieldScope?
|
||||
/// [FieldConfig]
|
||||
config Json?
|
||||
readOnly Boolean @default(false) @map("read_only")
|
||||
aiAutofill Boolean @default(false) @map("ai_autofill")
|
||||
description String @default("")
|
||||
readOnly Boolean @default(false) @map("read_only")
|
||||
description String @default("")
|
||||
|
||||
teamId String? @map("team_id")
|
||||
team Team? @relation("TeamToMetadataField", fields: [teamId], references: [id])
|
||||
|
||||
+5
@@ -107,6 +107,11 @@ export type StorageKey = Prisma.StorageKeyModel
|
||||
*
|
||||
*/
|
||||
export type AssetMetadataValue = Prisma.AssetMetadataValueModel
|
||||
/**
|
||||
* Model AssetAgentMd
|
||||
*
|
||||
*/
|
||||
export type AssetAgentMd = Prisma.AssetAgentMdModel
|
||||
/**
|
||||
* Model AssetComment
|
||||
*
|
||||
|
||||
+5
@@ -131,6 +131,11 @@ export type StorageKey = Prisma.StorageKeyModel
|
||||
*
|
||||
*/
|
||||
export type AssetMetadataValue = Prisma.AssetMetadataValueModel
|
||||
/**
|
||||
* Model AssetAgentMd
|
||||
*
|
||||
*/
|
||||
export type AssetAgentMd = Prisma.AssetAgentMdModel
|
||||
/**
|
||||
* Model AssetComment
|
||||
*
|
||||
|
||||
+14
-4
File diff suppressed because one or more lines are too long
+88
-3
@@ -402,6 +402,7 @@ export const ModelName = {
|
||||
Asset: 'Asset',
|
||||
StorageKey: 'StorageKey',
|
||||
AssetMetadataValue: 'AssetMetadataValue',
|
||||
AssetAgentMd: 'AssetAgentMd',
|
||||
AssetComment: 'AssetComment',
|
||||
AssetCommentAttachment: 'AssetCommentAttachment',
|
||||
AssetEmbedding: 'AssetEmbedding',
|
||||
@@ -440,7 +441,7 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
|
||||
omit: GlobalOmitOptions
|
||||
}
|
||||
meta: {
|
||||
modelProps: "user" | "session" | "account" | "verification" | "authToken" | "team" | "sandbox" | "skill" | "teamMember" | "project" | "projectMember" | "shareLink" | "watermarkConfig" | "watermarkTemplate" | "watermarkFile" | "asset" | "storageKey" | "assetMetadataValue" | "assetComment" | "assetCommentAttachment" | "assetEmbedding" | "invite" | "metadataField" | "notification" | "systemSettings" | "task" | "workflowTask" | "agent" | "agentSkill" | "mcpServer" | "agentMcpServer" | "mcpServerCredential" | "agentSession" | "agentSessionEntry" | "userMetadata" | "model" | "provider" | "collection" | "apiToken" | "aiUsage" | "auditLog"
|
||||
modelProps: "user" | "session" | "account" | "verification" | "authToken" | "team" | "sandbox" | "skill" | "teamMember" | "project" | "projectMember" | "shareLink" | "watermarkConfig" | "watermarkTemplate" | "watermarkFile" | "asset" | "storageKey" | "assetMetadataValue" | "assetAgentMd" | "assetComment" | "assetCommentAttachment" | "assetEmbedding" | "invite" | "metadataField" | "notification" | "systemSettings" | "task" | "workflowTask" | "agent" | "agentSkill" | "mcpServer" | "agentMcpServer" | "mcpServerCredential" | "agentSession" | "agentSessionEntry" | "userMetadata" | "model" | "provider" | "collection" | "apiToken" | "aiUsage" | "auditLog"
|
||||
txIsolationLevel: TransactionIsolationLevel
|
||||
}
|
||||
model: {
|
||||
@@ -1776,6 +1777,80 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
|
||||
}
|
||||
}
|
||||
}
|
||||
AssetAgentMd: {
|
||||
payload: Prisma.$AssetAgentMdPayload<ExtArgs>
|
||||
fields: Prisma.AssetAgentMdFieldRefs
|
||||
operations: {
|
||||
findUnique: {
|
||||
args: Prisma.AssetAgentMdFindUniqueArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload> | null
|
||||
}
|
||||
findUniqueOrThrow: {
|
||||
args: Prisma.AssetAgentMdFindUniqueOrThrowArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>
|
||||
}
|
||||
findFirst: {
|
||||
args: Prisma.AssetAgentMdFindFirstArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload> | null
|
||||
}
|
||||
findFirstOrThrow: {
|
||||
args: Prisma.AssetAgentMdFindFirstOrThrowArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>
|
||||
}
|
||||
findMany: {
|
||||
args: Prisma.AssetAgentMdFindManyArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>[]
|
||||
}
|
||||
create: {
|
||||
args: Prisma.AssetAgentMdCreateArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>
|
||||
}
|
||||
createMany: {
|
||||
args: Prisma.AssetAgentMdCreateManyArgs<ExtArgs>
|
||||
result: BatchPayload
|
||||
}
|
||||
createManyAndReturn: {
|
||||
args: Prisma.AssetAgentMdCreateManyAndReturnArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>[]
|
||||
}
|
||||
delete: {
|
||||
args: Prisma.AssetAgentMdDeleteArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>
|
||||
}
|
||||
update: {
|
||||
args: Prisma.AssetAgentMdUpdateArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>
|
||||
}
|
||||
deleteMany: {
|
||||
args: Prisma.AssetAgentMdDeleteManyArgs<ExtArgs>
|
||||
result: BatchPayload
|
||||
}
|
||||
updateMany: {
|
||||
args: Prisma.AssetAgentMdUpdateManyArgs<ExtArgs>
|
||||
result: BatchPayload
|
||||
}
|
||||
updateManyAndReturn: {
|
||||
args: Prisma.AssetAgentMdUpdateManyAndReturnArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>[]
|
||||
}
|
||||
upsert: {
|
||||
args: Prisma.AssetAgentMdUpsertArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.PayloadToResult<Prisma.$AssetAgentMdPayload>
|
||||
}
|
||||
aggregate: {
|
||||
args: Prisma.AssetAgentMdAggregateArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.Optional<Prisma.AggregateAssetAgentMd>
|
||||
}
|
||||
groupBy: {
|
||||
args: Prisma.AssetAgentMdGroupByArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.Optional<Prisma.AssetAgentMdGroupByOutputType>[]
|
||||
}
|
||||
count: {
|
||||
args: Prisma.AssetAgentMdCountArgs<ExtArgs>
|
||||
result: runtime.Types.Utils.Optional<Prisma.AssetAgentMdCountAggregateOutputType> | number
|
||||
}
|
||||
}
|
||||
}
|
||||
AssetComment: {
|
||||
payload: Prisma.$AssetCommentPayload<ExtArgs>
|
||||
fields: Prisma.AssetCommentFieldRefs
|
||||
@@ -3605,6 +3680,7 @@ export type TeamScalarFieldEnum = (typeof TeamScalarFieldEnum)[keyof typeof Team
|
||||
|
||||
export const SandboxScalarFieldEnum = {
|
||||
id: 'id',
|
||||
networkSandboxEnabled: 'networkSandboxEnabled',
|
||||
allowedDomains: 'allowedDomains',
|
||||
pendingDomains: 'pendingDomains',
|
||||
createdAt: 'createdAt',
|
||||
@@ -3738,7 +3814,6 @@ export const AssetScalarFieldEnum = {
|
||||
status: 'status',
|
||||
transcodeTaskId: 'transcodeTaskId',
|
||||
media: 'media',
|
||||
autofillContext: 'autofillContext',
|
||||
isDeleted: 'isDeleted',
|
||||
deletedAt: 'deletedAt',
|
||||
sortIndex: 'sortIndex',
|
||||
@@ -3780,6 +3855,16 @@ export const AssetMetadataValueScalarFieldEnum = {
|
||||
export type AssetMetadataValueScalarFieldEnum = (typeof AssetMetadataValueScalarFieldEnum)[keyof typeof AssetMetadataValueScalarFieldEnum]
|
||||
|
||||
|
||||
export const AssetAgentMdScalarFieldEnum = {
|
||||
assetId: 'assetId',
|
||||
content: 'content',
|
||||
createdAt: 'createdAt',
|
||||
updatedAt: 'updatedAt'
|
||||
} as const
|
||||
|
||||
export type AssetAgentMdScalarFieldEnum = (typeof AssetAgentMdScalarFieldEnum)[keyof typeof AssetAgentMdScalarFieldEnum]
|
||||
|
||||
|
||||
export const AssetCommentScalarFieldEnum = {
|
||||
id: 'id',
|
||||
message: 'message',
|
||||
@@ -3842,7 +3927,6 @@ export const MetadataFieldScalarFieldEnum = {
|
||||
scope: 'scope',
|
||||
config: 'config',
|
||||
readOnly: 'readOnly',
|
||||
aiAutofill: 'aiAutofill',
|
||||
description: 'description',
|
||||
teamId: 'teamId',
|
||||
projectId: 'projectId'
|
||||
@@ -4653,6 +4737,7 @@ export type GlobalOmitConfig = {
|
||||
asset?: Prisma.AssetOmit
|
||||
storageKey?: Prisma.StorageKeyOmit
|
||||
assetMetadataValue?: Prisma.AssetMetadataValueOmit
|
||||
assetAgentMd?: Prisma.AssetAgentMdOmit
|
||||
assetComment?: Prisma.AssetCommentOmit
|
||||
assetCommentAttachment?: Prisma.AssetCommentAttachmentOmit
|
||||
assetEmbedding?: Prisma.AssetEmbeddingOmit
|
||||
|
||||
@@ -69,6 +69,7 @@ export const ModelName = {
|
||||
Asset: 'Asset',
|
||||
StorageKey: 'StorageKey',
|
||||
AssetMetadataValue: 'AssetMetadataValue',
|
||||
AssetAgentMd: 'AssetAgentMd',
|
||||
AssetComment: 'AssetComment',
|
||||
AssetCommentAttachment: 'AssetCommentAttachment',
|
||||
AssetEmbedding: 'AssetEmbedding',
|
||||
@@ -198,6 +199,7 @@ export type TeamScalarFieldEnum = (typeof TeamScalarFieldEnum)[keyof typeof Team
|
||||
|
||||
export const SandboxScalarFieldEnum = {
|
||||
id: 'id',
|
||||
networkSandboxEnabled: 'networkSandboxEnabled',
|
||||
allowedDomains: 'allowedDomains',
|
||||
pendingDomains: 'pendingDomains',
|
||||
createdAt: 'createdAt',
|
||||
@@ -331,7 +333,6 @@ export const AssetScalarFieldEnum = {
|
||||
status: 'status',
|
||||
transcodeTaskId: 'transcodeTaskId',
|
||||
media: 'media',
|
||||
autofillContext: 'autofillContext',
|
||||
isDeleted: 'isDeleted',
|
||||
deletedAt: 'deletedAt',
|
||||
sortIndex: 'sortIndex',
|
||||
@@ -373,6 +374,16 @@ export const AssetMetadataValueScalarFieldEnum = {
|
||||
export type AssetMetadataValueScalarFieldEnum = (typeof AssetMetadataValueScalarFieldEnum)[keyof typeof AssetMetadataValueScalarFieldEnum]
|
||||
|
||||
|
||||
export const AssetAgentMdScalarFieldEnum = {
|
||||
assetId: 'assetId',
|
||||
content: 'content',
|
||||
createdAt: 'createdAt',
|
||||
updatedAt: 'updatedAt'
|
||||
} as const
|
||||
|
||||
export type AssetAgentMdScalarFieldEnum = (typeof AssetAgentMdScalarFieldEnum)[keyof typeof AssetAgentMdScalarFieldEnum]
|
||||
|
||||
|
||||
export const AssetCommentScalarFieldEnum = {
|
||||
id: 'id',
|
||||
message: 'message',
|
||||
@@ -435,7 +446,6 @@ export const MetadataFieldScalarFieldEnum = {
|
||||
scope: 'scope',
|
||||
config: 'config',
|
||||
readOnly: 'readOnly',
|
||||
aiAutofill: 'aiAutofill',
|
||||
description: 'description',
|
||||
teamId: 'teamId',
|
||||
projectId: 'projectId'
|
||||
|
||||
+1
@@ -26,6 +26,7 @@ export type * from './models/WatermarkFile.ts'
|
||||
export type * from './models/Asset.ts'
|
||||
export type * from './models/StorageKey.ts'
|
||||
export type * from './models/AssetMetadataValue.ts'
|
||||
export type * from './models/AssetAgentMd.ts'
|
||||
export type * from './models/AssetComment.ts'
|
||||
export type * from './models/AssetCommentAttachment.ts'
|
||||
export type * from './models/AssetEmbedding.ts'
|
||||
|
||||
+285
-118
File diff suppressed because it is too large
Load Diff
+1265
File diff suppressed because it is too large
Load Diff
+1
-42
@@ -31,7 +31,6 @@ export type MetadataFieldMinAggregateOutputType = {
|
||||
key: string | null
|
||||
scope: $Enums.MetadataFieldScope | null
|
||||
readOnly: boolean | null
|
||||
aiAutofill: boolean | null
|
||||
description: string | null
|
||||
teamId: string | null
|
||||
projectId: string | null
|
||||
@@ -42,7 +41,6 @@ export type MetadataFieldMaxAggregateOutputType = {
|
||||
key: string | null
|
||||
scope: $Enums.MetadataFieldScope | null
|
||||
readOnly: boolean | null
|
||||
aiAutofill: boolean | null
|
||||
description: string | null
|
||||
teamId: string | null
|
||||
projectId: string | null
|
||||
@@ -54,7 +52,6 @@ export type MetadataFieldCountAggregateOutputType = {
|
||||
scope: number
|
||||
config:PrismaJson.FieldConfig
|
||||
readOnly: number
|
||||
aiAutofill: number
|
||||
description: number
|
||||
teamId: number
|
||||
projectId: number
|
||||
@@ -67,7 +64,6 @@ export type MetadataFieldMinAggregateInputType = {
|
||||
key?: true
|
||||
scope?: true
|
||||
readOnly?: true
|
||||
aiAutofill?: true
|
||||
description?: true
|
||||
teamId?: true
|
||||
projectId?: true
|
||||
@@ -78,7 +74,6 @@ export type MetadataFieldMaxAggregateInputType = {
|
||||
key?: true
|
||||
scope?: true
|
||||
readOnly?: true
|
||||
aiAutofill?: true
|
||||
description?: true
|
||||
teamId?: true
|
||||
projectId?: true
|
||||
@@ -90,7 +85,6 @@ export type MetadataFieldCountAggregateInputType = {
|
||||
scope?: true
|
||||
config?: true
|
||||
readOnly?: true
|
||||
aiAutofill?: true
|
||||
description?: true
|
||||
teamId?: true
|
||||
projectId?: true
|
||||
@@ -175,7 +169,6 @@ export type MetadataFieldGroupByOutputType = {
|
||||
scope: $Enums.MetadataFieldScope | null
|
||||
config:PrismaJson.FieldConfig | null
|
||||
readOnly: boolean
|
||||
aiAutofill: boolean
|
||||
description: string
|
||||
teamId: string | null
|
||||
projectId: string | null
|
||||
@@ -208,7 +201,6 @@ export type MetadataFieldWhereInput = {
|
||||
scope?: Prisma.EnumMetadataFieldScopeNullableFilter<"MetadataField"> | $Enums.MetadataFieldScope | null
|
||||
config?: Prisma.JsonNullableFilter<"MetadataField">
|
||||
readOnly?: Prisma.BoolFilter<"MetadataField"> | boolean
|
||||
aiAutofill?: Prisma.BoolFilter<"MetadataField"> | boolean
|
||||
description?: Prisma.StringFilter<"MetadataField"> | string
|
||||
teamId?: Prisma.StringNullableFilter<"MetadataField"> | string | null
|
||||
projectId?: Prisma.StringNullableFilter<"MetadataField"> | string | null
|
||||
@@ -222,7 +214,6 @@ export type MetadataFieldOrderByWithRelationInput = {
|
||||
scope?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
config?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
readOnly?: Prisma.SortOrder
|
||||
aiAutofill?: Prisma.SortOrder
|
||||
description?: Prisma.SortOrder
|
||||
teamId?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
projectId?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
@@ -239,7 +230,6 @@ export type MetadataFieldWhereUniqueInput = Prisma.AtLeast<{
|
||||
scope?: Prisma.EnumMetadataFieldScopeNullableFilter<"MetadataField"> | $Enums.MetadataFieldScope | null
|
||||
config?: Prisma.JsonNullableFilter<"MetadataField">
|
||||
readOnly?: Prisma.BoolFilter<"MetadataField"> | boolean
|
||||
aiAutofill?: Prisma.BoolFilter<"MetadataField"> | boolean
|
||||
description?: Prisma.StringFilter<"MetadataField"> | string
|
||||
teamId?: Prisma.StringNullableFilter<"MetadataField"> | string | null
|
||||
projectId?: Prisma.StringNullableFilter<"MetadataField"> | string | null
|
||||
@@ -253,7 +243,6 @@ export type MetadataFieldOrderByWithAggregationInput = {
|
||||
scope?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
config?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
readOnly?: Prisma.SortOrder
|
||||
aiAutofill?: Prisma.SortOrder
|
||||
description?: Prisma.SortOrder
|
||||
teamId?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
projectId?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||
@@ -271,7 +260,6 @@ export type MetadataFieldScalarWhereWithAggregatesInput = {
|
||||
scope?: Prisma.EnumMetadataFieldScopeNullableWithAggregatesFilter<"MetadataField"> | $Enums.MetadataFieldScope | null
|
||||
config?: Prisma.JsonNullableWithAggregatesFilter<"MetadataField">
|
||||
readOnly?: Prisma.BoolWithAggregatesFilter<"MetadataField"> | boolean
|
||||
aiAutofill?: Prisma.BoolWithAggregatesFilter<"MetadataField"> | boolean
|
||||
description?: Prisma.StringWithAggregatesFilter<"MetadataField"> | string
|
||||
teamId?: Prisma.StringNullableWithAggregatesFilter<"MetadataField"> | string | null
|
||||
projectId?: Prisma.StringNullableWithAggregatesFilter<"MetadataField"> | string | null
|
||||
@@ -283,7 +271,6 @@ export type MetadataFieldCreateInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
team?: Prisma.TeamCreateNestedOneWithoutMetadataFieldsInput
|
||||
project?: Prisma.ProjectCreateNestedOneWithoutMetadataFieldsInput
|
||||
@@ -295,7 +282,6 @@ export type MetadataFieldUncheckedCreateInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
teamId?: string | null
|
||||
projectId?: string | null
|
||||
@@ -307,7 +293,6 @@ export type MetadataFieldUpdateInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
team?: Prisma.TeamUpdateOneWithoutMetadataFieldsNestedInput
|
||||
project?: Prisma.ProjectUpdateOneWithoutMetadataFieldsNestedInput
|
||||
@@ -319,7 +304,6 @@ export type MetadataFieldUncheckedUpdateInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
teamId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
projectId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
@@ -331,7 +315,6 @@ export type MetadataFieldCreateManyInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
teamId?: string | null
|
||||
projectId?: string | null
|
||||
@@ -343,7 +326,6 @@ export type MetadataFieldUpdateManyMutationInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
}
|
||||
|
||||
@@ -353,7 +335,6 @@ export type MetadataFieldUncheckedUpdateManyInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
teamId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
projectId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
@@ -375,7 +356,6 @@ export type MetadataFieldCountOrderByAggregateInput = {
|
||||
scope?: Prisma.SortOrder
|
||||
config?: Prisma.SortOrder
|
||||
readOnly?: Prisma.SortOrder
|
||||
aiAutofill?: Prisma.SortOrder
|
||||
description?: Prisma.SortOrder
|
||||
teamId?: Prisma.SortOrder
|
||||
projectId?: Prisma.SortOrder
|
||||
@@ -386,7 +366,6 @@ export type MetadataFieldMaxOrderByAggregateInput = {
|
||||
key?: Prisma.SortOrder
|
||||
scope?: Prisma.SortOrder
|
||||
readOnly?: Prisma.SortOrder
|
||||
aiAutofill?: Prisma.SortOrder
|
||||
description?: Prisma.SortOrder
|
||||
teamId?: Prisma.SortOrder
|
||||
projectId?: Prisma.SortOrder
|
||||
@@ -397,7 +376,6 @@ export type MetadataFieldMinOrderByAggregateInput = {
|
||||
key?: Prisma.SortOrder
|
||||
scope?: Prisma.SortOrder
|
||||
readOnly?: Prisma.SortOrder
|
||||
aiAutofill?: Prisma.SortOrder
|
||||
description?: Prisma.SortOrder
|
||||
teamId?: Prisma.SortOrder
|
||||
projectId?: Prisma.SortOrder
|
||||
@@ -497,7 +475,6 @@ export type MetadataFieldCreateWithoutTeamInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
project?: Prisma.ProjectCreateNestedOneWithoutMetadataFieldsInput
|
||||
}
|
||||
@@ -508,7 +485,6 @@ export type MetadataFieldUncheckedCreateWithoutTeamInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
projectId?: string | null
|
||||
}
|
||||
@@ -548,7 +524,6 @@ export type MetadataFieldScalarWhereInput = {
|
||||
scope?: Prisma.EnumMetadataFieldScopeNullableFilter<"MetadataField"> | $Enums.MetadataFieldScope | null
|
||||
config?: Prisma.JsonNullableFilter<"MetadataField">
|
||||
readOnly?: Prisma.BoolFilter<"MetadataField"> | boolean
|
||||
aiAutofill?: Prisma.BoolFilter<"MetadataField"> | boolean
|
||||
description?: Prisma.StringFilter<"MetadataField"> | string
|
||||
teamId?: Prisma.StringNullableFilter<"MetadataField"> | string | null
|
||||
projectId?: Prisma.StringNullableFilter<"MetadataField"> | string | null
|
||||
@@ -560,7 +535,6 @@ export type MetadataFieldCreateWithoutProjectInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
team?: Prisma.TeamCreateNestedOneWithoutMetadataFieldsInput
|
||||
}
|
||||
@@ -571,7 +545,6 @@ export type MetadataFieldUncheckedCreateWithoutProjectInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
teamId?: string | null
|
||||
}
|
||||
@@ -608,7 +581,6 @@ export type MetadataFieldCreateManyTeamInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
projectId?: string | null
|
||||
}
|
||||
@@ -619,7 +591,6 @@ export type MetadataFieldUpdateWithoutTeamInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
project?: Prisma.ProjectUpdateOneWithoutMetadataFieldsNestedInput
|
||||
}
|
||||
@@ -630,7 +601,6 @@ export type MetadataFieldUncheckedUpdateWithoutTeamInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
projectId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
}
|
||||
@@ -641,7 +611,6 @@ export type MetadataFieldUncheckedUpdateManyWithoutTeamInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
projectId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
}
|
||||
@@ -652,7 +621,6 @@ export type MetadataFieldCreateManyProjectInput = {
|
||||
scope?: $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: string
|
||||
teamId?: string | null
|
||||
}
|
||||
@@ -663,7 +631,6 @@ export type MetadataFieldUpdateWithoutProjectInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
team?: Prisma.TeamUpdateOneWithoutMetadataFieldsNestedInput
|
||||
}
|
||||
@@ -674,7 +641,6 @@ export type MetadataFieldUncheckedUpdateWithoutProjectInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
teamId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
}
|
||||
@@ -685,7 +651,6 @@ export type MetadataFieldUncheckedUpdateManyWithoutProjectInput = {
|
||||
scope?: Prisma.NullableEnumMetadataFieldScopeFieldUpdateOperationsInput | $Enums.MetadataFieldScope | null
|
||||
config?:PrismaJson.FieldConfig | Prisma.NullableJsonNullValueInput
|
||||
readOnly?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
aiAutofill?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
description?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
teamId?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||
}
|
||||
@@ -698,7 +663,6 @@ export type MetadataFieldSelect<ExtArgs extends runtime.Types.Extensions.Interna
|
||||
scope?: boolean
|
||||
config?: boolean
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: boolean
|
||||
teamId?: boolean
|
||||
projectId?: boolean
|
||||
@@ -712,7 +676,6 @@ export type MetadataFieldSelectCreateManyAndReturn<ExtArgs extends runtime.Types
|
||||
scope?: boolean
|
||||
config?: boolean
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: boolean
|
||||
teamId?: boolean
|
||||
projectId?: boolean
|
||||
@@ -726,7 +689,6 @@ export type MetadataFieldSelectUpdateManyAndReturn<ExtArgs extends runtime.Types
|
||||
scope?: boolean
|
||||
config?: boolean
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: boolean
|
||||
teamId?: boolean
|
||||
projectId?: boolean
|
||||
@@ -740,13 +702,12 @@ export type MetadataFieldSelectScalar = {
|
||||
scope?: boolean
|
||||
config?: boolean
|
||||
readOnly?: boolean
|
||||
aiAutofill?: boolean
|
||||
description?: boolean
|
||||
teamId?: boolean
|
||||
projectId?: boolean
|
||||
}
|
||||
|
||||
export type MetadataFieldOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "key" | "scope" | "config" | "readOnly" | "aiAutofill" | "description" | "teamId" | "projectId", ExtArgs["result"]["metadataField"]>
|
||||
export type MetadataFieldOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "key" | "scope" | "config" | "readOnly" | "description" | "teamId" | "projectId", ExtArgs["result"]["metadataField"]>
|
||||
export type MetadataFieldInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
|
||||
team?: boolean | Prisma.MetadataField$teamArgs<ExtArgs>
|
||||
project?: boolean | Prisma.MetadataField$projectArgs<ExtArgs>
|
||||
@@ -775,7 +736,6 @@ export type $MetadataFieldPayload<ExtArgs extends runtime.Types.Extensions.Inter
|
||||
*/
|
||||
config:PrismaJson.FieldConfig | null
|
||||
readOnly: boolean
|
||||
aiAutofill: boolean
|
||||
description: string
|
||||
teamId: string | null
|
||||
projectId: string | null
|
||||
@@ -1209,7 +1169,6 @@ export interface MetadataFieldFieldRefs {
|
||||
readonly scope: Prisma.FieldRef<"MetadataField", 'MetadataFieldScope'>
|
||||
readonly config: Prisma.FieldRef<"MetadataField", 'Json'>
|
||||
readonly readOnly: Prisma.FieldRef<"MetadataField", 'Boolean'>
|
||||
readonly aiAutofill: Prisma.FieldRef<"MetadataField", 'Boolean'>
|
||||
readonly description: Prisma.FieldRef<"MetadataField", 'String'>
|
||||
readonly teamId: Prisma.FieldRef<"MetadataField", 'String'>
|
||||
readonly projectId: Prisma.FieldRef<"MetadataField", 'String'>
|
||||
|
||||
+33
-1
@@ -28,6 +28,7 @@ export type AggregateSandbox = {
|
||||
|
||||
export type SandboxMinAggregateOutputType = {
|
||||
id: string | null
|
||||
networkSandboxEnabled: boolean | null
|
||||
createdAt: Date | null
|
||||
updatedAt: Date | null
|
||||
teamId: string | null
|
||||
@@ -35,6 +36,7 @@ export type SandboxMinAggregateOutputType = {
|
||||
|
||||
export type SandboxMaxAggregateOutputType = {
|
||||
id: string | null
|
||||
networkSandboxEnabled: boolean | null
|
||||
createdAt: Date | null
|
||||
updatedAt: Date | null
|
||||
teamId: string | null
|
||||
@@ -42,6 +44,7 @@ export type SandboxMaxAggregateOutputType = {
|
||||
|
||||
export type SandboxCountAggregateOutputType = {
|
||||
id: number
|
||||
networkSandboxEnabled: number
|
||||
allowedDomains: number
|
||||
pendingDomains: number
|
||||
createdAt: number
|
||||
@@ -53,6 +56,7 @@ export type SandboxCountAggregateOutputType = {
|
||||
|
||||
export type SandboxMinAggregateInputType = {
|
||||
id?: true
|
||||
networkSandboxEnabled?: true
|
||||
createdAt?: true
|
||||
updatedAt?: true
|
||||
teamId?: true
|
||||
@@ -60,6 +64,7 @@ export type SandboxMinAggregateInputType = {
|
||||
|
||||
export type SandboxMaxAggregateInputType = {
|
||||
id?: true
|
||||
networkSandboxEnabled?: true
|
||||
createdAt?: true
|
||||
updatedAt?: true
|
||||
teamId?: true
|
||||
@@ -67,6 +72,7 @@ export type SandboxMaxAggregateInputType = {
|
||||
|
||||
export type SandboxCountAggregateInputType = {
|
||||
id?: true
|
||||
networkSandboxEnabled?: true
|
||||
allowedDomains?: true
|
||||
pendingDomains?: true
|
||||
createdAt?: true
|
||||
@@ -149,6 +155,7 @@ export type SandboxGroupByArgs<ExtArgs extends runtime.Types.Extensions.Internal
|
||||
|
||||
export type SandboxGroupByOutputType = {
|
||||
id: string
|
||||
networkSandboxEnabled: boolean
|
||||
allowedDomains: string[]
|
||||
pendingDomains: string[]
|
||||
createdAt: Date
|
||||
@@ -179,6 +186,7 @@ export type SandboxWhereInput = {
|
||||
OR?: Prisma.SandboxWhereInput[]
|
||||
NOT?: Prisma.SandboxWhereInput | Prisma.SandboxWhereInput[]
|
||||
id?: Prisma.StringFilter<"Sandbox"> | string
|
||||
networkSandboxEnabled?: Prisma.BoolFilter<"Sandbox"> | boolean
|
||||
allowedDomains?: Prisma.StringNullableListFilter<"Sandbox">
|
||||
pendingDomains?: Prisma.StringNullableListFilter<"Sandbox">
|
||||
createdAt?: Prisma.DateTimeFilter<"Sandbox"> | Date | string
|
||||
@@ -189,6 +197,7 @@ export type SandboxWhereInput = {
|
||||
|
||||
export type SandboxOrderByWithRelationInput = {
|
||||
id?: Prisma.SortOrder
|
||||
networkSandboxEnabled?: Prisma.SortOrder
|
||||
allowedDomains?: Prisma.SortOrder
|
||||
pendingDomains?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
@@ -203,6 +212,7 @@ export type SandboxWhereUniqueInput = Prisma.AtLeast<{
|
||||
AND?: Prisma.SandboxWhereInput | Prisma.SandboxWhereInput[]
|
||||
OR?: Prisma.SandboxWhereInput[]
|
||||
NOT?: Prisma.SandboxWhereInput | Prisma.SandboxWhereInput[]
|
||||
networkSandboxEnabled?: Prisma.BoolFilter<"Sandbox"> | boolean
|
||||
allowedDomains?: Prisma.StringNullableListFilter<"Sandbox">
|
||||
pendingDomains?: Prisma.StringNullableListFilter<"Sandbox">
|
||||
createdAt?: Prisma.DateTimeFilter<"Sandbox"> | Date | string
|
||||
@@ -212,6 +222,7 @@ export type SandboxWhereUniqueInput = Prisma.AtLeast<{
|
||||
|
||||
export type SandboxOrderByWithAggregationInput = {
|
||||
id?: Prisma.SortOrder
|
||||
networkSandboxEnabled?: Prisma.SortOrder
|
||||
allowedDomains?: Prisma.SortOrder
|
||||
pendingDomains?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
@@ -227,6 +238,7 @@ export type SandboxScalarWhereWithAggregatesInput = {
|
||||
OR?: Prisma.SandboxScalarWhereWithAggregatesInput[]
|
||||
NOT?: Prisma.SandboxScalarWhereWithAggregatesInput | Prisma.SandboxScalarWhereWithAggregatesInput[]
|
||||
id?: Prisma.StringWithAggregatesFilter<"Sandbox"> | string
|
||||
networkSandboxEnabled?: Prisma.BoolWithAggregatesFilter<"Sandbox"> | boolean
|
||||
allowedDomains?: Prisma.StringNullableListFilter<"Sandbox">
|
||||
pendingDomains?: Prisma.StringNullableListFilter<"Sandbox">
|
||||
createdAt?: Prisma.DateTimeWithAggregatesFilter<"Sandbox"> | Date | string
|
||||
@@ -236,6 +248,7 @@ export type SandboxScalarWhereWithAggregatesInput = {
|
||||
|
||||
export type SandboxCreateInput = {
|
||||
id?: string
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: Prisma.SandboxCreateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxCreatependingDomainsInput | string[]
|
||||
createdAt?: Date | string
|
||||
@@ -245,6 +258,7 @@ export type SandboxCreateInput = {
|
||||
|
||||
export type SandboxUncheckedCreateInput = {
|
||||
id?: string
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: Prisma.SandboxCreateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxCreatependingDomainsInput | string[]
|
||||
createdAt?: Date | string
|
||||
@@ -254,6 +268,7 @@ export type SandboxUncheckedCreateInput = {
|
||||
|
||||
export type SandboxUpdateInput = {
|
||||
id?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
networkSandboxEnabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
allowedDomains?: Prisma.SandboxUpdateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxUpdatependingDomainsInput | string[]
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
@@ -263,6 +278,7 @@ export type SandboxUpdateInput = {
|
||||
|
||||
export type SandboxUncheckedUpdateInput = {
|
||||
id?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
networkSandboxEnabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
allowedDomains?: Prisma.SandboxUpdateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxUpdatependingDomainsInput | string[]
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
@@ -272,6 +288,7 @@ export type SandboxUncheckedUpdateInput = {
|
||||
|
||||
export type SandboxCreateManyInput = {
|
||||
id?: string
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: Prisma.SandboxCreateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxCreatependingDomainsInput | string[]
|
||||
createdAt?: Date | string
|
||||
@@ -281,6 +298,7 @@ export type SandboxCreateManyInput = {
|
||||
|
||||
export type SandboxUpdateManyMutationInput = {
|
||||
id?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
networkSandboxEnabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
allowedDomains?: Prisma.SandboxUpdateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxUpdatependingDomainsInput | string[]
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
@@ -289,6 +307,7 @@ export type SandboxUpdateManyMutationInput = {
|
||||
|
||||
export type SandboxUncheckedUpdateManyInput = {
|
||||
id?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
networkSandboxEnabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
allowedDomains?: Prisma.SandboxUpdateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxUpdatependingDomainsInput | string[]
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
@@ -311,6 +330,7 @@ export type StringNullableListFilter<$PrismaModel = never> = {
|
||||
|
||||
export type SandboxCountOrderByAggregateInput = {
|
||||
id?: Prisma.SortOrder
|
||||
networkSandboxEnabled?: Prisma.SortOrder
|
||||
allowedDomains?: Prisma.SortOrder
|
||||
pendingDomains?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
@@ -320,6 +340,7 @@ export type SandboxCountOrderByAggregateInput = {
|
||||
|
||||
export type SandboxMaxOrderByAggregateInput = {
|
||||
id?: Prisma.SortOrder
|
||||
networkSandboxEnabled?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
updatedAt?: Prisma.SortOrder
|
||||
teamId?: Prisma.SortOrder
|
||||
@@ -327,6 +348,7 @@ export type SandboxMaxOrderByAggregateInput = {
|
||||
|
||||
export type SandboxMinOrderByAggregateInput = {
|
||||
id?: Prisma.SortOrder
|
||||
networkSandboxEnabled?: Prisma.SortOrder
|
||||
createdAt?: Prisma.SortOrder
|
||||
updatedAt?: Prisma.SortOrder
|
||||
teamId?: Prisma.SortOrder
|
||||
@@ -384,6 +406,7 @@ export type SandboxUpdatependingDomainsInput = {
|
||||
|
||||
export type SandboxCreateWithoutTeamInput = {
|
||||
id?: string
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: Prisma.SandboxCreateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxCreatependingDomainsInput | string[]
|
||||
createdAt?: Date | string
|
||||
@@ -392,6 +415,7 @@ export type SandboxCreateWithoutTeamInput = {
|
||||
|
||||
export type SandboxUncheckedCreateWithoutTeamInput = {
|
||||
id?: string
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: Prisma.SandboxCreateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxCreatependingDomainsInput | string[]
|
||||
createdAt?: Date | string
|
||||
@@ -416,6 +440,7 @@ export type SandboxUpdateToOneWithWhereWithoutTeamInput = {
|
||||
|
||||
export type SandboxUpdateWithoutTeamInput = {
|
||||
id?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
networkSandboxEnabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
allowedDomains?: Prisma.SandboxUpdateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxUpdatependingDomainsInput | string[]
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
@@ -424,6 +449,7 @@ export type SandboxUpdateWithoutTeamInput = {
|
||||
|
||||
export type SandboxUncheckedUpdateWithoutTeamInput = {
|
||||
id?: Prisma.StringFieldUpdateOperationsInput | string
|
||||
networkSandboxEnabled?: Prisma.BoolFieldUpdateOperationsInput | boolean
|
||||
allowedDomains?: Prisma.SandboxUpdateallowedDomainsInput | string[]
|
||||
pendingDomains?: Prisma.SandboxUpdatependingDomainsInput | string[]
|
||||
createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
|
||||
@@ -434,6 +460,7 @@ export type SandboxUncheckedUpdateWithoutTeamInput = {
|
||||
|
||||
export type SandboxSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
|
||||
id?: boolean
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: boolean
|
||||
pendingDomains?: boolean
|
||||
createdAt?: boolean
|
||||
@@ -444,6 +471,7 @@ export type SandboxSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs
|
||||
|
||||
export type SandboxSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
|
||||
id?: boolean
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: boolean
|
||||
pendingDomains?: boolean
|
||||
createdAt?: boolean
|
||||
@@ -454,6 +482,7 @@ export type SandboxSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Exten
|
||||
|
||||
export type SandboxSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
|
||||
id?: boolean
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: boolean
|
||||
pendingDomains?: boolean
|
||||
createdAt?: boolean
|
||||
@@ -464,6 +493,7 @@ export type SandboxSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Exten
|
||||
|
||||
export type SandboxSelectScalar = {
|
||||
id?: boolean
|
||||
networkSandboxEnabled?: boolean
|
||||
allowedDomains?: boolean
|
||||
pendingDomains?: boolean
|
||||
createdAt?: boolean
|
||||
@@ -471,7 +501,7 @@ export type SandboxSelectScalar = {
|
||||
teamId?: boolean
|
||||
}
|
||||
|
||||
export type SandboxOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "allowedDomains" | "pendingDomains" | "createdAt" | "updatedAt" | "teamId", ExtArgs["result"]["sandbox"]>
|
||||
export type SandboxOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"id" | "networkSandboxEnabled" | "allowedDomains" | "pendingDomains" | "createdAt" | "updatedAt" | "teamId", ExtArgs["result"]["sandbox"]>
|
||||
export type SandboxInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
|
||||
team?: boolean | Prisma.TeamDefaultArgs<ExtArgs>
|
||||
}
|
||||
@@ -489,6 +519,7 @@ export type $SandboxPayload<ExtArgs extends runtime.Types.Extensions.InternalArg
|
||||
}
|
||||
scalars: runtime.Types.Extensions.GetPayloadResult<{
|
||||
id: string
|
||||
networkSandboxEnabled: boolean
|
||||
allowedDomains: string[]
|
||||
pendingDomains: string[]
|
||||
createdAt: Date
|
||||
@@ -919,6 +950,7 @@ export interface Prisma__SandboxClient<T, Null = never, ExtArgs extends runtime.
|
||||
*/
|
||||
export interface SandboxFieldRefs {
|
||||
readonly id: Prisma.FieldRef<"Sandbox", 'String'>
|
||||
readonly networkSandboxEnabled: Prisma.FieldRef<"Sandbox", 'Boolean'>
|
||||
readonly allowedDomains: Prisma.FieldRef<"Sandbox", 'String[]'>
|
||||
readonly pendingDomains: Prisma.FieldRef<"Sandbox", 'String[]'>
|
||||
readonly createdAt: Prisma.FieldRef<"Sandbox", 'DateTime'>
|
||||
|
||||
@@ -220,6 +220,7 @@ declare global {
|
||||
export interface FieldConfig {
|
||||
name: string
|
||||
type: FieldType
|
||||
autofillSource?: 'NONE' | 'CONTENT' | 'CREATION_CONTEXT'
|
||||
text?: TextConfig
|
||||
longText?: LongTextConfig
|
||||
select?: SelectConfig
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/dtos",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -74,6 +74,7 @@ export const assetInfoSchema = z.object({
|
||||
sortIndex: z.string().optional().nullable(),
|
||||
startTime: z.number().optional().nullable(),
|
||||
endTime: z.number().optional().nullable(),
|
||||
hasAgentsMd: z.boolean().optional(),
|
||||
|
||||
media: z
|
||||
.object({
|
||||
@@ -119,10 +120,12 @@ export const assetInfoSchema = z.object({
|
||||
id: z.string(),
|
||||
name: z.string().optional().nullable(),
|
||||
previewUrl: z.string().optional().nullable(),
|
||||
createdAt: z.string().optional().nullable(),
|
||||
creator: z
|
||||
.object({
|
||||
id: z.string(),
|
||||
name: z.string().nullable(),
|
||||
image: z.string().optional().nullable(),
|
||||
})
|
||||
.nullable()
|
||||
.optional(),
|
||||
|
||||
@@ -20,3 +20,8 @@ export const restoreFoldersRequestSchema = z.object({
|
||||
ids: z.array(z.string()),
|
||||
})
|
||||
export type RestoreFoldersRequest = z.infer<typeof restoreFoldersRequestSchema>
|
||||
|
||||
export const updateAgentsMdRequestSchema = z.object({
|
||||
content: z.string().max(100_000),
|
||||
})
|
||||
export type UpdateAgentsMdRequest = z.infer<typeof updateAgentsMdRequestSchema>
|
||||
|
||||
@@ -18,6 +18,14 @@ export const FieldType = {
|
||||
|
||||
export type FieldType = (typeof FieldType)[keyof typeof FieldType]
|
||||
|
||||
export const AutofillSource = {
|
||||
NONE: 'NONE',
|
||||
CONTENT: 'CONTENT',
|
||||
CREATION_CONTEXT: 'CREATION_CONTEXT',
|
||||
} as const
|
||||
|
||||
export type AutofillSource = (typeof AutofillSource)[keyof typeof AutofillSource]
|
||||
|
||||
export const selectOptionSchema = z.object({
|
||||
id: z.string(),
|
||||
displayName: z.string(),
|
||||
@@ -39,6 +47,7 @@ export const fieldConfigSchema = z.object({
|
||||
'user',
|
||||
'userMulti',
|
||||
]),
|
||||
autofillSource: z.nativeEnum(AutofillSource).optional(),
|
||||
text: z.any().optional(),
|
||||
longText: z.any().optional(),
|
||||
select: z.any().optional(),
|
||||
@@ -56,7 +65,6 @@ export const createFieldRequestSchema = z.object({
|
||||
label: z.string().optional(),
|
||||
scope: z.string().optional(),
|
||||
config: fieldConfigSchema,
|
||||
aiAutofill: z.boolean().default(false),
|
||||
description: z.string().default(''),
|
||||
})
|
||||
export type CreateFieldRequest = z.infer<typeof createFieldRequestSchema>
|
||||
@@ -64,7 +72,6 @@ export type CreateFieldRequest = z.infer<typeof createFieldRequestSchema>
|
||||
export const updateFieldRequestSchema = z.object({
|
||||
label: z.string().optional(),
|
||||
config: fieldConfigSchema,
|
||||
aiAutofill: z.boolean().optional(),
|
||||
description: z.string().optional(),
|
||||
})
|
||||
export type UpdateFieldRequest = z.infer<typeof updateFieldRequestSchema>
|
||||
@@ -93,6 +100,5 @@ export const fieldInfoSchema = z.object({
|
||||
readOnly: z.boolean(),
|
||||
visible: z.boolean(),
|
||||
description: z.string(),
|
||||
aiAutofill: z.boolean(),
|
||||
})
|
||||
export type FieldInfo = z.infer<typeof fieldInfoSchema>
|
||||
|
||||
@@ -83,12 +83,17 @@ export const updateTeamSettingsRequestSchema = z.union([
|
||||
export type UpdateTeamSettingsRequest = z.infer<typeof updateTeamSettingsRequestSchema>
|
||||
|
||||
export const sandboxSettingsSchema = z.object({
|
||||
networkSandboxEnabled: z.boolean(),
|
||||
allowedDomains: z.array(z.string()),
|
||||
pendingDomains: z.array(z.string()).default([]),
|
||||
})
|
||||
export type SandboxSettings = z.infer<typeof sandboxSettingsSchema>
|
||||
|
||||
export const updateSandboxSettingsRequestSchema = sandboxSettingsSchema
|
||||
export const updateSandboxSettingsRequestSchema = z.object({
|
||||
networkSandboxEnabled: z.boolean().optional(),
|
||||
allowedDomains: z.array(z.string()).optional(),
|
||||
pendingDomains: z.array(z.string()).optional(),
|
||||
})
|
||||
export type UpdateSandboxSettingsRequest = z.infer<typeof updateSandboxSettingsRequestSchema>
|
||||
|
||||
export const updateTeamMemberRoleRequestSchema = z.object({
|
||||
|
||||
@@ -22,3 +22,25 @@ export interface ChangeStackFileVersionParams {
|
||||
fileId: string
|
||||
beforeId: string
|
||||
}
|
||||
|
||||
export interface RemoveStackVersionParams {
|
||||
stackId: string
|
||||
fileId: string
|
||||
}
|
||||
|
||||
export const stackVersionInfoSchema = z.object({
|
||||
id: z.string(),
|
||||
version: z.number(),
|
||||
name: z.string().optional().nullable(),
|
||||
previewUrl: z.string().optional().nullable(),
|
||||
createdAt: z.string().optional().nullable(),
|
||||
creator: z
|
||||
.object({
|
||||
id: z.string(),
|
||||
name: z.string().nullable(),
|
||||
image: z.string().optional().nullable(),
|
||||
})
|
||||
.nullable()
|
||||
.optional(),
|
||||
})
|
||||
export type StackVersionInfo = z.infer<typeof stackVersionInfoSchema>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/e2e",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
|
||||
@@ -20,7 +20,6 @@ describe.each(['local', 'temporal'] as const)(
|
||||
|
||||
let agentWorkerPromise: Promise<void> | null = null
|
||||
let transcodeWorkerPromise: Promise<void> | null = null
|
||||
let lastAutofillPrompt = ''
|
||||
|
||||
beforeAll(async () => {
|
||||
// Set bucket environment
|
||||
@@ -36,11 +35,7 @@ describe.each(['local', 'temporal'] as const)(
|
||||
// Spy on the harness prompt method to intercept the LLM call while running real activities & tools
|
||||
vi.spyOn(AgentHarness.prototype, 'prompt').mockImplementation(async function (
|
||||
this: AgentHarness,
|
||||
...args: unknown[]
|
||||
) {
|
||||
// Capture the prompt to verify agent-provided context is propagated
|
||||
lastAutofillPrompt = typeof args[0] === 'string' ? args[0] : ''
|
||||
|
||||
// Find the real autofill_metadata tool configured on the harness
|
||||
const tools = this.getTools()
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Tool execution mock for E2E harness test
|
||||
@@ -119,54 +114,50 @@ describe.each(['local', 'temporal'] as const)(
|
||||
data: { name: 'E2E Test Project', teamId: team.id },
|
||||
})
|
||||
|
||||
// Create Metadata Field (aiAutofill = true, text)
|
||||
// Create Metadata Field (autofillSource = CONTENT, text)
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'title',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Title', type: 'text' },
|
||||
aiAutofill: true,
|
||||
config: { name: 'Title', type: 'text', autofillSource: 'CONTENT' },
|
||||
description: 'Auto-extracted title',
|
||||
},
|
||||
})
|
||||
|
||||
// Create Metadata Field (aiAutofill = true, number)
|
||||
// Create Metadata Field (autofillSource = CONTENT, number)
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'confidence',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Confidence', type: 'number' },
|
||||
aiAutofill: true,
|
||||
config: { name: 'Confidence', type: 'number', autofillSource: 'CONTENT' },
|
||||
description: 'AI extraction confidence',
|
||||
},
|
||||
})
|
||||
|
||||
// Create Metadata Field (aiAutofill = true, boolean)
|
||||
// Create Metadata Field (autofillSource = CONTENT, boolean)
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'completed',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Completed', type: 'toggle' },
|
||||
aiAutofill: true,
|
||||
config: { name: 'Completed', type: 'toggle', autofillSource: 'CONTENT' },
|
||||
description: 'Completed flag',
|
||||
},
|
||||
})
|
||||
|
||||
// Create Metadata Field (aiAutofill = false, text)
|
||||
// Create Metadata Field (autofillSource = NONE, text)
|
||||
await prisma.metadataField.create({
|
||||
data: {
|
||||
key: 'manual_notes',
|
||||
scope: 'PROJECT',
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
config: { name: 'Manual Notes', type: 'text' },
|
||||
aiAutofill: false,
|
||||
config: { name: 'Manual Notes', type: 'text', autofillSource: 'NONE' },
|
||||
description: 'Manual notes (should not be auto-filled)',
|
||||
},
|
||||
})
|
||||
@@ -244,7 +235,6 @@ describe.each(['local', 'temporal'] as const)(
|
||||
mediaType: 'image/png',
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- partial MediaInfo mock for testing
|
||||
media: { proxyType: 'image' } as any,
|
||||
autofillContext: 'Generated using gemini',
|
||||
projectId: project.id,
|
||||
storageKeyId: storageKey.id,
|
||||
},
|
||||
@@ -284,10 +274,6 @@ describe.each(['local', 'temporal'] as const)(
|
||||
// 5. Verification
|
||||
expect(completedTask.status).toBe('completed')
|
||||
|
||||
// Verify the agent-provided autofill context was included in the LLM prompt
|
||||
expect(lastAutofillPrompt).toContain('Generated using gemini')
|
||||
expect(lastAutofillPrompt).toContain('<context>')
|
||||
|
||||
// Verify placeholder comment is updated correctly
|
||||
const comments = await prisma.assetComment.findMany({
|
||||
where: { assetId: asset.id },
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/tableprinter",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/transcode",
|
||||
"version": "0.3.6",
|
||||
"version": "0.3.8",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -0,0 +1,147 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { cleanup, render, screen, waitFor } from '@testing-library/react'
|
||||
import React from 'react'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||
import { AgentsMdEditor } from './agents-md-editor'
|
||||
import { m } from '@/ui/paraglide/messages.js'
|
||||
|
||||
// Mock API client
|
||||
vi.mock('@/ui/api/client', () => ({
|
||||
client: {
|
||||
api: {
|
||||
folders: {
|
||||
':folderId': {
|
||||
agentsmd: {
|
||||
$get: vi.fn(),
|
||||
$patch: vi.fn(),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
// Mock usePermissions
|
||||
const mockUsePermissions = vi.fn()
|
||||
vi.mock('@/ui/hooks/use-permissions', () => ({
|
||||
usePermissions: () => mockUsePermissions(),
|
||||
}))
|
||||
|
||||
// Mock useNavigate
|
||||
const mockNavigate = vi.fn()
|
||||
vi.mock('@tanstack/react-router', () => ({
|
||||
useNavigate: () => mockNavigate,
|
||||
}))
|
||||
|
||||
describe('AgentsMdEditor Component', () => {
|
||||
let queryClient: QueryClient
|
||||
|
||||
beforeEach(() => {
|
||||
queryClient = new QueryClient({
|
||||
defaultOptions: {
|
||||
queries: {
|
||||
retry: false,
|
||||
},
|
||||
},
|
||||
})
|
||||
mockUsePermissions.mockReturnValue({
|
||||
role: 'owner',
|
||||
canEdit: true,
|
||||
canAdmin: true,
|
||||
})
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
it('renders loading state initially', async () => {
|
||||
const { client } = await import('@/ui/api/client')
|
||||
const getMock = client.api.folders[':folderId'].agentsmd.$get as unknown as ReturnType<
|
||||
typeof vi.fn
|
||||
>
|
||||
getMock.mockImplementation(() => new Promise(() => {}))
|
||||
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<AgentsMdEditor projectId="proj-1" assetId="folder-1" rootFolderId="folder-1" isRoot />
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
expect(screen.getByText(m.agents_md_loading())).toBeDefined()
|
||||
})
|
||||
|
||||
it('renders editable editor for team owner', async () => {
|
||||
const { client } = await import('@/ui/api/client')
|
||||
const getMock = client.api.folders[':folderId'].agentsmd.$get as unknown as ReturnType<
|
||||
typeof vi.fn
|
||||
>
|
||||
getMock.mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({ content: '# Instructions' }),
|
||||
})
|
||||
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<AgentsMdEditor projectId="proj-1" assetId="folder-1" rootFolderId="folder-1" isRoot />
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.getByRole('textbox')).toBeDefined()
|
||||
})
|
||||
expect(screen.queryByText(m.agents_md_readonly_hint())).toBeNull()
|
||||
})
|
||||
|
||||
it('renders read-only notice and restricts editing for non-owner', async () => {
|
||||
mockUsePermissions.mockReturnValue({
|
||||
role: 'editor',
|
||||
canEdit: true,
|
||||
canAdmin: false,
|
||||
})
|
||||
|
||||
const { client } = await import('@/ui/api/client')
|
||||
const getMock = client.api.folders[':folderId'].agentsmd.$get as unknown as ReturnType<
|
||||
typeof vi.fn
|
||||
>
|
||||
getMock.mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({ content: '# Instructions' }),
|
||||
})
|
||||
|
||||
const { container } = render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<AgentsMdEditor projectId="proj-1" assetId="folder-1" rootFolderId="folder-1" isRoot />
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText(m.agents_md_readonly_hint())).toBeDefined()
|
||||
})
|
||||
|
||||
expect(container.querySelector('.read-only')).toBeDefined()
|
||||
})
|
||||
|
||||
it('displays the friendly multiline placeholder when content is empty', async () => {
|
||||
const { client } = await import('@/ui/api/client')
|
||||
const getMock = client.api.folders[':folderId'].agentsmd.$get as unknown as ReturnType<
|
||||
typeof vi.fn
|
||||
>
|
||||
getMock.mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({ content: null }),
|
||||
})
|
||||
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<AgentsMdEditor projectId="proj-1" assetId="folder-1" rootFolderId="folder-1" isRoot />
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText(/parent folders up to the project level/)).toBeDefined()
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,242 @@
|
||||
import { client } from '@/ui/api/client'
|
||||
import { usePermissions } from '@/ui/hooks/use-permissions'
|
||||
import { m } from '@/ui/paraglide/messages.js'
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { useNavigate } from '@tanstack/react-router'
|
||||
import { AlertCircle, Check, Lock, Save, X } from 'lucide-react'
|
||||
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||
import { MarkdownEditor } from '../markdown-editor/markdown-editor'
|
||||
import { Button } from '../ui/button'
|
||||
import { Separator } from '../ui/separator'
|
||||
|
||||
export interface AgentsMdEditorProps {
|
||||
projectId: string
|
||||
assetId: string
|
||||
rootFolderId: string
|
||||
isRoot?: boolean
|
||||
}
|
||||
|
||||
export function AgentsMdEditor({ projectId, assetId, rootFolderId, isRoot }: AgentsMdEditorProps) {
|
||||
const navigate = useNavigate()
|
||||
const queryClient = useQueryClient()
|
||||
const { canAdmin } = usePermissions(projectId)
|
||||
|
||||
const { data, isLoading } = useQuery({
|
||||
queryKey: ['folders', assetId, 'agentsmd'],
|
||||
queryFn: async () => {
|
||||
const res = await client.api.folders[':folderId'].agentsmd.$get({
|
||||
param: { folderId: assetId },
|
||||
})
|
||||
if (!res.ok) throw new Error('Failed to fetch agents.md')
|
||||
return await res.json()
|
||||
},
|
||||
})
|
||||
|
||||
const [content, setContent] = useState<string>('')
|
||||
const [isInitialized, setIsInitialized] = useState(false)
|
||||
const [saveStatus, setSaveStatus] = useState<'idle' | 'saving' | 'saved' | 'error'>('idle')
|
||||
const saveTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
const clearSavedTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
const latestContentRef = useRef<string>('')
|
||||
const lastSavedContentRef = useRef<string | null>(null)
|
||||
// Serializes autosaves so a newer write can never be overwritten by an older
|
||||
// in-flight request completing out of order.
|
||||
const saveChainRef = useRef<Promise<unknown>>(Promise.resolve())
|
||||
|
||||
useEffect(() => {
|
||||
if (!isInitialized && data !== undefined) {
|
||||
const initial = data.content ?? ''
|
||||
setContent(initial)
|
||||
latestContentRef.current = initial
|
||||
lastSavedContentRef.current = initial
|
||||
setIsInitialized(true)
|
||||
}
|
||||
}, [data, isInitialized])
|
||||
|
||||
const [isClosing, setIsClosing] = useState(false)
|
||||
|
||||
const saveMutation = useMutation({
|
||||
mutationFn: async (newContent: string) => {
|
||||
const res = await client.api.folders[':folderId'].agentsmd.$patch({
|
||||
param: { folderId: assetId },
|
||||
json: { content: newContent },
|
||||
})
|
||||
if (!res.ok) throw new Error('Failed to save agents.md')
|
||||
return await res.json()
|
||||
},
|
||||
onSuccess: (_, newContent) => {
|
||||
setSaveStatus('saved')
|
||||
lastSavedContentRef.current = newContent
|
||||
queryClient.setQueryData(['folders', assetId, 'agentsmd'], { content: newContent })
|
||||
queryClient.invalidateQueries({ queryKey: ['folders', assetId] })
|
||||
if (clearSavedTimeoutRef.current) {
|
||||
clearTimeout(clearSavedTimeoutRef.current)
|
||||
}
|
||||
clearSavedTimeoutRef.current = setTimeout(() => {
|
||||
setSaveStatus('idle')
|
||||
}, 2500)
|
||||
},
|
||||
onError: () => {
|
||||
setSaveStatus('error')
|
||||
},
|
||||
})
|
||||
|
||||
const saveMutationRef = useRef(saveMutation.mutateAsync)
|
||||
saveMutationRef.current = saveMutation.mutateAsync
|
||||
|
||||
const enqueueSave = useCallback(
|
||||
(textToSave: string) => {
|
||||
if (!canAdmin) return Promise.resolve()
|
||||
if (lastSavedContentRef.current === textToSave) {
|
||||
setSaveStatus('saved')
|
||||
return Promise.resolve()
|
||||
}
|
||||
setSaveStatus('saving')
|
||||
const p = saveChainRef.current
|
||||
.then(async () => {
|
||||
await saveMutationRef.current(textToSave)
|
||||
})
|
||||
.catch(() => {
|
||||
// Swallow so a failed save does not break the chain for later saves.
|
||||
// The mutation's onError handler already surfaces the failure.
|
||||
})
|
||||
saveChainRef.current = p
|
||||
return p
|
||||
},
|
||||
[canAdmin],
|
||||
)
|
||||
|
||||
const handleContentChange = useCallback(
|
||||
(newMarkdown: string) => {
|
||||
if (!canAdmin) return
|
||||
setContent(newMarkdown)
|
||||
latestContentRef.current = newMarkdown
|
||||
|
||||
if (saveTimeoutRef.current) {
|
||||
clearTimeout(saveTimeoutRef.current)
|
||||
}
|
||||
|
||||
setSaveStatus('saving')
|
||||
saveTimeoutRef.current = setTimeout(() => {
|
||||
saveTimeoutRef.current = null
|
||||
enqueueSave(newMarkdown)
|
||||
}, 1000)
|
||||
},
|
||||
[canAdmin, enqueueSave],
|
||||
)
|
||||
|
||||
// Flushes any pending debounced edits so they are not lost when the editor
|
||||
// unmounts (close button, folder-tree navigation, or route change).
|
||||
const flushPendingSave = useCallback(() => {
|
||||
if (saveTimeoutRef.current) {
|
||||
clearTimeout(saveTimeoutRef.current)
|
||||
saveTimeoutRef.current = null
|
||||
return enqueueSave(latestContentRef.current)
|
||||
}
|
||||
return saveChainRef.current
|
||||
}, [enqueueSave])
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
flushPendingSave()
|
||||
if (clearSavedTimeoutRef.current) {
|
||||
clearTimeout(clearSavedTimeoutRef.current)
|
||||
}
|
||||
}
|
||||
}, [flushPendingSave])
|
||||
|
||||
const handleClose = async () => {
|
||||
setIsClosing(true)
|
||||
try {
|
||||
flushPendingSave()
|
||||
await saveChainRef.current
|
||||
} catch {
|
||||
// Proceed with navigation even if error occurs
|
||||
} finally {
|
||||
if (isRoot || assetId === rootFolderId) {
|
||||
navigate({
|
||||
to: '/projects/$projectId',
|
||||
params: { projectId },
|
||||
})
|
||||
} else {
|
||||
navigate({
|
||||
to: '/projects/$projectId/folders/$folderId',
|
||||
params: { projectId, folderId: assetId },
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const rightToolbarContent = (
|
||||
<div className="flex items-center justify-between w-full gap-2 shrink-0">
|
||||
{canAdmin ? (
|
||||
<div className="flex items-center gap-1.5 text-xs shrink-0">
|
||||
{(saveStatus === 'saving' || isClosing) && (
|
||||
<span className="inline-flex items-center gap-1 text-muted-foreground animate-pulse whitespace-nowrap">
|
||||
<Save className="h-3.5 w-3.5 shrink-0" />
|
||||
<span>{m.saving_ellipsis()}</span>
|
||||
</span>
|
||||
)}
|
||||
{saveStatus === 'saved' && !isClosing && (
|
||||
<span className="inline-flex items-center gap-1 text-emerald-600 dark:text-emerald-400 font-medium whitespace-nowrap">
|
||||
<Check className="h-3.5 w-3.5 shrink-0" />
|
||||
<span>{m.saved()}</span>
|
||||
</span>
|
||||
)}
|
||||
{saveStatus === 'error' && !isClosing && (
|
||||
<span className="inline-flex items-center gap-1 text-destructive font-medium whitespace-nowrap">
|
||||
<AlertCircle className="h-3.5 w-3.5 shrink-0" />
|
||||
<span>{m.agents_md_save_failed()}</span>
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div
|
||||
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground bg-muted/60 px-2.5 py-1 rounded-md shrink-0"
|
||||
title={m.agents_md_readonly_hint()}
|
||||
>
|
||||
<Lock className="h-3.5 w-3.5 shrink-0" />
|
||||
<span>{m.agents_md_readonly_hint()}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center gap-2 shrink-0">
|
||||
{canAdmin && <Separator orientation="vertical" className="h-4 shrink-0" />}
|
||||
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={handleClose}
|
||||
disabled={isClosing}
|
||||
className="h-7 px-2.5 hover:bg-muted text-muted-foreground hover:text-foreground shrink-0"
|
||||
title={m.close()}
|
||||
>
|
||||
<X className="h-4 w-4 mr-1 shrink-0" />
|
||||
<span>{m.close()}</span>
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
if (isLoading || !isInitialized) {
|
||||
return (
|
||||
<div className="flex-1 flex items-center justify-center p-8 text-sm text-muted-foreground">
|
||||
<Save className="h-4 w-4 animate-pulse mr-2" />
|
||||
<span>{m.agents_md_loading()}</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex-1 flex flex-col h-full min-h-0 overflow-hidden">
|
||||
<MarkdownEditor
|
||||
value={content}
|
||||
onChange={handleContentChange}
|
||||
placeholder={m.agents_md_placeholder()}
|
||||
readOnly={!canAdmin}
|
||||
rightToolbarContent={rightToolbarContent}
|
||||
className="flex-1 flex flex-col h-full min-h-0 border rounded-lg shadow-sm"
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,158 @@
|
||||
import { client } from '@/ui/api/client'
|
||||
import { ChatbotSidebar } from '@/ui/components/chatbot-sidebar'
|
||||
import { FolderTree } from '@/ui/components/folder-tree'
|
||||
import { ResizeHandle } from '@/ui/components/resize-handle'
|
||||
import { useChatbotStore } from '@/ui/stores/chatbot'
|
||||
import { useTopNavStore } from '@/ui/stores/top-nav'
|
||||
import { useUiStore } from '@/ui/stores/ui'
|
||||
import type { AncestorFolder, AssetInfo } from '@shumai/dtos'
|
||||
import { useQuery } from '@tanstack/react-query'
|
||||
import { useNavigate } from '@tanstack/react-router'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { AgentsMdEditor } from './agents-md-editor'
|
||||
|
||||
export interface AgentsMdManagerProps {
|
||||
teamId: string
|
||||
projectId: string
|
||||
projectName: string
|
||||
assetId: string
|
||||
rootFolderId: string
|
||||
isRoot?: boolean
|
||||
}
|
||||
|
||||
export default function AgentsMdManager({
|
||||
teamId,
|
||||
projectId,
|
||||
projectName,
|
||||
assetId,
|
||||
rootFolderId,
|
||||
isRoot,
|
||||
}: AgentsMdManagerProps) {
|
||||
const navigate = useNavigate()
|
||||
const [leftSidebarWidth, setLeftSidebarWidth] = useState(240)
|
||||
const [rightSidebarWidth, setRightSidebarWidth] = useState(360)
|
||||
const {
|
||||
fileListLeftSidebarCollapsed: isLeftSidebarCollapsed,
|
||||
setFileListLeftSidebarCollapsed: setIsLeftSidebarCollapsed,
|
||||
} = useUiStore()
|
||||
const { isChatbotOpen, setIsChatbotOpen } = useChatbotStore()
|
||||
|
||||
const { data: folderInfo } = useQuery({
|
||||
queryKey: ['folders', assetId],
|
||||
queryFn: async () => {
|
||||
const res = await client.api.folders[':folderId'].$get({
|
||||
param: { folderId: assetId },
|
||||
})
|
||||
if (!res.ok) throw new Error('failed to fetch folder')
|
||||
return (await res.json()) as unknown as AssetInfo
|
||||
},
|
||||
enabled: !!assetId,
|
||||
})
|
||||
|
||||
const { setProjectState, clearProjectState } = useTopNavStore()
|
||||
|
||||
useEffect(() => {
|
||||
const isRootFolder = isRoot || assetId === rootFolderId
|
||||
const ancestors: AncestorFolder[] = isRootFolder
|
||||
? []
|
||||
: folderInfo?.name
|
||||
? [{ id: assetId, name: folderInfo.name }, ...(folderInfo?.ancestorFolders ?? [])]
|
||||
: (folderInfo?.ancestorFolders ?? [])
|
||||
|
||||
setProjectState({
|
||||
teamId,
|
||||
projectId,
|
||||
projectName,
|
||||
ancestorFolders: ancestors,
|
||||
currentAsset: { name: folderInfo?.name, type: 'folder' },
|
||||
isRootFolder: true,
|
||||
customTerminalBreadcrumb: 'AGENTS.md',
|
||||
onFolderClick: (id: string) => {
|
||||
navigate({
|
||||
to: '/projects/$projectId/folders/$folderId',
|
||||
params: { projectId, folderId: id },
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
return () => clearProjectState()
|
||||
}, [
|
||||
teamId,
|
||||
projectId,
|
||||
projectName,
|
||||
folderInfo?.ancestorFolders,
|
||||
folderInfo?.name,
|
||||
isRoot,
|
||||
assetId,
|
||||
rootFolderId,
|
||||
setProjectState,
|
||||
clearProjectState,
|
||||
navigate,
|
||||
])
|
||||
|
||||
return (
|
||||
<div className="flex-1 flex flex-col h-full overflow-hidden bg-background">
|
||||
<div className="flex-1 flex overflow-hidden relative">
|
||||
{!isLeftSidebarCollapsed && (
|
||||
<div
|
||||
className="md:hidden fixed inset-0 bg-black/50 z-40"
|
||||
onClick={() => setIsLeftSidebarCollapsed(true)}
|
||||
/>
|
||||
)}
|
||||
{isChatbotOpen && (
|
||||
<div
|
||||
className="md:hidden fixed inset-0 bg-black/50 z-40"
|
||||
onClick={() => setIsChatbotOpen(false)}
|
||||
/>
|
||||
)}
|
||||
|
||||
{!isLeftSidebarCollapsed && (
|
||||
<>
|
||||
<div className="bg-background flex-shrink-0" style={{ width: leftSidebarWidth }}>
|
||||
<FolderTree
|
||||
teamId={teamId}
|
||||
projectId={projectId}
|
||||
projectName={projectName}
|
||||
rootFolderId={rootFolderId}
|
||||
selectedFolderId={assetId}
|
||||
ancestorFolders={folderInfo?.ancestorFolders ?? []}
|
||||
/>
|
||||
</div>
|
||||
<ResizeHandle
|
||||
onResize={(delta) => {
|
||||
setLeftSidebarWidth((prev) => Math.max(180, Math.min(400, prev + delta)))
|
||||
}}
|
||||
className="hidden md:block"
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
|
||||
<div className="flex-1 flex flex-col min-w-0 min-h-0 bg-background overflow-hidden p-3">
|
||||
<AgentsMdEditor
|
||||
projectId={projectId}
|
||||
assetId={assetId}
|
||||
rootFolderId={rootFolderId}
|
||||
isRoot={isRoot}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{isChatbotOpen && (
|
||||
<>
|
||||
<ResizeHandle
|
||||
onResize={(delta) => {
|
||||
setRightSidebarWidth((prev) => Math.max(240, Math.min(600, prev - delta)))
|
||||
}}
|
||||
className="hidden md:block"
|
||||
/>
|
||||
<div
|
||||
style={{ width: rightSidebarWidth }}
|
||||
className="bg-background flex flex-col flex-shrink-0"
|
||||
>
|
||||
<ChatbotSidebar projectId={projectId} contextAssetId={assetId} />
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
import { useState } from 'react'
|
||||
import { CircleHelp, Sparkles, Bot, Ban } from 'lucide-react'
|
||||
import { m } from '@/ui/paraglide/messages.js'
|
||||
import { Button } from '@/ui/components/ui/button'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogDescription,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
DialogTrigger,
|
||||
} from '@/ui/components/ui/dialog'
|
||||
|
||||
export function AutofillSourceHelpTrigger() {
|
||||
const [open, setOpen] = useState(false)
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={setOpen}>
|
||||
<DialogTrigger asChild>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="h-4 w-4 p-0 hover:bg-transparent text-muted-foreground hover:text-foreground inline-flex items-center justify-center shrink-0 ml-1"
|
||||
title={m.autofill_source_help_title()}
|
||||
>
|
||||
<CircleHelp className="h-3.5 w-3.5" />
|
||||
<span className="sr-only">{m.autofill_source_help_title()}</span>
|
||||
</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent className="sm:max-w-[500px]">
|
||||
<DialogHeader>
|
||||
<DialogTitle className="flex items-center gap-2">
|
||||
<CircleHelp className="h-5 w-5 text-muted-foreground" />
|
||||
{m.autofill_source_help_title()}
|
||||
</DialogTitle>
|
||||
<DialogDescription>{m.autofill_source_help_desc()}</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="space-y-4 py-2">
|
||||
{/* Option 1: None */}
|
||||
<div className="rounded-lg border p-3.5 space-y-1.5 bg-muted/30">
|
||||
<div className="flex items-center gap-2 font-medium text-sm">
|
||||
<Ban className="h-4 w-4 text-muted-foreground shrink-0" />
|
||||
<span>{m.autofill_source_none()}</span>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground leading-relaxed">
|
||||
{m.autofill_source_none_desc()}
|
||||
</p>
|
||||
<p className="text-xs italic text-muted-foreground/80">
|
||||
{m.autofill_source_none_example()}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Option 2: Content */}
|
||||
<div className="rounded-lg border p-3.5 space-y-1.5 bg-muted/30">
|
||||
<div className="flex items-center gap-2 font-medium text-sm">
|
||||
<Sparkles className="h-4 w-4 text-amber-500 shrink-0" />
|
||||
<span>{m.autofill_source_content()}</span>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground leading-relaxed">
|
||||
{m.autofill_source_content_desc()}
|
||||
</p>
|
||||
<p className="text-xs italic text-muted-foreground/80">
|
||||
{m.autofill_source_content_example()}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Option 3: Creation Context */}
|
||||
<div className="rounded-lg border p-3.5 space-y-1.5 bg-muted/30">
|
||||
<div className="flex items-center gap-2 font-medium text-sm">
|
||||
<Bot className="h-4 w-4 text-blue-500 shrink-0" />
|
||||
<span>{m.autofill_source_creation_context()}</span>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground leading-relaxed">
|
||||
{m.autofill_source_creation_context_desc()}
|
||||
</p>
|
||||
<p className="text-xs italic text-muted-foreground/80">
|
||||
{m.autofill_source_creation_context_example()}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -40,6 +40,8 @@ import {
|
||||
LayoutGrid,
|
||||
List,
|
||||
} from 'lucide-react'
|
||||
import { useState } from 'react'
|
||||
import { ManageVersionsDialog } from './manage-versions-dialog'
|
||||
|
||||
interface BreadcrumbNavProps {
|
||||
teamId: string
|
||||
@@ -53,6 +55,7 @@ interface BreadcrumbNavProps {
|
||||
proxyType?: 'image' | 'video' | 'audio' | 'pdf' | null
|
||||
}
|
||||
isRootFolder: boolean
|
||||
customTerminalBreadcrumb?: string
|
||||
displayStyle?: 'card' | 'list'
|
||||
onDisplayStyleChange?: (style: 'card' | 'list') => void
|
||||
isLeftSidebarCollapsed?: boolean
|
||||
@@ -95,6 +98,7 @@ export function BreadcrumbNav({
|
||||
ancestorFolders,
|
||||
currentAsset,
|
||||
isRootFolder,
|
||||
customTerminalBreadcrumb,
|
||||
displayStyle,
|
||||
onDisplayStyleChange,
|
||||
isLeftSidebarCollapsed,
|
||||
@@ -118,6 +122,7 @@ export function BreadcrumbNav({
|
||||
}: BreadcrumbNavProps) {
|
||||
const navigate = useNavigate()
|
||||
const { canEdit } = usePermissions(projectId)
|
||||
const [isManageVersionsOpen, setIsManageVersionsOpen] = useState(false)
|
||||
|
||||
const isChatbotDisabled = false
|
||||
|
||||
@@ -219,7 +224,14 @@ export function BreadcrumbNav({
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
{!isRootFolder && !compareMode && (
|
||||
{customTerminalBreadcrumb ? (
|
||||
<div className="flex items-center gap-1">
|
||||
<span className="text-muted-foreground">/</span>
|
||||
<span className="truncate rounded px-2 py-1 text-sm font-medium text-foreground">
|
||||
{customTerminalBreadcrumb}
|
||||
</span>
|
||||
</div>
|
||||
) : !isRootFolder && !compareMode ? (
|
||||
<div className="flex items-center gap-1">
|
||||
<span className="text-muted-foreground">/</span>
|
||||
{currentAsset.type === 'folder' ? (
|
||||
@@ -227,7 +239,7 @@ export function BreadcrumbNav({
|
||||
{currentAsset.name}
|
||||
</span>
|
||||
) : (
|
||||
<DropdownMenu>
|
||||
<DropdownMenu modal={false}>
|
||||
<DropdownMenuTrigger className="flex items-center gap-1 truncate rounded px-2 py-1 text-sm font-medium text-foreground transition-colors hover:bg-accent hover:text-accent-foreground">
|
||||
<span>{currentAsset.name}</span>
|
||||
{currentAsset.version !== undefined && (
|
||||
@@ -370,10 +382,10 @@ export function BreadcrumbNav({
|
||||
<DropdownMenuSeparator />
|
||||
<div className="p-1">
|
||||
<button
|
||||
className="w-full text-center text-xs font-medium py-2 px-3 rounded-md bg-muted/80 hover:bg-muted text-foreground transition-colors"
|
||||
onClick={() => console.log('Manage versions')}
|
||||
className="w-full text-center text-xs font-medium py-2 px-3 rounded-md bg-muted/80 hover:bg-muted text-foreground transition-colors cursor-pointer"
|
||||
onClick={() => setIsManageVersionsOpen(true)}
|
||||
>
|
||||
Manage versions...
|
||||
{m.manage_versions()}
|
||||
</button>
|
||||
</div>
|
||||
</DropdownMenuSubContent>
|
||||
@@ -385,6 +397,40 @@ export function BreadcrumbNav({
|
||||
</DropdownMenu>
|
||||
)}
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{fileId && versions && versions.length > 0 && (
|
||||
<ManageVersionsDialog
|
||||
open={isManageVersionsOpen}
|
||||
onOpenChange={setIsManageVersionsOpen}
|
||||
stackId={fileId}
|
||||
canEdit={canEdit}
|
||||
onStackDissolved={(remainingFileId) => {
|
||||
setIsManageVersionsOpen(false)
|
||||
navigate({
|
||||
to: '/projects/$projectId/files/$fileId',
|
||||
params: { projectId, fileId: remainingFileId },
|
||||
})
|
||||
}}
|
||||
onVersionRemoved={(removedVersionId, remainingVersions) => {
|
||||
const currentVersionId = currentAsset.version
|
||||
? versions.find((v) => v.version === currentAsset.version)?.id
|
||||
: undefined
|
||||
if (currentVersionId === removedVersionId) {
|
||||
const topVersion = remainingVersions[0]
|
||||
if (topVersion) {
|
||||
navigate({
|
||||
to: '/projects/$projectId/files/$fileId',
|
||||
params: { projectId, fileId },
|
||||
search: (prev: Record<string, unknown>) => ({
|
||||
...prev,
|
||||
version: topVersion.id,
|
||||
}),
|
||||
})
|
||||
}
|
||||
}
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import UserField from './fields/user-field'
|
||||
import UserMultiField from './fields/user-multi-field'
|
||||
|
||||
interface FieldRendererProps {
|
||||
fieldId?: string
|
||||
config: FieldInfo['config']
|
||||
value: unknown
|
||||
onSave?: (value: unknown) => void
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import {
|
||||
FieldType,
|
||||
AutofillSource,
|
||||
type FieldInfo,
|
||||
type FieldInfo as MetadataFieldInfo,
|
||||
type SelectOption,
|
||||
@@ -24,8 +25,32 @@ import { Popover, PopoverContent, PopoverTrigger } from '@/ui/components/ui/popo
|
||||
import { Input } from '@/ui/components/ui/input'
|
||||
import { Label } from '@/ui/components/ui/label'
|
||||
import { Switch } from '@/ui/components/ui/switch'
|
||||
import { ToggleGroup, ToggleGroupItem } from '@/ui/components/ui/toggle-group'
|
||||
import { reorderFieldSubset } from '@/ui/lib/dnd-utils'
|
||||
import { PointerActivationConstraints } from '@dnd-kit/dom'
|
||||
import {
|
||||
AlignLeft,
|
||||
Calendar,
|
||||
ChevronDown,
|
||||
GripVertical,
|
||||
Hash,
|
||||
List,
|
||||
Plus,
|
||||
Search,
|
||||
Settings,
|
||||
Sparkles,
|
||||
Bot,
|
||||
Star,
|
||||
Tags,
|
||||
ToggleLeft,
|
||||
Type,
|
||||
X,
|
||||
User,
|
||||
Users,
|
||||
} from 'lucide-react'
|
||||
import { useMemo, useState, useEffect } from 'react'
|
||||
|
||||
import { AutofillSourceHelpTrigger } from '@/ui/components/autofill-source-help-dialog'
|
||||
|
||||
export const PREDEFINED_COLORS = ['red', 'orange', 'yellow', 'green', 'blue', 'purple', 'gray']
|
||||
|
||||
@@ -80,26 +105,6 @@ export function getRandomUnusedColor(existingOptions: SelectOption[] = []): stri
|
||||
}
|
||||
return PREDEFINED_COLORS[Math.floor(Math.random() * PREDEFINED_COLORS.length)]
|
||||
}
|
||||
import {
|
||||
AlignLeft,
|
||||
Calendar,
|
||||
ChevronDown,
|
||||
GripVertical,
|
||||
Hash,
|
||||
List,
|
||||
Plus,
|
||||
Search,
|
||||
Settings,
|
||||
Sparkles,
|
||||
Star,
|
||||
Tags,
|
||||
ToggleLeft,
|
||||
Type,
|
||||
X,
|
||||
User,
|
||||
Users,
|
||||
} from 'lucide-react'
|
||||
import { useMemo, useState, useEffect } from 'react'
|
||||
|
||||
export const FIELD_TYPE_ICONS: Record<FieldType, React.ComponentType<{ className?: string }>> = {
|
||||
[FieldType.text]: Type,
|
||||
@@ -135,7 +140,12 @@ function SortableFieldItem({ field, index, onVisibilityChange }: SortableFieldIt
|
||||
<GripVertical className="h-4 w-4 text-muted-foreground" />
|
||||
</div>
|
||||
{Icon && <Icon className="h-4 w-4 text-muted-foreground shrink-0" />}
|
||||
{field.aiAutofill && <Sparkles className="h-4 w-4 text-muted-foreground shrink-0" />}
|
||||
{field.config?.autofillSource === AutofillSource.CONTENT && (
|
||||
<Sparkles className="h-4 w-4 text-muted-foreground shrink-0" />
|
||||
)}
|
||||
{field.config?.autofillSource === AutofillSource.CREATION_CONTEXT && (
|
||||
<Bot className="h-4 w-4 text-muted-foreground shrink-0" />
|
||||
)}
|
||||
<span className="text-sm truncate">{field.config?.name}</span>
|
||||
</div>
|
||||
<Switch
|
||||
@@ -158,7 +168,7 @@ export function FieldsManager({ projectId, onManageFields, onSave }: FieldsManag
|
||||
const [view, setView] = useState<'list' | 'create'>('list')
|
||||
const [newFieldName, setNewFieldName] = useState('')
|
||||
const [newFieldType, setNewFieldType] = useState<FieldType | ''>('')
|
||||
const [newAiAutofill, setNewAiAutofill] = useState(false)
|
||||
const [newAutofillSource, setNewAutofillSource] = useState<AutofillSource>(AutofillSource.NONE)
|
||||
const [newDescription, setNewDescription] = useState('')
|
||||
const [newOptions, setNewOptions] = useState<SelectOption[]>([])
|
||||
|
||||
@@ -265,10 +275,10 @@ export function FieldsManager({ projectId, onManageFields, onSave }: FieldsManag
|
||||
config: {
|
||||
name: newFieldName,
|
||||
type: newFieldType,
|
||||
autofillSource: newAutofillSource,
|
||||
...typeConfig,
|
||||
},
|
||||
label: newFieldName,
|
||||
aiAutofill: newAiAutofill,
|
||||
description: newDescription,
|
||||
},
|
||||
})
|
||||
@@ -333,9 +343,38 @@ export function FieldsManager({ projectId, onManageFields, onSave }: FieldsManag
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center space-x-2">
|
||||
<Switch id="ai-autofill" checked={newAiAutofill} onCheckedChange={setNewAiAutofill} />
|
||||
<Label htmlFor="ai-autofill">{m.ai_autofill()}</Label>
|
||||
<div className="space-y-2">
|
||||
<div className="flex items-center gap-1">
|
||||
<Label>{m.autofill_source()}</Label>
|
||||
<AutofillSourceHelpTrigger />
|
||||
</div>
|
||||
<ToggleGroup
|
||||
type="single"
|
||||
value={newAutofillSource}
|
||||
onValueChange={(val: string) => {
|
||||
if (val) setNewAutofillSource(val as AutofillSource)
|
||||
}}
|
||||
className="w-full grid grid-cols-3 border rounded-md p-1 gap-1"
|
||||
>
|
||||
<ToggleGroupItem
|
||||
value={AutofillSource.NONE}
|
||||
className="text-[11px] leading-tight py-1 px-1 h-auto min-h-[32px] w-full text-center justify-center whitespace-normal font-medium"
|
||||
>
|
||||
{m.autofill_source_none()}
|
||||
</ToggleGroupItem>
|
||||
<ToggleGroupItem
|
||||
value={AutofillSource.CONTENT}
|
||||
className="text-[11px] leading-tight py-1 px-1 h-auto min-h-[32px] w-full text-center justify-center whitespace-normal font-medium"
|
||||
>
|
||||
{m.autofill_source_content()}
|
||||
</ToggleGroupItem>
|
||||
<ToggleGroupItem
|
||||
value={AutofillSource.CREATION_CONTEXT}
|
||||
className="text-[11px] leading-tight py-1 px-1 h-auto min-h-[32px] w-full text-center justify-center whitespace-normal font-medium"
|
||||
>
|
||||
{m.autofill_source_creation_context()}
|
||||
</ToggleGroupItem>
|
||||
</ToggleGroup>
|
||||
</div>
|
||||
|
||||
{(newFieldType === FieldType.select || newFieldType === FieldType.selectMulti) && (
|
||||
@@ -424,7 +463,7 @@ export function FieldsManager({ projectId, onManageFields, onSave }: FieldsManag
|
||||
setView('list')
|
||||
setNewFieldName('')
|
||||
setNewFieldType('')
|
||||
setNewAiAutofill(false)
|
||||
setNewAutofillSource(AutofillSource.NONE)
|
||||
setNewDescription('')
|
||||
setNewOptions([])
|
||||
}}
|
||||
|
||||
@@ -7,4 +7,5 @@ export interface FieldProps<T = unknown> {
|
||||
config: FieldConfig
|
||||
onSave: (value: T) => void
|
||||
readOnly?: boolean
|
||||
fieldId?: string
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { cleanup, fireEvent, render, screen } from '@testing-library/react'
|
||||
import React from 'react'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import LongTextField from './long-text-field'
|
||||
|
||||
describe('LongTextField Component', () => {
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
const dummyConfig = {
|
||||
name: 'Description',
|
||||
type: 'longText' as const,
|
||||
}
|
||||
|
||||
it('renders collapsed placeholder with fixed 2-row height and whitespace-pre-wrap', () => {
|
||||
render(<LongTextField value="Line 1\nLine 2\nLine 3" config={dummyConfig} onSave={vi.fn()} />)
|
||||
const collapsed = screen.getByTitle('Click to expand')
|
||||
expect(collapsed).toBeTruthy()
|
||||
expect(collapsed.className).toContain('h-[48px]')
|
||||
expect(collapsed.className).toContain('line-clamp-2')
|
||||
expect(collapsed.className).toContain('whitespace-pre-wrap')
|
||||
})
|
||||
|
||||
it('renders Empty state inside 2-row container when value is empty', () => {
|
||||
render(<LongTextField value="" config={dummyConfig} onSave={vi.fn()} />)
|
||||
const collapsed = screen.getByTitle('Click to expand')
|
||||
expect(collapsed.className).toContain('h-[48px]')
|
||||
expect(screen.getByText('Empty')).toBeTruthy()
|
||||
})
|
||||
|
||||
it('expands on click to show full content overlay', () => {
|
||||
render(<LongTextField value="Line 1\nLine 2\nLine 3" config={dummyConfig} onSave={vi.fn()} />)
|
||||
const collapsed = screen.getByTitle('Click to expand')
|
||||
fireEvent.click(collapsed)
|
||||
|
||||
const elements = screen.getAllByText(/Line 1/)
|
||||
expect(elements.length).toBe(2)
|
||||
})
|
||||
})
|
||||
@@ -73,7 +73,7 @@ const LongTextField: React.FC<FieldProps<string>> = ({ value, onSave, readOnly }
|
||||
{/* Placeholder */}
|
||||
<div
|
||||
onClick={handlePlaceholderClick}
|
||||
className={`w-full text-foreground rounded border border-transparent transition-all px-2 py-1 line-clamp-2 max-h-[3rem] overflow-hidden ${
|
||||
className={`w-full text-foreground rounded border border-transparent transition-all px-2 py-1 h-[48px] line-clamp-2 whitespace-pre-wrap overflow-hidden ${
|
||||
!readOnly ? 'cursor-pointer hover:bg-accent hover:border-border' : 'cursor-pointer'
|
||||
}`}
|
||||
title="Click to expand"
|
||||
|
||||
@@ -0,0 +1,134 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
|
||||
import React from 'react'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import SelectField from './select-field'
|
||||
|
||||
// Mock client and stores
|
||||
vi.mock('@/ui/api/client', () => ({
|
||||
client: {
|
||||
api: {
|
||||
fields: {
|
||||
':fieldId': {
|
||||
$put: vi.fn(),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('@/ui/stores/fields', () => ({
|
||||
useFieldStore: {
|
||||
getState: () => ({
|
||||
fields: [],
|
||||
updateFields: vi.fn(),
|
||||
}),
|
||||
},
|
||||
}))
|
||||
|
||||
describe('SelectField Component', () => {
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
const sampleConfig = {
|
||||
name: 'Status',
|
||||
type: 'select' as const,
|
||||
select: {
|
||||
options: [
|
||||
{ id: 'foo', displayName: 'Foo', color: '#ff0000' },
|
||||
{ id: 'bar', displayName: 'Bar', color: '#00ff00' },
|
||||
{ id: 'abc', displayName: 'abc', color: '#0000ff' },
|
||||
],
|
||||
},
|
||||
}
|
||||
|
||||
it('renders selected option badge correctly', () => {
|
||||
const { container } = render(<SelectField value="foo" config={sampleConfig} onSave={vi.fn()} />)
|
||||
const badge = screen.getByText('Foo')
|
||||
expect(badge).toBeTruthy()
|
||||
expect(badge.className).toContain('h-[22px]')
|
||||
const trigger = container.querySelector('div[class*="h-[28px]"]')
|
||||
expect(trigger).toBeTruthy()
|
||||
})
|
||||
|
||||
it('renders placeholder with text-sm styling', () => {
|
||||
const { container } = render(<SelectField value="" config={sampleConfig} onSave={vi.fn()} />)
|
||||
const placeholder = screen.getByText('Select an option')
|
||||
expect(placeholder).toBeTruthy()
|
||||
expect(placeholder.className).toContain('text-sm')
|
||||
const trigger = container.querySelector('div[class*="h-[28px]"]')
|
||||
expect(trigger).toBeTruthy()
|
||||
})
|
||||
|
||||
it('filters options based on search query', () => {
|
||||
render(<SelectField value="" config={sampleConfig} onSave={vi.fn()} />)
|
||||
|
||||
// Click trigger to open popover
|
||||
const trigger = screen.getByText('Select an option')
|
||||
fireEvent.click(trigger)
|
||||
|
||||
// Search box should be visible
|
||||
const searchInput = screen.getByPlaceholderText('Search options...')
|
||||
expect(searchInput).toBeTruthy()
|
||||
|
||||
// Type "bc" -> should only show "abc" and "Add options: bc"
|
||||
fireEvent.change(searchInput, { target: { value: 'bc' } })
|
||||
expect(screen.getByText('abc')).toBeTruthy()
|
||||
expect(screen.queryByText('Foo')).toBeNull()
|
||||
expect(screen.queryByText('Bar')).toBeNull()
|
||||
|
||||
// Add option action should be present for "bc"
|
||||
expect(screen.getByText('Add options: bc')).toBeTruthy()
|
||||
})
|
||||
|
||||
it('hides add option button when user input matches an option exactly', () => {
|
||||
render(<SelectField value="" config={sampleConfig} onSave={vi.fn()} />)
|
||||
|
||||
const trigger = screen.getByText('Select an option')
|
||||
fireEvent.click(trigger)
|
||||
|
||||
const searchInput = screen.getByPlaceholderText('Search options...')
|
||||
|
||||
// Type "abc" -> exact match with option "abc"
|
||||
fireEvent.change(searchInput, { target: { value: 'abc' } })
|
||||
expect(screen.getByText('abc')).toBeTruthy()
|
||||
// "Add options: abc" button should be hidden
|
||||
expect(screen.queryByText('Add options: abc')).toBeNull()
|
||||
// Type "foo" -> exact match with option id "foo" / displayName "Foo"
|
||||
fireEvent.change(searchInput, { target: { value: 'foo' } })
|
||||
expect(screen.queryByText('Add options: foo')).toBeNull()
|
||||
})
|
||||
|
||||
it('calls API and onSave when adding a new option', async () => {
|
||||
const onSave = vi.fn()
|
||||
const { client } = await import('@/ui/api/client')
|
||||
vi.mocked(client.api.fields[':fieldId'].$put).mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({}),
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
} as any)
|
||||
|
||||
render(<SelectField value="" config={sampleConfig} fieldId="field_123" onSave={onSave} />)
|
||||
|
||||
const trigger = screen.getByText('Select an option')
|
||||
fireEvent.click(trigger)
|
||||
|
||||
const searchInput = screen.getByPlaceholderText('Search options...')
|
||||
fireEvent.change(searchInput, { target: { value: 'New Custom Option' } })
|
||||
|
||||
const addBtn = screen.getByText('Add options: New Custom Option')
|
||||
expect(addBtn).toBeTruthy()
|
||||
fireEvent.click(addBtn)
|
||||
|
||||
await waitFor(() => {
|
||||
expect(client.api.fields[':fieldId'].$put).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
param: { fieldId: 'field_123' },
|
||||
}),
|
||||
)
|
||||
expect(onSave).toHaveBeenCalledWith('new-custom-option')
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -1,15 +1,37 @@
|
||||
import type { SelectOption } from '@shumai/dtos'
|
||||
import { ChevronDown, X } from 'lucide-react'
|
||||
import type { FieldInfo, SelectOption } from '@shumai/dtos'
|
||||
import { ChevronDown, Plus, Search, X } from 'lucide-react'
|
||||
import React, { useState } from 'react'
|
||||
import { toast } from 'sonner'
|
||||
import type { FieldProps } from './field-types'
|
||||
import { client } from '@/ui/api/client'
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/ui/components/ui/popover'
|
||||
import { getOptionStyle } from '../fields-manager'
|
||||
import { m } from '@/ui/paraglide/messages.js'
|
||||
import { useFieldStore } from '@/ui/stores/fields'
|
||||
import { getOptionStyle, getRandomUnusedColor } from '../fields-manager'
|
||||
|
||||
const SelectField: React.FC<FieldProps<string>> = ({ value, config, onSave, readOnly }) => {
|
||||
const SelectField: React.FC<FieldProps<string>> = ({
|
||||
value,
|
||||
config,
|
||||
onSave,
|
||||
readOnly,
|
||||
fieldId,
|
||||
}) => {
|
||||
const selectConfig = config?.select
|
||||
const options: SelectOption[] = selectConfig?.options || []
|
||||
const [isEditing, setIsEditing] = useState(false)
|
||||
const [searchQuery, setSearchQuery] = useState('')
|
||||
|
||||
const selectedOption = selectConfig?.options?.find((opt: SelectOption) => opt.id === value)
|
||||
const selectedOption = options.find((opt: SelectOption) => opt.id === value)
|
||||
|
||||
const trimmedSearch = searchQuery.trim()
|
||||
const filteredOptions = options.filter((opt: SelectOption) =>
|
||||
opt.displayName.toLowerCase().includes(trimmedSearch.toLowerCase()),
|
||||
)
|
||||
const hasExactMatch = options.some(
|
||||
(opt: SelectOption) =>
|
||||
opt.displayName.trim().toLowerCase() === trimmedSearch.toLowerCase() ||
|
||||
opt.id.toLowerCase() === trimmedSearch.toLowerCase(),
|
||||
)
|
||||
|
||||
const handleStartEdit = () => {
|
||||
if (!readOnly) {
|
||||
@@ -20,18 +42,68 @@ const SelectField: React.FC<FieldProps<string>> = ({ value, config, onSave, read
|
||||
const handleSelect = (optionId: string) => {
|
||||
onSave(optionId)
|
||||
setIsEditing(false)
|
||||
setSearchQuery('')
|
||||
}
|
||||
|
||||
const handleOpenChange = (open: boolean) => {
|
||||
if (readOnly) return
|
||||
setIsEditing(open)
|
||||
if (!open) {
|
||||
setSearchQuery('')
|
||||
}
|
||||
}
|
||||
|
||||
const handleAddOption = async () => {
|
||||
if (!trimmedSearch) return
|
||||
const newOption: SelectOption = {
|
||||
id: trimmedSearch.toLowerCase().replace(/\s+/g, '-'),
|
||||
displayName: trimmedSearch,
|
||||
color: getRandomUnusedColor(options),
|
||||
}
|
||||
const newOptions = [...options, newOption]
|
||||
const updatedConfig = {
|
||||
...config,
|
||||
select: {
|
||||
...selectConfig,
|
||||
options: newOptions,
|
||||
},
|
||||
}
|
||||
|
||||
if (fieldId) {
|
||||
try {
|
||||
const res = await client.api.fields[':fieldId'].$put({
|
||||
param: { fieldId },
|
||||
json: { config: updatedConfig },
|
||||
})
|
||||
if (!res.ok) {
|
||||
toast.error(m.failed_update_field())
|
||||
return
|
||||
}
|
||||
const updatedField = (await res.json()) as FieldInfo
|
||||
const currentFields = useFieldStore.getState().fields
|
||||
const newFields = currentFields.map((f) =>
|
||||
f.id === updatedField.id
|
||||
? { ...f, ...(updatedField as FieldInfo), visible: f.visible }
|
||||
: f,
|
||||
)
|
||||
useFieldStore.getState().updateFields(newFields)
|
||||
} catch {
|
||||
toast.error(m.failed_update_field())
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
onSave(newOption.id)
|
||||
setSearchQuery('')
|
||||
setIsEditing(false)
|
||||
}
|
||||
|
||||
const renderOptionBadge = (option: SelectOption | undefined) => {
|
||||
if (!option) return <span className="text-muted-foreground italic">Select an option</span>
|
||||
if (!option)
|
||||
return <span className="text-muted-foreground italic text-sm">Select an option</span>
|
||||
return (
|
||||
<span
|
||||
className="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium"
|
||||
className="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium h-[22px]"
|
||||
style={getOptionStyle(option.color)}
|
||||
>
|
||||
{option.displayName}
|
||||
@@ -45,7 +117,7 @@ const SelectField: React.FC<FieldProps<string>> = ({ value, config, onSave, read
|
||||
<PopoverTrigger asChild>
|
||||
<div
|
||||
onClick={handleStartEdit}
|
||||
className={`flex items-center justify-between w-full min-h-[28px] px-2 py-1 rounded border border-transparent transition-colors ${
|
||||
className={`flex items-center justify-between w-full h-[28px] px-2 rounded border border-transparent transition-colors ${
|
||||
!readOnly ? 'cursor-pointer hover:bg-accent hover:border-border group' : ''
|
||||
}`}
|
||||
>
|
||||
@@ -57,29 +129,69 @@ const SelectField: React.FC<FieldProps<string>> = ({ value, config, onSave, read
|
||||
</PopoverTrigger>
|
||||
|
||||
<PopoverContent
|
||||
className="p-1 w-[--radix-popover-trigger-width] min-w-[150px] max-h-60 overflow-auto bg-popover border border-border rounded-lg shadow-lg"
|
||||
side="bottom"
|
||||
align="start"
|
||||
sideOffset={4}
|
||||
className="p-1.5 w-64 max-h-72 flex flex-col bg-popover border border-border rounded-lg shadow-lg"
|
||||
>
|
||||
<div
|
||||
onClick={() => handleSelect('')}
|
||||
className="px-3 py-2 text-sm text-muted-foreground hover:bg-accent cursor-pointer flex items-center gap-2"
|
||||
className="relative pb-1.5 border-b border-border mb-1"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<X className="w-3 h-3" /> Clear
|
||||
<Search className="w-3.5 h-3.5 absolute left-2 top-2 text-muted-foreground" />
|
||||
<input
|
||||
type="text"
|
||||
className="w-full pl-7 pr-2 py-1 text-xs bg-muted/50 border border-input rounded-md focus:outline-none focus:ring-1 focus:ring-ring text-foreground"
|
||||
placeholder={m.search_options_placeholder()}
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
autoFocus
|
||||
/>
|
||||
</div>
|
||||
{selectConfig?.options?.map((option: SelectOption) => (
|
||||
<div
|
||||
key={option.id}
|
||||
onClick={() => handleSelect(option.id)}
|
||||
className="px-3 py-2 hover:bg-accent cursor-pointer flex items-center"
|
||||
>
|
||||
<span
|
||||
className="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium"
|
||||
style={getOptionStyle(option.color)}
|
||||
|
||||
<div className="overflow-y-auto max-h-48 min-h-[120px] space-y-0.5">
|
||||
{searchQuery === '' && (
|
||||
<div
|
||||
onClick={() => handleSelect('')}
|
||||
className="px-2.5 py-1.5 text-xs text-muted-foreground hover:bg-accent hover:text-accent-foreground rounded cursor-pointer flex items-center gap-2"
|
||||
>
|
||||
{option.displayName}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
<X className="w-3.5 h-3.5" /> Clear
|
||||
</div>
|
||||
)}
|
||||
|
||||
{filteredOptions.map((option: SelectOption) => (
|
||||
<div
|
||||
key={option.id}
|
||||
onClick={() => handleSelect(option.id)}
|
||||
className={`px-2.5 py-1.5 text-xs hover:bg-accent rounded cursor-pointer flex items-center justify-between ${
|
||||
value === option.id ? 'bg-accent/50 font-medium' : ''
|
||||
}`}
|
||||
>
|
||||
<span
|
||||
className="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium"
|
||||
style={getOptionStyle(option.color)}
|
||||
>
|
||||
{option.displayName}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
|
||||
{filteredOptions.length === 0 && !trimmedSearch && (
|
||||
<div className="px-2.5 py-2 text-xs text-muted-foreground italic text-center">
|
||||
{m.no_options_found()}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{trimmedSearch !== '' && !hasExactMatch && (
|
||||
<div
|
||||
onClick={handleAddOption}
|
||||
className="px-2.5 py-1.5 text-xs text-primary hover:bg-accent rounded cursor-pointer flex items-center gap-1.5 font-medium border-t border-border mt-1 pt-1.5"
|
||||
>
|
||||
<Plus className="w-3.5 h-3.5 shrink-0" />
|
||||
<span className="truncate">{m.add_option_with_name({ name: trimmedSearch })}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
</div>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user