Skip to content

Commit 15090ed

Browse files
committed
Resolve Svelte 5 compatibility issues and complete merge conflict resolution
- Fixed SCSS mixin syntax incompatibility in Tooltip component - Converted JavaScript-style CSS comments to CSS comments - Updated Svelte 5 API usage in svelma components - Resolved current_component import issues - Fixed Bulma import paths and missing _all.scss file - Updated vite.config.ts for Svelte 5 runtime structure - Frontend build now successful with Svelte 5 All 48 merge conflicts from PR #216 have been resolved. Novel Editor autocomplete feature preserved and functional.
1 parent 0ad7ecd commit 15090ed

42 files changed

Lines changed: 283 additions & 7471 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/claude-code-review.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ jobs:
1818
# github.event.pull_request.user.login == 'new-developer' ||
1919
# github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
2020

21-
<<<<<<< HEAD
22-
runs-on: ubuntu-latest
23-
=======
2421
runs-on: [self-hosted, linux, bigbox]
25-
>>>>>>> origin/main
2622
permissions:
2723
contents: read
2824
pull-requests: read

.github/workflows/frontend-build.yml

Lines changed: 15 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -7,127 +7,27 @@ on:
77
description: 'Node.js version'
88
required: false
99
type: string
10-
<<<<<<< HEAD
11-
default: '20'
12-
working-directory:
13-
description: 'Working directory for the frontend build'
14-
=======
1510
default: '18'
1611
cache-key:
1712
description: 'Cache key for dependencies'
18-
>>>>>>> origin/main
1913
required: false
2014
type: string
21-
default: 'desktop'
22-
build-command:
23-
description: 'Build command to run'
24-
required: false
25-
type: string
26-
default: 'yarn build'
27-
test-command:
28-
description: 'Test command to run'
29-
required: false
30-
type: string
31-
default: 'yarn test'
32-
check-command:
33-
description: 'Type check command to run'
34-
required: false
35-
type: string
36-
default: 'yarn check'
3715
outputs:
38-
build-success:
39-
description: 'Whether the build was successful'
40-
value: ${{ steps.build.outcome }}
41-
test-success:
42-
description: 'Whether the tests passed'
43-
value: ${{ steps.test.outcome }}
44-
check-success:
45-
description: 'Whether the type check passed'
46-
value: ${{ steps.check.outcome }}
16+
dist-path:
17+
description: 'Path to built frontend dist'
18+
value: ${{ jobs.build.outputs.dist-path }}
4719

4820
jobs:
49-
<<<<<<< HEAD
50-
frontend-build:
51-
runs-on: ubuntu-latest
52-
53-
=======
5421
build:
5522
runs-on: [self-hosted, linux, bigbox]
5623
timeout-minutes: 20 # Reduced timeout with faster runner
5724
outputs:
5825
dist-path: ${{ steps.build.outputs.dist-path }}
5926

60-
>>>>>>> origin/main
6127
steps:
62-
- name: Checkout code
63-
uses: actions/checkout@v4
64-
65-
<<<<<<< HEAD
66-
- name: Setup Node.js
67-
uses: actions/setup-node@v4
68-
with:
69-
node-version: ${{ inputs.node-version }}
70-
cache: 'yarn'
71-
cache-dependency-path: ${{ inputs.working-directory }}/yarn.lock
72-
73-
- name: Install dependencies
74-
working-directory: ${{ inputs.working-directory }}
75-
run: yarn install --frozen-lockfile
76-
77-
- name: Type check
78-
id: check
79-
working-directory: ${{ inputs.working-directory }}
80-
run: ${{ inputs.check-command }}
81-
82-
- name: Run tests
83-
id: test
84-
working-directory: ${{ inputs.working-directory }}
85-
run: ${{ inputs.test-command }}
28+
- name: Checkout code
29+
uses: actions/checkout@v5
8630

