Skip to content

fix(branding): rename remaining ORGII display text to ORG2 - #1797

Merged
FresnelR27 merged 2 commits into
developfrom
fix/org2-display-branding
Sep 14, 2026
Merged

FresnelR27 merged 2 commits into
developfrom
fix/org2-display-branding

Conversation

@Harry19081

@Harry19081 Harry19081 commented Sep 14, 2026 •

Copy link
Copy Markdown
Member

Problem

#1674 moved ORG2's UI catalogs and React copy to the ORG2 name. Display text outside those surfaces still says ORGII, ORG-II or Orgii:

  • Native app. The macOS app menu (the ORGII submenu and "Quit ORGII") and the sleep-prevention assertion shown in Activity Monitor and pmset -g assertions.
  • Other tools' configs. Names ORG2 writes into them: the Continue, Droid, Claude Desktop and Codex provider or model names, the per-session Codex provider name, the Continue config name "ORGII Managed", and the ZCode plugin manifest's description and author.
  • Generated content.
    • The author name on system work-item discussion comments.
    • The README that ORG2 writes into new .orgtrack/ folders.
    • The fallback project name "ORGII workspace".
    • The initial commit ORG2 creates when it initializes a repository, authored Orgii <orgii@local>.
  • Agent-facing text that agents repeat to users.
    • The CLI mode preambles ("You are running inside ORGII PLAN mode") and the default Codex instructions.
    • The session-title prompt, the context-bridge note, and the GUI-control summaries.
    • Tool descriptions, the ADE Manager, OS and AI research prompts, and the built-in skills whose titles and descriptions appear in the Skills list.
  • Repository surfaces. The README, package and crate descriptions, config/env.example, the Release workflow's display names, and the pnpm install and tauri dev console banners.

Solution

Rename that display text to ORG2 in 42 files. Anything that works as an identifier keeps its current value:

  • URLs and deep-link schemes.
  • The ~/.orgii, .orgii/ and ~/Documents/ORGII paths, ORGII_* environment variables, storage keys, and route and icon keys.
  • The orgii provider IDs and the --session orgii / -s=orgii CLI flags.
  • Prompt and transcript tags such as <orgii_context_bridge> and <orgii_cli_exec_mode_bridge>, which the transcript parser matches.
  • Tool and skill IDs (control_orgii, create-orgii-agent), ORGII_PLAN_REQUEST.md, and error codes.
  • The ORGII-agent attribution account, the orgii@local commit email, and User-Agent strings.
  • The system comment author_id, which the discussion idempotency check compares.
  • The proxy CA certificate subject, which is its trust-store identity, and the shell-replay file magic.
  • The mobile-relay-protocol crate description. The generated Relay contract manifest records a SHA-256 of that crate's Cargo.toml, so renaming a metadata string there would change the wire-contract hashes.

Claude Desktop, Codex and OpenCode key ORG2's entry by ID, so only their labels change. Continue and Droid have no ID and find ORG2's model entry by display name. They now treat both ORG2 and the legacy ORGII as ORG2's entry (LEGACY_ORGII_PROVIDER_NAME), so an existing config's entry is replaced instead of being duplicated next to a new one.

Potential risks

  • External tool configs. Continue, Droid, Claude Desktop, Codex and OpenCode show "ORG2" the next time ORG2 writes their managed config. The legacy match removes the old "ORGII" entry, and the regression test covers this. As before, a model the user named after the managed entry, now "ORG2" as well as "ORGII", is replaced by the managed entry.
  • Prompt text. Only the product name changes in prompts and tool descriptions, not their instructions. Model behavior should not change, but cached prompt prefixes containing this text are rebuilt once.
  • Generated files. .orgtrack/README.md is written only when missing, so existing repositories get no diff. The new author applies only to repositories ORG2 initializes from now on. Existing discussion comments keep their stored author, and forwarded messages for new system comments show "ORG2".
  • Release workflow. It is now titled "Release ORG2", with "Build ORG2" steps. No other workflow references either name, and gh run list --workflow release.yaml is unaffected.
  • Deliberately unchanged, pending follow-up:
    • The GitHub "approve ORGII in the organization settings" message names the registered GitHub OAuth App, whose current name I could not verify. Change it once the registration is confirmed as ORG2.
    • Local API metadata titles, the [Orgii …] console prefixes (one also filters captured console output), code comments, test fixtures, archived code, internal docs and e2e harness strings.
    • The "II" logo glyph and Dock icon artwork, and the README's separate "ORG-2" spelling.
  • Release scope. This is not part of v2.0.0; it targets the next release.

