Merge pull request #289 from Latitudes-Dev/shuvcode-dev

sync: merge upstream v1.1.11

Author: shuv1337

.github/last-synced-tag

@@ -1 +1 @@
-v1.1.10
+v1.1.11

bun.lock

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.1.10-2",
+  "version": "1.1.11",
   "description": "",
   "type": "module",
   "exports": {

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.1.10-2",
+  "version": "1.1.11",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/console/app/package.json

@@ -195,6 +195,12 @@ export default function Home() {
                   <strong>Claude Pro</strong> Log in with Anthropic to use your Claude Pro or Max account
                 </div>
               </li>
+              <li>
+                <span>[*]</span>
+                <div>
+                  <strong>ChatGPT Plus/Pro</strong> Log in with OpenAI to use your ChatGPT Plus or Pro account
+                </div>
+              </li>
               <li>
                 <span>[*]</span>
                 <div>

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

@@ -91,6 +91,9 @@ export default function Home() {
             <li>
               <strong>Claude Pro</strong> Log in with Anthropic to use your Claude Pro or Max account
             </li>
+            <li>
+              <strong>ChatGPT Plus/Pro</strong> Log in with OpenAI to use your ChatGPT Plus or Pro account
+            </li>
             <li>
               <strong>Use any model</strong> Supports 75+ LLM providers through{" "}
               <a href="https://models.dev">Models.dev</a>, including local models

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

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.1.10-2",
+  "version": "1.1.11",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/console/core/package.json

@@ -38,10 +38,21 @@ if (identifier.startsWith("wrk_")) {
         workspaceID: UserTable.workspaceID,
         workspaceName: WorkspaceTable.name,
         role: UserTable.role,
+        subscribed: SubscriptionTable.timeCreated,
       })
       .from(UserTable)
       .innerJoin(WorkspaceTable, eq(WorkspaceTable.id, UserTable.workspaceID))
-      .where(eq(UserTable.accountID, accountID)),
+      .innerJoin(SubscriptionTable, eq(SubscriptionTable.userID, UserTable.id))
+      .where(eq(UserTable.accountID, accountID))
+      .then((rows) =>
+        rows.map((row) => ({
+          userID: row.userID,
+          workspaceID: row.workspaceID,
+          workspaceName: row.workspaceName,
+          role: row.role,
+          subscribed: formatDate(row.subscribed),
+        })),
+      ),
   )
 
   // Get all payments for these workspaces

packages/console/core/script/lookup-user.ts

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-function",
-  "version": "1.1.10-2",
+  "version": "1.1.11",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",

packages/console/function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-mail",
-  "version": "1.1.10-2",
+  "version": "1.1.11",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",