@vybestack/llxprt-code-core 0.10.0 → 0.11.0-nightly.260728.ffaa8d5d7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vybestack/llxprt-code-core",
-  "version": "0.10.0",
+  "version": "0.11.0-nightly.260728.ffaa8d5d7",
   "description": "LLxprt Code Core",
   "license": "Apache-2.0",
   "repository": {
@@ -355,6 +355,10 @@
       "bun": "./src/tools-adapters/CoreMessageBusAdapter.ts",
       "import": "./dist/src/tools-adapters/CoreMessageBusAdapter.js"
     },
+    "./tools-adapters/CoreShellToolHostAdapter.js": {
+      "bun": "./src/tools-adapters/CoreShellToolHostAdapter.ts",
+      "import": "./dist/src/tools-adapters/CoreShellToolHostAdapter.js"
+    },
     "./tools-adapters/CoreToolRegistryHostAdapter.js": {
       "bun": "./src/tools-adapters/CoreToolRegistryHostAdapter.ts",
       "import": "./dist/src/tools-adapters/CoreToolRegistryHostAdapter.js"
@@ -513,13 +517,13 @@
     "dist"
   ],
   "dependencies": {
-    "@vybestack/llxprt-code-auth": "0.10.0",
-    "@vybestack/llxprt-code-ide-integration": "0.10.0",
-    "@vybestack/llxprt-code-storage": "0.10.0",
-    "@vybestack/llxprt-code-mcp": "0.10.0",
-    "@vybestack/llxprt-code-policy": "0.10.0",
-    "@vybestack/llxprt-code-settings": "0.10.0",
-    "@vybestack/llxprt-code-telemetry": "0.10.0",
+    "@vybestack/llxprt-code-auth": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-ide-integration": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-storage": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-mcp": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-policy": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-settings": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-telemetry": "0.11.0-nightly.260728.ffaa8d5d7",
     "@ai-sdk/openai": "^2.0.74",
     "@anthropic-ai/sdk": "^0.55.1",
     "@ast-grep/lang-c": "^0.0.5",
@@ -540,7 +544,7 @@
     "@google/genai": "1.30.0",
     "@iarna/toml": "^2.2.5",
     "@modelcontextprotocol/sdk": "^1.25.2",
-    "@vybestack/llxprt-code-tools": "0.10.0",
+    "@vybestack/llxprt-code-tools": "0.11.0-nightly.260728.ffaa8d5d7",
     "@xterm/headless": "5.5.0",
     "ai": "^5.0.104",
     "ajv": "^8.17.1",

package/src/config/config.ts

@@ -50,6 +50,7 @@ import {
   getOrCreateAsyncTaskReminderService,
   setupAsyncTaskAutoTrigger,
 } from './asyncTaskServices.js';
+import { LiveTrustTransitionLifecycle } from './liveTrustTransitionLifecycle.js';
 import { parseSettingsSubagentDefinitions } from './subagentSettingsParser.js';
 
 import {
@@ -104,6 +105,10 @@ import type { MessageBus } from '../confirmation-bus/message-bus.js';
 import { coreEvents, CoreEvent } from '../utils/events.js';
 import { McpClientManager } from '@vybestack/llxprt-code-mcp';
 import { getCoreVersion } from '../utils/version.js';
+import {
+  buildMcpTrustedRules,
+  MCP_TRUSTED_POLICY_SOURCE,
+} from '../policy/config.js';
 
 import type { ShellExecutionConfig } from '../services/shellExecutionService.js';
 import type { ToolSchedulerContract } from '../core/toolSchedulerContract.js';
@@ -111,10 +116,39 @@ import type { ToolSchedulerContract } from '../core/toolSchedulerContract.js';
 export class Config extends ConfigBase {
   private static readonly logger = new DebugLogger('llxprt:config');
 
+  private readonly liveTrustTransitionLifecycle: LiveTrustTransitionLifecycle;
+
   constructor(params: ConfigParameters) {
     super();
     applyConfigParams(this as unknown as ConfigConstructorTarget, params);
     this.syncModeDerivedPolicyRules(this.approvalMode);
+    this.cachedEffectiveTrust = this.isTrustedFolder();
+    this.liveTrustTransitionLifecycle = new LiveTrustTransitionLifecycle({
+      downgradeApprovalMode: () => {
+        if (this.approvalMode !== ApprovalMode.DEFAULT) {
+          this.approvalMode = ApprovalMode.DEFAULT;
+        }
+      },
+      removeTrustedPolicyRules: () =>
+        this.policyEngine.removeRulesBySource(MCP_TRUSTED_POLICY_SOURCE),
+      updateTrustPolicy: (trusted) => {
+        if (trusted) {
+          for (const rule of buildMcpTrustedRules({
+            mcpServers: this.getMcpServers(),
+          })) {
+            this.policyEngine.addRule(rule);
+          }
+        } else {
+          this.mcpClientManager?.quarantineForTrustRevocation();
+        }
+      },
+      transitionMcp: (trusted) =>
+        trusted
+          ? this.mcpClientManager?.onFolderTrustGained()
+          : this.mcpClientManager?.onFolderTrustRevoked(),
+      initializeHooks: (signal) => this.getHookSystem()?.initialize(signal),
+      emitTrustChanged: (trusted) => coreEvents.emitFolderTrustChanged(trusted),
+    });
   }
 
   // Issue #2325: Background MCP discovery promise started in initialize() so
@@ -163,7 +197,7 @@ export class Config extends ConfigBase {
         'Config.initialize requires an explicit session/runtime MessageBus dependency.',
       );
     }
-    this.initialized = true;
+    this.cachedEffectiveTrust = this.isTrustedFolder();
     this.ideClient = await IdeClient.getInstance();
     // Initialize centralized FileDiscoveryService
     this.getFileService();
@@ -179,6 +213,8 @@ export class Config extends ConfigBase {
       this,
       this.eventEmitter,
     );
+    this.registerIdeTrustListener();
+    this.initialized = true;
     // Issue #2325: Fire MCP discovery in the background — don't block startup.
     // Tools are gated before model turns via McpClientManager.whenDiscoverySettled().
     this.mcpDiscoveryPromise =
@@ -551,22 +587,37 @@ export class Config extends ConfigBase {
    * 'false' for untrusted.
    */
   isTrustedFolder(): boolean {
-    // isWorkspaceTrusted in cli/src/config/trustedFolder.js returns undefined
-    // when the file based trust value is unavailable, since it is mainly used
-    // in the initialization for trust dialogs, etc. Here we return true since
-    // config.isTrustedFolder() is used for the main business logic of blocking
-    // tool calls etc in the rest of the application.
-    //
-    // Default value is true since we load with trusted settings to avoid
-    // restarts in the more common path. If the user chooses to mark the folder
-    // as untrusted, the CLI will restart and we will have the trust value
-    // reloaded.
-    const context = ideContext.getIdeContext();
-    if (context?.workspaceState?.isTrusted !== undefined) {
-      return context.workspaceState.isTrusted;
+    return this.getIdeTrust() ?? this.trustedFolder ?? true;
+  }
+
+  getIdeTrust(): boolean | undefined {
+    return (
+      this.ideTrust ?? ideContext.getIdeContext()?.workspaceState?.isTrusted
+    );
+  }
+
+  /**
+   * Updates the local trust fallback. IDE trust remains authoritative, so this
+   * only triggers a transition when the effective trust value changes.
+   */
+  setTrustedFolderLive(trusted: boolean): Promise<void> {
+    const previousEffectiveTrust = this.isTrustedFolder();
+    this.trustedFolder = trusted;
+    if (!this.initialized) {
+      return Promise.resolve();
     }
+    return this.reconcileEffectiveTrust(previousEffectiveTrust);
+  }
 
-    return this.trustedFolder ?? true;
+  private reconcileEffectiveTrust(
+    previousEffectiveTrust: boolean,
+  ): Promise<void> {
+    const effectiveTrust = this.isTrustedFolder();
+    this.cachedEffectiveTrust = effectiveTrust;
+    if (previousEffectiveTrust !== effectiveTrust) {
+      return this.liveTrustTransitionLifecycle.apply(effectiveTrust);
+    }
+    return Promise.resolve();
   }
 
   setPtyTerminalSize(
@@ -822,10 +873,92 @@ export class Config extends ConfigBase {
     return this.hookSystem;
   }
 
+  private ideTrust: boolean | undefined;
+  private cachedEffectiveTrust: boolean;
+
+  /**
+   * Resolves once any pending trust-transition side-effects have settled.
+   */
+  async whenTrustTransitionSettled(): Promise<void> {
+    await this.liveTrustTransitionLifecycle.whenSettled();
+  }
+
+  private ideTrustChangeListener:
+    | ((isTrusted: boolean | undefined) => void)
+    | undefined;
+
+  /**
+   * Subscribes to live IDE trust changes so that MCP servers, hooks, and
+   * approval mode are updated immediately without requiring a restart.
+   */
+  private registerIdeTrustListener(): void {
+    const client = this.ideClient;
+    const previousEffectiveTrust = this.cachedEffectiveTrust;
+    this.ideTrust = ideContext.getIdeContext()?.workspaceState?.isTrusted;
+    if (client && typeof client.addTrustChangeListener === 'function') {
+      this.ideTrustChangeListener = (isTrusted: boolean | undefined) => {
+        const priorEffectiveTrust = this.cachedEffectiveTrust;
+        this.ideTrust = isTrusted;
+        void this.reconcileEffectiveTrust(priorEffectiveTrust).catch(
+          (error) => {
+            Config.logger.error(
+              `IDE trust reconciliation failed: ${getErrorMessage(error)}`,
+            );
+          },
+        );
+      };
+      client.addTrustChangeListener(this.ideTrustChangeListener);
+    }
+    void this.reconcileEffectiveTrust(previousEffectiveTrust).catch((error) => {
+      Config.logger.error(
+        `IDE trust reconciliation failed: ${getErrorMessage(error)}`,
+      );
+    });
+  }
+
   async dispose(): Promise<void> {
+    const failures: unknown[] = [];
+    try {
+      this.liveTrustTransitionLifecycle.beginDisposal();
+    } catch (error) {
+      failures.push(error);
+    }
+    if (
+      this.ideTrustChangeListener &&
+      this.ideClient &&
+      typeof this.ideClient.removeTrustChangeListener === 'function'
+    ) {
+      try {
+        this.ideClient.removeTrustChangeListener(this.ideTrustChangeListener);
+      } catch (error) {
+        failures.push(error);
+      }
+      this.ideTrustChangeListener = undefined;
+    }
+    // Initiate MCP shutdown before awaiting trust-transition settlement so
+    // in-flight MCP work is cancelled and cannot block disposal.
+    const stopPromise = this.mcpClientManager?.stop();
+    try {
+      await this.whenTrustTransitionSettled();
+    } catch (error) {
+      failures.push(error);
+    }
     const client = this.agentClient as AgentClientContract | undefined;
     if (client !== undefined) {
-      client.dispose();
+      try {
+        client.dispose();
+      } catch (error) {
+        failures.push(error);
+      }
+    }
+    if (this.hookSystem !== undefined) {
+      const hookSystem = this.hookSystem;
+      this.hookSystem = undefined;
+      try {
+        hookSystem.dispose();
+      } catch (error) {
+        failures.push(error);
+      }
     }
     if (this.mcpDiscoveryPromise !== undefined) {
       try {
@@ -836,12 +969,18 @@ export class Config extends ConfigBase {
         );
       }
     }
-    // Issue #2325: Extension server discoveries fired by startExtension are
-    // tracked by whenDiscoverySettled(). Await it to avoid tearing down
-    // clients mid-connection.
-    if (this.mcpClientManager !== undefined) {
-      await this.mcpClientManager.whenDiscoverySettled();
-      await this.mcpClientManager.stop();
+    if (stopPromise !== undefined) {
+      try {
+        await stopPromise;
+      } catch (error) {
+        failures.push(error);
+      }
+    }
+    if (failures.length === 1) {
+      throw failures[0];
+    }
+    if (failures.length > 1) {
+      throw new AggregateError(failures, 'Config disposal failed');
     }
   }
 }

package/src/config/configBaseCore.ts

@@ -102,6 +102,7 @@ export abstract class ConfigBaseCore {
   protected workspaceContext!: WorkspaceContext;
   protected readonly debugMode!: boolean;
   protected readonly outputFormat!: OutputFormat;
+  protected readonly quiet!: boolean;
   protected readonly question: string | undefined;
   /**
    * @plan PLAN-20250212-LSP.P33
@@ -153,7 +154,7 @@ export abstract class ConfigBaseCore {
   protected readonly originalModel!: string;
   protected readonly extensionContextFilePaths!: string[];
   protected readonly noBrowser!: boolean;
-  protected readonly folderTrust!: boolean;
+  protected folderTrust!: boolean;
   protected ideMode!: boolean;
   protected ideClient: IdeClient | undefined;
   protected inFallbackMode = false;
@@ -182,7 +183,7 @@ export abstract class ConfigBaseCore {
   protected readonly loadMemoryFromIncludeDirectories: boolean = false;
   protected readonly chatCompression: ChatCompressionSettings | undefined;
   protected readonly interactive!: boolean;
-  protected readonly trustedFolder: boolean | undefined;
+  protected trustedFolder: boolean | undefined;
   protected readonly useRipgrep!: boolean;
   protected readonly shouldUseNodePtyShell!: boolean;
   protected readonly allowPtyThemeOverride!: boolean;
@@ -204,6 +205,7 @@ export abstract class ConfigBaseCore {
   enableToolOutputTruncation!: boolean;
 
   protected readonly continueOnFailedApiCall!: boolean;
+  protected readonly imagePayloadBudgetBytes!: number;
   protected readonly enableShellOutputEfficiency!: boolean;
   protected readonly continueSession!: boolean | string;
   protected readonly disableYoloMode!: boolean;
@@ -488,6 +490,9 @@ export abstract class ConfigBaseCore {
   getOutputFormat(): OutputFormat {
     return this.outputFormat;
   }
+  getQuiet(): boolean {
+    return this.quiet;
+  }
   getQuestion(): string | undefined {
     return this.question;
   }
@@ -769,6 +774,9 @@ export abstract class ConfigBaseCore {
   getContinueOnFailedApiCall(): boolean {
     return this.continueOnFailedApiCall;
   }
+  getImagePayloadBudgetBytes(): number {
+    return this.imagePayloadBudgetBytes;
+  }
   getEnableShellOutputEfficiency(): boolean {
     return this.enableShellOutputEfficiency;
   }

package/src/config/configConstructor.ts

@@ -21,6 +21,7 @@ import {
   normalizeShellReplacement,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
+  DEFAULT_IMAGE_PAYLOAD_BUDGET_BYTES,
   type AccessibilitySettings,
   type BugCommandSettings,
   type ChatCompressionSettings,
@@ -96,6 +97,7 @@ export interface ConfigConstructorTarget {
   debugMode: boolean;
   outputFormat: OutputFormat;
   question: string | undefined;
+  quiet: boolean;
 
   // Tool governance
   coreTools: string[] | undefined;
@@ -169,6 +171,7 @@ export interface ConfigConstructorTarget {
   truncateToolOutputLines: number;
   enableToolOutputTruncation: boolean;
   continueOnFailedApiCall: boolean;
+  imagePayloadBudgetBytes: number;
   enableShellOutputEfficiency: boolean;
   continueSession: boolean | string;
   extensionManagement: boolean;
@@ -256,6 +259,7 @@ function applyCoreIdentity(
   config.debugMode = params.debugMode;
   config.outputFormat = params.outputFormat ?? OutputFormat.TEXT;
   config.question = params.question;
+  config.quiet = params.quiet ?? false;
 }
 
 function applyToolGovernance(
@@ -436,6 +440,13 @@ function applySessionFlags(
   params: ConfigParameters,
 ): void {
   config.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
+  const imagePayloadBudgetBytes = params.imagePayloadBudgetBytes;
+  config.imagePayloadBudgetBytes =
+    typeof imagePayloadBudgetBytes === 'number' &&
+    Number.isSafeInteger(imagePayloadBudgetBytes) &&
+    imagePayloadBudgetBytes >= 0
+      ? imagePayloadBudgetBytes
+      : DEFAULT_IMAGE_PAYLOAD_BUDGET_BYTES;
   config.continueSession = params.continueSession ?? false;
   config.storage = new Storage(config.targetDir);
   config.fileExclusions = new FileExclusions(config as unknown as Config);

package/src/config/configTestHarness.ts

@@ -181,6 +181,8 @@ export function buildIdeIntegrationMockBody(
         getConnectionStatus: vi.fn(),
         initialize: vi.fn(),
         shutdown: vi.fn(),
+        addTrustChangeListener: vi.fn(),
+        removeTrustChangeListener: vi.fn(),
       }),
     },
   };
@@ -206,12 +208,16 @@ export function buildEventsMockBody(
   actual: unknown,
   hoisted: HoistedConfigMocks,
 ) {
+  const eventsModule = actual as { coreEvents?: object };
+  const CoreEventsConstructor = eventsModule.coreEvents?.constructor;
+  if (typeof CoreEventsConstructor !== 'function') {
+    throw new TypeError('Expected coreEvents to expose a callable constructor');
+  }
+  const coreEvents = Reflect.construct(CoreEventsConstructor, []);
+  Object.assign(coreEvents, hoisted.coreEvents, { emit: vi.fn() });
   return {
     ...(actual as object),
-    coreEvents: {
-      ...hoisted.coreEvents,
-      emit: vi.fn(),
-    },
+    coreEvents,
   };
 }
 

package/src/config/configTypes.ts

@@ -209,6 +209,8 @@ export function normalizeShellReplacement(
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 4_000_000;
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES = 1000;
 
+export const DEFAULT_IMAGE_PAYLOAD_BUDGET_BYTES = 15 * 1024 * 1024;
+
 export class MCPServerConfig {
   constructor(
     // For stdio transport
@@ -227,6 +229,7 @@ export class MCPServerConfig {
      * Transport type for URL-based servers.
      * When set, disables automatic HTTP→SSE fallback.
      * - 'http' → StreamableHTTPClientTransport
+     * - 'streamable-http' → alias for 'http' (StreamableHTTPClientTransport)
      * - 'sse'  → SSEClientTransport
      * - omitted → defaults to HTTP with SSE fallback (deprecated; add type explicitly)
      *
@@ -234,7 +237,7 @@ export class MCPServerConfig {
      * @plan PLAN-20250219-GMERGE021.R3.P03
      * @requirement REQ-GMERGE021-R3-001
      */
-    readonly type?: 'sse' | 'http',
+    readonly type?: 'sse' | 'http' | 'streamable-http',
     // Common
     readonly timeout?: number,
     readonly trust?: boolean,
@@ -373,6 +376,7 @@ export interface ConfigParameters {
   debugMode: boolean;
   outputFormat?: OutputFormat;
   question?: string;
+  quiet?: boolean;
 
   coreTools?: string[];
   allowedTools?: string[];
@@ -447,6 +451,7 @@ export interface ConfigParameters {
   truncateToolOutputLines?: number;
   enableToolOutputTruncation?: boolean;
   continueOnFailedApiCall?: boolean;
+  imagePayloadBudgetBytes?: number;
   enableShellOutputEfficiency?: boolean;
   continueSession?: boolean | string;
   disableYoloMode?: boolean;