@teaflask/assistant 0.10.3 → 0.11.1

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.
Files changed (91) hide show
  1. package/README.md +2 -0
  2. package/dist/appearance/theme.d.ts +21 -18
  3. package/dist/components/composer-banner.js +38 -3
  4. package/dist/components/composer-chip-shelf.js +136 -0
  5. package/dist/components/composer.js +2 -2
  6. package/dist/components/connector-add-flow.js +173 -0
  7. package/dist/components/connector-reconnect-notice.js +66 -0
  8. package/dist/components/connector-sign-in-flow.js +331 -0
  9. package/dist/components/connector-sign-in.js +103 -0
  10. package/dist/components/connectors-chip.js +78 -0
  11. package/dist/components/connectors-menu.js +186 -0
  12. package/dist/components/conversation-view.js +2 -2
  13. package/dist/components/icons.js +3 -0
  14. package/dist/components/model-picker-chip.js +10 -84
  15. package/dist/components/primitives/button.js +3 -0
  16. package/dist/components/primitives/disclosure.js +2 -1
  17. package/dist/components/primitives/text-input.js +6 -0
  18. package/dist/components/provider-chip.js +11 -63
  19. package/dist/components/subscription-plan-notice.js +9 -6
  20. package/dist/components/teaflask-assistant-provider.d.ts +14 -0
  21. package/dist/components/teaflask-assistant-provider.js +17 -0
  22. package/dist/components/use-store-cell.d.ts +2 -1
  23. package/dist/components/use-store-cell.js +5 -0
  24. package/dist/contract/mcp-servers.d.ts +10 -0
  25. package/dist/contract/mcp-servers.js +28 -0
  26. package/dist/core/assistant-session-registry.d.ts +65 -0
  27. package/dist/core/assistant-session-registry.js +66 -2
  28. package/dist/generated/models/addPersonMcpServerRequest.d.ts +9 -0
  29. package/dist/generated/models/addPersonMcpServerRequest.js +1 -0
  30. package/dist/generated/models/apiErrorCode.d.ts +17 -0
  31. package/dist/generated/models/apiErrorCode.js +17 -0
  32. package/dist/generated/models/assistantConfigResponse.d.ts +2 -0
  33. package/dist/generated/models/beginPersonMcpServerSignInRequest.d.ts +5 -0
  34. package/dist/generated/models/beginPersonMcpServerSignInRequest.js +1 -0
  35. package/dist/generated/models/completePersonMcpServerSignInRequest.d.ts +6 -0
  36. package/dist/generated/models/completePersonMcpServerSignInRequest.js +1 -0
  37. package/dist/generated/models/endUserMcpServerState.d.ts +5 -0
  38. package/dist/generated/models/endUserMcpServerState.js +4 -0
  39. package/dist/generated/models/handOffPersonMcpServerSignInRequest.d.ts +4 -0
  40. package/dist/generated/models/handOffPersonMcpServerSignInRequest.js +1 -0
  41. package/dist/generated/models/headersPersonMcpServerCredential.d.ts +5 -0
  42. package/dist/generated/models/headersPersonMcpServerCredential.js +1 -0
  43. package/dist/generated/models/index.d.ts +26 -0
  44. package/dist/generated/models/index.js +26 -0
  45. package/dist/generated/models/inspectPersonMcpServerRequest.d.ts +3 -0
  46. package/dist/generated/models/inspectPersonMcpServerRequest.js +1 -0
  47. package/dist/generated/models/mcpCredentialKind.d.ts +6 -0
  48. package/dist/generated/models/mcpCredentialKind.js +5 -0
  49. package/dist/generated/models/mcpServerSignInHandoff.d.ts +6 -0
  50. package/dist/generated/models/mcpServerSignInHandoff.js +1 -0
  51. package/dist/generated/models/mcpServerSignInPending.d.ts +4 -0
  52. package/dist/generated/models/mcpServerSignInPending.js +3 -0
  53. package/dist/generated/models/mcpServerSignInStatus.d.ts +7 -0
  54. package/dist/generated/models/mcpServerSignInStatus.js +6 -0
  55. package/dist/generated/models/mcpSignInMode.d.ts +6 -0
  56. package/dist/generated/models/mcpSignInMode.js +5 -0
  57. package/dist/generated/models/mcpSkipReason.d.ts +9 -0
  58. package/dist/generated/models/mcpSkipReason.js +8 -0
  59. package/dist/generated/models/newPersonMcpServerSignInTarget.d.ts +3 -0
  60. package/dist/generated/models/newPersonMcpServerSignInTarget.js +1 -0
  61. package/dist/generated/models/newPersonMcpServerTarget.d.ts +3 -0
  62. package/dist/generated/models/newPersonMcpServerTarget.js +1 -0
  63. package/dist/generated/models/noPersonMcpServerCredential.d.ts +4 -0
  64. package/dist/generated/models/noPersonMcpServerCredential.js +3 -0
  65. package/dist/generated/models/personMcpServer.d.ts +15 -0
  66. package/dist/generated/models/personMcpServer.js +1 -0
  67. package/dist/generated/models/personMcpServerHeader.d.ts +4 -0
  68. package/dist/generated/models/personMcpServerHeader.js +1 -0
  69. package/dist/generated/models/personMcpServerInspection.d.ts +5 -0
  70. package/dist/generated/models/personMcpServerInspection.js +1 -0
  71. package/dist/generated/models/personMcpServerSignInBegun.d.ts +6 -0
  72. package/dist/generated/models/personMcpServerSignInBegun.js +1 -0
  73. package/dist/generated/models/personMcpServersProjection.d.ts +3 -0
  74. package/dist/generated/models/personMcpServersProjection.js +1 -0
  75. package/dist/generated/models/personMcpServersResponse.d.ts +6 -0
  76. package/dist/generated/models/personMcpServersResponse.js +1 -0
  77. package/dist/generated/models/personSkippedTool.d.ts +6 -0
  78. package/dist/generated/models/personSkippedTool.js +1 -0
  79. package/dist/generated/models/reconnectedPersonMcpServerSignInTarget.d.ts +3 -0
  80. package/dist/generated/models/reconnectedPersonMcpServerSignInTarget.js +1 -0
  81. package/dist/generated/models/reconnectedPersonMcpServerTarget.d.ts +4 -0
  82. package/dist/generated/models/reconnectedPersonMcpServerTarget.js +1 -0
  83. package/dist/generated/models/servingErrorCode.d.ts +10 -2
  84. package/dist/generated/models/servingErrorCode.js +4 -0
  85. package/dist/generated/models/tokenPersonMcpServerCredential.d.ts +4 -0
  86. package/dist/generated/models/tokenPersonMcpServerCredential.js +1 -0
  87. package/dist/generated/serving.js +142 -0
  88. package/dist/styles.css +1 -1
  89. package/dist/transport/connectors-api.js +47 -0
  90. package/dist/transport/serving-api.js +4 -1
  91. package/package.json +1 -1
