blun-king-cli 9.1.628-pruefpaket.modules.r7 → 9.1.629

package/bin/launcher-runtime.js

@@ -40,8 +40,142 @@ const {
   writePrivateFile,
 } = require('./private-paths');
 
+const { writeTelegramTemplate } = require('./rename-private-staging.cjs');
 const PKG = path.resolve(__dirname, '..');
-const ARGS = process.argv.slice(2);
+const { parseProfileLaunchArgs, resolveSelectedProfile } = require('./profile-launch.cjs');
+
+// Generated from actual 628 Commander registrations; see GRAMMAR-628.json.
+// No subcommand option arity table: subcommand tails belong to Core.
+const ROOT_OPTION_ARITY = Object.freeze({
+  "-V": "flag",
+  "--version": "flag",
+  "--local": "flag",
+  "--message": "required",
+  "--history-limit": "required",
+  "--timeout-ms": "required",
+  "--thinking": "required",
+  "--url": "required",
+  "--token": "required",
+  "--password": "required",
+  "--tls-fingerprint": "required",
+  "-S": "optional",
+  "--session": "optional",
+  "-r": "optional",
+  "--resume": "optional",
+  "-c": "flag",
+  "--continue": "flag",
+  "-C": "flag",
+  "-y": "flag",
+  "--yolo": "flag",
+  "--auto": "flag",
+  "-p": "required",
+  "--prompt": "required",
+  "--output-format": "required",
+  "--skills-dir": "required",
+  "--add-dir": "required",
+  "--effort": "required",
+  "--permission-mode": "required",
+  "--fork-session": "required",
+  "--allowed-tools": "required",
+  "--settings": "required",
+  "--yes": "flag",
+  "--auto-approve": "flag",
+  "--plan": "flag",
+  "-h": "flag",
+  "--help": "flag"
+});
+const ROOT_COMMAND_NAMES = new Set(["export","proof","brief","handoff","replay","guard","demo","workspace","acp","server","web","login","mistakes","memory","doctor","config","agents","sessions","status","models","logs","vis","setup","docs","upgrade","update","__plugin_run_node","tui","chat","terminal"]);
+
+function parseExplicitProfileArgs(args, mode) {
+  if (mode !== LAUNCHER_MODES.KING) return { args: [...args], name: undefined };
+  const remaining = [];
+  let name;
+  let firstOperandSeen = false;
+  let unknownDestination = false;
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === '--') {
+      remaining.push(...args.slice(i));
+      break;
+    }
+    if (arg === '--profile' || arg.startsWith('--profile=')) {
+      if (name !== undefined) throw new Error('--profile darf nur einmal angegeben werden.');
+      if (arg !== '--profile') throw new Error('--profile braucht einen getrennten Profilnamen.');
+      const pair = i + 1 < args.length ? [arg, args[++i]] : [arg];
+      name = parseProfileLaunchArgs(pair, mode).name;
+      continue;
+    }
+    remaining.push(arg);
+    let token = arg;
+    let arity;
+    let recognized = false;
+    let attached = false;
+    let separator = false;
+    // Replay Commander's virtual tokens after each BOOLEAN short option.
+    // The remainder can itself become --, a long option, or a value option:
+    // -cy- -> -c -y --; -cy-prompt -> -c -y --prompt.
+    for (;;) {
+      if (token === '--') { separator = true; break; }
+      arity = Object.hasOwn(ROOT_OPTION_ARITY, token) ? ROOT_OPTION_ARITY[token] : undefined;
+      recognized = arity !== undefined;
+      if (recognized) break;
+      if (token.length > 2 && token[0] === '-' && token[1] !== '-') {
+        const short = '-' + token[1];
+        arity = ROOT_OPTION_ARITY[short];
+        if (arity !== undefined) {
+          if (arity !== 'flag') { recognized = true; attached = true; break; }
+          token = '-' + token.slice(2);
+          continue;
+        }
+      }
+      if (/^--[^=]+=/u.test(token)) {
+        arity = ROOT_OPTION_ARITY[token.slice(0, token.indexOf('='))];
+        recognized = arity === 'required' || arity === 'optional';
+        attached = recognized;
+      }
+      break;
+    }
+    if (separator) {
+      remaining.push(...args.slice(i + 1));
+      break;
+    }
+    if (recognized) {
+      if (!attached && i + 1 < args.length
+        && (arity === 'required'
+          || (arity === 'optional' && !(args[i + 1].length > 1 && args[i + 1][0] === '-')))) {
+        remaining.push(args[++i]);
+      }
+      continue;
+    }
+    const maybeOption = token.length > 1 && token[0] === '-';
+    if (maybeOption) unknownDestination = true;
+    // Match Commander's first operand/unknown split. A command-looking value
+    // behind -p/-S, a previous positional target or an unknown option is NOT
+    // a new command boundary.
+    if (!unknownDestination && !firstOperandSeen) {
+      if (ROOT_COMMAND_NAMES.has(arg)) {
+        remaining.push(...args.slice(i + 1));
+        break;
+      }
+      firstOperandSeen = true;
+    }
+  }
+  return { args: remaining, name };
+}
+
+const PROFILE = parseExplicitProfileArgs(process.argv.slice(2), launcherModeFromArgv(process.argv));
+const ARGS = PROFILE.args;
+
+function applyProfileEnvironment(env, paths) {
+  env.BLUN_HOME = paths.blunHome;
+  if (PROFILE.name !== undefined) {
+    env.BLUN_SHARED_HOME = paths.sharedHome;
+    env.BLUN_PROFILE = PROFILE.name;
+  } else if (String(env.BLUN_STATE_DIR || '').trim()) {
+    env.BLUN_SHARED_HOME = paths.blunHome;
+  }
+  return env;
+}
 
 function normalizeWindowsPath(value) {
   return path.win32.normalize(value).replace(/\\+$/u, '').toLowerCase();
@@ -51,6 +185,7 @@ function resolveLauncherPrivatePaths(options = {}) {
   const env = options.env || process.env;
   const platform = options.platform || process.platform;
   const configuredHome = String(env.BLUN_HOME || '').trim();
+  const selectedProfile = options.profileName ?? PROFILE.name;
   const stateDir = String(env.BLUN_STATE_DIR || '').trim();
   if (stateDir) {
     const paths = platform === 'win32' ? path.win32 : path.posix;
@@ -77,10 +212,35 @@ function resolveLauncherPrivatePaths(options = {}) {
         ancestor = parent;
       }
     }
+    if (selectedProfile !== undefined) {
+      // A state override cannot bypass the canonical OS-home/profile guards.
+      const profileEnv = { ...env };
+      delete profileEnv.BLUN_STATE_DIR;
+      const selected = resolveLauncherPrivatePaths({ ...options, env: profileEnv, profileName: selectedProfile });
+      const normalize = platform === 'win32' ? normalizeWindowsPath : paths.normalize;
+      if (normalize(blunHome) !== normalize(selected.blunHome)) {
+        throw new Error('BLUN_STATE_DIR widerspricht dem ausgewaehlten Profil.');
+      }
+      return selected;
+    }
     return { blunHome, userHome: (options.homedir || os.homedir)() };
   }
   if (platform !== 'win32') {
+    const posix = path.posix;
     const userHome = (options.homedir || os.homedir)();
+    if (selectedProfile !== undefined) {
+      const configuredShared = String(env.BLUN_SHARED_HOME || '').trim();
+      const sharedHome = configuredShared
+        ? posix.resolve(configuredShared)
+        : configuredHome && posix.basename(posix.dirname(configuredHome)) === 'profile'
+          ? posix.resolve(configuredHome, '..', '..')
+          : configuredHome ? posix.resolve(configuredHome) : posix.join(userHome, '.blun');
+      const blunHome = resolveSelectedProfile(sharedHome, selectedProfile, posix);
+      if (configuredShared && configuredHome && posix.resolve(configuredHome) !== blunHome) {
+        throw new Error(`BLUN_HOME passt nicht zum Profil ${selectedProfile}: ${blunHome}`);
+      }
+      return { blunHome, sharedHome, userHome };
+    }
     return {
       blunHome: configuredHome ? path.resolve(configuredHome) : path.join(userHome, '.blun'),
       userHome,
@@ -107,6 +267,19 @@ function resolveLauncherPrivatePaths(options = {}) {
   }
 
   const blunHome = path.win32.join(userHome, '.blun');
+  if (selectedProfile !== undefined) {
+    const profileHome = resolveSelectedProfile(blunHome, selectedProfile, path.win32);
+    const configuredShared = String(env.BLUN_SHARED_HOME || '').trim();
+    if (configuredShared && normalizeWindowsPath(path.win32.resolve(configuredShared)) !== normalizeWindowsPath(blunHome)) {
+      throw new Error(`BLUN_SHARED_HOME muss unter Windows exakt im Windows-Benutzerprofil liegen: ${blunHome}`);
+    }
+    if (configuredHome && normalizeWindowsPath(path.win32.resolve(configuredHome)) !== normalizeWindowsPath(profileHome)
+      && normalizeWindowsPath(path.win32.resolve(configuredHome)) !== normalizeWindowsPath(blunHome)) {
+      throw new Error(`BLUN_HOME passt nicht zum Profil ${selectedProfile}: ${profileHome}`);
+    }
+    return { blunHome: profileHome, sharedHome: blunHome, userHome };
+  }
+
   if (configuredHome
     && normalizeWindowsPath(path.win32.resolve(configuredHome)) !== normalizeWindowsPath(blunHome)) {
     throw new Error(`BLUN_HOME muss unter Windows exakt im Windows-Benutzerprofil liegen: ${blunHome}`);
@@ -253,7 +426,7 @@ function installTelegramForProfile(packageRoot, blunDir) {
   ensurePrivateDirectory(channelDir);
   const envFile = path.join(channelDir, '.env');
   if (!fs.existsSync(envFile)) {
-    writePrivateFile(envFile, 'BLUN_TELEGRAM_BOT_TOKEN=HIER_DEIN_BOT_TOKEN_EINFUEGEN\n');
+    writeTelegramTemplate(envFile, 'BLUN_TELEGRAM_BOT_TOKEN=HIER_DEIN_BOT_TOKEN_EINFUEGEN\n');
   } else {
     securePrivateFile(envFile);
   }
@@ -289,6 +462,9 @@ function spawnManagedLauncher(binary, cwd) {
 async function runLauncher(options = {}) {
   const callerCwd = process.cwd();
   const mode = options.mode || launcherModeFromArgv(process.argv);
+  if (PROFILE.name !== undefined) {
+    applyProfileEnvironment(process.env, resolveLauncherPrivatePaths());
+  }
   const explicitUpdateRequest = isNpmPackageUpdateRequest(ARGS);
   const explicitToolsRequest = String(ARGS[0] || '').toLowerCase() === 'tools';
   const noticeResult = options.skipUpdateNotice === true
@@ -393,7 +569,7 @@ async function runLauncher(options = {}) {
       const env = createLauncherEnvironment(process.env, mode, readPackageVersion());
       const informationalEnv = { ...process.env };
       delete informationalEnv.BLUN_HOME;
-      env.BLUN_HOME = resolveLauncherPrivatePaths({ env: informationalEnv }).blunHome;
+      applyProfileEnvironment(env, resolveLauncherPrivatePaths({ env: informationalEnv }));
       process.exitCode = await runInformationalCore(ARGS, env, callerCwd, releaseNotice);
       return;
     }
@@ -405,11 +581,11 @@ async function runLauncher(options = {}) {
         process.exitCode = 1;
         return;
       }
-      const blunDir = resolveLauncherPrivatePaths().blunHome;
+      const inspectionPaths = resolveLauncherPrivatePaths();
+      const blunDir = inspectionPaths.blunHome;
       require('./verify-bundled-agent-sources.cjs').verifyBundledAgentSources(PKG);
       const env = createLauncherEnvironment(process.env, LAUNCHER_MODES.BLUN, readPackageVersion(), blunDir);
-      env.BLUN_HOME = blunDir;
-      if (String(process.env.BLUN_STATE_DIR || '').trim()) env.BLUN_SHARED_HOME = blunDir;
+      applyProfileEnvironment(env, inspectionPaths);
       process.exitCode = await runInformationalCore(ARGS, env, callerCwd, releaseNotice);
       return;
     }
@@ -439,7 +615,7 @@ async function runLauncher(options = {}) {
       const env = createLauncherEnvironment(process.env, mode, readPackageVersion());
       const informationalEnv = { ...process.env };
       delete informationalEnv.BLUN_HOME;
-      env.BLUN_HOME = resolveLauncherPrivatePaths({ env: informationalEnv }).blunHome;
+      applyProfileEnvironment(env, resolveLauncherPrivatePaths({ env: informationalEnv }));
       process.exitCode = await superviseProtectedCore(ARGS, env, callerCwd, releaseNotice);
       return;
     }
@@ -529,8 +705,7 @@ async function runLauncher(options = {}) {
 
     // --- 6. Start -----------------------------------------------------------
     const env = createLauncherEnvironment(process.env, mode, readPackageVersion(), blunDir);
-    env.BLUN_HOME = blunDir;
-    if (String(process.env.BLUN_STATE_DIR || '').trim()) env.BLUN_SHARED_HOME = blunDir;
+    applyProfileEnvironment(env, getPrivatePaths());
     process.exitCode = await superviseProtectedCore(
       ARGS,
       env,

package/bin/managed-plugin-selection.cjs

@@ -1,115 +1,116 @@
-'use strict';
-const { createHash, randomUUID } = require('node:crypto');
-const fs = require('node:fs');
-const path = require('node:path');
-const { ensurePrivateDirectory, securePrivateTree } = require('./private-paths');
-const SCHEMA = 'blun.managed-plugin-selection/v1';
-
-function snapshotPluginTree(root) {
-  const entries = [];
-  const rootStat = fs.lstatSync(root);
-  if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) return null;
-  const visit = (directory, relativeDirectory = '') => {
-    for (const entry of fs.readdirSync(directory, { withFileTypes: true })
-      .sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0)) {
-      const relativePath = path.join(relativeDirectory, entry.name);
-      const absolutePath = path.join(directory, entry.name);
-      const stat = fs.lstatSync(absolutePath);
-      if (stat.isSymbolicLink()) return false;
-      if (stat.isDirectory()) {
-        entries.push({ kind: 'directory', path: relativePath });
-        if (!visit(absolutePath, relativePath)) return false;
-      } else if (stat.isFile()) {
-        entries.push({ kind: 'file', path: relativePath, content: fs.readFileSync(absolutePath) });
-      } else return false;
-    }
-    return true;
-  };
-  return visit(root) ? entries : null;
-}
-
-function digestPluginEntries(entries) {
-  if (entries === null) throw new Error('Invalid managed plugin tree');
-  const hash = createHash('sha256');
-  for (const entry of entries) {
-    hash.update(Buffer.from(`${entry.kind}\0${entry.path}\0`, 'utf8'));
-    if (entry.kind === 'file') {
-      const length = Buffer.allocUnsafe(8);
-      length.writeBigUInt64BE(BigInt(entry.content.length));
-      hash.update(length);
-      hash.update(entry.content);
-    }
-  }
-  return hash.digest('hex');
-}
-
-function samePath(left, right) {
-  const normalize = value => process.platform === 'win32' ? path.resolve(value).toLowerCase() : path.resolve(value);
-  return normalize(left) === normalize(right);
-}
-
-function scopedPluginRoot(blunDir, pluginRoot) {
-  const managed = path.resolve(blunDir, 'plugins', 'managed');
-  const root = path.resolve(pluginRoot);
-  if (!samePath(path.dirname(root), managed)) throw new Error('Selected AgentSpine root is outside this profile');
-  for (const directory of [blunDir, path.dirname(managed), managed, root]) {
-    const stat = fs.lstatSync(directory);
-    if (stat.isSymbolicLink() || !stat.isDirectory()) throw new Error('Selected AgentSpine root contains a linked directory');
-  }
-  if (!samePath(path.dirname(fs.realpathSync(root)), fs.realpathSync(managed))) {
-    throw new Error('Selected AgentSpine root resolves outside this profile');
-  }
-  return root;
-}
-
-function describeAgentSpineSelection({ blunDir, pluginRoot }) {
-  const root = scopedPluginRoot(blunDir, pluginRoot);
-  const digest = digestPluginEntries(snapshotPluginTree(root));
-  if (path.basename(root) !== `agent-spine-${digest}`) throw new Error('Selected AgentSpine digest mismatch');
-  return { schema: SCHEMA, digest };
-}
-
-function selectedAgentSpineRoot({ installed, blunDir }) {
-  const records = installed.plugins.filter(record => record.id === 'agent-spine');
-  if (!records.some(record => Object.hasOwn(record, 'managedSelection'))) return null;
-  if (records.length !== 1) throw new Error('Ambiguous AgentSpine selection');
-  const [record] = records;
-  const selection = record.managedSelection;
-  if (!selection || selection.schema !== SCHEMA || !/^[a-f0-9]{64}$/.test(selection.digest || '')
-    || Object.keys(selection).sort().join(',') !== 'digest,schema' || typeof record.root !== 'string') {
-    throw new Error('Invalid AgentSpine selection');
-  }
-  const actual = describeAgentSpineSelection({ blunDir, pluginRoot: record.root });
-  if (actual.digest !== selection.digest) throw new Error('Selected AgentSpine digest mismatch');
-  return record.root;
-}
-
-function copySelectedAgentSpinePlugin({ blunDir, sourceRoot }) {
-  const plugins = path.resolve(blunDir, 'plugins');
-  const managed = path.join(plugins, 'managed');
-  ensurePrivateDirectory(plugins);
-  ensurePrivateDirectory(managed);
-  const digest = digestPluginEntries(snapshotPluginTree(sourceRoot));
-  const pluginRoot = path.join(managed, `agent-spine-${digest}`);
-  if (fs.existsSync(pluginRoot)) {
-    describeAgentSpineSelection({ blunDir, pluginRoot });
-    return pluginRoot;
-  }
-  const staging = path.join(managed, `.agent-spine-selected-${process.pid}-${randomUUID()}.tmp`);
-  try {
-    fs.cpSync(sourceRoot, staging, { recursive: true, errorOnExist: true, force: false });
-    securePrivateTree(staging);
-    if (digestPluginEntries(snapshotPluginTree(staging)) !== digest) throw new Error('AgentSpine source changed during installation');
-    fs.renameSync(staging, pluginRoot);
-    describeAgentSpineSelection({ blunDir, pluginRoot });
-    return pluginRoot;
-  } finally {
-    if (!samePath(path.dirname(staging), managed) || !path.basename(staging).startsWith('.agent-spine-selected-')) {
-      throw new Error('Invalid AgentSpine staging cleanup path');
-    }
-    fs.rmSync(staging, { recursive: true, force: true });
-  }
-}
-
-module.exports = { snapshotPluginTree, digestPluginEntries, describeAgentSpineSelection,
-  selectedAgentSpineRoot, copySelectedAgentSpinePlugin };
+'use strict';
+const { createHash, randomUUID } = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+const { renamePrivateStaging } = require('./rename-private-staging.cjs');
+const { ensurePrivateDirectory, securePrivateTree } = require('./private-paths');
+const SCHEMA = 'blun.managed-plugin-selection/v1';
+
+function snapshotPluginTree(root) {
+  const entries = [];
+  const rootStat = fs.lstatSync(root);
+  if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) return null;
+  const visit = (directory, relativeDirectory = '') => {
+    for (const entry of fs.readdirSync(directory, { withFileTypes: true })
+      .sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0)) {
+      const relativePath = path.join(relativeDirectory, entry.name);
+      const absolutePath = path.join(directory, entry.name);
+      const stat = fs.lstatSync(absolutePath);
+      if (stat.isSymbolicLink()) return false;
+      if (stat.isDirectory()) {
+        entries.push({ kind: 'directory', path: relativePath });
+        if (!visit(absolutePath, relativePath)) return false;
+      } else if (stat.isFile()) {
+        entries.push({ kind: 'file', path: relativePath, content: fs.readFileSync(absolutePath) });
+      } else return false;
+    }
+    return true;
+  };
+  return visit(root) ? entries : null;
+}
+
+function digestPluginEntries(entries) {
+  if (entries === null) throw new Error('Invalid managed plugin tree');
+  const hash = createHash('sha256');
+  for (const entry of entries) {
+    hash.update(Buffer.from(`${entry.kind}\0${entry.path}\0`, 'utf8'));
+    if (entry.kind === 'file') {
+      const length = Buffer.allocUnsafe(8);
+      length.writeBigUInt64BE(BigInt(entry.content.length));
+      hash.update(length);
+      hash.update(entry.content);
+    }
+  }
+  return hash.digest('hex');
+}
+
+function samePath(left, right) {
+  const normalize = value => process.platform === 'win32' ? path.resolve(value).toLowerCase() : path.resolve(value);
+  return normalize(left) === normalize(right);
+}
+
+function scopedPluginRoot(blunDir, pluginRoot) {
+  const managed = path.resolve(blunDir, 'plugins', 'managed');
+  const root = path.resolve(pluginRoot);
+  if (!samePath(path.dirname(root), managed)) throw new Error('Selected AgentSpine root is outside this profile');
+  for (const directory of [blunDir, path.dirname(managed), managed, root]) {
+    const stat = fs.lstatSync(directory);
+    if (stat.isSymbolicLink() || !stat.isDirectory()) throw new Error('Selected AgentSpine root contains a linked directory');
+  }
+  if (!samePath(path.dirname(fs.realpathSync(root)), fs.realpathSync(managed))) {
+    throw new Error('Selected AgentSpine root resolves outside this profile');
+  }
+  return root;
+}
+
+function describeAgentSpineSelection({ blunDir, pluginRoot }) {
+  const root = scopedPluginRoot(blunDir, pluginRoot);
+  const digest = digestPluginEntries(snapshotPluginTree(root));
+  if (path.basename(root) !== `agent-spine-${digest}`) throw new Error('Selected AgentSpine digest mismatch');
+  return { schema: SCHEMA, digest };
+}
+
+function selectedAgentSpineRoot({ installed, blunDir }) {
+  const records = installed.plugins.filter(record => record.id === 'agent-spine');
+  if (!records.some(record => Object.hasOwn(record, 'managedSelection'))) return null;
+  if (records.length !== 1) throw new Error('Ambiguous AgentSpine selection');
+  const [record] = records;
+  const selection = record.managedSelection;
+  if (!selection || selection.schema !== SCHEMA || !/^[a-f0-9]{64}$/.test(selection.digest || '')
+    || Object.keys(selection).sort().join(',') !== 'digest,schema' || typeof record.root !== 'string') {
+    throw new Error('Invalid AgentSpine selection');
+  }
+  const actual = describeAgentSpineSelection({ blunDir, pluginRoot: record.root });
+  if (actual.digest !== selection.digest) throw new Error('Selected AgentSpine digest mismatch');
+  return record.root;
+}
+
+function copySelectedAgentSpinePlugin({ blunDir, sourceRoot }) {
+  const plugins = path.resolve(blunDir, 'plugins');
+  const managed = path.join(plugins, 'managed');
+  ensurePrivateDirectory(plugins);
+  ensurePrivateDirectory(managed);
+  const digest = digestPluginEntries(snapshotPluginTree(sourceRoot));
+  const pluginRoot = path.join(managed, `agent-spine-${digest}`);
+  if (fs.existsSync(pluginRoot)) {
+    describeAgentSpineSelection({ blunDir, pluginRoot });
+    return pluginRoot;
+  }
+  const staging = path.join(managed, `.agent-spine-selected-${process.pid}-${randomUUID()}.tmp`);
+  try {
+    fs.cpSync(sourceRoot, staging, { recursive: true, errorOnExist: true, force: false });
+    securePrivateTree(staging);
+    if (digestPluginEntries(snapshotPluginTree(staging)) !== digest) throw new Error('AgentSpine source changed during installation');
+    renamePrivateStaging(staging, pluginRoot);
+    describeAgentSpineSelection({ blunDir, pluginRoot });
+    return pluginRoot;
+  } finally {
+    if (!samePath(path.dirname(staging), managed) || !path.basename(staging).startsWith('.agent-spine-selected-')) {
+      throw new Error('Invalid AgentSpine staging cleanup path');
+    }
+    fs.rmSync(staging, { recursive: true, force: true });
+  }
+}
+
+module.exports = { snapshotPluginTree, digestPluginEntries, describeAgentSpineSelection,
+  selectedAgentSpineRoot, copySelectedAgentSpinePlugin };