@4yi/cli 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4yi/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "4YI command-line launcher for OAuth login and OpenCode runtime",
   "type": "module",
   "bin": {

package/src/http.mjs

@@ -1,12 +1,17 @@
 export async function requestJson(baseUrl, path, options = {}) {
   const url = `${baseUrl}${path}`;
+  const optionHeaders = normalizeHeaders(options.headers);
+  const headers = {
+    "content-type": "application/json",
+    ...(options.token ? { authorization: `Bearer ${options.token}` } : {}),
+    ...optionHeaders,
+  };
+  if (shouldGenerateIdempotencyKey(path, options, headers)) {
+    headers["Idempotency-Key"] = `cli-${randomId()}`;
+  }
   const res = await fetch(url, {
     ...options,
-    headers: {
-      "content-type": "application/json",
-      ...(options.token ? { authorization: `Bearer ${options.token}` } : {}),
-      ...(options.headers || {}),
-    },
+    headers,
   });
   const text = await res.text();
   let body = null;
@@ -27,3 +32,47 @@ export async function requestJson(baseUrl, path, options = {}) {
   }
   return body;
 }
+
+function normalizeHeaders(headers) {
+  if (!headers) return {};
+  if (headers instanceof Headers) return Object.fromEntries(headers.entries());
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return { ...headers };
+}
+
+function hasHeader(headers, name) {
+  const expected = name.toLowerCase();
+  return Object.keys(headers).some((key) => key.toLowerCase() === expected);
+}
+
+function shouldGenerateIdempotencyKey(path, options, headers) {
+  const method = String(options.method || "GET").toUpperCase();
+  if (method !== "POST") return false;
+  if (!path.endsWith("/chat/completions")) return false;
+  if (hasHeader(headers, "Idempotency-Key") || hasHeader(headers, "X-Idempotency-Key")) return false;
+
+  const body = parseJsonBody(options.body);
+  return body && body.stream !== true;
+}
+
+function parseJsonBody(body) {
+  if (!body) return null;
+  if (typeof body === "string") {
+    try {
+      return JSON.parse(body);
+    } catch {
+      return null;
+    }
+  }
+  if (body && typeof body === "object" && !(body instanceof ArrayBuffer)) return body;
+  return null;
+}
+
+function randomId() {
+  if (globalThis.crypto?.randomUUID) return globalThis.crypto.randomUUID();
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (ch) => {
+    const value = Math.floor(Math.random() * 16);
+    const nibble = ch === "x" ? value : (value & 0x3) | 0x8;
+    return nibble.toString(16);
+  });
+}

package/src/opencode.mjs

@@ -10,6 +10,7 @@ const DEFAULT_CONTEXT_LIMIT = 200000;
 const DEFAULT_OUTPUT_LIMIT = 8192;
 
 function isClaudeModel(model) {
+  if (model?.family === "claude") return true;
   const id = model?.id || "";
   const name = model?.display_name || "";
   return /claude/i.test(id) || /claude/i.test(name);
@@ -23,19 +24,31 @@ function modelOutputLimit(model) {
   return model.output_limit || model.max_output_tokens || model.max_tokens || DEFAULT_OUTPUT_LIMIT;
 }
 
+function modelPickerName(model) {
+  const displayName = model.display_name || model.id;
+  if (model.family === "claude") {
+    return `Claude · ${displayName.replace(/^(?:anthropic[ ._-]*)?claude[ ._-]*/i, "")}`;
+  }
+  if (model.family === "codex") return `Codex · ${displayName}`;
+  return displayName;
+}
+
 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.
+  // Register every server-approved coding model so OpenCode's native switcher
+  // (`Tab` / `/models`) can move between Claude and Codex. Claude stays the default.
   const list = modelConfig.models || [];
   const models = {};
   for (const model of list) {
-    models[model.id] = {
-      name: model.display_name || model.id,
+    const entry = {
+      name: modelPickerName(model),
       limit: {
         context: modelContextLimit(model),
         output: modelOutputLimit(model),
       },
     };
+    if (typeof model.attachment === "boolean") entry.attachment = model.attachment;
+    if (model.modalities && typeof model.modalities === "object") entry.modalities = model.modalities;
+    models[model.id] = entry;
   }
   const has = (id) => !!id && list.some((model) => model.id === id);
   const firstClaude = list.find(isClaudeModel)?.id;
@@ -108,7 +121,7 @@ export function ensureOpenCodeRuntime({ home = os.homedir(), stdout = console.lo
 
 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 });
+  const modelConfig = await requestJson(session.baseUrl, "/api/cli/models?runtime=opencode", { token: session.token });
   const list = modelConfig.models || [];
   if (list.length === 0) throw new Error("No chat models available for this organization.");