@schlenkr/ragents 0.1.0 → 0.1.1

package/apps/web/src/panel/contract.ts

@@ -1,6 +1,6 @@
 import type { ColumnTheme } from "../column/host-contract";
 
-/** Ein Ziel der Erweiterung: ein RAgents-Server oder ein lokales Profil, das sie selbst startet. */
+/** Eine Umgebung der Erweiterung: ein RAgents-Server oder ein lokales Profil, das sie selbst startet. */
 export type TargetKind = "server" | "profile";
 
 export type TargetState =
@@ -25,14 +25,16 @@ export interface TargetEntry {
   readonly id: string;
   readonly title: string;
   readonly description: string;
-  readonly action: "skill" | "script";
+  readonly kind: "skill" | "script";
+  /** Die Gruppe der Kachelansicht; ein Run-Script ohne eigene Kategorie steht unter "Run-Scripts". */
+  readonly category: string;
 }
 
 export interface TargetView {
   readonly name: string;
   readonly kind: TargetKind;
-  /** Adresse des Servers oder Profil samt Pfad. */
-  readonly description: string;
+  /** Adresse des Servers oder Pfad der Profildatei. */
+  readonly address: string;
   readonly state: TargetState;
   readonly runs: readonly TargetRun[];
   readonly entries: readonly TargetEntry[];
@@ -42,9 +44,9 @@ export interface TargetView {
   readonly user?: string;
   /** Die zuletzt versuchte Kennung; das Anmeldeformular übernimmt sie. */
   readonly loginUser?: string;
-  /** Anmeldedaten liegen in der SecretStorage, damit sich das Ziel still anmeldet. */
+  /** Anmeldedaten liegen in der SecretStorage, damit die Umgebung sich still anmeldet. */
   readonly savedLogin?: boolean;
-  /** Fehler der letzten Aktion an diesem Ziel, direkt in seiner Karte. */
+  /** Fehler der letzten Aktion an dieser Umgebung, direkt in ihrer Zeile. */
   readonly problem?: string;
 }
 
@@ -52,9 +54,11 @@ export interface PanelState {
   readonly theme: ColumnTheme;
   readonly page: "overview" | "settings";
   readonly targets: readonly TargetView[];
+  /** Die Profildateien im Host-Ordner; der Dialog bietet sie an, ohne Host bleibt die Liste leer. */
+  readonly profileSuggestions: readonly string[];
   /** Die Einstellung ragents.connections ist fehlerhaft; die Seite nennt den Grund. */
   readonly problem?: string;
-  /** Der zuletzt über den Dateidialog gewählte Profilpfad; das Formular übernimmt ihn. */
+  /** Der zuletzt über den Dateidialog gewählte Profilpfad; der Dialog übernimmt ihn. */
   readonly pickedProfileFile?: string;
 }
 
@@ -71,7 +75,9 @@ export type PanelAction =
   | { readonly action: "pickProfile" }
   | { readonly action: "addServer"; readonly name: string; readonly url: string }
   | { readonly action: "addProfile"; readonly name: string; readonly profileFile: string }
-  | { readonly action: "remove" | "connect" | "disconnect" | "logout"; readonly name: string }
+  | { readonly action: "updateServer"; readonly name: string; readonly newName: string; readonly url: string }
+  | { readonly action: "updateProfile"; readonly name: string; readonly newName: string; readonly profileFile: string }
+  | { readonly action: "remove" | "connect" | "disconnect" | "logout" | "startProfile" | "stopProfile" | "retry"; readonly name: string }
   | { readonly action: "login"; readonly name: string; readonly user: string; readonly password: string }
   | { readonly action: "login"; readonly name: string; readonly token: string }
   | { readonly action: "openRun"; readonly name: string; readonly runId: string }
@@ -88,7 +94,9 @@ export const isPanelActionMessage = (value: unknown): value is PanelActionMessag
     case "settingsFile": case "pickProfile": return true;
     case "addServer": return text(value, "name") && text(value, "url");
     case "addProfile": return text(value, "name") && text(value, "profileFile");
-    case "remove": case "connect": case "disconnect": case "logout": return text(value, "name");
+    case "updateServer": return text(value, "name") && text(value, "newName") && text(value, "url");
+    case "updateProfile": return text(value, "name") && text(value, "newName") && text(value, "profileFile");
+    case "remove": case "connect": case "disconnect": case "logout": case "startProfile": case "stopProfile": case "retry": return text(value, "name");
     case "login": return text(value, "name") && (text(value, "token") || (text(value, "user") && text(value, "password")));
     case "openRun": return text(value, "name") && text(value, "runId");
     case "newRun": return text(value, "name") && ((value as { entryId?: unknown }).entryId === undefined || text(value, "entryId"));

package/apps/web/src/panel/target-state.ts

@@ -1,6 +1,6 @@
 import type { TargetRun, TargetView } from "./contract";
 
-/** Wie der Zustand eines Ziels in seiner Karte steht; ein lokales Profil ist nicht getrennt, sondern nicht gestartet. */
+/** Wie der Zustand einer Umgebung in ihrer Zeile steht; ein lokales Profil ist nicht getrennt, sondern nicht gestartet. */
 export const stateLabel = (target: TargetView): string => {
   switch (target.state.kind) {
     case "stopped": return target.kind === "profile" ? "nicht gestartet" : "getrennt";
@@ -27,13 +27,17 @@ export const stateTone = (target: TargetView): string => {
   }
 };
 
-/** Der Grund, der zum Zustand gehört; er steht unter der Kopfzeile der Karte. */
+/** Der Grund, der zum Zustand gehört; er steht unter der Zeile der Umgebung. */
 export const stateDetail = (target: TargetView): string | undefined => {
   const state = target.state;
   if (state.kind === "unreachable" || state.kind === "forbidden" || state.kind === "failed") return state.message;
   return undefined;
 };
 
+export const kindLabel = (target: TargetView): string => target.kind === "profile" ? "lokales Profil" : "Server";
+
+export const busyState = (target: TargetView): boolean => target.state.kind === "starting" || target.state.kind === "connecting";
+
 export const runStateLabel = (run: TargetRun): string => {
   switch (run.state) {
     case "running": return "läuft";
@@ -51,3 +55,24 @@ export const runTone = (run: TargetRun): string => {
     case "idle": return "text-muted-foreground";
   }
 };
+
+const MINUTE = 60_000;
+const HOUR = 60 * MINUTE;
+const DAY = 24 * HOUR;
+
+/** Wann ein Run zuletzt etwas getan hat; alles ab gestern nennt das Datum statt einer Spanne. */
+export const runTime = (run: TargetRun, now: number = Date.now()): string => {
+  const passed = now - run.updatedAt;
+  if (passed < MINUTE) return "gerade eben";
+  if (passed < HOUR) return `vor ${Math.floor(passed / MINUTE)} Min`;
+  if (passed < DAY) return `vor ${Math.floor(passed / HOUR)} Std`;
+  return new Date(run.updatedAt).toLocaleDateString("de-DE", { day: "2-digit", month: "2-digit", year: "numeric" });
+};
+
+const HUES = [255, 170, 300, 10, 130, 210, 60, 330];
+
+/** Die Farbe einer Umgebung hängt an ihrem Namen, nicht an ihrer Stelle in der Liste; Umsortieren ändert sie nicht. */
+export const environmentHue = (name: string): number => {
+  const hash = [...name].reduce((value, character) => (value * 31 + character.codePointAt(0)!) % 100_003, 7);
+  return HUES[hash % HUES.length]!;
+};

package/apps/web/src/ui/theme.css

@@ -134,6 +134,8 @@
     --warning-soft: #f3e4d8;
     --info: #4b648a;
     --teal: #356c70;
+    --env-lightness: 0.55;
+    --env-chroma: 0.12;
     --border: #c9c4d5;
     --border-soft: #dad6e3;
     --border-strong: #a397b2;
@@ -186,6 +188,8 @@
     --warning-soft: #43382b;
     --info: #9dbade;
     --teal: #8ec9c4;
+    --env-lightness: 0.79;
+    --env-chroma: 0.1;
     --border: #555065;
     --border-soft: #403c50;
     --border-strong: #8e809f;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schlenkr/ragents",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "RAgents-Host: Server, Engine, Plugins und Werkzeuge ohne Quell-Checkout",
   "keywords": [
     "agents",
@@ -77,6 +77,6 @@
     "yaml": "2.9.0"
   },
   "ragents": {
-    "hostVersion": "c21cf651ca70b5851dbedfbc6f03d21cea77e596"
+    "hostVersion": "1f5768e0029dbc9663ecd4e31b365c4e4e99f531"
   }
 }

package/packages/ragents/src/plugin-host.ts

@@ -522,7 +522,10 @@ const validateStartEntry = (entry: StartEntryContribution): void => {
       }
       return;
     case "script":
-      assertKnownFields(entry, entry, [...base, "script"], "Einstieg");
+      assertKnownFields(entry, entry, [...base, "script", "category"], "Einstieg");
+      if (entry.category !== undefined && (typeof entry.category !== "string" || !entry.category.trim() || entry.category !== entry.category.trim())) {
+        throw new Error(`Einstieg ${entry.id}: category muss ein einzelner nicht leerer Text sein`);
+      }
       validateScriptPackage(entry, entry.script);
       return;
     default:
@@ -572,7 +575,7 @@ export class StartEntryContributionRegistry {
           case "skill":
             return { ...base, action: "skill", skill: value.skill, category: value.category, prompt: value.prompt };
           case "script":
-            return { ...base, action: "script", coordinator: value.script.coordinator };
+            return { ...base, action: "script", coordinator: value.script.coordinator, ...(value.category !== undefined ? { category: value.category } : {}) };
         }
       })
       .sort(byOrderThenId);