@@ -0,0 +1,186 @@
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 so this assistant can work with them.";
14
+ const TRUST_LINE = "Only connect apps you trust.";
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 menuRef = useRef(null);
23
+ useRoomWithinThePanel(menuRef, hidden);
24
+ useTokenFormAsk(list, setView);
25
+ useClosedWhenNothingIsLeft(offered, list, hidden, onDismiss);
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, onAdd: () => {
41
+ setView({ kind: "add" });
42
+ }, onReplaceToken: (server) => {
43
+ setView({ kind: "replace-token", server });
44
+ }, onSignIn: (server) => {
45
+ signIn.start({
46
+ target: { server_id: server.id },
47
+ host: server.host,
48
+ });
49
+ } })) : (_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") }) })) }));
50
+ }
51
+ function useTokenFormAsk(list, setView) {
52
+ const session = useAssistantSession();
53
+ const ask = useOptionalCell(session.connectorTokenFormAsk);
54
+ useEffect(() => {
55
+ if (ask === null) {
56
+ return;
57
+ }
58
+ const server = list?.servers.find((stored) => stored.id === ask);
59
+ if (server !== undefined) {
60
+ setView({ kind: "replace-token", server });
61
+ }
62
+ session.acknowledgeConnectorTokenForm?.();
63
+ }, [ask, list, session, setView]);
64
+ }
65
+ function useClosedWhenNothingIsLeft(offered, list, hidden, onDismiss) {
66
+ const nothingLeft = !offered && list !== null && list.servers.length === 0;
67
+ useEffect(() => {
68
+ if (nothingLeft && !hidden) {
69
+ onDismiss();
70
+ }
71
+ }, [nothingLeft, hidden, onDismiss]);
72
+ }
73
+ function ConnectorList({ offered, list, onAdd, onReplaceToken, onSignIn, }) {
74
+ const servers = list?.servers ?? [];
75
+ 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 }, server.id))) })) : null, offered ? (_jsx("div", { className: "tf:flex tf:flex-col tf:gap-2 tf:border-t tf:pt-3", children: _jsx(AddConnectorAction, { atLimit: list !== null && servers.length >= list.limit, limit: list?.limit ?? 0, onAdd: onAdd }) })) : null] }));
76
+ }
77
+ function AddConnectorAction({ atLimit, limit, onAdd, }) {
78
+ if (atLimit) {
79
+ return (_jsx("p", { className: NOTE_LINE, children: `You've connected ${String(limit)}, the most allowed. Remove one to add another.` }));
80
+ }
81
+ return (_jsx(TfButton, { variant: "outline", className: "tf:self-start", onClick: onAdd, children: "Add connector" }));
82
+ }
83
+ function useRoomWithinThePanel(menuRef, hidden) {
84
+ useLayoutEffect(() => {
85
+ const menu = menuRef.current;
86
+ const panel = menu?.closest("[data-tf-conversation]") ?? null;
87
+ if (hidden || menu === null || panel === null) {
88
+ return;
89
+ }
90
+ const measure = () => {
91
+ const room = menu.getBoundingClientRect().bottom -
92
+ panel.getBoundingClientRect().top -
93
+ MENU_PANEL_GAP_PX;
94
+ menu.style.setProperty("--_tf-connectors-room", `${String(Math.max(room, 0))}px`);
95
+ };
96
+ measure();
97
+ const win = menu.ownerDocument.defaultView;
98
+ win?.addEventListener("resize", measure);
99
+ return () => {
100
+ win?.removeEventListener("resize", measure);
101
+ };
102
+ }, [menuRef, hidden]);
103
+ }
104
+ const MENU_PANEL_GAP_PX = 8;
105
+ function ConnectorRow({ server, offered, onReplaceToken, onSignIn, }) {
106
+ const [confirmingRemove, setConfirmingRemove] = useState(false);
107
+ const { work, note, error, refresh, reconnect, remove } = useConnectorRowWork(server, { onReplaceToken, onSignIn });
108
+ const needsReconnect = server.state === "needs_reconnect";
109
+ return (_jsxs("div", { className: "tf:flex tf:flex-col tf:gap-2 tf:border-t tf:pt-2", children: [_jsx(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: () => {
110
+ setConfirmingRemove(false);
111
+ } })) : (_jsx(ConnectorRowActions, { server: server, offered: offered, busy: work !== null, onRefresh: () => void refresh(), onReconnect: reconnect, onRemove: () => {
112
+ setConfirmingRemove(true);
113
+ } })) }), 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] }));
114
+ }
115
+ function ConnectorRowSummary({ server }) {
116
+ 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, {})] }));
117
+ }
118
+ function ConnectorRowActions({ server, offered, busy, onRefresh, onReconnect, onRemove, }) {
119
+ 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" })] }));
120
+ }
121
+ function useConnectorRowWork(server, { onReplaceToken, onSignIn }) {
122
+ const session = useAssistantSession();
123
+ const [work, setWork] = useState(null);
124
+ const [note, setNote] = useState(null);
125
+ const [error, setError] = useState(null);
126
+ const run = async (kind, action) => {
127
+ setWork(kind);
128
+ setError(null);
129
+ setNote(null);
130
+ try {
131
+ setNote(await action());
132
+ }
133
+ catch (failure) {
134
+ setError(failureSentenceOf(failure));
135
+ }
136
+ finally {
137
+ setWork(null);
138
+ session.refreshMcpServers?.();
139
+ }
140
+ };
141
+ const refresh = () => run("refresh", async () => {
142
+ const refreshed = await refreshMcpServer(session.session, server.id);
143
+ return `Up to date · ${_toolCountOf(refreshed.tool_names.length)}`;
144
+ });
145
+ const reconnect = () => {
146
+ if (server.credential_kind === "headers") {
147
+ onReplaceToken(server);
148
+ return;
149
+ }
150
+ if (server.credential_kind === "oauth") {
151
+ onSignIn(server);
152
+ return;
153
+ }
154
+ void run("reconnect", async () => {
155
+ await addMcpServer(session.session, {
156
+ target: reconnectTargetOf(server, session.mcpServers?.get() ?? null),
157
+ credential: { kind: "none" },
158
+ });
159
+ return null;
160
+ });
161
+ };
162
+ const remove = () => run("remove", async () => {
163
+ await removeMcpServer(session.session, server.id);
164
+ return null;
165
+ });
166
+ return { work, note, error, refresh, reconnect, remove };
167
+ }
168
+ function ReconnectButton({ server, busy, onReconnect, primary = false, }) {
169
+ 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" }));
170
+ }
171
+ function RemoveConfirm({ name, busy, onRemove, onCancel, }) {
172
+ 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" })] })] }));
173
+ }
174
+ function _rowSecondaryOf(server) {
175
+ if (server.state === "needs_reconnect") {
176
+ return server.credential_kind === "headers"
177
+ ? `${server.host} · Needs a new access token`
178
+ : `${server.host} · Needs you to sign in again`;
179
+ }
180
+ const tools = `${server.host} · ${_toolCountOf(server.tool_names.length)}`;
181
+ const skipped = server.skipped_tools.length;
182
+ return skipped > 0 ? `${tools} · ${String(skipped)} can't be used` : tools;
183
+ }
184
+ function _toolCountOf(count) {
185
+ return count === 1 ? "1 tool" : `${String(count)} tools`;
186
+ }
@@ -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
  }
