Sync dev (#426)

* feat(page): landing page about section (WEB-376) (#419)

* fix(hover-header): rename "Portal" to "Join" and update button classes for better z-index handling

* fix(view-more): update content for clarity by replacing "meta-coordination" with "coordination" in descriptions

* fix(pred-api): only return reply chain context

* feat: services and apps split (#420)

* feat: prediction-swarm app file organization (#422)

* 🔥 removed llhama cpp dependency

* format-fix

* better scheduling

* chore: delete prophet finder

* chore: delete torus allocator

* feat: services renames (#425)

* fix: get paths from turbo

---------

Co-authored-by: Ed. <ed.sdr@outlook.com>
Co-authored-by: PsicoThePato <jmomcontato@gmail.com>
Co-authored-by: PsicoThePato <40248917+PsicoThePato@users.noreply.github.com>
Co-authored-by: kings177 <yanmendesp@gmail.com>

Author: 4 people

.github/ci-config.json

@@ -7,26 +7,18 @@
       "pr_preview": true
     },
     "torus-wallet": {
-      "deploys": [
-        "torus-cache"
-      ],
+      "deploys": ["torus-cache"],
       "pr_preview": true
     },
     "torus-allocator": {
-      "deploys": [
-        "torus-cache",
-        "torus-worker"
-      ],
+      "deploys": ["torus-cache", "torus-worker"],
       "pr_preview": true
     },
     "torus-bridge": {
       "pr_preview": true
     },
     "torus-governance": {
-      "deploys": [
-        "torus-cache",
-        "torus-worker"
-      ],
+      "deploys": ["torus-cache", "torus-worker"],
       "pr_preview": true
     },
     "torus-cache": {
@@ -40,29 +32,29 @@
       "preview_domain": "prophetfinder.com"
     },
     "prediction-swarm": {
-      "deploys": [
-        "torus-swarm-twitter",
-        "torus-swarm-verifier",
-        "swarm-filter"
-      ],
+      "deploys": ["swarm-twitter", "swarm-verifier", "swarm-filter"],
       "pr_preview": true,
       "preview_domain": "predictionswarm.com"
     },
-    "torus-swarm-twitter": {
+    "swarm-twitter": {
       "pr_preview": false,
       "prod_only": true
     },
-    "torus-swarm-verifier": {
+    "swarm-verifier": {
       "pr_preview": false,
       "prod_only": true
     },
     "swarm-filter": {
       "pr_preview": false,
       "prod_only": true
     },
-    "torus-swarm-services": {
+    "swarm-services": {
+      "pr_preview": false,
+      "prod_only": false
+    },
+    "swarm-api": {
       "pr_preview": false,
       "prod_only": false
     }
   }
-}
+}

.github/workflows/app-deployment-template.yml

@@ -6,6 +6,11 @@ on:
       app_name:
         required: true
         type: string
+      app_path:
+        required: false
+        description: "Path to app directory (apps or services)"
+        type: string
+        default: "apps"
       skip_build:
         required: false
         description: "Skip Docker Build"
@@ -61,6 +66,7 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             APP_NAME=${{ inputs.app_name }}
+            APP_PATH=${{ inputs.app_path }}
             TURBO_API=${{ vars.TURBO_API }}
             TURBO_TEAM=${{ vars.TURBO_TEAM }}
             TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
@@ -137,13 +143,13 @@ jobs:
       - name: Deploy application (new tag)
         id: deploy-new
         if: needs.docker-build.result == 'success'
-        working-directory: apps/${{ env.APP_NAME }}
+        working-directory: ${{ inputs.app_path }}/${{ inputs.app_name }}
         run: |
           helmfile sync -e ${ENV_NAME} --set deployment.image.tag=${{ steps.commit.outputs.short }}
 
       - name: Install helm diff plugin
         if: needs.docker-build.result == 'skipped'
-        working-directory: apps/${{ env.APP_NAME }}
+        working-directory: ${{ inputs.app_path }}/${{ inputs.app_name }}
         run: |
           if ! helm plugin list | grep -q '^diff'; then
             helm plugin install https://github.com/databus23/helm-diff
@@ -152,7 +158,7 @@ jobs:
       - name: Deploy application (apply diff only)
         id: deploy-diff
         if: needs.docker-build.result == 'skipped'
-        working-directory: apps/${{ env.APP_NAME }}
+        working-directory: ${{ inputs.app_path }}/${{ inputs.app_name }}
         run: |
           export RELEASE_NAME="$(helmfile -e ${ENV_NAME} list --output json | jq -r '.[].name')"
           export IMAGE_TAG="$(helm get values "${RELEASE_NAME}" -n "${NAMESPACE}" --output json | jq -r '.deployment.image.tag')"

.github/workflows/dry-run-build-template.yml

@@ -7,6 +7,11 @@ on:
       app_name:
         required: true
         type: string
+      app_path:
+        required: false
+        description: "Path to app directory (apps or services)"
+        type: string
+        default: "apps"
 
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.app_name }}-${{ github.ref }}
@@ -64,6 +69,7 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             APP_NAME=${{ inputs.app_name }}
+            APP_PATH=${{ inputs.app_path }}
             TURBO_API=${{ vars.TURBO_API }}
             TURBO_TEAM=${{ vars.TURBO_TEAM }}
             TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}

.github/workflows/main.yml

@@ -46,6 +46,7 @@ jobs:
       pr_preview_matrix: ${{ steps.parse.outputs.pr_preview_matrix }}
       all_apps: ${{ steps.parse.outputs.all_apps }}
       preview_domains: ${{ steps.parse.outputs.preview_domains }}
+      package_paths: ${{ steps.parse.outputs.package_paths }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -62,7 +63,12 @@ jobs:
       - name: Get apps list
         id: apps
         run: |
-          all_apps=$(ls -d apps/* | sed 's/apps\///' | jq -R -s -c 'split("\n")[:-1]')
+          # List both apps and services directories
+          apps_list=$(ls -d apps/* 2>/dev/null | sed 's/apps\///' || echo "")
+          services_list=$(ls -d services/* 2>/dev/null | sed 's/services\///' || echo "")
+
+          # Combine both lists
+          all_apps=$(echo -e "${apps_list}\n${services_list}" | grep -v '^$' | jq -R -s -c 'split("\n")[:-1]')
           echo "all_apps=$all_apps" >> $GITHUB_OUTPUT
           echo "All apps in workspace:"
           echo "$all_apps" | jq '.'
@@ -90,6 +96,27 @@ jobs:
           echo "Changed packages from turbo:"
           echo "$changed_packages" | jq '.'
 
+          # Extract package directories mapping (package -> directory parent folder)
+          # e.g., {"torus-cache": "services", "torus-wallet": "apps"}
+          package_paths=$(cat build.json | jq -c '
+            [.tasks[] | {key: .package, value: (.directory | split("/")[0])}]
+            | unique_by(.key)
+            | from_entries
+          ')
+          echo "package_paths=$package_paths" >> $GITHUB_OUTPUT
+          echo "Package paths:"
+          echo "$package_paths" | jq '.'
+
+          # Get paths for ALL packages
+          all_package_paths=$(pnpm exec turbo run build --dry-run=json 2>/dev/null | jq -c '
+            [.tasks[] | {key: .package, value: (.directory | split("/")[0])}]
+            | unique_by(.key)
+            | from_entries
+          ')
+          echo "all_package_paths=$all_package_paths" >> $GITHUB_OUTPUT
+          echo "All package paths:"
+          echo "$all_package_paths" | jq '.'
+
       - name: Filter changed apps
         id: changed
         run: |
@@ -165,13 +192,18 @@ jobs:
 
           preview_domains=$(echo "$config" | jq -c '[.apps | to_entries[] | select(.value.preview_domain != null) | {key: .key, value: .value.preview_domain}] | from_entries')
 
+          # Use complete package paths from turbo
+          package_paths='${{ steps.turbo.outputs.all_package_paths }}'
+
           echo "deploy_matrix=$deploy_json" >> $GITHUB_OUTPUT
           echo "pr_preview_matrix=$pr_json" >> $GITHUB_OUTPUT
           echo "all_apps=$all_apps" >> $GITHUB_OUTPUT
           echo "preview_domains=$preview_domains" >> $GITHUB_OUTPUT
+          echo "package_paths=$package_paths" >> $GITHUB_OUTPUT
 
           echo "Apps to deploy: $deploy_json"
           echo "Apps with PR preview: $pr_json"
+          echo "Package paths: $package_paths"
 
   ###################################
   ###### REGULAR DEPLOYMENTS  #######
@@ -191,6 +223,7 @@ jobs:
     secrets: inherit
     with:
       app_name: ${{ matrix.app }}
+      app_path: ${{ fromJson(needs.find-deployments.outputs.package_paths)[matrix.app] }}
       skip_build: ${{ inputs.skip_build || false }}
 
   ###################################
@@ -212,6 +245,7 @@ jobs:
     secrets: inherit
     with:
       app_name: ${{ matrix.app }}
+      app_path: ${{ fromJson(needs.find-deployments.outputs.package_paths)[matrix.app] }}
 
   ###################################
   ########### PR PREVIEW ############
@@ -231,6 +265,7 @@ jobs:
     secrets: inherit
     with:
       app_name: ${{ matrix.app }}
+      app_path: ${{ fromJson(needs.find-deployments.outputs.package_paths)[matrix.app] }}
 
   pr-preview-cleanup:
     needs: find-deployments
@@ -245,6 +280,7 @@ jobs:
     secrets: inherit
     with:
       app_name: ${{ matrix.app }}
+      app_path: ${{ fromJson(needs.find-deployments.outputs.package_paths)[matrix.app] }}
       cleanup: true
 
   deployment-summary:

.github/workflows/pr-preview-template.yml

@@ -7,6 +7,11 @@ on:
       app_name:
         required: true
         type: string
+      app_path:
+        required: false
+        description: "Path to app directory (apps or services)"
+        type: string
+        default: "apps"
       cleanup:
         required: false
         type: boolean
@@ -58,6 +63,7 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             APP_NAME=${{ inputs.app_name }}
+            APP_PATH=${{ inputs.app_path }}
             TURBO_API=${{ vars.TURBO_API }}
             TURBO_TEAM=${{ vars.TURBO_TEAM }}
             TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
@@ -133,7 +139,7 @@ jobs:
 
       - name: Deploy application
         id: deploy
-        working-directory: apps/${{ inputs.app_name }}
+        working-directory: ${{ inputs.app_path }}/${{ inputs.app_name }}
         run: |
           helmfile sync -e dev \
           --set deployment.image.tag=${{ steps.commit.outputs.short }}-pr \
@@ -206,7 +212,7 @@ jobs:
 
       - name: Cleanup PR preview deployment
         id: cleanup
-        working-directory: apps/${{ inputs.app_name }}
+        working-directory: ${{ inputs.app_path }}/${{ inputs.app_name }}
         run: |
           # Capture exit code - helmfile destroy returns non-zero when nothing exists to delete
           set +e

CLAUDE.md

@@ -10,17 +10,24 @@ applications, services, and shared packages for the Torus Network ecosystem.
 
 ### Architecture Components
 
-- **Apps**: User-facing web applications
+- **Apps** (`apps/`): User-facing web applications
   - `torus-allocator`: Agent weight allocation interface
   - `torus-wallet`: Token management and staking interface
   - `torus-bridge`: Cross-chain token bridge
   - `torus-governance`: DAO voting and proposals
   - `torus-portal`: Permission management and constraint creation
   - `torus-page`: Landing page
-- **Services**: Backend services
+  - `torus-prophet-finder`: Prophet finder application
+  - `prediction-swarm`: Prediction swarm interface
+- **Services** (`services/`): Backend services
   - `torus-cache`: Caching layer for blockchain data
   - `torus-worker`: Background processing and automation
-- **Packages**: Shared libraries
+  - `swarm-twitter`: Twitter integration for swarm
+  - `swarm-verifier`: Swarm verification service
+  - `swarm-services`: Swarm support services
+  - `swarm-filter`: Swarm filtering service
+  - `swarm-api`: Prediction swarm API
+- **Packages** (`packages/`): Shared libraries
   - `@torus-network/sdk`: Core Substrate/Polkadot.js integration
   - `@torus-ts/api`: tRPC API routes and database queries
   - `@torus-ts/db`: Drizzle ORM schema and database utilities
@@ -332,7 +339,7 @@ console.log("Success:", data);
 
 #### Agent-Fetcher Worker
 
-Location: `apps/torus-worker/src/workers/agent-fetcher.ts`
+Location: `services/torus-worker/src/workers/agent-fetcher.ts`
 
 The agent-fetcher worker synchronizes blockchain data to the database:
 

apps/prediction-swarm/src/app/(pages)/(expanded-pages)/feed/page.tsx

@@ -15,10 +15,10 @@ import {
   TabsList,
   TabsTrigger,
 } from "@torus-ts/ui/components/tabs";
-import { FilterDialog } from "~/app/_components/filter-dialog";
-import { PageHeader } from "~/app/_components/page-header";
-import { FeedLegend } from "~/app/_components/user-profile/feed-legend";
-import { ProfileFeed } from "~/app/_components/user-profile/profile-feed";
+import { ContentFilterDialog } from "~/app/_components/content-filter-dialog/content-filter-dialog";
+import { ExpandedFeedItem } from "~/app/_components/expanded-feed/expanded-feed-item/expanded-feed-item";
+import { FeedLegend } from "~/app/_components/expanded-feed/expanded-feed-legend-tooltip";
+import { ExpandedViewPageHeader } from "~/app/_components/expanded-view-page-header";
 import { api } from "~/trpc/react";
 import { Eye, Globe, Star } from "lucide-react";
 import { useRouter, useSearchParams } from "next/navigation";
@@ -285,7 +285,7 @@ export default function FeedPage() {
       <div className="border-border pointer-events-none absolute inset-y-0 left-1/2 w-full max-w-screen-lg -translate-x-1/2 border-x" />
 
       {/* Header section */}
-      <PageHeader
+      <ExpandedViewPageHeader
         title="Prediction Feed"
         description={
           view === "watched"
@@ -294,7 +294,7 @@ export default function FeedPage() {
               ? "View your starred predictions"
               : "View predictions from all tracked users"
         }
-        children={<FilterDialog />}
+        children={<ContentFilterDialog />}
       />
 
       {/* Full-width horizontal border */}
@@ -370,7 +370,7 @@ export default function FeedPage() {
             {/* Ongoing Predictions */}
             <TabsContent value="ongoing">
               <CardContent>
-                <ProfileFeed
+                <ExpandedFeedItem
                   predictions={ongoingPredictions ?? []}
                   variant="feed"
                   isLoading={ongoingLoading}
@@ -418,7 +418,7 @@ export default function FeedPage() {
             {/* True Predictions */}
             <TabsContent value="true">
               <CardContent>
-                <ProfileFeed
+                <ExpandedFeedItem
                   predictions={truePredictions ?? []}
                   variant="feed"
                   isLoading={trueLoading}
@@ -465,7 +465,7 @@ export default function FeedPage() {
             {/* False Predictions */}
             <TabsContent value="false">
               <CardContent>
-                <ProfileFeed
+                <ExpandedFeedItem
                   predictions={falsePredictions ?? []}
                   variant="feed"
                   isLoading={falseLoading}

apps/prediction-swarm/src/app/(pages)/(expanded-pages)/layout.tsx

@@ -1,5 +1,5 @@
-import Dither from "~/app/_components/dither";
-import { PageNavigation } from "~/app/_components/page-navigation";
+import { DitherBackgroundAnimation } from "~/app/_components/dither-background-animation";
+import { PageNavigation } from "~/app/_components/page-navigation/page-navigation";
 
 export default function RootLayout({
   children,
@@ -11,7 +11,7 @@ export default function RootLayout({
       <PageNavigation />
       {children}{" "}
       <div className="fixed inset-0 -z-10 opacity-30">
-        <Dither
+        <DitherBackgroundAnimation
           pixelSize={1}
           waveSpeed={0.01}
           waveFrequency={4}