Merge branch 'dev' into allow-assistant-message-edits

.devcontainer/devcontainer.json

@@ -1,4 +1,20 @@
 {
-  "name": "jan",
+	"name": "Jan",
-  "image": "node:20"
+	"image": "mcr.microsoft.com/devcontainers/base:jammy",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "20"
+		},
+		"ghcr.io/devcontainers/features/rust:1": {},
+		"ghcr.io/devcontainers-extra/features/corepack:1": {}
+	},
+
+	"postCreateCommand": "./.devcontainer/postCreateCommand.sh",
+
+	// appimagekit requires fuse to package appimage, to use fuse in the container you need to enable it on the host
+	"runArgs": [
+    	"--device", "/dev/fuse",
+    	"--cap-add=SYS_ADMIN",
+    	"--security-opt", "apparmor:unconfined"
+  	]
 }

.devcontainer/postCreateCommand.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# install tauri prerequisites + xdg-utils for xdg-open + libfuse2 for using appimagekit
+
+sudo apt update
+sudo apt install -yqq libwebkit2gtk-4.1-dev \
+    build-essential \
+    curl \
+    wget \
+    file \
+    libxdo-dev \
+    libssl-dev \
+    libayatana-appindicator3-dev \
+    librsvg2-dev \
+    xdg-utils \
+    libfuse2
+
+sudo mkdir -p /opt/bin
+sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /opt/bin/appimagetool
+sudo chmod +x /opt/bin/appimagetool

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,5 @@
 name: "\U0001F41B Bug Report"
 description: "If something isn't working as expected \U0001F914"
-labels: [ "type: bug" ]
 title: 'bug: [DESCRIPTION]'
 
 body:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,7 @@
 name: "\U0001F680 Feature Request"
 description: "Suggest an idea for this project \U0001F63B!"
 title: 'idea: [DESCRIPTION]'
-labels: 'type: feature request'
+labels: 'feature request'
 body:
   - type: textarea
     validations:

core/package.json

@@ -40,7 +40,7 @@
     "rolldown": "1.0.0-beta.1",
     "ts-jest": "^29.2.5",
     "tslib": "^2.6.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.8.3"
   },
   "dependencies": {
     "rxjs": "^7.8.1",

docs/package.json

@@ -27,7 +27,7 @@
     "embla-carousel-react": "^8.0.0",
     "fs": "^0.0.1-security",
     "gray-matter": "^4.0.3",
-    "lucide-react": "^0.372.0",
+    "lucide-react": "^0.522.0",
     "next": "^14.1.4",
     "next-seo": "^6.5.0",
     "next-sitemap": "^4.2.3",

docs/yarn.lock

@@ -5503,10 +5503,10 @@ lru-cache@^4.0.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lucide-react@^0.372.0:
+lucide-react@^0.522.0:
-  version "0.372.0"
+  version "0.522.0"
-  resolved "https://registry.npmjs.org/lucide-react/-/lucide-react-0.372.0.tgz"
+  resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.522.0.tgz#c0951dd32936b6a7bcc474a829a251fede0bdfbd"
-  integrity sha512-0cKdqmilHXWUwWAWnf6CrrjHD8YaqPMtLrmEHXolZusNTr9epULCsiJwIOHk2q1yFxdEwd96D4zShlAj67UJdA==
+  integrity sha512-jnJbw974yZ7rQHHEFKJOlWAefG3ATSCZHANZxIdx8Rk/16siuwjgA4fBULpXEAWx/RlTs3FzmKW/udWUuO0aRw==
 
 lz-string@^1.5.0:
   version "1.5.0"

mise.toml

@@ -24,13 +24,7 @@ run = [
 [tasks.install]
 description = "Install dependencies"
 depends = ["config-yarn"]
-run = '''
+run = "yarn install"
-#!/usr/bin/env bash
-# Skip install on Windows per Makefile logic
-if [[ "$OSTYPE" != "msys" && "$OSTYPE" != "win32" ]]; then
-  yarn install
-fi
-'''
 sources = ['package.json', 'yarn.lock']
 outputs = ['node_modules']
 

src-tauri/tauri.bundle.windows.nsis.template

@@ -33,7 +33,7 @@ ${StrLoc}
 !define VERSION "jan_version"
 !define VERSIONWITHBUILD "jan_build"
 !define HOMEPAGE ""
-!define INSTALLMODE "currentUser"
+!define INSTALLMODE "both"
 !define LICENSE ""
 !define INSTALLERICON "D:\a\jan\jan\src-tauri\icons\icon.ico"
 !define SIDEBARIMAGE ""

web-app/package.json

@@ -47,7 +47,7 @@
     "katex": "^0.16.22",
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",
-    "lucide-react": "^0.503.0",
+    "lucide-react": "^0.522.0",
     "motion": "^12.10.5",
     "next-themes": "^0.4.6",
     "posthog-js": "^1.246.0",
@@ -90,7 +90,7 @@
     "eslint-plugin-react-refresh": "^0.4.19",
     "globals": "^16.0.0",
     "tailwind-merge": "^3.2.0",
-    "typescript": "~5.7.2",
+    "typescript": "~5.8.3",
     "typescript-eslint": "^8.26.1",
     "vite": "^6.3.0",
     "vite-plugin-node-polyfills": "^0.23.0",

yarn.lock

@@ -2247,7 +2247,7 @@ __metadata:
     rxjs: "npm:^7.8.1"
     ts-jest: "npm:^29.2.5"
     tslib: "npm:^2.6.2"
-    typescript: "npm:^5.3.3"
+    typescript: "npm:^5.8.3"
     ulidx: "npm:^2.3.0"
   languageName: unknown
   linkType: soft
@@ -2326,7 +2326,7 @@ __metadata:
     tailwindcss: "npm:^4.1.4"
     token.js: "npm:token.js-fork@0.7.9"
     tw-animate-css: "npm:^1.2.7"
-    typescript: "npm:~5.7.2"
+    typescript: "npm:~5.8.3"
     typescript-eslint: "npm:^8.26.1"
     ulidx: "npm:^2.4.1"
     unified: "npm:^11.0.5"
@@ -18434,23 +18434,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.3.3, typescript@npm:~5.7.2":
+"typescript@npm:^5.8.3, typescript@npm:~5.8.3":
-  version: 5.7.3
+  version: 5.8.3
-  resolution: "typescript@npm:5.7.3"
+  resolution: "typescript@npm:5.8.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa
+  checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.3.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.7.2#optional!builtin<compat/typescript>":
+"typescript@patch:typescript@npm%3A^5.8.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.8.3#optional!builtin<compat/typescript>":
-  version: 5.7.3
+  version: 5.8.3
-  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
+  resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
+  checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb
   languageName: node
   linkType: hard