Integration merge #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

shuv1337 merged 67 commits into integration from integration-merge-test

Nov 24, 2025

.opencode/opencode.jsonc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,9 @@
  
    {

      "$schema": "https://opencode.ai/config.json",

      "plugin": ["opencode-openai-codex-auth"],

      // "enterprise": {

      //   "url": "http://localhost:3000",

      // },

      "enterprise": {

        "url": "http://localhost:3000",

      },

      "provider": {

        "opencode": {

          "options": {

bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

packages/console/app/package.json

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     {
       "name": "@opencode-ai/console-app",
-      "version": "1.0.108",
+      "version": "1.0.109",
       "type": "module",
       "scripts": {
         "typecheck": "tsgo --noEmit",
@@ Expand Down @@

packages/console/app/public/favicon.svg

This file was deleted.

packages/console/app/public/favicon.svg

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../ui/src/assets/favicon/favicon.svg

packages/console/app/src/component/icon.tsx

-Original file line number
+Diff line change
@@ Expand Up @@
       )
     }
-    export function IconGoogle(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
+    export function IconGemini(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
       return (
         <svg {...props} viewBox="0 0 50 50" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
           <path d="M49.04,24.001l-1.082-0.043h-0.001C36.134,23.492,26.508,13.866,26.042,2.043L25.999,0.96C25.978,0.424,25.537,0,25,0	s-0.978,0.424-0.999,0.96l-0.043,1.083C23.492,13.866,13.866,23.492,2.042,23.958L0.96,24.001C0.424,24.022,0,24.463,0,25	c0,0.537,0.424,0.978,0.961,0.999l1.082,0.042c11.823,0.467,21.449,10.093,21.915,21.916l0.043,1.083C24.022,49.576,24.463,50,25,50	s0.978-0.424,0.999-0.96l0.043-1.083c0.466-11.823,10.092-21.449,21.915-21.916l1.082-0.042C49.576,25.978,50,25.537,50,25	C50,24.463,49.576,24.022,49.04,24.001z"></path>
@@ Expand Down @@

packages/console/app/src/entry-server.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ export default createHandler( @@
               <head>
                 <meta charset="utf-8" />
                 <meta name="viewport" content="width=device-width, initial-scale=1" />
-                <link rel="icon" href="/favicon.svg" />
+                <link rel="shortcut icon" type="image/svg+xml" href="/favicon.svg" />
                 <meta property="og:image" content="/social-share.png" />
                 <meta property="twitter:image" content="/social-share.png" />
                 {assets}
@@ Expand Down @@

packages/console/app/src/routes/index.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,6 @@ export default function Home() { @@
           {/*<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />*/}
           <Title>OpenCode | The AI coding agent built for the terminal</Title>
           <Link rel="canonical" href={config.baseUrl} />
-          <Link rel="icon" type="image/svg+xml" href="/favicon.svg" />
           <Meta property="og:image" content="/social-share.png" />
           <Meta name="twitter:image" content="/social-share.png" />
           <div data-component="container">
@@ Expand Down @@

packages/console/app/src/routes/workspace.tsx

-Original file line number
+Diff line change
@@ Expand Up @@
       const userEmail = createAsync(() => getUserEmail(params.id!))
       return (
         <main data-page="workspace">
-          <Link rel="icon" type="image/svg+xml" href="/favicon-zen.svg" />
+          <Link rel="shortcut icon" type="image/svg+xml" href="/favicon-zen.svg" />
           <header data-component="workspace-header">
             <div data-slot="header-brand">
               <A href="/" data-component="site-title">
@@ Expand Down @@

packages/console/app/src/routes/workspace/[id]/model-section.tsx

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,7 +8,7 @@ import { querySessionInfo } from "../common"
  
    import {

      IconAlibaba,

      IconAnthropic,

      IconGoogle,

      IconGemini,

      IconMoonshotAI,

      IconOpenAI,

      IconStealth,

    @@ -117,7 +117,7 @@ export function ModelSection() {
  
                                    case "Anthropic":

                                      return <IconAnthropic width={16} height={16} />

                                    case "Google":

                                      return <IconGoogle width={16} height={16} />

                                      return <IconGemini width={16} height={16} />

                                    case "Moonshot AI":

                                      return <IconMoonshotAI width={16} height={16} />

                                    case "Z.ai":

packages/console/app/src/routes/workspace/[id]/provider-section.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ import styles from "./provider-section.module.css" @@
     const PROVIDERS = [
       { name: "OpenAI", key: "openai", prefix: "sk-" },
       { name: "Anthropic", key: "anthropic", prefix: "sk-ant-" },
+      { name: "Google Gemini", key: "google", prefix: "AI" },
     ] as const
     type Provider = (typeof PROVIDERS)[number]
@@ Expand Down @@

packages/console/app/src/routes/workspace/[id]/usage-section.tsx

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -50,6 +50,10 @@ export function UsageSection() {
  
        return u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWrite5mTokens ?? 0) + (u.cacheWrite1hTokens ?? 0)

      }

      const calculateTotalOutputTokens = (u: Awaited<ReturnType<typeof getUsageInfo>>[0]) => {

        return u.outputTokens + (u.reasoningTokens ?? 0)

      }

      const goPrev = async () => {

        const usage = await getUsageInfo(params.id!, store.page - 1)

        setStore({

    @@ -95,8 +99,11 @@ export function UsageSection() {
  
                    {(usage, index) => {

                      const date = createMemo(() => new Date(usage.timeCreated))

                      const totalInputTokens = createMemo(() => calculateTotalInputTokens(usage))

                      const breakdownId = `breakdown-${index()}`

                      const isOpen = createMemo(() => openBreakdownId() === breakdownId)

                      const totalOutputTokens = createMemo(() => calculateTotalOutputTokens(usage))

                      const inputBreakdownId = `input-breakdown-${index()}`

                      const outputBreakdownId = `output-breakdown-${index()}`

                      const isInputOpen = createMemo(() => openBreakdownId() === inputBreakdownId)

                      const isOutputOpen = createMemo(() => openBreakdownId() === outputBreakdownId)

                      const isClaude = usage.model.toLowerCase().includes("claude")

                      return (

                        <tr>

    @@ -110,13 +117,13 @@ export function UsageSection() {
  
                                data-slot="breakdown-button"

                                onClick={(e) => {

                                  e.stopPropagation()

                                  setOpenBreakdownId(isOpen() ? null : breakdownId)

                                  setOpenBreakdownId(isInputOpen() ? null : inputBreakdownId)

                                }}

                              >

                                <IconBreakdown />

                              </button>

                              <span onClick={() => setOpenBreakdownId(null)}>{totalInputTokens()}</span>

                              <Show when={isOpen()}>

                              <Show when={isInputOpen()}>

                                <div data-slot="breakdown-popup" onClick={(e) => e.stopPropagation()}>

                                  <div data-slot="breakdown-row">

                                    <span data-slot="breakdown-label">Input</span>

    @@ -136,7 +143,32 @@ export function UsageSection() {
  
                              </Show>

                            </div>

                          </td>

                          <td data-slot="usage-tokens">{usage.outputTokens}</td>

                          <td data-slot="usage-tokens">

                            <div data-slot="tokens-with-breakdown" onClick={(e) => e.stopPropagation()}>

                              <button

                                data-slot="breakdown-button"

                                onClick={(e) => {

                                  e.stopPropagation()

                                  setOpenBreakdownId(isOutputOpen() ? null : outputBreakdownId)

                                }}

                              >

                                <IconBreakdown />

                              </button>

                              <span onClick={() => setOpenBreakdownId(null)}>{totalOutputTokens()}</span>

                              <Show when={isOutputOpen()}>

                                <div data-slot="breakdown-popup" onClick={(e) => e.stopPropagation()}>

                                  <div data-slot="breakdown-row">

                                    <span data-slot="breakdown-label">Output</span>

                                    <span data-slot="breakdown-value">{usage.outputTokens}</span>

                                  </div>

                                  <div data-slot="breakdown-row">

                                    <span data-slot="breakdown-label">Reasoning</span>

                                    <span data-slot="breakdown-value">{usage.reasoningTokens ?? 0}</span>

                                  </div>

                                </div>

                              </Show>

                            </div>

                          </td>

                          <td data-slot="usage-cost">${((usage.cost ?? 0) / 100000000).toFixed(4)}</td>

                        </tr>

                      )

packages/console/app/src/routes/zen/index.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ import { Legal } from "~/component/legal" @@
     import { Footer } from "~/component/footer"
     import { Header } from "~/component/header"
     import { getLastSeenWorkspaceID } from "../workspace/common"
+    import { IconGemini } from "~/component/icon"
     const checkLoggedIn = query(async () => {
       "use server"
@@ Expand All / @@ -32,7 +33,7 @@ export default function Home() { @@
           {/*<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />*/}
           <Title>OpenCode Zen | A curated set of reliable optimized models for coding agents</Title>
           <Link rel="canonical" href={`${config.baseUrl}/zen`} />
-          <Link rel="icon" type="image/svg+xml" href="/favicon-zen.svg" />
+          <Link rel="shortcut icon" type="image/svg+xml" href="/favicon-zen.svg" />
           <Meta property="og:image" content="/social-share-zen.png" />
           <Meta name="twitter:image" content="/social-share-zen.png" />
           <Meta name="opencode:auth" content={loggedin() ? "true" : "false"} />
@@ Expand Down Expand Up / @@ -82,6 +83,9 @@ export default function Home() { @@
                         />
                       </svg>
                     </div>
+                    <div>
+                      <IconGemini width="24" height="24" />
+                    </div>
                     <div>
                       <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path
@@ Expand Down @@

packages/console/core/package.json

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     {
       "$schema": "https://json.schemastore.org/package.json",
       "name": "@opencode-ai/console-core",
-      "version": "1.0.108",
+      "version": "1.0.109",
       "private": true,
       "type": "module",
       "dependencies": {
@@ Expand Down @@

packages/console/function/package.json

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     {
       "name": "@opencode-ai/console-function",
-      "version": "1.0.108",
+      "version": "1.0.109",
       "$schema": "https://json.schemastore.org/package.json",
       "private": true,
       "type": "module",
@@ Expand Down @@

packages/console/mail/package.json

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     {
       "name": "@opencode-ai/console-mail",
-      "version": "1.0.108",
+      "version": "1.0.109",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ Expand Down @@

packages/desktop/package.json

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     {
       "name": "@opencode-ai/desktop",
-      "version": "1.0.108",
+      "version": "1.0.109",
       "description": "",
       "type": "module",
       "scripts": {
@@ Expand Down @@

packages/desktop/src/pages/session.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -338,14 +338,28 @@ export default function Page() { @@
                       <Match when={session.id}>
                         <div class="flex items-start justify-start h-full min-h-0">
                           <Show when={session.messages.user().length > 1}>
-                            <MessageNav
-                              classList={{ "mt-1.5 mr-3": wide(), "mt-3 mr-8": !wide() }}
-                              messages={session.messages.user()}
-                              current={session.messages.active()}
-                              onMessageSelect={session.messages.setActive}
-                              size={wide() ? "normal" : "compact"}
-                              working={session.working()}
-                            />
+                            <>
+                              <MessageNav
+                                class="@6xl:hidden mt-3 mr-8"
+                                messages={session.messages.user()}
+                                current={session.messages.active()}
+                                onMessageSelect={session.messages.setActive}
+                                size="compact"
+                                working={session.working()}
+                              />
+                              <MessageNav
+                                classList={{
+                                  "hidden @6xl:block": true,
+                                  "mt-0.5 mr-3 absolute right-full": wide(),
+                                  "mt-3 mr-8": !wide(),
+                                }}
+                                messages={session.messages.user()}
+                                current={session.messages.active()}
+                                onMessageSelect={session.messages.setActive}
+                                size={wide() ? "normal" : "compact"}
+                                working={session.working()}
+                              />
+                            </>
                           </Show>
                           <SessionTurn
                             sessionID={session.id!}
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integration merge #34

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!