@bike4mind/cli 0.2.30-feat-cli-websocket-streaming.19243 → 0.2.30-feat-new-architecture.19278

package/dist/{artifactExtractor-PK2WNCBH.js → artifactExtractor-7U23LA7G.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CurationArtifactType
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 
 // ../../b4m-core/packages/services/dist/src/notebookCurationService/artifactExtractor.js
 var ARTIFACT_TAG_REGEX = /<artifact\s+(.*?)>([\s\S]*?)<\/artifact>/gi;

package/dist/{chunk-XXYKIX5X.js → chunk-6HFPBXKR.js}

@@ -2,7 +2,7 @@
 import {
   BadRequestError,
   secureParameters
-} from "./chunk-7EEPLDUG.js";
+} from "./chunk-WP3WMRSG.js";
 import {
   CompletionApiUsageTransaction,
   GenericCreditDeductTransaction,
@@ -12,7 +12,7 @@ import {
   TextGenerationUsageTransaction,
   TransferCreditTransaction,
   VideoGenerationUsageTransaction
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 
 // ../../b4m-core/packages/services/dist/src/creditService/subtractCredits.js
 import { z } from "zod";

package/dist/{chunk-KBRR7H2K.js → chunk-H6H5JFXR.js}

@@ -6,12 +6,12 @@ import {
   getSettingsByNames,
   obfuscateApiKey,
   secureParameters
-} from "./chunk-7EEPLDUG.js";
+} from "./chunk-WP3WMRSG.js";
 import {
   ApiKeyType,
   MementoTier,
   isSupportedEmbeddingModel
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 
 // ../../b4m-core/packages/services/dist/src/apiKeyService/get.js
 import { z } from "zod";

package/dist/{chunk-55ZDRTGQ.js → chunk-LNNVZDLN.js}

@@ -1181,29 +1181,6 @@ var VoiceSessionSendTranscriptAction = z10.object({
   conversationItemId: z10.string(),
   timestamp: z10.coerce.date().optional()
 });
-var CliCompletionRequestAction = z10.object({
-  action: z10.literal("cli_completion_request"),
-  accessToken: z10.string(),
-  requestId: z10.string().uuid(),
-  model: z10.string(),
-  messages: z10.array(z10.object({
-    role: z10.enum(["user", "assistant", "system"]),
-    content: z10.union([z10.string(), z10.array(z10.unknown())])
-  })),
-  options: z10.object({
-    temperature: z10.number().optional(),
-    maxTokens: z10.number().optional(),
-    stream: z10.boolean().optional(),
-    tools: z10.array(z10.unknown()).optional()
-  }).optional()
-});
-var CliToolRequestAction = z10.object({
-  action: z10.literal("cli_tool_request"),
-  accessToken: z10.string(),
-  requestId: z10.string().uuid(),
-  toolName: z10.string(),
-  input: z10.record(z10.unknown())
-});
 var VoiceSessionEndedAction = z10.object({
   action: z10.literal("voice_session_ended"),
   userId: z10.string(),
@@ -1492,36 +1469,6 @@ var VoiceCreditsExhaustedAction = z10.object({
   creditsUsed: z10.number(),
   clientId: z10.string().optional()
 });
-var CliCompletionChunkAction = z10.object({
-  action: z10.literal("cli_completion_chunk"),
-  requestId: z10.string(),
-  chunk: z10.object({
-    type: z10.enum(["content", "tool_use"]),
-    text: z10.string(),
-    tools: z10.array(z10.unknown()).optional(),
-    usage: z10.object({
-      inputTokens: z10.number().optional(),
-      outputTokens: z10.number().optional()
-    }).optional(),
-    thinking: z10.array(z10.unknown()).optional()
-  })
-});
-var CliCompletionDoneAction = z10.object({
-  action: z10.literal("cli_completion_done"),
-  requestId: z10.string()
-});
-var CliCompletionErrorAction = z10.object({
-  action: z10.literal("cli_completion_error"),
-  requestId: z10.string(),
-  error: z10.string()
-});
-var CliToolResponseAction = z10.object({
-  action: z10.literal("cli_tool_response"),
-  requestId: z10.string(),
-  success: z10.boolean(),
-  content: z10.unknown().optional(),
-  error: z10.string().optional()
-});
 var SessionCreatedAction = shareableDocumentSchema.extend({
   action: z10.literal("session.created"),
   id: z10.string(),
@@ -1556,9 +1503,7 @@ var MessageDataToServer = z10.discriminatedUnion("action", [
   DataUnsubscribeRequestAction,
   HeartbeatAction,
   VoiceSessionSendTranscriptAction,
-  VoiceSessionEndedAction,
-  CliCompletionRequestAction,
-  CliToolRequestAction
+  VoiceSessionEndedAction
 ]);
 var MessageDataToClient = z10.discriminatedUnion("action", [
   DataSubscriptionUpdateAction,
@@ -1584,11 +1529,7 @@ var MessageDataToClient = z10.discriminatedUnion("action", [
   PiHistoryCompleteAction,
   PiHistoryErrorAction,
   SessionCreatedAction,
-  VoiceCreditsExhaustedAction,
-  CliCompletionChunkAction,
-  CliCompletionDoneAction,
-  CliCompletionErrorAction,
-  CliToolResponseAction
+  VoiceCreditsExhaustedAction
 ]);
 
 // ../../b4m-core/packages/common/dist/src/schemas/cliCompletions.js
@@ -2528,6 +2469,8 @@ var SettingKeySchema = z21.enum([
   "EnableEnhancedDateTime",
   "EnableHistoricalFeatures",
   "EnableAstronomyFeatures",
+  // ARCHITECTURE TRANSITION
+  "EnableArchitectureTransition",
   // STREAMING RESILIENCE SETTINGS
   "EnableStreamIdleTimeout",
   "StreamIdleTimeoutSeconds",
@@ -2952,14 +2895,15 @@ var API_SERVICE_GROUPS = {
       { key: "EnableResearchEngine", order: 8 },
       { key: "EnableReactViewer", order: 9 },
       { key: "EnableDeepResearch", order: 10 },
-      { key: "EnableLattice", order: 11 },
-      { key: "EnableKnowledgeBaseSearch", order: 12 },
-      { key: "EnableStreamIdleTimeout", order: 13 },
-      { key: "StreamIdleTimeoutSeconds", order: 14 },
-      { key: "EnableMcpToolFiltering", order: 15 },
-      { key: "McpToolFilteringMaxTools", order: 16 },
-      { key: "EnableParallelToolExecution", order: 17 },
-      { key: "EnableHelpChat", order: 18 }
+      { key: "EnableArchitectureTransition", order: 11 },
+      { key: "EnableLattice", order: 12 },
+      { key: "EnableKnowledgeBaseSearch", order: 13 },
+      { key: "EnableStreamIdleTimeout", order: 14 },
+      { key: "StreamIdleTimeoutSeconds", order: 15 },
+      { key: "EnableMcpToolFiltering", order: 16 },
+      { key: "McpToolFilteringMaxTools", order: 17 },
+      { key: "EnableParallelToolExecution", order: 18 },
+      { key: "EnableHelpChat", order: 19 }
     ]
   },
   NOTEBOOK: {
@@ -4072,6 +4016,16 @@ var settingsMap = {
     group: API_SERVICE_GROUPS.DATETIME_ASTRONOMY.id,
     order: 3
   }),
+  // Architecture Transition
+  EnableArchitectureTransition: makeBooleanSetting({
+    key: "EnableArchitectureTransition",
+    name: "Enable Architecture Transition",
+    defaultValue: false,
+    description: "Enable the transition to the new Simplified Hexagonal Architecture pattern. When enabled, new features will use the core/infra separation pattern.",
+    category: "Experimental",
+    group: API_SERVICE_GROUPS.EXPERIMENTAL.id,
+    order: 11
+  }),
   // Streaming Resilience Settings
   EnableStreamIdleTimeout: makeBooleanSetting({
     key: "EnableStreamIdleTimeout",
@@ -8783,8 +8737,6 @@ export {
   DataUnsubscribeRequestAction,
   HeartbeatAction,
   VoiceSessionSendTranscriptAction,
-  CliCompletionRequestAction,
-  CliToolRequestAction,
   VoiceSessionEndedAction,
   DataSubscriptionUpdateAction,
   LLMStatusUpdateAction,
@@ -8809,10 +8761,6 @@ export {
   ImportHistoryJobProgressUpdateAction,
   ResearchModeStreamAction,
   VoiceCreditsExhaustedAction,
-  CliCompletionChunkAction,
-  CliCompletionDoneAction,
-  CliCompletionErrorAction,
-  CliToolResponseAction,
   SessionCreatedAction,
   MessageDataToServer,
   MessageDataToClient,

package/dist/{chunk-7EEPLDUG.js → chunk-WP3WMRSG.js}

@@ -16,7 +16,7 @@ import {
   dayjsConfig_default,
   extractSnippetMeta,
   settingsMap
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 import {
   Logger
 } from "./chunk-OCYRD7D6.js";

package/dist/{chunk-K5IURWQT.js → chunk-ZX2SK6YL.js}

@@ -7,11 +7,11 @@ import {
   getSettingsMap,
   getSettingsValue,
   secureParameters
-} from "./chunk-7EEPLDUG.js";
+} from "./chunk-WP3WMRSG.js";
 import {
   KnowledgeType,
   SupportedFabFileMimeTypes
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 
 // ../../b4m-core/packages/services/dist/src/fabFileService/create.js
 import { z } from "zod";

package/dist/{create-IUID2337.js → create-PTKEJ7VK.js}

@@ -2,9 +2,9 @@
 import {
   createFabFile,
   createFabFileSchema
-} from "./chunk-K5IURWQT.js";
-import "./chunk-7EEPLDUG.js";
-import "./chunk-55ZDRTGQ.js";
+} from "./chunk-ZX2SK6YL.js";
+import "./chunk-WP3WMRSG.js";
+import "./chunk-LNNVZDLN.js";
 import "./chunk-OCYRD7D6.js";
 export {
   createFabFile,

package/dist/index.js

@@ -5,7 +5,7 @@ import {
   getEffectiveApiKey,
   getOpenWeatherKey,
   getSerperKey
-} from "./chunk-KBRR7H2K.js";
+} from "./chunk-H6H5JFXR.js";
 import "./chunk-RUI6HNLO.js";
 import {
   ConfigStore,
@@ -15,8 +15,8 @@ import {
   selectActiveBackgroundAgents,
   useCliStore
 } from "./chunk-BYXFQJYT.js";
-import "./chunk-XXYKIX5X.js";
-import "./chunk-K5IURWQT.js";
+import "./chunk-6HFPBXKR.js";
+import "./chunk-ZX2SK6YL.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -28,7 +28,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-7EEPLDUG.js";
+} from "./chunk-WP3WMRSG.js";
 import {
   AiEvents,
   ApiKeyEvents,
@@ -84,7 +84,7 @@ import {
   XAI_IMAGE_MODELS,
   b4mLLMTools,
   getMcpProviderMetadata
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 import {
   Logger
 } from "./chunk-OCYRD7D6.js";
@@ -94,7 +94,7 @@ import React21, { useState as useState10, useEffect as useEffect7, useCallback a
 import { render, Box as Box20, Text as Text20, useApp, useInput as useInput9 } from "ink";
 import { execSync } from "child_process";
 import { randomBytes as randomBytes5 } from "crypto";
-import { v4 as uuidv413 } from "uuid";
+import { v4 as uuidv411 } from "uuid";
 
 // src/components/App.tsx
 import React15, { useState as useState6, useEffect as useEffect5 } from "react";
@@ -4032,7 +4032,8 @@ var updateUserSchema = z7.object({
   })).nullable().optional(),
   securityQuestions: z7.array(z7.object({ question: z7.string(), answer: z7.string() })).nullable().optional(),
   photoUrl: z7.string().nullable().optional(),
-  showCreditsUsed: z7.boolean().optional()
+  showCreditsUsed: z7.boolean().optional(),
+  architectureTransitions: z7.record(z7.string(), z7.boolean()).optional()
 });
 
 // ../../b4m-core/packages/services/dist/src/userService/adminUpdate.js
@@ -12537,10 +12538,6 @@ var ServerToolExecutor = class {
 };
 
 // src/llm/ToolRouter.ts
-var wsToolExecutor = null;
-function setWebSocketToolExecutor(executor) {
-  wsToolExecutor = executor;
-}
 var SERVER_TOOLS = ["weather_info", "web_search", "web_fetch"];
 var LOCAL_TOOLS = [
   "file_read",
@@ -12563,15 +12560,7 @@ function isLocalTool(toolName) {
 }
 async function executeTool(toolName, input, apiClient, localToolFn) {
   if (isServerTool(toolName)) {
-    if (wsToolExecutor) {
-      logger.debug(`[ToolRouter] Routing ${toolName} to server via WebSocket`);
-      const result = await wsToolExecutor.execute(toolName, input);
-      if (!result.success) {
-        return `Error executing ${toolName}: ${result.error || "Tool execution failed"}`;
-      }
-      return typeof result.content === "string" ? result.content : JSON.stringify(result.content ?? "");
-    }
-    logger.debug(`[ToolRouter] Routing ${toolName} to server via HTTP`);
+    logger.debug(`[ToolRouter] Routing ${toolName} to server`);
     const executor = new ServerToolExecutor(apiClient);
     return await executor.executeTool(toolName, input);
   } else if (isLocalTool(toolName)) {
@@ -14533,173 +14522,6 @@ var ServerLlmBackend = class {
   }
 };
 
-// src/llm/WebSocketLlmBackend.ts
-import { v4 as uuidv411 } from "uuid";
-function stripThinkingBlocks2(text) {
-  return text.replace(/<think>[\s\S]*?<\/think>/g, "").trim();
-}
-var WebSocketLlmBackend = class {
-  constructor(options) {
-    this.wsManager = options.wsManager;
-    this.apiClient = options.apiClient;
-    this.currentModel = options.model;
-    this.tokenGetter = options.tokenGetter;
-    this.wsCompletionUrl = options.wsCompletionUrl;
-  }
-  /**
-   * Send completion request via HTTP POST, receive streaming response via WebSocket.
-   * Collects all streamed chunks, then calls callback once at completion
-   * with the full accumulated content.
-   */
-  async complete(model, messages, options, callback) {
-    logger.debug(`[WebSocketLlmBackend] Starting complete() with model: ${model}`);
-    if (options.abortSignal?.aborted) {
-      logger.debug("[WebSocketLlmBackend] Request aborted before start");
-      return;
-    }
-    if (!this.wsManager.isConnected) {
-      throw new Error("WebSocket is not connected");
-    }
-    const requestId = uuidv411();
-    return new Promise((resolve3, reject) => {
-      const isVerbose = process.env.B4M_VERBOSE === "1";
-      const isUltraVerbose = process.env.B4M_DEBUG_STREAM === "1";
-      const streamLogger = new StreamLogger(logger, "WebSocketLlmBackend", isVerbose, isUltraVerbose);
-      streamLogger.streamStart();
-      let eventCount = 0;
-      let accumulatedText = "";
-      let lastUsageInfo = {};
-      let toolsUsed = [];
-      let thinkingBlocks = [];
-      let settled = false;
-      const settle = (action) => {
-        if (settled) return;
-        settled = true;
-        this.wsManager.offRequest(requestId);
-        this.wsManager.offDisconnect(onDisconnect);
-        action();
-      };
-      const settleResolve = () => settle(() => resolve3());
-      const settleReject = (err) => settle(() => reject(err));
-      const onDisconnect = () => {
-        logger.debug("[WebSocketLlmBackend] Connection dropped during completion");
-        settleReject(new Error("WebSocket connection lost during completion"));
-      };
-      this.wsManager.onDisconnect(onDisconnect);
-      if (options.abortSignal) {
-        if (options.abortSignal.aborted) {
-          settleResolve();
-          return;
-        }
-        options.abortSignal.addEventListener(
-          "abort",
-          () => {
-            logger.debug("[WebSocketLlmBackend] Abort signal received");
-            settleResolve();
-          },
-          { once: true }
-        );
-      }
-      const updateUsage = (usage) => {
-        if (usage) {
-          lastUsageInfo = { inputTokens: usage.inputTokens, outputTokens: usage.outputTokens };
-        }
-      };
-      this.wsManager.onRequest(requestId, (message) => {
-        if (options.abortSignal?.aborted) return;
-        const action = message.action;
-        if (action === "cli_completion_chunk") {
-          eventCount++;
-          const chunk = message.chunk;
-          streamLogger.onEvent(eventCount, JSON.stringify(chunk));
-          const textChunk = chunk.text || "";
-          if (textChunk) accumulatedText += textChunk;
-          updateUsage(chunk.usage);
-          if (chunk.type === "content") {
-            streamLogger.onContent(eventCount, textChunk, accumulatedText);
-          } else if (chunk.type === "tool_use") {
-            streamLogger.onCriticalEvent(eventCount, "TOOL_USE", `tools: ${chunk.tools?.length}`);
-            if (chunk.tools && chunk.tools.length > 0) toolsUsed = chunk.tools;
-            if (chunk.thinking && chunk.thinking.length > 0) thinkingBlocks = chunk.thinking;
-          }
-        } else if (action === "cli_completion_done") {
-          streamLogger.streamComplete(accumulatedText);
-          const cleanedText = stripThinkingBlocks2(accumulatedText);
-          if (!cleanedText && toolsUsed.length === 0) {
-            settleResolve();
-            return;
-          }
-          const info = {
-            ...lastUsageInfo,
-            ...toolsUsed.length > 0 && { toolsUsed },
-            ...thinkingBlocks.length > 0 && { thinking: thinkingBlocks }
-          };
-          callback([cleanedText], info).then(() => settleResolve()).catch((err) => settleReject(err));
-        } else if (action === "cli_completion_error") {
-          const errorMsg = message.error || "Server error";
-          streamLogger.onCriticalEvent(eventCount, "ERROR", errorMsg);
-          settleReject(new Error(errorMsg));
-        }
-      });
-      const axiosInstance = this.apiClient.getAxiosInstance();
-      axiosInstance.post(
-        this.wsCompletionUrl,
-        {
-          requestId,
-          model,
-          messages,
-          options: {
-            temperature: options.temperature,
-            maxTokens: options.maxTokens,
-            stream: true,
-            tools: options.tools || []
-          }
-        },
-        { signal: options.abortSignal }
-      ).catch((err) => {
-        const msg = err instanceof Error ? err.message : String(err);
-        settleReject(new Error(`HTTP request failed: ${msg}`));
-      });
-    });
-  }
-  /**
-   * Get available models from server (REST call, not streaming).
-   * Delegates to ApiClient -- same as ServerLlmBackend.
-   */
-  async getModelInfo() {
-    try {
-      logger.debug("[WebSocketLlmBackend] Fetching models from /api/models");
-      const response = await this.apiClient.get("/api/models");
-      if (!response || typeof response !== "object" || !Array.isArray(response.models)) {
-        logger.warn("[WebSocketLlmBackend] Invalid API response format, using fallback models");
-        return this.getFallbackModels();
-      }
-      const filteredModels = response.models.filter(
-        (model) => model.type === "text" && model.supportsTools === true
-      );
-      if (filteredModels.length === 0) {
-        logger.warn("[WebSocketLlmBackend] No CLI-compatible models found, using fallback");
-        return this.getFallbackModels();
-      }
-      logger.debug(`[WebSocketLlmBackend] Loaded ${filteredModels.length} models`);
-      return filteredModels;
-    } catch (error) {
-      logger.warn(
-        `[WebSocketLlmBackend] Failed to fetch models: ${error instanceof Error ? error.message : String(error)}`
-      );
-      return this.getFallbackModels();
-    }
-  }
-  getFallbackModels() {
-    return [
-      { id: "claude-sonnet-4-5-20250929", name: "Claude 4.5 Sonnet" },
-      { id: "claude-3-5-haiku-20241022", name: "Claude 3.5 Haiku" },
-      { id: "gpt-4o", name: "GPT-4o" },
-      { id: "gpt-4o-mini", name: "GPT-4o Mini" }
-    ];
-  }
-};
-
 // src/llm/NotifyingLlmBackend.ts
 var NotifyingLlmBackend = class {
   constructor(inner, backgroundManager) {
@@ -14734,253 +14556,6 @@ Please acknowledge these background agent results and incorporate them into your
   }
 };
 
-// src/ws/WebSocketConnectionManager.ts
-var WebSocketConnectionManager = class {
-  constructor(wsUrl, getToken) {
-    this.ws = null;
-    this.heartbeatInterval = null;
-    this.reconnectAttempts = 0;
-    this.maxReconnectDelay = 3e4;
-    this.handlers = /* @__PURE__ */ new Map();
-    this.disconnectHandlers = /* @__PURE__ */ new Set();
-    this.reconnectTimer = null;
-    this.connected = false;
-    this.connecting = false;
-    this.closed = false;
-    this.wsUrl = wsUrl;
-    this.getToken = getToken;
-  }
-  /**
-   * Connect to the WebSocket server.
-   * Resolves when connection is established, rejects on failure.
-   */
-  async connect() {
-    if (this.connected || this.connecting) return;
-    this.connecting = true;
-    const token = await this.getToken();
-    if (!token) {
-      this.connecting = false;
-      throw new Error("No access token available for WebSocket connection");
-    }
-    return new Promise((resolve3, reject) => {
-      logger.debug(`[WS] Connecting to ${this.wsUrl}...`);
-      this.ws = new WebSocket(this.wsUrl, [`access_token.${token}`]);
-      this.ws.onopen = () => {
-        logger.debug("[WS] Connected");
-        this.connected = true;
-        this.connecting = false;
-        this.reconnectAttempts = 0;
-        this.startHeartbeat();
-        resolve3();
-      };
-      this.ws.onmessage = (event) => {
-        try {
-          const data = typeof event.data === "string" ? event.data : event.data.toString();
-          const message = JSON.parse(data);
-          const requestId = message.requestId;
-          if (requestId && this.handlers.has(requestId)) {
-            this.handlers.get(requestId)(message);
-          } else {
-            logger.debug(`[WS] Unhandled message: ${message.action || "unknown"}`);
-          }
-        } catch (err) {
-          logger.debug(`[WS] Failed to parse message: ${err}`);
-        }
-      };
-      this.ws.onclose = () => {
-        logger.debug("[WS] Connection closed");
-        this.cleanup();
-        this.notifyDisconnect();
-        if (!this.closed) {
-          this.scheduleReconnect();
-        }
-      };
-      this.ws.onerror = (err) => {
-        logger.debug(`[WS] Error: ${err}`);
-        if (this.connecting) {
-          this.connecting = false;
-          this.connected = false;
-          reject(new Error("WebSocket connection failed"));
-        }
-      };
-    });
-  }
-  /** Whether the connection is currently established */
-  get isConnected() {
-    return this.connected;
-  }
-  /**
-   * Send a JSON message over the WebSocket connection.
-   */
-  send(data) {
-    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-      throw new Error("WebSocket is not connected");
-    }
-    const payload = JSON.stringify(data);
-    const sizeKB = (payload.length / 1024).toFixed(1);
-    logger.debug(`[WS] Sending ${sizeKB} KB (action: ${data.action})`);
-    if (payload.length > 32e3) {
-      logger.warn(`[WS] Payload ${sizeKB} KB exceeds API Gateway 32 KB frame limit \u2014 connection will be closed`);
-    }
-    this.ws.send(payload);
-  }
-  /**
-   * Register a handler for messages matching a specific requestId.
-   */
-  onRequest(requestId, handler) {
-    this.handlers.set(requestId, handler);
-  }
-  /**
-   * Remove a handler for a specific requestId.
-   */
-  offRequest(requestId) {
-    this.handlers.delete(requestId);
-  }
-  /**
-   * Register a handler that fires when the connection drops.
-   */
-  onDisconnect(handler) {
-    this.disconnectHandlers.add(handler);
-  }
-  /**
-   * Remove a disconnect handler.
-   */
-  offDisconnect(handler) {
-    this.disconnectHandlers.delete(handler);
-  }
-  /**
-   * Close the connection and stop all heartbeat/reconnect logic.
-   */
-  disconnect() {
-    this.closed = true;
-    this.cleanup();
-    if (this.ws) {
-      this.ws.close();
-      this.ws = null;
-    }
-    this.handlers.clear();
-    this.disconnectHandlers.clear();
-  }
-  startHeartbeat() {
-    this.stopHeartbeat();
-    this.heartbeatInterval = setInterval(
-      () => {
-        if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-          this.ws.send(JSON.stringify({ action: "heartbeat" }));
-          logger.debug("[WS] Heartbeat sent");
-        }
-      },
-      5 * 60 * 1e3
-    );
-  }
-  stopHeartbeat() {
-    if (this.heartbeatInterval) {
-      clearInterval(this.heartbeatInterval);
-      this.heartbeatInterval = null;
-    }
-  }
-  cleanup() {
-    this.connected = false;
-    this.connecting = false;
-    this.stopHeartbeat();
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = null;
-    }
-  }
-  notifyDisconnect() {
-    for (const handler of this.disconnectHandlers) {
-      try {
-        handler();
-      } catch {
-      }
-    }
-  }
-  scheduleReconnect() {
-    if (this.closed) return;
-    this.reconnectAttempts++;
-    const delay = Math.min(1e3 * Math.pow(2, this.reconnectAttempts - 1), this.maxReconnectDelay);
-    logger.debug(`[WS] Reconnecting in ${delay}ms (attempt ${this.reconnectAttempts})`);
-    this.reconnectTimer = setTimeout(async () => {
-      this.reconnectTimer = null;
-      if (this.closed) return;
-      try {
-        await this.connect();
-      } catch {
-        logger.debug("[WS] Reconnection failed");
-      }
-    }, delay);
-  }
-};
-
-// src/ws/WebSocketToolExecutor.ts
-import { v4 as uuidv412 } from "uuid";
-var WebSocketToolExecutor = class {
-  constructor(wsManager, tokenGetter) {
-    this.wsManager = wsManager;
-    this.tokenGetter = tokenGetter;
-  }
-  /**
-   * Execute a server-side tool via WebSocket.
-   * Returns the tool result or throws on error.
-   */
-  async execute(toolName, input, abortSignal) {
-    if (!this.wsManager.isConnected) {
-      throw new Error("WebSocket is not connected");
-    }
-    const token = await this.tokenGetter();
-    if (!token) {
-      throw new Error("No access token available");
-    }
-    const requestId = uuidv412();
-    return new Promise((resolve3, reject) => {
-      let settled = false;
-      const settle = (action) => {
-        if (settled) return;
-        settled = true;
-        this.wsManager.offRequest(requestId);
-        this.wsManager.offDisconnect(onDisconnect);
-        action();
-      };
-      const settleResolve = (result) => settle(() => resolve3(result));
-      const settleReject = (err) => settle(() => reject(err));
-      const onDisconnect = () => {
-        settleReject(new Error("WebSocket connection lost during tool execution"));
-      };
-      this.wsManager.onDisconnect(onDisconnect);
-      if (abortSignal) {
-        if (abortSignal.aborted) {
-          settleReject(new Error("Tool execution aborted"));
-          return;
-        }
-        abortSignal.addEventListener("abort", () => settleReject(new Error("Tool execution aborted")), {
-          once: true
-        });
-      }
-      this.wsManager.onRequest(requestId, (message) => {
-        if (message.action === "cli_tool_response") {
-          settleResolve({
-            success: message.success,
-            content: message.content,
-            error: message.error
-          });
-        }
-      });
-      try {
-        this.wsManager.send({
-          action: "cli_tool_request",
-          accessToken: token,
-          requestId,
-          toolName,
-          input
-        });
-      } catch (err) {
-        settleReject(err instanceof Error ? err : new Error(String(err)));
-      }
-    });
-  }
-};
-
 // src/auth/ApiClient.ts
 import axios11 from "axios";
 var ApiClient = class {
@@ -15118,7 +14693,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.30-feat-cli-websocket-streaming.19243+6a95a9d10",
+  version: "0.2.30-feat-new-architecture.19278+592a62bc7",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -15229,10 +14804,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.51.1-feat-cli-websocket-streaming.19243+6a95a9d10",
-    "@bike4mind/mcp": "1.30.1-feat-cli-websocket-streaming.19243+6a95a9d10",
-    "@bike4mind/services": "2.49.1-feat-cli-websocket-streaming.19243+6a95a9d10",
-    "@bike4mind/utils": "2.6.1-feat-cli-websocket-streaming.19243+6a95a9d10",
+    "@bike4mind/common": "2.51.1-feat-new-architecture.19278+592a62bc7",
+    "@bike4mind/mcp": "1.30.1-feat-new-architecture.19278+592a62bc7",
+    "@bike4mind/services": "2.49.1-feat-new-architecture.19278+592a62bc7",
+    "@bike4mind/utils": "2.6.1-feat-new-architecture.19278+592a62bc7",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -15253,7 +14828,7 @@ var package_default = {
   optionalDependencies: {
     "@vscode/ripgrep": "^1.17.0"
   },
-  gitHead: "6a95a9d108b3eb161ebb1fe503ed9fb63585be72"
+  gitHead: "592a62bc71d62dd7598efffcf6c15eedb1087cc7"
 };
 
 // src/agents/toolFilter.ts
@@ -17027,8 +16602,7 @@ function CliApp() {
     agentStore: null,
     abortController: null,
     contextContent: "",
-    backgroundManager: null,
-    wsManager: null
+    backgroundManager: null
   });
   const [isInitialized, setIsInitialized] = useState10(false);
   const [initError, setInitError] = useState10(null);
@@ -17056,10 +16630,6 @@ function CliApp() {
         })
       );
     }
-    if (state.wsManager) {
-      state.wsManager.disconnect();
-      setWebSocketToolExecutor(null);
-    }
     if (state.agent) {
       state.agent.removeAllListeners();
     }
@@ -17078,7 +16648,7 @@ function CliApp() {
     setTimeout(() => {
       process.exit(0);
     }, 100);
-  }, [state.session, state.sessionStore, state.mcpManager, state.agent, state.imageStore, state.wsManager]);
+  }, [state.session, state.sessionStore, state.mcpManager, state.agent, state.imageStore]);
   useInput9((input, key) => {
     if (key.escape) {
       const store = useCliStore.getState();
@@ -17153,7 +16723,7 @@ function CliApp() {
       if (!isAuthenticated) {
         console.log("\u2139\uFE0F  AI features disabled. Available commands: /login, /help, /config\n");
         const minimalSession = {
-          id: uuidv413(),
+          id: uuidv411(),
           name: `Session ${(/* @__PURE__ */ new Date()).toLocaleString()}`,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17181,45 +16751,10 @@ function CliApp() {
         console.log(`\u{1F30D} API Environment: ${envName} (${apiBaseURL})`);
       }
       const apiClient = new ApiClient(apiBaseURL, state.configStore);
-      const tokenGetter = async () => {
-        const tokens = await state.configStore.getAuthTokens();
-        return tokens?.accessToken ?? null;
-      };
-      let wsManager = null;
-      let llm;
-      try {
-        const serverConfig = await apiClient.get(
-          "/api/settings/serverConfig"
-        );
-        const wsUrl = serverConfig?.websocketUrl;
-        const wsCompletionUrl = serverConfig?.wsCompletionUrl;
-        if (wsUrl && wsCompletionUrl) {
-          wsManager = new WebSocketConnectionManager(wsUrl, tokenGetter);
-          await wsManager.connect();
-          const wsToolExecutor2 = new WebSocketToolExecutor(wsManager, tokenGetter);
-          setWebSocketToolExecutor(wsToolExecutor2);
-          llm = new WebSocketLlmBackend({
-            wsManager,
-            apiClient,
-            model: config.defaultModel,
-            tokenGetter,
-            wsCompletionUrl
-          });
-          logger.debug("\u{1F50C} Using WebSocket transport (bypasses CloudFront timeout)");
-        } else {
-          throw new Error("No websocketUrl or wsCompletionUrl in server config");
-        }
-      } catch (wsError) {
-        logger.debug(
-          `[WS] WebSocket unavailable, using SSE fallback: ${wsError instanceof Error ? wsError.message : String(wsError)}`
-        );
-        wsManager = null;
-        setWebSocketToolExecutor(null);
-        llm = new ServerLlmBackend({
-          apiClient,
-          model: config.defaultModel
-        });
-      }
+      const llm = new ServerLlmBackend({
+        apiClient,
+        model: config.defaultModel
+      });
       const models = await llm.getModelInfo();
       if (models.length === 0) {
         throw new Error("No models available from server.");
@@ -17232,7 +16767,7 @@ function CliApp() {
       }
       llm.currentModel = modelInfo.id;
       const newSession = {
-        id: uuidv413(),
+        id: uuidv411(),
         name: `Session ${(/* @__PURE__ */ new Date()).toLocaleString()}`,
         createdAt: (/* @__PURE__ */ new Date()).toISOString(),
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17446,10 +16981,8 @@ function CliApp() {
         // Store agent store for agent management commands
         contextContent: contextResult.mergedContent,
         // Store raw context for compact instructions
-        backgroundManager,
+        backgroundManager
         // Store for grouped notification turn tracking
-        wsManager
-        // WebSocket connection manager (null if using SSE fallback)
       }));
       setStoreSession(newSession);
       const bannerLines = [
@@ -17544,13 +17077,13 @@ function CliApp() {
         messageContent = multimodalMessage.content;
       }
       const userMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "user",
         content: userMessageContent,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
       const pendingAssistantMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "assistant",
         content: "...",
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17763,13 +17296,13 @@ function CliApp() {
         userMessageContent = message;
       }
       const userMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "user",
         content: userMessageContent,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
       const pendingAssistantMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "assistant",
         content: "...",
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17849,7 +17382,7 @@ function CliApp() {
         const currentSession = useCliStore.getState().session;
         if (currentSession) {
           const cancelMessage = {
-            id: uuidv413(),
+            id: uuidv411(),
             role: "assistant",
             content: "\u26A0\uFE0F Operation cancelled by user",
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17894,7 +17427,7 @@ function CliApp() {
     setState((prev) => ({ ...prev, abortController }));
     try {
       const pendingAssistantMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "assistant",
         content: "...",
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17922,7 +17455,7 @@ function CliApp() {
       const currentSession = useCliStore.getState().session;
       if (!currentSession) return;
       const continuationMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "assistant",
         content: "---\n\n**Background Agent Results:**\n\n" + result.finalAnswer,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -17983,13 +17516,13 @@ function CliApp() {
         isError = true;
       }
       const userMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "user",
         content: `$ ${command}`,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
       const assistantMessage = {
-        id: uuidv413(),
+        id: uuidv411(),
         role: "assistant",
         content: isError ? `\u274C Error:
 ${output}` : output.trim() || "(no output)",
@@ -18458,7 +17991,7 @@ Keyboard Shortcuts:
         console.clear();
         const model = state.session?.model || state.config?.defaultModel || "claude-sonnet";
         const newSession = {
-          id: uuidv413(),
+          id: uuidv411(),
           name: `Session ${(/* @__PURE__ */ new Date()).toLocaleString()}`,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -18963,9 +18496,9 @@ No usage data available for the last ${USAGE_DAYS} days.`);
       return { ...prev, config: updatedConfig };
     });
     if (modelChanged && state.agent) {
-      const backend = state.agent.context.llm;
-      if (backend) {
-        backend.currentModel = updatedConfig.defaultModel;
+      const llm = state.agent.context.llm;
+      if (llm) {
+        llm.currentModel = updatedConfig.defaultModel;
       }
     }
   };

package/dist/{llmMarkdownGenerator-Q3PRX6UR.js → llmMarkdownGenerator-PUR2JBO6.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CurationArtifactType
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 
 // ../../b4m-core/packages/services/dist/src/notebookCurationService/llmMarkdownGenerator.js
 var DEFAULT_OPTIONS = {

package/dist/{markdownGenerator-TFFIS7MF.js → markdownGenerator-5LUEGOKL.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CurationArtifactType
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 
 // ../../b4m-core/packages/services/dist/src/notebookCurationService/markdownGenerator.js
 var DEFAULT_OPTIONS = {

package/dist/{mementoService-5ZUSQ4B4.js → mementoService-YDKHPMY5.js}

@@ -2,9 +2,9 @@
 import {
   findMostSimilarMemento,
   getRelevantMementos
-} from "./chunk-KBRR7H2K.js";
-import "./chunk-7EEPLDUG.js";
-import "./chunk-55ZDRTGQ.js";
+} from "./chunk-H6H5JFXR.js";
+import "./chunk-WP3WMRSG.js";
+import "./chunk-LNNVZDLN.js";
 import "./chunk-OCYRD7D6.js";
 export {
   findMostSimilarMemento,

package/dist/{src-LLWYZKB2.js → src-L7KNOB2L.js}

@@ -134,12 +134,12 @@ import {
   validateMermaidSyntax,
   warmUpSettingsCache,
   withRetry
-} from "./chunk-7EEPLDUG.js";
+} from "./chunk-WP3WMRSG.js";
 import {
   buildRateLimitLogEntry,
   isNearLimit,
   parseRateLimitHeaders
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 import {
   Logger,
   NotificationDeduplicator,

package/dist/{src-QWRGDJYC.js → src-OYWNW52D.js}

@@ -41,12 +41,6 @@ import {
   ChatModels,
   CitableSourceSchema,
   ClaudeArtifactMimeTypes,
-  CliCompletionChunkAction,
-  CliCompletionDoneAction,
-  CliCompletionErrorAction,
-  CliCompletionRequestAction,
-  CliToolRequestAction,
-  CliToolResponseAction,
   CollectionType,
   CompletionApiUsageTransaction,
   CompletionRequestSchema,
@@ -425,7 +419,7 @@ import {
   validateReactArtifactV2,
   validateSvgArtifactV2,
   wikiMarkupToAdf
-} from "./chunk-55ZDRTGQ.js";
+} from "./chunk-LNNVZDLN.js";
 export {
   ALL_IMAGE_MODELS,
   ALL_IMAGE_SIZES,
@@ -469,12 +463,6 @@ export {
   ChatModels,
   CitableSourceSchema,
   ClaudeArtifactMimeTypes,
-  CliCompletionChunkAction,
-  CliCompletionDoneAction,
-  CliCompletionErrorAction,
-  CliCompletionRequestAction,
-  CliToolRequestAction,
-  CliToolResponseAction,
   CollectionType,
   CompletionApiUsageTransaction,
   CompletionRequestSchema,

package/dist/{subtractCredits-LXVQL26O.js → subtractCredits-OWBFQJK2.js}

@@ -2,9 +2,9 @@
 import {
   SubtractCreditsSchema,
   subtractCredits
-} from "./chunk-XXYKIX5X.js";
-import "./chunk-7EEPLDUG.js";
-import "./chunk-55ZDRTGQ.js";
+} from "./chunk-6HFPBXKR.js";
+import "./chunk-WP3WMRSG.js";
+import "./chunk-LNNVZDLN.js";
 import "./chunk-OCYRD7D6.js";
 export {
   SubtractCreditsSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.2.30-feat-cli-websocket-streaming.19243+6a95a9d10",
+  "version": "0.2.30-feat-new-architecture.19278+592a62bc7",
   "type": "module",
   "description": "Interactive CLI tool for Bike4Mind with ReAct agents",
   "license": "UNLICENSED",
@@ -111,10 +111,10 @@
   },
   "devDependencies": {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.51.1-feat-cli-websocket-streaming.19243+6a95a9d10",
-    "@bike4mind/mcp": "1.30.1-feat-cli-websocket-streaming.19243+6a95a9d10",
-    "@bike4mind/services": "2.49.1-feat-cli-websocket-streaming.19243+6a95a9d10",
-    "@bike4mind/utils": "2.6.1-feat-cli-websocket-streaming.19243+6a95a9d10",
+    "@bike4mind/common": "2.51.1-feat-new-architecture.19278+592a62bc7",
+    "@bike4mind/mcp": "1.30.1-feat-new-architecture.19278+592a62bc7",
+    "@bike4mind/services": "2.49.1-feat-new-architecture.19278+592a62bc7",
+    "@bike4mind/utils": "2.6.1-feat-new-architecture.19278+592a62bc7",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -135,5 +135,5 @@
   "optionalDependencies": {
     "@vscode/ripgrep": "^1.17.0"
   },
-  "gitHead": "6a95a9d108b3eb161ebb1fe503ed9fb63585be72"
+  "gitHead": "592a62bc71d62dd7598efffcf6c15eedb1087cc7"
 }