@moderniser/plugin 0.1.5 → 0.1.7

package/dist/client.d.ts

@@ -2,3 +2,7 @@ export declare const API: () => string;
 export declare function setStoredKey(key: string): void;
 export declare function storedKey(): string | undefined;
 export declare function resolveKey(): string | undefined;
+export declare const COMPANY_HEADER = "x-moderniser-company";
+export declare function setStoredCompany(companyId: string): void;
+export declare function resolveCompany(): string | undefined;
+export declare function companyHeaders(): Record<string, string>;

package/dist/index.js

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // packages/plugin/src/client.ts
-import { readFileSync } from "node:fs";
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 var API = () => (process.env.MODERNISER_API_URL ?? "https://v2.moderniser.ai/api").replace(/\/+$/, "");
@@ -10,9 +10,6 @@ var stored;
 function setStoredKey(key) {
   stored = key;
 }
-function storedKey() {
-  return stored;
-}
 function authFilePath() {
   const data = process.env.XDG_DATA_HOME || join(homedir(), ".local", "share");
   return join(data, "moderniser", "auth.json");
@@ -34,6 +31,44 @@ function fromAuthFile() {
 function resolveKey() {
   return process.env.MODERNISER_API_KEY ?? stored ?? fromAuthFile();
 }
+var COMPANY_HEADER = "x-moderniser-company";
+function companyFilePath() {
+  const data = process.env.XDG_DATA_HOME || join(homedir(), ".local", "share");
+  return join(data, "moderniser", "company.json");
+}
+var storedCompany;
+function setStoredCompany(companyId) {
+  storedCompany = companyId;
+  fileCompany = companyId;
+  try {
+    const path = companyFilePath();
+    mkdirSync(join(path, ".."), { recursive: true });
+    const temp = `${path}.${process.pid}.tmp`;
+    writeFileSync(temp, JSON.stringify({ companyId }, null, 2) + `
+`, { mode: 384 });
+    renameSync(temp, path);
+  } catch {}
+}
+var fileCompany;
+function companyFromFile() {
+  if (fileCompany !== undefined)
+    return fileCompany ?? undefined;
+  fileCompany = null;
+  try {
+    const parsed = JSON.parse(readFileSync(companyFilePath(), "utf8"));
+    if (typeof parsed?.companyId === "string" && parsed.companyId.length > 0) {
+      fileCompany = parsed.companyId;
+    }
+  } catch {}
+  return fileCompany ?? undefined;
+}
+function resolveCompany() {
+  return process.env.MODERNISER_COMPANY ?? storedCompany ?? companyFromFile();
+}
+function companyHeaders() {
+  const company = resolveCompany();
+  return company ? { [COMPANY_HEADER]: company } : {};
+}
 
 // packages/plugin/src/auth.ts
 async function start() {
@@ -67,7 +102,7 @@ async function poll(deviceCode, expiresIn, intervalSeconds) {
       continue;
     }
     if (body.token)
-      return body.token;
+      return { token: body.token, companyId: body.companyId };
     if (body.error === "authorization_pending")
       continue;
     if (body.error === "slow_down") {
@@ -92,11 +127,13 @@ function moderniserAuth() {
             instructions: `Check that your browser shows this code: ${started.userCode}. After signing in for the first time, restart to pick up the Moderniser tools.`,
             method: "auto",
             async callback() {
-              const token = await poll(started.deviceCode, started.expiresIn, started.interval);
-              if (!token)
+              const collected = await poll(started.deviceCode, started.expiresIn, started.interval);
+              if (!collected)
                 return { type: "failed" };
-              setStoredKey(token);
-              return { type: "success", key: token };
+              setStoredKey(collected.token);
+              if (collected.companyId)
+                setStoredCompany(collected.companyId);
+              return { type: "success", key: collected.token };
             }
           };
         }
@@ -152,13 +189,13 @@ var GATEWAY = () => {
 var PROVIDER_ID = "moderniser";
 var DEFAULT_MODEL = `${PROVIDER_ID}/emm`;
 async function call(path, body) {
-  const key = KEY() ?? storedKey();
+  const key = resolveKey();
   if (!key)
     return null;
   try {
     return await fetch(`${API2()}${path}`, {
       method: "POST",
-      headers: { "Content-Type": "application/json", Authorization: `Bearer ${key}` },
+      headers: { "Content-Type": "application/json", Authorization: `Bearer ${key}`, ...companyHeaders() },
       body: JSON.stringify(body),
       signal: AbortSignal.timeout(1e4)
     });
@@ -169,13 +206,40 @@ async function call(path, body) {
 function positiveInt(value) {
   return typeof value === "number" && Number.isInteger(value) && value > 0 ? value : undefined;
 }
+function price(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : undefined;
+}
+async function companyPrices() {
+  const key = resolveKey();
+  if (!key)
+    return;
+  try {
+    const res = await fetch(`${API2()}/billing/prices`, {
+      headers: { Authorization: `Bearer ${key}`, ...companyHeaders() },
+      signal: AbortSignal.timeout(5000)
+    });
+    if (!res.ok)
+      return;
+    const body = await res.json();
+    const input = price(body.inputUsdPerMtok);
+    const output = price(body.outputUsdPerMtok);
+    const cache_read = price(body.cachedInputUsdPerMtok);
+    const cache_write = price(body.cacheWriteUsdPerMtok);
+    if (input === undefined || output === undefined || cache_read === undefined || cache_write === undefined) {
+      return;
+    }
+    return { input, output, cache_read, cache_write };
+  } catch {
+    return;
+  }
+}
 async function gatewayProduct() {
-  const key = KEY() ?? storedKey();
+  const key = resolveKey();
   if (!key)
     return {};
   try {
     const res = await fetch(`${GATEWAY()}/models`, {
-      headers: { Authorization: `Bearer ${key}` },
+      headers: { Authorization: `Bearer ${key}`, ...companyHeaders() },
       signal: AbortSignal.timeout(5000)
     });
     if (!res.ok)
@@ -199,8 +263,12 @@ var ModerniserPlugin = async () => {
   return {
     config: async (config) => {
       const modalities = { input: ["text", "image"], output: ["text"] };
-      const product = await gatewayProduct();
+      const [product, prices] = await Promise.all([gatewayProduct(), companyPrices()]);
       const efforts = (product.efforts ?? ["high"]).filter((effort) => effort !== "default");
+      const limit = {
+        ...product.contextWindow ? { context: product.contextWindow } : {},
+        ...product.maxOutputTokens ? { output: product.maxOutputTokens } : {}
+      };
       const models = {
         emm: {
           name: "Enterprise Modernisation Model",
@@ -208,15 +276,21 @@ var ModerniserPlugin = async () => {
           reasoning: true,
           modalities,
           variants: Object.fromEntries(efforts.map((effort) => [effort, { reasoning_effort: effort }])),
-          ...product.contextWindow && product.maxOutputTokens ? { limit: { context: product.contextWindow, output: product.maxOutputTokens } } : {}
+          ...Object.keys(limit).length ? { limit } : {},
+          ...prices ? { cost: prices } : {}
         }
       };
       const key = KEY();
+      const company = companyHeaders();
       config.provider ??= {};
       config.provider[PROVIDER_ID] ??= {
         name: "Moderniser",
         npm: "@ai-sdk/openai-compatible",
-        options: { baseURL: GATEWAY(), ...key ? { apiKey: key } : {} },
+        options: {
+          baseURL: GATEWAY(),
+          ...key ? { apiKey: key } : {},
+          ...Object.keys(company).length ? { headers: company } : {}
+        },
         models
       };
       config.enabled_providers ??= [PROVIDER_ID];
@@ -231,7 +305,7 @@ var ModerniserPlugin = async () => {
         config.mcp[PROVIDER_ID] ??= {
           type: "remote",
           url: `${API2()}/mcp`,
-          headers: { Authorization: `Bearer ${mcpKey}` },
+          headers: { Authorization: `Bearer ${mcpKey}`, ...companyHeaders() },
           oauth: false
         };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moderniser/plugin",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "description": "Moderniser plugin for opencode: points inference at the gateway, declares the Moderniser remote MCP server, and reports session telemetry",
   "license": "MIT",