Reviewing files that changed from the base of the PR and between 8bb96d7 and 34c3cda.

• Flow.Launcher.Core/Plugin/QueryBuilder.cs (3 hunks)
• Flow.Launcher.Plugin/Query.cs (1 hunks)
• Flow.Launcher.Test/QueryBuilderTest.cs (3 hunks)
• Flow.Launcher/MainWindow.xaml.cs (1 hunks)
• Flow.Launcher/ViewModel/MainViewModel.cs (9 hunks)

• GitHub Check: gitStream.cm
• GitHub Check: gitStream.cm
• GitHub Check: build

Flow.Launcher.Plugin/Query.cs (1)

10-14: Good addition of the Input property with clear documentation

The new Input property with appropriate XML documentation clearly explains its purpose and usage guidance. The warning about using Search property instead is consistent with the documentation for RawQuery.

Flow.Launcher/MainWindow.xaml.cs (1)

411-411: Updated QueryBuilder.Build call with proper parameters

The call has been correctly updated to pass both the raw query text and the trimmed text as separate parameters, aligning with the updated method signature in QueryBuilder.cs.

Flow.Launcher.Test/QueryBuilderTest.cs (3)

19-19: Test adjusted to use updated QueryBuilder.Build signature

The test call has been properly updated to include the raw input parameter, maintaining test integrity while accommodating the API change.

---

42-42: Test adjusted to use updated QueryBuilder.Build signature

The test call has been properly updated to include the raw input parameter, maintaining test integrity while accommodating the API change.

---

54-54: Test adjusted to use updated QueryBuilder.Build signature

The test call has been properly updated to include the raw input parameter, maintaining test integrity while accommodating the API change.

Flow.Launcher.Core/Plugin/QueryBuilder.cs (4)

9-9: Method signature updated to include the raw input parameter

The Build method signature has been enhanced to accept the raw input as a separate parameter, which will be used to populate the new Input property on the Query class.

---

14-15: Minor formatting change

Small formatting adjustment with no functional impact.

---

25-26: Additional whitespace added for readability

Small formatting improvement to enhance code readability.

Also applies to: 32-33

---

42-42: Correctly setting the new Input property

The new Input property is properly populated with the raw input parameter, completing the implementation of this feature.

Flow.Launcher/ViewModel/MainViewModel.cs (2)

1274-1281: Potential visibility race on _runningQuery

_runningQuery is written on the UI thread and later read from a Task.Delay continuation running on a ThreadPool thread.
Although reference assignments are atomic, without volatile/Interlocked there is no publish-happens-before relation; the ThreadPool may observe a stale value.

If correctness depends on the most recent write, consider:

private volatile Query _runningQuery;

or guarding access with a lock/Interlocked.Exchange.

Would you verify if stale reads could surface in practice? If so, I can help prepare a patch.

---

1396-1397: Verify parameter order matches QueryBuilder.Build signature

Just a sanity check: Build(rawInput, processedText, nonGlobalPlugins) is expected.
Confirm that QueryText (raw) and queryBuilder.ToString().Trim() (processed) are in the correct order to ensure Query.Input holds the unmodified user text.

Reviewing files that changed from the base of the PR and between 381334f and 1381748.

• Flow.Launcher/ViewModel/MainViewModel.cs (9 hunks)

• GitHub Check: gitStream workflow automation
• GitHub Check: gitStream.cm
• GitHub Check: build

Flow.Launcher/ViewModel/MainViewModel.cs (9)

240-240: Fixed update logic comparison

This fixes the core issue where the update logic incorrectly compared e.Query.RawQuery with QueryText instead of comparing equivalent objects.

---

373-373: Updated QueryBuilder.Build call with Input parameter

Correctly updated to pass both raw input and trimmed text to match the updated signature.

---

1221-1221: Reset query state before processing

Good practice to initialize the query state before starting a new query process.

---

1241-1246: Early return optimization for changed queries

This is a good optimization to prevent processing outdated queries when user input changes rapidly.

---

1251-1252: Improved query state tracking

Setting both the progress and update query objects provides better tracking of the query lifecycle.

---

1291-1302: Progress bar visibility linked to query state

