tulingcode 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "name": "tulingcode",
   "type": "module",
   "license": "MIT",
@@ -48,8 +48,8 @@
     "@babel/core": "7.28.4",
     "@effect/language-service": "0.84.2",
     "@octokit/webhooks-types": "7.6.1",
-    "@tuling-ai/script": "0.1.0",
-    "@tuling-ai/shared": "0.1.0",
+    "tulingcode-script": "0.1.0",
+    "tulingcode-shared": "0.1.0",
     "@parcel/watcher-darwin-arm64": "2.5.1",
     "@parcel/watcher-darwin-x64": "2.5.1",
     "@parcel/watcher-linux-arm64-glibc": "2.5.1",
@@ -134,10 +134,10 @@
     "@solid-primitives/i18n": "2.2.1",
     "@solid-primitives/scheduled": "1.5.2",
     "@standard-schema/spec": "1.0.0",
-    "@tuling-ai/plugin": "0.1.0",
-    "@tuling-ai/script": "0.1.0",
-    "@tuling-ai/sdk": "0.1.0",
-    "@tuling-ai/ui": "0.1.0",
+    "tulingcode-plugin": "0.1.0",
+    "tulingcode-script": "0.1.0",
+    "tulingcode-sdk": "0.1.0",
+    "tulingcode-ui": "0.1.0",
     "@zip.js/zip.js": "2.7.62",
     "ai": "6.0.168",
     "ai-gateway-provider": "3.1.2",

package/src/cli/cmd/tui/app.tsx

@@ -765,19 +765,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
       },
       category: "system",
     },
-    {
-      title: t("tui.command.docs.open.title"),
-      value: "docs.open",
-      slash: {
-        name: "doc",
-        aliases: ["docs"],
-      },
-      onSelect: () => {
-        open("https://mimo.xiaomi.com/coder/docs").catch(() => {})
-        dialog.clear()
-      },
-      category: "system",
-    },
     {
       title: t("tui.command.app.exit.title"),
       value: "app.exit",

package/src/cli/cmd/tui/component/dialog-mimo-login.tsx

@@ -5,8 +5,6 @@ import { useLocal } from "@tui/context/local"
 import { useDialog } from "@tui/ui/dialog"
 import { useTheme } from "../context/theme"
 import { useLanguage } from "../context/language"
-import { DialogProvider as DialogProviderList } from "./dialog-provider"
-import { DialogSelect } from "@tui/ui/dialog-select"
 import { DialogPrompt } from "../ui/dialog-prompt"
 import { useToast } from "../ui/toast"
 import os from "os"
@@ -40,129 +38,122 @@ export function DialogMimoLogin() {
               return
             }
             dialog.replace(() => (
-              <MimoOAuthFlow url={result.data!.url} instructions={result.data!.instructions} />
+              <TulingAIOAuthFlow url={result.data!.url} instructions={result.data!.instructions} />
             ))
           },
         },
         {
-          title: t("tui.dialog.login.xiaomi"),
-          value: "xiaomi",
-          description: t("tui.dialog.login.xiaomi.desc"),
-          onSelect: async () => {
-            const result = await sdk.client.provider.oauth.authorize({
-              providerID: "xiaomi",
-              method: 0,
-            })
-            if (result.error) {
-              toast.show({ message: t("tui.dialog.login.start_failed"), variant: "error" })
-              dialog.clear()
-              return
-            }
-            dialog.replace(() => (
-              <MimoOAuthFlow url={result.data!.url} instructions={result.data!.instructions} />
-            ))
+          title: "云端API",
+          value: "cloud-api",
+          description: "使用云端API Key",
+          onSelect: () => {
+            dialog.replace(() => <CloudAPIKeyInput />)
           },
         },
         {
-          title: t("tui.dialog.login.import_claude"),
-          value: "import_claude",
-          onSelect: async () => {
-            const claudeDir = path.join(os.homedir(), ".claude")
-            const candidates = ["settings.json", "settings.local.json", "settings_local.json"]
+          title: "自定义API",
+          value: "custom-api",
+          description: "自定义API地址和Key",
+          onSelect: () => {
+            dialog.replace(() => <CustomAPIInput />)
+          },
+        },
+      ]}
+    />
+  )
+}
 
