Skip to content

Fix script timeout duration in run details - #54296

Merged
juan-fdz-hawa merged 2 commits into
fleetdm:mainfrom
Prajwal2246:fix/54262-script-timeout-message
Oct 6, 2026
Merged

juan-fdz-hawa merged 2 commits into
fleetdm:mainfrom
Prajwal2246:fix/54262-script-timeout-message

Conversation

@Prajwal2246

@Prajwal2246 Prajwal2246 commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

Related issue: Resolves #54262

Use the script result API's message for the status line, so the timeout duration comes from the configured timeout. Script output remains in the output panel.

Checklist for submitter

  • Changes file added for the user-visible fix in changes/.

Testing

  • Added an automated test that separates the configured timeout from a duration printed by the script.
  • QA'd all new/changed functionality manually on a local macOS fleetd host.

Focused test: yarn jest --config ./frontend/test/jest.config.js --runInBand frontend/pages/DashboardPage/cards/ActivityFeed/components/RunScriptDetailsModal/RunScriptDetailsModal.tests.tsx — 1 passed.

Manual check: with script_execution_timeout: 60, a script printed sleeping 180 seconds and then slept. Script details showed "after 60 seconds" in the timeout message and kept "sleeping 180 seconds" in the output. The process was killed at the configured timeout.

AI

AI: Codex (unknown)

Frontend

  • Attached before and after screenshots of the user-visible change.

Before (from the issue):

Before: timeout duration taken from script output

After (local macOS host):

After: timeout shows 60 seconds while script output says sleeping 180 seconds

Summary by CodeRabbit

  • Bug Fixes
    • Script timeout details now show the configured timeout in the status message instead of a duration mentioned in the script output. The script’s output remains visible in the output section, so both the timeout setting and the script output can be reviewed separately.

@codecov

codecov Bot commented Sep 29, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.57%. Comparing base (aa90e84) to head (9563b2e).

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #54296      +/-   ##
==========================================
+ Coverage   76.56%   76.57%   +0.01%     
==========================================
  Files        4261     4261              
  Lines      260385   260385              
  Branches    15067    15273     +206     
