@schlenkr/ragents 0.1.8 → 0.1.10

package/apps/server/package.json

@@ -19,7 +19,7 @@
     "@ragents/engine": "workspace:*",
     "@ragents/workspace-executor": "workspace:*",
     "handlebars": "^4.7.9",
-    "quassel": "^0.2.2",
+    "quassel": "^0.3.0",
     "tsx": "^4.20.0",
     "typebox": "^1.3.13",
     "vscode-jsonrpc": "^9.0.2"

package/apps/server/src/access-projection.ts

@@ -1,37 +1,9 @@
-import { emptyUsage, type AccessContext, type JsonValue, type PluginState, type RunView } from "@ragents/engine";
+import { emptyUsage, type AccessContext, type AccessProjectionRegistry, type RunView } from "@ragents/engine";
 import type { ChatEvent, Message } from "quassel/events";
 import type { ActorConversations } from "./ragents/actor-chat-history.js";
 
-const record = (value: JsonValue | undefined): Record<string, JsonValue | undefined> | undefined =>
-  value !== null && typeof value === "object" && !Array.isArray(value) ? value : undefined;
-
-const hiddenStates = new Set(["ragents.system-prompt", "ragents.model", "ragents.start-options"]);
-
-const visibleState = (entry: PluginState): PluginState | undefined => {
-  if (hiddenStates.has(entry.pluginId)) return undefined;
-  if (entry.pluginId === "ragents.actor-programs.invocations") return { ...entry, state: { version: 1, revision: entry.updatedAt } };
-  if (entry.pluginId !== "ragents.actor-programs") return entry;
-  const state = record(entry.state);
-  const program = state?.program ? record(state.program) : undefined;
-  if (!program) return entry;
-  const views = Array.isArray(program.views) ? program.views.map((value) => {
-    const view = record(value);
-    return view ? { id: view.id, key: view.key, title: view.title, visible: view.visible, placements: view.placements } : value;
-  }) : [];
-  return { ...entry, state: {
-    version: 1,
-    program: {
-      name: program.name,
-      title: program.title,
-      actorId: program.actorId,
-      actorHandle: program.actorHandle,
-      revision: program.revision,
-      views,
-    },
-  } };
-};
-
-export const accessibleRunView = (view: RunView, access: AccessContext): RunView => access.can("runs.inspect") ? view : {
+/** Plugin-Zustände und Plugin-Ereignisse zeigt jedes Plugin selbst über seine Zugriffsprojektion (docs/spec/plugins.md, Registrierungen des PluginHost). */
+export const accessibleRunView = (view: RunView, access: AccessContext, projections: AccessProjectionRegistry): RunView => access.can("runs.inspect") ? view : {
   ...view,
   actors: view.actors.map((actor) => actor.kind === "human" ? { ...actor, grants: [] } : {
     ...actor,
@@ -53,12 +25,12 @@ export const accessibleRunView = (view: RunView, access: AccessContext): RunView
   turns: view.turns.map((turn) => ({ ...turn, usage: emptyUsage(), toolCalls: [], reason: turn.reason ? "Die Verarbeitung wurde beendet." : null })),
   subscriptions: [],
   pluginStates: view.pluginStates.flatMap((entry) => {
-    const state = visibleState(entry);
+    const state = projections.state(entry, access);
     return state ? [state] : [];
   }),
 };
 
-export const accessibleChatEvent = (event: ChatEvent, access: AccessContext): ChatEvent | undefined => {
+export const accessibleChatEvent = (event: ChatEvent, access: AccessContext, projections: AccessProjectionRegistry): ChatEvent | undefined => {
   if (access.can("runs.inspect")) return event;
   if (event.kind === "status" && event.startup?.status === "failed") return {
     ...event,
@@ -70,9 +42,7 @@ export const accessibleChatEvent = (event: ChatEvent, access: AccessContext): Ch
   if (event.kind === "tool-result") return trace ? event : { kind: "tool-result", id: event.id, result: "", isError: event.isError };
   if (event.kind === "system") return { ...event, text: "Hinweis zur Verarbeitung. Bei Fragen wende Dich an den zuständigen Agenten." };
   if (event.kind !== "plugin") return event;
-  if (hiddenStates.has(event.pluginId)) return undefined;
-  if (event.pluginId === "ragents.actor-programs" || event.pluginId === "ragents.actor-programs.invocations") return undefined;
-  return event;
+  return projections.chatEvent(event.pluginId, event, access);
 };
 
 const visibleMessage = (message: Message, actorId: string, trace: boolean): Message[] => {

package/apps/server/src/api/contracts.ts

@@ -25,6 +25,9 @@ const attachment = Type.Object({
 const sessionInfo = openJson<SessionInfo>("SessionInfo");
 
 /** Rechte je Run prüft der Host dynamisch; Verträge ohne `rights` nennen ihre Regel in der Beschreibung. */
+/** Was eine Oberfläche beim Start vom Server bekommt: das Profil der Plugins und die RAgents-Fassung des Servers, gegen die sie ihre eigene prüft. */
+export type HostBootstrap = PublicPluginProfile & { readonly version: string };
+
 export const coreContracts = {
   runs: {
     list: defineOperation({
@@ -161,9 +164,9 @@ export const coreContracts = {
   plugins: {
     bootstrap: defineOperation({
       id: "ragents.plugins.bootstrap",
-      description: "Produkt, aktive Plugins mit Web-Konfiguration und freigegebene Vorlagen für die Oberfläche.",
+      description: "Produkt, aktive Plugins mit Web-Konfiguration, freigegebene Vorlagen und die RAgents-Fassung des Servers für die Oberfläche.",
       input: Type.Object({}, { additionalProperties: false }),
-      result: openJson<PublicPluginProfile>("PublicPluginProfile"),
+      result: openJson<HostBootstrap>("HostBootstrap"),
     }),
   },
   external: {

package/apps/server/src/api/core-methods.ts

@@ -25,6 +25,8 @@ export interface CoreMethodSources {
     saveTitleModelSettings: (value: unknown) => Promise<TitleModelSettings>;
   };
   plugins: PluginHost;
+  /** Die RAgents-Fassung dieses Servers; eine Oberfläche mit anderer Fassung zeigt den Unterschied. */
+  version: string;
   global: GlobalRunPolicy | undefined;
   /** Der Benutzer eines Runs: null ohne Eigentümer, undefined für eine Kennung ohne Run. */
   runOwner: (runId: string) => string | null | undefined;
@@ -146,7 +148,7 @@ export const coreMethods = (sources: CoreMethodSources): MethodContribution[] =>
     implement(coreContracts.settings.skill, ({ id }, { local }) => { assertSettingsReachable(local); return sessions.skill(id); }),
     implement(coreContracts.settings.titlesRead, (_input, { local }) => { assertSettingsReachable(local); return sessions.titleModelSettings(); }),
     implement(coreContracts.settings.titlesSave, ({ value }, { local }) => { assertSettingsReachable(local); return sessions.saveTitleModelSettings(value); }),
-    implement(coreContracts.plugins.bootstrap, (_input, { access }) => sources.plugins.publicProfile(access)),
+    implement(coreContracts.plugins.bootstrap, (_input, { access }) => ({ ...sources.plugins.publicProfile(access), version: sources.version })),
     implement(coreContracts.external.set, async ({ state }, { local }) => {
       if (!local) throw new DomainError("local-only", "Nur lokal schaltbar", 403);
       await sources.external.set(state === "on");
@@ -155,7 +157,7 @@ export const coreMethods = (sources: CoreMethodSources): MethodContribution[] =>
   ];
 };
 
-export const coreChannels = (sources: Pick<CoreMethodSources, "sessions" | "global" | "runOwner" | "runOwnerOnly">): ChannelContribution[] => {
+export const coreChannels = (sources: Pick<CoreMethodSources, "sessions" | "plugins" | "global" | "runOwner" | "runOwnerOnly">): ChannelContribution[] => {
   const { sessions, global } = sources;
   const policy: RunAccessPolicy = { global, ownerOf: sources.runOwner, ownerOnly: sources.runOwnerOnly };
   return [
@@ -174,7 +176,7 @@ export const coreChannels = (sources: Pick<CoreMethodSources, "sessions" | "glob
       assertRunRights(access, runId, "read", policy);
       const current = await sessions.get(runId);
       return current.subscribe((event) => {
-        const visible = accessibleChatEvent(event, access);
+        const visible = accessibleChatEvent(event, access, sources.plugins.accessProjections);
         if (visible) emit(visible);
       });
     }),

package/apps/server/src/config-definition.ts

@@ -1,3 +1,5 @@
+import type { ModelCompaction } from "@ragents/ai";
+import type { ThinkingLevel } from "@ragents/engine";
 import type { hostConfigDescriptors } from "./config.js";
 
 export interface EnvironmentReference {
@@ -52,7 +54,23 @@ export interface ProfileUser extends ProfileAnonymousUser {
   readonly token?: EnvironmentReference;
 }
 
-export type ConfigValue = string | number | boolean | readonly string[] | EnvironmentReference | ProvisionedReference;
+/** Ein Eintrag von MODEL_ALIASES: ein Modell unter eigenem Namen mit den Kompaktierungswerten, die für dieses Modell gelten. */
+export interface ProfileModelAlias {
+  readonly alias: string;
+  /** Das Ziel als anbieter/modell aus dem eingebauten Katalog des Anbieters. */
+  readonly model: string;
+  readonly thinking?: ThinkingLevel;
+  readonly compaction: Readonly<ModelCompaction>;
+}
+
+export type ConfigValue =
+  | string
+  | number
+  | boolean
+  | readonly string[]
+  | readonly ProfileModelAlias[]
+  | EnvironmentReference
+  | ProvisionedReference;
 
 type Descriptors = readonly { readonly key: string }[];
 
@@ -64,6 +82,10 @@ type Section<T extends Descriptors> = {
   readonly [Key in T[number]["key"]]?: Key extends SecretKeyOf<T> ? EnvironmentReference : ConfigValue;
 };
 
+type HostSection = Omit<Section<typeof hostConfigDescriptors>, "MODEL_ALIASES"> & {
+  readonly MODEL_ALIASES?: readonly ProfileModelAlias[];
+};
+
 // Der Kern kennt keine Plugin-IDs: welche Sektion und welcher Schlüssel gültig ist, entscheidet die
 // Laufzeitprüfung gegen die Deklarationen der geladenen Plugins.
 export type PluginSection = {
@@ -76,5 +98,5 @@ export type PluginSection = {
 };
 
 export type RAgentsConfig =
-  & { readonly host?: Section<typeof hostConfigDescriptors> }
+  & { readonly host?: HostSection }
   & { readonly [pluginId: string]: PluginSection | undefined };

package/apps/server/src/config-file.ts

@@ -106,7 +106,7 @@ export const resolveAnonymousUser = (source: string, raw: unknown): AccessUser |
 export const resolveDefaultStartEntry = (source: string, raw: unknown): string | undefined => {
   if (raw === undefined) return undefined;
   if (typeof raw !== "string" || !START_ENTRY_ID.test(raw)) {
-    throw new Error(`${source}: defaultStartEntry braucht eine Vorlagenkennung als String, etwa "ragents.reference.word-game"`);
+    throw new Error(`${source}: defaultStartEntry braucht eine Vorlagenkennung als String, etwa "acme.tasks.setup"`);
   }
   return raw;
 };

package/apps/server/src/config.ts

@@ -11,8 +11,6 @@ export const hostConfigDescriptors = [
   { key: "PORT", source: "environment" },
   { key: "DATA_DIR", source: "environment" },
   { key: "AGENT_THINKING", source: "environment" },
-  { key: "AGENT_COMPACTION_RESERVE_TOKENS", source: "environment" },
-  { key: "AGENT_COMPACTION_KEEP_RECENT_TOKENS", source: "environment" },
   { key: "COMPACTION_PROVIDER", source: "environment" },
   { key: "COMPACTION_MODEL", source: "environment" },
   ...modelAliasEnvDescriptors,
@@ -37,10 +35,6 @@ export const config = Object.freeze({
   dataDir: path.resolve(env.value("DATA_DIR", defaultDataDirectory(env.required("PRODUCT_PROFILE")))),
   webDistDir: hostWebDirectory(rootDir),
   agentThinking: env.value("AGENT_THINKING", "high"),
-  agentCompaction: {
-    ...(env.optional("AGENT_COMPACTION_RESERVE_TOKENS") ? { reserveTokens: env.positiveNumber("AGENT_COMPACTION_RESERVE_TOKENS", "") } : {}),
-    ...(env.optional("AGENT_COMPACTION_KEEP_RECENT_TOKENS") ? { keepRecentTokens: env.positiveNumber("AGENT_COMPACTION_KEEP_RECENT_TOKENS", "") } : {}),
-  },
   compactionProvider: env.value("COMPACTION_PROVIDER", "openrouter"),
   compactionModel: env.value("COMPACTION_MODEL", ""),
   productProfile: env.required("PRODUCT_PROFILE"),

package/apps/server/src/host-api.json

@@ -1,5 +1,5 @@
 {
-  "version": 6,
+  "version": 7,
   "server": {
     "@ragents/engine": [
       "DomainError",
@@ -239,6 +239,7 @@
       "runManagementToken"
     ],
     "@ragents/host/ragents/host-services": [
+      "executorContributionsToken",
       "hostAddressToken",
       "runGuardToken",
       "runWorkspaceProviderToken",
@@ -266,31 +267,23 @@
       "workflowInstructions"
     ],
     "@ragents/workspace-executor": [
-      "BROWSER_EXECUTABLE_VARIABLE",
-      "BROWSER_OPERATIONS",
       "COMMAND_OPERATIONS",
       "FILE_OPERATIONS",
-      "FSHARP_SERVER_FILE",
-      "FSHARP_SERVER_VARIABLE",
       "PROCESS_OPERATIONS",
-      "ROSLYN_SERVER_FILE",
-      "ROSLYN_SERVER_VARIABLE",
       "RUN_FOLDER_OPERATIONS",
       "RUN_MARKER_ENV",
       "WORKSPACE_EXECUTOR_VERSION",
-      "fsharpAdapter",
       "languageServerOpenOperation",
       "languageServerSolutionsOperation",
       "listDirectory",
       "readTextFile",
-      "roslynAdapter",
+      "ripgrepAvailable",
       "runManagedProcess",
       "safeProcessEnvironment",
       "sandboxRunEnvironment",
       "sandboxedLaunch",
       "shellPlatformText",
       "startManagedService",
-      "typescriptAdapter",
       "watchDirectory"
     ],
     "@ragents/workspace-executor/src/git-config-environment": [
@@ -891,6 +884,7 @@
       "encodeAttachment",
       "fillText",
       "formatAttachmentSize",
+      "formatElapsed",
       "markdownPlainText",
       "messageDate",
       "prettyJson",
@@ -898,6 +892,7 @@
       "timestampDay",
       "timestampLabel",
       "useChatAction",
+      "useElapsed",
       "useQuasselComponents",
       "useQuasselPortalContainer",
       "validateAttachmentSelection"

package/apps/server/src/host-api.ts

@@ -1,5 +1,5 @@
 /** The number of the host API a plugin is built against; it changes with every incompatible change of a list, a listed name or a library. */
-export const HOST_API_VERSION = 6;
+export const HOST_API_VERSION = 7;
 
 /** A library the host shares whole, as its installed version exports it; host code instead names each value it offers. */
 export const LIBRARY = "library";
@@ -90,7 +90,8 @@ export const hostApi: { readonly server: HostApiModules; readonly web: HostApiMo
     "@ragents/host/ragents/document-store": ["documentStoreToken"],
     "@ragents/host/ragents/global-chat": ["globalChatToken", "runManagementToken"],
     "@ragents/host/ragents/host-services": [
-      "hostAddressToken", "runtimeProviderToken", "secretEnvNamesToken", "runGuardToken", "runWorkspaceProviderToken", "workspaceGuardToken",
+      "executorContributionsToken", "hostAddressToken", "runtimeProviderToken", "secretEnvNamesToken", "runGuardToken", "runWorkspaceProviderToken",
+      "workspaceGuardToken",
     ],
     "@ragents/host/ragents/product-runtime": ["productRuntimeToken"],
     "@ragents/host/ragents/runtime-bridge": ["runtimeBridgeToken"],
@@ -100,11 +101,9 @@ export const hostApi: { readonly server: HostApiModules; readonly web: HostApiMo
     ],
     "@ragents/workflow": ["defineWorkflow", "workflowInstructions"],
     "@ragents/workspace-executor": [
-      "BROWSER_EXECUTABLE_VARIABLE", "BROWSER_OPERATIONS", "COMMAND_OPERATIONS", "FILE_OPERATIONS",
-      "FSHARP_SERVER_FILE", "FSHARP_SERVER_VARIABLE", "PROCESS_OPERATIONS", "ROSLYN_SERVER_FILE",
-      "ROSLYN_SERVER_VARIABLE", "RUN_FOLDER_OPERATIONS", "RUN_MARKER_ENV", "WORKSPACE_EXECUTOR_VERSION", "fsharpAdapter",
-      "languageServerOpenOperation", "languageServerSolutionsOperation", "listDirectory", "readTextFile", "roslynAdapter", "runManagedProcess", "safeProcessEnvironment", "sandboxRunEnvironment", "sandboxedLaunch",
-      "shellPlatformText", "startManagedService", "typescriptAdapter", "watchDirectory",
+      "COMMAND_OPERATIONS", "FILE_OPERATIONS", "PROCESS_OPERATIONS", "RUN_FOLDER_OPERATIONS", "RUN_MARKER_ENV", "WORKSPACE_EXECUTOR_VERSION",
+      "languageServerOpenOperation", "languageServerSolutionsOperation", "listDirectory", "readTextFile", "ripgrepAvailable", "runManagedProcess", "safeProcessEnvironment", "sandboxRunEnvironment", "sandboxedLaunch",
+      "shellPlatformText", "startManagedService", "watchDirectory",
     ],
     "@ragents/workspace-executor/src/git-config-environment": ["withGitConfigPairs"],
     "@ragents/workspace-executor/src/managed-process": ["ProcessGroupJoinError"],

package/apps/server/src/plugin-build/build.ts

@@ -5,6 +5,7 @@ import path from "node:path";
 import { Scanner } from "@tailwindcss/oxide";
 import { build as esbuild, type Message, type Metafile, type OutputFile, type PartialMessage, type Plugin } from "esbuild";
 import ts from "typescript";
+import { EXECUTOR_CONTRIBUTION_FILE } from "@ragents/workspace-executor";
 import { installFolder, withLock } from "../folder-install.js";
 import { HOST_API_VERSION, HOST_MODULES_GLOBAL, LIBRARY, hostApi, hostOnly, providedByHost, type HostApiHalf } from "../host-api.js";
 import { checkedHostApiRecord, hostRoot, type HostApiRecord } from "../host-version.js";
@@ -172,13 +173,27 @@ interface HalfState {
 }
 
 /** Keeps a half to the host API, its own folder and declared exports of other plugins; everything else is a build error with its cause. */
-const boundaryPlugin = (source: PluginSource, half: HostApiHalf, environment: BuildEnvironment, state: HalfState, assets: readonly string[]): Plugin => ({
+const boundaryPlugin = (
+  source: PluginSource,
+  half: HostApiHalf,
+  environment: BuildEnvironment,
+  state: HalfState,
+  assets: readonly string[],
+  selfContained: boolean,
+): Plugin => ({
   name: "ragents-plugin-boundary",
   setup(build) {
     const id = source.description.id;
     const packageProblems = new Map<string, string | undefined>();
 
+    /** The executor contribution loads in every process without the host's loader, the VS Code extension included. */
+    const outsideContribution = (specifier: string) => ({ errors: [{
+      text: `${specifier}: der Executor-Beitrag lädt in jedem Node-Prozess ohne die Auflösung des Hosts; er importiert nur node:*, eigene Dateien, `
+        + "gebündelte Bibliotheken und vom Host Typen (import type), alles andere bekommt er über die Maschine",
+    }] });
+
     const crossImport = (owner: string, name: string) => {
+      if (selfContained) return outsideContribution(`@ragents/plugins/${owner}/${name}`);
       state.uses.add(owner);
       return half === "server"
         ? { path: `@ragents/plugins/${owner}/${name}`, external: true }
@@ -221,6 +236,7 @@ const boundaryPlugin = (source: PluginSource, half: HostApiHalf, environment: Bu
           }
           return crossImport(owner, name);
         }
+        if (selfContained && (providedByHost(half, specifier) || hostOnly(specifier))) return outsideContribution(specifier);
         if (providedByHost(half, specifier)) {
           if (args.kind === "dynamic-import" && (half === "web" || !isLibrary(half, specifier))) {
             return { errors: [{ text: `import() von ${specifier}: ein Modul des Hosts wird statisch importiert, damit der Bau jeden Namen gegen die Host-API prüft` }] };
@@ -381,23 +397,27 @@ const nodePathsOf = (root: string, half: HostApiHalf): string[] =>
   [path.join(root, "node_modules"), path.join(root, half === "server" ? "apps/server/node_modules" : "apps/web/node_modules")]
     .filter((folder) => existsSync(folder));
 
+/** Builds a half; `selfContained` builds the executor contribution as one file under executor/ that imports nothing but node:*. */
 const buildHalf = async (
   source: PluginSource,
   half: HostApiHalf,
   entries: readonly { readonly in: string; readonly out: string }[],
   environment: BuildEnvironment,
   assets: readonly string[],
+  selfContained = false,
 ): Promise<HalfResult | { readonly problems: readonly string[] }> => {
   const state: HalfState = { uses: new Set() };
   const id = source.description.id;
-  const problemsOf = (messages: readonly Message[]): readonly string[] => messages.map((message) => `${half}: ${messageText(message, source.folder)}`);
+  const part = selfContained ? path.posix.dirname(EXECUTOR_CONTRIBUTION_FILE) : half;
+  const problemsOf = (messages: readonly Message[]): readonly string[] => messages.map((message) => `${part}: ${messageText(message, source.folder)}`);
   try {
     const result = await esbuild({
       absWorkingDir: source.folder,
       entryPoints: [...entries],
-      outdir: path.join(environment.out, id, half),
+      outdir: path.join(environment.out, id, part),
       bundle: true,
-      splitting: true,
+      splitting: !selfContained,
+      ...(selfContained ? { outExtension: { ".js": path.posix.extname(EXECUTOR_CONTRIBUTION_FILE) } } : {}),
       format: "esm",
       write: false,
       metafile: true,
@@ -416,7 +436,7 @@ const buildHalf = async (
         define: { "process.env.NODE_ENV": JSON.stringify("production") },
       } : { banner: { js: SERVER_BANNER } }),
       logLevel: "silent",
-      plugins: [boundaryPlugin(source, half, environment, state, assets)],
+      plugins: [boundaryPlugin(source, half, environment, state, assets, selfContained)],
     });
     const fatal = result.warnings.filter((warning) => FATAL_WARNINGS.has(warning.id));
     if (fatal.length > 0) return { problems: problemsOf(fatal) };
@@ -472,6 +492,7 @@ const buildPlugin = async (folder: string, environment: BuildEnvironment, typeEr
   const serverEntry = sourceFileOf(path.join(source.folder, "server/index"));
   const webEntry = sourceFileOf(path.join(source.folder, "web/index"));
   const provision = sourceFileOf(path.join(source.folder, "provision"));
+  const executorEntry = sourceFileOf(path.join(source.folder, "executor"));
   const exportEntries = (half: HostApiHalf) => source.description.exports[half].map((name) => ({
     in: sourceFileOf(path.join(source.folder, name))!,
     out: `exports/${name}`,
@@ -481,6 +502,7 @@ const buildPlugin = async (folder: string, environment: BuildEnvironment, typeEr
   const results = await Promise.all([
     buildHalf(source, "server", [{ in: provision ? "ragents-entry:server" : serverEntry, out: "index" }, ...exportEntries("server")], environment, assets),
     ...(hasWeb ? [buildHalf(source, "web", [...(webEntry ? [{ in: webEntry, out: "index" }] : []), ...exportEntries("web")], environment, assets)] : []),
+    ...(executorEntry ? [buildHalf(source, "server", [{ in: executorEntry, out: path.posix.parse(EXECUTOR_CONTRIBUTION_FILE).name }], environment, assets, true)] : []),
   ]);
   const problems = results.flatMap((result) => "problems" in result ? result.problems : []);
   if (problems.length > 0) return failed(problems);
@@ -525,6 +547,7 @@ const buildPlugin = async (folder: string, environment: BuildEnvironment, typeEr
           classes: "web/classes.json",
         },
       } : {}),
+      ...(executorEntry ? { executor: EXECUTOR_CONTRIBUTION_FILE } : {}),
       exports: {
         server: Object.fromEntries(source.description.exports.server.map((name) => [name, exportOutput("server", name)])),
         web: Object.fromEntries(source.description.exports.web.map((name) => [name, exportOutput("web", name)])),

package/apps/server/src/plugin-build/plugin-description.ts

@@ -19,7 +19,7 @@ export interface PluginSource {
 
 const ID_PATTERN = /^[a-z0-9]+(?:[.-][a-z0-9]+)*$/;
 /** Places of the bundle the build tool writes itself; an asset there would overwrite its output or publish sources under /plugins/<id>/web/. */
-const RESERVED_ASSET_ROOTS = new Set(["server", "web", "ragents-bundle.json"]);
+const RESERVED_ASSET_ROOTS = new Set(["server", "web", "executor", "ragents-bundle.json"]);
 const DESCRIPTION_KEYS = new Set(["id", "exports", "assets"]);
 const HALVES = new Set(["server", "web"]);
 

package/apps/server/src/plugin-build/typecheck.ts

@@ -11,9 +11,9 @@ export const PLUGIN_TSCONFIG: Readonly<Record<HostApiHalf, string>> = {
   web: "apps/web/tsconfig.plugin.json",
 };
 
-/** The files a half starts from: its entry, the provisioning for the server, and the declared exports. */
+/** The files a half starts from: its entry, the provisioning and the executor contribution for the server, and the declared exports. */
 export const halfEntries = (source: PluginSource, half: HostApiHalf): readonly string[] => {
-  const own = half === "server" ? ["server/index", "provision"] : ["web/index"];
+  const own = half === "server" ? ["server/index", "provision", "executor"] : ["web/index"];
   return [...own, ...source.description.exports[half]]
     .map((name) => sourceFileOf(path.join(source.folder, name)))
     .filter((file): file is string => file !== undefined);

package/apps/server/src/plugin-support/language-server/plugin.ts

@@ -1,5 +1,5 @@
 import type { PluginConfigDescriptor, RAgentsPlugin } from "@ragents/engine";
-import type { LanguageServerAdapter } from "@ragents/workspace-executor";
+import type { LanguageServerDescription } from "@ragents/workspace-executor";
 import { workspaceGuardToken } from "../../ragents/host-services.js";
 import { sandboxServicesToken } from "../workspace-sandbox-host.js";
 import { createLanguageServerSnapshotMethod, createLanguageServerSolutionMethods } from "./snapshot-method.js";
@@ -7,7 +7,8 @@ import { createLanguageServerToolContributor } from "./tools.js";
 
 export interface LanguageServerPluginOptions {
   id: string;
-  adapter: LanguageServerAdapter;
+  /** Beschreibt den Sprachserver für Werkzeuge und Reiter; gestartet wird er im Executor aus dem Beitrag des Plugins. */
+  languageServer: LanguageServerDescription;
   tabLabel?: string;
   configDescriptors?: readonly PluginConfigDescriptor[];
   /** Nach jedem erfolgreichen Öffnen über Werkzeug oder Umschalten, mit dem Run. */
@@ -20,16 +21,16 @@ export const createLanguageServerPlugin = (options: LanguageServerPluginOptions)
     const sandbox = host.service(sandboxServicesToken);
     if (options.configDescriptors) host.config(...options.configDescriptors);
     const opened = options.onOpened ?? (() => undefined);
-    host.functions(createLanguageServerToolContributor(options.adapter, sandbox, opened));
-    const solutions = options.adapter.solutionExtensions !== undefined;
+    host.functions(createLanguageServerToolContributor(options.id, options.languageServer, sandbox, opened));
+    const solutions = options.languageServer.solutionExtensions !== undefined;
     host.clientConfig({
-      label: options.tabLabel ?? options.adapter.label,
-      openTool: `${options.adapter.id}_open`,
+      label: options.tabLabel ?? options.languageServer.label,
+      openTool: `${options.languageServer.id}_open`,
       solutions,
     });
     const methodOptions = {
       pluginId: options.id,
-      adapterId: options.adapter.id,
+      adapterId: options.languageServer.id,
       sandbox,
       ensureWorkspaceAccess: host.service(workspaceGuardToken),
       opened,

package/apps/server/src/plugin-support/language-server/tools.ts

@@ -5,7 +5,7 @@ import {
   languageServerDiagnosticsOperation,
   languageServerOpenOperation,
   languageServerSolutionsOperation,
-  type LanguageServerAdapter,
+  type LanguageServerDescription,
   type LanguageServerSolutions,
   type LanguageServerState,
 } from "@ragents/workspace-executor";
@@ -30,11 +30,12 @@ export const formatSolutions = (label: string, listing: LanguageServerSolutions)
 
 /** Beschreibung und Weiterreichung: der Sprachserver läuft im Executor des Runs, nicht in diesem Plugin. */
 export const createLanguageServerToolContributor = (
-  adapter: LanguageServerAdapter,
+  pluginId: string,
+  languageServer: LanguageServerDescription,
   sandbox: SandboxServices,
   opened: (runId: string) => void,
 ): ToolContributor => {
-  const { id, label, rootDescription, languages } = adapter;
+  const { id, label, rootDescription, languages } = languageServer;
   const extensions = Object.keys(languages).join(", ");
   const openMetadata = {
     name: languageServerOpenOperation(id),
@@ -96,7 +97,7 @@ export const createLanguageServerToolContributor = (
   const solutionsMetadata = {
     name: languageServerSolutionsOperation(id),
     nativeTool: true,
-    description: `List the solution files (${(adapter.solutionExtensions ?? []).join(", ")}) of this run's workspace and mark `
+    description: `List the solution files (${(languageServer.solutionExtensions ?? []).join(", ")}) of this run's workspace and mark `
       + `which ones the ${label} language server has open. ${openMetadata.name} loads another one in addition; `
       + "the open ones stay open.",
   } as const;
@@ -128,9 +129,9 @@ export const createLanguageServerToolContributor = (
         ...(scope.signal ? { signal: scope.signal } : {}),
       }) as string,
   });
-  const withSolutions = adapter.solutionExtensions !== undefined;
+  const withSolutions = languageServer.solutionExtensions !== undefined;
   return {
-    name: `ragents.lsp-${id}`,
+    name: pluginId,
     descriptors: [
       toolDescriptorFrom(openMetadata, alwaysAvailable),
       toolDescriptorFrom(diagnosticsMetadata, alwaysAvailable),