fix(work-panel): keep the active tab's close button inside the strip

Cargo.toml

@@ -5,4 +5,4 @@ resolver = "2"
 [workspace.package]
 edition = "2021"
 license = "LGPL-3.0-or-later"
-version = "0.21.0-beta.4"
+version = "0.21.0-beta.6"

apps/desktop/electron/main/bootstrap/shutdown.ts

@@ -9,6 +9,7 @@ import type { PersistenceOutbox } from "../persistence-outbox";
 import type { PluginPanelHost } from "../plugin-panel-host";
 import type { PluginRuntime } from "../plugin-runtime";
 import type { PluginViewHost } from "../plugin-view-host";
+import type { ComposerSuggestionRelay } from "../services/composer-suggestion";
 import type { AppUpdaterController } from "../updater";
 import type { UserMcpRuntime } from "../user-mcp";
 import type { McpControlServer } from "../mcp-control";
@@ -45,6 +46,8 @@ export type ShutdownDependencies = {
   mcpOAuth?: Pick<McpOAuthManager, "disposeAll">;
   browserHost: Pick<BrowserHost, "dispose">;
   pluginViews: Pick<PluginViewHost, "dispose">;
+  /** Composer suggestions still waiting for an answer at quit (ADR 0333). */
+  composerSuggestion?: Pick<ComposerSuggestionRelay, "dispose">;
   updater: Pick<AppUpdaterController, "dispose" | "isInstallingUpdate">;
   logger: Pick<Logger, "app">;
   confirmQuitDialog: () => Promise<boolean>;
@@ -70,6 +73,7 @@ export function registerShutdownHandlers({
   mcpOAuth,
   browserHost,
   pluginViews,
+  composerSuggestion,
   updater,
   logger,
   confirmQuitDialog,
@@ -213,6 +217,7 @@ export function registerShutdownHandlers({
       userMcp.disposeAll();
       mcpOAuth?.disposeAll();
       browserHost.dispose();
+      composerSuggestion?.dispose();
       inflightCheckpointer.dispose();
 
       try {

apps/desktop/electron/main/bootstrap/window.ts

@@ -900,8 +900,8 @@ export async function createWindow({
       // so the reservation replan below is treated as an OS-owned adjustment.
       windowState.workPanelUserMovePending = false;
       applyWorkPanelReservation();
-      // Brief pin only when actively recovering from a shelf.
-      if (shelved || electronTiny) {
+      // Only macOS runs the watchdog that releases this temporary recovery pin.
+      if (process.platform === "darwin" && (shelved || electronTiny)) {
         window.setAlwaysOnTop(true, "floating");
         pinUntil = Date.now() + 4000;
       } else {

apps/desktop/electron/main/fs-index.ts

@@ -1 +1 @@
-export { FS_INDEX_MAX_ENTRIES, getWorkspaceFileIndex } from "@pi-desktop/host-runtime";
+export { FS_INDEX_MAX_ENTRIES, getWorkspaceFileIndex, searchWorkspaceFiles } from "@pi-desktop/host-runtime";

apps/desktop/electron/main/index.ts

@@ -72,6 +72,7 @@ import { createSessionCoordination } from "./runtime/session-coordination";
 import { createScheduledRuntime } from "./runtime/scheduled";
 import { createDesktopServices } from "./services/desktop-services";
 import { createPluginServices } from "./services/plugin-services";
+import type { ComposerSuggestionAnswer } from "./services/composer-suggestion";
 import { wirePluginThemeRuntimeServices } from "./plugin-theme-services";
 import { createSessionCollaborationService } from "./services/session-collaboration";
 import {
@@ -592,6 +593,8 @@ const {
 
 /** sessionId → open host turn id, for turn bookkeeping across agent events. */
 const activeTurns = new Map<string, string>();
+/** Host-verified completion turns whose first settled reply may be silent. */
+const completionNoticeTurns = new Set<string>();
 /** Plan submission turns end without a task-complete notification. */
 const planSubmissionTurnIds = new Set<string>();
 /** sessionId → host execution id for an approved plan currently dispatched. */
@@ -638,8 +641,12 @@ const sessionCoordination = createSessionCoordination({
    * begins running is reported with the durable turn id instead of being
    * inferred from the previous turn's end.
    */
-  onTurnStarted: (sessionId: string, turnId: string) =>
-    pluginServices.pluginSession.noteTurnStarted(sessionId, turnId),
+  onTurnStarted: (sessionId: string, turnId: string) => {
+    pluginServices.pluginSession.noteTurnStarted(sessionId, turnId);
+    // A new turn owns the composer now, so a suggestion about the previous one
+    // stops being shown and stops being showable (ADR 0333).
+    pluginServices.composerSuggestion.noteTurnStarted(sessionId, turnId);
+  },
 });
 const {
   activeTurnUsages,
@@ -725,6 +732,7 @@ const {
 const eventPersistence = createEventPersistence({
   runtimeState,
   steeringReplies,
+  completionNoticeTurns,
   activeTurns,
   activeToolCalls,
   activeToolCallKey,
@@ -884,12 +892,16 @@ function registerIpc() {
     },
     /** The shell reports the session on screen; plugin surfaces read it. */
     setActivePluginSession: (next) => pluginServices.pluginSession.setActiveSession(next),
+    /** The shell answers a composer suggestion through the same invoke list. */
+    settleComposerSuggestion: (answer: ComposerSuggestionAnswer) =>
+      pluginServices.composerSuggestion.settle(answer),
     getPluginLauncherWindow: () => mainState.pluginLauncherWindow,
     togglePluginLauncher,
     safeOpenExternal,
     updater,
     dataDir,
     activeTurns,
+    completionNoticeTurns,
     isTurnDispatchable,
     sessionProjects,
     persistenceOutbox,
@@ -1075,6 +1087,7 @@ registerShutdownHandlers({
   mcpOAuth,
   browserHost,
   pluginViews,
+  composerSuggestion: pluginServices.composerSuggestion,
   updater,
   logger,
   confirmQuitDialog,

apps/desktop/electron/main/ipc/agent-ipc.ts

@@ -25,6 +25,7 @@ export type AgentIpcDependencies = {
   persistenceOutbox: PersistenceOutbox;
   dataDir: string;
   activeTurns: Map<string, string>;
+  completionNoticeTurns: Set<string>;
   recordTurnStart: (sessionId: string, turnId: string) => void;
   /** Whether the named turn can still start or steer host work. */
   isTurnDispatchable: (sessionId: string, turnId: string | null | undefined) => boolean;
@@ -87,6 +88,7 @@ export function registerAgentIpc({
   persistenceOutbox,
   dataDir,
   activeTurns,
+  completionNoticeTurns,
   recordTurnStart,
   isTurnDispatchable,
   activeTurnUsages,
@@ -515,6 +517,16 @@ export function registerAgentIpc({
     } satisfies AgentEventEnvelope);
 
     let result: { accepted: boolean; turnId: string };
+    const isTrustedCompletionNotice =
+      sessionMessage?.origin.kind === "completion" &&
+      sessionMessage.origin.targetSessionId === req.sessionId &&
+      Boolean(
+        sessionMessage.origin.messageId.trim() &&
+        sessionMessage.origin.replyToMessageId?.trim(),
+      );
+    // sessionMessage was resolved from the Host ledger above; keep this
+    // provenance Main-owned and tied to the durable turn, never the prompt text.
+    if (isTrustedCompletionNotice) completionNoticeTurns.add(durableTurnId);
     try {
       result = await sidecar.call<{ accepted: boolean; turnId: string }>(
         "agent.prompt",
@@ -558,6 +570,7 @@ export function registerAgentIpc({
         },
       );
     } catch (e) {
+      completionNoticeTurns.delete(durableTurnId);
       await finishTurn(req.sessionId, "error", (e as any)?.errorCode, {
         turnId: durableTurnId,
       });

apps/desktop/electron/main/ipc/plugin-ui-ipc.ts

@@ -12,6 +12,11 @@ import type { PluginPanelTheme } from "../../shared/plugin-panel-chrome";
 import type { IpcRegistrar } from "./types";
 import { pluginProviderCatalogEntries } from "../plugin-provider-catalog";
 import { createSessionPushGate } from "../plugin-session-push-gate";
+import {
+  PLUGIN_COMPOSER_SUGGESTION_REFUSALS,
+  type PluginComposerSuggestionRefusal,
+} from "@pi-desktop/plugin-sdk";
+import type { ComposerSuggestionAnswer } from "../services/composer-suggestion";
 
 export type PluginUiIpcDependencies = {
   registrar: IpcRegistrar;
@@ -27,6 +32,12 @@ export type PluginUiIpcDependencies = {
   setActivePluginSession: (
     next: { sessionId: string; projectPath: string | null } | null,
   ) => void;
+  /**
+   * The shell's answer to one composer suggestion (`pi.composer.suggest`): the
+   * main process is waiting on it, because only the renderer knows whether the
+   * draft could take the line.
+   */
+  settleComposerSuggestion: (answer: ComposerSuggestionAnswer) => boolean;
 };
 
 /** Register plugin panels, work-panel views, themes and services. */
@@ -41,6 +52,7 @@ export function registerPluginUiIpc({
   getUpdaterLocale,
   getPluginPanelTheme,
   setActivePluginSession,
+  settleComposerSuggestion,
 }: PluginUiIpcDependencies): void {
   const handle = (channel: string, fn: (...args: any[]) => Promise<any>) => {
     registrar.handle(channel, fn);
@@ -86,6 +98,36 @@ export function registerPluginUiIpc({
       return { ok: true };
     },
   );
+  /**
+   * The shell's answer to one composer suggestion (`pi.composer.suggest`).
+   *
+   * Nothing is refused here: the offer it answers may already have been
+   * replaced, dropped, or timed out, and a late answer to a forgotten offer is
+   * simply not applied. `ok` therefore says the message was well formed, not
+   * that a suggestion is on screen.
+   */
+  handle(
+    IPC.invoke.pluginComposerSuggestionResult,
+    async (
+      payload:
+        | { requestId?: string | null; shown?: boolean | null; reason?: string | null }
+        | null,
+    ) => {
+      const requestId = typeof payload?.requestId === "string" ? payload.requestId.trim() : "";
+      if (!requestId) throw new Error("INVALID_ARGUMENT: requestId is required");
+      const reason =
+        typeof payload?.reason === "string" &&
+        (PLUGIN_COMPOSER_SUGGESTION_REFUSALS as readonly string[]).includes(payload.reason)
+          ? (payload.reason as PluginComposerSuggestionRefusal)
+          : undefined;
+      settleComposerSuggestion({
+        requestId,
+        shown: payload?.shown === true,
+        ...(reason ? { reason } : {}),
+      });
+      return { ok: true };
+    },
+  );
   handle(IPC.invoke.pluginOpenPanel, async (id: string) => {
     const loaded = plugins.getLoaded(id);
     if (!loaded) throw new Error("plugin not loaded");

apps/desktop/electron/main/ipc/register.ts

@@ -37,6 +37,7 @@ import { registerSpeechIpc } from "./speech-ipc";
 import { registerVoiceIpc } from "./voice-ipc";
 import { registerLiveVoiceIpc } from "./live-voice-ipc";
 import type { LiveCallService } from "../live-voice/call-service";
+import type { ComposerSuggestionAnswer } from "../services/composer-suggestion";
 import type { LiveVoiceWidget } from "../live-voice/widget-window";
 import type { IpcRegistrar } from "./types";
 import type { createTraySessions } from "../tray-sessions";
@@ -64,9 +65,12 @@ export type RegisterIpcDependencies = {
   setActivePluginSession: (
     next: { sessionId: string; projectPath: string | null } | null,
   ) => void;
+  /** The shell's answer to a composer suggestion it was offered (ADR 0333). */
+  settleComposerSuggestion: (answer: ComposerSuggestionAnswer) => boolean;
   activeUserSubagentDocuments: (...args: any[]) => Promise<any>;
   disabledBuiltinSubagents: () => Promise<string[]>;
   disabledBuiltinSkills: () => Promise<string[]>;
+  completionNoticeTurns: Set<string>;
   liveCallService?: LiveCallService;
   liveVoiceWidget?: LiveVoiceWidget;
   restartForStorage: () => void;
@@ -99,12 +103,14 @@ export function registerIpcHandlers(dependencies: RegisterIpcDependencies) {
     getNotificationViewingSessionId,
     setNotificationViewingSessionId,
     setActivePluginSession,
+    settleComposerSuggestion,
     getPluginLauncherWindow,
     togglePluginLauncher,
     safeOpenExternal,
     updater,
     dataDir,
     activeTurns,
+    completionNoticeTurns,
     isTurnDispatchable,
     sessionProjects,
     persistenceOutbox,
@@ -425,6 +431,7 @@ export function registerIpcHandlers(dependencies: RegisterIpcDependencies) {
     persistenceOutbox,
     dataDir,
     activeTurns,
+    completionNoticeTurns,
     recordTurnStart,
     isTurnDispatchable,
     activeTurnUsages,
@@ -505,8 +512,8 @@ export function registerIpcHandlers(dependencies: RegisterIpcDependencies) {
     getUpdaterLocale,
     getPluginPanelTheme,
     setActivePluginSession,
+    settleComposerSuggestion,
   });
-
   registerSpeechIpc({ registrar, speech });
 
   if (voiceService) {