@4yi/cli 0.1.4 → 0.1.6

package/README.md

@@ -1,11 +1,26 @@
-# @4yi/cli
+# 4YI CLI
 
 4YI CLI signs in through the 4YI web app and launches OpenCode with 4YI model routing.
 
-## Commands
+## Install
+
+Temporary dev environment:
+
+```bash
+npm install -g @4yi/cli
+```
+
+Production environment:
 
 ```bash
 npm install -g @4yi/cli
+```
+
+Both packages install the `4yi` command. The dev package points at `https://xclaw-dev.bieases.com`; the production package points at `https://app.4yi.ai`.
+
+## Commands
+
+```bash
 4yi login
 4yi whoami
 4yi code

package/bin/4yi.mjs

@@ -5,10 +5,30 @@ import { runCode } from "../src/opencode.mjs";
 const command = process.argv[2] || "help";
 
 if (command === "help" || command === "--help" || command === "-h") {
-  console.log("Usage: 4yi <login|whoami|logout|code>");
+  console.log("Usage: 4yi <login|whoami|logout|code [--model <id>]>");
+  console.log("  4yi code            launch OpenCode; switch models live with Tab / /models");
+  console.log("  4yi code --model X  pin model X as the default for future sessions");
   process.exit(0);
 }
 
+/** Split out `--model <id>` / `--model=<id>` / `-m <id>`; the rest pass through to OpenCode. */
+function parseCodeArgs(args) {
+  let preferredModel = null;
+  const passthrough = [];
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === "--model" || arg === "-m") {
+      preferredModel = args[i + 1] ?? null;
+      i += 1;
+    } else if (arg.startsWith("--model=")) {
+      preferredModel = arg.slice("--model=".length);
+    } else {
+      passthrough.push(arg);
+    }
+  }
+  return { preferredModel, passthrough };
+}
+
 if (command === "--version" || command === "-v") {
   const pkg = await import("../package.json", { with: { type: "json" } });
   console.log(pkg.default.version);
@@ -27,7 +47,8 @@ try {
     console.log("Signed out.");
   } else if (command === "code") {
     const session = loadSession();
-    const code = await runCode({ session, argv: process.argv.slice(3) });
+    const { preferredModel, passthrough } = parseCodeArgs(process.argv.slice(3));
+    const code = await runCode({ session, argv: passthrough, preferredModel });
     process.exit(Number(code || 0));
   } else {
     console.error(`Unknown command: ${command}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4yi/cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "4YI command-line launcher for OAuth login and OpenCode runtime",
   "type": "module",
   "bin": {
@@ -13,7 +13,13 @@
   ],
   "scripts": {
     "test": "node --test",
-    "pack:dry": "npm pack --dry-run"
+    "pack:dry": "npm pack --dry-run",
+    "stage:dev": "node scripts/stage-package.mjs dev",
+    "stage:prod": "node scripts/stage-package.mjs prod",
+    "pack:dev": "node scripts/stage-package.mjs dev --pack",
+    "pack:prod": "node scripts/stage-package.mjs prod --pack",
+    "publish:dev": "node scripts/stage-package.mjs dev --publish",
+    "publish:prod": "node scripts/stage-package.mjs prod --publish"
   },
   "engines": {
     "node": ">=20.0.0"

package/src/config.mjs

@@ -2,7 +2,18 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
-export const DEFAULT_BASE_URL = "https://xclaw-dev.bieases.com";
+export const PACKAGE_NAME = "@4yi/cli";
+
+const PACKAGE_BASE_URLS = {
+  "@4yi-dev/cli": "https://xclaw-dev.bieases.com",
+  "@4yi/cli": "https://app.4yi.ai",
+};
+
+export function defaultBaseUrlForPackage(packageName = PACKAGE_NAME) {
+  return PACKAGE_BASE_URLS[packageName] || PACKAGE_BASE_URLS["@4yi/cli"];
+}
+
+export const DEFAULT_BASE_URL = defaultBaseUrlForPackage(PACKAGE_NAME);
 
 export function normalizeBaseUrl(value) {
   return String(value || DEFAULT_BASE_URL).replace(/\/+$/, "");
@@ -37,3 +48,13 @@ export function writeConfig(config, home = os.homedir()) {
   ensureDir(paths.homeDir);
   fs.writeFileSync(paths.configFile, `${JSON.stringify(config, null, 2)}\n`, { mode: 0o600 });
 }
+
+/** The user's pinned default model id for `4yi code`, or null if unset. */
+export function getPreferredModel(home = os.homedir()) {
+  return readConfig(home).preferred_model || null;
+}
+
+/** Persist the pinned default model id, preserving the rest of the config (e.g. session). */
+export function setPreferredModel(model, home = os.homedir()) {
+  writeConfig({ ...readConfig(home), preferred_model: model }, home);
+}

package/src/opencode.mjs

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { spawn, spawnSync } from "node:child_process";
-import { pathsForHome, ensureDir } from "./config.mjs";
+import { pathsForHome, ensureDir, getPreferredModel, setPreferredModel } from "./config.mjs";
 import { requestJson } from "./http.mjs";
 
 const DEFAULT_OPENCODE_PACKAGE = "opencode-ai";
@@ -23,10 +23,12 @@ function modelOutputLimit(model) {
   return model.output_limit || model.max_output_tokens || model.max_tokens || DEFAULT_OUTPUT_LIMIT;
 }
 
-export function buildOpenCodeConfig({ modelConfig, tokenEnv = "FOURYI_CLI_TOKEN", orgEnv = "FOURYI_ORG_ID" }) {
+export function buildOpenCodeConfig({ modelConfig, preferredModel = null, tokenEnv = "FOURYI_CLI_TOKEN", orgEnv = "FOURYI_ORG_ID" }) {
+  // Register EVERY model the server returned so OpenCode's native switcher
+  // (`Tab` / `/models`) can move between them. Claude stays the default.
+  const list = modelConfig.models || [];
   const models = {};
-  const claudeModels = (modelConfig.models || []).filter(isClaudeModel);
-  for (const model of claudeModels) {
+  for (const model of list) {
     models[model.id] = {
       name: model.display_name || model.id,
       limit: {
@@ -35,9 +37,14 @@ export function buildOpenCodeConfig({ modelConfig, tokenEnv = "FOURYI_CLI_TOKEN"
       },
     };
   }
-  const defaultModel = claudeModels.some((model) => model.id === modelConfig.default_model)
-    ? modelConfig.default_model
-    : claudeModels[0]?.id;
+  const has = (id) => !!id && list.some((model) => model.id === id);
+  const firstClaude = list.find(isClaudeModel)?.id;
+  // Precedence: an explicit/persisted preferred model → server default → first Claude → first model.
+  const defaultModel =
+    (has(preferredModel) && preferredModel) ||
+    (has(modelConfig.default_model) && modelConfig.default_model) ||
+    firstClaude ||
+    list[0]?.id;
 
   return {
     "$schema": "https://opencode.ai/config.json",
@@ -99,18 +106,27 @@ export function ensureOpenCodeRuntime({ home = os.homedir(), stdout = console.lo
   return bin;
 }
 
-export async function runCode({ session, home = os.homedir(), argv = [], stdout = console.log } = {}) {
+export async function runCode({ session, home = os.homedir(), argv = [], stdout = console.log, preferredModel = null } = {}) {
   if (!session?.token) throw new Error("Not signed in. Run `4yi login`.");
   const modelConfig = await requestJson(session.baseUrl, "/api/cli/models", { token: session.token });
-  if (!modelConfig.default_model) throw new Error("No chat models available for this organization.");
-  if (!(modelConfig.models || []).some(isClaudeModel)) throw new Error("No Claude models available for this organization.");
+  const list = modelConfig.models || [];
+  if (list.length === 0) throw new Error("No chat models available for this organization.");
+
+  // Resolve the model to launch with: an explicit `--model` (validated + persisted)
+  // takes precedence over a previously persisted preference; both must be entitled.
+  const valid = (id) => !!id && list.some((model) => model.id === id);
+  const explicit = valid(preferredModel) ? preferredModel : null;
+  const persisted = !explicit && valid(getPreferredModel(home)) ? getPreferredModel(home) : null;
+  const effectivePreferred = explicit || persisted || null;
+  if (explicit) setPreferredModel(explicit, home);
+  if (preferredModel && !explicit) stdout(`Model "${preferredModel}" is not available; using the default instead.`);
 
   const paths = pathsForHome(home);
   ensureDir(paths.opencodeConfigDir);
   for (const dir of ["config", "data", "cache", "state"]) {
     ensureDir(path.join(paths.opencodeConfigDir, "xdg", dir));
   }
-  fs.writeFileSync(paths.opencodeConfigFile, `${JSON.stringify(buildOpenCodeConfig({ modelConfig }), null, 2)}\n`, { mode: 0o600 });
+  fs.writeFileSync(paths.opencodeConfigFile, `${JSON.stringify(buildOpenCodeConfig({ modelConfig, preferredModel: effectivePreferred }), null, 2)}\n`, { mode: 0o600 });
 
   const bin = ensureOpenCodeRuntime({ home, stdout });
   stdout("Launching OpenCode with 4YI models...");