@wrongstack/webui 0.7.2 → 0.7.3

package/dist/server/index.js

@@ -6,18 +6,18 @@ import {
   Agent,
   AutoCompactionMiddleware,
   Context,
-  DefaultMemoryStore,
-  DefaultModeStore,
+  DefaultMemoryStore as DefaultMemoryStore2,
+  DefaultModeStore as DefaultModeStore2,
   DefaultModelsRegistry,
-  DefaultSessionStore,
-  DefaultSkillLoader,
-  DefaultSystemPromptBuilder,
-  DefaultTokenCounter,
+  DefaultSessionStore as DefaultSessionStore2,
+  DefaultSkillLoader as DefaultSkillLoader2,
+  DefaultSystemPromptBuilder as DefaultSystemPromptBuilder2,
+  DefaultTokenCounter as DefaultTokenCounter2,
   estimateRequestTokens,
   EventBus,
-  HybridCompactor,
+  HybridCompactor as HybridCompactor2,
   ProviderRegistry,
-  TOKENS,
+  TOKENS as TOKENS2,
   ToolRegistry,
   atomicWrite,
   createDefaultPipelines,
@@ -33,7 +33,63 @@ import { buildProviderFactoriesFromRegistry, makeProviderFromConfig } from "@wro
 import { builtinToolsPack, forgetTool, rememberTool } from "@wrongstack/tools";
 import { WebSocket, WebSocketServer } from "ws";
 import { randomBytes } from "crypto";
-import { createDefaultContainer } from "@wrongstack/runtime";
+
+// ../runtime/src/container.ts
+import {
+  Container,
+  DefaultConfigStore,
+  DefaultErrorHandler,
+  DefaultMemoryStore,
+  DefaultModeStore,
+  DefaultPermissionPolicy,
+  DefaultRetryPolicy,
+  DefaultSecretScrubber,
+  DefaultSessionStore,
+  DefaultSkillLoader,
+  DefaultSystemPromptBuilder,
+  DefaultTokenCounter,
+  HybridCompactor,
+  TOKENS
+} from "@wrongstack/core";
+function createDefaultContainer(opts) {
+  const { config, wpaths, logger, modelsRegistry } = opts;
+  const container = new Container();
+  const configStore = new DefaultConfigStore(config);
+  container.bind(TOKENS.ConfigStore, () => configStore);
+  container.bind(TOKENS.Logger, () => logger);
+  container.bind(TOKENS.SecretScrubber, () => new DefaultSecretScrubber());
+  container.bind(TOKENS.RetryPolicy, () => new DefaultRetryPolicy());
+  container.bind(TOKENS.ErrorHandler, () => new DefaultErrorHandler());
+  container.bind(TOKENS.ModelsRegistry, () => modelsRegistry);
+  container.bind(TOKENS.TokenCounter, () => new DefaultTokenCounter({ registry: modelsRegistry, providerId: config.provider }));
+  const modeStore = new DefaultModeStore({ directory: wpaths.configDir });
+  container.bind(TOKENS.ModeStore, () => modeStore);
+  container.bind(TOKENS.SessionStore, () => new DefaultSessionStore({ dir: wpaths.projectSessions }));
+  const memoryStore = new DefaultMemoryStore({ paths: wpaths });
+  container.bind(TOKENS.MemoryStore, () => memoryStore);
+  const skillLoader = new DefaultSkillLoader({ paths: wpaths, bundledDir: opts.bundledSkillsDir });
+  container.bind(TOKENS.SkillLoader, () => skillLoader);
+  if (opts.systemPrompt) {
+    container.bind(TOKENS.SystemPromptBuilder, () => new DefaultSystemPromptBuilder(opts.systemPrompt));
+  }
+  container.bind(
+    TOKENS.PermissionPolicy,
+    () => new DefaultPermissionPolicy({
+      trustFile: wpaths.projectTrust,
+      yolo: opts.permission?.yolo ?? false,
+      forceAllYolo: opts.permission?.forceAllYolo ?? false,
+      promptDelegate: opts.permission?.promptDelegate
+    })
+  );
+  container.bind(
+    TOKENS.Compactor,
+    () => new HybridCompactor({
+      preserveK: opts.compactor?.preserveK ?? 20,
+      eliseThreshold: opts.compactor?.eliseThreshold ?? 0.7
+    })
+  );
+  return container;
+}
 
 // src/server/boot.ts
 import * as fs from "fs/promises";
@@ -99,7 +155,7 @@ async function startWebUI(opts = {}) {
     ttlSeconds: 24 * 3600
   });
   const container = createDefaultContainer({ config, wpaths, logger, modelsRegistry });
