@schlenkr/ragents 0.1.4 → 0.1.6

package/plugins/ragents.overseer/server/settings.ts

@@ -1,10 +1,10 @@
 import { renameSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { DomainError, isThinkingLevel, type CatalogModel, type ModelSelection, type Orchestration } from "@aicontainer/ragents";
-import type { GlobalChatPolicy } from "@aicontainer/server/ragents/global-chat.js";
+import { DomainError, isThinkingLevel, type CatalogModel, type ModelSelection, type Orchestration } from "@ragents/engine";
+import type { GlobalChatPolicy } from "@ragents/host/ragents/global-chat.js";
 import type { OverseerSettings } from "../contract.js";
-import { OVERSEER_PLUGIN_ID, OVERSEER_RUN_ID } from "../contract.js";
+import { OVERSEER_PLUGIN_ID } from "../contract.js";
 
 type Selection = ModelSelection & { thinking: NonNullable<ModelSelection["thinking"]> };
 type Model = CatalogModel & { input: readonly string[] };
@@ -31,7 +31,7 @@ export class OverseerModelSettings {
   };
 
   readonly selection = (): Selection => {
-    if (!this.current) throw new DomainError("overseer-model-unavailable", "Der übergeordnete Koordinator hat keine konfigurierte Modellauswahl.", 400);
+    if (!this.current) throw new DomainError("overseer-model-unavailable", "Der globale Koordinator hat keine konfigurierte Modellauswahl.", 400);
     return { ...this.validate(this.current) };
   };
 
@@ -53,9 +53,9 @@ export class OverseerModelSettings {
     return operation;
   }
 
-  readonly forTurn = (runtime: Orchestration, actorId: string, turnId: string): ModelSelection => {
+  readonly forTurn = (runtime: Orchestration, runId: string, actorId: string, turnId: string): ModelSelection => {
     const selection = this.selection();
-    runtime.replacePluginState({ actorId: runtime.view(OVERSEER_RUN_ID).ownerId, commandId: `overseer-model:${turnId}` }, OVERSEER_RUN_ID, {
+    runtime.replacePluginState({ actorId: runtime.view(runId).ownerId, commandId: `overseer-model:${turnId}` }, runId, {
       pluginId: OVERSEER_PLUGIN_ID, scope: { kind: "actor", actorId }, state: { turnId, ...selection },
     });
     return selection;

package/plugins/ragents.overseer/server/user-location.ts

@@ -1,8 +1,9 @@
 import { randomUUID } from "node:crypto";
-import { DomainError, isRunId, pluginStateAt, type RunView } from "@aicontainer/ragents";
-import type { ChatUserLocation } from "@aicontainer/server/chat-context.js";
-import type { GlobalChatPolicy, SessionManagement } from "@aicontainer/server/ragents/global-chat.js";
-import { OVERSEER_PLUGIN_ID, OVERSEER_RUN_ID } from "../contract.js";
+import { DomainError, isRunId, pluginStateAt, type RunView } from "@ragents/engine";
+import type { ChatUserLocation } from "@ragents/host/chat-context.js";
+import type { GlobalChatPolicy, RunManagement } from "@ragents/host/ragents/global-chat.js";
+import { OVERSEER_PLUGIN_ID } from "../contract.js";
+import { isCoordinatorRunId } from "./coordinator.js";
 import type { RunDirectory } from "./run-directory.js";
 
 const record = (value: unknown): value is Record<string, unknown> => !!value && typeof value === "object" && !Array.isArray(value);
@@ -12,15 +13,15 @@ const unavailable = "Kein Oberflächenkontext für diese Nachricht übermittelt.
 
 export function parseUserLocation(value: unknown): ChatUserLocation | undefined {
   if (value === undefined) return undefined;
-  if (!record(value) || Object.keys(value).some((key) => !["surface", "runId", "tab", "selection"].includes(key))
-    || typeof value.surface !== "string" || !["home", "overview", "run"].includes(value.surface)
-    || !(value.runId === null || (typeof value.runId === "string" && isRunId(value.runId) && value.runId !== OVERSEER_RUN_ID))
+  if (!record(value) || Object.keys(value).some((key) => !["page", "runId", "tab", "selection"].includes(key))
+    || typeof value.page !== "string" || !["home", "overview", "run"].includes(value.page)
+    || !(value.runId === null || (typeof value.runId === "string" && isRunId(value.runId) && !isCoordinatorRunId(value.runId)))
     || !(value.tab === null || shortText(value.tab, 120))
     || !(value.selection === null || (record(value.selection) && Object.keys(value.selection).length === 2
       && shortText(value.selection.type, 40) && shortText(value.selection.id, 120)))
-    || (value.surface === "run" && value.runId === null)
-    || (value.surface === "home" && value.runId !== null)
-    || (value.surface !== "run" && (value.tab !== null || value.selection !== null))) {
+    || (value.page === "run" && value.runId === null)
+    || (value.page === "home" && value.runId !== null)
+    || (value.page !== "run" && (value.tab !== null || value.selection !== null))) {
     throw new DomainError("invalid-user-location", "Der Oberflächenkontext enthält keinen gültigen Standort.", 400);
   }
   return value as unknown as ChatUserLocation;
@@ -56,11 +57,11 @@ function selectedElement(view: RunView, selection: NonNullable<ChatUserLocation[
   return "Element inzwischen nicht mehr vorhanden oder hier nicht auflösbar";
 }
 
-export function createUserLocationContext(management: () => SessionManagement, directory: RunDirectory): Pick<GlobalChatPolicy, "inputContext" | "contextPrompt"> {
+export function createUserLocationContext(management: () => RunManagement, directory: RunDirectory): Pick<GlobalChatPolicy, "inputContext" | "contextPrompt"> {
   return {
-    inputContext: async (runtime, value) => {
+    inputContext: async (runtime, coordinatorId, value) => {
       const location = parseUserLocation(value);
-      const lines = [location ? `Oberfläche: ${{ home: "Startansicht ohne geöffneten Run", overview: "Run-Übersicht", run: "geöffneter Run" }[location.surface]}.` : unavailable];
+      const lines = [location ? `Oberfläche: ${{ home: "Startansicht ohne geöffneten Run", overview: "Run-Übersicht", run: "geöffneter Run" }[location.page]}.` : unavailable];
       if (location?.runId) {
         const run = (await management().list()).find((entry) => entry.id === location.runId);
         if (run) {
@@ -71,21 +72,21 @@ export function createUserLocationContext(management: () => SessionManagement, d
         } else lines.push("Der beim Absenden geöffnete Run ist inzwischen nicht mehr verfügbar.");
       }
       const commandId = `user-location:${randomUUID()}`;
-      const ownerId = runtime.view(OVERSEER_RUN_ID).ownerId;
-      runtime.replacePluginState({ actorId: ownerId, commandId }, OVERSEER_RUN_ID, {
+      const ownerId = runtime.view(coordinatorId).ownerId;
+      runtime.replacePluginState({ actorId: ownerId, commandId }, coordinatorId, {
         pluginId: OVERSEER_PLUGIN_ID, scope: { kind: "actor", actorId: ownerId },
         state: { kind: "user-location", text: lines.join("\n") },
       });
-      const event = runtime.events(OVERSEER_RUN_ID).find((entry) => entry.commandId === commandId && (entry.type === "plugin.state-replaced" || entry.type === "plugin.state-patched"));
+      const event = runtime.events(coordinatorId).find((entry) => entry.commandId === commandId && (entry.type === "plugin.state-replaced" || entry.type === "plugin.state-patched"));
       if (!event) throw new Error("Der Oberflächenkontext wurde nicht journalisiert.");
       return [event.eventId];
     },
-    contextPrompt: (runtime, actor) => {
-      const view = runtime.view(OVERSEER_RUN_ID);
+    contextPrompt: (runtime, coordinatorId, actor) => {
+      const view = runtime.view(coordinatorId);
       const turnId = actor.lifecycle.kind === "running" ? actor.lifecycle.turnId : undefined;
       const inputId = view.turns.find((turn) => turn.id === turnId)?.inputId;
       const sources = view.inputs.find((input) => input.id === inputId)?.sourceEventIds ?? [];
-      const events = runtime.events(OVERSEER_RUN_ID);
+      const events = runtime.events(coordinatorId);
       const event = events.find((entry) => sources.includes(entry.eventId)
         && (entry.type === "plugin.state-replaced" || entry.type === "plugin.state-patched") && entry.payload.pluginId === OVERSEER_PLUGIN_ID);
       const state = event && (event.type === "plugin.state-replaced" || event.type === "plugin.state-patched") ? pluginStateAt(events, event) : undefined;

package/plugins/ragents.overseer/web/ModelSettings.tsx

@@ -1,7 +1,7 @@
-import { useAccess } from "@aicontainer/web/AccessContext";
-import { Button, Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@aicontainer/web/ui";
+import { useAccess } from "@ragents/web/AccessContext";
+import { Button, Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@ragents/web/ui";
 import { useEffect, useSyncExternalStore, type ReactNode } from "react";
-import { thinkingLabel } from "@aicontainer/web/lib/labels";
+import { thinkingLabel } from "@ragents/web/lib/labels";
 import { modelSettingsStore } from "./model-settings";
 import type { OverseerModelSelection } from "../contract";
 
@@ -29,7 +29,7 @@ export function ModelSettings({ active = true, compact = false, disabled = false
   const thinkingOptions = model?.thinking.map((level) => ({ value: level, label: thinkingLabel(level) })) ?? [];
   if (!readable) return null;
   return (
-    <section aria-label="Modell des übergeordneten Koordinators" className={compact ? "min-w-0 flex-1" : "min-w-0"}>
+    <section aria-label="Modell des globalen Koordinators" className={compact ? "min-w-0 flex-1" : "min-w-0"}>
       <div className={compact ? "flex flex-nowrap items-center gap-2 max-md:gap-1" : "flex flex-wrap items-center gap-2.5"}>
         {settings && model ? <>
           <Select

package/plugins/ragents.overseer/web/chat-display.ts

@@ -1,4 +1,4 @@
-import type { ChatDisplayPolicy } from "@aicontainer/web/PluginRegistry";
+import type { ChatDisplayPolicy } from "@ragents/web/PluginRegistry";
 
 export const overseerChatStorageKeyPrefix = "ragents.overseer.chat-steps";
 

package/plugins/ragents.overseer/web/index.tsx

@@ -1,33 +1,58 @@
-import { useAccess } from "@aicontainer/web/AccessContext";
-import { Button, Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, Popover, PopoverContent } from "@aicontainer/web/ui";
-import { RunModalContext } from "@aicontainer/web/ui/dialog";
+import { useAccess } from "@ragents/web/AccessContext";
+import { Button, Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, Popover, PopoverContent } from "@ragents/web/ui";
+import { RunModalContext } from "@ragents/web/ui/dialog";
 import { XIcon } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { ChatMessages } from "@aicontainer/web/chat/ChatMessages";
-import { ChatInputToolbar, type ChatInputHandle } from "@aicontainer/web/chat/ChatInputToolbar";
-import { DetailModeSwitch } from "@aicontainer/web/chat/DetailModeSwitch";
-import { useChat } from "@aicontainer/web/chat/useChat";
-import { useAttachmentCapabilities } from "@aicontainer/web/chat/useAttachmentCapabilities";
-import { ChatStepsProvider, useChatSteps, type OverviewPanelContext, type WebPlugin } from "@aicontainer/web/PluginRegistry";
-import { withToolSummaries } from "@aicontainer/web/toolLine";
-import { rpc } from "@aicontainer/web/rpc";
-import type { ChatEvent } from "@aicontainer/server/chat-events";
-import { OVERSEER_PLUGIN_ID, OVERSEER_RUN_ID, overseerContracts } from "../contract";
+import { ChatMessages, ChatInputToolbar, type ChatInputHandle, type ChatEvent } from "quassel";
+import { useChat } from "@ragents/web/chat/useChat";
+import { useAttachmentCapabilities } from "@ragents/web/chat/useAttachmentCapabilities";
+import { ChatStepsProvider, type OverviewPanelContext, type WebPlugin } from "@ragents/web/PluginRegistry";
+import { ChatViewSwitches, useChatViewSettings } from "@ragents/web/chat-view-settings";
+import { withToolSummaries } from "@ragents/web/toolLine";
+import { rpc } from "@ragents/web/rpc";
+import { interruptActorTurn } from "@ragents/web/api";
+import { runContracts } from "@ragents/engine/src/http/contracts";
+import { runViewFrom } from "@ragents/web/run-view";
+import { OVERSEER_PLUGIN_ID, overseerContracts } from "../contract";
 import { ModelSettings, useModelSettings } from "./ModelSettings";
 import { overseerChatDisplayPolicy, overseerChatStorageKeyPrefix } from "./chat-display";
 import { createQuickAnswers, type QuickAnswerNotice } from "./quick-answers";
 
 const toolbarClass = "flex h-header max-w-[720px] min-w-[190px] flex-[0_1_570px] items-center gap-1 border-r border-border bg-[color-mix(in_srgb,var(--primary)_4%,var(--card))] px-2 py-1 data-open:bg-accent max-md:min-w-[130px] max-md:flex-[0_1_210px] max-md:px-1 max-md:data-open:grow";
 const noteClass = "mx-4 my-2 flex-none text-[0.8rem] text-muted-foreground";
+
+/** Unterbricht nur den laufenden Turn des Koordinators; der Run und seine übrigen Actors laufen weiter. */
+const interruptCoordinator = async (runId: string) => {
+  const coordinator = runViewFrom(await rpc.call(runContracts.view, { runId }))?.primaryActorId;
+  if (!coordinator) throw new Error("Der globale Koordinator ist nicht verfügbar");
+  await interruptActorTurn(runId, coordinator);
+};
 const errorClass = "mx-4 my-2 flex-none text-[0.8rem] text-destructive";
 
+/** Jeder Benutzer hat seinen eigenen Koordinator; seine Kennung kennt nur der Server. */
 function OverseerToolbar(context: OverviewPanelContext) {
+  const user = useAccess().user?.id;
+  const [coordinator, setCoordinator] = useState<{ runId?: string; error?: string }>({});
+  useEffect(() => {
+    let current = true;
+    setCoordinator({});
+    rpc.call(overseerContracts.coordinator, {}).then(
+      ({ runId }) => { if (current) setCoordinator({ runId }); },
+      (cause: unknown) => { if (current) setCoordinator({ error: cause instanceof Error ? cause.message : String(cause) }); },
+    );
+    return () => { current = false; };
+  }, [user]);
+  if (!coordinator.runId) {
+    return <div className={toolbarClass} data-slot="overseer-toolbar" role="status">
+      {coordinator.error && <span className="text-[0.7rem] font-bold text-destructive" title={coordinator.error} aria-label={coordinator.error}>!</span>}
+    </div>;
+  }
   return <ChatStepsProvider policy={overseerChatDisplayPolicy} storageKeyPrefix={overseerChatStorageKeyPrefix}>
-    <OverseerConversation {...context} />
+    <OverseerConversation key={coordinator.runId} {...context} runId={coordinator.runId} />
   </ChatStepsProvider>;
 }
 
-function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation }: OverviewPanelContext) {
+function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation, runId }: OverviewPanelContext & { runId: string }) {
   const writable = useAccess().can("ragents.overseer.write");
   const [activated, setActivated] = useState(false);
   const [confirmReset, setConfirmReset] = useState(false);
@@ -68,10 +93,10 @@ function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation }: O
     if (event.kind === "replay-end") conversationId.current = event.conversationId;
     if (notice && !panelOpen.current) setQuickAnswer(notice);
   }, [clearConversation, quickAnswers]);
-  const chat = useChat(OVERSEER_RUN_ID, onEvent, activated);
-  const steps = useChatSteps(OVERSEER_RUN_ID);
+  const chat = useChat(runId, onEvent, activated);
+  const chatView = useChatViewSettings(runId, "primary", "coordinator");
   const modelState = useModelSettings(open);
-  const attachments = useAttachmentCapabilities(OVERSEER_RUN_ID, "primary", JSON.stringify(modelState.settings && [modelState.settings.provider, modelState.settings.model]));
+  const attachments = useAttachmentCapabilities(runId, "primary", JSON.stringify(modelState.settings && [modelState.settings.provider, modelState.settings.model]));
   const messages = useMemo(() => withToolSummaries(chat.messages), [chat.messages]);
   const requestOpen = () => { suppressFocus.current = false; setQuickAnswer(undefined); onOpen(); };
   useEffect(() => { if (open) { setActivated(true); setQuickAnswer(undefined); } }, [open]);
@@ -135,7 +160,7 @@ function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation }: O
         inputAriaControls="overseer-dropdown"
         disabled={!writable || resetting || confirmReset} sendDisabled={!chat.connected || modelState.status === "saving" || resetting}
         maxRows={2} rows={1} onErrorChange={setComposerError} onSend={(text, attachments) => chat.send(text, attachments, userLocation)}
-        onStop={writable ? () => { if (!resetPending.current) perform(chat.stop); } : undefined}
+        onStop={writable && chat.running ? () => { if (!resetPending.current) perform(() => interruptCoordinator(runId)); } : undefined}
         running={chat.running}
         texts={{ placeholder: "Globaler Koordinator", steeringPlaceholder: "Globaler Koordinator" }}
         toolbarRight={<ModelSettings active={open} compact disabled={resetting} actions={
@@ -143,7 +168,7 @@ function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation }: O
             {resetting ? "Wird zurückgesetzt ..." : "Zurücksetzen"}
           </Button>
         } />}
-        toolbarLeft={steps.selectable && <DetailModeSwitch className="max-md:[&>span]:hidden" collapsible={false} mode={steps.mode("coordinator")} onChange={(mode) => steps.setMode("coordinator", mode)} />}
+        toolbarLeft={<ChatViewSwitches className="max-md:[&>span]:hidden" collapsible={false} settings={chatView} />}
       />
     </div>
       <span className="flex min-w-0 flex-none items-center justify-end gap-1.5 empty:hidden" role="status" aria-live="polite">
@@ -152,7 +177,7 @@ function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation }: O
       </span>
     <Popover modal={false} open={quickAnswer !== undefined}>
       <PopoverContent align="start" anchor={belowHeader} aria-atomic="true" aria-live="polite" className="flex max-w-[calc(100vw-16px)] flex-row items-start gap-1 p-1.5 text-[0.76rem]" collisionPadding={8}
-        finalFocus={false} initialFocus={false} role="status" side="bottom" sideOffset={6}
+        finalFocus={false} initialFocus={false} role="status" side="bottom"
         style={{ width: "min(max(calc(var(--anchor-width) * 2), 480px), var(--available-width))" }}>
         {quickAnswer && <>
           <Button className="h-auto min-w-0 flex-1 justify-start rounded-lg px-2.5 py-2 text-left text-[0.76rem] leading-[1.45] font-normal whitespace-normal [overflow-wrap:anywhere]" variant="ghost" aria-label={`Verlauf öffnen: ${quickAnswer.question} ${quickAnswer.text}`}
@@ -167,9 +192,9 @@ function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation }: O
     </Popover>
     <Popover modal={false} open={open} onOpenChange={(next, details) => { if (!next) dismiss(details.reason, details.event); }}>
     <PopoverContent align="start" anchor={belowHeader} aria-label="Globaler Koordinator" className="flex min-h-0 flex-col gap-0 overflow-hidden rounded-t-none rounded-b-panel border-t-2 border-t-primary p-0" collisionPadding={8}
-      finalFocus={false} id="overseer-dropdown" initialFocus={false} keepMounted ref={setDropdown} role="region" side="bottom" sideOffset={0}
+      finalFocus={false} id="overseer-dropdown" initialFocus={false} keepMounted ref={setDropdown} role="region" side="bottom"
       style={{ width: "min(760px, var(--available-width))", height: "min(650px, var(--available-height))" }}>
-      <div className="flex-none border-b border-border-soft" data-surface="overseer-details" ref={setDetailsContainer} />
+      <div className="flex-none border-b border-border-soft" data-tone="overseer-details" ref={setDetailsContainer} />
       {confirmReset && dialogContainer && <RunModalContext.Provider value={dialogContainer}>
         <Dialog open onOpenChange={(next) => { if (!next && !resetting) setConfirmReset(false); }} modal="trap-focus" disablePointerDismissal>
           <DialogContent initialFocus={cancelReset} onBackdropClick={() => { if (!resetting) setConfirmReset(false); }} scope="run" showCloseButton={false} size="small">
@@ -191,10 +216,10 @@ function OverseerConversation({ open, onOpen, onClose, onBusy, userLocation }: O
       {!writable && <p className={noteClass}>Du hast Lesezugriff auf dieses Gespräch.</p>}
       {connectionNote && <p className={noteClass} role="status">{connectionNote}</p>}
       {error && <p className={errorClass} role="alert">{error}</p>}
-      <ChatMessages announceMessages={false} className="min-h-16 flex-1" scrollerRef={setScroller}
-        detailMode={steps.mode("coordinator")}
+      <ChatMessages announce={false} className="min-h-16! flex-1" scrollerRef={setScroller}
+        detailMode={chatView.detailMode}
         emptyState={<div className="m-auto max-w-[480px] p-8 text-[0.9rem] leading-[1.6] text-muted-foreground max-md:p-5"><strong className="text-foreground">Ein Chat für die gesamte Werkstatt</strong><p>Schreibe deinen Auftrag oben in die Titelleiste. Hier erscheinen Antworten zu deinen Runs und laufenden Arbeiten.</p></div>}
-        messages={messages} running={chat.running} showTimestamps stepsExpandable={steps.stepsExpandable}
+        messages={messages} running={chat.running} showTimestamps={chatView.showTimestamps} stepsExpandable={chatView.stepsExpandable}
       />
     </PopoverContent>
     </Popover>

package/plugins/ragents.overseer/web/model-settings.ts

@@ -1,4 +1,4 @@
-import { rpc } from "@aicontainer/web/rpc";
+import { rpc } from "@ragents/web/rpc";
 import { overseerContracts, type OverseerModelSelection, type OverseerSettings } from "../contract";
 
 type SettingsState =

package/plugins/ragents.overseer/web/quick-answers.ts

@@ -1,4 +1,4 @@
-import type { ChatEvent } from "@aicontainer/server/chat-events";
+import type { ChatEvent } from "quassel/events";
 import { OVERSEER_PLUGIN_ID, QUICK_ANSWER_MAX_LENGTH } from "../contract";
 
 export interface QuickAnswerNotice {
@@ -38,7 +38,7 @@ export function createQuickAnswers() {
         pending = undefined;
         return notice;
       }
-      if (event.kind !== "extension" || event.pluginId !== OVERSEER_PLUGIN_ID || event.type !== "state-replaced") return;
+      if (event.kind !== "plugin" || event.pluginId !== OVERSEER_PLUGIN_ID || event.type !== "state-replaced") return;
       const payload = event.payload;
       if (!payload || typeof payload !== "object" || !("state" in payload)) return;
       if (!("scope" in payload) || !payload.scope || typeof payload.scope !== "object"

package/plugins/ragents.processes/contract.ts

@@ -1,6 +1,6 @@
 import { Type } from "typebox";
-import { defineChannel, defineOperation } from "@aicontainer/ragents/src/rpc/contract";
-import { openJson } from "@aicontainer/ragents/src/http/contracts";
+import { defineChannel, defineOperation } from "@ragents/engine/src/rpc/contract";
+import { openJson } from "@ragents/engine/src/http/contracts";
 
 export const PROCESSES_PLUGIN_ID = "ragents.processes";
 
@@ -36,14 +36,14 @@ const runId = Type.String({ minLength: 1, maxLength: 64, description: "Kennung d
 export const processesContracts = {
   snapshot: defineOperation({
     id: "ragents.processes.snapshot",
-    description: "Die beobachteten Prozesse eines Laufs mit ihren offenen Ports. Rechte: runs.read und ragents.processes.read.",
+    description: "Die beobachteten Prozesse eines Runs mit ihren offenen Ports. Rechte: runs.read und ragents.processes.read.",
     rights: ["runs.read", "ragents.processes.read"],
     input: Type.Object({ runId }, { additionalProperties: false }),
     result: openJson<RunProcessSnapshot>("RunProcessSnapshot"),
   }),
   stop: defineOperation({
     id: "ragents.processes.stop",
-    description: "Einen Prozess des Laufs beenden. Rechte: runs.read, runs.write und runs.inspect.",
+    description: "Einen Prozess des Runs beenden. Rechte: runs.read, runs.write und runs.inspect.",
     rights: ["runs.read", "runs.write", "runs.inspect"],
     input: Type.Object({
       runId,
@@ -53,7 +53,7 @@ export const processesContracts = {
   }),
   live: defineChannel({
     id: "ragents.processes",
-    description: "Der laufende Stand der Prozessüberwachung eines Laufs. Rechte: runs.read und ragents.processes.read.",
+    description: "Der laufende Stand der Prozessüberwachung eines Runs. Rechte: runs.read und ragents.processes.read.",
     rights: ["runs.read", "ragents.processes.read"],
     params: Type.Object({ runId }, { additionalProperties: false }),
     message: openJson<RunProcessMessage>("RunProcessMessage"),

package/plugins/ragents.processes/ragents-plugin.json

@@ -0,0 +1,3 @@
+{
+  "id": "ragents.processes"
+}

package/plugins/ragents.processes/server/index.ts

@@ -1,33 +1,27 @@
-import type { RAgentsPlugin } from "@aicontainer/ragents";
-import { sessionGuardToken } from "@aicontainer/server/ragents/host-services.js";
-import type { PluginModule } from "@aicontainer/server/plugin-support/plugin-module.js";
+import type { RAgentsPlugin } from "@ragents/engine";
+import { workspaceGuardToken } from "@ragents/host/ragents/host-services.js";
+import type { PluginModule } from "@ragents/host/plugin-support/plugin-module.js";
+import { sandboxServicesToken } from "@ragents/host/plugin-support/workspace-sandbox-host.js";
 import { PROCESSES_PLUGIN_ID } from "../contract.js";
 import { RunProcessObserver } from "./observer.js";
-import { processTableForPlatform } from "./process-table.js";
 import { createProcessChannel, createProcessMethods } from "./methods.js";
-import { RunProcessTerminator } from "./terminator.js";
+import { runProcessesOf } from "./run-processes.js";
 
 const POLL_INTERVAL_MS = 2_000;
 
 const processesPlugin: RAgentsPlugin = {
   manifest: { id: PROCESSES_PLUGIN_ID },
   register: (host) => {
-    const table = processTableForPlatform();
-    const observer = new RunProcessObserver({
-      table,
-      serverPid: process.pid,
-      serverUid: process.getuid?.(),
-      pollIntervalMs: POLL_INTERVAL_MS,
-    });
-    const terminator = new RunProcessTerminator({ table, serverPid: process.pid, serverUid: process.getuid?.() });
-    const ensureSession = host.service(sessionGuardToken);
-    host.methods(...createProcessMethods({ observer, ensureSession, terminate: (runId, processId, context) => terminator.stop(runId, processId, context) }));
-    host.channels(createProcessChannel({ observer, ensureSession }));
+    const processes = runProcessesOf(host.service(sandboxServicesToken));
+    const observer = new RunProcessObserver({ snapshot: processes.snapshot, pollIntervalMs: POLL_INTERVAL_MS });
+    const ensureWorkspaceAccess = host.service(workspaceGuardToken);
+    host.methods(...createProcessMethods({ observer, ensureWorkspaceAccess, terminate: processes.terminate }));
+    host.channels(createProcessChannel({ observer, ensureWorkspaceAccess }));
     host.lifecycle({
       id: "ragents.processes.lifecycle",
-      stopSession: ({ runId, signal }) => terminator.stopRun(runId, { signal }),
-      afterStopSession: ({ runId, signal }) => terminator.stopRun(runId, { signal }),
-      deleteSession: ({ runId }) => terminator.stopRun(runId),
+      stopSession: ({ runId, signal }) => processes.stopAll(runId, signal),
+      afterStopSession: ({ runId, signal }) => processes.stopAll(runId, signal),
+      deleteSession: ({ runId }) => processes.stopAll(runId),
       shutdown: () => observer.shutdown(),
     });
   },

package/plugins/ragents.processes/server/methods.ts

@@ -1,39 +1,37 @@
-import { DomainError, implement, implementChannel, type ChannelContribution, type MethodContribution } from "@aicontainer/ragents";
+import { DomainError, implement, implementChannel, type AccessContext, type ChannelContribution, type MethodContribution } from "@ragents/engine";
 import { processesContracts, type RunProcessMessage, type RunProcessSnapshot } from "../contract.js";
-import type { ProcessTerminationContext } from "./terminator.js";
 
 export interface ProcessObservation {
-  observe: (runId: string) => Promise<RunProcessSnapshot>;
+  observe: (runId: string, signal?: AbortSignal) => Promise<RunProcessSnapshot>;
   watch: (runId: string, listener: (message: RunProcessMessage) => void) => () => void;
 }
 
 export interface ProcessMethodOptions {
   observer: ProcessObservation;
-  ensureSession: (runId: string) => void;
-  terminate: (runId: string, processId: string, context: ProcessTerminationContext) => Promise<void>;
+  /** Die Prozesse liegen im Arbeitsbereich des Runs; wer ihn nicht sehen darf, sieht auch sie nicht. */
+  ensureWorkspaceAccess: (access: AccessContext, runId: string) => void;
+  /** Beendet beim Executor des Runs; der Abbruch der Anfrage erreicht ihn über `signal`. */
+  terminate: (runId: string, processId: string, signal: AbortSignal) => Promise<void>;
 }
 
 export const createProcessMethods = (options: ProcessMethodOptions): MethodContribution[] => [
-  implement(processesContracts.snapshot, ({ runId }) => {
-    options.ensureSession(runId);
-    return options.observer.observe(runId);
+  implement(processesContracts.snapshot, ({ runId }, { access, signal }) => {
+    options.ensureWorkspaceAccess(access, runId);
+    return options.observer.observe(runId, signal);
   }),
   implement(processesContracts.stop, async ({ runId, processId }, { access, signal }) => {
-    const assertAllowed = () => {
-      for (const right of processesContracts.stop.rights) {
-        if (!access.can(right)) throw new DomainError("forbidden", "Das Beenden von Prozessen ist nicht erlaubt", 403);
-      }
-      if (signal.aborted) throw new Error("Die Prozess-Stopp-Anfrage wurde abgebrochen");
-      options.ensureSession(runId);
-    };
-    assertAllowed();
-    await options.terminate(runId, processId, { signal, assertAllowed });
+    for (const right of processesContracts.stop.rights) {
+      if (!access.can(right)) throw new DomainError("forbidden", "Das Beenden von Prozessen ist nicht erlaubt", 403);
+    }
+    if (signal.aborted) throw new Error("Die Prozess-Stopp-Anfrage wurde abgebrochen");
+    options.ensureWorkspaceAccess(access, runId);
+    await options.terminate(runId, processId, signal);
     return null;
   }),
 ];
 
-export const createProcessChannel = (options: Pick<ProcessMethodOptions, "observer" | "ensureSession">): ChannelContribution =>
-  implementChannel(processesContracts.live, ({ runId }, emit) => {
-    options.ensureSession(runId);
+export const createProcessChannel = (options: Pick<ProcessMethodOptions, "observer" | "ensureWorkspaceAccess">): ChannelContribution =>
+  implementChannel(processesContracts.live, ({ runId }, emit, { access }) => {
+    options.ensureWorkspaceAccess(access, runId);
     return options.observer.watch(runId, emit);
   });