@omercnet/paseo-omp 5.1.1 → 5.2.0-next.362.1

package/OVERVIEW.md

@@ -11,6 +11,7 @@ OMP adds an agent provider for the OMP coding agent, plus an OMP sidebar and wor
 - Edit OMP settings and project configuration for the default store or a named profile.
 - Manage OMP's own plugins, and view quota history, memory, hub processes, session history and a support report.
 - An **MCP** composer control runs OMP's MCP management in the current session, with authorization prompts shown in the chat.
+- While OMP subagents run, a row under each `task` card in the conversation lets you steer one with a message or stop it after confirmation. It needs OMP 18.4.9 or newer.
 - OMP agents can call Paseo's orchestration tools with the optional `serverId` argument and `list_hosts` to delegate work to other connected Paseo hosts.
 
 ## Reads and sends

package/README.md

@@ -31,7 +31,7 @@ paseo plugin install npm:@omercnet/paseo-omp@<version>
 paseo plugin ls paseo-omp
 ```
 
-Open the **OMP** sidebar to review the provider-profile contract, choose which composer pills appear, browse and edit native scalar settings, manage OMP-native plugins, verify runtime health, and generate a bounded support report under **Help**. The same tabs are available in the workspace OMP panel, except for the global Composer preference tab. Then create an agent and select **OMP Plugin**. Its optional **MCP** composer control runs OMP-native management commands in the current session; setup questions and authorization stay in that chat timeline, where OAuth can open in a workspace-scoped Paseo Browser or on the current device. Composer pill preferences are shared by clients connected to the same host; normal use requires no other plugin-specific settings.
+Open the **OMP** sidebar to review the provider-profile contract, choose which composer pills appear, browse and edit native scalar settings, manage OMP-native plugins, verify runtime health, and generate a bounded support report under **Help**. The same tabs are available in the workspace OMP panel, except for the global Composer preference tab. Then create an agent and select **OMP Plugin**. Its optional **MCP** composer control runs OMP-native management commands in the current session; setup questions and authorization stay in that chat timeline, where OAuth can open in a workspace-scoped Paseo Browser or on the current device. While OMP subagents run, a row under each `task` card in the conversation lets you steer or stop one of them; this needs OMP 18.4.9 or newer. Composer pill preferences are shared by clients connected to the same host; normal use requires no other plugin-specific settings.
 
 - [Install, update, rollback, and local development](docs/installation.md)
 - [Configuration and every provider option](docs/configuration.md)
@@ -84,7 +84,7 @@ Scoring is deliberately mechanical so releases remain comparable:
 | `session.revert.both` | **0%** | Not advertised because OMP cannot atomically rewind conversation and workspace files. |
 | `session.revert.conversation` | **100%** | Native branch-based conversation rewind, replay deduplication, ownership transfer, and failure quarantine. |
 | `session.revert.files` | **0%** | Not advertised because OMP does not expose a native file-only rewind contract. |
-| `session.subsession` | **100%** | Direct and nested OMP subagents become Paseo child sessions with lifecycle, ancestry, progress, and replay. |
+| `session.subsession` | **100%** | Direct and nested OMP subagents become Paseo child sessions with lifecycle, ancestry, progress, and replay. Paseo's child sessions are read-only, so the provider also publishes a plugin timeline row under each `task` card that steers or stops one running child through OMP's `steer_subagent` and `cancel_subagent` (OMP 18.4.9 or newer) without stopping the parent turn. |
 | `session.unarchive` | **0%** | Not advertised; there is no native OMP archive state to reverse. |
 | `permission` | **100%** | Typed tool permissions when negotiated, with a bounded generic interaction fallback for OMP 18.1.15. Allow, deny, cancel, timeout, and interruption are covered. |
 | `permission.tool_policy` | **0%** | Not advertised. Exact MCP preapproval policy cannot be preserved through OMP `set_host_tools`, so the plugin fails closed instead of broadening access. |

package/client/provider-image.tsx

@@ -1,6 +1,7 @@
 import type { PluginTimelineItemProps } from "@getpaseo/plugin/client";
-import { useMemo, useState } from "react";
-import { Image, Text, View } from "react-native";
+import { Modal, ScrollView } from "@getpaseo/plugin/client/ui";
+import { useEffect, useMemo, useState } from "react";
+import { Image, Pressable, Text, View } from "react-native";
 import { type OmpImageTimelineData, visibleOmpImageText } from "../shared/provider-image";
 
 export function OmpImageTimeline({ item, theme }: PluginTimelineItemProps<OmpImageTimelineData>) {
@@ -31,6 +32,8 @@ export function OmpImageTimeline({ item, theme }: PluginTimelineItemProps<OmpIma
     }),
     [theme],
   );
+  const [enlargedId, setEnlargedId] = useState<string | null>(null);
+  const enlarged = item.data.images.find((image) => image.id === enlargedId);
   const [failedImageIds, setFailedImageIds] = useState<ReadonlySet<string>>(() => new Set());
   const visibleText = useMemo(() => visibleOmpImageText(item.data.text), [item.data.text]);
   return (
@@ -46,21 +49,131 @@ export function OmpImageTimeline({ item, theme }: PluginTimelineItemProps<OmpIma
             </Text>
           </View>
         ) : (
-          <Image
+          <Pressable
             key={image.id}
-            source={{ uri: `data:${image.mimeType};base64,${image.data}` }}
-            resizeMode="contain"
-            accessibilityLabel={`${item.data.label} image ${index + 1}`}
-            onError={() =>
-              setFailedImageIds((current) => {
-                if (current.has(image.id)) return current;
-                return new Set([...current, image.id]);
-              })
-            }
-            style={styles.image}
-          />
+            accessibilityRole="button"
+            accessibilityLabel={`Enlarge ${item.data.label} image ${index + 1}`}
+            onPress={() => setEnlargedId(image.id)}
+          >
+            <Image
+              source={{ uri: `data:${image.mimeType};base64,${image.data}` }}
+              resizeMode="contain"
+              accessibilityLabel={`${item.data.label} image ${index + 1}`}
+              onError={() =>
+                setFailedImageIds((current) => {
+                  if (current.has(image.id)) return current;
+                  return new Set([...current, image.id]);
+                })
+              }
+              style={styles.image}
+            />
+          </Pressable>
         ),
       )}
+      <Modal
+        title={item.data.label}
+        open={enlarged !== undefined}
+        onOpenChange={(open) => {
+          if (!open) setEnlargedId(null);
+        }}
+      >
+        <Modal.Content scrollable={false}>
+          {enlarged ? (
+            <EnlargedImage
+              key={enlarged.id}
+              failed={failedImageIds.has(enlarged.id)}
+              uri={`data:${enlarged.mimeType};base64,${enlarged.data}`}
+              label={item.data.label}
+              theme={theme}
+            />
+          ) : null}
+        </Modal.Content>
+      </Modal>
+    </View>
+  );
+}
+
+/** Fits the image to the dialog; a tap shows it at its real pixel size, panned by scrolling. */
+function EnlargedImage({
+  uri,
+  label,
+  failed,
+  theme,
+}: {
+  uri: string;
+  failed: boolean;
+  label: string;
+  theme: PluginTimelineItemProps<OmpImageTimelineData>["theme"];
+}) {
+  const [natural, setNatural] = useState<{ width: number; height: number } | null>(null);
+  const [actualSize, setActualSize] = useState(false);
+  const [renderFailed, setRenderFailed] = useState(false);
+  const [sizeUnavailable, setSizeUnavailable] = useState(false);
+  useEffect(() => {
+    let current = true;
+    Image.getSize(
+      uri,
+      (width, height) => current && setNatural({ width, height }),
+      () => current && setSizeUnavailable(true),
+    );
+    return () => {
+      current = false;
+    };
+  }, [uri]);
+  const canZoom = natural !== null;
+  // The modal body is bounded (`scrollable={false}`), so the image and its scroller share its height
+  // with the caption instead of guessing from the window.
+  const fill = { flex: 1, minHeight: 0 };
+  const mutedText = {
+    color: theme.colors.foregroundMuted,
+    fontSize: 12,
+    textAlign: "center" as const,
+  };
+  if (failed || renderFailed) {
+    return <Text style={mutedText}>This image could not be rendered on this Paseo client.</Text>;
+  }
+  return (
+    <View style={[fill, { gap: 8 }]}>
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={
+          actualSize ? `Fit ${label} image to window` : `Show ${label} image at actual size`
+        }
+        disabled={!canZoom}
+        onPress={() => setActualSize((value) => !value)}
+        style={fill}
+      >
+        {actualSize && natural ? (
+          <ScrollView style={fill}>
+            <ScrollView horizontal>
+              <Image
+                source={{ uri }}
+                accessibilityLabel={`${label} enlarged image`}
+                onError={() => setRenderFailed(true)}
+                style={{ width: natural.width, height: natural.height }}
+              />
+            </ScrollView>
+          </ScrollView>
+        ) : (
+          <Image
+            source={{ uri }}
+            resizeMode="contain"
+            accessibilityLabel={`${label} enlarged image`}
+            onError={() => setRenderFailed(true)}
+            style={[fill, { width: "100%" }]}
+          />
+        )}
+      </Pressable>
+      {canZoom ? (
+        <Text style={mutedText}>
+          {actualSize
+            ? `${natural.width} × ${natural.height}px · tap to fit`
+            : `Tap the image to see it at ${natural.width} × ${natural.height}px`}
+        </Text>
+      ) : null}
+      {sizeUnavailable ? (
+        <Text style={mutedText}>The actual size of this image is not available.</Text>
+      ) : null}
     </View>
   );
 }

package/client/provider-launch-settings.tsx

@@ -8,6 +8,7 @@ import {
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Text, View } from "react-native";
 import {
+  MAX_SESSIONS_UPPER_BOUND,
   providerLaunchSettings,
   providerLaunchSettingsSchema,
 } from "../shared/provider-launch-settings";
@@ -23,6 +24,11 @@ function ProviderLaunchSettingsControls({ settings }: { settings: ReadySettings
   useEffect(() => {
     setRawNames(savedNames);
   }, [savedNames]);
+  const savedMaxSessions = String(settings.values.maxSessions);
+  const [rawMaxSessions, setRawMaxSessions] = useState(() => savedMaxSessions);
+  useEffect(() => {
+    setRawMaxSessions(savedMaxSessions);
+  }, [savedMaxSessions]);
   const inheritEnv = [
     ...new Set(
       rawNames
@@ -31,7 +37,7 @@ function ProviderLaunchSettingsControls({ settings }: { settings: ReadySettings
         .filter(Boolean),
     ),
   ];
-  const next = providerLaunchSettingsSchema.safeParse({ inheritEnv });
+  const next = providerLaunchSettingsSchema.safeParse({ ...settings.values, inheritEnv });
   const error = next.success
     ? null
     : (next.error.issues[0]?.message ?? "Enter valid variable names.");
@@ -39,6 +45,14 @@ function ProviderLaunchSettingsControls({ settings }: { settings: ReadySettings
     if (!next.success) return;
     await settings.save(next.data, settings.revision);
   }, [next, settings]);
+  const nextMaxSessions = providerLaunchSettingsSchema.safeParse({
+    ...settings.values,
+    maxSessions: Number(rawMaxSessions.trim()),
+  });
+  const saveMaxSessions = useCallback(async () => {
+    if (!nextMaxSessions.success) return;
+    await settings.save(nextMaxSessions.data, settings.revision);
+  }, [nextMaxSessions, settings]);
 
   return (
     <View style={{ gap: 12 }}>
@@ -69,7 +83,9 @@ function ProviderLaunchSettingsControls({ settings }: { settings: ReadySettings
             actionLabel="Clear"
             disabled={settings.saving || settings.values.inheritEnv.length === 0}
             onPress={async () => {
-              if (await settings.save({ inheritEnv: [] }, settings.revision)) setRawNames("");
+              if (await settings.save({ ...settings.values, inheritEnv: [] }, settings.revision)) {
+                setRawNames("");
+              }
             }}
           />
           {settings.saveError ? (
@@ -83,6 +99,34 @@ function ProviderLaunchSettingsControls({ settings }: { settings: ReadySettings
           ) : null}
         </SettingsCard>
       </SettingsSection>
+      <SettingsSection
+        title="Session limit"
+        info="Applies to all OMP Plugin agents on this host together, including idle ones."
+      >
+        <SettingsCard>
+          <SettingsInput
+            key={savedMaxSessions}
+            label="Open sessions"
+            hint="New OMP Plugin agents are refused while this many sessions are open. Archive idle agents to free sessions."
+            initialValue={savedMaxSessions}
+            onChangeText={setRawMaxSessions}
+            error={
+              nextMaxSessions.success
+                ? undefined
+                : `Enter a whole number from 1 to ${MAX_SESSIONS_UPPER_BOUND}.`
+            }
+            disabled={settings.saving}
+          />
+          <SettingsAction
+            label="Save session limit"
+            actionLabel="Save"
+            disabled={
+              settings.saving || rawMaxSessions === savedMaxSessions || !nextMaxSessions.success
+            }
+            onPress={() => void saveMaxSessions()}
+          />
+        </SettingsCard>
+      </SettingsSection>
     </View>
   );
 }

package/client/subagents-state.ts

@@ -0,0 +1,108 @@
+import type { OmpSubagentStrip } from "../shared/subagents";
+
+export type OmpSubagentRow = OmpSubagentStrip["subagents"][number];
+
+/**
+ * One row of a subagent strip at a time owns the stop confirmation, the steering draft, or the
+ * pending request. The state keeps that row as last listed, so its draft stays visible after the
+ * subagent leaves the strip.
+ */
+export type SubagentStripState =
+  | { kind: "idle" }
+  | { kind: "confirming-stop"; subagent: OmpSubagentRow }
+  | { kind: "steering"; subagent: OmpSubagentRow; draft: string }
+  | { kind: "stopping"; subagent: OmpSubagentRow }
+  | { kind: "sending"; subagent: OmpSubagentRow; draft: string };
+
+export type SubagentStripAction =
+  | { type: "request-stop"; subagent: OmpSubagentRow }
+  | { type: "start-steer"; subagent: OmpSubagentRow }
+  | { type: "edit-draft"; draft: string }
+  | { type: "dismiss" }
+  | { type: "submit" }
+  | { type: "settled" }
+  | { type: "failed" };
+
+type PendingState = Extract<SubagentStripState, { kind: "stopping" | "sending" }>;
+
+export const INITIAL_SUBAGENT_STRIP_STATE: SubagentStripState = { kind: "idle" };
+
+export function isSendableDraft(draft: string): boolean {
+  return draft.trim().length > 0;
+}
+
+export function isSubagentRequestPending(state: SubagentStripState): state is PendingState {
+  return state.kind === "stopping" || state.kind === "sending";
+}
+
+/** The subagent a row's controls belong to while it owns the strip, or `null`. */
+export function activeSubagent(state: SubagentStripState): OmpSubagentRow | null {
+  return state.kind === "idle" ? null : state.subagent;
+}
+
+/**
+ * The request a submit starts from this state, or `null` when it starts none. A submit while a
+ * request is pending starts nothing, so a repeated press cannot send a second steering message.
+ */
+export function requestedSubmission(state: SubagentStripState): PendingState | null {
+  if (isSubagentRequestPending(state)) return null;
+  const next = subagentStripReducer(state, { type: "submit" });
+  return isSubagentRequestPending(next) ? next : null;
+}
+
+export function subagentStripReducer(
+  state: SubagentStripState,
+  action: SubagentStripAction,
+): SubagentStripState {
+  if (isSubagentRequestPending(state)) return settle(state, action);
+  switch (action.type) {
+    case "request-stop":
+      return { kind: "confirming-stop", subagent: action.subagent };
+    case "start-steer":
+      return { kind: "steering", subagent: action.subagent, draft: "" };
+    case "edit-draft":
+      return state.kind === "steering" ? { ...state, draft: action.draft } : state;
+    case "dismiss":
+      return INITIAL_SUBAGENT_STRIP_STATE;
+    case "submit":
+      if (state.kind === "confirming-stop") return { kind: "stopping", subagent: state.subagent };
+      if (state.kind === "steering" && isSendableDraft(state.draft)) {
+        return { kind: "sending", subagent: state.subagent, draft: state.draft };
+      }
+      return state;
+    default:
+      return state;
+  }
+}
+
+/** A failed send reopens its draft for another try; every other outcome closes the row. */
+function settle(state: PendingState, action: SubagentStripAction): SubagentStripState {
+  if (action.type === "settled") return INITIAL_SUBAGENT_STRIP_STATE;
+  if (action.type !== "failed") return state;
+  return state.kind === "sending"
+    ? { kind: "steering", subagent: state.subagent, draft: state.draft }
+    : INITIAL_SUBAGENT_STRIP_STATE;
+}
+
+export function stopOutcomeMessage(cancelled: boolean): string {
+  return cancelled ? "Subagent stopped" : "The subagent had already finished";
+}
+
+/** The host's RPC error keeps the handler's text in `userMessage`, without transport details. */
+export function subagentRequestError(cause: unknown): string {
+  if (cause instanceof Error) {
+    const userMessage: unknown = Reflect.get(cause, "userMessage");
+    return typeof userMessage === "string" && userMessage ? userMessage : cause.message;
+  }
+  return "The OMP subagent request failed";
+}
+
+/** Compact elapsed time, such as `42s`, `3m`, or `1h 5m`. */
+export function formatElapsed(milliseconds: number): string {
+  const seconds = Math.max(0, Math.floor(milliseconds / 1_000));
+  if (seconds < 60) return `${seconds}s`;
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  return minutes % 60 === 0 ? `${hours}h` : `${hours}h ${minutes % 60}m`;
+}