@@ -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
- const session = useOptionalAssistantSession();
14
- if (session === null) {
15
- return null;
16
- }
17
- return _jsx(MountedModelPickerShelf, {});
11
+ return _jsx(ComposerChipShelf, {});
18
12
  }
19
- function MountedModelPickerShelf() {
20
- const session = useAssistantSession();
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, menuRef, rootPanelRef, modelPanelRef, effortPanelRef, } = useModelPickerPanels({ open, onOpenChange });
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", { ref: menuRef, id: "tf-model-picker-menu", role: "dialog", "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) => {
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
- useEffect(() => {
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": "tf-model-picker-menu", "aria-label": currentEffort === null
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, useRef, useState } from "react";
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, useOptionalAssistantSession, } from "./teaflask-assistant-provider.js";
9
- import { useCell } from "./use-store-cell.js";
9
+ import { useAssistantSession } from "./teaflask-assistant-provider.js";
10
10
  export function ProviderChipShelf() {
11
- const session = useOptionalAssistantSession();
12
- if (session === null) {
13
- return null;
14
- }
15
- return _jsx(MountedProviderChipShelf, {});
11
+ return _jsx(ComposerChipShelf, { awaitsConfig: false });
16
12
  }
17
- function MountedProviderChipShelf() {
18
- const session = useAssistantSession();
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
- const menuRef = useRef(null);
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": "tf-provider-chip-menu", "aria-label": headline.accessibleName, onClick: () => {
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: "tf:whitespace-nowrap", children: headline.label }), _jsx(ChevronDownIcon, {})] }), open ? (_jsxs("div", { ref: menuRef, id: "tf-provider-chip-menu", role: "dialog", "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) => {
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 SubscriptionPlanNotice() {
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 null;
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
- if (!inUse || readPlanNoticeSeen(session.publishableKey, due)) {
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 { ReadonlyCell } from "../core/observable-cell.js";
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;