@osovv/vvcode 0.5.0 → 0.5.1

package/README.md

@@ -92,6 +92,18 @@ vvcode opencode --preset <name>
 vvcode --preset <name>
 ```
 
+By default `vvcode` starts the shell with:
+
+```bash
+opencode
+```
+
+You can override the shell command, for example:
+
+```bash
+OPENCODE_SHELL_COMMAND='bun x opencode-ai' vvcode --preset openai
+```
+
 Options:
 
 1. `--preset`, `-p` for the preset name.

package/dist/vvcode.js

@@ -547,7 +547,7 @@ import { join as join3, resolve } from "path";
 // package.json
 var package_default = {
   name: "@osovv/vvcode",
-  version: "0.5.0",
+  version: "0.5.1",
   description: "Packaged CLI for launching OpenCode with vvcode runtime semantics.",
   license: "MIT",
   homepage: "https://github.com/osovv/vvcode",
@@ -565,7 +565,7 @@ var package_default = {
     "dist"
   ],
   bin: {
-    vvcode: "./bin/vvcode"
+    vvcode: "bin/vvcode"
   },
   publishConfig: {
     access: "public"
@@ -1359,7 +1359,8 @@ function createTraceWriteError(message, cause) {
 // src/cli/pivv-opencode.ts
 var LAUNCHER_LOG_PREFIX = "[VvcodeLauncher]";
 var BLOCK_LOAD_ACTIVE_PRESET = "BLOCK_LOAD_ACTIVE_PRESET";
-var OPENCODE_ENTRYPOINT = "bun x opencode-ai";
+var DEFAULT_OPENCODE_SHELL_COMMAND = "opencode";
+var OPENCODE_SHELL_COMMAND_ENV = "OPENCODE_SHELL_COMMAND";
 function buildRuntimeEnvironment(runtimeOverlay, baseEnvironment = process.env) {
   const runtimeEnvironment = {};
   for (const [key, value] of Object.entries(baseEnvironment)) {
@@ -1368,7 +1369,12 @@ function buildRuntimeEnvironment(runtimeOverlay, baseEnvironment = process.env)
     }
   }
   runtimeEnvironment.OPENCODE_CONFIG_DIR = runtimeOverlay.overlayDirPath;
-  runtimeEnvironment.OPENCODE_CONFIG_CONTENT = JSON.stringify(runtimeOverlay);
+  runtimeEnvironment.OPENCODE_CONFIG_CONTENT = JSON.stringify({
+    provider: normalizeProviderConfig(runtimeOverlay.providers),
+    agent: runtimeOverlay.agents,
+    command: normalizeCommandConfig(runtimeOverlay.commands),
+    tools: runtimeOverlay.tools
+  });
   return runtimeEnvironment;
 }
 async function runPivvOpencode(cliArgs) {
@@ -1383,6 +1389,8 @@ async function runPivvOpencode(cliArgs) {
   let aliasModelCount = 0;
   let providerIds = [];
   let lifecycleStage = "config.load";
+  const openCodeShellCommand = resolveOpenCodeShellCommand();
+  const openCodeEntrypoint = openCodeShellCommand.entrypoint;
   if (!traceRecorder) {
     try {
       resolvedProjectRoot = await findProjectRoot(cliArgs.projectRoot);
@@ -1401,7 +1409,7 @@ async function runPivvOpencode(cliArgs) {
       preset: cliArgs.preset,
       projectRoot: resolvedProjectRoot,
       cwd: resolvedProjectRoot,
-      entrypoint: OPENCODE_ENTRYPOINT
+      entrypoint: openCodeEntrypoint
     }
   });
   try {
@@ -1415,7 +1423,7 @@ async function runPivvOpencode(cliArgs) {
         preset: cliArgs.preset,
         projectRoot: resolvedProjectRoot,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     const projectConfig = await loadPivvConfig(cliArgs.globalConfigPath, cliArgs.projectRoot);
@@ -1430,7 +1438,7 @@ async function runPivvOpencode(cliArgs) {
         preset: cliArgs.preset,
         projectRoot: resolvedProjectRoot,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     lifecycleStage = "preset.resolve";
@@ -1444,7 +1452,7 @@ async function runPivvOpencode(cliArgs) {
         preset: cliArgs.preset,
         coreSlotsResolved: 0,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     const resolvedPreset = resolvePreset(cliArgs.preset, projectConfig);
@@ -1459,7 +1467,7 @@ async function runPivvOpencode(cliArgs) {
         profileCount: resolvedPreset.profileCount,
         coreSlotsResolved: Object.keys(resolvedPreset.coreProfiles).length,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     lifecycleStage = "overlay.build";
@@ -1474,7 +1482,7 @@ async function runPivvOpencode(cliArgs) {
         aliasModelCount,
         providerIds,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     const runtimeOverlay = await buildRuntimeOverlay(resolvedPreset, projectConfig, baseOpenCodeInputs);
@@ -1493,7 +1501,7 @@ async function runPivvOpencode(cliArgs) {
         aliasModelCount,
         providerIds,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     lifecycleStage = "launch";
@@ -1511,7 +1519,7 @@ async function runPivvOpencode(cliArgs) {
         aliasModelCount,
         providerIds,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     const launchResult = await launchOpenCodeProcess({
@@ -1519,7 +1527,8 @@ async function runPivvOpencode(cliArgs) {
       projectRoot: resolvedProjectRoot,
       runtimeOverlay,
       runtimeEnvironment,
-      traceContext
+      traceContext,
+      openCodeShellCommand
     });
     if (launchResult.exitCode !== 0) {
       const cleanupResult = await cleanupRuntimeOverlay(runtimeOverlayPath);
@@ -1531,7 +1540,8 @@ async function runPivvOpencode(cliArgs) {
         exitCode: launchResult.exitCode,
         cleanupResult,
         aliasModelCount,
-        providerIds
+        providerIds,
+        entrypoint: openCodeEntrypoint
       });
       return failureResult;
     }
@@ -1548,7 +1558,7 @@ async function runPivvOpencode(cliArgs) {
         aliasModelCount,
         providerIds,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     const runFinishTrace = await persistLaunchTrace(traceRecorder, traceContext, {
@@ -1563,7 +1573,7 @@ async function runPivvOpencode(cliArgs) {
         projectRoot: resolvedProjectRoot,
         runtimeOverlayPath,
         cwd: resolvedProjectRoot,
-        entrypoint: OPENCODE_ENTRYPOINT
+        entrypoint: openCodeEntrypoint
       }
     });
     console.info(`${LAUNCHER_LOG_PREFIX}[runPivvOpencode][${BLOCK_LOAD_ACTIVE_PRESET}] launch completed`, {
@@ -1593,7 +1603,7 @@ async function runPivvOpencode(cliArgs) {
           preset: cliArgs.preset,
           projectRoot: resolvedProjectRoot,
           cwd: resolvedProjectRoot,
-          entrypoint: OPENCODE_ENTRYPOINT
+          entrypoint: openCodeEntrypoint
         }
       });
     }
@@ -1609,7 +1619,7 @@ async function runPivvOpencode(cliArgs) {
           projectRoot: resolvedProjectRoot,
           coreSlotsResolved: 0,
           cwd: resolvedProjectRoot,
-          entrypoint: OPENCODE_ENTRYPOINT
+          entrypoint: openCodeEntrypoint
         }
       });
     }
@@ -1627,7 +1637,7 @@ async function runPivvOpencode(cliArgs) {
           aliasModelCount,
           providerIds,
           cwd: resolvedProjectRoot,
-          entrypoint: OPENCODE_ENTRYPOINT
+          entrypoint: openCodeEntrypoint
         }
       });
     }
@@ -1640,7 +1650,8 @@ async function runPivvOpencode(cliArgs) {
       code: failureCode,
       cleanupResult,
       aliasModelCount,
-      providerIds
+      providerIds,
+      entrypoint: openCodeEntrypoint
     });
   }
 }
@@ -1700,7 +1711,7 @@ async function finalizeLaunchFailure(traceRecorder, traceContext, context) {
       aliasModelCount: context.aliasModelCount,
       providerIds: context.providerIds,
       cwd: context.projectRoot,
-      entrypoint: OPENCODE_ENTRYPOINT
+      entrypoint: context.entrypoint
     }
   });
   const runFailTrace = await persistLaunchTrace(traceRecorder, traceContext, {
@@ -1717,7 +1728,7 @@ async function finalizeLaunchFailure(traceRecorder, traceContext, context) {
       code: context.code,
       exitCode: context.exitCode,
       cwd: context.projectRoot,
-      entrypoint: OPENCODE_ENTRYPOINT
+      entrypoint: context.entrypoint
     }
   });
   console.info(`${LAUNCHER_LOG_PREFIX}[runPivvOpencode][${BLOCK_LOAD_ACTIVE_PRESET}] launch failed`, {
@@ -1739,7 +1750,7 @@ async function finalizeLaunchFailure(traceRecorder, traceContext, context) {
 }
 async function launchOpenCodeProcess(request) {
   return await new Promise((resolve, reject) => {
-    const launchedProcess = spawn("bun", ["x", "opencode-ai"], {
+    const launchedProcess = spawn(request.openCodeShellCommand.executable, request.openCodeShellCommand.args, {
       cwd: request.projectRoot,
       env: request.runtimeEnvironment,
       stdio: "inherit"
@@ -1754,6 +1765,122 @@ async function launchOpenCodeProcess(request) {
     });
   });
 }
+function resolveOpenCodeShellCommand(baseEnvironment = process.env) {
+  const configuredCommand = baseEnvironment[OPENCODE_SHELL_COMMAND_ENV]?.trim();
+  const entrypoint = configuredCommand && configuredCommand.length > 0 ? configuredCommand : DEFAULT_OPENCODE_SHELL_COMMAND;
+  const tokens = splitShellCommand(entrypoint);
+  if (tokens.length === 0) {
+    return {
+      executable: DEFAULT_OPENCODE_SHELL_COMMAND,
+      args: [],
+      entrypoint: DEFAULT_OPENCODE_SHELL_COMMAND
+    };
+  }
+  return {
+    executable: tokens[0],
+    args: tokens.slice(1),
+    entrypoint
+  };
+}
+function splitShellCommand(command) {
+  const tokens = [];
+  let current = "";
+  let quote = null;
+  for (let index = 0;index < command.length; index += 1) {
+    const character = command[index];
+    if (quote === null) {
+      if (character === '"' || character === "'") {
+        quote = character === '"' ? "double" : "single";
+        continue;
+      }
+      if (/\s/.test(character)) {
+        if (current.length > 0) {
+          tokens.push(current);
+          current = "";
+        }
+        continue;
+      }
+    } else if (quote === "double" && character === '"' || quote === "single" && character === "'") {
+      quote = null;
+      continue;
+    }
+    current += character;
+  }
+  if (current.length > 0) {
+    tokens.push(current);
+  }
+  return tokens;
+}
+function normalizeCommandConfig(commands) {
+  const normalizedCommands = {};
+  for (const [commandName, commandConfig] of Object.entries(commands)) {
+    const template = typeof commandConfig.prompt === "string" ? commandConfig.prompt : undefined;
+    if (!template) {
+      continue;
+    }
+    normalizedCommands[commandName] = {
+      template,
+      ...typeof commandConfig.description === "string" ? { description: commandConfig.description } : {},
+      ...typeof commandConfig.agent === "string" ? { agent: commandConfig.agent } : {},
+      ...typeof commandConfig.model === "string" ? { model: commandConfig.model } : {},
+      ...typeof commandConfig.subtask === "boolean" ? { subtask: commandConfig.subtask } : {}
+    };
+  }
+  return normalizedCommands;
+}
+function normalizeProviderConfig(providers) {
+  const normalizedProviders = {};
+  for (const [providerId, providerConfig] of Object.entries(providers)) {
+    const normalizedProvider = {};
+    for (const key of ["api", "name", "env", "id", "npm", "whitelist", "blacklist", "options"]) {
+      if (key in providerConfig) {
+        normalizedProvider[key] = providerConfig[key];
+      }
+    }
+    if (isRecord2(providerConfig.models)) {
+      const normalizedModels = {};
+      for (const [modelId, modelConfig] of Object.entries(providerConfig.models)) {
+        if (!isRecord2(modelConfig)) {
+          continue;
+        }
+        const normalizedModel = {};
+        for (const key of [
+          "id",
+          "name",
+          "family",
+          "release_date",
+          "attachment",
+          "reasoning",
+          "temperature",
+          "tool_call",
+          "interleaved",
+          "cost",
+          "limit",
+          "modalities",
+          "experimental",
+          "status",
+          "options",
+          "headers",
+          "variants"
+        ]) {
+          if (key in modelConfig) {
+            normalizedModel[key] = modelConfig[key];
+          }
+        }
+        if (isRecord2(modelConfig.provider)) {
+          normalizedModel.provider = modelConfig.provider;
+        }
+        normalizedModels[modelId] = normalizedModel;
+      }
+      normalizedProvider.models = normalizedModels;
+    }
+    normalizedProviders[providerId] = normalizedProvider;
+  }
+  return normalizedProviders;
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/cli/vvcode.ts
 var CLI_LOG_PREFIX = "[VvcodeCli]";
@@ -1908,7 +2035,7 @@ function createVvcodeCommand(dependencyOverrides = {}) {
               const snapshot = await loadProjectConfigSnapshot(String(args.globalConfig), String(args.projectRoot));
               const globalPresets = toObjectBucket(snapshot.globalConfig?.presets);
               const globalProfiles = toObjectBucket(snapshot.globalConfig?.profiles);
-              if (!(presetName in globalPresets) || !isRecord2(globalPresets[presetName])) {
+              if (!(presetName in globalPresets) || !isRecord3(globalPresets[presetName])) {
                 throw new Error(`Preset "${presetName}" was not found in global config ${snapshot.globalConfigPath}`);
               }
               const projectConfig = snapshot.projectConfig ?? createEmptyRawVvcodeConfig();
@@ -1927,7 +2054,7 @@ function createVvcodeCommand(dependencyOverrides = {}) {
                 }
                 const profileName = profileNameValue;
                 const globalProfile = globalProfiles[profileName];
-                if (!isRecord2(globalProfile)) {
+                if (!isRecord3(globalProfile)) {
                   throw new Error(`Global preset "${presetName}" references missing profile "${profileName}"`);
                 }
                 if (profileName in projectProfiles) {
@@ -1969,13 +2096,13 @@ function createVvcodeCommand(dependencyOverrides = {}) {
               const projectPresets = toMutableBucket(projectConfig, "presets");
               const projectProfiles = toMutableBucket(projectConfig, "profiles");
               const removedPreset = projectPresets[presetName];
-              if (!isRecord2(removedPreset)) {
+              if (!isRecord3(removedPreset)) {
                 throw new Error(`Preset "${presetName}" was not found in project config ${projectConfigPath}`);
               }
               delete projectPresets[presetName];
               const stillReferencedProfiles = new Set;
               for (const presetValue of Object.values(projectPresets)) {
-                if (!isRecord2(presetValue)) {
+                if (!isRecord3(presetValue)) {
                   continue;
                 }
                 for (const profileNameValue of Object.values(presetValue)) {
@@ -2086,7 +2213,7 @@ function describePresetSource(snapshot, presetName) {
 }
 function toMutableBucket(config, key) {
   const bucket = config[key];
-  if (isRecord2(bucket)) {
+  if (isRecord3(bucket)) {
     return bucket;
   }
   const nextBucket = {};
@@ -2094,9 +2221,9 @@ function toMutableBucket(config, key) {
   return nextBucket;
 }
 function toObjectBucket(value) {
-  return isRecord2(value) ? value : {};
+  return isRecord3(value) ? value : {};
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function areJsonValuesEqual(left, right) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osovv/vvcode",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Packaged CLI for launching OpenCode with vvcode runtime semantics.",
   "license": "MIT",
   "homepage": "https://github.com/osovv/vvcode",
@@ -18,7 +18,7 @@
     "dist"
   ],
   "bin": {
-    "vvcode": "./bin/vvcode"
+    "vvcode": "bin/vvcode"
   },
   "publishConfig": {
     "access": "public"