@botconnector/bccli 0.5.2 → 0.5.4

package/bccli-bootstrap.cjs

@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+'use strict'
+
+// This small launcher runs before importing the coding engine. npm's Windows
+// shims use the system Node; on affected releases we may select a known-safe
+// owner-installed Node without changing the system-wide PATH.
+const { spawn, spawnSync } = require('node:child_process')
+const { existsSync } = require('node:fs')
+const { join, resolve } = require('node:path')
+const { pathToFileURL } = require('node:url')
+
+function unsafeWindowsNode(version, platform = process.platform) {
+  const m = /^v?(\d+)\.(\d+)\.(\d+)/.exec(String(version))
+  if (!m) return true
+  const [major, minor, patch] = m.slice(1).map(Number)
+  return platform === 'win32' && major === 24 && (minor < 22 || (minor === 22 && patch < 1))
+}
+function safeRuntime(version) {
+  const m = /^v?(\d+)\.(\d+)\.(\d+)/.exec(String(version))
+  if (!m) return false
+  const [major, minor, patch] = m.slice(1).map(Number)
+  return (major === 22 && (minor > 23 || (minor === 23 && patch >= 4))) ||
+    (major === 24 && (minor > 22 || (minor === 22 && patch >= 1)))
+}
+function selectRuntime({ platform = process.platform, nodeVersion = process.version,
+  execPath = process.execPath, env = process.env,
+  probe = (path) => {
+    const result = spawnSync(path, ['--version'], { encoding: 'utf8', timeout: 5000, windowsHide: true })
+    return result.status === 0 ? result.stdout.trim() : ''
+  },
+  exists = existsSync } = {}) {
+  if (!unsafeWindowsNode(nodeVersion, platform)) return execPath
+  const candidates = [
+    env.BCCLI_NODE_EXECUTABLE,
+    env.LOCALAPPDATA && join(env.LOCALAPPDATA, 'BotConnector', 'BCCLI-Preview', 'runtime', 'node.exe'),
+  ].filter(Boolean)
+  for (const candidate of candidates) {
+    const path = resolve(candidate)
+    if (path === resolve(execPath) || !exists(path)) continue
+    if (safeRuntime(probe(path))) return path
+  }
+  throw Error('BCCLI requires Node.js 24.22.1+ or 22.23.4+ on Windows. Set BCCLI_NODE_EXECUTABLE to an installed compatible node.exe, or update Node.js. No coding request was sent.')
+}
+async function main() {
+  const exe = selectRuntime()
+  const entry = join(__dirname, 'cli.mjs')
+  if (exe === process.execPath) {
+    await import(pathToFileURL(entry).href)
+    return
+  }
+  const child = spawn(exe, [entry, ...process.argv.slice(2)], {
+    stdio: 'inherit', cwd: process.cwd(), env: process.env, windowsHide: false, shell: false,
+  })
+  child.once('error', (error) => { console.error('BCCLI runtime launch failed: ' + error.message); process.exitCode = 1 })
+  child.once('exit', (code, signal) => { process.exitCode = code ?? (signal ? 130 : 1) })
+}
+if (require.main === module) main().catch((error) => {
+  console.error(error.message)
+  process.exitCode = 1
+})
+module.exports = { unsafeWindowsNode, safeRuntime, selectRuntime }

package/branding.mjs

