Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(settings): clarify WorkBuddy connection and sign-in status

tianma-if6dca569daa14
diff --git a/apps/web/src/components/settings/DesktopAcpAgentCard.tsx b/apps/web/src/components/settings/DesktopAcpAgentCard.tsx
index 86ebfde9..586dc88d 100644
--- a/apps/web/src/components/settings/DesktopAcpAgentCard.tsx
+++ b/apps/web/src/components/settings/DesktopAcpAgentCard.tsx
@@ -1,8 +1,9 @@
import { useEffect, useId, useState } from "react";
import { useTranslation } from "react-i18next";
-import { Bot, Info } from "lucide-react";
+import { Bot, ChevronDown, Info } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
import { Input } from "@/components/ui/input";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import {
@@ -56,6 +57,7 @@ const statusKey = (adapter: DesktopAcpAdapter | undefined, probing: boolean) =>
if (adapter.id === "deepseekHarness" && adapter.state === "not_installed") return "aiAssistant.agentSource.deepseekHarnessNotFound";
if (adapter.id === "piAgent" && adapter.state === "not_installed") return adapter.detail === "adapter_missing" ? "aiAssistant.agentSource.piAgentAdapterMissing" : "aiAssistant.agentSource.piAgentNotFound";
if ((adapter.id === "workbuddyCn" || adapter.id === "workbuddyIntl") && adapter.state === "not_installed") return "aiAssistant.agentSource.workbuddyNotFound";
+ if ((adapter.id === "workbuddyCn" || adapter.id === "workbuddyIntl") && adapter.state === "needs_login") return "aiAssistant.agentSource.workbuddyLoginRequired";
if ((adapter.id === "workbuddyCn" || adapter.id === "workbuddyIntl") && adapter.state === "available") return "aiAssistant.agentSource.workbuddyConnectionReady";
return `aiAssistant.agentSource.states.${adapter.state}`;
};
@@ -64,18 +66,15 @@ const getStatusTone = ({
probing,
installing,
installError,
- handshakeOnly,
state,
}: {
probing: boolean;
installing: boolean;
installError: boolean;
- handshakeOnly: boolean;
state?: DesktopAcpAdapter["state"];
}) => {
if (installing || probing) return "loading";
if (installError || state === "failed") return "error";
- if (handshakeOnly) return "neutral";
if (state === "available") return "success";
if (state === "needs_login" || state === "not_installed") return "warning";
return "neutral";
@@ -146,7 +145,6 @@ const DesktopAcpAgentCardBody = ({ bridge }: { bridge: boolean }) => {
probing,
installing,
installError,
- handshakeOnly: isWorkBuddy && shown?.state === "available",
state: shown?.state,
});
const authMethods = shown?.authMethods?.filter((method) => (
@@ -155,12 +153,24 @@ const DesktopAcpAgentCardBody = ({ bridge }: { bridge: boolean }) => {
const hasDetails = Boolean(
shown?.state === "not_installed" ||
shown?.state === "needs_login" ||
- (shown?.state === "available" && authMethods.length > 0) ||
+ (shown?.state === "available" && (isWorkBuddy || authMethods.length > 0)) ||
shown?.updateError ||
adapterId === "openClaw" ||
(adapterId === "hermesAgent" && shown?.state === "failed")
);
+ const authButtons = (
+ <div className="flex flex-wrap gap-2 pt-0.5">
+ {authMethods.map((method) => (
+ <Button key={method.id} type="button" variant="outline" size="sm" className="h-8 bg-card text-xs font-normal" disabled={Boolean(authenticating)} onClick={() => void authenticate(method.id)}>
+ {authenticating === method.id ? t("aiAssistant.agentSource.authenticating") : isWorkBuddy
+ ? t("aiAssistant.agentSource.workbuddyAuthenticateWith", { method: method.name.replace(/^Login with\s+/i, "").replace(/Google\/Github/gi, "Google / GitHub") })
+ : t("aiAssistant.agentSource.authenticateWith", { method: method.name })}
+ </Button>
+ ))}
+ </div>
+ );
+
const selectAdapter = (id: DesktopAcpAdapterId) => {
setAdapterId(id);
setProbed(null);
@@ -391,21 +401,26 @@ const DesktopAcpAgentCardBody = ({ bridge }: { bridge: boolean }) => {
{shown?.state === "needs_login" && adapterId === "piAgent" ? (
<p>{t("aiAssistant.agentSource.piAgentLoginHint")}</p>
) : null}
- {(shown?.state === "needs_login" || shown?.state === "available") && isWorkBuddy ? (
+ {shown?.state === "available" && isWorkBuddy ? (
+ <p>{t("aiAssistant.agentSource.workbuddyConnectedHint")}</p>
+ ) : null}
+ {shown?.state === "needs_login" && isWorkBuddy ? (
<p>{t(adapterId === "workbuddyCn" ? "aiAssistant.agentSource.workbuddyCnLoginHint" : "aiAssistant.agentSource.workbuddyIntlLoginHint")}</p>
) : null}
{shown?.state === "available" && !isWorkBuddy && authMethods.length ? (
<p>{t("aiAssistant.agentSource.authAvailableHint")}</p>
) : null}
- {(shown?.state === "needs_login" || shown?.state === "available") && authMethods.length ? (
- <div className="flex flex-wrap gap-2 pt-0.5">
- {authMethods.map((method) => (
- <Button key={method.id} type="button" variant="outline" size="sm" className="h-8 bg-card text-xs font-normal" disabled={Boolean(authenticating)} onClick={() => void authenticate(method.id)}>
- {authenticating === method.id ? t("aiAssistant.agentSource.authenticating") : t("aiAssistant.agentSource.authenticateWith", { method: method.name })}
+ {shown?.state === "available" && isWorkBuddy && authMethods.length ? (
+ <Collapsible key={`${adapterId}:${adapterPath}:${shown.state}`}>
+ <CollapsibleTrigger asChild>
+ <Button type="button" variant="ghost" size="sm" className="group h-7 px-0 text-xs font-normal text-slate-500 hover:bg-transparent">
+ {t("aiAssistant.agentSource.workbuddyLoginOptions")}
+ <ChevronDown aria-hidden="true" className="ml-1 h-3 w-3 group-data-[state=open]:rotate-180" />
</Button>
- ))}
- </div>
- ) : null}
+ </CollapsibleTrigger>
+ <CollapsibleContent>{authButtons}</CollapsibleContent>
+ </Collapsible>
+ ) : (shown?.state === "needs_login" || shown?.state === "available") && authMethods.length ? authButtons : null}
{shown?.state === "needs_login" && !authMethods.length && adapterId !== "piAgent" ? (
<p className="text-xs text-amber-700" role="status">{t("aiAssistant.agentSource.loginUnavailable")}</p>
) : null}
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 3a9c398b..189476dd 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -1730,10 +1730,14 @@ export const enUS = {
piAgentLoginHint: "Run pi in a terminal to sign in to your model provider or configure an API key, then check the connection again.",
workbuddyNotFound: "WorkBuddy ACP program not found",
workbuddyMissingHint: "The WorkBuddy desktop app includes the ACP program; no separate CodeBuddy installation is needed. A standalone CodeBuddy CLI also works.",
- workbuddyCnLoginHint: "ACP tries saved sign-in first. If chat still requires login, use WeChat or your organization's ACP sign-in method.",
- workbuddyIntlLoginHint: "ACP tries saved sign-in first. If chat still requires login, use Google/GitHub or your organization's ACP sign-in method.",
+ workbuddyCnLoginHint: "Sign in to WorkBuddy, then check the connection. Use WeChat or your organization’s sign-in method.",
+ workbuddyIntlLoginHint: "Sign in to WorkBuddy, then check the connection. Use Google / GitHub or your organization’s sign-in method.",
workbuddyCredentialsUnavailable: "WorkBuddy saved sign-in credentials could not be read, so ACP is unavailable. Use another local Agent for now; retrying sign-in cannot resolve this issue.",
- workbuddyConnectionReady: "ACP connected; sign-in is checked during chat",
+ workbuddyConnectionReady: "Connected to WorkBuddy",
+ workbuddyConnectedHint: "You can start chatting with the account signed in to WorkBuddy.",
+ workbuddyLoginOptions: "Sign-in options",
+ workbuddyLoginRequired: "Sign in to WorkBuddy",
+ workbuddyAuthenticateWith: "Sign in with {{method}}",
installing: "Installing and checking…",
installFailed: "Installation or connection check failed. The previous version was kept.",
updateFailed: "Automatic update failed. The previous version remains in use.",
diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.ts
index 9451fc42..901943a9 100644
--- a/packages/shared/src/i18n/ja.ts
+++ b/packages/shared/src/i18n/ja.ts
@@ -1719,10 +1719,14 @@ export const ja = {
piAgentLoginHint: "ターミナルで pi を実行し、モデルサービスへのログインまたは API キーの設定を済ませてから、接続を再確認してください。",
workbuddyNotFound: "WorkBuddy の ACP プログラムが見つかりません",
workbuddyMissingHint: "WorkBuddy デスクトップアプリには ACP プログラムが含まれるため、CodeBuddy の別途インストールは不要です。単体の CodeBuddy CLI も利用できます。",
- workbuddyCnLoginHint: "ACP は保存済みのログインを試します。チャットでログインが必要な場合は WeChat または組織指定の方法で ACP 認証を行ってください。",
- workbuddyIntlLoginHint: "ACP は保存済みのログインを試します。チャットでログインが必要な場合は Google/GitHub または組織指定の方法で ACP 認証を行ってください。",
+ workbuddyCnLoginHint: "WorkBuddy にログインしてから接続を確認してください。WeChat または組織指定のログイン方法を使用できます。",
+ workbuddyIntlLoginHint: "WorkBuddy にログインしてから接続を確認してください。Google / GitHub または組織指定のログイン方法を使用できます。",
workbuddyCredentialsUnavailable: "WorkBuddy の保存済みログイン情報を読み取れないため、ACP は利用できません。当面は別のローカル Agent を使用してください。再ログインでは解決できません。",
- workbuddyConnectionReady: "ACP 接続済み・ログインはチャット時に確認",
+ workbuddyConnectionReady: "WorkBuddy に接続済み",
+ workbuddyConnectedHint: "WorkBuddy にログイン中のアカウントでチャットを開始できます。",
+ workbuddyLoginOptions: "ログイン方法",
+ workbuddyLoginRequired: "WorkBuddy にログインしてください",
+ workbuddyAuthenticateWith: "{{method}} でログイン",
installing: "インストールして確認中…",
installFailed: "インストールまたは接続確認に失敗しました。以前のバージョンは保持されています。",
updateFailed: "自動更新に失敗しました。以前のバージョンを継続して使用します。",
diff --git a/packages/shared/src/i18n/pl.ts b/packages/shared/src/i18n/pl.ts
index 11361784..d0fc0c36 100644
--- a/packages/shared/src/i18n/pl.ts
+++ b/packages/shared/src/i18n/pl.ts
@@ -1719,10 +1719,14 @@ export const pl = {
piAgentLoginHint: "Uruchom pi w terminalu, aby zalogować się u dostawcy modeli lub skonfigurować klucz API, a potem ponownie sprawdź połączenie.",
workbuddyNotFound: "Nie znaleziono programu WorkBuddy ACP",
workbuddyMissingHint: "Aplikacja desktopowa WorkBuddy zawiera program ACP; osobna instalacja CodeBuddy nie jest potrzebna. Działa też samodzielny CodeBuddy CLI.",
- workbuddyCnLoginHint: "ACP najpierw próbuje użyć zapisanego logowania. Jeśli czat nadal wymaga zalogowania, użyj WeChat lub metody logowania ACP swojej organizacji.",
- workbuddyIntlLoginHint: "ACP najpierw próbuje użyć zapisanego logowania. Jeśli czat nadal wymaga zalogowania, użyj Google/GitHub lub metody logowania ACP swojej organizacji.",
+ workbuddyCnLoginHint: "Zaloguj się do WorkBuddy, a następnie sprawdź połączenie. Użyj WeChat lub metody logowania swojej organizacji.",
+ workbuddyIntlLoginHint: "Zaloguj się do WorkBuddy, a następnie sprawdź połączenie. Użyj Google / GitHub lub metody logowania swojej organizacji.",
workbuddyCredentialsUnavailable: "Nie można odczytać zapisanych danych logowania WorkBuddy, więc ACP jest niedostępne. Na razie użyj innego lokalnego agenta; ponowne logowanie nie rozwiąże problemu.",
- workbuddyConnectionReady: "Połączono z ACP; logowanie jest sprawdzane podczas czatu",
+ workbuddyConnectionReady: "Połączono z WorkBuddy",
+ workbuddyConnectedHint: "Możesz rozpocząć czat z kontem zalogowanym w WorkBuddy.",
+ workbuddyLoginOptions: "Opcje logowania",
+ workbuddyLoginRequired: "Zaloguj się do WorkBuddy",
+ workbuddyAuthenticateWith: "Zaloguj się przez {{method}}",
installing: "Instalowanie i sprawdzanie…",
installFailed: "Instalacja lub sprawdzenie połączenia nie powiodło się. Zachowano poprzednią wersję.",
updateFailed: "Automatyczna aktualizacja nie powiodła się. Nadal używana jest poprzednia wersja.",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index cea6407f..11fa2d8a 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -1730,10 +1730,14 @@ export const zhCN = {
piAgentLoginHint: "请先在终端运行 pi 并完成模型服务登录或 API Key 配置,然后重新检查连接。",
workbuddyNotFound: "未找到 WorkBuddy 的 ACP 程序",
workbuddyMissingHint: "安装 WorkBuddy 桌面版即可使用其内置 ACP,无需另装 CodeBuddy;也可单独安装 CodeBuddy CLI。",
- workbuddyCnLoginHint: "ACP 会尝试使用已保存的登录;若聊天仍提示需要登录,请使用微信或组织指定方式完成 ACP 认证。",
- workbuddyIntlLoginHint: "ACP 会尝试使用已保存的登录;若聊天仍提示需要登录,请使用 Google/GitHub 或组织指定方式完成 ACP 认证。",
+ workbuddyCnLoginHint: "请登录 WorkBuddy,并在完成后检查连接。可使用微信或组织指定的登录方式。",
+ workbuddyIntlLoginHint: "请登录 WorkBuddy,并在完成后检查连接。可使用 Google / GitHub 或组织指定的登录方式。",
workbuddyCredentialsUnavailable: "无法读取 WorkBuddy 保存的登录凭据,ACP 当前不可用。请先改用其他本机 Agent;重复点击登录无法解决此问题。",
- workbuddyConnectionReady: "ACP 已连接,聊天时验证登录",
+ workbuddyConnectionReady: "已连接 WorkBuddy",
+ workbuddyConnectedHint: "可开始聊天,将使用 WorkBuddy 中已登录的账号。",
+ workbuddyLoginOptions: "登录选项",
+ workbuddyLoginRequired: "请登录 WorkBuddy",
+ workbuddyAuthenticateWith: "{{method}} 登录",
installing: "正在安装并检查…",
installFailed: "安装或连接检查失败,原版本已保留。",
updateFailed: "自动更新失败,正在继续使用原版本。",