package/packages/ragents/src/plugin-types.ts

@@ -207,7 +207,8 @@ export interface RunScriptPackage {
 
 export type StartEntryContribution = StartEntryBase & (
   | { action: "skill"; skill: string; category: string; prompt: string }
-  | { action: "script"; script: RunScriptPackage }
+  /** A run script may name a category of its own; without one the start surfaces group it as a run script. */
+  | { action: "script"; script: RunScriptPackage; category?: string }
 );
 
 export type StartEntryAction = StartEntryContribution["action"];
@@ -215,7 +216,7 @@ export type StartEntryAction = StartEntryContribution["action"];
 /** The entry as the web sees it: a script entry shows its kind and coordinator flag, never its source. */
 export type PublicStartEntry = StartEntryBase & { owner: string } & (
   | { action: "skill"; skill: string; category: string; prompt: string }
-  | { action: "script"; coordinator: boolean }
+  | { action: "script"; coordinator: boolean; category?: string }
 );
 
 export interface SkillContribution {

package/packages/workspace-executor/src/context.ts

@@ -12,6 +12,8 @@ export interface WorkspaceProcessContext {
   home: string;
   /** Wohin ein Sprachserver Protokolle und Zwischenstände legen darf; nie das Home eines Entwicklers. */
   logDirectory: string;
+  /** Die Wurzel des Hosts auf dieser Maschine, aus der ein Adapter seinen Sprachserver auflöst; ohne Host bleibt sie offen. */
+  hostRoot: string | undefined;
   env: NodeJS.ProcessEnv;
   uid?: number;
   gid?: number;
@@ -78,6 +80,7 @@ export interface WorkspaceContextOptions {
   root: string;
   home: SandboxHomeEnvironment;
   logDirectory: string;
+  hostRoot: string | undefined;
   ident?: SessionIdent;
   additionalRoots?: readonly ResolvedWorkspaceRoot[];
   readOnlyRoots?: readonly ResolvedWorkspaceRoot[];
@@ -107,6 +110,7 @@ export const workspaceProcessContext = (options: WorkspaceContextOptions): Works
     root: options.root,
     home: options.home.home,
     logDirectory: options.logDirectory,
+    hostRoot: options.hostRoot,
     env: sandboxEnvironment(options.source ?? process.env, {
       home: options.home,
       ...(options.ident ? { ident: options.ident } : {}),

package/packages/workspace-executor/src/executor.ts

@@ -12,6 +12,8 @@ export const languageServerOpenTool = (adapterId: string): string => `${adapterI
 
 export const languageServerDiagnosticsTool = (adapterId: string): string => `${adapterId}_diagnostics`;
 
+export const languageServerCloseTool = (adapterId: string): string => `${adapterId}_close`;
+
 export const languageServerSnapshotTool = (adapterId: string): string => `${adapterId}_snapshot`;
 
 export interface WorkspaceExecuteOptions {
@@ -62,6 +64,7 @@ export class SandboxWorkspaceExecutor implements WorkspaceExecutor {
     const languageServer = this.#languageServers.find((host) =>
       tool === languageServerOpenTool(host.adapter.id)
       || tool === languageServerDiagnosticsTool(host.adapter.id)
+      || tool === languageServerCloseTool(host.adapter.id)
       || tool === languageServerSnapshotTool(host.adapter.id));
     if (languageServer) return this.#languageServerCall(languageServer, runId, tool, input);
     return this.#toolCall(runId, tool, input, options);
@@ -105,8 +108,12 @@ export class SandboxWorkspaceExecutor implements WorkspaceExecutor {
       const { root } = input as { root: string };
       return host.open(runId, root);
     }
-    const { paths, warnings } = input as { paths?: readonly string[]; warnings?: boolean };
-    return host.diagnostics(runId, paths, warnings ?? false);
+    if (tool === languageServerCloseTool(host.adapter.id)) {
+      const { root } = (input ?? {}) as { root?: string };
+      return host.close(runId, root);
+    }
+    const { paths, warnings, root } = input as { paths?: readonly string[]; warnings?: boolean; root?: string };
+    return host.diagnostics(runId, paths, warnings ?? false, root);
   }
 
   #sandbox(runId: string): Promise<SandboxTools> {

package/packages/workspace-executor/src/index.ts

@@ -9,6 +9,7 @@ export {
   SandboxWorkspaceExecutor,
   WORKSPACE_EXECUTOR_VERSION,
   WORKSPACE_STOP_OPERATION,
+  languageServerCloseTool,
   languageServerDiagnosticsTool,
   languageServerOpenTool,
   languageServerSnapshotTool,
@@ -38,6 +39,7 @@ export {
 export {
   type LanguageServerDiagnostic,
   type LanguageServerFileDiagnostics,
+  type LanguageServerInstanceSnapshot,
   type LanguageServerSeverity,
   type LanguageServerSnapshot,
   type LanguageServerState,

package/packages/workspace-executor/src/language-server/adapters/fsharp.ts

@@ -30,6 +30,7 @@ export const fsharpAdapter: LanguageServerAdapter = {
   languages,
   rootDescription: "the .sln file (or a single .fsproj)",
   resolveRoot: (workspaceRoot, root) => resolveRootFile(workspaceRoot, root, [".sln", ".fsproj"]),
+  rootDirectory: (root) => path.dirname(root),
   launch: async (context, root) => ({
     label: "FSAC",
     ...dotnetCommand(serverPath(), ["--state-directory", path.join(context.logDirectory, "fsautocomplete")]),

package/packages/workspace-executor/src/language-server/adapters/roslyn.ts

@@ -27,6 +27,7 @@ export const roslynAdapter: LanguageServerAdapter = {
   languages,
   rootDescription: "the .sln file (or a single .csproj)",
   resolveRoot: (workspaceRoot, root) => resolveRootFile(workspaceRoot, root, [".sln", ".slnx", ".csproj"]),
+  rootDirectory: (root) => path.dirname(root),
   launch: async (context, root) => ({
     label: "Roslyn",
     ...dotnetCommand(serverPath(), [

package/packages/workspace-executor/src/language-server/adapters/typescript.ts

@@ -5,10 +5,6 @@ import { pathToFileURL } from "node:url";
 import type { LanguageServerAdapter } from "../host.js";
 import { resolveRootDirectory } from "../roots.js";
 
-const require = createRequire(import.meta.url);
-const serverScript = require.resolve("typescript-language-server/lib/cli.mjs");
-const bundledTypeScriptLib = path.dirname(require.resolve("typescript"));
-
 const languages = {
   ".ts": "typescript",
   ".tsx": "typescriptreact",
@@ -18,6 +14,37 @@ const languages = {
   ".jsx": "javascriptreact",
 } as const;
 
+/** Der Sprachserver liegt in den node_modules des Hosts; ohne Host gibt es ihn auf dieser Maschine nicht. */
+const hostRequire = (hostRoot: string | undefined): NodeRequire => {
+  if (!hostRoot) {
+    throw new Error("Für TypeScript ist auf diesem Rechner kein Host bekannt, aus dem sich typescript-language-server "
+      + "auflösen ließe. Ein Arbeitsplatz bekommt ihn mit der ersten Verbindung zu einem verteilenden Server oder über "
+      + "die Einstellung ragents.hostPath");
+  }
+  return createRequire(path.join(hostRoot, "package.json"));
+};
+
+const missing = (hostRoot: string | undefined, name: string, cause: unknown): Error =>
+  new Error(`${name} liegt nicht im Host ${hostRoot}: ${cause instanceof Error ? cause.message : String(cause)}`);
+
+const serverScript = (hostRoot: string | undefined): string => {
+  const require = hostRequire(hostRoot);
+  try {
+    return require.resolve("typescript-language-server/lib/cli.mjs");
+  } catch (cause) {
+    throw missing(hostRoot, "typescript-language-server", cause);
+  }
+};
+
+const bundledTypeScriptLib = (hostRoot: string | undefined): string => {
+  const require = hostRequire(hostRoot);
+  try {
+    return path.dirname(require.resolve("typescript"));
+  } catch (cause) {
+    throw missing(hostRoot, "typescript", cause);
+  }
+};
+
 const hasWorkspaceTypeScript = (root: string): Promise<boolean> =>
   stat(path.join(root, "node_modules", "typescript", "lib", "tsserver.js")).then((info) => info.isFile(), () => false);
 
@@ -27,17 +54,18 @@ export const typescriptAdapter: LanguageServerAdapter = {
   languages,
   rootDescription: "the directory whose tsconfig.json projects should be served (e.g. src)",
   resolveRoot: resolveRootDirectory,
+  rootDirectory: (root) => root,
   launch: async (context, root) => ({
     label: "TypeScript",
     command: process.execPath,
-    args: [serverScript, "--stdio"],
+    args: [serverScript(context.hostRoot), "--stdio"],
     cwd: root,
     // Im Extension-Host ist process.execPath Electron; ohne diese Variable startet es die Anwendung statt des Skripts.
     env: { ...context.env, ELECTRON_RUN_AS_NODE: "1" },
     uid: context.uid,
     gid: context.gid,
     rootUri: pathToFileURL(root).href,
-    initializationOptions: await hasWorkspaceTypeScript(root) ? {} : { tsserver: { path: bundledTypeScriptLib } },
+    initializationOptions: await hasWorkspaceTypeScript(root) ? {} : { tsserver: { path: bundledTypeScriptLib(context.hostRoot) } },
     languages,
     publishesOnlyChangedDiagnostics: true,
   }),

package/packages/workspace-executor/src/language-server/contract.ts

@@ -1,4 +1,4 @@
-export type LanguageServerState = "closed" | "opening" | "ready" | "failed" | "suspended";
+export type LanguageServerState = "opening" | "ready" | "failed" | "suspended";
 
 export type LanguageServerSeverity = "error" | "warning" | "information" | "hint";
 
@@ -15,9 +15,13 @@ export interface LanguageServerFileDiagnostics {
   diagnostics: readonly LanguageServerDiagnostic[];
 }
 
-export interface LanguageServerSnapshot {
+export interface LanguageServerInstanceSnapshot {
   state: LanguageServerState;
-  root: string | null;
+  root: string;
   summary: string | null;
   files: readonly LanguageServerFileDiagnostics[];
 }
+
+export interface LanguageServerSnapshot {
+  instances: readonly LanguageServerInstanceSnapshot[];
+}