@@ -5,7 +5,6 @@ import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, renameSync, r
 import { basename, dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { homedir } from 'node:os'
-import { BCCLI_MODEL_COMMAND } from './model-command.mjs'
 import { BCCLI_PROVIDER_COMMAND } from './provider-command.mjs'
 import { BCCLI_PROVIDER_DIALOG } from './provider-dialog.mjs'
 
@@ -33,7 +32,7 @@ const SOURCE_HASHES = Object.freeze({
   'chunks/chunk-B3ZFUGTC.js': 'f3f57aafbaeab56ca58f5d3173751d30e5fef815aeaf8dc9b46e6ea9e85eb528',
   'chunks/chunk-GGVWG4SI.js': '945c7f4e9b3697003c165b7bc5d007c9b87140d1fad7be084d7b253d8d2b476c',
 })
-const BRAND_REVISION = 'bccli-new-20261031-safe-core-tools-v14-atomic-patch'
+const BRAND_REVISION = 'bccli-20261031-opentui-provider-fallback-v17'
 // Deliberately not Qwen's blue→purple→rose gradient. BotConnector-facing
 // coding CLI uses a distinct teal→green→amber palette in dark/light themes.
 export const BCCLI_COLORS = Object.freeze(['#00AFA0', '#22C55E', '#EAB308'])
@@ -66,9 +65,11 @@ function replaceOnce(text, oldValue, newValue, label) {
 
 
 // Embedded slash commands are part of the upstream renderer bundle. BCCLI's
-// Gateway owns authentication, model eligibility and release management, so
-// those commands must not open arbitrary upstream provider settings or invoke
-// the upstream npm / standalone auto-updater.
+// Gateway owns authentication and release management, so those commands must
+// not open arbitrary upstream provider settings or invoke the upstream npm /
+// standalone auto-updater. /model intentionally stays upstream-owned: the
+// interactive picker is fed by the gateway catalog that BCCLI writes into the
+// session's modelProviders (see dialog-models.mjs).
 export function guardUpstreamProviderCommands(text) {
   const replacements = [
     {
@@ -76,11 +77,6 @@ export function guardUpstreamProviderCommands(text) {
       detect: 'dialog:"auth"',
       code: BCCLI_PROVIDER_COMMAND,
     },
-    {
-      command: 'model',
-      detect: 'dialog:"model"',
-      code: BCCLI_MODEL_COMMAND,
-    },
     {
       command: 'settings',
       detect: 'dialog:"settings"',
@@ -249,6 +245,12 @@ export function patchUiChunk(file, text) {
       'customBannerTitle?customBannerTitle:">_ BCCLI | BotConnector"',
       'Ink banner title',
     )
+    if (result.includes('const versionLabel=formatVersionLabel(version);')) {
+      result = replaceOnce(result,
+        'const versionLabel=formatVersionLabel(version);',
+        'const versionLabel="engine "+formatVersionLabel(version);',
+        'Clarify upstream engine version in BCCLI banner')
+    }
     result = replaceOnce(result,
       'Add a QWEN.md file to give Qwen Code persistent project context.',
       'Use /help to explore BCCLI tools and commands.',

package/cli.mjs

@@ -1,13 +1,20 @@
 #!/usr/bin/env node
 import { readFileSync } from 'node:fs'
-import { DEFAULT_MODEL, assertCandidateRuntimeSupported, discoverModels, launchQwen, parseArgs, resolveQwenEntrypoint, resolveTrustedMcpConfig, selectModel } from './core.mjs'
+import { DEFAULT_MODEL, assertCandidateRuntimeSupported, discoverModels, launchQwen, parseArgs, resolveQwenEntrypoint, resolveTrustedMcpConfig, selectModel, sessionHome } from './core.mjs'
 import { prepareBrandedQwen } from './branding.mjs'
+import { readDialogSelectedModel } from './dialog-models.mjs'
 import { botConnectorCredentialStatus } from './credentials.mjs'
 import { resolveProvider, selectedProvider, providerDefinition, isConfigured } from './providers.mjs'
 import { runProviderCommand } from './provider-cli.mjs'
 import { startupMenu, autoSelectStartup, PROVIDER_SWITCH_EXIT } from './startup-menu.mjs'
 import { legacyCompatibilityMode, runLegacyCli } from './legacy-compat.mjs'
 
+// An unreadable or unsafe settings file must not block startup; the picker
+// simply falls back to the legacy active-model record.
+function dialogModel(providerId) {
+  try { return readDialogSelectedModel(sessionHome(providerId, process.env)) } catch { return undefined }
+}
+
 function help() {
   console.log([
     'BCCLI | BotConnector Coding Agent',
@@ -84,18 +91,22 @@ async function main() {
   if (!args.prompt && !process.stdin.isTTY) throw Error('Interactive mode requires a TTY; use -p "prompt".')
   const mcpConfig = resolveTrustedMcpConfig(args.mcpConfig)
   let chosen
+  let catalog
   const showPicker = args.command === 'chat' && !args.prompt && !args.model
   if (showPicker) {
     chosen = forceChoose ? undefined : await autoSelectStartup({
       ...(args.provider ? { providerId: args.provider } : {}),
+      dialogModel,
     })
     if (!chosen) chosen = await startupMenu({
       ...(args.provider ? { currentProvider: () => args.provider } : {}),
+      dialogModel,
     })
   } else {
     const providerId = args.provider ?? selectedProvider()
     const profile = resolveProvider(providerId)
     const models = await discoverModels({ key: profile.key, endpoint: profile.endpoint })
+    catalog = models
     const requested = args.model ??
       (providerId === 'botconnector' ? (process.env.BOTCONNECTOR_MODEL_ID ?? DEFAULT_MODEL) : undefined)
     if (!requested) throw Error('Use --model MODEL_ID for ' + providerId + '.')
@@ -109,15 +120,16 @@ async function main() {
     const code = await launchQwen({
       key: chosen.key, model: chosen.model, prompt: args.prompt,
       mcpConfig, entrypoint, upstream: chosen.endpoint,
-      providerId: chosen.providerId, continueSession, resumeSession,
+      providerId: chosen.providerId, continueSession, resumeSession, catalog,
     })
     if (code !== PROVIDER_SWITCH_EXIT) return code
     if (args.prompt || !process.stdin.isTTY) throw Error('Provider menu requires an interactive terminal.')
     // Older cached engine fallback only. Current /provider switches the live
     // parent proxy and model Config without exiting or exposing API keys.
     resumeSession = undefined // Native picker is used only on the first launch.
+    catalog = undefined // The next provider has its own eligible model list.
     const previousProvider = chosen.providerId
-    chosen = await startupMenu()
+    chosen = await startupMenu({ dialogModel })
     continueSession = previousProvider === chosen.providerId
   }
 }

package/core.mjs

@@ -7,11 +7,27 @@ import { dirname, join, isAbsolute } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { startGatewayProxy } from './proxy.mjs'
 import { GATEWAY } from './gateway.mjs'
-import { listProviderDefinitions } from './providers.mjs'
+import { listProviderDefinitions, providerRoot } from './providers.mjs'
+import { ensureIsolatedSessionSettings } from './session-settings.mjs'
+import { syncDialogModelCatalog } from './dialog-models.mjs'
 
 export { GATEWAY } from './gateway.mjs'
 export const DEFAULT_MODEL = 'ling-3.0-flash'
 
+// One engine home per provider keeps /model persistence provider-scoped.
+// BCCLI_PREVIEW_HOME (already the owner config/key root) also relocates the
+// engine home so isolated runs and tests never write to the real user profile.
+export function sessionHome(providerId, env = process.env) {
+  const override = typeof env.BCCLI_PREVIEW_HOME === 'string' ? env.BCCLI_PREVIEW_HOME.trim() : ''
+  if (override) {
+    if (!isAbsolute(override)) throw Error('BCCLI_PREVIEW_HOME must be absolute.')
+    return providerId === 'botconnector' ? override : join(override, 'sessions-' + providerId)
+  }
+  return providerId === 'botconnector'
+    ? join(homedir(), '.bccli-preview')
+    : join(homedir(), '.bccli-preview', 'sessions-' + providerId)
+}
+
 // Qwen Code 0.26.3 Windows tool-loop exits cleanly with Node 24.22.1
 // (GitHub Actions), but repeatedly crashes on Windows Node 24.18.0
 // with libuv UV_HANDLE_CLOSING after delivering the tool result.
@@ -21,7 +37,7 @@ export function assertCandidateRuntimeSupported({ platform = process.platform, n
   if (!parts) throw Error('Cannot verify the Node.js version for BCCLI candidate.')
   const major = Number(parts[1]), minor = Number(parts[2]), patch = Number(parts[3])
   if (platform === 'win32' && major === 24 && (minor < 22 || (minor === 22 && patch < 1))) {
-    throw Error('Windows Node.js ' + nodeVersion + ' may crash after coding tools. Use Node.js 24.22.1 or newer, or Node.js 22.23.4. Existing public BCCLI is unaffected.')
+    throw Error('Windows Node.js ' + nodeVersion + ' may crash after coding tools. Use Node.js 24.22.1 or newer, or Node.js 22.23.4. No coding request was sent.')
   }
 }
 const MODEL_ID = /^[a-zA-Z0-9][a-zA-Z0-9._:/+-]{0,255}$/
@@ -209,7 +225,7 @@ export function childEnvironment(base, key, model, { endpoint = GATEWAY, home, p
   env.OPENAI_BASE_URL = endpoint
   env.OPENAI_MODEL = model
   env.QWEN_MODEL = model
-  env.QWEN_HOME = home ?? (providerId === 'botconnector' ? join(homedir(), '.bccli-preview') : join(homedir(), '.bccli-preview', 'sessions-' + providerId))
+  env.QWEN_HOME = home ?? sessionHome(providerId, env)
   env.BCCLI_ACTIVE_PROVIDER = providerId
   env.BCCLI_WEB_SEARCH_AVAILABLE = searchAvailable ? '1' : '0'
   env.CLI_TITLE = 'BCCLI - ' + process.cwd().split(/[\\/]/).filter(Boolean).at(-1)
@@ -219,8 +235,9 @@ export function childEnvironment(base, key, model, { endpoint = GATEWAY, home, p
 
 // Explicit MCP servers run local commands on startup, so they must originate
 // from a config file the user deliberately placed outside any cloned project.
-// Full engine auto-discovery is subject to upstream workspace trust.
-export function resolveTrustedMcpConfig(input, { home = join(homedir(), '.bccli-preview') } = {}) {
+// Full engine auto-discovery is subject to upstream workspace trust. The owner
+// config root follows BCCLI_PREVIEW_HOME so an isolated home is fully isolated.
+export function resolveTrustedMcpConfig(input, { home = providerRoot() } = {}) {
   if (!input) return undefined
   if (!isAbsolute(input)) throw Error('MCP config must use an absolute path.')
   let realHome, file, stats
@@ -259,15 +276,28 @@ export function resolveQwenEntrypoint() {
   return join(dirname(require.resolve('@qwen-code/qwen-code/package.json')), 'cli-entry.js')
 }
 
-export async function launchQwen({ key, model, prompt, mcpConfig, continueSession = false, resumeSession, upstream = GATEWAY, providerId = 'botconnector', env = process.env, entrypoint = resolveQwenEntrypoint(), spawnImpl = spawn, proxyFactory = startGatewayProxy }) {
+export async function launchQwen({ key, model, prompt, mcpConfig, continueSession = false, resumeSession, upstream = GATEWAY, providerId = 'botconnector', env = process.env, entrypoint = resolveQwenEntrypoint(), spawnImpl = spawn, proxyFactory = startGatewayProxy, catalog }) {
   // The real API key never enters Qwen, its tools, or any MCP child process.
   // Only this launcher retains it while the ephemeral proxy is running.
   const searchApiKey = env.BRAVE_SEARCH_API_KEY
   const proxy = await proxyFactory({ key, endpoint: upstream, liveProvider: true, initialProvider: providerId, searchApiKey })
   try {
     const args = [entrypoint, ...qwenArguments(model, prompt, proxy.baseUrl, { mcpConfig, continueSession, resumeSession, projectDir: process.cwd() })]
+    const childEnv = childEnvironment(env, proxy.token, model, { endpoint: proxy.baseUrl, providerId, searchAvailable: Boolean(searchApiKey?.trim()) })
+    ensureIsolatedSessionSettings(childEnv.QWEN_HOME)
+    // The upstream /model picker needs the catalog in modelProviders; without
+    // it the dialog only knows the single OPENAI_MODEL route. Never block a
+    // launch on catalog failure: chat still works with the startup model.
+    if (proxyFactory === startGatewayProxy) {
+      try {
+        const dialogCatalog = catalog ?? await discoverModels({ key, endpoint: upstream })
+        syncDialogModelCatalog(childEnv.QWEN_HOME, { models: dialogCatalog, baseUrl: proxy.baseUrl })
+      } catch (error) {
+        if (env.BCCLI_DEBUG) console.error('BCCLI: model picker catalog unavailable: ' + (error instanceof Error ? error.message : 'unknown'))
+      }
+    }
     const child = spawnImpl(process.execPath, args, {
-      cwd: process.cwd(), env: childEnvironment(env, proxy.token, model, { endpoint: proxy.baseUrl, providerId, searchAvailable: Boolean(searchApiKey?.trim()) }),
+      cwd: process.cwd(), env: childEnv,
       stdio: 'inherit', windowsHide: false, shell: false,
     })
     return await new Promise((resolve, reject) => {

package/dialog-models.mjs

@@ -0,0 +1,114 @@
+// The upstream /model picker lists models from settings.modelProviders. BCCLI's
+// engine can only reach the parent-owned loopback proxy, so publish the live
+// gateway catalog into the per-provider QWEN_HOME as one OpenAI-compatible
+// provider. The picker itself stays upstream-owned (arrow keys, search,
+// --global/--project and one-off prompts); BCCLI only supplies the eligible
+// model set and reads back the persisted selection.
+import { lstatSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
+import { randomBytes } from 'node:crypto'
+import { join } from 'node:path'
+
+const MODEL_ID = /^[a-zA-Z0-9][a-zA-Z0-9._:/+-]{0,255}$/
+const LOOPBACK_ENDPOINT = /^http:\/\/127\.0\.0\.1:[0-9]{1,5}\/v1$/
+const MAX_SETTINGS_BYTES = 1024 * 1024
+
+export function buildDialogProviders(models, baseUrl) {
+  if (typeof baseUrl !== 'string' || !LOOPBACK_ENDPOINT.test(baseUrl)) {
+    throw Error('Model picker requires the local loopback provider endpoint.')
+  }
+  if (!Array.isArray(models) || models.length === 0) {
+    throw Error('Model picker requires a non-empty provider catalog.')
+  }
+  return models.map((item) => {
+    const id = item?.id
+    if (typeof id !== 'string' || !MODEL_ID.test(id)) {
+      throw Error('Invalid provider model id for the model picker.')
+    }
+    const name = typeof item?.name === 'string' && item.name.trim() ? item.name.trim().slice(0, 90) : id
+    return { id, name, baseUrl, envKey: 'OPENAI_API_KEY' }
+  })
+}
+
+// Keep unrelated settings and other configured providers byte-for-byte; only
+// the OpenAI-compatible entry is owned by the live loopback proxy.
+export function mergeDialogProviders(settings, providers) {
+  const base = settings && typeof settings === 'object' && !Array.isArray(settings) ? settings : {}
+  const existing = base.modelProviders
+  const modelProviders = existing && typeof existing === 'object' && !Array.isArray(existing) ? existing : {}
+  return { ...base, modelProviders: { ...modelProviders, openai: providers } }
+}
+
+function readSettings(home) {
+  const info = lstatSync(home)
+  if (!info.isDirectory() || info.isSymbolicLink()) {
+    throw Error('BCCLI session directory must not be a symlink.')
+  }
+  const file = join(home, 'settings.json')
+  let stats
+  try {
+    stats = lstatSync(file)
+  } catch {
+    return {}
+  }
+  if (!stats.isFile() || stats.isSymbolicLink()) {
+    throw Error('BCCLI session settings must be a regular file.')
+  }
+  if (stats.size > MAX_SETTINGS_BYTES) throw Error('BCCLI session settings are too large.')
+  const text = readFileSync(file, 'utf8').trim()
+  if (!text) return {}
+  const parsed = JSON.parse(text)
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw Error('BCCLI session settings must contain a JSON object.')
+  }
+  return parsed
+}
+
+function writeSettings(home, settings) {
+  const file = join(home, 'settings.json')
+  const tmp = file + '.' + randomBytes(8).toString('hex') + '.tmp'
+  try {
+    writeFileSync(tmp, JSON.stringify(settings, null, 2) + '\n', { flag: 'wx', encoding: 'utf8', mode: 0o600 })
+    renameSync(tmp, file)
+  } finally {
+    rmSync(tmp, { force: true })
+  }
+}
+
+// A picker selection persists model.baseUrl alongside the id. The proxy port is
+// ephemeral, so clear only an endpoint this module previously injected once the
+// loopback port changes; unrelated endpoints are never rewritten.
+function clearStalePickerEndpoint(settings, baseUrl) {
+  const injected = settings.modelProviders?.openai
+  if (!Array.isArray(injected)) return settings
+  const previous = new Set(injected
+    .map((entry) => entry?.baseUrl)
+    .filter((url) => typeof url === 'string' && LOOPBACK_ENDPOINT.test(url)))
+  const model = settings.model
+  if (!model || typeof model !== 'object' || Array.isArray(model)) return settings
+  if (typeof model.baseUrl !== 'string' || !previous.has(model.baseUrl) || model.baseUrl === baseUrl) return settings
+  return { ...settings, model: { ...model, baseUrl: '' } }
+}
+
+// Returns true only when the catalog actually changed, so a normal relaunch
+// does not touch the user's settings file.
+export function syncDialogModelCatalog(home, { models, baseUrl }) {
+  if (typeof home !== 'string' || !home.trim()) throw Error('BCCLI session home missing.')
+  const providers = buildDialogProviders(models, baseUrl)
+  mkdirSync(home, { recursive: true, mode: 0o700 })
+  const current = clearStalePickerEndpoint(readSettings(home), baseUrl)
+  const next = mergeDialogProviders(current, providers)
+  if (JSON.stringify(next) === JSON.stringify(current)) return false
+  writeSettings(home, next)
+  return true
+}
+
+// The upstream picker persists the chosen id to settings.model.name. Read it
+// back so the next launch (and the pre-launch menu) starts on the same model.
+export function readDialogSelectedModel(home) {
+  if (typeof home !== 'string' || !home.trim()) return undefined
+  const settings = readSettings(home)
+  const name = settings.model?.name
+  if (typeof name !== 'string') return undefined
+  const trimmed = name.trim()
+  return MODEL_ID.test(trimmed) ? trimmed : undefined
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@botconnector/bccli",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "BCCLI | Full coding engine and legacy SDK with verified Apache-2.0 bundled runtime",
   "type": "module",
   "bin": {
-    "bccli": "./cli.mjs"
+    "bccli": "./bccli-bootstrap.cjs"
   },
   "engines": {
     "node": ">=22"
@@ -24,7 +24,7 @@
     "test": "node --test test/*.test.mjs",
     "test:security": "node --test test/security-e2e.test.mjs test/proxy-mcp-e2e.test.mjs test/trusted-mcp.test.mjs test/proxy.test.mjs",
     "test:integration": "node --test test-integration/*.test.mjs",
-    "build": "node --check cli.mjs && node --check core.mjs && node --check proxy.mjs && node --check gateway.mjs && node --check branding.mjs && node --check credentials.mjs && node --check model-command.mjs && node --check providers.mjs && node --check provider-cli.mjs && node --check startup-menu.mjs",
+    "build": "node --check cli.mjs && node --check core.mjs && node --check proxy.mjs && node --check gateway.mjs && node --check branding.mjs && node --check credentials.mjs && node --check dialog-models.mjs && node --check providers.mjs && node --check provider-cli.mjs && node --check startup-menu.mjs",
     "rebuild": "npm run build && npm test && npm pack --ignore-scripts"
   },
   "license": "Apache-2.0",
@@ -36,12 +36,14 @@
     "LICENSE",
     "THIRD_PARTY_NOTICES.md",
     "cli.mjs",
+    "bccli-bootstrap.cjs",
+    "session-settings.mjs",
     "core.mjs",
     "proxy.mjs",
     "gateway.mjs",
     "branding.mjs",
     "credentials.mjs",
-    "model-command.mjs",
+    "dialog-models.mjs",
     "providers.mjs",
     "provider-cli.mjs",
     "startup-menu.mjs",
@@ -79,8 +81,8 @@
   },
   "bccliRuntimeSource": {
     "repository": "https://github.com/farijarifriyanto-debug/bccli-runtime",
-    "commit": "bc4924b0613a759bbd46da414b506b68a2f444ff",
-    "release": "bccli-v0.5.2",
-    "originalSha256": "a801ea65e710dd5825d2867c0df9ed6e172417214bb64d77a9960e7dae1a3c5e"
+    "commit": "999fe7d6179954f45e9492c55a8384cd93a51737",
+    "release": "bccli-v0.5.4",
+    "originalSha256": "52702af547846044b9aa36d0f7be33816d3fd26cdcb05f8bb3bdd30b3d290da3"
   }
 }

package/provider-command.mjs

@@ -21,12 +21,18 @@ export const BCCLI_PROVIDER_COMMAND = String.raw`var authCommand={name:"provider
     if(!Array.isArray(data?.providers))return response("error","Provider list unavailable.");
     var providers=data.providers;
     var current=data.active||"(unknown)";
+    // OpenTUI renders the upstream AuthDialog for dialog:"auth", which would
+    // expose provider settings BCCLI does not own. Keep the same gateway-owned
+    // text flow there instead of opening that dialog.
+    var openTui=process.env.QWEN_TUI_RENDERER==="opentui";
+    var listText=()=>"BCCLI providers — active: "+current+"\n\n"+providers.map((p,i)=>(i+1)+". "+p.id+" — "+p.name+(p.active?" [ACTIVE]":"")+(p.configured?" [configured]":" [API key required]")).join("\n")+"\n\nChoose: /provider NUMBER or /provider NAME\nSave/replace key: /provider add NAME\nDelete saved key: /provider remove NAME\nSelect AI: /provider NAME MODEL_ID\nKeys open a hidden Windows dialog; NEVER paste keys into chat.";
     if(!params.length){
+      if(openTui)return response("info",listText());
       delete process.env.BCCLI_PROVIDER_PICKER_FOCUS;
       return {type:"dialog",dialog:"auth"};
     }
     if(params[0]==="list"){
-      return response("info","BCCLI providers — active: "+current+"\n\n"+providers.map((p,i)=>(i+1)+". "+p.id+" — "+p.name+(p.active?" [ACTIVE]":"")+(p.configured?" [configured]":" [API key required]")).join("\n")+"\n\nChoose: /provider NUMBER or /provider NAME\nSave/replace key: /provider add NAME\nDelete saved key: /provider remove NAME\nSelect AI: /provider NAME MODEL_ID\nKeys open a hidden Windows dialog; NEVER paste keys into chat.");
+      return response("info",listText());
     }
     if(params.length===1&&params[0].toLowerCase()==="add"){
       const created=await request("/bccli/provider/custom/add",{method:"POST",timeoutMs:190000,
@@ -53,7 +59,7 @@ export const BCCLI_PROVIDER_COMMAND = String.raw`var authCommand={name:"provider
       return response("error","The key operation was not confirmed.");
     }
     var id=/^[0-9]+$/.test(params[0])?providers[Number(params[0])-1]?.id:params[0].toLowerCase();
-    if(params.length===1&&providers.some(p=>p.id===id)){
+    if(params.length===1&&providers.some(p=>p.id===id)&&!openTui){
       process.env.BCCLI_PROVIDER_PICKER_FOCUS=id;
       return {type:"dialog",dialog:"auth"};
     }

package/session-settings.mjs

@@ -0,0 +1,26 @@
+// A provider-scoped QWEN_HOME is intentionally separate from ~/.qwen.
+// The upstream engine warns when the isolated directory has no settings.json;
+// create only the minimal blank configuration, never migrate tokens or plugins.
+import { existsSync, lstatSync, mkdirSync, writeFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+
+export function ensureIsolatedSessionSettings(home) {
+  if (typeof home !== 'string' || !home.trim()) throw Error('BCCLI session home missing.')
+  mkdirSync(home, { recursive: true, mode: 0o700 })
+  for (const dir of [dirname(home), home]) {
+    const info = lstatSync(dir)
+    if (!info.isDirectory() || info.isSymbolicLink()) throw Error('BCCLI session directory must not be a symlink.')
+  }
+  const file = join(home, 'settings.json')
+  if (existsSync(file)) {
+    if (!lstatSync(file).isFile()) throw Error('BCCLI session settings must be a regular file.')
+    return false
+  }
+  try {
+    writeFileSync(file, '{}\n', { flag: 'wx', mode: 0o600 })
+  } catch (error) {
+    if (error.code !== 'EEXIST' || !lstatSync(file).isFile()) throw error
+    return false
+  }
+  return true
+}

package/startup-menu.mjs

@@ -14,19 +14,24 @@ export async function autoSelectStartup({
   providerId = selectedProvider(),
   configured = isConfigured,
   remembered = selectedModel,
+  dialogModel = () => undefined,
   resolve = resolveProvider,
   list = discoverModels,
   defaultModel = DEFAULT_MODEL,
   env = process.env,
 } = {}) {
   if (!configured(providerId)) return undefined
-  const requested = providerId === 'botconnector'
-    ? (env.BOTCONNECTOR_MODEL_ID || remembered(providerId) || defaultModel)
-    : remembered(providerId)
-  if (!requested) return undefined
+  // A model chosen in the upstream /model picker is persisted in the engine's
+  // per-provider settings; it wins over the older active-model file, but only
+  // when the live catalog still offers it.
+  const candidates = providerId === 'botconnector'
+    ? [env.BOTCONNECTOR_MODEL_ID, dialogModel(providerId), remembered(providerId), defaultModel]
+    : [dialogModel(providerId), remembered(providerId)]
+  if (!candidates.some(Boolean)) return undefined
   const profile = resolve(providerId)
   const models = await list({ key: profile.key, endpoint: profile.endpoint })
-  if (!models.some(item => item.id === requested)) return undefined
+  const requested = candidates.find(id => id && models.some(item => item.id === id))
+  if (!requested) return undefined
   return { providerId, model: selectModel(models, requested), key: profile.key, endpoint: profile.endpoint }
 }
 
@@ -52,6 +57,7 @@ export async function startupMenu({
   saveKey = saveProviderKey,
   use = useProvider,
   remembered = selectedModel,
+  dialogModel = () => undefined,
   saveModel = saveSelectedModel,
   resolve = resolveProvider,
   list = discoverModels,
@@ -90,7 +96,7 @@ export async function startupMenu({
   const models = await list({ key: profile.key, endpoint: profile.endpoint })
   if (!models.length) throw Error('Tidak ada model untuk provider ini.')
   const all = [...models].sort((a, b) => a.id.localeCompare(b.id))
-  const previous = remembered(providerId)
+  const previous = dialogModel(providerId) ?? remembered(providerId)
   const preferred = all.some(m => m.id === previous) ? previous :
     providerId === 'botconnector' && all.some(m => m.id === defaultModel) ? defaultModel : undefined
   let filtered = all

package/model-command.mjs

@@ -1,61 +0,0 @@
-// Generated, version-pinned Qwen slash command overlay for /model.
-// Fetches the authenticated model catalog from the existing local BotConnector
-// proxy on each invocation. Selection changes Qwen Config in the current
-// session; it never opens upstream provider settings or writes project config.
-export const BCCLI_MODEL_COMMAND = String.raw`var bccliModelLastList=[];var modelCommand={name:"model",get description(){return "Choose an AI model from the active provider"},argumentHint:"[number|model-id|search WORD|page N]",kind:"built-in",supportedModes:["interactive","non_interactive","acp"],action:__name(async(context,argumentText)=>{
-  var response=(type,content)=>({type:"message",messageType:type,content});
-  try{
-    var base=process.env.OPENAI_BASE_URL||"";
-    var key=process.env.OPENAI_API_KEY||"";
-    if(!/^http:\/\/127\.0\.0\.1:[0-9]{1,5}\/v1$/.test(base)||!key){
-      return response("error","BCCLI requires an authenticated local provider session.");
-    }
-    var result=await fetch(base+"/models",{method:"GET",headers:{Authorization:"Bearer "+key,Accept:"application/json"},redirect:"error",signal:AbortSignal.timeout(10000)});
-    if(!result.ok)return response("error","Provider model catalog is unavailable (HTTP "+result.status+"). No provider fallback.");
-    var payload=await result.json();
-    if(!Array.isArray(payload?.data))return response("error","Invalid provider model catalog.");
-    var catalog=new Map();
-    for(var entry of payload.data){
-      if(typeof entry?.id==="string" && /^[a-zA-Z0-9][a-zA-Z0-9._:/+-]{0,255}$/.test(entry.id) && !catalog.has(entry.id)){
-        catalog.set(entry.id,{id:entry.id,name:typeof entry.name==="string"?entry.name.slice(0,90):entry.id});
-      }
-    }
-    var all=[...catalog.values()].sort((a,b)=>a.id.localeCompare(b.id));
-    if(!all.length)return response("error","No provider models available for this API key.");
-    var text=String(context.invocation?.args||argumentText||"").trim();
-    var config=context.services?.config;
-    if(!config||typeof config.setModel!=="function")return response("error","BCCLI model switch is unavailable in this session.");
-    var current=config.getModel?.()||process.env.OPENAI_MODEL||"(unknown)";
-    var list=(entries,page=1)=>{
-      bccliModelLastList=entries.map(x=>x.id);
-      var size=12;
-      var pages=Math.max(1,Math.ceil(entries.length/size));
-      if(!Number.isSafeInteger(page)||page<1||page>pages)return response("error","Invalid page. Use /model page 1 ... "+pages);
-      var start=(page-1)*size;
-      var rows=entries.slice(start,start+size).map((x,i)=>(start+i+1)+". "+x.id+(x.id===current?"  [ACTIVE]":""));
-      return response("info","Provider AI models ("+entries.length+" available; page "+page+"/"+pages+")\nActive: "+current+"\n\n"+rows.join("\n")+"\n\nUse /model NUMBER or /model MODEL_ID to switch now; /model page N; /model search KEYWORD. To manage providers and their keys in this chat, use /provider, /provider add NAME or /provider remove NAME; then /provider NAME MODEL_ID.");
-    };
-    if(!text)return list(all);
-    var page=text.match(/^page\s+([0-9]+)$/i);
-    if(page)return list(all,Number(page[1]));
-    var search=text.match(/^search\s+(.{1,80})$/i);
-    if(search)return list(all.filter(x=>x.id.toLowerCase().includes(search[1].toLowerCase())||x.name.toLowerCase().includes(search[1].toLowerCase())));
-    var item;
-    if(/^[0-9]+$/.test(text)){
-      var index=Number(text);
-      item=Number.isSafeInteger(index)&&index>=1?catalog.get(bccliModelLastList[index-1]||all[index-1]?.id):undefined;
-    }else if(/^[a-zA-Z0-9][a-zA-Z0-9._:/+-]{0,255}$/.test(text)){
-      item=catalog.get(text);
-    }
-    if(!item)return response("error","That model is not available in your active provider catalog. Run /model to view allowed models.");
-    if(item.id===current)return response("info","Already using "+item.id+" via the active provider.");
-    // Raw model IDs are supported by Config.setModel; this preserves OpenAI
-    // auth/loopback proxy instead of switching providers. It refreshes the
-    // live content generator, so the next message uses the new model.
-    await config.setModel(item.id,{reason:"bccli-gateway-model-picker"});
-    if(config.getModel?.()!==item.id)return response("error","Model switch did not take effect; previous model preserved.");
-    return response("info","Switched to "+item.id+" in the current session. Routing and billing remain with the active provider.");
-  }catch{
-    return response("error","Provider model selection failed; no upstream provider fallback was used.");
-  }
-},"action")};`