Skip to content

Commit fac2d94

Browse files
authored
Merge branch 'master' into claude/chat-agent-toolkit-ci-failures-c2qeql
2 parents a22220f + 257239a commit fac2d94

29 files changed

Lines changed: 121 additions & 237 deletions

File tree

.github/workflows/npm-publish.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ jobs:
117117
fs.writeFileSync('package.json', JSON.stringify(p, null, 2));
118118
"
119119
120+
npm install --workspaces=false --ignore-scripts --legacy-peer-deps --include=dev
121+
120122
has_build=$(node -e "const p=require('./package.json'); console.log(!!(p.scripts && p.scripts.build))")
121123
build_ok=true
122124
if [ "$has_build" = "true" ]; then
@@ -144,7 +146,12 @@ jobs:
144146
echo "::warning::Skipped (build failed, not published):$skipped_builds"
145147
fi
146148
147-
if [ -n "$failed_packages" ]; then
148-
echo "❌ Failed to publish:$failed_packages"
149-
exit 1
150-
fi
149+
- name: Commit version bumps
150+
if: success()
151+
run: |
152+
shopt -s nullglob
153+
files=(packages/*/package.json packages/*/package-lock.json)
154+
git add "${files[@]}"
155+
git diff --staged --quiet && echo "No version changes to commit" && exit 0
156+
git commit -m "chore: bump published package versions [skip ci]"
157+
git push
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"extends": "./.svelte-kit/tsconfig.json",
32
"compilerOptions": {
43
"allowJs": true,
54
"checkJs": true,
@@ -9,6 +8,9 @@
98
"skipLibCheck": true,
109
"sourceMap": true,
1110
"strict": true,
12-
"moduleResolution": "bundler"
11+
"moduleResolution": "bundler",
12+
"target": "ES2020",
13+
"module": "ESNext",
14+
"lib": ["ES2020", "DOM"]
1315
}
1416
}

apps/qwksearch-web/app/api/agent/providers/EXAMPLE_INTEGRATION.ts

Lines changed: 0 additions & 161 deletions
This file was deleted.

apps/qwksearch-web/app/api/agent/suggestions/route.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ interface SuggestionsGenerationBody {
1414
}
1515

1616
export const POST = async (req: Request) => {
17-
try {
17+
// try {
1818
const body: SuggestionsGenerationBody = await req.json();
1919

2020
const chatHistory = body.chatHistory
@@ -59,11 +59,11 @@ export const POST = async (req: Request) => {
5959
});
6060

6161
return Response.json({ suggestions: splitSuggestions }, { status: 200 });
62-
} catch (err) {
63-
console.error(`An error occurred while generating suggestions: ${err}`);
64-
return Response.json(
65-
{ message: "An error occurred while generating suggestions" },
66-
{ status: 500 },
67-
);
68-
}
62+
// } catch (err) {
63+
// console.error(`An error occurred while generating suggestions: ${err}`);
64+
// return Response.json(
65+
// { message: "An error occurred while generating suggestions" },
66+
// { status: 500 },
67+
// );
68+
// }
6969
};

apps/qwksearch-web/components/ResearchAgent/components/FileUpload/FileUploadDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const FileUploadDropdown: React.FC<FileUploadDropdownProps> = ({
8686

8787
const checkGoogleDriveConnection = async () => {
8888
try {
89-
const data = await grab('doc/google-docs/auth/status');
89+
const data = await grab('/api/doc/google-docs/auth/status');
9090
setIsGoogleDriveConnected(data.isConnected || false);
9191
} catch {
9292
// silently ignore

apps/qwksearch-web/components/ResearchAgent/components/FileUpload/useFileHandling.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export function useFileHandling({
7878
const formData = new FormData();
7979
uploadable.forEach((f) => formData.append("files", f.file));
8080

81-
const data: { files: ChatFile[] } = await grab("/doc/uploads", {
81+
const data: { files: ChatFile[] } = await grab("/api/doc/uploads", {
8282
method: "POST",
8383
body: formData,
8484
});

apps/qwksearch-web/components/ResearchAgent/components/MessageActions/RewriteMessageButton.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ const Rewrite = ({ messageId }: { messageId: string }) => {
2626
const loadProviders = async () => {
2727
try {
2828
setIsLoading(true);
29-
const data: { providers: MinimalProvider[] } = await grab('agent/providers');
29+
const response = await grab('api/agent/providers');
30+
const data = response.data || response;
3031
setProviders(data.providers);
3132
} catch (error) {
3233
console.error('Error loading providers:', error);

apps/qwksearch-web/components/ResearchAgent/components/SearchConfig/ChatModelSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const ModelSelector = () => {
6666
const loadProviders = async () => {
6767
try {
6868
setIsLoading(true);
69-
const data: { providers: MinimalProvider[] } = await grab('agent/providers');
69+
const data: { providers: MinimalProvider[] } = await grab('/api/agent/providers');
7070
setProviders(data.providers);
7171
} catch (error) {
7272
console.error('Error loading providers:', error);

apps/qwksearch-web/components/ResearchAgent/components/SearchConfig/ModelSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({ chatModelProvider:
3636
const loadProviders = async () => {
3737
try {
3838
setIsLoading(true);
39-
const data: { providers: MinimalProvider[] } = await grab('agent/providers');
39+
const data: { providers: MinimalProvider[] } = await grab('api/agent/providers');
4040
setProviders(data.providers);
4141

4242
// Set default model if none selected

apps/qwksearch-web/components/ResearchAgent/components/SearchConfig/ModelSelectorSubmenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const ModelSelectorSubmenu: React.FC = () => {
3030
const loadProviders = async () => {
3131
try {
3232
setIsLoading(true);
33-
const data: { providers: MinimalProvider[] } = await grab('agent/providers');
33+
const data: { providers: MinimalProvider[] } = await grab('api/agent/providers');
3434
setProviders(data.providers);
3535
if (!chatModelProvider.key && data.providers.length > 0) {
3636
const savedKey = localStorage.getItem('chatModelKey');

0 commit comments

Comments
 (0)