@schlenkr/ragents 0.1.7 → 0.1.9

package/ragents.config.showcase.ts

@@ -7,7 +7,10 @@ export const config = {
     PRODUCT_PROFILE: "showcase",
     COMPACTION_MODEL: "google/gemma-4-26b-a4b-it",
     // Aliasse für andere RAgents-Server, die ihre Modelle über ragents.model-relay von hier beziehen.
-    MODEL_ALIASES: ["showcase-standard=openrouter/z-ai/glm-5.3-flash", "showcase-coordinator=openrouter/deepseek/deepseek-v4-flash-0731"],
+    MODEL_ALIASES: [
+      { alias: "showcase-standard", model: "openrouter/z-ai/glm-5.3-flash", compaction: { threshold: 160_000, keepRecentTokens: 24_000, summaryTokens: 12_000 } },
+      { alias: "showcase-coordinator", model: "openrouter/deepseek/deepseek-v4-flash-0731", compaction: { threshold: 300_000, keepRecentTokens: 40_000, summaryTokens: 16_000 } },
+    ],
     PRODUCT_ID: "ragents-showcase",
     PRODUCT_TITLE: "RAgents Showcase",
     PLUGINS: [

package/scripts/agent/journal.ts

@@ -114,7 +114,9 @@ export const journalLines = (events: readonly JournalEvent[], mode: JournalMode,
       const content = payload.subscriptionId ? `[event ${String((payload.sourceEventIds as string[] | undefined)?.[0] ?? "")}]` : text(payload.content);
       lines.push(`[${event.sequence}] INPUT -> ${String(payload.actorId ?? "").slice(0, 14)}: ${content.slice(0, 300)}`);
     } else if (type === "context.compacted" && mode !== "tools") {
-      lines.push(`[${event.sequence}] CONTEXT COMPACTED ${actor}: about ${String(payload.tokensBefore)} tokens summarized`);
+      const threshold = payload.threshold as { tokens?: unknown; source?: unknown } | undefined;
+      const applied = threshold ? ` (threshold ${String(threshold.tokens)} from ${String(threshold.source)})` : "";
+      lines.push(`[${event.sequence}] CONTEXT COMPACTED ${actor}: about ${String(payload.tokensBefore)} tokens summarized${applied}`);
     } else if (type === "turn.input-steered" && mode !== "tools") {
       lines.push(`[${event.sequence}] STEERING -> ${actor}: ${String(payload.inputId ?? "")} in ${String(payload.turnId ?? "")}`);
     } else if (type.startsWith("tool.call.") && mode !== "chat") {

package/scripts/package/build-package.ts

@@ -84,6 +84,8 @@ const PACKAGE_NAME_PATTERN = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._
 const SCAN_SKIPPED = new Set(["node_modules", "dist"]);
 const SCANNED_EXTENSIONS = new Set([".ts", ".tsx", ".mts", ".mjs", ".js", ".css"]);
 const IMPORT_PATTERN = /\b(?:from|import|require(?:\.resolve)?)\s*\(?\s*["']([^"'\n]+)["']/g;
+/** Ein Beitrag zum Executor löst Pakete zur Laufzeit aus dem Host auf; auch sie muss das Paket tragen. */
+const HOST_PACKAGE_PATTERN = /\bhostPackageFile\([^,()]*,\s*["']([^"'\n]+)["']/g;
 
 const files = async (folder: string, skippedFolders: ReadonlySet<string> = SKIPPED_FOLDERS): Promise<readonly string[]> => {
   const found: string[] = [];
@@ -149,7 +151,7 @@ export const requiredPackages = (packageDirectory: string): ReadonlyMap<string,
   for (const folder of scanRoots(packageDirectory)) {
     for (const file of scannedFiles(folder)) {
       const content = readFileSync(file, "utf8");
-      for (const match of content.matchAll(IMPORT_PATTERN)) {
+      for (const match of [...content.matchAll(IMPORT_PATTERN), ...content.matchAll(HOST_PACKAGE_PATTERN)]) {
         const name = packageNameOf(match[1]!);
         if (name && !sources.has(name)) sources.set(name, path.relative(packageDirectory, file));
       }

package/scripts/package/publish-package.ts

@@ -1,7 +1,7 @@
 import { spawnSync } from "node:child_process";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { compareVersions, nextVersion, readVersion, versionLine, writeHostPackageVersion, writeVersion } from "../publish-version.ts";
+import { compareVersions, readVersion, releaseVersion, versionLine, writeHostPackageVersion, writeVersion } from "../publish-version.ts";
 import { buildPackage, PACKAGE_FOLDER, PACKAGE_NAME } from "./build-package.ts";
 
 const repositoryRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
@@ -121,11 +121,12 @@ const main = async (): Promise<void> => {
   if (!token) throw new Error(`npm_key fehlt: der npm-Token mit Schreibrecht auf ${PACKAGE_NAME}.\n${usage}`);
   const manifestFile = path.join(repositoryRoot, "package.json");
   const published = publishedVersions(PACKAGE_NAME, runNpm);
-  const next = nextVersion(readVersion(manifestFile), published);
-  console.log(versionLine(next));
   const extensionManifestFile = path.join(repositoryRoot, "apps", "vscode", "package.json");
+  const next = releaseVersion([readVersion(manifestFile), readVersion(extensionManifestFile)], published);
+  console.log(versionLine(next));
   if (!dryRun) {
     writeVersion(manifestFile, next.version);
+    writeVersion(extensionManifestFile, next.version);
     writeHostPackageVersion(extensionManifestFile, next.version);
   }
   const built = await buildPackage(path.join(repositoryRoot, "dist", PACKAGE_FOLDER));

package/scripts/provision/run-provision.ts

@@ -19,8 +19,8 @@ const repositoryRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url))
 
 const usage = (): string => `Verwendung: pnpm provision [<profil>|<pfad zu ragents.config.<profil>.ts>|--workspace]
 Provisioniert die Werkzeuge der Plugins eines Profils nach <Datenordner>/tools/<plugin-id>/ und
-berichtet je Plugin bereit, installiert oder fehlt. --workspace provisioniert stattdessen
-Sprachserver und Browser eines Arbeitsplatzes auf dieser Maschine. Ein relativer Pfad gilt ab dem
+berichtet je Plugin bereit, installiert oder fehlt. --workspace provisioniert stattdessen die
+eingebauten Plugins, die zum Executor eines Arbeitsplatzes beitragen. Ein relativer Pfad gilt ab dem
 aufrufenden Ordner; ohne Argument gilt das Profil aus der Umgebung (PRODUCT_PROFILE_FILE oder
 PRODUCT_PROFILE).`;
 

package/scripts/workspace-client/run-workspace-client.ts

@@ -13,11 +13,13 @@ const usage = (): string => `Verwendung: [RAGENTS_TOKEN=<token>] pnpm workspace-
 Meldet die Ordner als Arbeitsplatz beim Server an und führt dessen Aufträge mit dem Executor
 dieses Rechners aus - dasselbe, was die VS-Code-Erweiterung tut, nur ohne VS Code. Ohne Ordner
 gilt das aktuelle Verzeichnis. Jeder Werkzeugaufruf erscheint als eine Zeile auf stdout.
-Sprachserver und Chromium holt der Start auf diesen Rechner (dasselbe wie pnpm provision
---workspace); ROSLYN_LANGUAGE_SERVER, FSHARP_LANGUAGE_SERVER und BROWSER_EXECUTABLE_PATH
-übersteuern das, TypeScript und playwright-core kommen aus dem Host-Ordner. Unter Windows nennt
+Was die Plugins des Servers zum Executor beitragen, etwa Sprachserver, lädt der Arbeitsplatz bei
+der Anmeldung aus den Bundles dieses Hosts; ihre Werkzeuge holt der Start auf diesen Rechner
+(dasselbe wie pnpm provision --workspace). Unter Windows nennt
 RAGENTS_BASH die bash.exe, die RAgents mitbringt (aus der Windows-Fassung der VS-Code-Erweiterung);
-ohne sie scheitert das Werkzeug bash. Das Skript läuft, bis es mit Strg-C beendet wird.`;
+ohne sie scheitert das Werkzeug bash. RAGENTS_RG nennt ein rg, dessen Ordner die Bash vorn im PATH
+hat, etwa das aus der Erweiterung; ohne Angabe gilt eines im PATH. Das Skript läuft, bis es mit
+Strg-C beendet wird.`;
 
 export interface WorkspaceClientArguments {
   readonly serverUrl: string;
@@ -79,6 +81,7 @@ const main = async (): Promise<void> => {
   const client = new WorkspaceClient(transport, identity, {
     hostRoot,
     bash: process.env.RAGENTS_BASH || undefined,
+    rg: process.env.RAGENTS_RG || undefined,
     onExecuted: ({ runId, operation, durationMs, error }) =>
       console.log(`== ${runId.slice(0, 8)} ${operation} ${durationMs} ms ${error ?? "ok"}`),
   });

package/bundles/ragents.ask/web/chunks/chunk-HGFDGTNC.js

@@ -1,2 +0,0 @@
-var r="ragents.ask",i=t=>Array.isArray(t)&&t.every(n=>typeof n=="string")?[...t]:void 0,o=t=>{if(typeof t!="object"||t===null)return;let n=t,e=i(n.options);if(!(typeof n.question!="string"||!e))return{question:n.question,options:e,multi:n.multi===!0,...typeof n.recipient=="string"?{recipient:n.recipient}:{}}};export{r as a,o as b};
-//# sourceMappingURL=/plugins/ragents.ask/web/chunks/chunk-HGFDGTNC.js.map

package/bundles/ragents.ask/web/chunks/chunk-HGFDGTNC.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../plugins/ragents.ask/ask-payload.ts"],
-  "sourcesContent": ["export const ASK_PLUGIN_ID = \"ragents.ask\";\n\nexport interface AskPayload {\n  question: string;\n  options: string[];\n  multi: boolean;\n  /** Der Actor, f\u00FCr den die Frage steht, wenn der Eigent\u00FCmer des Runs sie au\u00DFerhalb eines Turns stellt. */\n  recipient?: string;\n}\n\nconst stringArrayOf = (value: unknown): string[] | undefined =>\n  Array.isArray(value) && value.every((entry) => typeof entry === \"string\") ? [...value] : undefined;\n\nexport const askPayloadOf = (payload: unknown): AskPayload | undefined => {\n  if (typeof payload !== \"object\" || payload === null) return undefined;\n  const candidate = payload as Partial<AskPayload>;\n  const options = stringArrayOf(candidate.options);\n  if (typeof candidate.question !== \"string\" || !options) return undefined;\n  return {\n    question: candidate.question,\n    options,\n    multi: candidate.multi === true,\n    ...(typeof candidate.recipient === \"string\" ? { recipient: candidate.recipient } : {}),\n  };\n};\n"],
-  "mappings": "AAAO,IAAMA,EAAgB,cAUvBC,EAAiBC,GACrB,MAAM,QAAQA,CAAK,GAAKA,EAAM,MAAOC,GAAU,OAAOA,GAAU,QAAQ,EAAI,CAAC,GAAGD,CAAK,EAAI,OAE9EE,EAAgBC,GAA6C,CACxE,GAAI,OAAOA,GAAY,UAAYA,IAAY,KAAM,OACrD,IAAMC,EAAYD,EACZE,EAAUN,EAAcK,EAAU,OAAO,EAC/C,GAAI,SAAOA,EAAU,UAAa,UAAY,CAACC,GAC/C,MAAO,CACL,SAAUD,EAAU,SACpB,QAAAC,EACA,MAAOD,EAAU,QAAU,GAC3B,GAAI,OAAOA,EAAU,WAAc,SAAW,CAAE,UAAWA,EAAU,SAAU,EAAI,CAAC,CACtF,CACF",
-  "names": ["ASK_PLUGIN_ID", "stringArrayOf", "value", "entry", "askPayloadOf", "payload", "candidate", "options"]
-}

package/bundles/ragents.browser/server/chunks/chunk-2GKLLCBE.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../plugins/ragents.browser/server/contract.ts"],
-  "sourcesContent": ["import { serviceToken } from \"@ragents/engine\";\nimport type { BrowserSnapshot } from \"@ragents/workspace-executor\";\n\nexport type { BrowserSnapshot, BrowserTarget } from \"@ragents/workspace-executor\";\n\nexport interface BrowserEvidence {\n  checkedAt?: string;\n  url?: string;\n  screenshots: { name: string; url: string }[];\n  currentScreenshots: { name: string; url: string }[];\n  errors: string[];\n}\n\n/** Wer eine Operation an der Seite ausl\u00F6st: bei einem Werkzeugaufruf dessen Kennung, dazu der Abbruch. */\nexport interface BrowserCallOptions {\n  signal?: AbortSignal;\n  toolCallId?: string;\n}\n\nexport interface BrowserRuntime {\n  open: (runId: string, url: string, options?: BrowserCallOptions) => Promise<BrowserSnapshot>;\n  evidence: (runId: string) => BrowserEvidence;\n}\n\nexport const browserRuntimeToken = serviceToken<BrowserRuntime>(\"ragents.browser.runtime\");\n"],
-  "mappings": ";;;;AAAA,SAAS,oBAAoB;AAwBtB,IAAM,sBAAsB,aAA6B,yBAAyB;",
-  "names": []
-}

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

@@ -1,60 +0,0 @@
-import { existsSync } from "node:fs";
-import path from "node:path";
-import { pathToFileURL } from "node:url";
-import { hostToolFile } from "../../tools.js";
-import type { LanguageServerAdapter } from "../host.js";
-import { dotnetCommand, resolveRootFile } from "../roots.js";
-import { solutionProjects } from "../solution.js";
-
-export const FSHARP_SERVER_VARIABLE = "FSHARP_LANGUAGE_SERVER";
-export const FSHARP_PLUGIN_ID = "ragents.lsp-fsharp";
-export const FSHARP_SERVER_FILE = "fsautocomplete/fsautocomplete.dll";
-
-const languages = { ".fs": "fsharp", ".fsi": "fsharp", ".fsx": "fsharp" } as const;
-
-const serverPath = (): string => {
-  const configured = process.env[FSHARP_SERVER_VARIABLE];
-  if (configured) return configured;
-  const provisioned = hostToolFile(FSHARP_PLUGIN_ID, FSHARP_SERVER_FILE);
-  if (existsSync(provisioned)) return provisioned;
-  throw new Error("fsautocomplete gibt es auf diesem Rechner nicht: weder "
-    + `${FSHARP_SERVER_VARIABLE} gesetzt noch ${provisioned} vorhanden. Ein Arbeitsplatz holt es mit `
-    + `pnpm provision --workspace, ein Server über pnpm provision <profil>; ${FSHARP_SERVER_VARIABLE} übersteuert beides`);
-};
-
-const contentOf = (params: unknown): string => (params as { content?: string } | undefined)?.content ?? "";
-
-export const fsharpAdapter: LanguageServerAdapter = {
-  id: "fsharp",
-  label: "FSAC",
-  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")]),
-    cwd: path.dirname(root),
-    env: context.env,
-    uid: context.uid,
-    gid: context.gid,
-    rootUri: pathToFileURL(path.dirname(root)).href,
-    initializationOptions: { AutomaticWorkspaceInit: false },
-    languages,
-  }),
-  open: async (session, root, timeoutMs) => {
-    const projects = root.toLowerCase().endsWith(".sln")
-      ? (await solutionProjects(root)).filter((project) => project.toLowerCase().endsWith(".fsproj"))
-      : [root];
-    if (projects.length === 0) throw new Error(`${path.basename(root)} enthält keine F#-Projekte`);
-    const finished = session.waitForNotification(timeoutMs, "Projekte geladen", (method, params) =>
-      method === "fsharp/notifyWorkspace"
-      && contentOf(params).includes("\"workspaceLoad\"")
-      && contentOf(params).includes("\"finished\""));
-    await session.request("fsharp/workspaceLoad", {
-      textDocuments: projects.map((project) => ({ uri: pathToFileURL(project).href })),
-    });
-    await finished;
-    return `${projects.length} F#-Projekt${projects.length === 1 ? "" : "e"} aus ${path.basename(root)} geladen`;
-  },
-};

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

@@ -1,7 +0,0 @@
-import type { LanguageServerAdapter } from "../host.js";
-import { fsharpAdapter } from "./fsharp.js";
-import { roslynAdapter } from "./roslyn.js";
-import { typescriptAdapter } from "./typescript.js";
-
-/** Jeder Executor bietet dieselbe Menge Sprachserver an; fehlt einer auf der Maschine, scheitert erst der Aufruf. */
-export const workspaceLanguageServers: readonly LanguageServerAdapter[] = [roslynAdapter, fsharpAdapter, typescriptAdapter];

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

@@ -1,56 +0,0 @@
-import { existsSync } from "node:fs";
-import path from "node:path";
-import { pathToFileURL } from "node:url";
-import { hostToolFile } from "../../tools.js";
-import type { LanguageServerAdapter } from "../host.js";
-import { dotnetCommand, resolveRootFile } from "../roots.js";
-
-export const ROSLYN_SERVER_VARIABLE = "ROSLYN_LANGUAGE_SERVER";
-export const ROSLYN_PLUGIN_ID = "ragents.lsp-roslyn";
-export const ROSLYN_SERVER_FILE = "roslyn/Microsoft.CodeAnalysis.LanguageServer.dll";
-
-const languages = { ".cs": "csharp" } as const;
-
-const serverPath = (): string => {
-  const configured = process.env[ROSLYN_SERVER_VARIABLE];
-  if (configured) return configured;
-  const provisioned = hostToolFile(ROSLYN_PLUGIN_ID, ROSLYN_SERVER_FILE);
-  if (existsSync(provisioned)) return provisioned;
-  throw new Error("Microsoft.CodeAnalysis.LanguageServer gibt es auf diesem Rechner nicht: weder "
-    + `${ROSLYN_SERVER_VARIABLE} gesetzt noch ${provisioned} vorhanden. Ein Arbeitsplatz holt ihn mit `
-    + `pnpm provision --workspace, ein Server über pnpm provision <profil>; ${ROSLYN_SERVER_VARIABLE} übersteuert beides`);
-};
-
-export const roslynAdapter: LanguageServerAdapter = {
-  id: "roslyn",
-  label: "Roslyn",
-  languages,
-  rootDescription: "the .sln file (or a single .csproj)",
-  solutionExtensions: [".sln", ".slnx"],
-  resolveRoot: (workspaceRoot, root) => resolveRootFile(workspaceRoot, root, [".sln", ".slnx", ".csproj"]),
-  rootDirectory: (root) => path.dirname(root),
-  launch: async (context, root) => ({
-    label: "Roslyn",
-    ...dotnetCommand(serverPath(), [
-      "--stdio",
-      "--logLevel", "Warning",
-      "--extensionLogDirectory", path.join(context.logDirectory, "roslyn-logs"),
-    ]),
-    cwd: path.dirname(root),
-    env: context.env,
-    uid: context.uid,
-    gid: context.gid,
-    rootUri: pathToFileURL(path.dirname(root)).href,
-    languages,
-    newFileSettleMs: 2_000,
-  }),
-  open: async (session, root, timeoutMs) => {
-    const uri = pathToFileURL(root).href;
-    const loaded = session.waitForNotification(timeoutMs, "Projekte geladen",
-      (method) => method === "workspace/projectInitializationComplete");
-    if (root.toLowerCase().endsWith(".csproj")) session.notify("project/open", { projects: [uri] });
-    else session.notify("solution/open", { solution: uri });
-    await loaded;
-    return `${path.basename(root)} geladen`;
-  },
-};

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

@@ -1,74 +0,0 @@
-import { stat } from "node:fs/promises";
-import { createRequire } from "node:module";
-import path from "node:path";
-import { pathToFileURL } from "node:url";
-import type { LanguageServerAdapter } from "../host.js";
-import { resolveRootDirectory } from "../roots.js";
-
-const languages = {
-  ".ts": "typescript",
-  ".tsx": "typescriptreact",
-  ".mts": "typescript",
-  ".cts": "typescript",
-  ".js": "javascript",
-  ".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);
-
-export const typescriptAdapter: LanguageServerAdapter = {
-  id: "typescript",
-  label: "TypeScript",
-  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(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(context.hostRoot) } },
-    languages,
-    publishesOnlyChangedDiagnostics: true,
-  }),
-  open: async (_session, root) =>
-    `TypeScript-Server auf ${path.basename(root)} bereit; Projekte werden je Datei aus der nächsten tsconfig.json geladen`,
-};

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

@@ -1,13 +0,0 @@
-import { readFile } from "node:fs/promises";
-import path from "node:path";
-
-const PROJECT_LINE = /^Project\("\{[^}]+\}"\)\s*=\s*"[^"]*",\s*"([^"]+)"/gm;
-
-export const solutionProjects = async (solutionFile: string): Promise<string[]> => {
-  const text = await readFile(solutionFile, "utf8");
-  const directory = path.dirname(solutionFile);
-  return [...text.matchAll(PROJECT_LINE)]
-    .map((match) => match[1].replaceAll("\\", "/"))
-    .filter((relative) => /\.[a-z]+proj$/i.test(relative))
-    .map((relative) => path.resolve(directory, relative));
-};