-  const configStore = container.resolve(TOKENS.ConfigStore);
+  const configStore = container.resolve(TOKENS2.ConfigStore);
   const providerRegistry = new ProviderRegistry();
   try {
     const factories = await buildProviderFactoriesFromRegistry({
@@ -113,7 +169,7 @@ async function startWebUI(opts = {}) {
   }
   const toolRegistry = new ToolRegistry();
   toolRegistry.registerAllOrThrow([...builtinToolsPack.tools ?? []], builtinToolsPack.name);
-  const memoryStore = new DefaultMemoryStore({ paths: wpaths });
+  const memoryStore = new DefaultMemoryStore2({ paths: wpaths });
   if (config.features.memory) {
     toolRegistry.register(rememberTool(memoryStore));
     toolRegistry.register(forgetTool(memoryStore));
@@ -121,7 +177,7 @@ async function startWebUI(opts = {}) {
   console.log("[WebUI] Tool registry loaded:", toolRegistry.list().length, "tools");
   const events = new EventBus();
   events.setLogger(logger);
-  const sessionStore = new DefaultSessionStore({ dir: wpaths.projectSessions });
+  const sessionStore = new DefaultSessionStore2({ dir: wpaths.projectSessions });
   let session = await sessionStore.create({
     id: "",
     title: "",
@@ -130,11 +186,11 @@ async function startWebUI(opts = {}) {
   });
   let sessionStartedAt = Date.now();
   console.log("[WebUI] Session created:", session.id);
-  const tokenCounter = new DefaultTokenCounter({
+  const tokenCounter = new DefaultTokenCounter2({
     registry: modelsRegistry,
     providerId: config.provider
   });
-  const modeStore = new DefaultModeStore({ directory: wpaths.configDir });
+  const modeStore = new DefaultModeStore2({ directory: wpaths.configDir });
   const activeMode = await modeStore.getActiveMode();
   let modeId = activeMode?.id ?? "default";
   const modePrompt = activeMode?.prompt ?? "";
@@ -145,8 +201,8 @@ async function startWebUI(opts = {}) {
     supportsVision: resolvedModel.capabilities.vision,
     supportsReasoning: resolvedModel.capabilities.reasoning
   } : void 0;
-  const skillLoader = config.features.skills ? new DefaultSkillLoader({ paths: wpaths }) : void 0;
-  const systemPromptBuilder = new DefaultSystemPromptBuilder({
+  const skillLoader = config.features.skills ? new DefaultSkillLoader2({ paths: wpaths }) : void 0;
+  const systemPromptBuilder = new DefaultSystemPromptBuilder2({
     memoryStore,
     skillLoader,
     modeStore,
@@ -216,7 +272,7 @@ async function startWebUI(opts = {}) {
   context.meta["contextWindowMode"] = initialContextPolicy.id;
   context.meta["contextWindowPolicy"] = initialContextPolicy;
   const pipelines = createDefaultPipelines();
-  const compactor = new HybridCompactor({
+  const compactor = new HybridCompactor2({
     preserveK: config.context?.preserveK ?? 20,
     eliseThreshold: config.context?.eliseThreshold ?? 0.7
   });
@@ -253,10 +309,10 @@ async function startWebUI(opts = {}) {
     }
     autoCompactor.setMaxContext(newMaxContext);
   }
-  const secretScrubber = container.resolve(TOKENS.SecretScrubber);
-  const renderer = container.has(TOKENS.Renderer) ? container.resolve(TOKENS.Renderer) : void 0;
+  const secretScrubber = container.resolve(TOKENS2.SecretScrubber);
+  const renderer = container.has(TOKENS2.Renderer) ? container.resolve(TOKENS2.Renderer) : void 0;
   const toolExecutor = new ToolExecutor(toolRegistry, {
-    permissionPolicy: container.resolve(TOKENS.PermissionPolicy),
+    permissionPolicy: container.resolve(TOKENS2.PermissionPolicy),
     secretScrubber,
     renderer,
     events,
@@ -1235,7 +1291,7 @@ async function startWebUI(opts = {}) {
           }
           modeId = id;
           const modePrompt2 = id === "default" ? "" : (await modeStore.getMode(id))?.prompt ?? "";
-          const freshBuilder = new DefaultSystemPromptBuilder({
+          const freshBuilder = new DefaultSystemPromptBuilder2({
             memoryStore,
             skillLoader,
             modeStore,