remote-codex 0.11.29 → 0.11.31

package/apps/supervisor-web/dist/assets/{ui-vendor-CeKGesq3.js → ui-vendor-CuR8GHb0.js}

@@ -1,4 +1,4 @@
-import{r as s,R as Tv,a as Tw,j as v,b as Fv}from"./react-vendor-CgLzZcV4.js";function mN(t,a){if(typeof t=="function")return t(a);t!=null&&(t.current=a)}function Fw(...t){return a=>{let c=!1;const n=t.map(i=>{const d=mN(i,a);return!c&&typeof d=="function"&&(c=!0),d});if(c)return()=>{for(let i=0;i<n.length;i++){const d=n[i];typeof d=="function"?d():mN(t[i],null)}}}}function B(...t){return s.useCallback(Fw(...t),t)}function Da(t){const a=s.forwardRef((c,n)=>{let{children:i,...d}=c,r=null,h=!1;const o=[];gN(i)&&typeof Tg=="function"&&(i=Tg(i._payload)),s.Children.forEach(i,k=>{var _;if(Gw(k)){h=!0;const f=k;let u="child"in f.props?f.props.child:f.props.children;gN(u)&&typeof Tg=="function"&&(u=Tg(u._payload)),r=Ew(f,u),o.push((_=r==null?void 0:r.props)==null?void 0:_.children)}else o.push(k)}),r?r=s.cloneElement(r,void 0,o):!h&&s.Children.count(i)===1&&s.isValidElement(i)&&(r=i);const y=r?Ww(r):void 0,l=B(n,y);if(!r){if(i||i===0)throw new Error(h?Qw(t):Kw(t));return i}const p=Uw(d,r.props??{});return r.type!==s.Fragment&&(p.ref=n?l:y),s.cloneElement(r,p)});return a.displayName=`${t}.Slot`,a}var Rae=Da("Slot"),GN=Symbol.for("radix.slottable");function Ow(t){const a=c=>"child"in c?c.children(c.child):c.children;return a.displayName=`${t}.Slottable`,a.__radixId=GN,a}var Ew=(t,a)=>{if("child"in t.props){const c=t.props.child;return s.isValidElement(c)?s.cloneElement(c,void 0,t.props.children(c.props.children)):null}return s.isValidElement(a)?a:null};function Uw(t,a){const c={...a};for(const n in a){const i=t[n],d=a[n];/^on[A-Z]/.test(n)?i&&d?c[n]=(...h)=>{const o=d(...h);return i(...h),o}:i&&(c[n]=i):n==="style"?c[n]={...i,...d}:n==="className"&&(c[n]=[i,d].filter(Boolean).join(" "))}return{...t,...c}}function Ww(t){var n,i;let a=(n=Object.getOwnPropertyDescriptor(t.props,"ref"))==null?void 0:n.get,c=a&&"isReactWarning"in a&&a.isReactWarning;return c?t.ref:(a=(i=Object.getOwnPropertyDescriptor(t,"ref"))==null?void 0:i.get,c=a&&"isReactWarning"in a&&a.isReactWarning,c?t.props.ref:t.props.ref||t.ref)}function Gw(t){return s.isValidElement(t)&&typeof t.type=="function"&&"__radixId"in t.type&&t.type.__radixId===GN}var Zw=Symbol.for("react.lazy");function gN(t){return t!=null&&typeof t=="object"&&"$$typeof"in t&&t.$$typeof===Zw&&"_payload"in t&&Xw(t._payload)}function Xw(t){return typeof t=="object"&&t!==null&&"then"in t}var Kw=t=>`${t} failed to slot onto its children. Expected a single React element child or \`Slottable\`.`,Qw=t=>`${t} failed to slot onto its \`Slottable\`. Expected \`Slottable\` to receive a single React element child.`,Tg=Tv[" use ".trim().toString()],e={};/**
+import{r as s,R as Tv,a as Tw,j as v,b as Fv}from"./react-vendor-Dfg_6BLf.js";function mN(t,a){if(typeof t=="function")return t(a);t!=null&&(t.current=a)}function Fw(...t){return a=>{let c=!1;const n=t.map(i=>{const d=mN(i,a);return!c&&typeof d=="function"&&(c=!0),d});if(c)return()=>{for(let i=0;i<n.length;i++){const d=n[i];typeof d=="function"?d():mN(t[i],null)}}}}function B(...t){return s.useCallback(Fw(...t),t)}function Da(t){const a=s.forwardRef((c,n)=>{let{children:i,...d}=c,r=null,h=!1;const o=[];gN(i)&&typeof Tg=="function"&&(i=Tg(i._payload)),s.Children.forEach(i,k=>{var _;if(Gw(k)){h=!0;const f=k;let u="child"in f.props?f.props.child:f.props.children;gN(u)&&typeof Tg=="function"&&(u=Tg(u._payload)),r=Ew(f,u),o.push((_=r==null?void 0:r.props)==null?void 0:_.children)}else o.push(k)}),r?r=s.cloneElement(r,void 0,o):!h&&s.Children.count(i)===1&&s.isValidElement(i)&&(r=i);const y=r?Ww(r):void 0,l=B(n,y);if(!r){if(i||i===0)throw new Error(h?Qw(t):Kw(t));return i}const p=Uw(d,r.props??{});return r.type!==s.Fragment&&(p.ref=n?l:y),s.cloneElement(r,p)});return a.displayName=`${t}.Slot`,a}var Rae=Da("Slot"),GN=Symbol.for("radix.slottable");function Ow(t){const a=c=>"child"in c?c.children(c.child):c.children;return a.displayName=`${t}.Slottable`,a.__radixId=GN,a}var Ew=(t,a)=>{if("child"in t.props){const c=t.props.child;return s.isValidElement(c)?s.cloneElement(c,void 0,t.props.children(c.props.children)):null}return s.isValidElement(a)?a:null};function Uw(t,a){const c={...a};for(const n in a){const i=t[n],d=a[n];/^on[A-Z]/.test(n)?i&&d?c[n]=(...h)=>{const o=d(...h);return i(...h),o}:i&&(c[n]=i):n==="style"?c[n]={...i,...d}:n==="className"&&(c[n]=[i,d].filter(Boolean).join(" "))}return{...t,...c}}function Ww(t){var n,i;let a=(n=Object.getOwnPropertyDescriptor(t.props,"ref"))==null?void 0:n.get,c=a&&"isReactWarning"in a&&a.isReactWarning;return c?t.ref:(a=(i=Object.getOwnPropertyDescriptor(t,"ref"))==null?void 0:i.get,c=a&&"isReactWarning"in a&&a.isReactWarning,c?t.props.ref:t.props.ref||t.ref)}function Gw(t){return s.isValidElement(t)&&typeof t.type=="function"&&"__radixId"in t.type&&t.type.__radixId===GN}var Zw=Symbol.for("react.lazy");function gN(t){return t!=null&&typeof t=="object"&&"$$typeof"in t&&t.$$typeof===Zw&&"_payload"in t&&Xw(t._payload)}function Xw(t){return typeof t=="object"&&t!==null&&"then"in t}var Kw=t=>`${t} failed to slot onto its children. Expected a single React element child or \`Slottable\`.`,Qw=t=>`${t} failed to slot onto its \`Slottable\`. Expected \`Slottable\` to receive a single React element child.`,Tg=Tv[" use ".trim().toString()],e={};/**
  * @license lucide-react v0.544.0 - ISC
  *
  * This source code is licensed under the ISC license.

package/apps/supervisor-web/dist/index.html

@@ -3,17 +3,23 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Remote Codex Supervisor</title>
-    <script type="module" crossorigin src="/assets/index-fi_pAm4J.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/react-vendor-CgLzZcV4.js">
-    <link rel="modulepreload" crossorigin href="/assets/ui-vendor-CeKGesq3.js">
-    <link rel="modulepreload" crossorigin href="/assets/graph-vendor-DVPtkh3h.js">
-    <link rel="modulepreload" crossorigin href="/assets/terminal-vendor-B365Go3Z.js">
-    <link rel="modulepreload" crossorigin href="/assets/markdown-vendor-BQJfKm05.js">
-    <link rel="modulepreload" crossorigin href="/assets/thread-ui-DXUs5Aqt.js">
+    <meta name="theme-color" content="#101722" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="48x48" href="/favicon-48x48.png" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="manifest" href="/site.webmanifest" />
+    <title>Remote Codex</title>
+    <script type="module" crossorigin src="/assets/index-BkwJP0KB.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/react-vendor-Dfg_6BLf.js">
+    <link rel="modulepreload" crossorigin href="/assets/ui-vendor-CuR8GHb0.js">
+    <link rel="modulepreload" crossorigin href="/assets/graph-vendor-DVQUpZ8C.js">
+    <link rel="modulepreload" crossorigin href="/assets/terminal-vendor-C5bTa-Ka.js">
+    <link rel="modulepreload" crossorigin href="/assets/markdown-vendor-RZk8L7-L.js">
+    <link rel="modulepreload" crossorigin href="/assets/thread-ui-BOqbjoiB.js">
     <link rel="stylesheet" crossorigin href="/assets/graph-vendor-C5ap-Sga.css">
     <link rel="stylesheet" crossorigin href="/assets/terminal-vendor-Beg8tuEN.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-FOSXdyuj.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-CJFMmjP5.css">
   </head>
   <body class="bg-stone-950">
     <div id="root"></div>

package/apps/supervisor-web/dist/site.webmanifest

@@ -0,0 +1,19 @@
+{
+  "name": "Remote Codex",
+  "short_name": "Remote Codex",
+  "icons": [
+    {
+      "src": "/icon-192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/icon-512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#101722",
+  "background_color": "#101722",
+  "display": "standalone"
+}

package/config/codex-model-pricing.json

@@ -9,6 +9,50 @@
     }
   },
   "models": {
+    "gpt-5.6": {
+      "inputUsdPerMillion": 5,
+      "cachedInputUsdPerMillion": 0.5,
+      "cacheWriteInputUsdPerMillion": 6.25,
+      "outputUsdPerMillion": 30,
+      "supportsFastMode": true,
+      "contextWindowTokens": 353400,
+      "longContextThresholdTokens": 272000,
+      "longContextInputMultiplier": 2,
+      "longContextOutputMultiplier": 1.5
+    },
+    "gpt-5.6-sol": {
+      "inputUsdPerMillion": 5,
+      "cachedInputUsdPerMillion": 0.5,
+      "cacheWriteInputUsdPerMillion": 6.25,
+      "outputUsdPerMillion": 30,
+      "supportsFastMode": true,
+      "contextWindowTokens": 353400,
+      "longContextThresholdTokens": 272000,
+      "longContextInputMultiplier": 2,
+      "longContextOutputMultiplier": 1.5
+    },
+    "gpt-5.6-terra": {
+      "inputUsdPerMillion": 2.5,
+      "cachedInputUsdPerMillion": 0.25,
+      "cacheWriteInputUsdPerMillion": 3.125,
+      "outputUsdPerMillion": 15,
+      "supportsFastMode": true,
+      "contextWindowTokens": 353400,
+      "longContextThresholdTokens": 272000,
+      "longContextInputMultiplier": 2,
+      "longContextOutputMultiplier": 1.5
+    },
+    "gpt-5.6-luna": {
+      "inputUsdPerMillion": 1,
+      "cachedInputUsdPerMillion": 0.1,
+      "cacheWriteInputUsdPerMillion": 1.25,
+      "outputUsdPerMillion": 6,
+      "supportsFastMode": true,
+      "contextWindowTokens": 353400,
+      "longContextThresholdTokens": 272000,
+      "longContextInputMultiplier": 2,
+      "longContextOutputMultiplier": 1.5
+    },
     "gpt-5.5": {
       "inputUsdPerMillion": 5,
       "cachedInputUsdPerMillion": 0.5,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remote-codex",
-  "version": "0.11.29",
+  "version": "0.11.31",
   "description": "Local web supervisor for Codex workspaces and threads.",
   "license": "MIT",
   "type": "module",

package/packages/agent-runtime/src/model-pricing.ts

@@ -11,10 +11,14 @@ export type PricingTierKey = 'standard' | 'fast';
 interface ModelPricingEntry {
   inputUsdPerMillion: number;
   cachedInputUsdPerMillion: number;
+  cacheWriteInputUsdPerMillion?: number;
   outputUsdPerMillion: number;
   supportsFastMode: boolean;
   fastMultiplier?: number;
   contextWindowTokens?: number;
+  longContextThresholdTokens?: number;
+  longContextInputMultiplier?: number;
+  longContextOutputMultiplier?: number;
 }
 
 interface PricingTierConfig {
@@ -119,10 +123,14 @@ function parsePricingConfig(raw: unknown): PricingConfig {
     const entry = value as {
       inputUsdPerMillion?: unknown;
       cachedInputUsdPerMillion?: unknown;
+      cacheWriteInputUsdPerMillion?: unknown;
       outputUsdPerMillion?: unknown;
       supportsFastMode?: unknown;
       fastMultiplier?: unknown;
       contextWindowTokens?: unknown;
+      longContextThresholdTokens?: unknown;
+      longContextInputMultiplier?: unknown;
+      longContextOutputMultiplier?: unknown;
     };
 
     if (
@@ -133,6 +141,12 @@ function parsePricingConfig(raw: unknown): PricingConfig {
     ) {
       throw new Error(`Pricing config model "${modelKey}" has invalid fields.`);
     }
+    if (
+      entry.cacheWriteInputUsdPerMillion !== undefined &&
+      !isPositiveNumber(entry.cacheWriteInputUsdPerMillion)
+    ) {
+      throw new Error(`Pricing config model "${modelKey}" cacheWriteInputUsdPerMillion must be a non-negative number.`);
+    }
     if (
       entry.fastMultiplier !== undefined &&
       !isPositiveNumber(entry.fastMultiplier)
@@ -145,10 +159,22 @@ function parsePricingConfig(raw: unknown): PricingConfig {
     ) {
       throw new Error(`Pricing config model "${modelKey}" contextWindowTokens must be a non-negative number.`);
     }
+    for (const field of [
+      'longContextThresholdTokens',
+      'longContextInputMultiplier',
+      'longContextOutputMultiplier',
+    ] as const) {
+      if (entry[field] !== undefined && !isPositiveNumber(entry[field])) {
+        throw new Error(`Pricing config model "${modelKey}" ${field} must be a non-negative number.`);
+      }
+    }
 
     models[modelKey] = {
       inputUsdPerMillion: entry.inputUsdPerMillion as number,
       cachedInputUsdPerMillion: entry.cachedInputUsdPerMillion as number,
+      ...(entry.cacheWriteInputUsdPerMillion !== undefined
+        ? { cacheWriteInputUsdPerMillion: entry.cacheWriteInputUsdPerMillion as number }
+        : {}),
       outputUsdPerMillion: entry.outputUsdPerMillion as number,
       supportsFastMode: entry.supportsFastMode,
       ...(entry.fastMultiplier !== undefined
@@ -157,6 +183,15 @@ function parsePricingConfig(raw: unknown): PricingConfig {
       ...(entry.contextWindowTokens !== undefined
         ? { contextWindowTokens: entry.contextWindowTokens as number }
         : {}),
+      ...(entry.longContextThresholdTokens !== undefined
+        ? { longContextThresholdTokens: entry.longContextThresholdTokens as number }
+        : {}),
+      ...(entry.longContextInputMultiplier !== undefined
+        ? { longContextInputMultiplier: entry.longContextInputMultiplier as number }
+        : {}),
+      ...(entry.longContextOutputMultiplier !== undefined
+        ? { longContextOutputMultiplier: entry.longContextOutputMultiplier as number }
+        : {}),
     };
   }
 
@@ -293,24 +328,48 @@ export function estimateTurnPrice(
   }
 
   const nonCachedInputTokens = Math.max(
-    usage.total.inputTokens - usage.total.cachedInputTokens,
+    usage.total.inputTokens -
+      usage.total.cachedInputTokens -
+      (usage.total.cacheWriteInputTokens ?? 0),
     0,
   );
   const cachedInputTokens = Math.max(usage.total.cachedInputTokens, 0);
+  const cacheWriteInputTokens = Math.max(
+    usage.total.cacheWriteInputTokens ?? 0,
+    0,
+  );
   const outputTokens = Math.max(usage.total.outputTokens, 0);
-  const multiplier =
+  const tierMultiplier =
     tierKey === 'fast' && modelPricing.fastMultiplier !== undefined
       ? modelPricing.fastMultiplier
       : tier.multiplier;
+  const usesLongContextPricing =
+    typeof modelPricing.longContextThresholdTokens === 'number' &&
+    usage.total.inputTokens > modelPricing.longContextThresholdTokens;
+  const inputMultiplier =
+    tierMultiplier *
+    (usesLongContextPricing
+      ? modelPricing.longContextInputMultiplier ?? 1
+      : 1);
+  const outputMultiplier =
+    tierMultiplier *
+    (usesLongContextPricing
+      ? modelPricing.longContextOutputMultiplier ?? 1
+      : 1);
 
   const inputUsd =
-    (nonCachedInputTokens * modelPricing.inputUsdPerMillion * multiplier) /
+    (nonCachedInputTokens * modelPricing.inputUsdPerMillion * inputMultiplier) /
     TOKEN_PRICE_DENOMINATOR;
   const cachedInputUsd =
-    (cachedInputTokens * modelPricing.cachedInputUsdPerMillion * multiplier) /
+    (cachedInputTokens * modelPricing.cachedInputUsdPerMillion * inputMultiplier) /
+    TOKEN_PRICE_DENOMINATOR;
+  const cacheWriteInputUsd =
+    (cacheWriteInputTokens *
+      (modelPricing.cacheWriteInputUsdPerMillion ?? modelPricing.inputUsdPerMillion) *
+      inputMultiplier) /
     TOKEN_PRICE_DENOMINATOR;
   const outputUsd =
-    (outputTokens * modelPricing.outputUsdPerMillion * multiplier) /
+    (outputTokens * modelPricing.outputUsdPerMillion * outputMultiplier) /
     TOKEN_PRICE_DENOMINATOR;
 
   return {
@@ -319,7 +378,8 @@ export function estimateTurnPrice(
     currency: pricingConfig.currency,
     inputUsd,
     cachedInputUsd,
+    cacheWriteInputUsd,
     outputUsd,
-    totalUsd: inputUsd + cachedInputUsd + outputUsd,
+    totalUsd: inputUsd + cachedInputUsd + cacheWriteInputUsd + outputUsd,
   };
 }

package/packages/claude/src/runtimeAdapter.ts

@@ -364,6 +364,7 @@ interface ClaudeTokenUsageBreakdown {
   totalTokens: number;
   inputTokens: number;
   cachedInputTokens: number;
+  cacheWriteInputTokens: number;
   outputTokens: number;
   reasoningOutputTokens: number;
 }
@@ -792,6 +793,8 @@ function addClaudeUsage(
     totalTokens: left.totalTokens + right.totalTokens,
     inputTokens: left.inputTokens + right.inputTokens,
     cachedInputTokens: left.cachedInputTokens + right.cachedInputTokens,
+    cacheWriteInputTokens:
+      left.cacheWriteInputTokens + right.cacheWriteInputTokens,
     outputTokens: left.outputTokens + right.outputTokens,
     reasoningOutputTokens: left.reasoningOutputTokens + right.reasoningOutputTokens,
   };
@@ -821,6 +824,7 @@ function normalizeClaudeUsage(value: unknown): ClaudeTokenUsageBreakdown | null
     totalTokens,
     inputTokens,
     cachedInputTokens: cacheReadInputTokens,
+    cacheWriteInputTokens: cacheCreationInputTokens,
     outputTokens,
     reasoningOutputTokens: 0,
   };

package/packages/codex/src/modelPricing.test.ts

@@ -52,6 +52,90 @@ describe('modelPricing', () => {
     expect(estimate?.totalUsd).toBeCloseTo(0.05025, 10);
   });
 
+  it('prices GPT-5.6 aliases and cache writes with the published rates', () => {
+    const usage = {
+      ...sampleUsage,
+      total: {
+        ...sampleUsage.total,
+        cacheWriteInputTokens: 200,
+      },
+      last: {
+        ...sampleUsage.last,
+        cacheWriteInputTokens: 200,
+      },
+      modelContextWindow: 353_400,
+    };
+
+    expect(contextWindowForModel('gpt-5.6')).toBe(353_400);
+    expect(contextWindowForModel('openai/gpt-5.6-sol')).toBe(353_400);
+    expect(supportsFastMode('gpt-5.6-terra')).toBe(true);
+    expect(buildTurnPricingSnapshot('gpt-5.6-luna', false)).toEqual({
+      pricingModelKey: 'gpt-5.6-luna',
+      pricingTierKey: 'standard',
+    });
+
+    const solEstimate = estimateTurnPrice(usage, {
+      pricingModelKey: 'gpt-5.6-sol',
+      pricingTierKey: 'standard',
+    });
+    expect(solEstimate).toMatchObject({
+      pricingModelKey: 'gpt-5.6-sol',
+      inputUsd: 0.004,
+      cachedInputUsd: 0.00025,
+      cacheWriteInputUsd: 0.00125,
+      outputUsd: 0.045,
+    });
+    expect(solEstimate?.totalUsd).toBeCloseTo(0.0505, 10);
+
+    const terraEstimate = estimateTurnPrice(usage, {
+      pricingModelKey: 'gpt-5.6-terra',
+      pricingTierKey: 'standard',
+    });
+    expect(terraEstimate?.cacheWriteInputUsd).toBeCloseTo(0.000625, 10);
+
+    const lunaEstimate = estimateTurnPrice(usage, {
+      pricingModelKey: 'gpt-5.6-luna',
+      pricingTierKey: 'standard',
+    });
+    expect(lunaEstimate?.cacheWriteInputUsd).toBeCloseTo(0.00025, 10);
+  });
+
+  it('applies GPT-5.6 long-context rates above 272K input tokens', () => {
+    const estimate = estimateTurnPrice(
+      {
+        total: {
+          totalTokens: 301_000,
+          inputTokens: 300_000,
+          cachedInputTokens: 0,
+          cacheWriteInputTokens: 0,
+          outputTokens: 1_000,
+          reasoningOutputTokens: 0,
+        },
+        last: {
+          totalTokens: 301_000,
+          inputTokens: 300_000,
+          cachedInputTokens: 0,
+          cacheWriteInputTokens: 0,
+          outputTokens: 1_000,
+          reasoningOutputTokens: 0,
+        },
+        modelContextWindow: 353_400,
+      },
+      {
+        pricingModelKey: 'gpt-5.6-sol',
+        pricingTierKey: 'standard',
+      },
+    );
+
+    expect(estimate).toMatchObject({
+      inputUsd: 3,
+      cachedInputUsd: 0,
+      cacheWriteInputUsd: 0,
+      outputUsd: 0.045,
+    });
+    expect(estimate?.totalUsd).toBeCloseTo(3.045, 10);
+  });
+
   it('uses the gpt-5.5-specific fast multiplier and marks it fast-capable', () => {
     expect(supportsFastMode('gpt-5.5')).toBe(true);
     expect(contextWindowForModel('gpt-5.5')).toBe(272000);

package/packages/codex/src/types.ts

@@ -63,7 +63,9 @@ export type ReasoningEffort =
   | 'low'
   | 'medium'
   | 'high'
-  | 'xhigh';
+  | 'xhigh'
+  | 'max'
+  | 'ultra';
 
 export type CollaborationModeKind = 'default' | 'plan';
 export type SandboxMode = 'read-only' | 'workspace-write' | 'danger-full-access';

package/packages/opencode/src/runtimeAdapter.ts

@@ -439,6 +439,13 @@ function openCodeUsageFromTokens(tokens: unknown) {
   const cachedInputTokens = nonNegativeNumberValue(
     tokens.cachedInputTokens ?? tokens.cached_input_tokens ?? cache?.read,
   ) ?? 0;
+  const cacheWriteInputTokens = nonNegativeNumberValue(
+    tokens.cacheWriteInputTokens ??
+      tokens.cache_write_input_tokens ??
+      tokens.cacheWriteTokens ??
+      tokens.cache_write_tokens ??
+      cache?.write,
+  ) ?? 0;
   const totalTokens = nonNegativeNumberValue(tokens.total ?? tokens.totalTokens ?? tokens.total_tokens)
     ?? inputTokens + outputTokens;
 
@@ -451,6 +458,7 @@ function openCodeUsageFromTokens(tokens: unknown) {
       totalTokens,
       inputTokens,
       cachedInputTokens,
+      ...(cacheWriteInputTokens > 0 ? { cacheWriteInputTokens } : {}),
       outputTokens,
       reasoningOutputTokens,
     },
@@ -524,6 +532,13 @@ function turnTokenUsage(messages: unknown[], model: ReturnType<typeof parseModel
       totalTokens: sum.totalTokens + usage.totalTokens,
       inputTokens: sum.inputTokens + usage.inputTokens,
       cachedInputTokens: sum.cachedInputTokens + usage.cachedInputTokens,
+      ...((sum.cacheWriteInputTokens ?? 0) + (usage.cacheWriteInputTokens ?? 0) > 0
+        ? {
+            cacheWriteInputTokens:
+              (sum.cacheWriteInputTokens ?? 0) +
+              (usage.cacheWriteInputTokens ?? 0),
+          }
+        : {}),
       outputTokens: sum.outputTokens + usage.outputTokens,
       reasoningOutputTokens: sum.reasoningOutputTokens + usage.reasoningOutputTokens,
     }), firstRecord);

package/packages/shared/src/index.ts

@@ -156,6 +156,8 @@ export interface RelayPendingRegistrationDto {
 
 export type RelayThreadAccessDto = 'read' | 'control';
 export type RelayWorkspaceAccessDto = 'none' | 'read' | 'write';
+export type RelayShareScopeDto = 'thread' | 'workspace' | 'device';
+export type RelayWorkspaceScopeDto = 'all' | 'selected';
 
 export interface CreateRelaySessionShareInput {
   targetIdentifier: string;
@@ -204,15 +206,91 @@ export interface RelaySessionShareAccessDto {
   shareId: string;
   userId: string;
   username: string;
+  kind: RelayAccessEventKindDto;
   accessedAt: string;
 }
 
+export type RelayAccessEventKindDto =
+  | 'access'
+  | 'open_device'
+  | 'open_thread'
+  | 'create_thread'
+  | 'send_prompt'
+  | 'read_workspace_file'
+  | 'write_workspace_file';
+
+export interface RelayAccessGrantEventDto {
+  id: string;
+  grantId: string;
+  userId: string;
+  username: string;
+  kind: RelayAccessEventKindDto;
+  accessedAt: string;
+}
+
+export interface CreateRelayAccessGrantInput {
+  targetIdentifier: string;
+  deviceId: string;
+  scope: RelayShareScopeDto;
+  threadId?: string | null;
+  workspaceId?: string | null;
+  workspaceScope?: RelayWorkspaceScopeDto;
+  workspaceIds?: string[];
+  label?: string | null;
+  threadAccess: RelayThreadAccessDto;
+  workspaceAccess: RelayWorkspaceAccessDto;
+  canCreateThreads?: boolean;
+  expiresAt?: string | null;
+}
+
+export interface UpdateRelayAccessGrantInput {
+  workspaceId?: string | null | undefined;
+  workspaceScope?: RelayWorkspaceScopeDto | undefined;
+  workspaceIds?: string[] | undefined;
+  label?: string | null | undefined;
+  threadAccess?: RelayThreadAccessDto | undefined;
+  workspaceAccess?: RelayWorkspaceAccessDto | undefined;
+  canCreateThreads?: boolean | undefined;
+  expiresAt?: string | null | undefined;
+}
+
+export interface RelayAccessGrantDto {
+  id: string;
+  ownerUserId: string;
+  ownerUsername: string;
+  targetUserId: string;
+  targetUsername: string;
+  deviceId: string;
+  deviceName: string;
+  scope: RelayShareScopeDto;
+  threadId: string | null;
+  threadTitle: string | null;
+  workspaceId: string | null;
+  workspaceLabel: string | null;
+  workspaceScope: RelayWorkspaceScopeDto;
+  workspaceIds: string[];
+  label: string | null;
+  threadAccess: RelayThreadAccessDto;
+  workspaceAccess: RelayWorkspaceAccessDto;
+  canCreateThreads: boolean;
+  createdAt: string;
+  revokedAt: string | null;
+  expiresAt: string | null;
+  lastAccessedAt: string | null;
+  lastAccessedByUsername: string | null;
+  accessEvents: RelayAccessGrantEventDto[];
+}
+
 export interface RelayEffectiveAccessDto {
   kind: 'owner' | 'shared';
+  grantId?: string | null;
   shareId: string | null;
+  scope?: 'owner' | RelayShareScopeDto;
   threadAccess: RelayThreadAccessDto;
   workspaceAccess: RelayWorkspaceAccessDto;
   workspaceId: string | null;
+  workspaceScope?: RelayWorkspaceScopeDto | null;
+  canCreateThreads?: boolean;
 }
 
 export interface RelaySessionDto {
@@ -243,12 +321,16 @@ export interface RelayPortalSummaryDto {
   devices: RelayDeviceDto[];
   sharedWithMe: RelaySessionShareDto[];
   sharedByMe: RelaySessionShareDto[];
+  sharedDevicesWithMe?: RelayAccessGrantDto[];
+  sharedThreadsWithMe?: RelayAccessGrantDto[];
+  grantsByMe?: RelayAccessGrantDto[];
 }
 
 export interface RelayAdminSummaryDto {
   users: RelayAdminUserDto[];
   devices: RelayAdminDeviceDto[];
   shares: RelaySessionShareDto[];
+  grants?: RelayAccessGrantDto[];
   pendingRegistrations: RelayPendingRegistrationDto[];
   settings: RelayRegistrationSettingsDto;
   conversationWindowDays: number;
@@ -620,7 +702,8 @@ export type ReasoningEffortDto =
   | 'medium'
   | 'high'
   | 'xhigh'
-  | 'max';
+  | 'max'
+  | 'ultra';
 export type CollaborationModeDto = 'default' | 'plan';
 export type SandboxModeDto = 'read-only' | 'workspace-write' | 'danger-full-access';
 
@@ -812,6 +895,7 @@ export interface ThreadTurnTokenBreakdownDto {
   totalTokens: number;
   inputTokens: number;
   cachedInputTokens: number;
+  cacheWriteInputTokens?: number;
   outputTokens: number;
   reasoningOutputTokens: number;
 }
@@ -830,6 +914,7 @@ export interface ThreadTurnPriceEstimateDto {
   currency: 'USD';
   inputUsd: number;
   cachedInputUsd: number;
+  cacheWriteInputUsd?: number;
   outputUsd: number;
   totalUsd: number;
 }