chore: import upstream snapshot with attribution
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,228 @@
|
||||
import { db } from '@sim/db'
|
||||
import { jobExecutionLogs } from '@sim/db/schema'
|
||||
import { createLogger } from '@sim/logger'
|
||||
import { and, desc, eq } from 'drizzle-orm'
|
||||
import { GetScheduledTaskLogs } from '@/lib/copilot/generated/tool-catalog-v1'
|
||||
import type { BaseServerTool, ServerToolContext } from '@/lib/copilot/tools/server/base-tool'
|
||||
import type { TraceSpan } from '@/lib/logs/types'
|
||||
import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
|
||||
|
||||
const logger = createLogger('GetJobLogsServerTool')
|
||||
|
||||
interface GetJobLogsArgs {
|
||||
jobId: string
|
||||
executionId?: string
|
||||
limit?: number
|
||||
includeDetails?: boolean
|
||||
workspaceId?: string
|
||||
}
|
||||
|
||||
interface ToolCallDetail {
|
||||
name: string
|
||||
input: unknown
|
||||
output: unknown
|
||||
error?: string
|
||||
duration: number
|
||||
}
|
||||
|
||||
interface JobLogEntry {
|
||||
executionId: string
|
||||
status: string
|
||||
trigger: string
|
||||
startedAt: string
|
||||
endedAt: string | null
|
||||
durationMs: number | null
|
||||
error?: string
|
||||
toolCalls?: ToolCallDetail[]
|
||||
output?: unknown
|
||||
cost?: unknown
|
||||
tokens?: unknown
|
||||
}
|
||||
|
||||
/**
|
||||
* Walks the trace-span tree and collects tool invocations from both data shapes:
|
||||
* - New: `type: 'tool'` spans nested under agent blocks in `children`.
|
||||
* - Legacy: a `toolCalls` array hanging off the agent span directly (pre-unification).
|
||||
*/
|
||||
function collectToolCalls(spans: TraceSpan[] | undefined): ToolCallDetail[] {
|
||||
if (!spans?.length) return []
|
||||
const collected: ToolCallDetail[] = []
|
||||
|
||||
const visit = (span: TraceSpan) => {
|
||||
if (span.type === 'tool') {
|
||||
const output = span.output as { result?: unknown } | undefined
|
||||
collected.push({
|
||||
name: span.name || 'unknown',
|
||||
input: span.input ?? {},
|
||||
output: output?.result ?? span.output,
|
||||
error: span.status === 'error' ? errorMessageFromSpan(span) : undefined,
|
||||
duration: span.duration || 0,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (span.toolCalls?.length) {
|
||||
for (const tc of span.toolCalls) {
|
||||
collected.push({
|
||||
name: tc.name || 'unknown',
|
||||
input: tc.input ?? {},
|
||||
output: tc.output ?? undefined,
|
||||
error: tc.error || undefined,
|
||||
duration: tc.duration || 0,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if (span.children?.length) {
|
||||
for (const child of span.children) visit(child)
|
||||
}
|
||||
}
|
||||
|
||||
for (const span of spans) visit(span)
|
||||
return collected
|
||||
}
|
||||
|
||||
function errorMessageFromSpan(span: TraceSpan): string | undefined {
|
||||
const out = span.output as { error?: unknown } | undefined
|
||||
if (typeof out?.error === 'string') return out.error
|
||||
return undefined
|
||||
}
|
||||
|
||||
function extractOutputAndError(
|
||||
executionData: { traceSpans?: TraceSpan[] } & Record<string, unknown>
|
||||
): {
|
||||
output: unknown
|
||||
error: string | undefined
|
||||
toolCalls: ToolCallDetail[]
|
||||
cost: unknown
|
||||
tokens: unknown
|
||||
} {
|
||||
const traceSpans = executionData?.traceSpans ?? []
|
||||
const mainSpan = traceSpans[0]
|
||||
|
||||
const toolCalls = collectToolCalls(traceSpans)
|
||||
const output = mainSpan?.output || executionData?.finalOutput || undefined
|
||||
const cost = mainSpan?.cost || executionData?.cost || undefined
|
||||
const tokens = mainSpan?.tokens || undefined
|
||||
|
||||
const errorMsg =
|
||||
mainSpan?.status === 'error'
|
||||
? mainSpan?.output?.error || executionData?.error
|
||||
: executionData?.error || undefined
|
||||
|
||||
return {
|
||||
output,
|
||||
error: errorMsg
|
||||
? typeof errorMsg === 'string'
|
||||
? errorMsg
|
||||
: JSON.stringify(errorMsg)
|
||||
: undefined,
|
||||
toolCalls,
|
||||
cost,
|
||||
tokens,
|
||||
}
|
||||
}
|
||||
|
||||
export const getJobLogsServerTool: BaseServerTool<GetJobLogsArgs, JobLogEntry[]> = {
|
||||
name: GetScheduledTaskLogs.id,
|
||||
async execute(rawArgs: GetJobLogsArgs, context?: ServerToolContext): Promise<JobLogEntry[]> {
|
||||
const withMessageId = (message: string) =>
|
||||
context?.messageId ? `${message} [messageId:${context.messageId}]` : message
|
||||
|
||||
const {
|
||||
jobId,
|
||||
executionId,
|
||||
limit = 3,
|
||||
includeDetails = false,
|
||||
workspaceId,
|
||||
} = rawArgs || ({} as GetJobLogsArgs)
|
||||
|
||||
if (!jobId || typeof jobId !== 'string') {
|
||||
throw new Error('jobId is required')
|
||||
}
|
||||
if (!context?.userId) {
|
||||
throw new Error('Unauthorized access')
|
||||
}
|
||||
|
||||
const wsId = workspaceId || context.workspaceId
|
||||
if (!wsId) {
|
||||
throw new Error('Workspace context required')
|
||||
}
|
||||
const access = await checkWorkspaceAccess(wsId, context.userId)
|
||||
if (!access.hasAccess) {
|
||||
throw new Error('Unauthorized workspace access')
|
||||
}
|
||||
|
||||
const clampedLimit = Math.min(Math.max(1, limit), 5)
|
||||
|
||||
logger.info('Fetching job logs', {
|
||||
jobId,
|
||||
executionId,
|
||||
limit: clampedLimit,
|
||||
includeDetails,
|
||||
})
|
||||
|
||||
const conditions = [
|
||||
eq(jobExecutionLogs.scheduleId, jobId),
|
||||
eq(jobExecutionLogs.workspaceId, wsId),
|
||||
]
|
||||
if (executionId) {
|
||||
conditions.push(eq(jobExecutionLogs.executionId, executionId))
|
||||
}
|
||||
|
||||
const rows = await db
|
||||
.select({
|
||||
id: jobExecutionLogs.id,
|
||||
executionId: jobExecutionLogs.executionId,
|
||||
status: jobExecutionLogs.status,
|
||||
level: jobExecutionLogs.level,
|
||||
trigger: jobExecutionLogs.trigger,
|
||||
startedAt: jobExecutionLogs.startedAt,
|
||||
endedAt: jobExecutionLogs.endedAt,
|
||||
totalDurationMs: jobExecutionLogs.totalDurationMs,
|
||||
executionData: jobExecutionLogs.executionData,
|
||||
cost: jobExecutionLogs.cost,
|
||||
})
|
||||
.from(jobExecutionLogs)
|
||||
.where(and(...conditions))
|
||||
.orderBy(desc(jobExecutionLogs.startedAt))
|
||||
.limit(executionId ? 1 : clampedLimit)
|
||||
|
||||
const entries: JobLogEntry[] = rows.map((row) => {
|
||||
const executionData = row.executionData as any
|
||||
const details = includeDetails ? extractOutputAndError(executionData) : null
|
||||
|
||||
const entry: JobLogEntry = {
|
||||
executionId: row.executionId,
|
||||
status: row.status,
|
||||
trigger: row.trigger,
|
||||
startedAt: row.startedAt.toISOString(),
|
||||
endedAt: row.endedAt ? row.endedAt.toISOString() : null,
|
||||
durationMs: row.totalDurationMs ?? null,
|
||||
}
|
||||
|
||||
if (details) {
|
||||
if (details.error) entry.error = details.error
|
||||
if (details.toolCalls.length > 0) entry.toolCalls = details.toolCalls
|
||||
if (details.output) entry.output = details.output
|
||||
if (details.cost) entry.cost = details.cost
|
||||
if (details.tokens) entry.tokens = details.tokens
|
||||
} else {
|
||||
const errorMsg = executionData?.error || executionData?.traceSpans?.[0]?.output?.error
|
||||
if (row.status === 'error' && errorMsg) {
|
||||
entry.error = typeof errorMsg === 'string' ? errorMsg : JSON.stringify(errorMsg)
|
||||
}
|
||||
}
|
||||
|
||||
return entry
|
||||
})
|
||||
|
||||
logger.info('Job logs prepared', {
|
||||
jobId,
|
||||
count: entries.length,
|
||||
resultSizeKB: Math.round(JSON.stringify(entries).length / 1024),
|
||||
})
|
||||
|
||||
return entries
|
||||
},
|
||||
}
|
||||
Reference in New Issue
Block a user