==========================================
+ Hits       199365   199393      +28     
+ Misses      60843    60813      -30     
- Partials      177      179       +2     
Flag Coverage Δ
frontend 69.52% <ø> (+0.06%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Prajwal2246
Prajwal2246 marked this pull request as ready for review September 29, 2026 09:44
@Prajwal2246
Prajwal2246 requested a review from a team as a code owner September 29, 2026 09:44
@coderabbitai

coderabbitai Bot commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: fleetdm/fleet/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: bceea796-ba0d-459a-8b1b-cd6ad36f4359

📥 Commits

Reviewing files that changed from the base of the PR and between bcfeff1 and 9563b2e.

📒 Files selected for processing (2)
  • frontend/pages/DashboardPage/cards/ActivityFeed/components/RunScriptDetailsModal/RunScriptDetailsModal.tests.tsx
  • frontend/pages/DashboardPage/cards/ActivityFeed/components/RunScriptDetailsModal/RunScriptDetailsModal.tsx

Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 7 remain after this review.


Walkthrough

The script details modal now passes the API-provided message to StatusMessage instead of the script output. A test checks that a timeout status shows the configured 60-second timeout, while the script output still displays its separate 180-second duration.

Priority: ⬇️ Low

Severity of issue fixed: Low

Merge Risk: ⚪ Minimal · up to 9563b

The modal now shows the API-provided status message while keeping script output separate. No actionable merge-blocking risk remains.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the main change: correcting the script timeout duration shown in run details.
Description check ✅ Passed The description identifies the related issue, explains the fix, documents automated and manual testing, includes the AI section, and provides before-and-after screenshots for the user-visible change.
Linked Issues check ✅ Passed Issue [#54262] requires the Script details modal to use the configured timeout from the API message and keep script output separate. At the reviewed head, RunScriptDetailsModal.tsx passes `data.me…
Out of Scope Changes check ✅ Passed The reviewed changes update the timeout message source, add a focused regression test, and add a related change note. Each change supports issue [#54262]. No unrelated change is demonstrated.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 2…
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@Prajwal2246

Copy link
Copy Markdown
Contributor Author

The merge conflict is resolved, and JavaScript tests pass. The remaining lint-js failure reports five import-formatting errors in AgentOptionsPage.tests.tsx. That file is unchanged by this PR and identical to the version from main merged in aa90e843ed.

@juan-fdz-hawa juan-fdz-hawa self-assigned this Oct 6, 2026

@juan-fdz-hawa juan-fdz-hawa left a comment

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.

Thanks for the contribution - linter errors seem to be unrelated to the current changeset.

@juan-fdz-hawa
juan-fdz-hawa merged commit efff697 into fleetdm:main Oct 6, 2026
23 of 24 checks passed
@Prajwal2246
Prajwal2246 deleted the fix/54262-script-timeout-message branch October 23, 2026 19:09
allenhouchins added a commit that referenced this pull request Nov 6, 2026
**Related issue:** NA

Adds Fleet's November 2026 newsletter
(`articles/newsletter-2026-11.md`), which covers October 2026. It
publishes at `fleetdm.com/newsletters/newsletter-2026-11`.

- **Email subject line:** `Fleet news: November 2026`
- **Category:** `newsletter`, singular, which the website build accepts
(#52120). No website changes are needed.
- **Author:** Aube Paul (`robinedev`), matching the September and
October issues.

## Open questions for reviewers

- **New "📺 Fleet Virtual Summit" section** for the November 10 LinkedIn
Live event, placed before workshops. Keep it or fold it into the
workshops section. If it stays, it's a new entry in the newsletter's
section emoji table.
- **The roadmap preview is linked even though November isn't a quarter's
first month.** The October preview published October 13, after the
October issue went out, so readers haven't seen it in the newsletter
yet.
- **Article and guide picks are editorial**, not based on traffic
numbers. Reorder them if you have analytics. There were no case studies
in October.
- **The community section has one post, and it's personal.** Henry
Stamerjohann's MacSysAdmin talk. Fleet's company-page post about the
"Apple in the enterprise" research is another option, but it repeats the
research article in "Worth reading." No engagement numbers were
available.
- **Community contributors with five or more merged PRs in October:**
Prajwal Janbandhu (8, in the thank-you line), Michael Alt (6,
highlighted), Dhvanit (6, returning, not named), and Shreyash Agare (5,
returning, not named). Confirm none of them is a contractor whose
account isn't in the org.
- **Several first-time contributors only edited the handbook.** None
appear in Fleet's Slack, so they stay in the thank-you line.

## How each section was sourced

- **Shipped:** the Fleet 4.93.0 and 4.94.0 release articles,
cross-checked against tagged releases. The three highlights are macOS
patch notifications (Premium), Android zero-touch enrollment (Premium),
and self-service configuration profiles (not Premium), so the section
isn't all Premium. Patch releases 4.93.1 and 4.93.2 are covered by the
"See every release" link.
- **Planned:** the release planning board (view 10, filtered to
milestone 4.95.0), not the milestone fallback. There are 22 stories, all
assigned. 5.0.0 is due December 4, so November holds one release.
- **Workshops:** fleetdm.com/workshops, with the next five after the
send date.
- **Community contributions:** PRs merged in public `fleetdm` repos in
October by authors outside the `fleetdm` org, minus bots.

## Left out on purpose

- **"Windows: force standard account"** was in the planned section in
both September and October and hasn't shipped. It's not on the 4.95.0
board, so it isn't mentioned a third time.
- **Multiple versions of the same App Store app** is named in the 4.94.0
release article's title, but the article marks it as moved to 4.95. It's
listed under "Also on deck" instead of "shipped."
- **Amsterdam workshop (November 3):** past by the time this sends.
- **Fleet staff or contractors whose accounts aren't in the org:**
@TraiLynne and @thomcrowe. Both are confirmed in Fleet's Slack.
- **Other October content:** the warehouse inventory article and
Retriever guide, the PHP2Shell and eMudhra pieces, and every `industry
news` article. The routine doesn't feature that category.

<details>
<summary>Suggested <code>~/fleet-newsletters/contributors.tsv</code>
lines (append once confirmed)</summary>

```
TraiLynne	fleet	Trai Lynne Compton, Fleet staff (Slack); not an org member
thomcrowe	fleet	Thom Crowe, Fleet contractor (website); not an org member
```

</details>

<details>
<summary>Ledger append block: run only after this issue is
sent</summary>

`~/fleet-newsletters/ledger.jsonl` didn't exist before this issue.
Repeats were checked against the September and October issues in the
repo instead. This block creates the ledger and records every item in
this issue.

```bash
mkdir -p ~/fleet-newsletters && cat >> ~/fleet-newsletters/ledger.jsonl <<'EOF'
{"issue":"2026-11","section":"shipped","id":"4.93.0"}
{"issue":"2026-11","section":"shipped","id":"4.94.0"}
{"issue":"2026-11","section":"planned","id":"51599"}
{"issue":"2026-11","section":"planned","id":"39176"}
{"issue":"2026-11","section":"planned","id":"51979"}
{"issue":"2026-11","section":"planned","id":"53284"}
{"issue":"2026-11","section":"planned","id":"33062"}
{"issue":"2026-11","section":"planned","id":"52534"}
{"issue":"2026-11","section":"planned","id":"47904"}
{"issue":"2026-11","section":"events","id":"fleet-virtual-summit-2026"}
{"issue":"2026-11","section":"events","id":"2003719976388"}
{"issue":"2026-11","section":"events","id":"2003716644422"}
{"issue":"2026-11","section":"events","id":"2002266719658"}
{"issue":"2026-11","section":"events","id":"2002266872114"}
{"issue":"2026-11","section":"events","id":"2002267524064"}
{"issue":"2026-11","section":"articles","id":"apple-in-the-enterprise-2026"}
{"issue":"2026-11","section":"articles","id":"nvidia-gtc-2026"}
{"issue":"2026-11","section":"articles","id":"tailworm-what-to-do-about-tailscale-ssh-before-the-fix-ships"}
{"issue":"2026-11","section":"articles","id":"revert-a-bad-change-in-gitops"}
{"issue":"2026-11","section":"articles","id":"block-chrome-extensions"}
{"issue":"2026-11","section":"articles","id":"block-edge-extensions"}
{"issue":"2026-11","section":"articles","id":"block-firefox-extensions"}
{"issue":"2026-11","section":"articles","id":"block-safari-extensions"}
{"issue":"2026-11","section":"articles","id":"use-claude-code-with-fleet"}
{"issue":"2026-11","section":"articles","id":"roadmap-preview-october-2026"}
{"issue":"2026-11","section":"social","id":"7513481631123394560"}
{"issue":"2026-11","section":"community","id":"#50836"}
{"issue":"2026-11","section":"community","id":"#53407"}
{"issue":"2026-11","section":"community","id":"#53670"}
{"issue":"2026-11","section":"community","id":"#53768"}
{"issue":"2026-11","section":"community","id":"#53810"}
{"issue":"2026-11","section":"community","id":"#53824"}
{"issue":"2026-11","section":"community","id":"#54019"}
{"issue":"2026-11","section":"community","id":"#54181"}
{"issue":"2026-11","section":"community","id":"#54296"}
{"issue":"2026-11","section":"community","id":"#54411"}
{"issue":"2026-11","section":"community","id":"#54502"}
{"issue":"2026-11","section":"community","id":"#54509"}
{"issue":"2026-11","section":"community","id":"#54592"}
{"issue":"2026-11","section":"community","id":"#54685"}
{"issue":"2026-11","section":"community","id":"#54708"}
{"issue":"2026-11","section":"community","id":"#54726"}
{"issue":"2026-11","section":"community","id":"#54785"}
{"issue":"2026-11","section":"community","id":"#55056"}
{"issue":"2026-11","section":"community","id":"#55058"}
{"issue":"2026-11","section":"community","id":"#55072"}
{"issue":"2026-11","section":"community","id":"#55089"}
{"issue":"2026-11","section":"community","id":"#55097"}
{"issue":"2026-11","section":"community","id":"#55127"}
{"issue":"2026-11","section":"community","id":"#55249"}
{"issue":"2026-11","section":"community","id":"#55266"}
{"issue":"2026-11","section":"community","id":"#55353"}
{"issue":"2026-11","section":"community","id":"#55471"}
{"issue":"2026-11","section":"community","id":"#55492"}
{"issue":"2026-11","section":"community","id":"#55547"}
{"issue":"2026-11","section":"community","id":"#55841"}
{"issue":"2026-11","section":"community","id":"#55900"}
{"issue":"2026-11","section":"community","id":"#55903"}
{"issue":"2026-11","section":"community","id":"#55946"}
{"issue":"2026-11","section":"community","id":"#56072"}
{"issue":"2026-11","section":"community","id":"#56085"}
{"issue":"2026-11","section":"community","id":"#56148"}
{"issue":"2026-11","section":"community","id":"#56214"}
{"issue":"2026-11","section":"community","id":"#56266"}
{"issue":"2026-11","section":"community","id":"#56287"}
{"issue":"2026-11","section":"community","id":"#56376"}
{"issue":"2026-11","section":"community","id":"#56403"}
{"issue":"2026-11","section":"community","id":"#56486"}
{"issue":"2026-11","section":"community","id":"#56498"}
{"issue":"2026-11","section":"community","id":"#56575"}
{"issue":"2026-11","section":"community","id":"#56596"}
{"issue":"2026-11","section":"community","id":"#56609"}
{"issue":"2026-11","section":"community","id":"#56657"}
{"issue":"2026-11","section":"community","id":"#56708"}
{"issue":"2026-11","section":"community","id":"#56719"}
{"issue":"2026-11","section":"community","id":"#56983"}
{"issue":"2026-11","section":"community","id":"#56984"}
{"issue":"2026-11","section":"community","id":"#56985"}
EOF
```

</details>

## Testing

- [x] Confirmed the markdown passes the website build's metadata checks:
required meta tags, ISO `publishedOn`, description at 139 of 150
characters, `category` set to `newsletter`, H1 matching `articleTitle`,
and no Vue-template braces.
- [x] Verified all 54 fleetdm.com, GitHub, and Eventbrite links return
200. LinkedIn returns 999 to automated requests, so the profile links
come from the handbook and the post link was opened in a browser.
- [x] Checked the copy against Fleet's content style: no em dashes,
sentence-case headings, Oxford commas, and Fleet Premium labels carried
through from the release articles.
- [ ] QA'd all new/changed functionality manually

## AI

**AI:** Claude Code (claude-opus-5-5)

---------

Co-authored-by: robinedev <aubedev@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Script details: timeout message takes "after N seconds" from the script output, not the configured timeout

2 participants