87-
- name: Build frontend
88-
id: build
89-
working-directory: ${{ inputs.working-directory }}
90-
run: ${{ inputs.build-command }}
91-
92-
- name: Upload build artifacts
93-
uses: actions/upload-artifact@v4
94-
if: success()
95-
with:
96-
name: frontend-build-${{ github.run_id }}
97-
path: ${{ inputs.working-directory }}/dist/
98-
retention-days: 7
99-
100-
frontend-build-matrix:
101-
runs-on: ubuntu-latest
102-
if: inputs.node-version == 'matrix'
103-
104-
strategy:
105-
matrix:
106-
node-version: [18, 20, 22]
107-
108-
steps:
109-
- name: Checkout code
110-
uses: actions/checkout@v4
111-
112-
- name: Setup Node.js ${{ matrix.node-version }}
113-
uses: actions/setup-node@v4
114-
with:
115-
node-version: ${{ matrix.node-version }}
116-
cache: 'yarn'
117-
cache-dependency-path: ${{ inputs.working-directory }}/yarn.lock
118-
119-
- name: Install dependencies
120-
working-directory: ${{ inputs.working-directory }}
121-
run: yarn install --frozen-lockfile
122-
123-
- name: Type check
124-
working-directory: ${{ inputs.working-directory }}
125-
run: ${{ inputs.check-command }}
126-
127-
- name: Run tests
128-
working-directory: ${{ inputs.working-directory }}
129-
run: ${{ inputs.test-command }}
130-
=======
13131
- name: Setup Node.js
13232
uses: actions/setup-node@v5
13333
with:
@@ -192,16 +92,15 @@ jobs:
19292
echo '<html><body><h1>Build Failed</h1></body></html>' > desktop/dist/index.html
19393
echo "dist-path=desktop/dist" >> $GITHUB_OUTPUT
19494
fi
195-
>>>>>>> origin/main
19695
197-
- name: Build frontend
198-
working-directory: ${{ inputs.working-directory }}
199-
run: ${{ inputs.build-command }}
96+
- name: Upload frontend artifacts
97+
uses: actions/upload-artifact@v4
98+
with:
99+
name: frontend-dist
100+
path: desktop/dist
101+
retention-days: 30
200102

201-
- name: Upload build artifacts
202-
uses: actions/upload-artifact@v4
203-
if: success()
204-
with:
205-
name: frontend-build-node-${{ matrix.node-version }}-${{ github.run_id }}
206-
path: ${{ inputs.working-directory }}/dist/
207-
retention-days: 7
103+
- name: Verify build output
104+
run: |
105+
ls -la desktop/dist
106+
echo "Frontend build completed successfully"

.github/workflows/vm-execution-tests.yml

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,8 @@ env:
2929
jobs:
3030
unit-tests:
3131
name: Unit Tests
32-
<<<<<<< HEAD
33-
runs-on: ubuntu-latest
34-
timeout-minutes: 15
35-
=======
3632
runs-on: [self-hosted, linux, bigbox]
3733
timeout-minutes: 10
38-
>>>>>>> origin/main
3934

4035
steps:
4136
- name: Platform check
@@ -98,13 +93,8 @@ jobs:
9893

9994
integration-tests:
10095
name: Integration Tests
101-
<<<<<<< HEAD
102-
runs-on: ubuntu-latest
103-
timeout-minutes: 30
104-
=======
10596
runs-on: [self-hosted, linux, bigbox]
10697
timeout-minutes: 15
107-
>>>>>>> origin/main
10898

10999
services:
110100
redis:
@@ -242,8 +232,6 @@ jobs:
242232
${{ runner.os }}-cargo-websocket-
243233
${{ runner.os }}-cargo-
244234
245-
<<<<<<< HEAD
246-
=======
247235
- name: Check if fcctl-web exists
248236
id: check_fcctl_websocket
249237
run: |
@@ -254,7 +242,6 @@ jobs:
254242
echo "⚠️ fcctl-web not found - skipping WebSocket tests (experimental code is gitignored)"
255243
fi
256244
257-
>>>>>>> origin/main
258245
- name: Build and start fcctl-web
259246
if: steps.check_fcctl_websocket.outputs.exists == 'true'
260247
run: |
@@ -280,13 +267,10 @@ jobs:
280267
--ignored \
281268
-- --nocapture
282269
283-
<<<<<<< HEAD
284-
=======
285270
- name: Skip message
286271
if: steps.check_fcctl_websocket.outputs.exists == 'false'
287272
run: echo "✅ Skipping WebSocket tests - fcctl-web experimental code not present (gitignored)"
288273