Good implementation of delayed progress bar visibility that also checks if the query is still active before showing it.

---

1325-1332: Reset progress query after completion

Properly manages the progress state and progress bar visibility after query execution completes.

---

1334-1338: Added safety with try-finally block

The finally block ensures the query state is cleaned up even if an exception occurs, preventing state leakage.

---

1414-1414: Updated call to match new QueryBuilder.Build signature

Correctly updated to provide both the original input and the processed query string.

Reviewing files that changed from the base of the PR and between f49a86a and e01109d.

• Flow.Launcher/MainWindow.xaml.cs (1 hunks)
• Flow.Launcher/ViewModel/MainViewModel.cs (9 hunks)

• Flow.Launcher/MainWindow.xaml.cs

• GitHub Check: build

Reviewing files that changed from the base of the PR and between e01109d and 61ee542.

• Flow.Launcher/ViewModel/MainViewModel.cs (8 hunks)

• GitHub Check: gitStream.cm

Flow.Launcher/ViewModel/MainViewModel.cs (14)

444-452: Correct: Build now receives both Input (untrimmed) and text (trimmed).

This aligns Backspace with the new QueryBuilder API and preserves user input semantics.

---

1337-1345: Don’t abort after shortcut expansion (stale guard).

ConstructQueryAsync can rewrite QueryText (builtin/custom shortcuts). Comparing query.Input with the live QueryText right after that will often differ and prematurely return, yielding an empty/stale result pane after expansions.

Apply this to snapshot the input before constructing the query and relax the guard to allow either the original input or the expanded RawQuery:

- var query = await ConstructQueryAsync(QueryText, Settings.CustomShortcuts, Settings.BuiltinShortcuts);
+ var inputSnapshot = QueryText;
+ var query = await ConstructQueryAsync(inputSnapshot, Settings.CustomShortcuts, Settings.BuiltinShortcuts);
@@
- // Check if the input text matches the query text
- if (query.Input != QueryText) return;
+ // Short-circuit only if user has typed something new unrelated to this query
+ var currentText = QueryText;
+ if (!string.Equals(currentText, inputSnapshot, StringComparison.Ordinal) &&
+ !string.Equals(currentText, query.RawQuery, StringComparison.Ordinal))
+ {
+ return;
+ }

---

1485-1499: Result-clearing logic looks correct; good early return when no update tasks.

This prevents stale results when home-page plugins are all disabled or absent.

If you want to be extra sure, test with:

• ShowHistoryResultsForHomePage = false
• All home plugins disabled
• Enter/clear text to confirm the view clears.

---

1596-1599: Good: Build for whitespace path sets both Input and RawQuery empty.

This keeps IsHomeQuery true and avoids null queries.

---

1618-1619: Good: pass the method parameter as Input to avoid races.

Using queryText here ensures the built Query carries the exact input used for construction.

---

217-277: Channel consumer resiliency looks fine; continuation restarts on fault.

No action needed.

---

571-588: UI navigation helpers unchanged; LGTM.

Selection and preview update wiring remains consistent.

Also applies to: 607-622

---

1510-1517: ClearResults helper is cohesive and idempotent.

Approach to collapse/clear/reset states is sound.

---

1523-1572: Per-plugin query path is correct; good use of Task.Yield and cloning.

No issues spotted.

---

327-338: Clock/date timer ok.

PeriodicTimer loop is simple and cancellation-free as intended.

---

1951-1958: Dialog focus restore is guarded and logged; ok.

No changes requested.

---

2276-2303: Dispose pattern correct; writers completed and tasks disposed.

Looks good.

---

1379-1381: Compile-time error: TaskScheduler is not awaitable.

await TaskScheduler.Default; won’t compile and also risks property updates off the UI thread. Use an awaitable construct; you don’t need to hop threads here since plugin work is already offloaded per-plugin.

- // Switch to ThreadPool thread
- await TaskScheduler.Default;
+ // Yield once without changing context (plugin queries run on background tasks)
+ await Task.Yield();

---

1335-1499: No extra await TaskScheduler.Default or stale-query guards found
Only the await at MainViewModel.cs:1380 and the input guard at 1363 exist.

