@teaflask/assistant 0.10.2 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/dist/appearance/theme.d.ts +21 -18
- package/dist/components/composer-banner.js +38 -3
- package/dist/components/composer-chip-shelf.js +136 -0
- package/dist/components/composer.js +2 -2
- package/dist/components/connector-add-flow.js +173 -0
- package/dist/components/connector-reconnect-notice.js +66 -0
- package/dist/components/connector-sign-in-flow.js +331 -0
- package/dist/components/connector-sign-in.js +103 -0
- package/dist/components/connectors-chip.js +78 -0
- package/dist/components/connectors-menu.js +187 -0
- package/dist/components/conversation-view.js +2 -2
- package/dist/components/icons.js +3 -0
- package/dist/components/model-picker-chip.js +10 -84
- package/dist/components/primitives/button.js +3 -0
- package/dist/components/primitives/disclosure.js +2 -1
- package/dist/components/primitives/text-input.js +6 -0
- package/dist/components/provider-chip.js +11 -63
- package/dist/components/subscription-plan-notice.js +9 -6
- package/dist/components/teaflask-assistant-provider.d.ts +14 -0
- package/dist/components/teaflask-assistant-provider.js +17 -0
- package/dist/components/use-store-cell.d.ts +2 -1
- package/dist/components/use-store-cell.js +5 -0
- package/dist/contract/mcp-servers.d.ts +10 -0
- package/dist/contract/mcp-servers.js +28 -0
- package/dist/core/assistant-session-registry.d.ts +65 -0
- package/dist/core/assistant-session-registry.js +66 -2
- package/dist/generated/models/addPersonMcpServerRequest.d.ts +9 -0
- package/dist/generated/models/addPersonMcpServerRequest.js +1 -0
- package/dist/generated/models/apiErrorCode.d.ts +23 -0
- package/dist/generated/models/apiErrorCode.js +23 -0
- package/dist/generated/models/assistantConfigResponse.d.ts +2 -0
- package/dist/generated/models/beginPersonMcpServerSignInRequest.d.ts +5 -0
- package/dist/generated/models/beginPersonMcpServerSignInRequest.js +1 -0
- package/dist/generated/models/completePersonMcpServerSignInRequest.d.ts +6 -0
- package/dist/generated/models/completePersonMcpServerSignInRequest.js +1 -0
- package/dist/generated/models/endUserMcpServerState.d.ts +5 -0
- package/dist/generated/models/endUserMcpServerState.js +4 -0
- package/dist/generated/models/handOffPersonMcpServerSignInRequest.d.ts +4 -0
- package/dist/generated/models/handOffPersonMcpServerSignInRequest.js +1 -0
- package/dist/generated/models/headersPersonMcpServerCredential.d.ts +5 -0
- package/dist/generated/models/headersPersonMcpServerCredential.js +1 -0
- package/dist/generated/models/helpPageResponse.d.ts +2 -0
- package/dist/generated/models/index.d.ts +26 -0
- package/dist/generated/models/index.js +26 -0
- package/dist/generated/models/inspectPersonMcpServerRequest.d.ts +3 -0
- package/dist/generated/models/inspectPersonMcpServerRequest.js +1 -0
- package/dist/generated/models/mcpCredentialKind.d.ts +6 -0
- package/dist/generated/models/mcpCredentialKind.js +5 -0
- package/dist/generated/models/mcpServerSignInHandoff.d.ts +6 -0
- package/dist/generated/models/mcpServerSignInHandoff.js +1 -0
- package/dist/generated/models/mcpServerSignInPending.d.ts +4 -0
- package/dist/generated/models/mcpServerSignInPending.js +3 -0
- package/dist/generated/models/mcpServerSignInStatus.d.ts +7 -0
- package/dist/generated/models/mcpServerSignInStatus.js +6 -0
- package/dist/generated/models/mcpSignInMode.d.ts +6 -0
- package/dist/generated/models/mcpSignInMode.js +5 -0
- package/dist/generated/models/mcpSkipReason.d.ts +9 -0
- package/dist/generated/models/mcpSkipReason.js +8 -0
- package/dist/generated/models/newPersonMcpServerSignInTarget.d.ts +3 -0
- package/dist/generated/models/newPersonMcpServerSignInTarget.js +1 -0
- package/dist/generated/models/newPersonMcpServerTarget.d.ts +3 -0
- package/dist/generated/models/newPersonMcpServerTarget.js +1 -0
- package/dist/generated/models/noPersonMcpServerCredential.d.ts +4 -0
- package/dist/generated/models/noPersonMcpServerCredential.js +3 -0
- package/dist/generated/models/personMcpServer.d.ts +15 -0
- package/dist/generated/models/personMcpServer.js +1 -0
- package/dist/generated/models/personMcpServerHeader.d.ts +4 -0
- package/dist/generated/models/personMcpServerHeader.js +1 -0
- package/dist/generated/models/personMcpServerInspection.d.ts +5 -0
- package/dist/generated/models/personMcpServerInspection.js +1 -0
- package/dist/generated/models/personMcpServerSignInBegun.d.ts +6 -0
- package/dist/generated/models/personMcpServerSignInBegun.js +1 -0
- package/dist/generated/models/personMcpServersProjection.d.ts +3 -0
- package/dist/generated/models/personMcpServersProjection.js +1 -0
- package/dist/generated/models/personMcpServersResponse.d.ts +6 -0
- package/dist/generated/models/personMcpServersResponse.js +1 -0
- package/dist/generated/models/personSkippedTool.d.ts +6 -0
- package/dist/generated/models/personSkippedTool.js +1 -0
- package/dist/generated/models/reconnectedPersonMcpServerSignInTarget.d.ts +3 -0
- package/dist/generated/models/reconnectedPersonMcpServerSignInTarget.js +1 -0
- package/dist/generated/models/reconnectedPersonMcpServerTarget.d.ts +4 -0
- package/dist/generated/models/reconnectedPersonMcpServerTarget.js +1 -0
- package/dist/generated/models/servingErrorCode.d.ts +10 -2
- package/dist/generated/models/servingErrorCode.js +4 -0
- package/dist/generated/models/tokenPersonMcpServerCredential.d.ts +4 -0
- package/dist/generated/models/tokenPersonMcpServerCredential.js +1 -0
- package/dist/generated/serving.js +142 -0
- package/dist/styles.css +1 -1
- package/dist/transport/connectors-api.js +47 -0
- package/dist/transport/serving-api.js +4 -1
- package/package.json +1 -1
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
"use client";
|
|
2
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
|
+
import { lazy, Suspense, useEffect, useLayoutEffect, useRef, useState, } from "react";
|
|
4
|
+
import { failureSentenceOf } from "../core/error-copy.js";
|
|
5
|
+
import { addMcpServer, reconnectTargetOf, refreshMcpServer, removeMcpServer, } from "../transport/connectors-api.js";
|
|
6
|
+
import { ConnectorSignInArms, useRefocusWhenTheSignInEnds, useReportedSignIn, } from "./connector-sign-in.js";
|
|
7
|
+
import { useConnectorSignInFlow, } from "./connector-sign-in-flow.js";
|
|
8
|
+
import { Disclosure, DisclosureChevron } from "./primitives/disclosure.js";
|
|
9
|
+
import { TfButton } from "./primitives/button.js";
|
|
10
|
+
import { useAssistantSession } from "./teaflask-assistant-provider.js";
|
|
11
|
+
import { useOptionalCell } from "./use-store-cell.js";
|
|
12
|
+
const ConnectorAddFlow = lazy(() => import("./connector-add-flow.js"));
|
|
13
|
+
const OFFERED_INTRO = "Connect apps you use so this assistant can work with them for you. They stay connected across your conversations on this site.";
|
|
14
|
+
const TRUST_LINE = "Only connect services you trust. What a connector returns becomes part of your conversation, which this site's team can see.";
|
|
15
|
+
const NOT_OFFERED_INTRO = "This assistant doesn't use connectors. You can still remove yours.";
|
|
16
|
+
const NOTE_LINE = "tf:m-0 tf:text-xs tf:text-tf-muted-foreground";
|
|
17
|
+
const ACTION_ROW = "tf:flex tf:flex-wrap tf:justify-end tf:gap-2";
|
|
18
|
+
const TEXT_LINE = "tf:m-0 tf:text-tf-label";
|
|
19
|
+
const SCROLL_AREA = "tf:-m-1 tf:flex tf:min-h-0 tf:flex-col tf:gap-2 tf:overflow-y-auto tf:p-1";
|
|
20
|
+
export default function ConnectorsMenu({ id, offered, list, hidden, onDismiss, onSignInChange, }) {
|
|
21
|
+
const [view, setView] = useState({ kind: "list" });
|
|
22
|
+
const [removedNote, setRemovedNote] = useState(null);
|
|
23
|
+
const menuRef = useRef(null);
|
|
24
|
+
useRoomWithinThePanel(menuRef, hidden);
|
|
25
|
+
useTokenFormAsk(list, setView);
|
|
26
|
+
const backToList = () => {
|
|
27
|
+
setView({ kind: "list" });
|
|
28
|
+
};
|
|
29
|
+
const signIn = useConnectorSignInFlow(backToList);
|
|
30
|
+
useReportedSignIn(signIn, onSignInChange);
|
|
31
|
+
const signingIn = signIn.state.kind !== "idle";
|
|
32
|
+
useRefocusWhenTheSignInEnds(signIn, menuRef);
|
|
33
|
+
return (_jsx("div", { ref: menuRef, id: id, role: "dialog", "aria-label": "Connectors", tabIndex: -1, "data-tf-glass": "", "data-tf-popover": "", "data-teaflask-ignore": "", "data-tf-composer-menu": "", "data-tf-defocuses-beneath": "", hidden: hidden, className: `${hidden ? "tf:hidden" : "tf:flex"} tf:absolute tf:right-0 tf:bottom-full tf:mb-2 tf:max-h-[min(32rem,var(--_tf-connectors-room,calc(100vh-6rem)))] tf:w-80 tf:max-w-[calc(100vw-2rem)] tf:flex-col tf:gap-3 tf:rounded-2xl tf:border tf:p-3`, onKeyDown: (event) => {
|
|
34
|
+
if (event.key !== "Escape") {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
event.preventDefault();
|
|
38
|
+
event.stopPropagation();
|
|
39
|
+
onDismiss();
|
|
40
|
+
}, children: signingIn ? (_jsx(ConnectorSignInArms, { flow: signIn, onCancel: backToList })) : view.kind === "list" ? (_jsx(ConnectorList, { offered: offered, list: list, removedNote: removedNote, onAdd: () => {
|
|
41
|
+
setRemovedNote(null);
|
|
42
|
+
setView({ kind: "add" });
|
|
43
|
+
}, onReplaceToken: (server) => {
|
|
44
|
+
setRemovedNote(null);
|
|
45
|
+
setView({ kind: "replace-token", server });
|
|
46
|
+
}, onRemoved: setRemovedNote, onSignIn: (server) => {
|
|
47
|
+
setRemovedNote(null);
|
|
48
|
+
signIn.start({
|
|
49
|
+
target: { server_id: server.id },
|
|
50
|
+
host: server.host,
|
|
51
|
+
});
|
|
52
|
+
} })) : (_jsx("div", { className: SCROLL_AREA, children: _jsx(Suspense, { fallback: null, children: _jsx(ConnectorAddFlow, { reconnecting: view.kind === "replace-token" ? view.server : null, onConnected: backToList, onCancel: backToList, onSignInChange: onSignInChange }, view.kind === "replace-token" ? view.server.id : "add") }) })) }));
|
|
53
|
+
}
|
|
54
|
+
function useTokenFormAsk(list, setView) {
|
|
55
|
+
const session = useAssistantSession();
|
|
56
|
+
const ask = useOptionalCell(session.connectorTokenFormAsk);
|
|
57
|
+
useEffect(() => {
|
|
58
|
+
if (ask === null) {
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
const server = list?.servers.find((stored) => stored.id === ask);
|
|
62
|
+
if (server !== undefined) {
|
|
63
|
+
setView({ kind: "replace-token", server });
|
|
64
|
+
}
|
|
65
|
+
session.acknowledgeConnectorTokenForm?.();
|
|
66
|
+
}, [ask, list, session, setView]);
|
|
67
|
+
}
|
|
68
|
+
function ConnectorList({ offered, list, removedNote, onAdd, onReplaceToken, onSignIn, onRemoved, }) {
|
|
69
|
+
const servers = list?.servers ?? [];
|
|
70
|
+
return (_jsxs(_Fragment, { children: [offered ? (_jsxs(_Fragment, { children: [_jsx("p", { className: TEXT_LINE, children: OFFERED_INTRO }), _jsx("p", { className: NOTE_LINE, children: TRUST_LINE })] })) : servers.length > 0 ? (_jsx("p", { className: TEXT_LINE, children: NOT_OFFERED_INTRO })) : null, servers.length > 0 ? (_jsx("div", { className: SCROLL_AREA, children: servers.map((server) => (_jsx(ConnectorRow, { server: server, offered: offered, onReplaceToken: onReplaceToken, onSignIn: onSignIn, onRemoved: onRemoved }, server.id))) })) : null, offered || removedNote !== null ? (_jsxs("div", { className: "tf:flex tf:flex-col tf:gap-2 tf:border-t tf:pt-3", children: [removedNote !== null ? (_jsx("p", { className: TEXT_LINE, role: "status", children: removedNote })) : null, offered ? (_jsx(AddConnectorAction, { atLimit: list !== null && servers.length >= list.limit, limit: list?.limit ?? 0, onAdd: onAdd })) : null] })) : null] }));
|
|
71
|
+
}
|
|
72
|
+
function AddConnectorAction({ atLimit, limit, onAdd, }) {
|
|
73
|
+
if (atLimit) {
|
|
74
|
+
return (_jsx("p", { className: NOTE_LINE, children: `You've connected ${String(limit)}, the most allowed. Remove one to add another.` }));
|
|
75
|
+
}
|
|
76
|
+
return (_jsx(TfButton, { variant: "outline", className: "tf:self-start", onClick: onAdd, children: "Add connector" }));
|
|
77
|
+
}
|
|
78
|
+
function useRoomWithinThePanel(menuRef, hidden) {
|
|
79
|
+
useLayoutEffect(() => {
|
|
80
|
+
const menu = menuRef.current;
|
|
81
|
+
const panel = menu?.closest("[data-tf-conversation]") ?? null;
|
|
82
|
+
if (hidden || menu === null || panel === null) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
const measure = () => {
|
|
86
|
+
const room = menu.getBoundingClientRect().bottom -
|
|
87
|
+
panel.getBoundingClientRect().top -
|
|
88
|
+
MENU_PANEL_GAP_PX;
|
|
89
|
+
menu.style.setProperty("--_tf-connectors-room", `${String(Math.max(room, 0))}px`);
|
|
90
|
+
};
|
|
91
|
+
measure();
|
|
92
|
+
const win = menu.ownerDocument.defaultView;
|
|
93
|
+
win?.addEventListener("resize", measure);
|
|
94
|
+
return () => {
|
|
95
|
+
win?.removeEventListener("resize", measure);
|
|
96
|
+
};
|
|
97
|
+
}, [menuRef, hidden]);
|
|
98
|
+
}
|
|
99
|
+
const MENU_PANEL_GAP_PX = 8;
|
|
100
|
+
function ConnectorRow({ server, offered, onReplaceToken, onSignIn, onRemoved, }) {
|
|
101
|
+
const [confirmingRemove, setConfirmingRemove] = useState(false);
|
|
102
|
+
const { work, note, error, refresh, reconnect, remove } = useConnectorRowWork(server, { onReplaceToken, onSignIn, onRemoved });
|
|
103
|
+
const needsReconnect = server.state === "needs_reconnect";
|
|
104
|
+
return (_jsxs("div", { className: "tf:flex tf:flex-col tf:gap-2 tf:border-t tf:pt-2", children: [_jsxs(Disclosure, { variant: "bare", summaryClassName: "tf:flex tf:items-center tf:justify-between tf:gap-2", bodyClassName: "tf:flex tf:flex-col tf:gap-2 tf:pt-2", summary: _jsx(ConnectorRowSummary, { server: server }), children: [confirmingRemove ? (_jsx(RemoveConfirm, { name: server.name, busy: work === "remove", onRemove: () => void remove(), onCancel: () => {
|
|
105
|
+
setConfirmingRemove(false);
|
|
106
|
+
} })) : (_jsx(ConnectorRowActions, { server: server, offered: offered, busy: work !== null, onRefresh: () => void refresh(), onReconnect: reconnect, onRemove: () => {
|
|
107
|
+
setConfirmingRemove(true);
|
|
108
|
+
} })), _jsx(ConnectorTools, { server: server })] }), offered && needsReconnect && !confirmingRemove ? (_jsx(ReconnectButton, { server: server, busy: work !== null, onReconnect: reconnect, primary: true })) : null, note !== null ? (_jsx("p", { className: NOTE_LINE, role: "status", children: note })) : null, error !== null ? (_jsx("p", { className: "tf:m-0 tf:text-tf-label tf:text-tf-destructive", role: "alert", children: error })) : null] }));
|
|
109
|
+
}
|
|
110
|
+
function ConnectorRowSummary({ server }) {
|
|
111
|
+
return (_jsxs(_Fragment, { children: [_jsxs("span", { className: "tf:flex tf:min-w-0 tf:flex-col", children: [_jsx("span", { className: "tf:truncate tf:text-tf-label tf:font-medium", children: server.name }), _jsx("span", { className: "tf:text-xs tf:text-tf-muted-foreground", children: _rowSecondaryOf(server) })] }), _jsx(DisclosureChevron, {})] }));
|
|
112
|
+
}
|
|
113
|
+
function ConnectorRowActions({ server, offered, busy, onRefresh, onReconnect, onRemove, }) {
|
|
114
|
+
return (_jsxs("div", { className: ACTION_ROW, children: [offered ? (_jsxs(_Fragment, { children: [_jsx(TfButton, { variant: "outline", disabled: busy, onClick: onRefresh, children: "Refresh" }), _jsx(ReconnectButton, { server: server, busy: busy, onReconnect: onReconnect })] })) : null, _jsx(TfButton, { variant: "outline", disabled: busy, onClick: onRemove, children: "Remove" })] }));
|
|
115
|
+
}
|
|
116
|
+
function useConnectorRowWork(server, { onReplaceToken, onSignIn, onRemoved }) {
|
|
117
|
+
const session = useAssistantSession();
|
|
118
|
+
const [work, setWork] = useState(null);
|
|
119
|
+
const [note, setNote] = useState(null);
|
|
120
|
+
const [error, setError] = useState(null);
|
|
121
|
+
const run = async (kind, action) => {
|
|
122
|
+
setWork(kind);
|
|
123
|
+
setError(null);
|
|
124
|
+
setNote(null);
|
|
125
|
+
try {
|
|
126
|
+
setNote(await action());
|
|
127
|
+
}
|
|
128
|
+
catch (failure) {
|
|
129
|
+
setError(failureSentenceOf(failure));
|
|
130
|
+
}
|
|
131
|
+
finally {
|
|
132
|
+
setWork(null);
|
|
133
|
+
session.refreshMcpServers?.();
|
|
134
|
+
}
|
|
135
|
+
};
|
|
136
|
+
const refresh = () => run("refresh", async () => {
|
|
137
|
+
const refreshed = await refreshMcpServer(session.session, server.id);
|
|
138
|
+
return `Up to date · ${_toolCountOf(refreshed.tool_names.length)}`;
|
|
139
|
+
});
|
|
140
|
+
const reconnect = () => {
|
|
141
|
+
if (server.credential_kind === "headers") {
|
|
142
|
+
onReplaceToken(server);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
if (server.credential_kind === "oauth") {
|
|
146
|
+
onSignIn(server);
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
void run("reconnect", async () => {
|
|
150
|
+
await addMcpServer(session.session, {
|
|
151
|
+
target: reconnectTargetOf(server, session.mcpServers?.get() ?? null),
|
|
152
|
+
credential: { kind: "none" },
|
|
153
|
+
});
|
|
154
|
+
return null;
|
|
155
|
+
});
|
|
156
|
+
};
|
|
157
|
+
const remove = () => run("remove", async () => {
|
|
158
|
+
await removeMcpServer(session.session, server.id);
|
|
159
|
+
onRemoved(server.credential_kind === "headers"
|
|
160
|
+
? "Removed. Also delete the access token where it was issued."
|
|
161
|
+
: "Removed.");
|
|
162
|
+
return null;
|
|
163
|
+
});
|
|
164
|
+
return { work, note, error, refresh, reconnect, remove };
|
|
165
|
+
}
|
|
166
|
+
function ConnectorTools({ server }) {
|
|
167
|
+
return (_jsxs(_Fragment, { children: [_jsx("p", { className: "tf:m-0 tf:text-xs tf:font-medium", children: "What it can do" }), _jsxs("ul", { className: "tf:m-0 tf:flex tf:max-h-40 tf:list-none tf:flex-col tf:gap-1 tf:overflow-y-auto tf:p-0 tf:text-xs tf:break-words", children: [server.skipped_tools.map((skipped) => (_jsxs("li", { children: [_jsx("span", { className: "tf:text-tf-muted-foreground", children: skipped.name }), " — ", _jsx("span", { children: skipped.sentence })] }, `skipped:${skipped.name}`))), server.tool_names.map((name) => (_jsx("li", { children: name }, name)))] })] }));
|
|
168
|
+
}
|
|
169
|
+
function ReconnectButton({ server, busy, onReconnect, primary = false, }) {
|
|
170
|
+
return (_jsx(TfButton, { variant: primary ? "primary" : "outline", className: primary ? "tf:self-start" : undefined, disabled: busy, onClick: onReconnect, children: server.credential_kind === "headers" ? "Replace token" : "Reconnect" }));
|
|
171
|
+
}
|
|
172
|
+
function RemoveConfirm({ name, busy, onRemove, onCancel, }) {
|
|
173
|
+
return (_jsxs("div", { className: "tf:flex tf:flex-col tf:gap-2", role: "group", children: [_jsx("p", { className: TEXT_LINE, children: `Remove ${name}? This assistant will stop using it.` }), _jsxs("div", { className: ACTION_ROW, children: [_jsx(TfButton, { variant: "secondary", disabled: busy, onClick: onCancel, children: "Cancel" }), _jsx(TfButton, { variant: "destructive", disabled: busy, onClick: onRemove, children: "Remove" })] })] }));
|
|
174
|
+
}
|
|
175
|
+
function _rowSecondaryOf(server) {
|
|
176
|
+
if (server.state === "needs_reconnect") {
|
|
177
|
+
return server.credential_kind === "headers"
|
|
178
|
+
? `${server.host} · Needs a new access token`
|
|
179
|
+
: `${server.host} · Needs you to sign in again`;
|
|
180
|
+
}
|
|
181
|
+
const tools = `${server.host} · ${_toolCountOf(server.tool_names.length)}`;
|
|
182
|
+
const skipped = server.skipped_tools.length;
|
|
183
|
+
return skipped > 0 ? `${tools} · ${String(skipped)} can't be used` : tools;
|
|
184
|
+
}
|
|
185
|
+
function _toolCountOf(count) {
|
|
186
|
+
return count === 1 ? "1 tool" : `${String(count)} tools`;
|
|
187
|
+
}
|
|
@@ -42,12 +42,12 @@ function EmptyConversation({ surface, suggestions, welcomeTitle = "Where should
|
|
|
42
42
|
return (_jsx("div", { className: "tf:flex tf:min-h-0 tf:flex-1 tf:flex-col " +
|
|
43
43
|
(pendingEcho === null ? "tf:overflow-y-auto" : ""), children: _jsxs("div", { className: pendingEcho === null
|
|
44
44
|
? "tf:my-auto tf:flex tf:w-full tf:flex-col tf:pt-4 tf:pb-16"
|
|
45
|
-
: "tf:contents", children: [pendingEcho !== null ? (_jsx(SurfaceBoundary, { surface: "message-list", children: _jsx(MessageList, { rows: pendingRows, cards: [], live: true }) })) : (_jsxs("div", { className: "tf:flex tf:items-center tf:justify-center tf:gap-2 tf:px-6 tf:pb-5 tf:text-center", children: [_jsx("span", { "data-tf-host-view": "", className: "tf:contents", children: welcomeMark }), _jsx("h2", { className: "tf:text-3xl tf:font-semibold tf:tracking-[-0.04em] tf:text-balance", children: welcomeTitle })] })), _jsx(SurfaceBoundary, { surface: "composer", children: _jsx(Composer, { compact: pendingEcho === null, surface: surface }) }), pendingEcho === null &&
|
|
45
|
+
: "tf:contents", children: [pendingEcho !== null ? (_jsx(SurfaceBoundary, { surface: "message-list", children: _jsx(MessageList, { rows: pendingRows, cards: [], live: true }) })) : (_jsxs("div", { "data-tf-welcome": "", className: "tf:flex tf:items-center tf:justify-center tf:gap-2 tf:px-6 tf:pb-5 tf:text-center", children: [_jsx("span", { "data-tf-host-view": "", className: "tf:contents", children: welcomeMark }), _jsx("h2", { className: "tf:text-3xl tf:font-semibold tf:tracking-[-0.04em] tf:text-balance", children: welcomeTitle })] })), _jsx(SurfaceBoundary, { surface: "composer", children: _jsx(Composer, { compact: pendingEcho === null, surface: surface }) }), pendingEcho === null &&
|
|
46
46
|
suggestions !== undefined &&
|
|
47
47
|
suggestions.length > 0 ? (_jsx("div", { className: "tf:px-4 tf:pb-4", children: _jsx("div", { className: "tf:mx-auto tf:flex tf:w-full tf:max-w-xl tf:flex-col", children: _jsx(SuggestionRows, { suggestions: suggestions }) }) })) : null] }) }));
|
|
48
48
|
}
|
|
49
49
|
function CompanionWelcome({ suggestions, welcomeTitle, welcomeMark, pendingRows, }) {
|
|
50
|
-
return (_jsxs("div", { className: "tf:@container tf:flex tf:min-h-0 tf:min-w-0 tf:flex-1 tf:flex-col", children: [pendingRows.length > 0 ? (_jsx(SurfaceBoundary, { surface: "message-list", children: _jsx(MessageList, { rows: pendingRows, cards: [], live: true }) })) : (_jsx("div", { className: "tf:flex tf:min-h-0 tf:flex-1 tf:flex-col tf:overflow-y-auto", children: _jsxs("div", { className: suggestions !== undefined && suggestions.length > 0
|
|
50
|
+
return (_jsxs("div", { className: "tf:@container tf:flex tf:min-h-0 tf:min-w-0 tf:flex-1 tf:flex-col", children: [pendingRows.length > 0 ? (_jsx(SurfaceBoundary, { surface: "message-list", children: _jsx(MessageList, { rows: pendingRows, cards: [], live: true }) })) : (_jsx("div", { className: "tf:flex tf:min-h-0 tf:flex-1 tf:flex-col tf:overflow-y-auto", children: _jsxs("div", { "data-tf-welcome": "", className: suggestions !== undefined && suggestions.length > 0
|
|
51
51
|
? "tf:my-auto tf:flex tf:w-full tf:flex-col tf:pt-4 tf:pb-6"
|
|
52
52
|
: "tf:my-auto tf:flex tf:w-full tf:flex-col tf:pt-16 tf:pb-6", children: [_jsx("div", { className: "tf:flex tf:justify-center", children: welcomeMark }), _jsx("div", { className: "tf:px-6 tf:pt-3 tf:pb-5 tf:text-center", children: _jsx("h2", { className: "tf:text-xl tf:font-semibold tf:tracking-[-0.04em] tf:text-balance tf:@md:text-2xl", children: welcomeTitle }) }), suggestions !== undefined && suggestions.length > 0 ? (_jsx("div", { className: "tf:px-4", children: _jsx("div", { className: "tf:mx-auto tf:flex tf:w-full tf:max-w-3xl tf:flex-col", children: _jsx(SuggestionRows, { suggestions: suggestions }) }) })) : null] }) })), _jsx("div", { className: "tf:shrink-0", children: _jsx(SurfaceBoundary, { surface: "composer", children: _jsx(Composer, { surface: "companion" }) }) })] }));
|
|
53
53
|
}
|
package/dist/components/icons.js
CHANGED
|
@@ -11,6 +11,9 @@ export function StopIcon() {
|
|
|
11
11
|
export function ChevronDownIcon() {
|
|
12
12
|
return (_jsx("svg", { viewBox: "0 0 16 16", "aria-hidden": "true", className: "tf:size-4 tf:shrink-0", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", children: _jsx("path", { d: "M3.5 6l4.5 4.5L12.5 6" }) }));
|
|
13
13
|
}
|
|
14
|
+
export function PlugIcon() {
|
|
15
|
+
return (_jsx("svg", { viewBox: "0 0 16 16", "aria-hidden": "true", className: "tf:size-3.5 tf:shrink-0", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", children: _jsx("path", { d: "M6 1.5v3M10 1.5v3M4 4.5h8v3a4 4 0 0 1-8 0v-3zM8 11.5v3" }) }));
|
|
16
|
+
}
|
|
14
17
|
export function MinimizeIcon() {
|
|
15
18
|
return (_jsx("svg", { viewBox: "0 0 16 16", "aria-hidden": "true", className: "tf:size-4 tf:shrink-0", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", children: _jsx("path", { d: "M3.5 8h9" }) }));
|
|
16
19
|
}
|
|
@@ -1,72 +1,21 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
3
|
-
import { useEffect, useRef, useState } from "react";
|
|
3
|
+
import { useEffect, useId, useRef, useState } from "react";
|
|
4
|
+
import { ComposerChipShelf, useComposerMenuLightDismiss, } from "./composer-chip-shelf.js";
|
|
4
5
|
import { ChevronDownIcon } from "./icons.js";
|
|
5
6
|
import { useConversation } from "./conversation-context.js";
|
|
6
7
|
import { displayEffortOf, effortLabelOf } from "./model-picker-effort.js";
|
|
7
8
|
import { ModelPickerEffortPanel, ModelPickerServedModelsPanel, ModelPickerRootPanel, } from "./model-picker-panels.js";
|
|
8
9
|
import { TfButton } from "./primitives/button.js";
|
|
9
|
-
import { ProviderChip, ProviderChipShelf } from "./provider-chip.js";
|
|
10
|
-
import { useAssistantSession, useOptionalAssistantSession, } from "./teaflask-assistant-provider.js";
|
|
11
|
-
import { useCell } from "./use-store-cell.js";
|
|
12
10
|
export function ModelPickerShelf() {
|
|
13
|
-
|
|
14
|
-
if (session === null) {
|
|
15
|
-
return null;
|
|
16
|
-
}
|
|
17
|
-
return _jsx(MountedModelPickerShelf, {});
|
|
11
|
+
return _jsx(ComposerChipShelf, {});
|
|
18
12
|
}
|
|
19
|
-
function
|
|
20
|
-
const
|
|
21
|
-
const [openChip, setOpenChip] = useState(null);
|
|
22
|
-
const answered = useCell(session.configAnswered);
|
|
23
|
-
const menu = useCell(session.modelChoice);
|
|
24
|
-
const identified = session.tier === "identified";
|
|
25
|
-
useEffect(() => {
|
|
26
|
-
if (identified) {
|
|
27
|
-
session.ensureSubscriptions();
|
|
28
|
-
}
|
|
29
|
-
}, [identified, session]);
|
|
30
|
-
const statuses = useCell(session.subscriptions);
|
|
31
|
-
const connectable = identified
|
|
32
|
-
? (statuses ?? []).filter((status) => status.offered || status.connected)
|
|
33
|
-
: [];
|
|
34
|
-
const ownsPickerChip = answered && menu !== null;
|
|
35
|
-
const ownsAccountChip = ownsPickerChip && connectable.length > 0;
|
|
36
|
-
const openRequested = useCell(session.connectOpenRequested);
|
|
37
|
-
if (openRequested && ownsAccountChip && openChip !== "account") {
|
|
38
|
-
setOpenChip("account");
|
|
39
|
-
}
|
|
40
|
-
if (openChip === "account" && !ownsAccountChip) {
|
|
41
|
-
setOpenChip(null);
|
|
42
|
-
}
|
|
43
|
-
if (openChip === "picker" && !ownsPickerChip) {
|
|
44
|
-
setOpenChip(null);
|
|
45
|
-
}
|
|
46
|
-
useEffect(() => {
|
|
47
|
-
if (openRequested && ownsAccountChip && openChip === "account") {
|
|
48
|
-
session.acknowledgeSubscriptionConnect();
|
|
49
|
-
}
|
|
50
|
-
}, [openRequested, ownsAccountChip, openChip, session]);
|
|
51
|
-
if (!answered) {
|
|
52
|
-
return null;
|
|
53
|
-
}
|
|
54
|
-
if (menu === null) {
|
|
55
|
-
return _jsx(ProviderChipShelf, {});
|
|
56
|
-
}
|
|
57
|
-
return (_jsxs("div", { className: "tf:relative tf:mt-1.5 tf:flex tf:items-center tf:justify-end tf:gap-2 tf:px-1", children: [ownsAccountChip ? (_jsx(ProviderChip, { statuses: connectable, open: openChip === "account", onOpenChange: (next) => {
|
|
58
|
-
setOpenChip(next ? "account" : null);
|
|
59
|
-
}, fundingNote: connectable.some((status) => status.offered)
|
|
60
|
-
? "Models your plan serves run on it; other picks run on this site's own funding."
|
|
61
|
-
: undefined })) : null, _jsx(ModelPickerChip, { menu: menu, open: openChip === "picker", onOpenChange: (next) => {
|
|
62
|
-
setOpenChip(next ? "picker" : null);
|
|
63
|
-
} })] }));
|
|
64
|
-
}
|
|
65
|
-
function ModelPickerChip({ menu, open, onOpenChange, }) {
|
|
13
|
+
export function ModelPickerChip({ menu, open, onOpenChange, holdsMinimumWidth = false, }) {
|
|
14
|
+
const menuId = `tf-model-picker-menu${useId()}`;
|
|
66
15
|
const { modelPick, setModelPick } = useConversation();
|
|
67
|
-
const { panel, setPanel, showPanel, triggerRef,
|
|
16
|
+
const { panel, setPanel, showPanel, triggerRef, rootPanelRef, modelPanelRef, effortPanelRef, } = useModelPickerPanels({ open, onOpenChange });
|
|
68
17
|
const { currentModelId, renderedLadder, currentEffort, currentName } = pickerSelectionOf(menu, modelPick);
|
|
69
|
-
return (_jsxs(_Fragment, { children: [_jsx(ModelPickerTrigger, { triggerRef: triggerRef, open: open, onOpenChange: onOpenChange, setPanel: setPanel, currentName: currentName, currentEffort: currentEffort }), open ? (_jsxs("div", {
|
|
18
|
+
return (_jsxs(_Fragment, { children: [_jsx(ModelPickerTrigger, { triggerRef: triggerRef, menuId: menuId, open: open, onOpenChange: onOpenChange, setPanel: setPanel, currentName: currentName, currentEffort: currentEffort, holdsMinimumWidth: holdsMinimumWidth }), open ? (_jsxs("div", { id: menuId, role: "dialog", "data-tf-composer-menu": "", "data-tf-defocuses-beneath": "", "aria-label": "Choose model and effort", "data-tf-glass": "", "data-tf-popover": "", className: "tf:absolute tf:right-0 tf:bottom-full tf:mb-2 tf:flex tf:max-h-[min(32rem,calc(100vh-6rem))] tf:w-80 tf:max-w-full tf:flex-col tf:overflow-y-auto tf:rounded-2xl tf:border tf:p-2", onKeyDown: (event) => {
|
|
70
19
|
if (event.key !== "Escape") {
|
|
71
20
|
return;
|
|
72
21
|
}
|
|
@@ -79,7 +28,6 @@ function ModelPickerChip({ menu, open, onOpenChange, }) {
|
|
|
79
28
|
}
|
|
80
29
|
function useModelPickerPanels({ open, onOpenChange, }) {
|
|
81
30
|
const triggerRef = useRef(null);
|
|
82
|
-
const menuRef = useRef(null);
|
|
83
31
|
const [panel, setPanel] = useState("root");
|
|
84
32
|
const rootPanelRef = useRef(null);
|
|
85
33
|
const modelPanelRef = useRef(null);
|
|
@@ -108,34 +56,12 @@ function useModelPickerPanels({ open, onOpenChange, }) {
|
|
|
108
56
|
: effortPanelRef;
|
|
109
57
|
panelRef.current?.focus();
|
|
110
58
|
});
|
|
111
|
-
|
|
112
|
-
const menuElement = menuRef.current;
|
|
113
|
-
if (!open || menuElement === null) {
|
|
114
|
-
return;
|
|
115
|
-
}
|
|
116
|
-
const closeUnlessInside = (event) => {
|
|
117
|
-
const path = event.composedPath();
|
|
118
|
-
if (path.includes(menuElement)) {
|
|
119
|
-
return;
|
|
120
|
-
}
|
|
121
|
-
const trigger = triggerRef.current;
|
|
122
|
-
if (trigger !== null && path.includes(trigger)) {
|
|
123
|
-
return;
|
|
124
|
-
}
|
|
125
|
-
onOpenChange(false);
|
|
126
|
-
};
|
|
127
|
-
const doc = menuElement.ownerDocument;
|
|
128
|
-
doc.addEventListener("pointerdown", closeUnlessInside);
|
|
129
|
-
return () => {
|
|
130
|
-
doc.removeEventListener("pointerdown", closeUnlessInside);
|
|
131
|
-
};
|
|
132
|
-
}, [open, onOpenChange]);
|
|
59
|
+
useComposerMenuLightDismiss(open, onOpenChange, triggerRef);
|
|
133
60
|
return {
|
|
134
61
|
panel,
|
|
135
62
|
setPanel,
|
|
136
63
|
showPanel,
|
|
137
64
|
triggerRef,
|
|
138
|
-
menuRef,
|
|
139
65
|
rootPanelRef,
|
|
140
66
|
modelPanelRef,
|
|
141
67
|
effortPanelRef,
|
|
@@ -150,8 +76,8 @@ function pickerSelectionOf(menu, modelPick) {
|
|
|
150
76
|
const currentName = selectedOption?.display_name ?? currentModelId;
|
|
151
77
|
return { currentModelId, renderedLadder, currentEffort, currentName };
|
|
152
78
|
}
|
|
153
|
-
function ModelPickerTrigger({ triggerRef, open, onOpenChange, setPanel, currentName, currentEffort, }) {
|
|
154
|
-
return (_jsxs(TfButton, { ref: triggerRef, variant: "chipQuiet", className: "tf:min-w-0", "aria-expanded": open, "aria-controls":
|
|
79
|
+
function ModelPickerTrigger({ triggerRef, menuId, open, onOpenChange, setPanel, currentName, currentEffort, holdsMinimumWidth, }) {
|
|
80
|
+
return (_jsxs(TfButton, { ref: triggerRef, variant: "chipQuiet", "data-tf-composer-menu": "", className: holdsMinimumWidth ? "tf:min-w-24" : "tf:min-w-0", "aria-expanded": open, "aria-controls": menuId, "aria-label": currentEffort === null
|
|
155
81
|
? `Model: ${currentName}`
|
|
156
82
|
: `Model: ${currentName}, effort: ${effortLabelOf(currentEffort)}`, onClick: () => {
|
|
157
83
|
if (!open) {
|
|
@@ -6,6 +6,9 @@ const VARIANT_CLASSES = {
|
|
|
6
6
|
primary: "tf:justify-center tf:rounded-full tf:border-0 tf:px-3 tf:py-1.5 tf:text-tf-label tf:font-medium " +
|
|
7
7
|
"tf:bg-tf-primary tf:text-tf-primary-foreground tf:shadow-tf-control " +
|
|
8
8
|
"tf:hover:opacity-90 tf:disabled:opacity-50",
|
|
9
|
+
destructive: "tf:justify-center tf:rounded-full tf:border-0 tf:px-3 tf:py-1.5 tf:text-tf-label tf:font-medium " +
|
|
10
|
+
"tf:bg-tf-destructive tf:text-tf-background tf:shadow-tf-control " +
|
|
11
|
+
"tf:hover:bg-tf-destructive-hover tf:disabled:opacity-50",
|
|
9
12
|
ghost: "tf:justify-center tf:rounded-tf tf:border-0 tf:px-3 tf:py-1.5 tf:text-tf-label tf:font-medium " +
|
|
10
13
|
"tf:bg-tf-transparent tf:text-tf-foreground tf:hover:bg-tf-accent " +
|
|
11
14
|
"tf:hover:text-tf-accent-foreground tf:disabled:opacity-50",
|
|
@@ -6,11 +6,12 @@ const DisclosureVisualStateContext = createContext(null);
|
|
|
6
6
|
export function useDisclosureVisualState() {
|
|
7
7
|
return useContext(DisclosureVisualStateContext);
|
|
8
8
|
}
|
|
9
|
-
export function Disclosure({ summary, children, variant = "framed", open, className, summaryClassName, bodyClassName, rootDataAttributes, }) {
|
|
9
|
+
export function Disclosure({ summary, children, variant = "framed", open, className, summaryClassName, bodyClassName, rootDataAttributes, onToggle, }) {
|
|
10
10
|
const [nativeOpen, setNativeOpen] = useState(open === true);
|
|
11
11
|
const [summaryActive, setSummaryActive] = useState(false);
|
|
12
12
|
return (_jsxs("details", { ...rootDataAttributes, open: open, onToggle: (event) => {
|
|
13
13
|
setNativeOpen(event.currentTarget.open);
|
|
14
|
+
onToggle?.(event.currentTarget.open);
|
|
14
15
|
}, className: cx(variant === "framed" && "tf:rounded-tf tf:border", className), children: [_jsx("summary", { onMouseEnter: () => {
|
|
15
16
|
setSummaryActive(true);
|
|
16
17
|
}, onMouseLeave: () => {
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use client";
|
|
2
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
|
+
import { cx } from "./cx.js";
|
|
4
|
+
export function TfTextInput({ type = "text", className, ...props }) {
|
|
5
|
+
return (_jsx("input", { type: type, className: cx("tf:w-full tf:rounded-tf tf:border tf:border-tf-input tf:bg-tf-background tf:px-3 tf:py-2", "tf:text-tf-label tf:text-tf-foreground tf:placeholder:text-tf-muted-foreground", "tf:focus-visible:outline-2 tf:focus-visible:outline-offset-1 tf:focus-visible:outline-tf-ring", "tf:disabled:cursor-not-allowed tf:disabled:opacity-50", className), ...props }));
|
|
6
|
+
}
|
|
@@ -1,73 +1,19 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
3
|
-
import { useEffect,
|
|
3
|
+
import { useEffect, useId, useRef } from "react";
|
|
4
|
+
import { ComposerChipShelf, useComposerMenuLightDismiss, } from "./composer-chip-shelf.js";
|
|
4
5
|
import { ChevronDownIcon, OpenAiMarkIcon } from "./icons.js";
|
|
5
6
|
import { TfButton } from "./primitives/button.js";
|
|
6
7
|
import { ProviderConnectSection, providerNameOf, } from "./subscription-connect-flow.js";
|
|
7
8
|
import { useRefreshStandingAndGate } from "./subscription-recheck.js";
|
|
8
|
-
import { useAssistantSession
|
|
9
|
-
import { useCell } from "./use-store-cell.js";
|
|
9
|
+
import { useAssistantSession } from "./teaflask-assistant-provider.js";
|
|
10
10
|
export function ProviderChipShelf() {
|
|
11
|
-
|
|
12
|
-
if (session === null) {
|
|
13
|
-
return null;
|
|
14
|
-
}
|
|
15
|
-
return _jsx(MountedProviderChipShelf, {});
|
|
11
|
+
return _jsx(ComposerChipShelf, { awaitsConfig: false });
|
|
16
12
|
}
|
|
17
|
-
function
|
|
18
|
-
const
|
|
19
|
-
const statuses = useCell(session.subscriptions);
|
|
20
|
-
const [open, setOpen] = useState(false);
|
|
21
|
-
const identified = session.tier === "identified";
|
|
22
|
-
useEffect(() => {
|
|
23
|
-
if (identified) {
|
|
24
|
-
session.ensureSubscriptions();
|
|
25
|
-
}
|
|
26
|
-
}, [identified, session]);
|
|
27
|
-
const connectable = (statuses ?? []).filter((status) => status.offered || status.connected);
|
|
28
|
-
const chipShown = identified && connectable.length > 0;
|
|
29
|
-
const openRequested = useCell(session.connectOpenRequested);
|
|
30
|
-
if (openRequested && chipShown && !open) {
|
|
31
|
-
setOpen(true);
|
|
32
|
-
}
|
|
33
|
-
if (!chipShown && open) {
|
|
34
|
-
setOpen(false);
|
|
35
|
-
}
|
|
36
|
-
useEffect(() => {
|
|
37
|
-
if (openRequested && open && chipShown) {
|
|
38
|
-
session.acknowledgeSubscriptionConnect();
|
|
39
|
-
}
|
|
40
|
-
}, [openRequested, open, chipShown, session]);
|
|
41
|
-
if (!chipShown) {
|
|
42
|
-
return null;
|
|
43
|
-
}
|
|
44
|
-
return (_jsx("div", { className: "tf:relative tf:mt-1.5 tf:flex tf:items-center tf:justify-end tf:px-1", children: _jsx(ProviderChip, { statuses: connectable, open: open, onOpenChange: setOpen }) }));
|
|
45
|
-
}
|
|
46
|
-
export function ProviderChip({ statuses, open, onOpenChange, fundingNote, }) {
|
|
13
|
+
export function ProviderChip({ statuses, open, onOpenChange, fundingNote, compactWhenNarrow = false, }) {
|
|
14
|
+
const menuId = `tf-provider-chip-menu${useId()}`;
|
|
47
15
|
const triggerRef = useRef(null);
|
|
48
|
-
|
|
49
|
-
useEffect(() => {
|
|
50
|
-
const menu = menuRef.current;
|
|
51
|
-
if (!open || menu === null) {
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
const closeUnlessInside = (event) => {
|
|
55
|
-
const path = event.composedPath();
|
|
56
|
-
if (path.includes(menu)) {
|
|
57
|
-
return;
|
|
58
|
-
}
|
|
59
|
-
const trigger = triggerRef.current;
|
|
60
|
-
if (trigger !== null && path.includes(trigger)) {
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
|
-
onOpenChange(false);
|
|
64
|
-
};
|
|
65
|
-
const doc = menu.ownerDocument;
|
|
66
|
-
doc.addEventListener("pointerdown", closeUnlessInside);
|
|
67
|
-
return () => {
|
|
68
|
-
doc.removeEventListener("pointerdown", closeUnlessInside);
|
|
69
|
-
};
|
|
70
|
-
}, [open, onOpenChange]);
|
|
16
|
+
useComposerMenuLightDismiss(open, onOpenChange, triggerRef);
|
|
71
17
|
const session = useAssistantSession();
|
|
72
18
|
const identified = session.tier === "identified";
|
|
73
19
|
useEffect(() => {
|
|
@@ -76,7 +22,7 @@ export function ProviderChip({ statuses, open, onOpenChange, fundingNote, }) {
|
|
|
76
22
|
}
|
|
77
23
|
}, [open, identified, session]);
|
|
78
24
|
const headline = _chipHeadlineOf(statuses);
|
|
79
|
-
return (_jsxs(_Fragment, { children: [_jsxs(TfButton, { ref: triggerRef, variant: headline.connected ? "chipQuiet" : "chip", "aria-expanded": open, "aria-controls":
|
|
25
|
+
return (_jsxs(_Fragment, { children: [_jsxs(TfButton, { ref: triggerRef, variant: headline.connected ? "chipQuiet" : "chip", "data-tf-composer-menu": "", "aria-expanded": open, "aria-controls": menuId, "aria-label": headline.accessibleName, onClick: () => {
|
|
80
26
|
onOpenChange(!open);
|
|
81
27
|
}, onKeyDown: (event) => {
|
|
82
28
|
if (!open || event.key !== "Escape") {
|
|
@@ -85,7 +31,9 @@ export function ProviderChip({ statuses, open, onOpenChange, fundingNote, }) {
|
|
|
85
31
|
event.preventDefault();
|
|
86
32
|
event.stopPropagation();
|
|
87
33
|
onOpenChange(false);
|
|
88
|
-
}, children: [_jsx(OpenAiMarkIcon, {}), _jsx("span", { className:
|
|
34
|
+
}, children: [_jsx(OpenAiMarkIcon, {}), _jsx("span", { className: compactWhenNarrow
|
|
35
|
+
? "tf:whitespace-nowrap tf:@max-tf-shelf-narrow:hidden"
|
|
36
|
+
: "tf:whitespace-nowrap", children: headline.label }), _jsx(ChevronDownIcon, {})] }), open ? (_jsxs("div", { id: menuId, role: "dialog", "data-tf-composer-menu": "", "aria-label": headline.accessibleName, "data-tf-glass": "", "data-tf-popover": "", className: "tf:absolute tf:right-0 tf:bottom-full tf:mb-2 tf:flex tf:w-80 tf:max-w-[calc(100vw-2rem)] tf:flex-col tf:gap-3 tf:overflow-y-auto tf:rounded-2xl tf:border tf:p-3", onKeyDown: (event) => {
|
|
89
37
|
if (event.key !== "Escape") {
|
|
90
38
|
return;
|
|
91
39
|
}
|
|
@@ -7,18 +7,21 @@ import { manageUsageUrlOf } from "./subscription-connect-arms.js";
|
|
|
7
7
|
import { providerNameOf } from "./subscription-connect-flow.js";
|
|
8
8
|
import { useAssistantSession } from "./teaflask-assistant-provider.js";
|
|
9
9
|
import { useCell } from "./use-store-cell.js";
|
|
10
|
-
export function
|
|
11
|
-
const session = useAssistantSession();
|
|
12
|
-
const due = useCell(session.planNoticeDue);
|
|
13
|
-
const statuses = useCell(session.subscriptions);
|
|
10
|
+
export function planNoticeShows(session, due, statuses) {
|
|
14
11
|
if (due === null) {
|
|
15
|
-
return
|
|
12
|
+
return false;
|
|
16
13
|
}
|
|
17
14
|
const standing = statuses?.find((status) => Object.is(status.provider, due));
|
|
18
15
|
const inUse = standing?.connected === true &&
|
|
19
16
|
standing.state === "active" &&
|
|
20
17
|
standing.offered;
|
|
21
|
-
|
|
18
|
+
return inUse && !readPlanNoticeSeen(session.publishableKey, due);
|
|
19
|
+
}
|
|
20
|
+
export function SubscriptionPlanNotice() {
|
|
21
|
+
const session = useAssistantSession();
|
|
22
|
+
const due = useCell(session.planNoticeDue);
|
|
23
|
+
const statuses = useCell(session.subscriptions);
|
|
24
|
+
if (due === null || !planNoticeShows(session, due, statuses)) {
|
|
22
25
|
return null;
|
|
23
26
|
}
|
|
24
27
|
const name = providerNameOf(due);
|
|
@@ -3,8 +3,10 @@ import { type AssistantTheme, type AssistantThemeMode } from "../appearance/them
|
|
|
3
3
|
import type { ActionsAdapter } from "../contract/actions-adapter.js";
|
|
4
4
|
import type { ServedAttachmentPolicy, ServedModelChoice, ServedSuggestionsConfig } from "../contract/assistant-config.js";
|
|
5
5
|
import type { VisitorTier } from "../contract/identity.js";
|
|
6
|
+
import type { PersonMcpServersProjection, PersonMcpServersResponse } from "../contract/mcp-servers.js";
|
|
6
7
|
import type { SubscriptionProvider, SubscriptionStatus } from "../contract/subscriptions.js";
|
|
7
8
|
import type { AssistantTelemetryEvent } from "../contract/telemetry.js";
|
|
9
|
+
import { type ComposerMenu } from "../core/assistant-session-registry.js";
|
|
8
10
|
import type { ConversationGate } from "../core/connect-gate.js";
|
|
9
11
|
import type { ReadonlyCell } from "../core/observable-cell.js";
|
|
10
12
|
import type { AssistantConversationStore } from "../core/conversation-store.js";
|
|
@@ -143,6 +145,7 @@ interface AssistantSessionValue {
|
|
|
143
145
|
attachmentPolicy: ReadonlyCell<ServedAttachmentPolicy | null>;
|
|
144
146
|
modelChoice: ReadonlyCell<ServedModelChoice | null>;
|
|
145
147
|
configAnswered: ReadonlyCell<boolean>;
|
|
148
|
+
configReadFailed?: ReadonlyCell<boolean>;
|
|
146
149
|
ensureAssistantConfig: () => void;
|
|
147
150
|
refreshAssistantConfig: () => void;
|
|
148
151
|
conversationGate: ReadonlyCell<ConversationGate>;
|
|
@@ -155,6 +158,17 @@ interface AssistantSessionValue {
|
|
|
155
158
|
planNoticeDue: ReadonlyCell<SubscriptionProvider | null>;
|
|
156
159
|
notePlanSignedIn: (provider: SubscriptionProvider) => void;
|
|
157
160
|
acknowledgePlanNotice: () => void;
|
|
161
|
+
mcpServersProjection?: ReadonlyCell<PersonMcpServersProjection | null>;
|
|
162
|
+
mcpServers?: ReadonlyCell<PersonMcpServersResponse | null>;
|
|
163
|
+
ensureMcpServers?: () => void;
|
|
164
|
+
refreshMcpServers?: () => void;
|
|
165
|
+
openComposerMenu?: ReadonlyCell<ComposerMenu | null>;
|
|
166
|
+
setOpenComposerMenu?: (next: ComposerMenu | null) => void;
|
|
167
|
+
connectorTokenFormAsk?: ReadonlyCell<string | null>;
|
|
168
|
+
openConnectorTokenForm?: (serverId: string) => void;
|
|
169
|
+
acknowledgeConnectorTokenForm?: () => void;
|
|
170
|
+
reconnectNoticesSettled?: ReadonlyCell<ReadonlySet<string>>;
|
|
171
|
+
settleReconnectNotice?: (key: string) => void;
|
|
158
172
|
reportError: (error: Error) => void;
|
|
159
173
|
}
|
|
160
174
|
export declare function useAssistantSession(): AssistantSessionValue;
|
|
@@ -144,6 +144,7 @@ function useSessionRegistration({ publishableKey, baseUrl, userId, host, }) {
|
|
|
144
144
|
attachmentPolicy: entry.attachmentPolicy,
|
|
145
145
|
modelChoice: entry.modelChoice,
|
|
146
146
|
configAnswered: entry.configAnswered,
|
|
147
|
+
configReadFailed: entry.configReadFailed,
|
|
147
148
|
ensureAssistantConfig: entry.ensureAssistantConfig,
|
|
148
149
|
refreshAssistantConfig: entry.refreshAssistantConfig,
|
|
149
150
|
conversationGate: entry.conversationGate,
|
|
@@ -156,6 +157,7 @@ function useSessionRegistration({ publishableKey, baseUrl, userId, host, }) {
|
|
|
156
157
|
planNoticeDue: entry.planNoticeDue,
|
|
157
158
|
notePlanSignedIn: entry.notePlanSignedIn,
|
|
158
159
|
acknowledgePlanNotice: entry.acknowledgePlanNotice,
|
|
160
|
+
..._connectorFieldsOf(entry),
|
|
159
161
|
reportError,
|
|
160
162
|
}), [
|
|
161
163
|
session,
|
|
@@ -172,6 +174,21 @@ function useSessionRegistration({ publishableKey, baseUrl, userId, host, }) {
|
|
|
172
174
|
reportError,
|
|
173
175
|
]);
|
|
174
176
|
}
|
|
177
|
+
function _connectorFieldsOf(entry) {
|
|
178
|
+
return {
|
|
179
|
+
mcpServersProjection: entry.mcpServersProjection,
|
|
180
|
+
mcpServers: entry.mcpServers,
|
|
181
|
+
ensureMcpServers: entry.ensureMcpServers,
|
|
182
|
+
refreshMcpServers: entry.refreshMcpServers,
|
|
183
|
+
openComposerMenu: entry.openComposerMenu,
|
|
184
|
+
setOpenComposerMenu: entry.setOpenComposerMenu,
|
|
185
|
+
connectorTokenFormAsk: entry.connectorTokenFormAsk,
|
|
186
|
+
openConnectorTokenForm: entry.openConnectorTokenForm,
|
|
187
|
+
acknowledgeConnectorTokenForm: entry.acknowledgeConnectorTokenForm,
|
|
188
|
+
reconnectNoticesSettled: entry.reconnectNoticesSettled,
|
|
189
|
+
settleReconnectNotice: entry.settleReconnectNotice,
|
|
190
|
+
};
|
|
191
|
+
}
|
|
175
192
|
function _companionMarkOf(companionMark) {
|
|
176
193
|
return hostFillDeclines(companionMark) ? null : companionMark;
|
|
177
194
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type ReadonlyCell } from "../core/observable-cell.js";
|
|
2
2
|
/**
|
|
3
3
|
* Subscribes a React component to an observable value such as composerInput and
|
|
4
4
|
* returns its current value, re-rendering when it changes. Server rendering
|
|
5
5
|
* gets the initial value.
|
|
6
6
|
*/
|
|
7
7
|
export declare function useCell<T>(cell: ReadonlyCell<T>): T;
|
|
8
|
+
export declare function useOptionalCell<T>(cell: ReadonlyCell<T | null> | undefined): T | null;
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { useSyncExternalStore } from "react";
|
|
3
|
+
import { ObservableCell } from "../core/observable-cell.js";
|
|
3
4
|
export function useCell(cell) {
|
|
4
5
|
return useSyncExternalStore(cell.subscribe, cell.get, cell.get);
|
|
5
6
|
}
|
|
7
|
+
const NULL_CELL = new ObservableCell(null);
|
|
8
|
+
export function useOptionalCell(cell) {
|
|
9
|
+
return useCell(cell ?? NULL_CELL);
|
|
10
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export type { AddPersonMcpServerRequest, BeginPersonMcpServerSignInRequest, CompletePersonMcpServerSignInRequest, HandOffPersonMcpServerSignInRequest, McpServerSignInHandoff, PersonMcpServer, PersonMcpServerInspection, PersonMcpServerSignInBegun, PersonMcpServersProjection, PersonMcpServersResponse, ReconnectedPersonMcpServerTarget, } from "../generated/models/index.js";
|
|
2
|
+
export type McpServerConnectMessage = {
|
|
3
|
+
kind: "code";
|
|
4
|
+
code: string;
|
|
5
|
+
state: string;
|
|
6
|
+
iss?: string;
|
|
7
|
+
} | {
|
|
8
|
+
kind: "denied" | "failed";
|
|
9
|
+
};
|
|
10
|
+
export declare function mcpServerConnectMessageOf(event: MessageEvent, serverOrigin: string, popup: Window): McpServerConnectMessage | null;
|