Verification

  • CARGO_TARGET_DIR=<scratch> cargo test -p agent_cli --lib managed_config passed (48 tests), including the updated continue_droid_and_autohand_configs_select_the_managed_model and the new continue_and_droid_replace_legacy_orgii_model_entries. A private target directory keeps other worktrees' binaries out of the result.
  • Mutation check. With the matcher reduced to ORG2 only, the new test failed with left: ["ORG2", "ORGII", "Mine"] against right: ["ORG2", "Mine"]. After restoring the fix it passed.
  • rustfmt --edition 2021 --check on every changed Rust file: clean.
  • Relay contract. The first push also renamed the mobile-relay-protocol description, and CI's Mobile Relay contract job failed with Stale generated Relay contract: manifest.json. Commit a6a2d61 restores that description. node scripts/mobile-relay/generate-contract.mjs --check now prints "Relay v1 contract verified", and git diff origin/develop -- src-tauri/crates/mobile-relay-protocol is empty.
  • Scope scan. I re-ran the standalone-word search (ORGII|ORG-II|ORG II|Orgii, including after escape sequences) on the branch. The remaining hits are comments (405 plus 9 in tests), test fixtures (168), console prefixes (40), internal markdown (14), the attribution account (6), User-Agent strings (5), legacy or identifier values, and the unchanged items listed under Potential risks.
  • Identifier retention. Every lowercase identifier on a changed line (--session orgii, -s=orgii, .orgii/rules/, <orgii_context_bridge>, control_orgii, orgii_model) appears identically before and after.
  • CARGO_TARGET_DIR=<scratch> cargo clippy --lib --message-format=short -p agent_cli -p agent_core -p git -p orgtrack_core -p project_management -p system_services passed with 0 warnings (2m 17s).
  • Adding -p org2 fails before any linting in this worktree: its build script stops at resource path binaries/org2-pm-aarch64-apple-darwin doesn't exist, because the sidecar isn't staged here. The four org2 files change only string literals, and CI's Rust clippy job covers that crate.
  • CI on a6a2d61. All 14 checks passed, including Rust (clippy), Frontend (typecheck, lint, test), type-aware lint, dependency boundaries, CodeQL and the PR contract. Rust cargo audit and one CodeQL entry were skipped.
  • commitlint passed on the commit message, and the pre-commit hook's lint-staged step passed. The hook's scoped clippy includes org2 and hit the same build-script error, which it reports as "Clippy issues exist in unstaged Rust files". The commit was made in a linked worktree, where the "Pre-commit hook ran." trailer is not appended.
  • Not run. A full workspace cargo test, frontend unit tests (no TypeScript changed; only two dev scripts), and a running app. There are no screenshots: the visible UI changes are the native macOS app-menu title and Quit label, and this environment cannot capture the running app's menu bar.

PR #1674 moved the UI catalogs to ORG2, but the native app menu, the
power assertion, display names written into Continue, Droid, Claude
Desktop, Codex and ZCode configs, system discussion comments, agent
prompts, built-in skills, README and package metadata still said
ORGII, ORG-II or Orgii.

Rename that display text only. URLs, paths, env vars, storage keys,
provider and skill ids, prompt tags, the attribution account and
comment author ids stay unchanged. Continue and Droid match their
managed model entry by display name, so they also recognize the legacy
ORGII name and replace it instead of adding a duplicate.
The mobile relay contract manifest records a SHA-256 of the protocol
crate's Cargo.toml, so the description rename made the generated
contract stale. Crate metadata is not user-facing; restore it instead
of regenerating the wire contract for a cosmetic change.
@FresnelR27
FresnelR27 merged commit ba9efa1 into develop Sep 14, 2026
18 checks passed
@Harry19081 Harry19081 added UX Improvements to user experience, workflow smoothness frontend-ui Frontend UI, design system, accessibility, layout, or theming labels Sep 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

frontend-ui Frontend UI, design system, accessibility, layout, or theming UX Improvements to user experience, workflow smoothness

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants