Skip to content

Pin OctosCode at its macOS look fix after the main merge (a9aa91c2) - #563

Merged
guofoo merged 1 commit into
mainfrom
fix/octoscode-pin-a9aa91c2
Nov 20, 2026
Merged

guofoo merged 1 commit into
mainfrom
fix/octoscode-pin-a9aa91c2

Conversation

@guofoo

@guofoo guofoo commented Nov 18, 2026

Copy link
Copy Markdown
Contributor

Moves the OctosCode pin from 960bfa13 to a9aa91c2, octos-org/octoscode-app main's merge of octos-org/octoscode-app#35 (merged 2026-11-13).

960bfa13 was 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 octoscode source.rev. python3 tools/native_apps.py wrote the matching pin in Cargo.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 --locked and cargo build --locked accept the lock as it is.
  • tools/release-scan-public-assets.json: revision only. All 52 reviewed assets are byte-identical at a9aa91c2: size, SHA-256 and the recorded match offsets all match. No file under design/ and no build.rs changed in the range.
  • tools/release-scan.py: the OctosCode seam comment now gives the literals' lines at a9aa91c2 (seed_board2() 3941/3944, the theme names 3385-3390, "This Mac" 3371; browser.rs 766/787 is unchanged), with source links at the pin. The functions are byte-identical to 960bfa13's. The seam patterns are unchanged.

What else comes in

960bfa13..a9aa91c2 is 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:

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_scan and test_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.
  • From phone/, cargo check --locked -p octosense-home --features mobile-apps: passes (host target).
  • Release scan of the unpackaged binary, identity rules off:
    • The seams match: the theme-name seam with a 0-byte gap, and the "Use this folder" form of the folder seam.
    • Every /home/user/ occurrence is admitted by a seam or a reviewed asset.
    • There are no Linux-home, private IPv4 or mDNS findings.
    • What remains is the build machine's own Cargo home path. desktop/scripts/package.py remaps it in a packaged build; that remapping was not observed here.
  • Hidden run (MAKEPAD_HIDE_WINDOWS=1, control surface, fresh OCTOSENSE_HOME and RINX_DATA_DIR): the shell starts, opens OctosCode in the Mac look, logs no [E] or panic, and quits through /quit.

Not verified:

  • Packaged release scan. CI's packaging (neutral build paths, rustc 1.97.1, cargo-packager 0.11.8) was not reproduced. This PR changes tools/release-scan*, so release-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.
  • Windows and Linux desktop builds, and phone device targets (Android, iOS, OpenHarmony).
  • The two fixes inside OctoSense. The right-click menu and typing in the rename fields were not exercised here: a fresh home has no server and no chats. Give chat rows their right-click menu and rename fields their keys again octos-org/octoscode-app#35 reports its Mac-look rig passing the workspace rename and chat right-click journeys on an OctoSense shell built with the module. That rig did not type in the chat rename field either.

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.
@guofoo
guofoo merged commit b8d3864 into main Nov 20, 2026
16 checks passed
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.

1 participant