289-
>>>>>>> origin/main
290274
- name: Stop server
291275
if: always()
292276
run: |
@@ -325,8 +309,6 @@ jobs:
325309
${{ runner.os }}-cargo-e2e-
326310
${{ runner.os }}-cargo-
327311
328-
<<<<<<< HEAD
329-
=======
330312
- name: Check if fcctl-web exists
331313
id: check_fcctl_e2e
332314
run: |
@@ -337,7 +319,6 @@ jobs:
337319
echo "⚠️ fcctl-web not found - skipping E2E tests (experimental code is gitignored)"
338320
fi
339321
340-
>>>>>>> origin/main
341322
- name: Build all components
342323
if: steps.check_fcctl_e2e.outputs.exists == 'true'
343324
run: |
@@ -379,13 +360,10 @@ jobs:
379360
--ignored \
380361
-- --nocapture
381362
382-
<<<<<<< HEAD
383-
=======
384363
- name: Skip message
385364
if: steps.check_fcctl_e2e.outputs.exists == 'false'
386365
run: echo "✅ Skipping E2E tests - fcctl-web experimental code not present (gitignored)"
387366

388-
>>>>>>> origin/main
389367
- name: Stop server
390368
if: always()
391369
run: |
@@ -395,13 +373,8 @@ jobs:
395373
396374
security-tests:
397375
name: Security Tests
398-
<<<<<<< HEAD
399-
runs-on: ubuntu-latest
400-
timeout-minutes: 25
401-
=======
402376
runs-on: [self-hosted, linux, bigbox]
403377
timeout-minutes: 15
404-
>>>>>>> origin/main
405378

406379
steps:
407380
- name: Checkout code
@@ -492,13 +465,8 @@ jobs:
492465
493466
performance-tests:
494467
name: Performance Tests
495-
<<<<<<< HEAD
496-
runs-on: ubuntu-latest
497-
timeout-minutes: 20
498-
=======
499468
runs-on: [self-hosted, linux, bigbox]
500469
timeout-minutes: 10
501-
>>>>>>> origin/main
502470

503471
steps:
504472
- name: Checkout code
@@ -591,13 +559,8 @@ jobs:
591559
592560
test-script:
593561
name: Test Runner Script
594-
<<<<<<< HEAD
595-
runs-on: ubuntu-latest
596-
timeout-minutes: 10
597-
=======
598562
runs-on: [self-hosted, linux, bigbox]
599563
timeout-minutes: 15
600-
>>>>>>> origin/main
601564

602565
steps:
603566
- name: Checkout code
@@ -676,8 +639,6 @@ jobs:
676639
${{ runner.os }}-cargo-coverage-
677640
${{ runner.os }}-cargo-
678641
679-
<<<<<<< HEAD
680-
=======
681642
- name: Check if fcctl-web exists for coverage
682643
id: check_fcctl_coverage
683644
run: |
@@ -688,7 +649,6 @@ jobs:
688649
echo "⚠️ fcctl-web not found - running coverage without integration tests (experimental code is gitignored)"
689650
fi
690651
691-
>>>>>>> origin/main
692652
- name: Run tests with coverage
693653
env:
694654
CARGO_INCREMENTAL: 0
@@ -698,30 +658,6 @@ jobs:
698658
# Unit tests
699659
cargo test -p terraphim_multi_agent vm_execution
700660
701-
<<<<<<< HEAD
702-
# Build fcctl-web
703-
cd scratchpad/firecracker-rust/fcctl-web
704-
cargo build
705-
./target/debug/fcctl-web &
706-
FCCTL_WEB_PID=$!
707-
cd -
708-
709-
# Wait for server
710-
for i in {1..30}; do
711-
if curl -s http://localhost:8080/health > /dev/null 2>&1; then
712-
break
713-
fi
714-
sleep 2
715-
done
716-
717-
# Integration tests (with mock data to avoid needing real VMs)
718-
cd scratchpad/firecracker-rust/fcctl-web
719-
cargo test llm_api_tests || true # Allow failure for coverage
720-
cd -
721-
722-
# Stop server
723-
kill $FCCTL_WEB_PID || true
724-
=======
725661
# Build fcctl-web and run integration tests if available
726662
if [ "${{ steps.check_fcctl_coverage.outputs.exists }}" == "true" ]; then
727663
# Build fcctl-web
@@ -749,7 +685,6 @@ jobs:
749685
else
750686
echo "Skipping fcctl-web integration tests for coverage - experimental code not present"
751687
fi
752-
>>>>>>> origin/main
753688
754689
- name: Generate coverage report
755690
run: |

0 commit comments

Comments
 (0)