Dev

.github/scripts/.package.zsh

@@ -110,7 +110,16 @@ package() {
   local commit_hash
 
   if [[ -d ${project_root}/.git ]] {
-    local git_description="$(git describe --tags --long)"
+    # `|| true` keeps ERR_RETURN/TRAPZERR from firing (and leaking the
+    # callstack into the variable) when the fork has no tags reachable.
+    local git_description="$(git describe --tags --long 2>/dev/null || true)"
+    if [[ -z ${git_description} ]] {
+      # obs-studio-plus fork fallback: synthesize <version>-<distance>-g<sha>
+      # from the commit count and short HEAD hash so packaging proceeds.
+      local _short_hash="$(git rev-parse --short=9 HEAD)"
+      local _commit_count="$(git rev-list --count HEAD)"
+      git_description="0.0.1-${_commit_count}-g${_short_hash}"
+    }
     commit_version="${${git_description%-*}%-*}"
     commit_hash="${git_description##*-g}"
     commit_distance="${${git_description%-*}##*-}"

.github/scripts/Package-Windows.ps1

@@ -44,7 +44,15 @@ function Package {
 
     Install-BuildDependencies -WingetFile "${ScriptHome}/.Wingetfile"
 
-    $GitDescription = Invoke-External git describe --tags --long
+    # obs-studio-plus fork: tolerate missing tags (git describe --tags fails
+    # when no tag is reachable). Fall back to <version>-<commit-count>-g<sha>.
+    $GitDescription = $null
+    try { $GitDescription = Invoke-External git describe --tags --long } catch { }
+    if ( -not $GitDescription ) {
+        $ShortHash = (Invoke-External git rev-parse --short=9 HEAD).Trim()
+        $CommitCount = (Invoke-External git rev-list --count HEAD).Trim()
+        $GitDescription = "0.0.1-${CommitCount}-g${ShortHash}"
+    }
     $Tokens = ($GitDescription -split '-')
     $CommitVersion = $Tokens[0..$($Tokens.Count - 3)] -join '-'
     $CommitHash = $($Tokens[-1]).SubString(1)

.github/workflows/no-core-changes.yaml

@@ -0,0 +1,99 @@
+name: No Core Changes
+# Enforces the obs-studio-plus fork rule: libobs/, plugins/, deps/, and the
+# C++/Qt parts of frontend/ track upstream OBS Studio untouched. Only files
+# under engine/, CI infrastructure, and explicitly-allowlisted fork-specific
+# build fixes may diverge.
+#
+# See CONTRIBUTING.md for the full policy.
+
+on:
+  push:
+    branches:
+      - dev
+      - 'engine/**'
+  pull_request:
+    branches:
+      - dev
+      - master
+
+permissions:
+  contents: read
+
+jobs:
+  diff-against-upstream:
+    name: Diff Against Upstream OBS
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
+        with:
+          fetch-depth: 0
+
+      - name: Add upstream remote
+        run: |
+          git remote add upstream https://github.com/obsproject/obs-studio.git
+          git fetch --depth=200 upstream master
+
+      - name: Check off-limits paths
+        run: |
+          set -euo pipefail
+
+          # Off-limits paths (see CONTRIBUTING.md).
+          OFF_LIMITS=(
+            'libobs/'
+            'libobs-d3d11/'
+            'libobs-opengl/'
+            'libobs-winrt/'
+            'plugins/'
+            'deps/'
+          )
+
+          # Frontend is special: only the C++/Qt code is off-limits. The
+          # frontend/cmake/os-linux.cmake flatpak fix is allowlisted below.
+          # We restrict to actual source files, not cmake.
+          OFF_LIMITS+=(
+            'frontend/*.cpp'
+            'frontend/*.hpp'
+            'frontend/*.h'
+            'frontend/*.mm'
+            'frontend/*.swift'
+            'frontend/data/'
+            'frontend/dialogs/'
+            'frontend/docks/'
+            'frontend/forms/'
+            'frontend/idian/'
+            'frontend/menu/'
+            'frontend/models/'
+            'frontend/oauth/'
+            'frontend/plugins/'
+            'frontend/settings/'
+            'frontend/utility/'
+            'frontend/widgets/'
+            'frontend/window-basic-main.*'
+          )
+
+          MERGE_BASE=$(git merge-base upstream/master HEAD)
+          echo "Merge base with upstream/master: ${MERGE_BASE}"
+
+          # Find any diff in off-limits paths.
+          CHANGED=$(git diff --name-only "${MERGE_BASE}" HEAD -- "${OFF_LIMITS[@]}" || true)
+
+          if [[ -z "${CHANGED}" ]]; then
+            echo '✅ No core changes detected. Fork rule respected.'
+            exit 0
+          fi
+
+          echo '❌ The following files were modified in off-limits paths:'
+          echo '---'
+          echo "${CHANGED}"
+          echo '---'
+          echo ''
+          echo 'See CONTRIBUTING.md ("OBS Studio Plus — Fork Contribution Rules").'
+          echo 'OBS core (libobs, plugins, frontend C++) tracks upstream untouched.'
+          echo ''
+          echo 'Options:'
+          echo '  1. Move the change into engine/ (preferred)'
+          echo '  2. File the change upstream first (obsproject/obs-studio)'
+          echo '  3. If the change is genuinely fork-specific build/CI infrastructure'
+          echo '     and would be accepted upstream as a robustness fix, update'
+          echo '     CONTRIBUTING.md to allowlist it explicitly.'
+          exit 1

.github/workflows/push.yaml

@@ -1,20 +1,27 @@
 name: Push
+# obs-studio-plus fork: re-register after enabling Actions
 run-name: ${{ github.ref_name }} push run 🚀
 on:
   push:
     paths-ignore:
       - '**.md'
+      - '**.rst'
+      - 'AUTHORS'
+      - 'COPYING'
     branches:
       - master
       - 'release/**'
+      - dev
+      - 'feature/**'
     tags:
       - '*'
+  workflow_dispatch:
 permissions:
   contents: write
 jobs:
   check-format:
     name: Format 🔍
-    if: github.ref_name == 'master'
+    if: github.ref_name == 'master' || github.ref_name == 'dev' || startsWith(github.ref_name, 'feature/')
     uses: ./.github/workflows/check-format.yaml
     permissions:
       contents: read

.gitignore

@@ -32,6 +32,9 @@
 !COPYING
 !INSTALL
 !README.rst
+!ROADMAP.md
+!PLUS_PLAN.md
+!/engine
 
 # Exclude lock files
 *.lock.json

CONTRIBUTING.md

@@ -1,3 +1,108 @@
+OBS Studio Plus — Fork Contribution Rules
+=========================================
+
+> The section below is **specific to this fork** (`OgBops/obs-studio-plus`).
+> Upstream OBS Studio's full contribution guide follows further down and
+> applies to any code that is intended to be submitted upstream.
+
+This repository is the **engine** for the Plus desktop app. Plus is a
+separate user-facing product (separate repository, future). This fork
+exists for one reason: produce a headless `plus-host` binary that runs
+`libobs` in a sidecar process and exposes its functionality over IPC.
+
+## The hard rule: OBS core is read-only
+
+We do **not** modify the engine, plugins, or any code that ships as part of
+upstream OBS Studio. The fork's value is in keeping libobs unmodified so
+upstream changes merge cleanly forever.
+
+### Off-limits paths
+
+| Path | What it is |
+|------|-----------|
+| `libobs/` | The OBS engine itself |
+| `libobs-d3d11/`, `libobs-opengl/`, `libobs-winrt/` | Engine GPU backends |
+| `plugins/` | Every encoder, capture source, filter, output |
+| `frontend/` (C++/Qt code) | Upstream Qt UI. We don't link it; we also don't modify it. |
+| `deps/` | Third-party dependencies as upstream ships them |
+
+### Allowed playgrounds
+
+| Path | Purpose |
+|------|---------|
+| `engine/` | All Plus engine code (IPC server, host wrapper). New code lives here. |
+| `.github/workflows/`, `.github/scripts/`, `.github/actions/` | CI infrastructure |
+| `cmake/common/versionconfig.cmake` | Already-shipped fork-specific build robustness fix |
+| `frontend/cmake/os-linux.cmake` | Already-shipped flatpak metadata fix |
+| `*.md`, `*.rst`, `AUTHORS`, `COPYING` | Documentation and licensing |
+| `build-aux/` | Project tooling |
+
+### Smell test
+
+Before any commit outside `engine/`:
+
+> "Would this change still be correct if we deleted the entire fork tomorrow
+> and submitted it upstream as a PR?"
+
+If yes, fine. If no, you're modifying core. Stop.
+
+## What if libobs is genuinely missing what we need?
+
+We file the change **upstream first**.
+
+1. Search [obsproject/obs-studio issues](https://github.com/obsproject/obs-studio/issues)
+   for prior discussion.
+2. Open an upstream PR or issue with the API change request.
+3. Wait for upstream review.
+4. Once accepted upstream, sync via `master`.
+
+We do not carry local core patches. The discipline is the point.
+
+## Where Plus engine code goes
+
+```
+engine/
+├─ host/            # plus-host binary: links libobs, runs IPC server
+│  ├─ ipc/          # newline-JSON IPC protocol implementation
+│  ├─ methods/      # IPC method handlers (capture, output, scenes...)
+│  └─ main.cpp      # entry point
+├─ protocol/        # IPC protocol schema (shared definitions)
+└─ spike/           # Phase 0 throwaway code (deleted at end of phase 0)
+```
+
+## CI enforcement
+
+The workflow `.github/workflows/no-core-changes.yaml` runs on every push to
+`dev` and `engine/**`. It diffs against `upstream/master` and fails the
+build if any off-limits path has changed beyond explicitly-allowlisted
+commits.
+
+To intentionally update the allowlist (rare — only for upstream-able
+fork-specific build/CI fixes), edit the allowlist in the workflow itself
+and reference the upstream issue or PR.
+
+## Branching
+
+| Branch | Purpose |
+|--------|---------|
+| `master` | Tracks upstream OBS Studio. Untouched. |
+| `dev` | Integration branch. Branding, CI, the engine entry points land here. |
+| `engine/<name>` | Active engine work. Branch off `dev`. |
+| `engine/spike` | Phase 0 spike. Temporary; deleted after the spike retro. |
+
+Open work-in-progress PRs against `dev`, never `master`.
+
+## License
+
+Files in `engine/` are licensed under the GPL v2 or later, same as upstream
+OBS Studio, because they link `libobs`.
+
+The Plus app (separate repository) does **not** link `libobs` — it
+communicates with `plus-host` over IPC — and is therefore not subject to
+GPL. That separation is load-bearing. Keep it that way.
+
+---
+
 OBS Studio Contribution Guidelines
 ============