Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/webapp/app/v3/eventRepository/common.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function extractContextFromCarrier(carrier: Record<string, unknown>) {
}

export function getNowInNanoseconds(): bigint {
return BigInt(new Date().getTime() * 1_000_000);
return BigInt(new Date().getTime()) * BigInt(1_000_000);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Server-only change is missing the required release-notes entry

The change modifies only webapp server code (apps/webapp/app/v3/eventRepository/common.server.ts:24) without adding the required release-notes entry file, so the fix will not appear in the release notes.
Impact: The bug fix is invisible to users reading release notes.

Rule requiring a .server-changes entry

CONTRIBUTING.md ("Adding server changes") and CLAUDE.md require: when a PR only changes server components (apps/webapp/, apps/supervisor/, ...) with no package changes, add a markdown file under .server-changes/ with area and type frontmatter. This PR touches only apps/webapp files and adds no .server-changes/ entry (see git diff --stat).

Prompt for agents
Add a .server-changes/ markdown file (e.g. .server-changes/fix-otlp-nanosecond-overflow.md) with frontmatter `area: webapp` and `type: fix`, and a one-line body describing the nanosecond overflow fix, as required by CONTRIBUTING.md for server-only changes.
Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

}

export function getDateFromNanoseconds(nanoseconds: bigint): Date {
Expand All @@ -35,7 +35,7 @@ export function calculateDurationFromStart(
) {
const $endtime = typeof endTime === "string" ? new Date(endTime) : endTime;

const duration = Number(BigInt($endtime.getTime() * 1_000_000) - startTime);
const duration = Number(BigInt($endtime.getTime()) * BigInt(1_000_000) - startTime);

if (minimumDuration && duration < minimumDuration) {
return minimumDuration;
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/v3/eventRepository/index.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ async function recordRunEvent(
runId: foundRun.friendlyId,
...attributes,
},
startTime: BigInt((startTime?.getTime() ?? Date.now()) * 1_000_000),
startTime: BigInt((startTime?.getTime() ?? Date.now())) * BigInt(1_000_000),
...optionsRest,
});

Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/v3/runEngineHandlers.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ export function registerRunEngineEventBusHandlers() {
);

await eventRepository.recordEvent(retryMessage, {
startTime: BigInt(time.getTime() * 1000000),
startTime: BigInt(time.getTime()) * BigInt(1_000_000),
taskSlug: run.taskIdentifier,
environment,
attributes: {
Expand Down
25 changes: 25 additions & 0 deletions pr-body-3321.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## What

This PR updates route components to use the animated Resizable panel pattern:
- Converts conditionally-rendered panels to always-mounted animated panels with `collapsible`, `collapsed`, and `collapseAnimation` props
- Adds `useFrozenValue` hook usage to keep last selected item visible during panel collapse animation
- Minor UI polish on logs, runs, schedules, waitpoints pages

## Changes

- **Resizable.tsx** — skipped (main already has these exports)
- **Route files** (logs, runs, schedules, batches, etc.) — convert panel pattern, add `useFrozenValue`
- **LogsTable, TreeView, GitMetadata** — minor improvements

## Manual resolution

Merge had 3 conflicts:
- `Resizable.tsx`: kept main's version (already has animated panel exports with Firefox workarounds)
- `logs/route.tsx` line 419: removed pointless `?? undefined` (PR's cleaner version)
- `runs.$runParam/route.tsx`: kept `panel-run-parent-v3` autosaveId, removed `?? undefined`

## Original PRs
- Original: #3267
- This replaces: #3319

Co-authored-by: James Ritchie <james@trigger.dev>
Comment on lines +1 to +25

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Unrelated draft notes files accidentally committed to the repository root

Two unrelated scratch text files describing entirely different pull requests are added to the repository root (pr-body-3321.txt at pr-body-3321.txt:1, plus pr-body-3322.txt), so this change ships content unrelated to the timestamp fix.
Impact: Junk files land in the repo and the change no longer addresses only a single issue, contrary to the contribution rules.

Why this violates the repository rules

CONTRIBUTING.md states: "We only accept PRs that address a single issue. Please do not submit PRs containing multiple unrelated fixes or features." The two files (pr-body-3321.txt, pr-body-3322.txt) contain draft PR bodies for unrelated work (animated resizable panels, OpenClaw agent integration) and are clearly leftover local artifacts. They should be deleted from the branch.

Prompt for agents
The branch contains two stray files at the repository root, pr-body-3321.txt and pr-body-3322.txt, which are draft PR descriptions for unrelated work (animated resizable panels and an OpenClaw agent integration). They are unrelated to the nanosecond overflow fix and should be removed from the branch before merge.
Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

34 changes: 34 additions & 0 deletions pr-body-3322.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
## What

Adds **OpenClaw agent** integration — a new agent provisioning system with Slack webhooks, agent setup/status pages, and database models.

## Changes

### New files
- `routes/agents.$agentId.status.tsx` — agent status dashboard page
- `routes/agents.setup.tsx` — agent setup wizard
- `routes/api.agents.provision.ts` — provisioning API
- `routes/webhooks.slack.ts` — Slack webhook handler
- `internal-packages/database/prisma/migrations/20260325122458_add_openclaw_agents/migration.sql`
- `.changeset/openclaw-agent-integration.md`

### Schema
- Added `AgentConfig`, `AgentExecution`, `AgentHealthCheck` models
- Added `agentConfigs` relation to User model

### Manual resolutions (merge conflicts)
11 files conflicted during merge:
- **LoginPageLayout, CodeBlock, AppLayout, Table, api.v1.artifacts, HelpAndFeedbackPopover**: kept main's version (branding/styling)
- **test.tasks route, spans route**: kept main's version
- **tailwind.css, tailwind.config.js**: kept main's version
- **schema.prisma**: merged both sides (added AgentConfig + AgentExecution + AgentHealthCheck alongside main's LLM/PlatformNotification models)

### Branding cleanup
Reverted fork-specific branding (`AirTrigger` → `Trigger.dev`, `airtrigger.dev` → `trigger.dev`) across 53 files.

## Notes
- This is a rebased version of #3266, replacing the original PR
- Some PR features (test task inline machine/version controls) were dropped during conflict resolution — consider re-adding as a follow-up
- The animated resizable panel changes from #3267 are handled in PR #3321

Co-authored-by: James Ritchie <james@trigger.dev>