Omniscio

Base-branch picker

How the Base branch choice works: which git branch a new session's worktree forks from and merges back into, how the choice is remembered on the session, and the one boundary worth knowing about the auto-lander. No Start session dialog shows the picker today — see "Where to find it".

On this page

What it is

One line: A session launch can name which git branch its worktree forks from — and that same branch is where the session's work merges back when it's done — instead of always branching off (and merging into) master.

What it does (user-visible)

Omniscio can run a session in its own git worktree (a separate working copy on its own branch) so agents don't step on each other. That is off by default: the global isolation default ships off, a project's own isolation flag ships off, and a session is isolated only when one of those has been switched on (or the session was launched with a one-off isolation override). Until now an isolated session's worktree always started from the repo's current HEAD (normally master), and the session's work merged back into master when the session ended.

A session launch can name a base branch. With one named (say develop or a feature branch):

  • the new session's worktree is forked from that branch (it starts with that branch's code), and
  • when the session finishes and its work merges back, it merges into that same branch, not master.

Name nothing and everything behaves exactly as before (fork from master, merge to master) — the default is byte-for-byte the old behavior.

The choice only does anything for an isolated session. The branch is read only on the worktree-creation path. A session that is not isolated runs in your project folder on whatever is checked out there: the branch you picked is neither forked from nor saved as the session's land target, and nothing tells you it was ignored. If you want the pick to mean something, switch session isolation on for the project (or launch the session isolated) first.

A returned cloud branch is a starting point only. Branches that start with cloud/ are the work a cloud session sent back to your computer, and Omniscio keeps them exactly as they came home. You can still pick one as the Base branch, and the new session will fork from it, but when that session finishes it merges into your main line, not into the cloud/ branch. Nothing is changed on the cloud branch, and you are not asked to confirm this.

Where to find it

Where it is

  • Nowhere on screen today. The Start session dialogs you open from an inbox alert, a drip item, a scheduled message, a weekly summary, a briefing, a failed job, a Help Desk report or ticket, a share or a Linear issue — and the Supermail and Team Chat start dialogs — show no Base branch dropdown. Sessions started from them fork from (and merge back into) the project's default, as if nothing were picked.
  • The launch itself still accepts a baseBranch, and everything below — the fork, the saved land target and the merge back — works for a launch that carries one.
  • The live branch list (PROJECT_BRANCHES_GET) still exists; other screens use it.

How it behaves

The one boundary to know

This is delivered entirely through Omniscio's in-app merge — the path interactive sessions already use when they end. The background auto-lander (which merges ready-to-merge-tagged branches) is deliberately left untouched, but the in-app merge still obeys the lander's on/off switch: it runs only while the auto-lander is armed — and the auto-lander ships disarmed, so on a default install the session-end merge does not run and the branch is kept for you to merge.

So do NOT tag a base-branch session ready-to-merge. If you do, the auto-lander lands the branch to master (its normal, unchanged behavior) — and, critically, your chosen target then never receives the work at all. This is stronger than "the lander used the wrong target": once the lander has landed the branch, the later in-app merge is SKIPPED. It sees that the branch's work has already reached a base and reports success without merging into the branch you picked.

Net effect for exactly that combination: the UI reports success, and the branch you picked is never touched. The work is not lost — it is on master — but it is not where you asked for it. (The skip itself is correct in isolation: the lander replays commits with FRESH SHAs, so a plain git merge would FALSE-conflict on already-landed changes. What is missing is any handling of a chosen land target that the land bypassed.)

Landing into your branch happens via the normal session-end / Merge / CLI merge only when the auto-lander has not already landed the branch. Closing the gap properly is a lander/merge-queue behaviour change and is deliberately not taken here.

Status & limits

  • No Start session dialog offers the picker; the launch field and the merge-back machinery remain. A Quick Launch composer picker and a CLI/API baseBranch on POST /project/:name/new are not built.
  • The branch-list read is mobile-reachable.

Base branches are one part of a session's git story: start-a-new-session.md covers starting a session, session-land-status-strip.md shows where a finished session's branch sits in the auto-lander's queue, and auto-lander-dashboard.md is where the lander itself is watched, paused and resumed.

Last verified 2026-10-25