-            const resolve = await (async () => {
-              const envs: Record<string, string>[] = []
-              for (const file of candidates) {
-                try {
-                  const content = await Bun.file(path.join(claudeDir, file)).json()
-                  if (content?.env && typeof content.env === "object") envs.push(content.env)
-                } catch {}
-              }
-              return (name: string) => {
-                for (let i = envs.length - 1; i >= 0; i--) {
-                  const v = envs[i][name]
-                  if (v && typeof v === "string") return v
-                }
-                return process.env[name]
-              }
-            })()
+// 云端API Key 输入组件
+function CloudAPIKeyInput() {
+  const dialog = useDialog()
+  const sdk = useSDK()
+  const sync = useSync()
+  const local = useLocal()
+  const toast = useToast()
 
-            const key = resolve("ANTHROPIC_API_KEY")
-            const rawBaseUrl = resolve("ANTHROPIC_BASE_URL")
-            const baseUrl = rawBaseUrl
-              ? rawBaseUrl.replace(/\/+$/, "").replace(/(?<!\/v1)$/, "/v1")
-              : undefined
-            // strip Claude Code context-window suffix e.g. claude-opus-4-6[1m]
-            const preferredModel = (
-              resolve("ANTHROPIC_DEFAULT_OPUS_MODEL") ?? resolve("ANTHROPIC_DEFAULT_SONNET_MODEL")
-            )?.replace(/\[.*\]$/, "")
+  return (
+    <DialogPrompt
+      title="云端API Key"
+      placeholder="请输入 API Key (sk-...)"
+      onConfirm={async (value) => {
+        if (!value) return
+        await sdk.client.auth.set({
+          providerID: "cloud-api",
+          auth: { type: "api", key: value, metadata: { base_url: "https://ydapi.cxikeji.top" } },
+        })
+        await sdk.client.instance.dispose()
+        await sync.bootstrap()
+        const provider = sync.data.provider.find((p) => p.id === "cloud-api")
+        if (provider) {
+          local.model.set({ providerID: "cloud-api", modelID: Object.keys(provider.models)[0] }, { recent: true })
+        }
+        toast.show({ message: "云端API 连接成功", variant: "info" })
+        dialog.clear()
+      }}
+    />
+  )
+}
 
-            if (!key) {
-              toast.show({ message: t("tui.dialog.login.import_claude.no_key"), variant: "error" })
-              dialog.clear()
-              return
-            }
+// 自定义API 输入组件
+function CustomAPIInput() {
+  const dialog = useDialog()
+  const sdk = useSDK()
+  const sync = useSync()
+  const local = useLocal()
+  const toast = useToast()
+  const [apiUrl, setApiUrl] = createSignal("")
 
-            await sdk.client.auth.set({
-              providerID: "anthropic",
-              auth: { type: "api", key },
-            })
-            await sdk.client.global.config.update({
-              config: {
-                provider: {
-                  anthropic: { options: { baseURL: baseUrl || "https://api.anthropic.com/v1" } },
-                },
-              },
-            })
-            await sdk.client.instance.dispose()
-            await sync.bootstrap()
+  return (
+    <DialogPrompt
+      title="自定义API 地址"
+      placeholder="请输入API地址 (https://api.example.com/v1)"
+      onConfirm={async (value) => {
+        if (!value) return
+        setApiUrl(value)
+        dialog.replace(() => <CustomAPIKeyInput apiUrl={value} />)
+      }}
+    />
+  )
+}
 
