@agent-native/toolkit 0.198.8 → 0.199.0-nightly-20261001064935
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/dist/app/agentkit/react/components.d.ts.map +1 -1
- package/dist/app/agentkit/react/components.js +142 -56
- package/dist/app/agentkit/react/components.js.map +1 -1
- package/dist/app/chat/AgentKitAssistantChat.d.ts.map +1 -1
- package/dist/app/chat/AgentKitAssistantChat.js +34 -27
- package/dist/app/chat/AgentKitAssistantChat.js.map +1 -1
- package/dist/app/chat/AgentPanel.d.ts +2 -1
- package/dist/app/chat/AgentPanel.d.ts.map +1 -1
- package/dist/app/chat/AgentPanel.js +7 -4
- package/dist/app/chat/AgentPanel.js.map +1 -1
- package/dist/app/chat/MultiTabAssistantChat.d.ts.map +1 -1
- package/dist/app/chat/MultiTabAssistantChat.js +21 -4
- package/dist/app/chat/MultiTabAssistantChat.js.map +1 -1
- package/dist/app/chat/chat/run-recovery.d.ts +2 -1
- package/dist/app/chat/chat/run-recovery.d.ts.map +1 -1
- package/dist/app/chat/chat/run-recovery.js +13 -9
- package/dist/app/chat/chat/run-recovery.js.map +1 -1
- package/dist/app/i18n/catalogs/ar-SA.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/ar-SA.js +24 -2
- package/dist/app/i18n/catalogs/ar-SA.js.map +1 -1
- package/dist/app/i18n/catalogs/de-DE.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/de-DE.js +24 -2
- package/dist/app/i18n/catalogs/de-DE.js.map +1 -1
- package/dist/app/i18n/catalogs/en-US.d.ts +24 -2
- package/dist/app/i18n/catalogs/en-US.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/en-US.js +24 -2
- package/dist/app/i18n/catalogs/en-US.js.map +1 -1
- package/dist/app/i18n/catalogs/es-ES.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/es-ES.js +24 -2
- package/dist/app/i18n/catalogs/es-ES.js.map +1 -1
- package/dist/app/i18n/catalogs/fr-FR.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/fr-FR.js +24 -2
- package/dist/app/i18n/catalogs/fr-FR.js.map +1 -1
- package/dist/app/i18n/catalogs/hi-IN.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/hi-IN.js +24 -2
- package/dist/app/i18n/catalogs/hi-IN.js.map +1 -1
- package/dist/app/i18n/catalogs/ja-JP.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/ja-JP.js +24 -2
- package/dist/app/i18n/catalogs/ja-JP.js.map +1 -1
- package/dist/app/i18n/catalogs/ko-KR.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/ko-KR.js +24 -2
- package/dist/app/i18n/catalogs/ko-KR.js.map +1 -1
- package/dist/app/i18n/catalogs/pt-BR.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/pt-BR.js +24 -2
- package/dist/app/i18n/catalogs/pt-BR.js.map +1 -1
- package/dist/app/i18n/catalogs/zh-CN.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/zh-CN.js +24 -2
- package/dist/app/i18n/catalogs/zh-CN.js.map +1 -1
- package/dist/app/i18n/catalogs/zh-TW.d.ts.map +1 -1
- package/dist/app/i18n/catalogs/zh-TW.js +24 -2
- package/dist/app/i18n/catalogs/zh-TW.js.map +1 -1
- package/dist/app/labs/LabsSettings.d.ts.map +1 -1
- package/dist/app/labs/LabsSettings.js +10 -2
- package/dist/app/labs/LabsSettings.js.map +1 -1
- package/dist/app/org/OrgSwitcher.d.ts.map +1 -1
- package/dist/app/org/OrgSwitcher.js +51 -9
- package/dist/app/org/OrgSwitcher.js.map +1 -1
- package/dist/app/settings/SettingsPanel.d.ts.map +1 -1
- package/dist/app/settings/SettingsPanel.js +4 -145
- package/dist/app/settings/SettingsPanel.js.map +1 -1
- package/dist/app/settings/SettingsTabsPage.d.ts.map +1 -1
- package/dist/app/settings/SettingsTabsPage.js +27 -16
- package/dist/app/settings/SettingsTabsPage.js.map +1 -1
- package/dist/app/settings/model/ChatGPTSubscriptionRow.d.ts +24 -2
- package/dist/app/settings/model/ChatGPTSubscriptionRow.d.ts.map +1 -1
- package/dist/app/settings/model/ChatGPTSubscriptionRow.js +97 -26
- package/dist/app/settings/model/ChatGPTSubscriptionRow.js.map +1 -1
- package/dist/app/settings/model/ModelSettingsPage.d.ts.map +1 -1
- package/dist/app/settings/model/ModelSettingsPage.js +73 -22
- package/dist/app/settings/model/ModelSettingsPage.js.map +1 -1
- package/dist/app/settings/model/model-page-state.d.ts +12 -2
- package/dist/app/settings/model/model-page-state.d.ts.map +1 -1
- package/dist/app/settings/model/model-page-state.js +14 -1
- package/dist/app/settings/model/model-page-state.js.map +1 -1
- package/dist/app/settings/shell/bridge.d.ts +1 -1
- package/dist/app/settings/shell/bridge.d.ts.map +1 -1
- package/dist/app/settings/shell/bridge.js +1 -4
- package/dist/app/settings/shell/bridge.js.map +1 -1
- package/dist/app/settings/usage/UsagePage.d.ts.map +1 -1
- package/dist/app/settings/usage/UsagePage.js +3 -2
- package/dist/app/settings/usage/UsagePage.js.map +1 -1
- package/dist/composer/TiptapComposer.d.ts +1 -0
- package/dist/composer/TiptapComposer.d.ts.map +1 -1
- package/dist/composer/TiptapComposer.js +10 -4
- package/dist/composer/TiptapComposer.js.map +1 -1
- package/dist/composer/runtime-adapters.d.ts +1 -0
- package/dist/composer/runtime-adapters.d.ts.map +1 -1
- package/dist/composer/runtime-adapters.js.map +1 -1
- package/package.json +4 -4
- package/src/app/agentkit/react/components.tsx +295 -98
- package/src/app/agentkit/react/lifecycle.spec.tsx +758 -17
- package/src/app/chat/AgentKitAssistantChat.spec.tsx +116 -7
- package/src/app/chat/AgentKitAssistantChat.tsx +100 -45
- package/src/app/chat/AgentPanel.header.spec.ts +9 -0
- package/src/app/chat/AgentPanel.tsx +10 -1
- package/src/app/chat/MultiTabAssistantChat.spec.tsx +115 -1
- package/src/app/chat/MultiTabAssistantChat.tsx +24 -4
- package/src/app/chat/chat/run-recovery.spec.tsx +31 -0
- package/src/app/chat/chat/run-recovery.tsx +22 -5
- package/src/app/i18n/catalogs/ar-SA.ts +31 -2
- package/src/app/i18n/catalogs/de-DE.ts +33 -2
- package/src/app/i18n/catalogs/en-US.ts +33 -2
- package/src/app/i18n/catalogs/es-ES.ts +34 -2
- package/src/app/i18n/catalogs/fr-FR.ts +33 -2
- package/src/app/i18n/catalogs/hi-IN.ts +34 -2
- package/src/app/i18n/catalogs/ja-JP.ts +31 -2
- package/src/app/i18n/catalogs/ko-KR.ts +31 -2
- package/src/app/i18n/catalogs/pt-BR.ts +33 -2
- package/src/app/i18n/catalogs/zh-CN.ts +32 -2
- package/src/app/i18n/catalogs/zh-TW.ts +32 -2
- package/src/app/labs/LabsSettings.tsx +13 -3
- package/src/app/org/OrgSwitcher.spec.tsx +75 -0
- package/src/app/org/OrgSwitcher.tsx +104 -34
- package/src/app/settings/SettingsPanel.connections.spec.tsx +25 -5
- package/src/app/settings/SettingsPanel.tsx +3 -286
- package/src/app/settings/SettingsTabsPage.spec.tsx +110 -17
- package/src/app/settings/SettingsTabsPage.tsx +36 -20
- package/src/app/settings/model/ChatGPTSubscriptionRow.tsx +316 -60
- package/src/app/settings/model/ModelSettingsPage.spec.tsx +599 -20
- package/src/app/settings/model/ModelSettingsPage.tsx +114 -25
- package/src/app/settings/model/model-page-state.spec.ts +46 -0
- package/src/app/settings/model/model-page-state.ts +27 -2
- package/src/app/settings/shell/bridge.spec.ts +3 -13
- package/src/app/settings/shell/bridge.ts +2 -5
- package/src/app/settings/shell/pages/app-group-pages.spec.tsx +50 -2
- package/src/app/settings/usage/UsagePage.spec.tsx +25 -1
- package/src/app/settings/usage/UsagePage.tsx +21 -1
- package/src/composer/PromptComposer.context.spec.tsx +22 -3
- package/src/composer/TiptapComposer.tsx +13 -4
- package/src/composer/runtime-adapters.tsx +1 -0
|
@@ -796,9 +796,10 @@ describe("AgentKitAssistantChat host behavior", () => {
|
|
|
796
796
|
|
|
797
797
|
const thinking = container.querySelector('[role="status"]');
|
|
798
798
|
expect(thinking?.textContent).toBe("agentChat.status.thinking");
|
|
799
|
-
expect(thinking?.classList.contains("agent-thinking-indicator")).toBe(true);
|
|
800
799
|
expect(
|
|
801
|
-
thinking?.querySelector(
|
|
800
|
+
thinking?.querySelector(
|
|
801
|
+
"[data-agentkit-current-activity] .agent-running-shimmer",
|
|
802
|
+
),
|
|
802
803
|
).not.toBeNull();
|
|
803
804
|
expect(chatMocks.composerProps.disabled).toBe(false);
|
|
804
805
|
expect(chatMocks.composerProps.submissionDisabled).toBe(true);
|
|
@@ -1337,14 +1338,12 @@ describe("AgentKitAssistantChat host behavior", () => {
|
|
|
1337
1338
|
await act(async () => ref.current!.setComposerContextItem(ambient));
|
|
1338
1339
|
expect(chatMocks.composerProps.contextItems).toEqual([ambient, item]);
|
|
1339
1340
|
expect(chatMocks.composerProps.contextMenuItems).toBe(context.menuItems);
|
|
1341
|
+
expect(chatMocks.composerProps.onInspectContextItem).toBeUndefined();
|
|
1340
1342
|
expect(chatMocks.composerProps.plusMenuMode).toBe("full");
|
|
1341
1343
|
expect(container.querySelector("[data-app-dialog]")).not.toBeNull();
|
|
1342
|
-
await act(async () =>
|
|
1343
|
-
chatMocks.composerProps.onRetryContextItem(item.key);
|
|
1344
|
-
chatMocks.composerProps.onInspectContextItem(item.key);
|
|
1345
|
-
});
|
|
1344
|
+
await act(async () => chatMocks.composerProps.onRetryContextItem(item.key));
|
|
1346
1345
|
expect(context.onRetryContextItem).toHaveBeenCalledWith(item.key);
|
|
1347
|
-
expect(context.onInspectContextItem).
|
|
1346
|
+
expect(context.onInspectContextItem).not.toHaveBeenCalled();
|
|
1348
1347
|
const accepted = Promise.withResolvers<void>();
|
|
1349
1348
|
chatMocks.control.sendMessage.mockImplementationOnce(
|
|
1350
1349
|
() => accepted.promise,
|
|
@@ -3921,6 +3920,116 @@ describe("AgentKitAssistantChat host behavior", () => {
|
|
|
3921
3920
|
});
|
|
3922
3921
|
});
|
|
3923
3922
|
|
|
3923
|
+
it("reuses file IDs when retrying a saved request", async () => {
|
|
3924
|
+
chatMocks.thread.messages = [
|
|
3925
|
+
{
|
|
3926
|
+
id: "user-retry",
|
|
3927
|
+
role: "user",
|
|
3928
|
+
parts: [
|
|
3929
|
+
{ type: "text", text: "Retry the export" },
|
|
3930
|
+
{
|
|
3931
|
+
type: "file",
|
|
3932
|
+
name: "source.csv",
|
|
3933
|
+
mediaType: "text/csv",
|
|
3934
|
+
fileId: "file-1",
|
|
3935
|
+
},
|
|
3936
|
+
],
|
|
3937
|
+
},
|
|
3938
|
+
];
|
|
3939
|
+
await mount(baseProps());
|
|
3940
|
+
|
|
3941
|
+
expect(chatMocks.failureProps.retryHasUnavailableAttachment).toBe(false);
|
|
3942
|
+
await act(async () => {
|
|
3943
|
+
chatMocks.failureProps.onRetry();
|
|
3944
|
+
await Promise.resolve();
|
|
3945
|
+
});
|
|
3946
|
+
|
|
3947
|
+
expect(chatMocks.control.sendMessage).toHaveBeenCalledOnce();
|
|
3948
|
+
expect(
|
|
3949
|
+
chatMocks.control.sendMessage.mock.calls[0]?.[0].attachments,
|
|
3950
|
+
).toEqual([
|
|
3951
|
+
{
|
|
3952
|
+
type: "file",
|
|
3953
|
+
name: "source.csv",
|
|
3954
|
+
mediaType: "text/csv",
|
|
3955
|
+
fileId: "file-1",
|
|
3956
|
+
},
|
|
3957
|
+
]);
|
|
3958
|
+
expect(chatMocks.control.uploadFiles).not.toHaveBeenCalled();
|
|
3959
|
+
});
|
|
3960
|
+
|
|
3961
|
+
it("preserves saved file IDs when retrying while the provider is unavailable", async () => {
|
|
3962
|
+
chatMocks.readiness = {
|
|
3963
|
+
canChat: false,
|
|
3964
|
+
missing: false,
|
|
3965
|
+
state: "unavailable",
|
|
3966
|
+
};
|
|
3967
|
+
chatMocks.fileUploadStatus = {
|
|
3968
|
+
data: { configured: false },
|
|
3969
|
+
isError: false,
|
|
3970
|
+
isLoading: false,
|
|
3971
|
+
refetch: vi.fn(),
|
|
3972
|
+
};
|
|
3973
|
+
chatMocks.thread.messages = [
|
|
3974
|
+
{
|
|
3975
|
+
id: "user-retry",
|
|
3976
|
+
role: "user",
|
|
3977
|
+
parts: [
|
|
3978
|
+
{ type: "text", text: "Retry the export" },
|
|
3979
|
+
{
|
|
3980
|
+
type: "file",
|
|
3981
|
+
name: "source.csv",
|
|
3982
|
+
mediaType: "text/csv",
|
|
3983
|
+
fileId: "file-1",
|
|
3984
|
+
},
|
|
3985
|
+
],
|
|
3986
|
+
},
|
|
3987
|
+
];
|
|
3988
|
+
await mount(baseProps({ providerStatusChecksEnabled: true }));
|
|
3989
|
+
|
|
3990
|
+
await act(async () => {
|
|
3991
|
+
chatMocks.failureProps.onRetry();
|
|
3992
|
+
await new Promise((resolve) => setTimeout(resolve, 0));
|
|
3993
|
+
});
|
|
3994
|
+
|
|
3995
|
+
const stateKey = [...chatMocks.appState.keys()].find((key) =>
|
|
3996
|
+
key.startsWith("agentkit-deferred-provider-submissions:"),
|
|
3997
|
+
);
|
|
3998
|
+
expect(stateKey).toBeDefined();
|
|
3999
|
+
expect(chatMocks.appState.get(stateKey!)).toMatchObject({
|
|
4000
|
+
submissions: [
|
|
4001
|
+
{
|
|
4002
|
+
fileParts: [
|
|
4003
|
+
{
|
|
4004
|
+
type: "file",
|
|
4005
|
+
name: "source.csv",
|
|
4006
|
+
mediaType: "text/csv",
|
|
4007
|
+
fileId: "file-1",
|
|
4008
|
+
},
|
|
4009
|
+
],
|
|
4010
|
+
},
|
|
4011
|
+
],
|
|
4012
|
+
});
|
|
4013
|
+
expect(chatMocks.control.uploadFiles).not.toHaveBeenCalled();
|
|
4014
|
+
expect(chatMocks.control.sendMessage).not.toHaveBeenCalled();
|
|
4015
|
+
});
|
|
4016
|
+
|
|
4017
|
+
it("marks a saved file without a replay reference as unavailable", async () => {
|
|
4018
|
+
chatMocks.thread.messages = [
|
|
4019
|
+
{
|
|
4020
|
+
id: "user-retry",
|
|
4021
|
+
role: "user",
|
|
4022
|
+
parts: [
|
|
4023
|
+
{ type: "text", text: "Retry the export" },
|
|
4024
|
+
{ type: "file", name: "source.csv", mediaType: "text/csv" },
|
|
4025
|
+
],
|
|
4026
|
+
},
|
|
4027
|
+
];
|
|
4028
|
+
await mount(baseProps());
|
|
4029
|
+
|
|
4030
|
+
expect(chatMocks.failureProps.retryHasUnavailableAttachment).toBe(true);
|
|
4031
|
+
});
|
|
4032
|
+
|
|
3924
4033
|
it("shows a localized Stop tooltip and bounces the blocked setup card", async () => {
|
|
3925
4034
|
chatMocks.readiness = {
|
|
3926
4035
|
canChat: false,
|
|
@@ -18,6 +18,7 @@ import type {
|
|
|
18
18
|
FilePart,
|
|
19
19
|
} from "@agent-native/agentkit/protocol";
|
|
20
20
|
import type { AgentChatAttachment } from "@agent-native/core";
|
|
21
|
+
import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "@agent-native/core/agent/chatgpt-subscription-contract";
|
|
21
22
|
import {
|
|
22
23
|
appendAgentChatContextToMessage,
|
|
23
24
|
filterAgentChatContextItems,
|
|
@@ -535,7 +536,7 @@ interface AgentKitSurfaceContextValue {
|
|
|
535
536
|
text: string,
|
|
536
537
|
recoveryAction: "continue" | "retry",
|
|
537
538
|
images?: string[],
|
|
538
|
-
|
|
539
|
+
fileParts?: FilePart[],
|
|
539
540
|
references?: Reference[],
|
|
540
541
|
recoveryOptions?: Pick<
|
|
541
542
|
AgentKitInternalSendOptions,
|
|
@@ -2084,20 +2085,19 @@ const AgentKitAssistantChatBody = forwardRef<
|
|
|
2084
2085
|
const selectionRevision = selectionRevisionRef.current;
|
|
2085
2086
|
const attachments = options.attachments ?? [];
|
|
2086
2087
|
const needsFileStorage =
|
|
2087
|
-
|
|
2088
|
-
|
|
2089
|
-
(
|
|
2090
|
-
|
|
2088
|
+
!options.deferredFileParts &&
|
|
2089
|
+
(files.length > 0 ||
|
|
2090
|
+
attachments.some(
|
|
2091
|
+
(attachment) => !attachment.displayOnly && !attachment.url,
|
|
2092
|
+
));
|
|
2091
2093
|
if (needsFileStorage && !fileStorageConfigured) {
|
|
2092
2094
|
throw new Error(t("onboarding.fileStorage.title"));
|
|
2093
2095
|
}
|
|
2094
2096
|
// Persist only URLs or opaque file handles; application_state is
|
|
2095
2097
|
// not a file store and must never receive attachment bodies.
|
|
2096
|
-
const fileParts =
|
|
2097
|
-
|
|
2098
|
-
attachments,
|
|
2099
|
-
files,
|
|
2100
|
-
);
|
|
2098
|
+
const fileParts =
|
|
2099
|
+
options.deferredFileParts ??
|
|
2100
|
+
(await uploadAgentChatAttachments(control, attachments, files));
|
|
2101
2101
|
const selectionChangedDuringUpload =
|
|
2102
2102
|
selectionRevision !== selectionRevisionRef.current;
|
|
2103
2103
|
const context = options.recoveryAction
|
|
@@ -2555,7 +2555,7 @@ const AgentKitAssistantChatBody = forwardRef<
|
|
|
2555
2555
|
text: string,
|
|
2556
2556
|
recoveryAction: "continue" | "retry",
|
|
2557
2557
|
images?: string[],
|
|
2558
|
-
|
|
2558
|
+
fileParts?: FilePart[],
|
|
2559
2559
|
references?: Reference[],
|
|
2560
2560
|
recoveryOptions?: Pick<
|
|
2561
2561
|
AgentKitInternalSendOptions,
|
|
@@ -2575,13 +2575,16 @@ const AgentKitAssistantChatBody = forwardRef<
|
|
|
2575
2575
|
recoveryAction,
|
|
2576
2576
|
recoveryReferences: references,
|
|
2577
2577
|
...recoveryOptions,
|
|
2578
|
-
|
|
2579
|
-
...(
|
|
2580
|
-
...(images ?? []).map(
|
|
2581
|
-
|
|
2582
|
-
|
|
2583
|
-
|
|
2584
|
-
|
|
2578
|
+
deferredFileParts: [
|
|
2579
|
+
...(fileParts ?? []),
|
|
2580
|
+
...(images ?? []).map(
|
|
2581
|
+
(url): FilePart => ({
|
|
2582
|
+
type: "file",
|
|
2583
|
+
name: "image",
|
|
2584
|
+
mediaType: "image",
|
|
2585
|
+
url,
|
|
2586
|
+
}),
|
|
2587
|
+
),
|
|
2585
2588
|
],
|
|
2586
2589
|
},
|
|
2587
2590
|
);
|
|
@@ -3265,12 +3268,18 @@ function AgentKitTranscript({ children, threadId }: AgentKitRegionRenderProps) {
|
|
|
3265
3268
|
))}
|
|
3266
3269
|
{showThinking ? (
|
|
3267
3270
|
<div
|
|
3268
|
-
className="
|
|
3271
|
+
className="agentkit-activities agentkit-activities-summary-content"
|
|
3269
3272
|
role="status"
|
|
3270
3273
|
aria-live="polite"
|
|
3271
3274
|
>
|
|
3272
|
-
<span
|
|
3273
|
-
|
|
3275
|
+
<span
|
|
3276
|
+
className="agentkit-activities-current"
|
|
3277
|
+
data-running="true"
|
|
3278
|
+
data-agentkit-current-activity="true"
|
|
3279
|
+
>
|
|
3280
|
+
<span className="agentkit-activities-current-label agent-running-shimmer">
|
|
3281
|
+
{t("agentChat.status.thinking")}
|
|
3282
|
+
</span>
|
|
3274
3283
|
</span>
|
|
3275
3284
|
</div>
|
|
3276
3285
|
) : null}
|
|
@@ -3785,7 +3794,6 @@ function AgentKitComposerSurface({
|
|
|
3785
3794
|
else onRemoveContextItem(key);
|
|
3786
3795
|
}}
|
|
3787
3796
|
onRetryContextItem={composerContext?.onRetryContextItem}
|
|
3788
|
-
onInspectContextItem={composerContext?.onInspectContextItem}
|
|
3789
3797
|
interceptBuildRequestsForBuilder={isInBuilderFrame()}
|
|
3790
3798
|
selectedModel={props.selectedModel ?? props.defaultModel}
|
|
3791
3799
|
selectedEngine={props.selectedEngine}
|
|
@@ -3820,7 +3828,24 @@ function AgentKitComposerSurface({
|
|
|
3820
3828
|
onConnectLocalRuntime={props.onConnectLocalRuntime}
|
|
3821
3829
|
imageModelMenu={props.imageModelMenu}
|
|
3822
3830
|
voiceEnabled
|
|
3823
|
-
toolbarSlot={
|
|
3831
|
+
toolbarSlot={
|
|
3832
|
+
<>
|
|
3833
|
+
{props.selectedEngine === CHATGPT_SUBSCRIPTION_ENGINE_NAME ? (
|
|
3834
|
+
<span className="inline-flex items-center gap-2 text-[11px] text-muted-foreground">
|
|
3835
|
+
<span>{t("agentChat.composer.chatgptPlanUsing")}</span>
|
|
3836
|
+
<a
|
|
3837
|
+
href="https://chatgpt.com/settings/usage"
|
|
3838
|
+
target="_blank"
|
|
3839
|
+
rel="noreferrer"
|
|
3840
|
+
className="font-medium text-foreground underline-offset-2 hover:underline"
|
|
3841
|
+
>
|
|
3842
|
+
{t("agentChat.composer.chatgptManageUsage")}
|
|
3843
|
+
</a>
|
|
3844
|
+
</span>
|
|
3845
|
+
) : null}
|
|
3846
|
+
{props.composerToolbarSlot}
|
|
3847
|
+
</>
|
|
3848
|
+
}
|
|
3824
3849
|
extraActionButton={props.composerExtraActionButton}
|
|
3825
3850
|
includeDefaultSlashCommands
|
|
3826
3851
|
includeDefaultSlashSkills
|
|
@@ -4068,14 +4093,25 @@ function AgentKitTool({ value, active }: AgentKitRenderProps<AgentToolCall>) {
|
|
|
4068
4093
|
const surface = useAgentKitSurface();
|
|
4069
4094
|
const metadata = value.metadata ?? {};
|
|
4070
4095
|
const input = asRecord(value.input) ?? {};
|
|
4096
|
+
const errorOutput =
|
|
4097
|
+
value.status === "failed"
|
|
4098
|
+
? Array.from(
|
|
4099
|
+
new Set(
|
|
4100
|
+
[
|
|
4101
|
+
value.error?.message?.trim(),
|
|
4102
|
+
formatErrorDetails(value.error?.details),
|
|
4103
|
+
formatErrorDetails(value.output),
|
|
4104
|
+
].filter((detail): detail is string => Boolean(detail?.trim())),
|
|
4105
|
+
),
|
|
4106
|
+
).join("\n\n") || undefined
|
|
4107
|
+
: undefined;
|
|
4071
4108
|
const output =
|
|
4072
|
-
|
|
4073
|
-
|
|
4074
|
-
|
|
4075
|
-
|
|
4076
|
-
|
|
4077
|
-
|
|
4078
|
-
: JSON.stringify(value.output);
|
|
4109
|
+
errorOutput ??
|
|
4110
|
+
(typeof value.output === "string"
|
|
4111
|
+
? value.output
|
|
4112
|
+
: value.output === undefined
|
|
4113
|
+
? undefined
|
|
4114
|
+
: JSON.stringify(value.output));
|
|
4079
4115
|
return (
|
|
4080
4116
|
<ChatRunningContext.Provider
|
|
4081
4117
|
value={active === true || value.status === "running"}
|
|
@@ -4324,19 +4360,11 @@ function AgentKitRunFailure({
|
|
|
4324
4360
|
const value = retryMetadata?.[key] ?? retryCustomMetadata?.[key];
|
|
4325
4361
|
return typeof value === "string" && value.trim() ? value : undefined;
|
|
4326
4362
|
};
|
|
4327
|
-
const
|
|
4328
|
-
lastUserMessage?.parts.
|
|
4329
|
-
|
|
4330
|
-
|
|
4331
|
-
|
|
4332
|
-
type: "file",
|
|
4333
|
-
name: part.name,
|
|
4334
|
-
...(part.mediaType ? { contentType: part.mediaType } : {}),
|
|
4335
|
-
...(part.url ? { url: part.url } : {}),
|
|
4336
|
-
},
|
|
4337
|
-
]
|
|
4338
|
-
: [],
|
|
4339
|
-
) ?? [];
|
|
4363
|
+
const retryFileParts =
|
|
4364
|
+
lastUserMessage?.parts.filter((part) => part.type === "file") ?? [];
|
|
4365
|
+
const retryHasUnavailableAttachment = retryFileParts.some(
|
|
4366
|
+
(part) => !part.url && !part.fileId,
|
|
4367
|
+
);
|
|
4340
4368
|
const retryReferences = Array.isArray(retryMetadata?.references)
|
|
4341
4369
|
? (retryMetadata.references as Reference[])
|
|
4342
4370
|
: [];
|
|
@@ -4352,7 +4380,7 @@ function AgentKitRunFailure({
|
|
|
4352
4380
|
retryText || "Please retry the last request.",
|
|
4353
4381
|
"retry",
|
|
4354
4382
|
undefined,
|
|
4355
|
-
|
|
4383
|
+
retryFileParts,
|
|
4356
4384
|
retryReferences,
|
|
4357
4385
|
{
|
|
4358
4386
|
recoveryModel: metadataString("model"),
|
|
@@ -4364,6 +4392,7 @@ function AgentKitRunFailure({
|
|
|
4364
4392
|
},
|
|
4365
4393
|
)
|
|
4366
4394
|
}
|
|
4395
|
+
retryHasUnavailableAttachment={retryHasUnavailableAttachment}
|
|
4367
4396
|
onFork={async () => {
|
|
4368
4397
|
if (!lastUserMessage) return surface.props.onForkChat?.();
|
|
4369
4398
|
const fork = await control.fork(lastUserMessage.id);
|
|
@@ -4383,6 +4412,12 @@ function AgentKitConnectionError({
|
|
|
4383
4412
|
recoveryError,
|
|
4384
4413
|
}: AgentConnectionErrorRenderProps) {
|
|
4385
4414
|
const t = useT();
|
|
4415
|
+
const surface = useAgentKitSurface();
|
|
4416
|
+
const chatGPTPlanUsageError =
|
|
4417
|
+
surface.props.selectedEngine === CHATGPT_SUBSCRIPTION_ENGINE_NAME &&
|
|
4418
|
+
`${error.code} ${error.message}`.match(
|
|
4419
|
+
/subscription_sharing_usage_limit_(exceeded|unavailable)/,
|
|
4420
|
+
)?.[1];
|
|
4386
4421
|
return (
|
|
4387
4422
|
<div
|
|
4388
4423
|
className="rounded-md border border-border px-3 py-2 text-xs text-muted-foreground"
|
|
@@ -4393,7 +4428,27 @@ function AgentKitConnectionError({
|
|
|
4393
4428
|
<strong className="mr-2 font-medium text-foreground">
|
|
4394
4429
|
{t("agentChat.error.failed")}
|
|
4395
4430
|
</strong>
|
|
4396
|
-
|
|
4431
|
+
{chatGPTPlanUsageError ? (
|
|
4432
|
+
<>
|
|
4433
|
+
<span>
|
|
4434
|
+
{t(
|
|
4435
|
+
chatGPTPlanUsageError === "exceeded"
|
|
4436
|
+
? "agentChat.error.chatgptPlanUsageLimit"
|
|
4437
|
+
: "agentChat.error.chatgptPlanUsageUnavailable",
|
|
4438
|
+
)}
|
|
4439
|
+
</span>
|
|
4440
|
+
<a
|
|
4441
|
+
href="https://chatgpt.com/settings/usage"
|
|
4442
|
+
target="_blank"
|
|
4443
|
+
rel="noreferrer"
|
|
4444
|
+
className="ml-3 font-medium text-foreground underline-offset-2 hover:underline"
|
|
4445
|
+
>
|
|
4446
|
+
{t("agentChat.composer.chatgptManageUsage")}
|
|
4447
|
+
</a>
|
|
4448
|
+
</>
|
|
4449
|
+
) : (
|
|
4450
|
+
<span>{formatAgentKitErrorText(error, t)}</span>
|
|
4451
|
+
)}
|
|
4397
4452
|
{error.retryable ? (
|
|
4398
4453
|
<button
|
|
4399
4454
|
type="button"
|
|
@@ -308,6 +308,15 @@ describe("AgentPanel header tab visibility", () => {
|
|
|
308
308
|
).toBe(true);
|
|
309
309
|
});
|
|
310
310
|
|
|
311
|
+
it("can keep the page history menu visible for an empty chat", () => {
|
|
312
|
+
expect(
|
|
313
|
+
shouldShowAgentPanelPageHeader([chatTab("main")], "main", 0, true),
|
|
314
|
+
).toBe(true);
|
|
315
|
+
expect(
|
|
316
|
+
shouldShowAgentPanelPageNewChatButton([chatTab("main")], "main", 0),
|
|
317
|
+
).toBe(false);
|
|
318
|
+
});
|
|
319
|
+
|
|
311
320
|
it("keeps new chat out of the page canvas header by default", () => {
|
|
312
321
|
expect(
|
|
313
322
|
shouldDefaultAgentChatSurfacePageNewChatButton("page", undefined),
|
|
@@ -414,12 +414,18 @@ export function shouldShowAgentPanelPageHeader(
|
|
|
414
414
|
tabs: MultiTabAssistantChatHeaderProps["tabs"],
|
|
415
415
|
activeTabId: string,
|
|
416
416
|
activeTabMessageCount: number,
|
|
417
|
+
showWhenEmpty = false,
|
|
417
418
|
) {
|
|
418
419
|
if (!activeTabId) return false;
|
|
419
420
|
if (activeTabMessageCount > 0) return true;
|
|
420
421
|
|
|
421
422
|
const activeTab = tabs.find((tab) => tab.id === activeTabId);
|
|
422
|
-
return
|
|
423
|
+
return Boolean(
|
|
424
|
+
activeTab &&
|
|
425
|
+
(showWhenEmpty ||
|
|
426
|
+
activeTab.status === "running" ||
|
|
427
|
+
activeTab.status === "completed"),
|
|
428
|
+
);
|
|
423
429
|
}
|
|
424
430
|
|
|
425
431
|
export function shouldShowAgentPanelCliTabBar(cliTabs: string[]) {
|
|
@@ -637,6 +643,7 @@ export interface AgentPanelProps extends Omit<
|
|
|
637
643
|
showTabBar?: boolean;
|
|
638
644
|
showPageNewChatButton?: boolean;
|
|
639
645
|
showPageHeader?: boolean;
|
|
646
|
+
showPageHeaderWhenEmpty?: boolean;
|
|
640
647
|
pageHeaderLeadingSlot?: React.ReactNode;
|
|
641
648
|
pageToolbarSlot?: React.ReactNode;
|
|
642
649
|
onPageHeaderVisibilityChange?: (visible: boolean) => void;
|
|
@@ -822,6 +829,7 @@ function AgentPanelInner({
|
|
|
822
829
|
showTabBar = true,
|
|
823
830
|
showPageNewChatButton = false,
|
|
824
831
|
showPageHeader = false,
|
|
832
|
+
showPageHeaderWhenEmpty = false,
|
|
825
833
|
pageHeaderLeadingSlot,
|
|
826
834
|
pageToolbarSlot,
|
|
827
835
|
onPageHeaderVisibilityChange,
|
|
@@ -1713,6 +1721,7 @@ function AgentPanelInner({
|
|
|
1713
1721
|
tabs,
|
|
1714
1722
|
activeTabId,
|
|
1715
1723
|
activeTabMessageCount,
|
|
1724
|
+
showPageHeaderWhenEmpty,
|
|
1716
1725
|
);
|
|
1717
1726
|
const canShareActiveTab =
|
|
1718
1727
|
activeTab && (activeTabMessageCount > 0 || activeTab.status !== "idle");
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// @vitest-environment happy-dom
|
|
2
2
|
|
|
3
|
+
import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "@agent-native/core/agent/chatgpt-subscription-contract";
|
|
3
4
|
import {
|
|
4
5
|
AGENT_CHAT_SUBMIT_RESULT_EVENT,
|
|
5
6
|
AGENT_CHAT_CONTEXT_CHANGED_EVENT,
|
|
@@ -252,6 +253,26 @@ function stubCatalog(
|
|
|
252
253
|
);
|
|
253
254
|
}
|
|
254
255
|
|
|
256
|
+
function chatgptCatalog(model: string) {
|
|
257
|
+
const groups = buildChatModelGroups({
|
|
258
|
+
engines: [
|
|
259
|
+
{
|
|
260
|
+
name: CHATGPT_SUBSCRIPTION_ENGINE_NAME,
|
|
261
|
+
label: "ChatGPT plan access",
|
|
262
|
+
supportedModels: [model],
|
|
263
|
+
requiredEnvVars: [],
|
|
264
|
+
configured: true,
|
|
265
|
+
},
|
|
266
|
+
],
|
|
267
|
+
});
|
|
268
|
+
return {
|
|
269
|
+
state: "available" as const,
|
|
270
|
+
groups,
|
|
271
|
+
defaultModel: model,
|
|
272
|
+
loadLiveGroups: async () => null,
|
|
273
|
+
};
|
|
274
|
+
}
|
|
275
|
+
|
|
255
276
|
async function mountWithCatalog(
|
|
256
277
|
engines: unknown[],
|
|
257
278
|
configuredKeys: string[],
|
|
@@ -303,7 +324,11 @@ vi.mock("./AgentKitAssistantChat.js", async () => {
|
|
|
303
324
|
selectedModel?: string;
|
|
304
325
|
selectedEngine?: string;
|
|
305
326
|
selectedEffort?: string;
|
|
306
|
-
availableModels?: Array<{
|
|
327
|
+
availableModels?: Array<{
|
|
328
|
+
engine: string;
|
|
329
|
+
configured: boolean;
|
|
330
|
+
models?: string[];
|
|
331
|
+
}>;
|
|
307
332
|
composerDisabled?: boolean;
|
|
308
333
|
composerDisabledPlaceholder?: string;
|
|
309
334
|
isActiveComposer?: boolean;
|
|
@@ -342,6 +367,9 @@ vi.mock("./AgentKitAssistantChat.js", async () => {
|
|
|
342
367
|
data-model-catalog={props.availableModels
|
|
343
368
|
?.map((group) => `${group.engine}:${group.configured}`)
|
|
344
369
|
.join(",")}
|
|
370
|
+
data-model-options={props.availableModels
|
|
371
|
+
?.flatMap((group) => group.models ?? [])
|
|
372
|
+
.join(",")}
|
|
345
373
|
data-composer-disabled={props.composerDisabled ? "true" : "false"}
|
|
346
374
|
data-composer-submission-disabled={
|
|
347
375
|
props.composerSubmissionDisabled ? "true" : "false"
|
|
@@ -991,6 +1019,92 @@ describe("MultiTabAssistantChat postMessage bridge", () => {
|
|
|
991
1019
|
await view.cleanup();
|
|
992
1020
|
});
|
|
993
1021
|
|
|
1022
|
+
it("reconciles a saved ChatGPT model with the selected account catalog", async () => {
|
|
1023
|
+
window.localStorage.setItem(
|
|
1024
|
+
"agent-native:chat-models:selection:catalog-test",
|
|
1025
|
+
JSON.stringify({
|
|
1026
|
+
model: "model-from-previous-account",
|
|
1027
|
+
engine: CHATGPT_SUBSCRIPTION_ENGINE_NAME,
|
|
1028
|
+
}),
|
|
1029
|
+
);
|
|
1030
|
+
const view = await mountWithCatalog(
|
|
1031
|
+
[
|
|
1032
|
+
{
|
|
1033
|
+
name: CHATGPT_SUBSCRIPTION_ENGINE_NAME,
|
|
1034
|
+
label: "ChatGPT plan access",
|
|
1035
|
+
supportedModels: ["model-on-current-account"],
|
|
1036
|
+
configured: true,
|
|
1037
|
+
requiredEnvVars: [],
|
|
1038
|
+
},
|
|
1039
|
+
],
|
|
1040
|
+
[],
|
|
1041
|
+
);
|
|
1042
|
+
|
|
1043
|
+
expect(view.engineOf()).toBe(CHATGPT_SUBSCRIPTION_ENGINE_NAME);
|
|
1044
|
+
expect(view.modelOf()).toBe("model-on-current-account");
|
|
1045
|
+
await view.cleanup();
|
|
1046
|
+
});
|
|
1047
|
+
|
|
1048
|
+
it("keeps the selected account catalog when an older ChatGPT read finishes late", async () => {
|
|
1049
|
+
await act(async () => root.unmount());
|
|
1050
|
+
stubCatalog([], []);
|
|
1051
|
+
modelCatalogMocks.load = async () =>
|
|
1052
|
+
chatgptCatalog("model-from-previous-account");
|
|
1053
|
+
|
|
1054
|
+
root = createRoot(container);
|
|
1055
|
+
await act(async () => {
|
|
1056
|
+
root.render(<MultiTabAssistantChat storageKey="bridge-test" />);
|
|
1057
|
+
await Promise.resolve();
|
|
1058
|
+
await Promise.resolve();
|
|
1059
|
+
});
|
|
1060
|
+
expect(
|
|
1061
|
+
container
|
|
1062
|
+
.querySelector("[data-testid='assistant-chat']")
|
|
1063
|
+
?.getAttribute("data-model-options"),
|
|
1064
|
+
).toBe("model-from-previous-account");
|
|
1065
|
+
|
|
1066
|
+
const pendingCatalogs: Array<(value: unknown) => void> = [];
|
|
1067
|
+
modelCatalogMocks.load = () =>
|
|
1068
|
+
new Promise((resolve) => pendingCatalogs.push(resolve));
|
|
1069
|
+
|
|
1070
|
+
act(() => {
|
|
1071
|
+
window.dispatchEvent(new Event("agent-engine:configured-changed"));
|
|
1072
|
+
});
|
|
1073
|
+
expect(pendingCatalogs).toHaveLength(1);
|
|
1074
|
+
expect(
|
|
1075
|
+
container
|
|
1076
|
+
.querySelector("[data-testid='assistant-chat']")
|
|
1077
|
+
?.getAttribute("data-model-options"),
|
|
1078
|
+
).toBe("");
|
|
1079
|
+
|
|
1080
|
+
act(() => {
|
|
1081
|
+
window.dispatchEvent(new Event("agent-engine:configured-changed"));
|
|
1082
|
+
});
|
|
1083
|
+
expect(pendingCatalogs).toHaveLength(2);
|
|
1084
|
+
|
|
1085
|
+
await act(async () => {
|
|
1086
|
+
pendingCatalogs[1](chatgptCatalog("model-on-selected-account"));
|
|
1087
|
+
await Promise.resolve();
|
|
1088
|
+
await Promise.resolve();
|
|
1089
|
+
});
|
|
1090
|
+
expect(
|
|
1091
|
+
container
|
|
1092
|
+
.querySelector("[data-testid='assistant-chat']")
|
|
1093
|
+
?.getAttribute("data-model-options"),
|
|
1094
|
+
).toBe("model-on-selected-account");
|
|
1095
|
+
|
|
1096
|
+
await act(async () => {
|
|
1097
|
+
pendingCatalogs[0](chatgptCatalog("model-from-superseded-read"));
|
|
1098
|
+
await Promise.resolve();
|
|
1099
|
+
await Promise.resolve();
|
|
1100
|
+
});
|
|
1101
|
+
expect(
|
|
1102
|
+
container
|
|
1103
|
+
.querySelector("[data-testid='assistant-chat']")
|
|
1104
|
+
?.getAttribute("data-model-options"),
|
|
1105
|
+
).toBe("model-on-selected-account");
|
|
1106
|
+
});
|
|
1107
|
+
|
|
994
1108
|
it("applies a submitted model override sent without an engine", () => {
|
|
995
1109
|
act(() => {
|
|
996
1110
|
dispatchSubmitChat({
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { AgentChatAttachment } from "@agent-native/core";
|
|
2
|
+
import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "@agent-native/core/agent/chatgpt-subscription-contract";
|
|
2
3
|
import type { AgentChatMessage } from "@agent-native/core/client/agent-chat";
|
|
3
4
|
import {
|
|
4
5
|
DEFAULT_MODEL,
|
|
@@ -243,7 +244,10 @@ function resolveModelSelection(
|
|
|
243
244
|
const fallbackGroup = matchingConfiguredGroup ?? fallbackConfiguredGroup;
|
|
244
245
|
const engine = suppliedEngineGroup?.engine ?? fallbackGroup?.engine;
|
|
245
246
|
const model = suppliedEngineGroup
|
|
246
|
-
?
|
|
247
|
+
? suppliedEngineGroup.engine === CHATGPT_SUBSCRIPTION_ENGINE_NAME &&
|
|
248
|
+
!suppliedEngineGroup.models.includes(selection.model)
|
|
249
|
+
? suppliedEngineGroup.models[0]
|
|
250
|
+
: selection.model
|
|
247
251
|
: matchingConfiguredGroup?.models.includes(selection.model)
|
|
248
252
|
? selection.model
|
|
249
253
|
: fallbackGroup?.models[0];
|
|
@@ -1153,6 +1157,7 @@ export function MultiTabAssistantChat({
|
|
|
1153
1157
|
? (hostModelListLoading ?? false)
|
|
1154
1158
|
: discoveredModelsLoading;
|
|
1155
1159
|
const [defaultModel, setDefaultModel] = useState<string>(DEFAULT_MODEL);
|
|
1160
|
+
const engineCatalogRequestRef = useRef(0);
|
|
1156
1161
|
const threadModelRef = useRef<
|
|
1157
1162
|
Map<string, { model: string; engine?: string; effort?: ReasoningEffort }>
|
|
1158
1163
|
>(new Map());
|
|
@@ -1387,9 +1392,18 @@ export function MultiTabAssistantChat({
|
|
|
1387
1392
|
|
|
1388
1393
|
const refreshEngines = useCallback(() => {
|
|
1389
1394
|
if (hostManagedModels) return;
|
|
1395
|
+
const requestId = ++engineCatalogRequestRef.current;
|
|
1396
|
+
const isCurrentRequest = () =>
|
|
1397
|
+
requestId === engineCatalogRequestRef.current;
|
|
1398
|
+
setDiscoveredModels((groups) =>
|
|
1399
|
+
groups.filter(
|
|
1400
|
+
(group) => group.engine !== CHATGPT_SUBSCRIPTION_ENGINE_NAME,
|
|
1401
|
+
),
|
|
1402
|
+
);
|
|
1390
1403
|
setModelListLoading(true);
|
|
1391
1404
|
loadChatModelCatalog()
|
|
1392
1405
|
.then((catalog) => {
|
|
1406
|
+
if (!isCurrentRequest()) return;
|
|
1393
1407
|
if (catalog.state !== "available") {
|
|
1394
1408
|
if (catalog.enginesUnavailable) {
|
|
1395
1409
|
// Leaves `availableModels` empty for the session, so an override
|
|
@@ -1403,21 +1417,27 @@ export function MultiTabAssistantChat({
|
|
|
1403
1417
|
setDiscoveredModels(catalog.groups);
|
|
1404
1418
|
setDefaultModel(catalog.defaultModel);
|
|
1405
1419
|
void catalog.loadLiveGroups().then((liveGroups) => {
|
|
1406
|
-
if (
|
|
1420
|
+
if (isCurrentRequest() && liveGroups) {
|
|
1421
|
+
setDiscoveredModels(liveGroups);
|
|
1422
|
+
}
|
|
1407
1423
|
});
|
|
1408
1424
|
})
|
|
1409
1425
|
.catch(() => {})
|
|
1410
|
-
.finally(() =>
|
|
1426
|
+
.finally(() => {
|
|
1427
|
+
if (isCurrentRequest()) setModelListLoading(false);
|
|
1428
|
+
});
|
|
1411
1429
|
}, [hostManagedModels]);
|
|
1412
1430
|
|
|
1413
1431
|
useEffect(() => {
|
|
1414
1432
|
refreshEngines();
|
|
1415
1433
|
window.addEventListener("agent-engine:configured-changed", refreshEngines);
|
|
1416
|
-
return () =>
|
|
1434
|
+
return () => {
|
|
1417
1435
|
window.removeEventListener(
|
|
1418
1436
|
"agent-engine:configured-changed",
|
|
1419
1437
|
refreshEngines,
|
|
1420
1438
|
);
|
|
1439
|
+
engineCatalogRequestRef.current += 1;
|
|
1440
|
+
};
|
|
1421
1441
|
}, [refreshEngines]);
|
|
1422
1442
|
|
|
1423
1443
|
// Parent-child thread mapping — persisted to localStorage.
|