Skip to content

improvement(refactor): move to soft deletion of resources + reliability improvements #3561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icecrasher321 merged 11 commits into from
Mar 13, 2026
Merged

improvement(refactor): move to soft deletion of resources + reliability improvements #3561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29e636b
improvement(deletion): migrate to soft deletion of resources
icecrasher321 Mar 12, 2026
3949401
progress
icecrasher321 Mar 13, 2026
0d7d31f
scoping fixes
icecrasher321 Mar 13, 2026
f1b2c94
round of fixes
icecrasher321 Mar 13, 2026
8ba189d
deduplicated name on workflow import
icecrasher321 Mar 13, 2026
dab4cb2
fix tests
icecrasher321 Mar 13, 2026
b9b709d
Merge branch 'feat/mothership-copilot' into improvement/soft-deletion…
icecrasher321 Mar 13, 2026
6375ffe
add migration
icecrasher321 Mar 13, 2026
f9ce858
cleanup dead code
icecrasher321 Mar 13, 2026
2a5b409
address bugbot comments
icecrasher321 Mar 13, 2026
d782f7c
optimize query
icecrasher321 Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions apps/sim/app/api/a2a/agents/[agentId]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { db } from '@sim/db'
import { a2aAgent, workflow } from '@sim/db/schema'
import { createLogger } from '@sim/logger'
import { eq } from 'drizzle-orm'
import { and, eq, isNull } from 'drizzle-orm'
import { type NextRequest, NextResponse } from 'next/server'
import { generateAgentCard, generateSkillsFromWorkflow } from '@/lib/a2a/agent-card'
import type { AgentCapabilities, AgentSkill } from '@/lib/a2a/types'
Expand Down Expand Up @@ -31,8 +31,8 @@ export async function GET(request: NextRequest, { params }: { params: Promise<Ro
workflow: workflow,
})
.from(a2aAgent)
.innerJoin(workflow, eq(a2aAgent.workflowId, workflow.id))
.where(eq(a2aAgent.id, agentId))
.innerJoin(workflow, and(eq(a2aAgent.workflowId, workflow.id), isNull(workflow.archivedAt)))
.where(and(eq(a2aAgent.id, agentId), isNull(a2aAgent.archivedAt)))
.limit(1)

if (!agent) {
Expand Down Expand Up @@ -94,7 +94,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<Ro
const [existingAgent] = await db
.select()
.from(a2aAgent)
.where(eq(a2aAgent.id, agentId))
.where(and(eq(a2aAgent.id, agentId), isNull(a2aAgent.archivedAt)))
.limit(1)

if (!existingAgent) {
Expand Down Expand Up @@ -164,7 +164,7 @@ export async function DELETE(request: NextRequest, { params }: { params: Promise
const [existingAgent] = await db
.select()
.from(a2aAgent)
.where(eq(a2aAgent.id, agentId))
.where(and(eq(a2aAgent.id, agentId), isNull(a2aAgent.archivedAt)))
.limit(1)

if (!existingAgent) {
Expand Down Expand Up @@ -203,7 +203,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<R
const [existingAgent] = await db
.select()
.from(a2aAgent)
.where(eq(a2aAgent.id, agentId))
.where(and(eq(a2aAgent.id, agentId), isNull(a2aAgent.archivedAt)))
.limit(1)

if (!existingAgent) {
Expand Down
22 changes: 17 additions & 5 deletions apps/sim/app/api/a2a/agents/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { db } from '@sim/db'
import { a2aAgent, workflow } from '@sim/db/schema'
import { createLogger } from '@sim/logger'
import { and, eq, sql } from 'drizzle-orm'
import { and, eq, isNull, sql } from 'drizzle-orm'
import { type NextRequest, NextResponse } from 'next/server'
import { v4 as uuidv4 } from 'uuid'
import { generateSkillsFromWorkflow } from '@/lib/a2a/agent-card'
Expand Down Expand Up @@ -72,8 +72,8 @@ export async function GET(request: NextRequest) {
)`.as('task_count'),
})
.from(a2aAgent)
.leftJoin(workflow, eq(a2aAgent.workflowId, workflow.id))
.where(eq(a2aAgent.workspaceId, workspaceId))
.leftJoin(workflow, and(eq(a2aAgent.workflowId, workflow.id), isNull(workflow.archivedAt)))
.where(and(eq(a2aAgent.workspaceId, workspaceId), isNull(a2aAgent.archivedAt)))
.orderBy(a2aAgent.createdAt)

logger.info(`Listed ${agents.length} A2A agents for workspace ${workspaceId}`)
Expand Down Expand Up @@ -123,7 +123,13 @@ export async function POST(request: NextRequest) {
isDeployed: workflow.isDeployed,
})
.from(workflow)
.where(and(eq(workflow.id, workflowId), eq(workflow.workspaceId, workspaceId)))
.where(
and(
eq(workflow.id, workflowId),
eq(workflow.workspaceId, workspaceId),
isNull(workflow.archivedAt)
)
)
.limit(1)

if (!wf) {
Expand All @@ -144,7 +150,13 @@ export async function POST(request: NextRequest) {
const [existing] = await db
.select({ id: a2aAgent.id })
.from(a2aAgent)
.where(and(eq(a2aAgent.workspaceId, workspaceId), eq(a2aAgent.workflowId, workflowId)))
.where(
and(
eq(a2aAgent.workspaceId, workspaceId),
eq(a2aAgent.workflowId, workflowId),
isNull(a2aAgent.archivedAt)
)
)
.limit(1)

if (existing) {
Expand Down
Loading