Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions docs/sourceos-shell-launcher-bridge.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sourceos-shell launcher bridge note
# sourceos-shell command bus note

During the early shell rollout, launcher integration is tracked as temporary bridge work.
During the early shell rollout, launcher/search integration is tracked as temporary command-bus work.

## Routing rule

Expand All @@ -12,7 +12,9 @@ Queries are routed by scope:

## Required invariant

For `files` queries, Albert must not perform a second file-search pass in parallel with the Linux-native provider.
For `files` queries, the command bus must not perform a second file-search pass in parallel with the Linux-native provider.

Lampstand is the intended Linux-native file authority for this lane.

## Realization scaffolds

Expand All @@ -21,8 +23,8 @@ The Linux realization currently carries placeholder search-provider material at:
- `linux/desktop/sourceos-search-provider.conf`
- `/etc/sourceos-shell/search-provider.json` (realized by the shell Nix module scaffold)

These capture the intended rollout mode and the provider choice for the Linux-native file search lane.
These capture the intended rollout mode, routing invariant, and the provider choice for the Linux-native file search lane.

## Lifecycle

This bridge exists only until the shell's own command/search surface fully absorbs the routing behavior.
This command-bus/search-provider surface exists only until the shell's own command/search runtime fully absorbs the routing behavior.
10 changes: 7 additions & 3 deletions linux/desktop/sourceos-search-provider.conf
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# SourceOS shell search-provider scaffold
# This file records the intended launcher/search routing policy during early shell rollout.
# This file records the intended command-bus/search routing policy during early shell rollout.

mode=launcher-bridge
linux-file-provider=tracker3
mode=command-bus
linux-file-provider=lampstand
invariant=no_redundant_file_search

# scopes
apps=launcher
files=linux-native-only
web=browser-agent

# notes
# - Lampstand is the Linux-native file authority for scope=files.
# - The command bus remains a frontend and must not perform a second file-search pass.
12 changes: 8 additions & 4 deletions modules/nixos/sourceos-shell/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ in

searchProvider = {
mode = lib.mkOption {
type = lib.types.enum [ "linux-native" "launcher-bridge" "shell-native" ];
default = "launcher-bridge";
type = lib.types.enum [ "linux-native" "command-bus" "shell-native" ];
default = "command-bus";
description = "Search routing mode during shell rollout.";
};

linuxFileProvider = lib.mkOption {
type = lib.types.enum [ "tracker3" "fd" "locate" ];
default = "tracker3";
type = lib.types.enum [ "lampstand" "fd" "locate" ];
default = "lampstand";
description = "Linux-native file search provider used when scope=files.";
};
};
Expand All @@ -72,6 +72,10 @@ in
files = "linux-native-only";
web = "browser-agent";
};
notes = [
"Lampstand is the Linux-native file authority for scope=files."
"The command bus remains a frontend and must not perform a second file-search pass."
];
};

systemd.services.sourceos-shell = {
Expand Down
Loading