-            const anthropic = sync.data.provider.find((p) => p.id === "anthropic")
-            if (anthropic) {
-              if (preferredModel && !(preferredModel in anthropic.models)) {
-                await sdk.client.global.config.update({
-                  config: {
-                    provider: {
-                      anthropic: { models: { [preferredModel]: { name: preferredModel } } },
-                    },
-                  },
-                })
-                await sdk.client.instance.dispose()
-                await sync.bootstrap()
-              }
-              const models = Object.keys(anthropic.models).sort()
-              const selected = preferredModel
-                || models.find((m) => m === "claude-opus-4-6")
-                || models.findLast((m) => m.includes("opus"))
-                || models.findLast((m) => m.includes("sonnet"))
-                || models[0]
-              if (selected) {
-                local.model.set({ providerID: "anthropic", modelID: selected }, { recent: true })
-              }
-            }
-            toast.show({ message: t("tui.dialog.login.import_claude.success"), variant: "info" })
-            dialog.clear()
-          },
-        },
-        {
-          title: t("tui.dialog.login.other"),
-          value: "__other__",
-          onSelect: () => {
-            dialog.replace(() => <DialogProviderList />)
-          },
-        },
-      ]}
+// 自定义API Key 输入组件
+function CustomAPIKeyInput(props: { apiUrl: string }) {
+  const dialog = useDialog()
+  const sdk = useSDK()
+  const sync = useSync()
+  const local = useLocal()
+  const toast = useToast()
+
+  return (
+    <DialogPrompt
+      title="自定义API Key"
+      placeholder="请输入 API Key (sk-...)"
+      onConfirm={async (value) => {
+        if (!value) return
+        await sdk.client.auth.set({
+          providerID: "custom-api",
+          auth: { type: "api", key: value, metadata: { base_url: props.apiUrl } },
+        })
+        await sdk.client.instance.dispose()
+        await sync.bootstrap()
+        const provider = sync.data.provider.find((p) => p.id === "custom-api")
+        if (provider) {
+          local.model.set({ providerID: "custom-api", modelID: Object.keys(provider.models)[0] }, { recent: true })
+        }
+        toast.show({ message: "自定义API 连接成功", variant: "info" })
+        dialog.clear()
+      }}
     />
   )
 }
 
