@schlenkr/ragents 0.1.5 → 0.1.7

package/plugins/ragents.ask/server/ask-service.ts

@@ -5,16 +5,15 @@ import {
   type CommandContext,
   type JournalEvent,
   type Orchestration,
-} from "@aicontainer/ragents";
-import type { AskCall, AskRequest, AskService } from "./contract.js";
+} from "@ragents/engine";
+import { askPayloadOf, ASK_PLUGIN_ID } from "../ask-payload.js";
+import { DISMISSED_ANSWER, type AskCall, type AskRequest, type AskService } from "./contract.js";
 
-export const DISMISSED_ANSWER = "Der Benutzer hat die Frage verworfen.";
-
-const answerOf = (decision: "approved" | "dismissed", response: string | null): string =>
-  decision === "approved" ? response ?? "" : DISMISSED_ANSWER;
+const answerOf = (decision: "approved" | "dismissed", result: unknown): string =>
+  decision !== "approved" ? DISMISSED_ANSWER : typeof result === "string" ? result : result === null || result === undefined ? "" : JSON.stringify(result);
 
 const resolvedAnswerOf = (action: Action): string | null =>
-  action.status === "pending" ? null : answerOf(action.status, action.response);
+  action.status === "pending" ? null : answerOf(action.status, action.result);
 
 export class RuntimeAskService implements AskService {
   #runtime: Orchestration | undefined;
@@ -35,12 +34,17 @@ export class RuntimeAskService implements AskService {
       ...(call.turnId ? { turnId: call.turnId, correlationId: call.turnId, causationId: call.turnId } : {}),
     };
     runtime.proposeAction(context, call.runId, {
-      kind: "question",
-      question: { options: request.options, multi: request.multi === true },
+      owner: ASK_PLUGIN_ID,
       title: request.question,
       description: request.description,
       parameters: request.parameters,
       input: { label: "Antwort", placeholder: null, required: true },
+      payload: {
+        question: request.question,
+        options: [...request.options],
+        multi: request.multi === true,
+        ...(request.recipient ? { recipient: request.recipient } : {}),
+      },
     });
     const proposed = runtime.events(call.runId).find((event) =>
       event.type === "action.proposed" && event.commandId === call.commandId);
@@ -54,7 +58,7 @@ export class RuntimeAskService implements AskService {
     const runtime = this.#requireRuntime();
     const state = runtime.state(runId);
     const action = state.actions.get(actionId);
-    if (!action || action.kind !== "question") {
+    if (!action || action.owner !== ASK_PLUGIN_ID) {
       throw new DomainError("question-not-found", `Frage ${actionId} existiert nicht in Run ${runId}.`, 404);
     }
     runtime.resolveAction(
@@ -62,11 +66,30 @@ export class RuntimeAskService implements AskService {
       runId,
       actionId,
       input.dismiss === true
-        ? { decision: "dismissed", response: null }
-        : { decision: "approved", response: input.answer ?? null },
+        ? { decision: "dismissed", result: null }
+        : { decision: "approved", result: input.answer ?? null },
     );
   }
 
+  withdraw(runId: string, actionId: string): void {
+    const runtime = this.#requireRuntime();
+    const state = runtime.state(runId);
+    const action = state.actions.get(actionId);
+    if (action?.owner !== ASK_PLUGIN_ID || action.status !== "pending") return;
+    this.#aborting.add(actionId);
+    try {
+      runtime.resolveAction(
+        { actorId: state.ownerId, commandId: `ask-withdraw:${actionId}:${randomUUID()}` },
+        runId,
+        actionId,
+        { decision: "dismissed", result: null },
+      );
+    } finally {
+      this.#aborting.delete(actionId);
+    }
+    this.#waiters.get(actionId)?.(DISMISSED_ANSWER);
+  }
+
   #awaitAnswer(runId: string, actionId: string, signal: AbortSignal | undefined): Promise<string> {
     const runtime = this.#requireRuntime();
     const action = runtime.state(runId).actions.get(actionId);
@@ -85,7 +108,7 @@ export class RuntimeAskService implements AskService {
               { actorId: state.ownerId, commandId: `ask-abort:${actionId}:${randomUUID()}` },
               runId,
               actionId,
-              { decision: "dismissed", response: null },
+              { decision: "dismissed", result: null },
             );
           }
           reject(new Error("Das Warten auf die Antwort wurde abgebrochen."));
@@ -113,8 +136,8 @@ export class RuntimeAskService implements AskService {
       if (event.type !== "action.resolved") continue;
       if (this.#aborting.has(event.payload.actionId)) continue;
       const resolved = this.#requireRuntime().state(event.runId).actions.get(event.payload.actionId);
-      if (resolved?.kind !== "question") continue;
-      const answer = answerOf(event.payload.decision, event.payload.response);
+      if (resolved?.owner !== ASK_PLUGIN_ID) continue;
+      const answer = answerOf(event.payload.decision, event.payload.result);
       const waiter = this.#waiters.get(event.payload.actionId);
       if (waiter) {
         waiter(answer);
@@ -130,14 +153,15 @@ export class RuntimeAskService implements AskService {
       const state = runtime.state(runId);
       const action = state.actions.get(actionId);
       if (!action) return;
-      const asker = state.actors.get(action.askedBy);
-      if (!asker || asker.kind === "human" || asker.lifecycle.kind === "stopped") return;
+      const recipientId = askPayloadOf(action.payload)?.recipient ?? action.askedBy;
+      const recipient = state.actors.get(recipientId);
+      if (!recipient || recipient.kind === "human" || recipient.lifecycle.kind === "stopped") return;
       runtime.enqueueInput(
         { actorId: state.ownerId, commandId: `ask-input:${actionId}` },
         runId,
         {
-          actorId: action.askedBy,
-          content: `Antwort auf deine Frage: ${action.title}\nAntwort: ${answer}`,
+          actorId: recipientId,
+          content: `Antwort auf ${recipientId === action.askedBy ? "deine Frage" : "die Frage"}: ${action.title}\nAntwort: ${answer}`,
         },
       );
     } catch (error) {

package/plugins/ragents.ask/server/ask-tool.ts

@@ -1,6 +1,6 @@
 import { Type } from "typebox";
-import { defineRunFunction, type RunFunction } from "@aicontainer/ragents";
-import { facesOperator } from "@aicontainer/server/plugin-support/tool-availability.js";
+import { defineRunFunction, type RunFunction } from "@ragents/engine";
+import { facesOperator } from "@ragents/host/plugin-support/tool-availability.js";
 import type { AskService } from "./contract.js";
 
 export const askToolMetadata = {

package/plugins/ragents.ask/server/contract.ts

@@ -1,7 +1,11 @@
-import { serviceToken, type ServiceToken } from "@aicontainer/ragents";
+import { serviceToken, type ServiceToken } from "@ragents/engine";
+
+/** Die Antwort, die `ask` liefert, wenn der Benutzer die Frage verwirft. */
+export const DISMISSED_ANSWER = "Der Benutzer hat die Frage verworfen.";
 
 export interface AskCall {
   runId: string;
+  /** Wer fragt: ein Agent in seinem laufenden Turn, ohne Turn der Eigentümer des Runs. */
   agentId: string;
   turnId: string | null;
   commandId: string;
@@ -13,10 +17,14 @@ export interface AskRequest {
   multi?: boolean;
   description?: string;
   parameters?: Record<string, string>;
+  /** Der Actor, dem eine Antwort zugeht, auf die niemand mehr wartet; ohne Angabe der Fragende. */
+  recipient?: string;
 }
 
 export interface AskService {
   ask: (call: AskCall, request: AskRequest, signal: AbortSignal | undefined) => Promise<string>;
+  /** Verwirft eine offene Frage: ein wartender Aufruf bekommt DISMISSED_ANSWER, niemand bekommt einen Input. */
+  withdraw: (runId: string, actionId: string) => void;
 }
 
 export const askServiceToken: ServiceToken<AskService> = serviceToken("ragents.ask.service");

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

@@ -1,25 +1,23 @@
-import type { RAgentsPlugin } from "@aicontainer/ragents";
-import { pluginAssetPath } from "@aicontainer/server/plugin-support/asset-path.js";
-import type { PluginModule } from "@aicontainer/server/plugin-support/plugin-module.js";
-import { handlebarsPrompt } from "@aicontainer/server/plugin-support/prompt.js";
-import { sessionGuardToken } from "@aicontainer/server/ragents/host-services.js";
-import { runtimeBridgeToken } from "@aicontainer/server/ragents/runtime-bridge.js";
+import type { RAgentsPlugin } from "@ragents/engine";
+import { pluginAsset } from "@ragents/host/plugin-support/plugin-folder.js";
+import type { PluginModule } from "@ragents/host/plugin-support/plugin-module.js";
+import { handlebarsPrompt } from "@ragents/host/plugin-support/prompt.js";
+import { runGuardToken } from "@ragents/host/ragents/host-services.js";
+import { runtimeBridgeToken } from "@ragents/host/ragents/runtime-bridge.js";
 import { createAnswerMethod } from "./answer-method.js";
 import { RuntimeAskService } from "./ask-service.js";
 import { askServiceToken } from "./contract.js";
 import { createAskToolContributor } from "./tool-contributor.js";
 
-const askPromptPath = pluginAssetPath(import.meta.url, "../ask.hbs");
-
 const askPlugin: RAgentsPlugin = {
   manifest: { id: "ragents.ask" },
   register: (host) => {
     const service = new RuntimeAskService();
     host.provide(askServiceToken, service);
     host.provide(runtimeBridgeToken, { bind: (runtime) => service.bind(runtime) });
-    host.prompts(handlebarsPrompt("ragents.ask.prompt", 480, askPromptPath));
+    host.prompts(handlebarsPrompt("ragents.ask.prompt", 480, pluginAsset("ragents.ask", "ask.hbs")));
     host.functions(createAskToolContributor(service));
-    host.methods(createAnswerMethod(service, host.service(sessionGuardToken)));
+    host.methods(createAnswerMethod(service, host.service(runGuardToken)));
   },
 };
 

package/plugins/ragents.ask/server/tool-contributor.ts

@@ -1,6 +1,6 @@
-import type { ToolContributor } from "@aicontainer/ragents";
-import { toolDescriptorFrom } from "@aicontainer/server/plugin-support/agent-tool.js";
-import { facesOperator } from "@aicontainer/server/plugin-support/tool-availability.js";
+import type { ToolContributor } from "@ragents/engine";
+import { toolDescriptorFrom } from "@ragents/host/plugin-support/agent-tool.js";
+import { facesOperator } from "@ragents/host/plugin-support/tool-availability.js";
 import { askToolMetadata, createAskTool } from "./ask-tool.js";
 import type { AskService } from "./contract.js";
 

package/plugins/ragents.ask/web/AskActionView.tsx

@@ -0,0 +1,36 @@
+import { useAccess } from "@ragents/web/AccessContext";
+import { useState } from "react";
+import type { ActionViewContext } from "@ragents/web/PluginRegistry";
+import { askPayloadOf } from "../ask-payload";
+import { answerQuestion } from "./api";
+import { QuestionCard } from "./QuestionCard";
+
+const answerTextOf = (result: unknown): string =>
+  typeof result === "string" ? result : result === null || result === undefined ? "" : JSON.stringify(result);
+
+export function AskActionView({ action, session, text }: ActionViewContext) {
+  const access = useAccess();
+  const [error, setError] = useState<string>();
+  const question = askPayloadOf(action.payload);
+  if (!question) return null;
+
+  const answer = (value: string) => {
+    setError(undefined);
+    answerQuestion(session.session.id, action.actionId, value)
+      .catch((caught: unknown) => setError(caught instanceof Error ? caught.message : String(caught)));
+  };
+
+  return (
+    <>
+      <QuestionCard
+        answer={action.status === undefined
+          ? undefined
+          : action.status === "approved" ? answerTextOf(action.result) : "Der Benutzer hat die Frage verworfen."}
+        onAnswer={access.can("runs.write") ? answer : undefined}
+        question={question}
+        text={text}
+      />
+      {error && <p className="text-[0.7rem] text-destructive" role="alert">{error}</p>}
+    </>
+  );
+}

package/{apps/web/src/chat → plugins/ragents.ask/web}/QuestionCard.tsx

@@ -1,7 +1,7 @@
 import { CheckIcon } from "lucide-react";
-import { Button, Card, cn, Input } from "../ui";
+import { Button, Card, cn, Input } from "@ragents/web/ui";
 import { useState } from "react";
-import { Question } from "./types";
+import type { AskPayload } from "../ask-payload";
 
 const cardClasses = "gap-2.5 bg-background px-3.5 text-sm";
 const optionClasses = "h-auto w-full justify-start gap-2 px-3 py-1.5 text-left text-sm font-normal whitespace-normal";
@@ -13,22 +13,24 @@ const optionClasses = "h-auto w-full justify-start gap-2 px-3 py-1.5 text-left t
 export function QuestionCard({
   text,
   question,
+  answer,
   onAnswer,
 }: {
   text: string;
-  question: Question;
+  question: AskPayload;
+  answer?: string;
   onAnswer?: (text: string) => void;
 }) {
   const [gewaehlt, setGewaehlt] = useState<string[]>([]);
   const [frei, setFrei] = useState("");
 
-  if (question.answer !== undefined) {
+  if (answer !== undefined) {
     return (
       <Card className={cardClasses} size="sm">
         <div className="leading-normal">{text}</div>
         <div className="flex items-center gap-1.5 text-sm text-muted-foreground" data-question="answered">
           <CheckIcon className="text-success" size={12} />
-          {question.answer}
+          {answer}
         </div>
       </Card>
     );

package/plugins/ragents.ask/web/QuestionSection.tsx

@@ -1,9 +1,11 @@
-import { useAccess } from "@aicontainer/web/AccessContext";
+import { useAccess } from "@ragents/web/AccessContext";
 import { useState } from "react";
-import { QuestionCard } from "@aicontainer/web/chat/QuestionCard";
-import { runActorFrom, runViewFrom } from "@aicontainer/plugins/ragents.orchestration/web/contract";
-import type { CardSectionContext } from "@aicontainer/web/PluginRegistry";
-import { SectionLabel } from "@aicontainer/web/ui";
+import { runActorFrom, runViewFrom } from "@ragents/web/run-view";
+import type { CardSectionContext } from "@ragents/web/PluginRegistry";
+import { SectionLabel } from "@ragents/web/ui";
+import { askPayloadOf, ASK_PLUGIN_ID } from "../ask-payload";
+import { answerQuestion } from "./api";
+import { QuestionCard } from "./QuestionCard";
 
 export function QuestionSection({ actor, session }: CardSectionContext) {
   const access = useAccess();
@@ -12,12 +14,12 @@ export function QuestionSection({ actor, session }: CardSectionContext) {
   if (!view) return null;
   const actorId = runActorFrom(actor).id;
   const pending = view.actions.filter((action) =>
-    action.kind === "question" && action.askedBy === actorId && action.status === "pending");
+    action.owner === ASK_PLUGIN_ID && (askPayloadOf(action.payload)?.recipient ?? action.askedBy) === actorId && action.status === "pending");
   if (pending.length === 0) return null;
 
   const answer = (actionId: string, text: string) => {
     setError(undefined);
-    session.respond(actionId, text)
+    answerQuestion(session.session.id, actionId, text)
       .catch((caught: unknown) => setError(caught instanceof Error ? caught.message : String(caught)));
   };
 
@@ -27,20 +29,19 @@ export function QuestionSection({ actor, session }: CardSectionContext) {
         <span>Rückfrage</span>
         <small>{pending.length}</small>
       </SectionLabel>
-      {pending.map((action) => (
-        <div className="rounded-lg animate-ring-pulse motion-reduce:animate-none" key={action.id}>
-          {action.description && <p className="mb-1.5 text-[0.7rem] leading-[1.35] text-muted-foreground">{action.description}</p>}
-          <QuestionCard
-            onAnswer={access.can("runs.write") ? (text) => answer(action.id, text) : undefined}
-            question={{
-              callId: action.id,
-              options: action.question?.options ?? [],
-              multi: action.question?.multi ?? false,
-            }}
-            text={action.title}
-          />
-        </div>
-      ))}
+      {pending.map((action) => {
+        const question = askPayloadOf(action.payload);
+        return question && (
+          <div className="rounded-lg animate-ring-pulse motion-reduce:animate-none" key={action.id}>
+            {action.description && <p className="mb-1.5 text-[0.7rem] leading-[1.35] text-muted-foreground">{action.description}</p>}
+            <QuestionCard
+              onAnswer={access.can("runs.write") ? (text) => answer(action.id, text) : undefined}
+              question={question}
+              text={action.title}
+            />
+          </div>
+        );
+      })}
       {error && <p className="text-[0.7rem] text-destructive" role="alert">{error}</p>}
     </section>
   );

package/plugins/ragents.ask/web/api.ts

@@ -1,4 +1,4 @@
-import { rpc } from "@aicontainer/web/rpc";
+import { rpc } from "@ragents/web/rpc";
 import { askContracts } from "../contract";
 
 export const answerQuestion = async (runId: string, actionId: string, answer: string): Promise<void> => {

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

@@ -2,13 +2,14 @@ import {
   type SessionContext,
   type WebPlugin,
   type WebPluginDescriptor,
-} from "@aicontainer/web/PluginRegistry";
-import { runViewFrom, type RunView } from "@aicontainer/plugins/ragents.orchestration/web/contract";
-import { answerQuestion } from "./api";
+} from "@ragents/web/PluginRegistry";
+import { runViewFrom, type RunView } from "@ragents/web/run-view";
+import { askPayloadOf, ASK_PLUGIN_ID } from "../ask-payload";
+import { AskActionView } from "./AskActionView";
 import { QuestionSection } from "./QuestionSection";
 
 const pendingQuestions = (view: RunView) =>
-  view.actions.filter((action) => action.kind === "question" && action.status === "pending");
+  view.actions.filter((action) => action.owner === ASK_PLUGIN_ID && action.status === "pending");
 
 const askerHandle = (view: RunView, askedBy: string): string =>
   view.actors.find((actor) => actor.id === askedBy)?.handle ?? askedBy;
@@ -21,7 +22,7 @@ const attentionFor = (session: SessionContext) => {
   return {
     active: true as const,
     label: rest.length === 0
-      ? `@${askerHandle(view, first.askedBy)} fragt`
+      ? `@${askerHandle(view, askPayloadOf(first.payload)?.recipient ?? first.askedBy)} fragt`
       : `${rest.length + 1} Rückfragen offen`,
   };
 };
@@ -29,8 +30,10 @@ const attentionFor = (session: SessionContext) => {
 const configuredPlugin = (descriptor: WebPluginDescriptor): WebPlugin => ({
   ...descriptor,
   needsRunView: true,
-  questionResponder: (session, callId, payload) =>
-    answerQuestion(session.id, callId, typeof payload === "string" ? payload : JSON.stringify(payload)),
+  actionViews: [{
+    owner: ASK_PLUGIN_ID,
+    View: AskActionView,
+  }],
   cardSections: [{
     id: "ragents.ask.questions",
     order: 100,
@@ -42,7 +45,7 @@ const configuredPlugin = (descriptor: WebPluginDescriptor): WebPlugin => ({
   }],
 });
 
-const descriptor: WebPluginDescriptor = { id: "ragents.ask" };
+const descriptor: WebPluginDescriptor = { id: ASK_PLUGIN_ID };
 
 export const webPlugin: WebPlugin = {
   ...descriptor,

package/plugins/ragents.browser/provision.ts

@@ -1,18 +1,18 @@
 import { spawn } from "node:child_process";
 import { access, constants } from "node:fs/promises";
-import { createRequire } from "node:module";
 import path from "node:path";
 import { chromium } from "playwright-core";
+import { BROWSER_EXECUTABLE_VARIABLE } from "@ragents/workspace-executor";
 import {
+  hostPackageFolder,
   provisionGap,
   provisionReady,
   type PluginProvision,
-} from "@aicontainer/server/plugin-support/provision.js";
+} from "@ragents/host/plugin-support/provision.js";
 
 const executable = async (file: string): Promise<boolean> => access(file, constants.X_OK).then(() => true, () => false);
 
-const playwrightCli = (): string =>
-  path.join(path.dirname(createRequire(import.meta.url).resolve("playwright-core/package.json")), "cli.js");
+const playwrightCli = (): string => path.join(hostPackageFolder("playwright-core"), "cli.js");
 
 const install = (log: (line: string) => void): Promise<void> => new Promise((resolve, reject) => {
   const child = spawn(process.execPath, [playwrightCli(), "install", ...(process.platform === "linux" ? ["--with-deps"] : []), "chromium"], { stdio: ["ignore", "pipe", "pipe"] });
@@ -24,17 +24,18 @@ const install = (log: (line: string) => void): Promise<void> => new Promise((res
 // Playwright verwaltet seinen Browsercache selbst; der Werkzeugordner des Plugins bleibt leer.
 export const createBrowserProvision = (): PluginProvision => ({
   check: async () => {
-    const configured = process.env.BROWSER_EXECUTABLE_PATH;
+    const configured = process.env[BROWSER_EXECUTABLE_VARIABLE];
     if (configured) {
       return await executable(configured)
         ? provisionReady
-        : provisionGap("browser", `BROWSER_EXECUTABLE_PATH nennt ${configured}; dort gibt es keinen ausführbaren Browser`, false);
+        : provisionGap("browser", `${BROWSER_EXECUTABLE_VARIABLE} nennt ${configured}; dort gibt es keinen ausführbaren Browser`, false);
     }
     const bundled = chromium.executablePath();
     return await executable(bundled)
       ? provisionReady
-      : provisionGap("chromium", `Chromium fehlt unter ${bundled}; entweder BROWSER_EXECUTABLE_PATH in der Profilsektion ragents.browser `
-        + "auf einen vorhandenen Chrome setzen oder die Provisionierung den Browser laden lassen", true);
+      : provisionGap("chromium", `Chromium fehlt unter ${bundled}; entweder ${BROWSER_EXECUTABLE_VARIABLE} auf einen vorhandenen Chrome `
+        + "setzen (auf einem Server in der Profilsektion ragents.browser, auf einem Arbeitsplatz in seiner Umgebung) oder die "
+        + "Provisionierung den Browser laden lassen", true);
   },
   apply: async (_target, log) => {
     const state = await createBrowserProvision().check("");

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

@@ -0,0 +1,6 @@
+{
+  "id": "ragents.browser",
+  "exports": {
+    "server": ["server/contract"]
+  }
+}