Reviewing files that changed from the base of the PR and between 61ee542 and 51be8d0.

• Flow.Launcher/MainWindow.xaml.cs (1 hunks)
• Flow.Launcher/ViewModel/MainViewModel.cs (7 hunks)

• GitHub Check: build

Flow.Launcher/MainWindow.xaml.cs (1)

479-479: LGTM! Correct usage of the new QueryBuilder.Build signature.

The call correctly passes the untrimmed QueryTextBox.Text as the input parameter and the trimmed version as the text parameter, aligning with the new Input property feature.

Flow.Launcher/ViewModel/MainViewModel.cs (7)

39-40: LGTM! Query-based tracking improves state management.

Replacing the boolean _isQueryRunning with Query-based tracking fields provides more precise cancellation and state management by tracking which specific query is in progress.

---

286-286: LGTM! Correct use of Input property for stale query detection.

The guard now compares e.Query.Input with _updateQuery.Input, which correctly identifies stale queries by comparing the untrimmed original input rather than the trimmed/expanded RawQuery.

Based on PR objectives and author clarification to reviewer taooceros.

---

444-444: LGTM! Correct usage of the new QueryBuilder.Build signature.

The call correctly passes QueryText (untrimmed) as the input parameter and QueryText.Trim() as the text parameter.

---

1375-1376: Verify that await TaskScheduler.Default; compiles in your environment.

The code await TaskScheduler.Default; is not standard awaitable syntax. TaskScheduler does not implement GetAwaiter() in the standard .NET libraries.

If this compiles in your environment, you may be using a Visual Studio extension or custom awaiter. However, this will fail in most standard .NET environments.

Standard alternatives for switching to ThreadPool:

If the current syntax doesn't compile or you want more portable code, use:

-// Switch to ThreadPool thread
-await TaskScheduler.Default;
+// Switch to ThreadPool thread
+await Task.Run(() => { });

Or if you only need to yield execution without guaranteeing a thread switch:

-// Switch to ThreadPool thread
-await TaskScheduler.Default;
+// Yield execution
+await Task.Yield();

Note: Task.Yield() queues continuation but doesn't guarantee thread switch, while Task.Run(() => { }) ensures execution on ThreadPool.

Based on past review comments indicating this was discussed with reviewer taooceros.

---

1424-1434: LGTM! Correct progress bar timing with Input property comparison.

The progress bar logic correctly uses _progressQuery.Input == query.Input to verify that the current query is still active before showing the progress indicator.

---

1594-1594: LGTM! Correct handling of empty input.

For empty or whitespace input, both the input and text parameters are set to string.Empty, correctly indicating a home query with no user input.

---

1614-1614: LGTM! Correctly uses method parameter to avoid race condition.

The call correctly passes the immutable queryText parameter (not the mutable QueryText property) as the input argument, preventing race conditions where the property value could change between query construction and validation.

Based on past review comments indicating this race condition was previously flagged and fixed.

Reviewing files that changed from the base of the PR and between ae76b53 and 3ef5238.

• Flow.Launcher/Helper/ResultHelper.cs (1 hunks)
• Flow.Launcher/MainWindow.xaml.cs (1 hunks)
• Flow.Launcher/ViewModel/MainViewModel.cs (7 hunks)

• GitHub Check: build

Flow.Launcher/Helper/ResultHelper.cs (1)

23-23: Build call update is correct

Passing rawQuery as both Input and Text aligns with the new signature and is appropriate for history re-query. LGTM.

Flow.Launcher/MainWindow.xaml.cs (1)

480-480: Correct use of Input vs trimmed Text

Using QueryTextBox.Text (Input) with its Trim() (Text) ensures accurate Search parsing without losing user input. Looks good.

Flow.Launcher/ViewModel/MainViewModel.cs (2)

40-42: Clear split of query state tracking

Replacing a single running flag with _progressQuery and _updateQuery clarifies responsibilities for progress gating vs update routing. Good change.

---

1640-1641: Correct propagation of original input into QueryBuilder

Passing the pre-expansion queryText as Input and the expanded-trimmed text as Text is the right contract for Query.Input vs RawQuery/Search. LGTM.

Also applies to: 1660-1661