Fix accidental mesh.proto truncation; add LockdownAuth.disable and LockdownStatus.State.DISABLED#929
Merged
Conversation
… and LockdownStatus.State.DISABLED
Copilot
AI
changed the title
[WIP] Fix CI job failure by restoring mesh.proto contents
Fix accidental mesh.proto truncation; add LockdownAuth.disable and LockdownStatus.State.DISABLED
May 29, 2026
jamesarich
approved these changes
May 30, 2026
jamesarich
left a comment
Contributor
There was a problem hiding this comment.
Seems to be working in the client implementation.
|
The latest Buf updates on your PR. Results from workflow pull-request / build (pull_request).
|
jamesarich
reviewed
May 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Restores
meshtastic/mesh.protoafter an accidental truncation and adds lockdown disable semantics needed by clients/firmware.Changes
meshtastic/admin.protobool disable = 6toLockdownAuthto disable lockdown with a valid passphrase.meshtastic/mesh.protobuf build.DISABLED = 5toLockdownStatus.Statefor the “lockdown-capable but not currently locked” state (clients render toggle OFF).STATION_G3comment indentation for Buf formatting.MESHLINKdescription text edit so this PR stays scoped to the intended fix.Checklist before merging
New Hardware Model Acceptance Policy
Due to limited availability and ongoing support, new Hardware Models will only be accepted from Meshtastic Backers and Partners. The Meshtastic team reserves the right to make exceptions to this policy.
Alternative for Community Contributors
You are welcome to use one of the existing DIY hardware models in your PlatformIO environment and create a pull request in the firmware project. Please note the following conditions:
Getting Official Support
To have your hardware model officially supported and included in the Meshtastic ecosystem, consider becoming a Meshtastic Backer or Partner. Visit meshtastic.com for more information about partnership opportunities.
Original prompt
Update the existing pull request at #927 by committing the fix to that PR branch.
Repository: meshtastic/protobufs
PR: #927
Base branch: develop
Current PR branch: feature/lockdown-disable
Goal:
Fix the failing CI job 78378405719 in this PR by correcting the accidental truncation/removal in
meshtastic/mesh.proto.Known failure:
Buf build fails with unresolved symbols including:
Root cause to address:
A very large tail section of
meshtastic/mesh.protoappears to have been unintentionally removed afterRouteDiscovery, replaced by a placeholder comment. Restore that removed content while preserving the intended PR changes.Required final state:
meshtastic/admin.protokeeps the intended addition ofLockdownAuth.disable = 6with its docs.meshtastic/mesh.protorestores all missing message/enum definitions that were accidentally deleted.meshtastic/mesh.protoincludes the intended additionFromRadio.LockdownStatus.State.DISABLED = 5.Please make the minimal change necessary and update the existing PR branch rather than creating a separate unrelated branch.
The following is the prior conversation context from the user's chat exploration (may be truncated):
User: Please find a solution for failing job 78378405719. Use the logs, job definition, and any referenced files where the failure occurred. Keep your response focused on the solution and include code suggestions when appropriate.
Assistant: The failure is a Buf build/type-resolution error, not a workflow bug.
What’s failing
In the PR workflow, the only relevant step is the Buf validation step in
.github/workflows/pull_request.yml:.github/workflows/pull_request.yml:16-23runs Buf withformat,lint, andbreakingchecksThe failing job log shows unresolved protobuf type references during
buf build:cannot find DeviceMetadata in this scopecannot find NodeRemoteHardwarePin in this scopecannot find MyNodeInfo in this scopecannot find MeshPacket in this scopecannot find StatusMessage in this scopeRoot cause
One or more
.protofiles in this PR are referring to message types that are no longer in scope from Buf’s point of view. That almost always means one of these happened:importwas removed or is missingBecause the missing symbols are all Meshtastic message types, the most likely issue is a missing import or wrong package qualification in the modified
.protofile(s).Fix
Update the changed
.protofile(s) so every referenced message type is either:What to change
For any file that uses these symbols:
DeviceMetadataNodeRemoteHardwarePinMyNodeInfoMeshPacketStatusMessagemake sure it imports the defining proto file, for example:
or whatever the current canonical path is in this repo for those message definitions.
If the file is in a different package, use fully qualified names instead of bare names, for example:
Concrete code suggestion
If the PR introduced a new proto file or split an existing one, the fix will look like this pattern:
If those types are intended to be in the same package, then restore the missing import and keep the short names:
Best solution for this PR
Revert or correct the proto change that removed visibility of these shared message types. Specifically:
This pull request was created from Copilot chat.