-function MimoOAuthFlow(props: { url: string; instructions: string }) {
+// 图灵AI OAuth 流程
+function TulingAIOAuthFlow(props: { url: string; instructions: string }) {
   const dialog = useDialog()
   const sdk = useSDK()
   const sync = useSync()
   const local = useLocal()
   const { theme } = useTheme()
-  const { t } = useLanguage()
   const toast = useToast()
   const [busy, setBusy] = createSignal(false)
 
@@ -179,7 +170,7 @@ function MimoOAuthFlow(props: { url: string; instructions: string }) {
 
   onMount(async () => {
     const callbackResult = await sdk.client.provider.oauth.callback({
-      providerID: "xiaomi",
+      providerID: "tuling-ai",
       method: 0,
     })
     if (callbackResult.error) return
@@ -188,37 +179,30 @@ function MimoOAuthFlow(props: { url: string; instructions: string }) {
 
   return (
     <DialogPrompt
-      title={t("tui.dialog.login.flow.title")}
-      placeholder={t("tui.dialog.login.flow.placeholder")}
-      busy={busy()}
-      busyText={t("tui.dialog.login.flow.busy")}
-      description={
-        <box gap={1}>
-          <Show when={props.url}>
-            <text fg={theme.textMuted}>{t("tui.dialog.login.flow.manual_hint")}</text>
-            <text fg={theme.primary}>{props.url}</text>
-          </Show>
-          <Show when={props.instructions}>
-            <text fg={theme.textMuted}>{props.instructions}</text>
-          </Show>
-          <text fg={theme.textMuted}>{t("tui.dialog.login.flow.waiting")}</text>
-        </box>
-      }
+      title="图灵AI 授权"
+      placeholder="Authorization code"
       onConfirm={async (value) => {
         if (!value) return
-        setBusy(true)
-        const { error: err } = await sdk.client.provider.oauth.callback({
-          providerID: "xiaomi",
+        const { error } = await sdk.client.provider.oauth.callback({
+          providerID: "tuling-ai",
           method: 0,
-          code: value.trim(),
+          code: value,
         })
-        if (err) {
-          setBusy(false)
-          toast.show({ message: t("tui.dialog.login.flow.invalid_code"), variant: "error" })
+        if (!error) {
+          await onLoginSuccess()
           return
         }
-        await onLoginSuccess()
+        toast.show({ message: "授权失败", variant: "error" })
       }}
+      description={() => (
+        <box gap={1}>
+          <text fg={theme.textMuted}>{props.instructions}</text>
+          <text fg={theme.textMuted}>Press c to copy the authorization code</text>
+        </box>
+      )}
     />
   )
 }
+
+// 导入 DialogSelect
+import { DialogSelect } from "@tui/ui/dialog-select"

package/src/cli/cmd/tui/component/dialog-model.tsx

@@ -53,10 +53,10 @@ export function DialogModel(props: { providerID?: string }) {
             key: item,
             value: { providerID: provider.id, modelID: model.id },
             title: model.name ?? item.modelID,
-            description: provider.name,
+            description: undefined, // 不显示 provider 名称
             category,
-            disabled: provider.id === "tulingcode" && model.id.includes("-nano"),
-            footer: model.cost?.input === 0 && provider.id === "tulingcode" ? "Free" : undefined,
+            disabled: false,
+            footer: undefined as "Free" | undefined,
             onSelect: () => {
               onSelect(provider.id, model.id)
             },
@@ -73,73 +73,67 @@ export function DialogModel(props: { providerID?: string }) {
       "Recent",
     )
 
+    // 合并所有provider的模型，去重后显示（通用模型，不分provider）
+    const allModels = new Map<string, { providerID: string; modelID: string; name: string }>()
+    for (const provider of sync.data.provider.filter((p) => ["tuling-ai", "cloud-api", "custom-api"].includes(p.id))) {
+      for (const [modelID, info] of Object.entries(provider.models)) {
+        if (info.status === "deprecated") continue
+        if (!allModels.has(modelID)) {
+          allModels.set(modelID, { providerID: provider.id, modelID, name: info.name ?? modelID })
+        }
+      }
+    }
+
+    // 自定义排序：GPT-5.5 放在第一个
+    const modelOrder = ["gpt-5.5", "claude-opus-4-8", "claude-sonnet-4-6", "mimo-v2.5", "mimo-v2.5-pro", "gemini-3.1-pro-preview"]
+    const sortedModels = Array.from(allModels.values()).sort((a, b) => {
+      const aIndex = modelOrder.indexOf(a.modelID)
+      const bIndex = modelOrder.indexOf(b.modelID)
+      if (aIndex !== -1 && bIndex !== -1) return aIndex - bIndex
+      if (aIndex !== -1) return -1
+      if (bIndex !== -1) return 1
+      return a.name.localeCompare(b.name)
+    })
+
     const providerOptions = pipe(
-      sync.data.provider,
-      sortBy(
-        (provider) => provider.id !== "tulingcode",
-        (provider) => provider.name,
-      ),
-      flatMap((provider) => {
-        const models = pipe(
-          provider.models,
-          entries(),
-          filter(([_, info]) => info.status !== "deprecated"),
-          filter(([_, info]) => (props.providerID ? info.providerID === props.providerID : true)),
-          map(([model, info]) => ({
-            value: { providerID: provider.id, modelID: model },
-            title: info.name ?? model,
-            description: favorites.some((item) => item.providerID === provider.id && item.modelID === model)
-              ? "(Favorite)"
-              : undefined,
-            category: connected() ? provider.name : undefined,
-            disabled: provider.id === "tulingcode" && model.includes("-nano"),
-            footer: info.cost?.input === 0 && provider.id === "tulingcode" ? "Free" : undefined,
-            onSelect() {
-              onSelect(provider.id, model)
-            },
-          })),
-          filter((x) => {
-            if (!showSections) return true
-            if (favorites.some((item) => item.providerID === x.value.providerID && item.modelID === x.value.modelID))
-              return false
-            if (recents.some((item) => item.providerID === x.value.providerID && item.modelID === x.value.modelID))
-              return false
-            return true
-          }),
-          sortBy(
-            (x) => x.footer !== "Free",
-            (x) => x.title,
-          ),
-        )
-        if (provider.source !== "config") return models
-        if (props.providerID && props.providerID !== provider.id) return models
-        return [
-          ...models,
-          {
-            value: { providerID: provider.id, modelID: ADD_MODEL_SENTINEL },
-            title: "+ Add model",
-            description: undefined,
-            category: connected() ? provider.name : undefined,
-            disabled: false,
-            footer: undefined as "Free" | undefined,
-            onSelect() {
-              void runAddModelWizard({ dialog, sdk, sync, toast, providerID: provider.id })
-            },
-          },
-        ]
+      sortedModels,
+      map((item) => ({
+        value: { providerID: item.providerID, modelID: item.modelID },
+        title: item.name,
+        description: "",
+        category: undefined,
+        disabled: false,
+        footer: undefined as "Free" | undefined,
+        onSelect() {
+          onSelect(item.providerID, item.modelID)
+        },
+      })),
+      filter((x) => {
+        if (!showSections) return true
+        if (favorites.some((item) => item.modelID === x.value.modelID))
+          return false
+        if (recents.some((item) => item.modelID === x.value.modelID))
+          return false
+        return true
       }),
+      // 添加 "+ Add model" 选项
+      (list) => [
+        ...list,
+        {
+          value: { providerID: "tuling-ai", modelID: ADD_MODEL_SENTINEL },
+          title: "+ Add model",
+          description: "",
+          category: undefined,
+          disabled: false,
+          footer: undefined as "Free" | undefined,
+          onSelect() {
+            void runAddModelWizard({ dialog, sdk, sync, toast, providerID: "tuling-ai" })
+          },
+        },
+      ],
     )
 
-    const popularProviders = !connected()
-      ? pipe(
-          providers(),
-          map((option) => ({
-            ...option,
-            category: "Popular providers",
-          })),
-          take(6),
-        )
-      : []
+    const popularProviders = [] // 移除不需要的 provider 选项
 
     if (needle) {
       return [
@@ -163,17 +157,8 @@ export function DialogModel(props: { providerID?: string }) {
 
   function onSelect(providerID: string, modelID: string) {
     local.model.set({ providerID, modelID }, { recent: true })
-    const list = local.model.variant.list()
-    const cur = local.model.variant.selected()
-    if (cur === "default" || (cur && list.includes(cur))) {
-      dialog.clear()
-      return
-    }
-    if (list.length > 0) {
-      dialog.replace(() => <DialogVariant />)
-      return
-    }
-    dialog.clear()
+    // 总是跳转到 API 格式选择
+    dialog.replace(() => <DialogVariant />)
   }
 
   return (

package/src/cli/cmd/tui/component/dialog-variant.tsx

@@ -1,4 +1,4 @@
-import { createMemo } from "solid-js"
+import { createMemo, createSignal } from "solid-js"
 import { useLocal } from "@tui/context/local"
 import { DialogSelect } from "@tui/ui/dialog-select"
 import { useDialog } from "@tui/ui/dialog"
@@ -10,30 +10,47 @@ export function DialogVariant() {
   const options = createMemo(() => {
     return [
       {
-        value: "default",
-        title: "Default",
+        value: "skip",
+        title: "跳过 (使用默认格式)",
         onSelect: () => {
+          local.model.variant.set(undefined)
           dialog.clear()
+        },
+      },
+      {
+        value: "openai",
+        title: "OpenAI 格式",
+        description: "兼容所有 OpenAI 格式 API",
+        onSelect: () => {
           local.model.variant.set(undefined)
+          dialog.clear()
         },
       },
-      ...local.model.variant.list().map((variant) => ({
-        value: variant,
-        title: variant,
+      {
+        value: "anthropic",
+        title: "Anthropic 格式",
+        description: "Claude 官方格式",
         onSelect: () => {
+          local.model.variant.set(undefined)
           dialog.clear()
-          local.model.variant.set(variant)
         },
-      })),
+      },
+      {
+        value: "gemini",
+        title: "Gemini 格式",
+        description: "Google Gemini 官方格式",
+        onSelect: () => {
+          local.model.variant.set(undefined)
+          dialog.clear()
+        },
+      },
     ]
   })
 
   return (
     <DialogSelect<string>
       options={options()}
-      title={"Select variant"}
-      current={local.model.variant.selected()}
-      flat={true}
+      title="Select API format"
     />
   )
 }

package/src/cli/cmd/tui/ui/dialog-select.tsx

@@ -204,7 +204,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
     if (evt.name === "home") moveTo(0)
     if (evt.name === "end") moveTo(flat().length - 1)
 
-    if (evt.name === "return") {
+    if (evt.name === "return" || evt.name === "enter") {
       const option = selected()
       if (option) {
         evt.preventDefault()
@@ -351,7 +351,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
                         </Show>
                         <Option
                           title={option.title}
-                          footer={flatten() ? (option.category ?? option.footer) : option.footer}
+                          footer={option.footer}
                           description={option.description !== category ? option.description : undefined}
                           active={active()}
                           current={current()}

package/src/cli/logo.ts

@@ -2,16 +2,16 @@ export const logo = {
   left: [
     "                                       ",
     "                                       ",
-    "  ███╗   ███╗ ██╗ ███╗   ███╗  ██████╗ ",
-    "  ████╗ ████║ ██║ ████╗ ████║ ██╔═══██╗",
-    "  ██╔████╔██║ ██║ ██╔████╔██║ ██║   ██║",
-    "  ██║╚██╔╝██║ ██║ ██║╚██╔╝██║ ██║   ██║",
-    "  ██║ ╚═╝ ██║ ██║ ██║ ╚═╝ ██║ ╚██████╔╝",
-    "  ╚═╝     ╚═╝ ╚═╝ ╚═╝     ╚═╝  ╚═════╝ ",
+    "  ███████╗██╗   ██╗██╗      ██████╗ ███████╗",
+    "  ╚══██╔╝██║   ██║██║     ██╔═══██╗██╔════╝",
+    "     ██║  ██║   ██║██║     ██║   ██║███████╗",
+    "     ██║  ██║   ██║██║     ██║   ██║╚════██║",
+    "     ██║  ╚██████╔╝███████╗╚██████╔╝███████║",
+    "     ╚═╝   ╚═════╝ ╚══════╝ ╚═════╝ ╚══════╝",
   ],
   right: [
-    "                              Xiaomi",
-    "                                    ",
+    "",
+    "",
     " ██████╗  ██████╗  ██████╗  ███████╗",
     "██╔════╝ ██╔═══██╗ ██╔══██╗ ██╔════╝",
     "██║      ██║   ██║ ██║  ██║ █████╗  ",
@@ -23,15 +23,15 @@ export const logo = {
 
 export const logoThin = {
   left: [
-    "                  ",
-    "                  ",
-    "█▀▄▀█ █ █▀▄▀█ █▀▀█",
-    "█ ▀ █ █ █ ▀ █ █  █",
-    "▀   ▀ ▀ ▀   ▀ ▀▀▀▀",
+    "            ",
+    "            ",
+    "█▀▀ █▀▀█ █▀▀▄",
+    "█▀▀▀ █  █ █  █",
+    "▀   ▀ ▀▀▀▀ ▀  ",
   ],
   right: [
-    "              Xiaomi",
-    "                    ",
+    "          Tuling",
+    "                  ",
     "  █▀▀ █▀▀█ █▀▀▄ █▀▀▀",
     "  █   █  █ █  █ █▀▀ ",
     "  ▀▀▀ ▀▀▀▀ ▀▀▀  ▀▀▀▀",
@@ -50,4 +50,4 @@ export const go = {
   right: ["    ", "█▀▀▀", "█ __", "▀▀▀▀"],
 }
 
-export const marks = "_^~,"
+export const marks = "_^~,"