Merge remote-tracking branch 'origin/main' into feature/install-tools…

…-deeplink
dcSpark · Jan 20, 2025 · b1becc9 · b1becc9
2 parents ca78a83 + 26c4824
commit b1becc9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/pr-ci-healchecks.yml b/.github/workflows/pr-ci-healchecks.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Download side binaries
         env:
           ARCH: x86_64-unknown-linux-gnu
-          SHINKAI_NODE_VERSION: v0.9.5
+          SHINKAI_NODE_VERSION: v0.9.6
           OLLAMA_VERSION: v0.5.4
         run: |
           npx ts-node ./ci-scripts/download-side-binaries.ts

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
@@ -208,7 +208,7 @@ jobs:
       - name: Download side binaries
         env:
           ARCH: ${{ matrix.arch }}
-          SHINKAI_NODE_VERSION: v0.9.5
+          SHINKAI_NODE_VERSION: v0.9.6
           OLLAMA_VERSION: v0.5.4
         run: |
           npx ts-node ./ci-scripts/download-side-binaries.ts

diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
@@ -209,7 +209,7 @@ jobs:
       - name: Download side binaries
         env:
           ARCH: ${{ matrix.arch }}
-          SHINKAI_NODE_VERSION: v0.9.5
+          SHINKAI_NODE_VERSION: v0.9.6
           OLLAMA_VERSION: v0.5.4
         run: |
           npx ts-node ./ci-scripts/download-side-binaries.ts
@@ -257,46 +257,50 @@ jobs:
 
 # --- Signing process ---
       - name: 'Google auth'
-        if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }}
         id: 'auth'
+        if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }}
         uses: 'google-github-actions/auth@v2'
         with:
-          workload_identity_provider: '${{ secrets.WIF_PROVIDER }}'
-          service_account: '${{ secrets.SERVICE_ACCOUNT }}'
+          project_id: 'shinkai-412316'
+          workload_identity_provider: 'projects/511721742630/locations/global/workloadIdentityPools/github/providers/shinkai-apps'
 
       - name: 'Set up Cloud SDK'
         if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }}
         uses: 'google-github-actions/setup-gcloud@v2'
         with:
           project_id: 'shinkai-412316'
 
-
       - name: Set up Java
         if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }}
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
+
       - name: Download Jsign
-        run: wget https://github.com/ebourg/jsign/releases/download/7.0/jsign-7.0.jar
+        if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }}
+        shell: bash
+        run: choco install jsign
 
       - name: Cert to file
         if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }}
+        shell: bash
         run: |
-          echo -n "$EV_CODE_SIGNING_CERTIFICATE" | base64 --decode -o OS20241029372986.pem
+          echo -n "$EV_CODE_SIGNING_CERTIFICATE" > OS20241029372986.cer
 
       - name: Sign
         if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }}
+        shell: bash
         run: >
-          java -jar jsign.jar \
+          jsign \
               --storetype GOOGLECLOUD \
               --storepass "$(gcloud auth print-access-token)" \
               --keystore "projects/shinkai-412316/locations/us/keyRings/shinkai-apps" \
               --alias "EVCodeSigning" \
-              --certfile "OS20241029372986.pem" \
+              --certfile "OS20241029372986.cer" \
               --tsmode RFC3161 \
               --tsaurl http://timestamp.globalsign.com/tsa/r6advanced1 \
-              ${{ matrix.build_output_file_path }}
+              "${{ matrix.build_output_file_path }}"
 # ---
 
       - name: Prepare binary files

diff --git a/README.md b/README.md
@@ -46,22 +46,22 @@ $ git clone https://github.com/dcSpark/shinkai-apps
 ```
 ARCH="aarch64-apple-darwin" \
 OLLAMA_VERSION="v0.5.4" \
-SHINKAI_NODE_VERSION="v0.9.5" \
+SHINKAI_NODE_VERSION="v0.9.6" \
 npx ts-node ./ci-scripts/download-side-binaries.ts
 ```
 
 #### Linux
 ```
 ARCH="x86_64-unknown-linux-gnu" \
 OLLAMA_VERSION="v0.5.4"\
-SHINKAI_NODE_VERSION="v0.9.5" \
+SHINKAI_NODE_VERSION="v0.9.6" \
 npx ts-node ./ci-scripts/download-side-binaries.ts
 ```
 
 #### Windows
 ```
 $ENV:OLLAMA_VERSION="v0.5.4"
-$ENV:SHINKAI_NODE_VERSION="v0.9.5"
+$ENV:SHINKAI_NODE_VERSION="v0.9.6"
 $ENV:ARCH="x86_64-pc-windows-msvc"
 npx ts-node ./ci-scripts/download-side-binaries.ts
 ```

diff --git a/apps/shinkai-desktop/src/components/playground-tool/schemas.ts b/apps/shinkai-desktop/src/components/playground-tool/schemas.ts
@@ -5,7 +5,7 @@ export const ToolMetadataSchema = z.object({
     .string({ message: 'Tool name is required' })
     .min(1, 'Tool name is required')
     .max(100, 'Tool name must be less than 100 characters'),
-
+  homePage: z.string().optional().default(''),
   description: z
     .string({ message: 'Tool description is required' })
     .min(1, 'Tool description is required')
@@ -67,9 +67,9 @@ export const ToolMetadataSchema = z.object({
       clientId: z.string().default('YOUR_PROVIDER_CLIENT_ID'),
       clientSecret: z.string().default('YOUR_PROVIDER_CLIENT_SECRET'),
       scopes: z.array(z.string()).default([]),
-      grantType: z.string().default('authorization_code'),
+      responseType: z.string().default('code'),
+      pkceType: z.string().default(''),
       refreshToken: z.string().default(''),
-      accessToken: z.string().default(''),
     }),
   ).default([]),
 });