8000 fix(mfile,mctx,minimald): keep a box's minimal.toml edits inside its workspace by minimal-backporter[bot] · Pull Request #3519 · gominimal/minimal · GitHub
[go: up one dir, main page]

Skip to content

fix(mfile,mctx,minimald): keep a box's minimal.toml edits inside its workspace - #3519

Closed
minimal-backporter[bot] wants to merge 1 commit into
release/0.7.xfrom
backport/3404-to-release/0.7.x
Closed

minimal-backporter[bot] wants to merge 1 commit into
release/0.7.xfrom
backport/3404-to-release/0.7.x

Conversation

@minimal-backporter
@minimal-backporter minimal-backporter Bot commented Nov 18, 2026 •
Copy link
Copy Markdown

Backport of #3404 to release/0.7.x.

Squash-merge this PR and keep the PR title as the subject. The cherry-picked commit keeps the source subject.

Conflict

Source PR: #3404
Source commit: 287e4f4

Conflicted paths:

  • crates/mctx/src/lib.rs
  • crates/mfile/src/lib.rs
  • crates/minimald/src/box_actor/setup.rs
  • crates/minimald/src/session/tests.rs

@minimal-backporter
Copy link
Copy Markdown
Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport/3404-to-release/0.7.x
git worktree add --checkout .worktree/backport/3404-to-release/0.7.x backport/3404-to-release/0.7.x
cd .worktree/backport/3404-to-release/0.7.x
git reset --hard HEAD^
git cherry-pick -x 287e4f4810dc6f9e6faa262161c425d18a07ea45

@coderabbitai
coderabbitai Bot commented Nov 18, 2026
Copy link
Copy Markdown
Contributor

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 279ab7b4-d7a2-4fbe-b8df-b02111d41b67

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

@minimal-backporter minimal-backporter Bot added the backport-conflict Backport PR with committed conflicts; resolve before marking ready label Nov 18, 2026
@norrietaylor
Copy link
Copy Markdown
Member

/revise and resolve conflicts

@minimal-foundry
minimal-foundry Bot commented Nov 18, 2026 •
Copy link
Copy Markdown
Contributor

Stopped job aaf4ffe4: pull request #3519 was closed. Its model and callback tokens are revoked and its container is told to stop.

branch backport/3404-to-release/0.7.x

Updated 2026-11-18T21:57:25.172Z.

@minimal-foundry
Copy link
Copy Markdown
Contributor

That /revise is held, not dropped. The container fleet is mid-roll: a new image is deploying, and an instance on the old one refused the coder. Your note is kept and asked again every 10 minutes for up to 30; a wait that outlives that is refused here with the reason.

What the runner said

could not start the coder: Error: runner refused the job: HTTP 400 {"error": "runtime_sha does not match this image", "job_runtime_sha": "9f3632309e2ca333ec87b1af5fae374c932daf48", "image_runtime_sha": "2ab0abc64d8aa968129f50d4b69dd8ae6e13c55b"}

Nothing to type again: the command gets a rocket when its round starts, or a refusal that names the reason. No round was counted for it yet.

@bryan-minimal
Copy link
Copy Markdown
Member

A hand port of #3404 for this line is ready and is finishing its checks. I would like to put it on this branch in place of the placeholder commit, so please hold the /revise run if it has not started.

Why a hand port and not a resolution of the cherry-pick: this line needs two things that main's commit does not contain.

  1. The scaffold. On this line the daemon writes a box's default minimal.toml by path when it builds the box's context. On main that write goes through the exclusive editor from fix(mfile): lock minimal.toml edits and name missing link fields #2302, which this line does not have, so main's commit never had to touch it. The port routes it through the confined editor.
  2. The fallback without openat2. Main's fallback replaces the file by a temporary file and a rename. That also rests on fix(mfile): lock minimal.toml edits and name missing link fields #2302. The port does the same without the lock.

Both came out of an independent review of the first version of the port. The port is one commit with the source subject. It carries main's tests, adapted to this line, and new ones for the two points above. Each refusal test has a control.

State: lint, the workspace tests, the new tests repeated, and the native end-to-end script pass on it. Its last checks finish within the hour, and I will push then.

If the /revise run lands first, I will not overwrite it: I will add the two points above on top of it as a second commit.

Related, for whoever merges on this line: #3563 (the backport of #3342) adds the state component check that the port of #3405 also needs. The #3405 port is written against a line without it, so whichever lands second needs a small rebase. I will do that for the #3405 port.

🤖 Generated with Claude Code

@norrietaylor
Copy link
Copy Markdown
Member

Closing based on @bryan-minimal's comment above that he has a better fix ready

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-conflict Backport PR with committed conflicts; resolve before marking ready

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

0