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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vybestack/llxprt-code",
-  "version": "0.10.0",
+  "version": "0.11.0-nightly.260728.ffaa8d5d7",
   "description": "LLxprt Code",
   "license": "Apache-2.0",
   "repository": {
@@ -44,24 +44,24 @@
     "!**/__snapshots__/**"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/vybestack/llxprt-code/sandbox:0.10.0"
+    "sandboxImageUri": "ghcr.io/vybestack/llxprt-code/sandbox:0.11.0-nightly.260728.ffaa8d5d7"
   },
   "dependencies": {
-    "@vybestack/llxprt-code-storage": "0.10.0",
-    "@agentclientprotocol/sdk": "^0.14.1",
+    "@vybestack/llxprt-code-storage": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@agentclientprotocol/sdk": "^1.2.1",
     "@anthropic-ai/sdk": "^0.55.1",
     "@dqbd/tiktoken": "^1.0.21",
     "@iarna/toml": "^2.2.5",
     "@modelcontextprotocol/sdk": "^1.25.2",
-    "@vybestack/llxprt-code-auth": "0.10.0",
-    "@vybestack/llxprt-code-core": "0.10.0",
-    "@vybestack/llxprt-code-ide-integration": "0.10.0",
-    "@vybestack/llxprt-code-mcp": "0.10.0",
-    "@vybestack/llxprt-code-providers": "0.10.0",
-    "@vybestack/llxprt-code-agents": "0.10.0",
-    "@vybestack/llxprt-code-settings": "0.10.0",
-    "@vybestack/llxprt-code-telemetry": "0.10.0",
-    "@vybestack/llxprt-code-tools": "0.10.0",
+    "@vybestack/llxprt-code-auth": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-core": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-ide-integration": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-mcp": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-providers": "0.11.0-nightly.260728.ffaa8d5d7",
+    "@vybestack/llxprt-code-agents": "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",
+    "@vybestack/llxprt-code-tools": "0.11.0-nightly.260728.ffaa8d5d7",
     "ansi-regex": "^6.2.2",
     "bun": "1.3.14",
     "chalk": "^5.3.0",

package/src/commands/mcp/add.ts

@@ -78,7 +78,7 @@ function parseEnvEntries(
 
 function createHttpServerConfig(
   commandOrUrl: string,
-  type: 'sse' | 'http',
+  type: 'sse' | 'http' | 'streamable-http',
   headers: Record<string, string> | undefined,
   options: SharedServerOptions,
 ): Partial<MCPServerConfig> {
@@ -117,7 +117,11 @@ function createServerConfig(
     excludeTools: options.excludeTools,
   };
   const headers = parseHeaderEntries(options.header);
-  if (options.transport === 'sse' || options.transport === 'http') {
+  if (
+    options.transport === 'sse' ||
+    options.transport === 'http' ||
+    options.transport === 'streamable-http'
+  ) {
     return createHttpServerConfig(
       commandOrUrl,
       options.transport,
@@ -216,10 +220,10 @@ export const addCommand: CommandModule = {
       })
       .option('transport', {
         alias: ['t', 'type'],
-        describe: 'Transport type (stdio, sse, http)',
+        describe: 'Transport type (stdio, sse, http, streamable-http)',
         type: 'string',
         default: 'stdio',
-        choices: ['stdio', 'sse', 'http'],
+        choices: ['stdio', 'sse', 'http', 'streamable-http'],
       })
       .option('env', {
         alias: 'e',

package/src/config/cliArgParser.ts

@@ -37,6 +37,7 @@ export interface CliArgs {
   prompt: string | undefined;
   promptInteractive: string | undefined;
   outputFormat: string | undefined;
+  quiet: boolean | undefined;
 
   showMemoryUsage: boolean | undefined;
   yolo: boolean | undefined;
@@ -161,6 +162,7 @@ function mapParsedArgsToCliArgs(result: Record<string, unknown>): CliArgs {
     ),
     promptInteractive: result['promptInteractive'] as string | undefined,
     outputFormat: result['outputFormat'] as string | undefined,
+    quiet: result['quiet'] as boolean | undefined,
     showMemoryUsage: result['showMemoryUsage'] as boolean | undefined,
     yolo: result['yolo'] as boolean | undefined,
     approvalMode: result['approvalMode'] as string | undefined,

package/src/config/config.ts

@@ -63,6 +63,7 @@ type ConfigBuildPieces = {
   extensionsEnabled: boolean;
   adminSkillsEnabled: boolean;
   outputFormat: Parameters<typeof buildConfig>[0]['outputFormat'];
+  quiet: boolean;
   allowedTools: readonly string[];
 };
 
@@ -267,6 +268,7 @@ function buildLoadedConfig(
     extensionsEnabled: pieces.extensionsEnabled,
     adminSkillsEnabled: pieces.adminSkillsEnabled,
     outputFormat: pieces.outputFormat,
+    quiet: pieces.quiet,
     allowedTools: pieces.allowedTools,
   });
 }

package/src/config/configBuilder.ts

@@ -72,6 +72,7 @@ export interface ConfigBuildInput {
   readonly extensionsEnabled: boolean;
   readonly adminSkillsEnabled: boolean;
   readonly outputFormat: OutputFormat;
+  readonly quiet: boolean;
   readonly allowedTools: readonly string[];
 }
 
@@ -194,6 +195,7 @@ function buildSessionBaseArgs(
     filePaths,
     screenReader,
     outputFormat,
+    quiet,
     question,
     extensionsEnabled,
     adminSkillsEnabled,
@@ -209,6 +211,7 @@ function buildSessionBaseArgs(
       context.resolvedLoadMemoryFromIncludeDirectories,
     debugMode: context.debugMode,
     outputFormat,
+    quiet,
     question,
     ...toolConfig,
     extensionsEnabled,

package/src/config/configError.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface ConfigFileError {
+  readonly path: string;
+  readonly message: string;
+}
+
+export function formatConfigFileErrors(
+  errors: readonly ConfigFileError[],
+  fileDescription = 'configuration file(s)',
+): string {
+  const details = errors.map(
+    (error) => `Error in ${error.path}: ${error.message}`,
+  );
+  const instruction = `Please fix the ${fileDescription} and try again.`;
+  return details.length === 0
+    ? instruction
+    : `${details.join('\n')}\n${instruction}`;
+}

package/src/config/extensions/extensionEnablement.ts

@@ -202,7 +202,16 @@ export class ExtensionEnablementManager {
   private readRuntimeConfig(): RuntimeAllExtensionsEnablementConfig {
     try {
       const content = fs.readFileSync(this.configFilePath, 'utf-8');
-      return JSON.parse(content) as RuntimeAllExtensionsEnablementConfig;
+      const parsed: unknown = JSON.parse(content);
+      const validated = parseRuntimeEnablementConfig(parsed);
+      if (validated === null) {
+        coreEvents.emitFeedback(
+          'error',
+          'Invalid extension enablement config; ignoring malformed file.',
+        );
+        return {};
+      }
+      return validated;
     } catch (error) {
       if (
         error instanceof Error &&
@@ -289,3 +298,55 @@ export class ExtensionEnablementManager {
     this.sessionState.clear();
   }
 }
+
+/**
+ * Validates a single extension enablement entry.
+ * Returns `undefined` to skip, `null` if invalid, otherwise the entry.
+ */
+function parseExtensionEntry(
+  entry: unknown,
+): ExtensionEnablementConfig | null | undefined {
+  if (entry === undefined) {
+    return undefined;
+  }
+  if (entry === null || typeof entry !== 'object' || Array.isArray(entry)) {
+    return null;
+  }
+  const overrides = (entry as { overrides?: unknown }).overrides;
+  if (overrides === undefined) {
+    return { overrides: [] };
+  }
+  if (
+    !Array.isArray(overrides) ||
+    !overrides.every((rule) => typeof rule === 'string')
+  ) {
+    return null;
+  }
+  return { overrides };
+}
+
+/**
+ * Validates extension-enablement.json. Returns null for structurally invalid
+ * JSON so callers can fall back safely instead of throwing at startup.
+ */
+function parseRuntimeEnablementConfig(
+  value: unknown,
+): RuntimeAllExtensionsEnablementConfig | null {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+    return null;
+  }
+
+  const result: RuntimeAllExtensionsEnablementConfig = {};
+  for (const [name, entry] of Object.entries(
+    value as Record<string, unknown>,
+  )) {
+    const parsed = parseExtensionEntry(entry);
+    if (parsed === null) {
+      return null;
+    }
+    if (parsed !== undefined) {
+      result[name] = parsed;
+    }
+  }
+  return result;
+}

package/src/config/interactiveContext.ts

@@ -92,7 +92,8 @@ function resolveTrustAndIdeContext(
 
   // Trust uses originalSettings (not profile-merged) — security critical
   const folderTrust = originalSettings.folderTrust ?? false;
-  const trustedFolder = isWorkspaceTrusted(originalSettings) ?? false;
+  const trustedFolder =
+    isWorkspaceTrusted(originalSettings, input.cwd) ?? false;
 
   return { debugMode, memoryImportFormat, ideMode, folderTrust, trustedFolder };
 }

package/src/config/intermediateConfig.ts

@@ -30,6 +30,7 @@ export interface IntermediateConfig {
   readonly profileSettingsWithTools: Settings;
   readonly policyEngineConfig: PolicyEngineConfig;
   readonly outputFormat: OutputFormat;
+  readonly quiet: boolean;
   readonly useRipgrepSetting: boolean | undefined;
   readonly mcpEnabled: boolean;
   readonly extensionsEnabled: boolean;
@@ -84,9 +85,11 @@ export async function resolveIntermediateConfig(
   const policyEngineConfig = await createPolicyEngineConfig(
     profileSettingsWithTools,
     approvalMode,
+    context.trustedFolder,
   );
 
   const outputFormat = resolveOutputFormat(argv);
+  const quiet = argv.quiet ?? false;
 
   const useRipgrepSetting = await resolveRipgrepSetting(profileMergedSettings);
 
@@ -116,6 +119,7 @@ export async function resolveIntermediateConfig(
     profileSettingsWithTools,
     policyEngineConfig,
     outputFormat,
+    quiet,
     useRipgrepSetting,
     mcpEnabled,
     extensionsEnabled,

package/src/config/keyBindings.ts

@@ -65,6 +65,7 @@ export enum Command {
 
   // Text Input
   SUBMIT = 'submit',
+  STEER = 'steer', // LLXPRT-SPECIFIC: mid-turn steering (Ctrl+Enter while streaming)
   NEWLINE = 'newline',
   OPEN_EXTERNAL_EDITOR = 'openExternalEditor',
   PASTE_CLIPBOARD = 'pasteClipboard',
@@ -73,6 +74,7 @@ export enum Command {
   SHOW_ERROR_DETAILS = 'showErrorDetails',
   TOGGLE_TOOL_DESCRIPTIONS = 'toggleToolDescriptions', // LLXPRT-SPECIFIC
   TOGGLE_TODO_DIALOG = 'toggleTodoDialog', // LLXPRT-SPECIFIC
+  TOGGLE_QUEUED_MESSAGES = 'toggleQueuedMessages', // LLXPRT-SPECIFIC
   SHOW_IDE_CONTEXT_DETAIL = 'showIDEContextDetail',
   TOGGLE_MARKDOWN = 'toggleMarkdown',
   TOGGLE_COPY_MODE = 'toggleCopyMode',
@@ -223,7 +225,7 @@ export const defaultKeyBindings: KeyBindingConfig = {
   [Command.COLLAPSE_SUGGESTION]: [{ key: 'left' }],
 
   // Text Input
-  // Must also exclude shift to allow shift+enter for newline
+  // Must also exclude shift to allow shift+enter for multi-line input
   [Command.SUBMIT]: [
     {
       key: 'return',
@@ -232,8 +234,11 @@ export const defaultKeyBindings: KeyBindingConfig = {
       shift: false,
     },
   ],
-  // Split into multiple data-driven bindings
-  // Now also includes shift+enter for multi-line input
+  // Mid-turn steering: Ctrl+Enter while the agent is streaming injects the
+  // typed text at the next tool-call boundary. When not streaming, Ctrl+Enter
+  // falls through to NEWLINE (both match the same key; the handler checks
+  // STEER first and only consumes it when streaming).
+  [Command.STEER]: [{ key: 'return', ctrl: true }],
   [Command.NEWLINE]: [
     { key: 'return', ctrl: true },
     { key: 'return', command: true },
@@ -250,6 +255,7 @@ export const defaultKeyBindings: KeyBindingConfig = {
   [Command.SHOW_ERROR_DETAILS]: [{ key: 'o', ctrl: true }],
   [Command.TOGGLE_TOOL_DESCRIPTIONS]: [{ key: 't', ctrl: true }],
   [Command.TOGGLE_TODO_DIALOG]: [{ key: 'q', ctrl: true }],
+  [Command.TOGGLE_QUEUED_MESSAGES]: [{ key: ']', ctrl: true }],
   [Command.SHOW_IDE_CONTEXT_DETAIL]: [{ key: 'g', ctrl: true }],
   [Command.TOGGLE_MARKDOWN]: [{ key: 'm', command: true }],
   [Command.TOGGLE_COPY_MODE]: [{ key: 's', ctrl: true }],
@@ -273,6 +279,17 @@ export const defaultKeyBindings: KeyBindingConfig = {
   ],
 };
 
+export function getDefaultKeyBindingHint(command: Command): string {
+  const binding = defaultKeyBindings[command][0];
+  const modifiers = [
+    binding.ctrl === true ? 'Ctrl' : undefined,
+    binding.command === true ? 'Cmd' : undefined,
+    binding.shift === true ? 'Shift' : undefined,
+  ].filter((modifier): modifier is string => modifier !== undefined);
+  const key = binding.key ?? binding.sequence ?? '';
+  return [...modifiers, key].join('+');
+}
+
 interface CommandCategory {
   readonly title: string;
   readonly commands: readonly Command[];
@@ -357,6 +374,7 @@ export const commandCategories: readonly CommandCategory[] = [
     title: 'Text Input',
     commands: [
       Command.SUBMIT,
+      Command.STEER,
       Command.NEWLINE,
       Command.OPEN_EXTERNAL_EDITOR,
       Command.PASTE_CLIPBOARD,
@@ -383,6 +401,10 @@ export const commandCategories: readonly CommandCategory[] = [
     title: 'Todo Dialog',
     commands: [Command.TOGGLE_TODO_DIALOG, Command.TOGGLE_TOOL_DESCRIPTIONS],
   },
+  {
+    title: 'Queued Messages',
+    commands: [Command.TOGGLE_QUEUED_MESSAGES],
+  },
   {
     title: 'Mouse',
     commands: [Command.TOGGLE_MOUSE_EVENTS],
@@ -452,6 +474,8 @@ export const commandDescriptions: Readonly<Record<Command, string>> = {
 
   // Text Input
   [Command.SUBMIT]: 'Submit the current prompt.',
+  [Command.STEER]:
+    'Steer the active agent mid-turn by injecting input at the next tool-call boundary (only during streaming).',
   [Command.NEWLINE]: 'Insert a newline without submitting.',
   [Command.OPEN_EXTERNAL_EDITOR]:
     'Open the current prompt in an external editor.',
@@ -462,6 +486,8 @@ export const commandDescriptions: Readonly<Record<Command, string>> = {
   [Command.SHOW_ERROR_DETAILS]: 'Toggle detailed error information.',
   [Command.TOGGLE_TOOL_DESCRIPTIONS]: 'Toggle tool descriptions display.',
   [Command.TOGGLE_TODO_DIALOG]: 'Toggle the TODO dialog visibility.',
+  [Command.TOGGLE_QUEUED_MESSAGES]:
+    'Toggle the queued messages panel visibility.',
   [Command.SHOW_IDE_CONTEXT_DETAIL]: 'Show IDE context details.',
   [Command.TOGGLE_MARKDOWN]: 'Toggle Markdown rendering.',
   [Command.TOGGLE_COPY_MODE]: 'Toggle copy mode when in alternate buffer mode.',

package/src/config/policy.ts

@@ -18,6 +18,7 @@ import { type Settings } from './settings.js';
 export async function createPolicyEngineConfig(
   settings: Settings,
   approvalMode: ApprovalMode,
+  trustedFolder = true,
 ): Promise<PolicyEngineConfig> {
   // Explicitly construct PolicySettings from Settings to ensure type safety
   // and avoid accidental leakage of other settings properties.
@@ -38,7 +39,12 @@ export async function createPolicyEngineConfig(
     mcpServers: settings.mcpServers,
   };
 
-  return createCorePolicyEngineConfig(policySettings, approvalMode);
+  return createCorePolicyEngineConfig(
+    policySettings,
+    approvalMode,
+    undefined,
+    trustedFolder,
+  );
 }
 
 export function createPolicyUpdater(

package/src/config/postConfigRuntime.ts

@@ -14,7 +14,10 @@ import {
 } from '@vybestack/llxprt-code-core';
 import { DebugLogger } from '@vybestack/llxprt-code-telemetry';
 import { ProfileManager } from '@vybestack/llxprt-code-settings';
-import type { SettingsService } from '@vybestack/llxprt-code-settings';
+import type {
+  EphemeralSettings,
+  SettingsService,
+} from '@vybestack/llxprt-code-settings';
 import {
   getCliRuntimeContext,
   setCliRuntimeContext,
@@ -51,7 +54,7 @@ export interface PostConfigInput {
   readonly bootstrapArgs: BootstrapProfileArgs;
   readonly argv: CliArgs;
   readonly settings: Settings;
-  readonly profileSettingsWithTools: Settings;
+  readonly profileSettingsWithTools: Settings & EphemeralSettings;
   readonly profileLoadResult: ProfileLoadResult;
   readonly providerModelResult: ProviderModelResult;
   readonly defaultDisabledTools: readonly string[];
@@ -152,7 +155,11 @@ interface ProfileEphemeralSettingsInput {
   readonly bootstrapArgs: Pick<BootstrapProfileArgs, 'profileJson'>;
   readonly argv: Pick<CliArgs, 'provider'>;
   readonly settings: StreamTimeoutSettingsInput;
-  readonly profileSettingsWithTools: StreamTimeoutSettingsInput;
+  // profileSettingsWithTools carries both the public JSON settings and the
+  // ephemeral tool-governance keys (e.g. 'tools.allowed') that
+  // applyGlobalAndProfileEphemeralSettings forwards to applyToolPolicies.
+  readonly profileSettingsWithTools: StreamTimeoutSettingsInput &
+    EphemeralSettings;
   readonly profileLoadResult: Pick<ProfileLoadResult, 'profileToLoad'>;
 }
 
@@ -472,9 +479,9 @@ function applyToolPolicies(input: ApplyToolPoliciesInput): void {
       : (profileSettingsWithTools.allowedTools ?? []),
   );
 
-  const profileAllowedTools = buildNormalizedToolSet(
-    config.getEphemeralSetting('tools.allowed'),
-  );
+  const rawProfileAllowedTools = profileSettingsWithTools['tools.allowed'];
+  const profileAllowedExplicit = Array.isArray(rawProfileAllowedTools);
+  const profileAllowedTools = buildNormalizedToolSet(rawProfileAllowedTools);
 
   const applyPolicy = (allowedSet: Set<string> | undefined): void => {
     if (allowedSet === undefined) {
@@ -491,7 +498,7 @@ function applyToolPolicies(input: ApplyToolPoliciesInput): void {
 
   if (interactive !== true && experimentalAcp !== true) {
     if (approvalMode === ApprovalMode.YOLO) {
-      if (profileAllowedTools.size > 0 || explicitAllowedTools.size > 0) {
+      if (profileAllowedExplicit || explicitAllowedTools.size > 0) {
         const finalAllowed = new Set(profileAllowedTools);
         explicitAllowedTools.forEach((tool) => finalAllowed.add(tool));
         applyPolicy(finalAllowed);
@@ -507,16 +514,15 @@ function applyToolPolicies(input: ApplyToolPoliciesInput): void {
         baseAllowed.add(EDIT_TOOL_NAME);
       }
 
-      const finalAllowed =
-        profileAllowedTools.size > 0
-          ? new Set(
-              [...baseAllowed].filter((tool) => profileAllowedTools.has(tool)),
-            )
-          : baseAllowed;
+      const finalAllowed = profileAllowedExplicit
+        ? new Set(
+            [...baseAllowed].filter((tool) => profileAllowedTools.has(tool)),
+          )
+        : baseAllowed;
 
       applyPolicy(finalAllowed);
     }
-  } else if (profileAllowedTools.size > 0 || explicitAllowedTools.size > 0) {
+  } else if (profileAllowedExplicit || explicitAllowedTools.size > 0) {
     const finalAllowed = new Set(profileAllowedTools);
     explicitAllowedTools.forEach((tool) => finalAllowed.add(tool));
     applyPolicy(finalAllowed);

package/src/config/settings-schema/schema-ui.ts

@@ -192,6 +192,15 @@ export const UI_SETTINGS_SCHEMA = {
         description: 'Display memory usage information in the UI',
         showInDialog: true,
       },
+      alwaysDisplayFullShellCommand: {
+        type: 'boolean',
+        label: 'Always Display Full Shell Command',
+        category: 'UI',
+        requiresRestart: false,
+        default: true,
+        description: 'Display complete shell commands without truncation.',
+        showInDialog: true,
+      },
       showLineNumbers: {
         type: 'boolean',
         label: 'Show Line Numbers',

package/src/config/settingsLoader.ts

@@ -11,6 +11,7 @@ import type { Settings } from './settingsSchema.js';
 import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
 import { USER_SETTINGS_PATH } from './paths.js';
 import { mergeSettings } from './settingsMerge.js';
+import { formatConfigFileErrors } from './configError.js';
 import {
   migrateHooksConfig,
   migrateLegacyInteractiveShellSetting,
@@ -100,12 +101,11 @@ function loadOptionalSettingsFile(
   }
 }
 
-function resolveRealWorkspaceDir(workspaceDir: string): string {
-  const resolvedWorkspaceDir = path.resolve(workspaceDir);
+function resolveRealWorkspaceDir(workspaceDir: string): string | undefined {
   try {
-    return fs.realpathSync(resolvedWorkspaceDir);
+    return fs.realpathSync(path.resolve(workspaceDir));
   } catch {
-    return resolvedWorkspaceDir;
+    return undefined;
   }
 }
 
@@ -115,7 +115,7 @@ function loadSettingsFiles(
 ): {
   settings: SettingsState;
   errors: SettingsError[];
-  realWorkspaceDir: string;
+  realWorkspaceDir: string | undefined;
   realHomeDir: string;
 } {
   const errors: SettingsError[] = [];
@@ -133,7 +133,7 @@ function loadSettingsFiles(
     legacyTheme: true,
   });
   const workspace =
-    realWorkspaceDir === realHomeDir
+    realWorkspaceDir === undefined || realWorkspaceDir === realHomeDir
       ? {}
       : loadOptionalSettingsFile(paths.workspace, errors, {
           legacyTheme: true,
@@ -156,7 +156,10 @@ function shouldCheckFolderTrust(settings: SettingsState): boolean {
   return folderTrustFeature && folderTrustEnabled;
 }
 
-function resolveTrustedState(settings: SettingsState): boolean {
+function resolveTrustedState(
+  settings: SettingsState,
+  workspaceDir: string | undefined,
+): boolean {
   const tempSettingsForTrust = mergeSettings(
     settings.system,
     settings.systemDefaults,
@@ -164,9 +167,12 @@ function resolveTrustedState(settings: SettingsState): boolean {
     settings.workspace,
     true,
   );
-  return shouldCheckFolderTrust(settings)
-    ? (isWorkspaceTrusted(tempSettingsForTrust) ?? true)
-    : true;
+  if (!shouldCheckFolderTrust(settings)) {
+    return true;
+  }
+  return workspaceDir === undefined
+    ? false
+    : (isWorkspaceTrusted(tempSettingsForTrust, workspaceDir) ?? false);
 }
 
 function loadEnvironmentAndResolveSettings(
@@ -193,12 +199,7 @@ function throwSettingsErrors(errors: SettingsError[]): void {
   if (errors.length === 0) {
     return;
   }
-  const errorMessages = errors.map(
-    (error) => `Error in ${error.path}: ${error.message}`,
-  );
-  throw new FatalConfigError(
-    `${errorMessages.join('\n')}\nPlease fix the configuration file(s) and try again.`,
-  );
+  throw new FatalConfigError(formatConfigFileErrors(errors));
 }
 
 function migrateLoadedSettings(settings: SettingsState): void {
@@ -237,7 +238,10 @@ export function loadSettings(
     workspace: new Storage(workspaceDir).getWorkspaceSettingsPath(),
   };
   const loaded = loadSettingsFiles(workspaceDir, paths);
-  const isTrusted = resolveTrustedState(loaded.settings);
+  const isTrusted = resolveTrustedState(
+    loaded.settings,
+    loaded.realWorkspaceDir,
+  );
   const settings = loadEnvironmentAndResolveSettings(
     loaded.settings,
     isTrusted,

package/src/config/settingsSchema.ts

@@ -76,8 +76,8 @@ export const SETTINGS_SCHEMA_DEFINITIONS: Record<
       type: {
         type: 'string',
         description:
-          'Transport type. Use "stdio" for local command, "sse" for Server-Sent Events, or "http" for Streamable HTTP.',
-        enum: ['stdio', 'sse', 'http'],
+          'Transport type. Use "stdio" for local command, "sse" for Server-Sent Events, "http" for Streamable HTTP, or "streamable-http" as an alias for "http".',
+        enum: ['stdio', 'sse', 'http', 'streamable-http'],
       },
       timeout: {
         type: 'number',