Repository navigation
Pin OctosCode at its macOS look fix after the main merge (a9aa91c2) - #563
Merged
Merged
Conversation
a9aa91c2 is octos-org/octoscode-app main's merge of #35. When main (#9 to #27) came into the macOS look branch (#34), the Mac look inside OctoSense lost a chat row's right-click menu, and a press in the workspace or chat rename field moved the keyboard away from it. #35 reads a right-click from the press itself and keeps the two views that watch presses from taking the keyboard. 960bfa13, the stop-gap pin from before that merge, is 19 commits behind. The crates' manifests are the same at both revisions, so only the four octoscode-app sources in Cargo.lock move. The pin also brings main's #9 to #27 into OctoSense, among them #27: a hosted window keeps the app shell while a session opens, so there is no "Couldn't Connect" card and no "Connecting..." while the assistant starts. The release scan's 52 reviewed assets are unchanged at this revision. So are the literals of the OctosCode placeholder seams, which now sit further down chrome.rs; the scan's source references point at a9aa91c2.
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.
Moves the OctosCode pin from
960bfa13toa9aa91c2, octos-org/octoscode-app main's merge of octos-org/octoscode-app#35 (merged 2026-11-13).960bfa13was a stop-gap: the macOS look branch from before it took in main (octos-org/octoscode-app#9 to octos-org/octoscode-app#27). After that merge, the Mac look inside OctoSense lost a chat row's right-click menu, and a press in the workspace or chat rename field moved the keyboard away from it. octos-org/octoscode-app#35 fixes both. This moves the pin to that fix.Changes
native-apps.json: the octoscodesource.rev.python3 tools/native_apps.pywrote the matching pin inCargo.toml.Cargo.lock: the four octoscode-app sources (client, module, store, transport). The crates' manifests are the same at both revisions, so no other entry moves.cargo metadata --lockedandcargo build --lockedaccept the lock as it is.tools/release-scan-public-assets.json:revisiononly. All 52 reviewed assets are byte-identical ata9aa91c2: size, SHA-256 and the recorded match offsets all match. No file underdesign/and nobuild.rschanged in the range.tools/release-scan.py: the OctosCode seam comment now gives the literals' lines ata9aa91c2(seed_board2()3941/3944, the theme names 3385-3390, "This Mac" 3371;browser.rs766/787 is unchanged), with source links at the pin. The functions are byte-identical to960bfa13's. The seam patterns are unchanged.What else comes in
960bfa13..a9aa91c2is 19 commits. Besides octos-org/octoscode-app#35 it brings main's octos-org/octoscode-app#9 to octos-org/octoscode-app#27 into OctoSense:auth_expiredclose.Tests
Run on macOS arm64, rustc 1.99.1:
python3 tools/native_apps.py --check: passes.python3 -m unittest discover -s tools -p 'test_*.py': 162 tests, OK (test_release_scanandtest_native_apps: 70, OK).python3 tools/setup.py --check --cargo: passes.bash tools/check-shell-graph.sh -p octosense: passes.cargo build --release --locked -p octosense: builds, with no warnings from the octoscode crates.phone/,cargo check --locked -p octosense-home --features mobile-apps: passes (host target)./home/user/occurrence is admitted by a seam or a reviewed asset.desktop/scripts/package.pyremaps it in a packaged build; that remapping was not observed here.MAKEPAD_HIDE_WINDOWS=1, control surface, freshOCTOSENSE_HOMEandRINX_DATA_DIR): the shell starts, opens OctosCode in the Mac look, logs no[E]or panic, and quits through/quit.Not verified:
tools/release-scan*, sorelease-desktop.yml's macOS, Windows and Linux package jobs run on it. They are the check for packaged artifacts, including how each linker pools the seam literals.