Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ src/renderer/src/components/ui/*
.vscode
electron.vite.config.ts
*.md
scripts/*
1 change: 1 addition & 0 deletions electron.vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export default defineConfig({
},
css: {
postcss: {
// @ts-ignore
plugins: [tailwind(), autoprefixer()]
}
},
Expand Down
28 changes: 22 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "ThinkInAIXYZ",
"type": "module",
"engines": {
"node": ">=20.12.2",
"node": ">=20.19.0",
"pnpm": ">=10.11.0"
},
"packageManager": "pnpm@10.13.1+sha512.37ebf1a5c7a30d5fabe0c5df44ee8da4c965ca0c5af3dbab28c3a1681b70a256218d05c81c9c0dcf767ef6b8551eb5b960042b9ed4300c59242336377e01cfad",
Expand All @@ -29,7 +29,7 @@
"dev:inspect": "electron-vite dev --watch --inspect=9229",
"dev:linux": "electron-vite dev --watch --noSandbox",
"build": "pnpm run typecheck && electron-vite build",
"postinstall": "node scripts/postinstall.js && electron-builder install-app-deps",
"postinstall": "electron-builder install-app-deps && simple-git-hooks",
"build:unpack": "pnpm run build && electron-builder --dir",
"build:win": "pnpm run build && electron-builder --win",
"build:win:x64": "pnpm run build && electron-builder --win --x64",
Expand Down Expand Up @@ -104,7 +104,7 @@
"@lingual/i18n-check": "^0.8.4",
"@radix-icons/vue": "^1.0.0",
"@tailwindcss/typography": "^0.5.16",
"@tailwindcss/vite": "^4.0.4",
"@tailwindcss/vite": "^4.1.11",
"@tiptap/core": "^2.11.7",
"@tiptap/extension-code-block": "^2.11.9",
"@tiptap/extension-document": "^2.11.7",
Expand All @@ -120,7 +120,7 @@
"@types/better-sqlite3": "^7.6.0",
"@types/node": "^22.14.1",
"@types/xlsx": "^0.0.35",
"@vitejs/plugin-vue": "^5.2.3",
"@vitejs/plugin-vue": "^6.0.1",
"@vitest/ui": "^3.2.3",
"@vue/test-utils": "^2.4.6",
"@vueuse/core": "^12.7.0",
Expand All @@ -132,13 +132,16 @@
"electron-builder": "26.0.12",
"electron-vite": "^4.0.0",
"jsdom": "^26.1.0",
"lint-staged": "^16.1.2",
"lucide-vue-next": "^0.511.0",
"mermaid": "^11.6.0",
"minimatch": "^10.0.1",
"monaco-editor": "^0.52.2",
"picocolors": "^1.1.1",
"pinia": "^3.0.2",
"prettier": "^3.5.3",
"radix-vue": "^1.9.14",
"simple-git-hooks": "^2.13.0",
"tailwind-merge": "^3.3.0",
"tailwind-scrollbar-hide": "^2.0.0",
"tailwindcss": "3.4.17",
Expand All @@ -147,7 +150,7 @@
"typescript": "^5.8.3",
"vite": "npm:rolldown-vite@latest",
"vite-plugin-monaco-editor-esm": "^2.0.2",
"vite-plugin-vue-devtools": "^7.7.6",
"vite-plugin-vue-devtools": "^8.0.0",
"vite-svg-loader": "^5.1.0",
"vitest": "^3.2.3",
"vue": "^3.5.14",
Expand All @@ -161,6 +164,18 @@
"yaml": "^2.8.0",
"zod-to-json-schema": "^3.24.5"
},
"simple-git-hooks": {
"pre-commit": "pnpm lint-staged && pnpm typecheck",
"commit-msg": "node scripts/verify-commit.js"
},
"lint-staged": {
"*.js": [
"prettier --write"
],
"*.ts": [
"prettier --parser=typescript --write"
]
},
"pnpm": {
"overrides": {
"vite": "npm:rolldown-vite@latest"
Expand All @@ -169,7 +184,8 @@
"@tailwindcss/oxide",
"electron",
"electron-winstaller",
"lzo"
"lzo",
"simple-git-hooks"
],
"ignoredBuiltDependencies": [
"better-sqlite3-multiple-ciphers",
Expand Down
1 change: 0 additions & 1 deletion scripts/postinstall.js

This file was deleted.

28 changes: 28 additions & 0 deletions scripts/verify-commit.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// @ts-check
import pico from 'picocolors'
import { readFileSync } from 'node:fs'
import path from 'node:path'

const msgPath = path.resolve('.git/COMMIT_EDITMSG')
const msg = readFileSync(msgPath, 'utf-8').trim()

const commitRE =
/^(revert: )?(feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(\(.+\))?: .{1,50}/

if (!commitRE.test(msg)) {
console.log()
console.error(
` ${pico.white(pico.bgRed(' ERROR '))} ${pico.red(
`invalid commit message format.`,
)}\n\n` +
pico.red(
` Proper commit message format is required for automated changelog generation. Examples:\n\n`,
) +
` ${pico.green(`feat(compiler): add 'comments' option`)}\n` +
` ${pico.green(
`fix(v-model): handle events on blur (close #28)`,
)}\n\n` +
pico.red(` See .github/commit-convention.md for more details.\n`),
)
process.exit(1)
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,18 @@ import sharp from 'sharp'
import { proxyConfig } from '../../proxyConfig'
import { ProxyAgent } from 'undici'

const OPENAI_REASONING_MODELS = ['o3-mini', 'o3-preview', 'o1-mini', 'o1-pro', 'o1-preview', 'o1']
const OPENAI_REASONING_MODELS = [
'o4-mini',
'o1-pro',
'o3',
'o3-pro',
'o3-mini',
'o3-preview',
'o1-mini',
'o1-pro',
'o1-preview',
'o1'
]
const OPENAI_IMAGE_GENERATION_MODELS = [
'gpt-4o-all',
'gpt-4o-image',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,18 @@ import sharp from 'sharp'
import { proxyConfig } from '../../proxyConfig'
import { ProxyAgent } from 'undici'

const OPENAI_REASONING_MODELS = ['o3-mini', 'o3-preview', 'o1-mini', 'o1-pro', 'o1-preview', 'o1']
const OPENAI_REASONING_MODELS = [
'o4-mini',
'o1-pro',
'o3',
'o3-pro',
'o3-mini',
'o3-preview',
'o1-mini',
'o1-pro',
'o1-preview',
'o1'
]
const OPENAI_IMAGE_GENERATION_MODELS = [
'gpt-4o-all',
'gpt-4o-image',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// https://github.com/supermemoryai/apple-mcp
import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { ListToolsRequestSchema, CallToolRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { z } from 'zod'
import { runAppleScript } from 'run-applescript'
Expand Down Expand Up @@ -273,7 +273,7 @@ class NotesUtils {
-- 如果文件夹不存在,创建它
set targetFolder to make new folder with properties {name:"${folderName.replace(/"/g, '\\"')}"}
end try

-- 在指定文件夹中创建笔记
set newNote to make new note at targetFolder with properties {name:"${title.replace(/"/g, '\\"')}", body:"${body.replace(/"/g, '\\"')}"}
return "success"
Expand Down Expand Up @@ -500,11 +500,11 @@ class RemindersUtils {
on error
set targetList to make new list with properties {name:"${listName.replace(/"/g, '\\"')}"}
end try

set reminderProps to {name:"${name.replace(/"/g, '\\"')}"}
${notes ? `set reminderProps to reminderProps & {body:"${notes.replace(/"/g, '\\"')}"}` : ''}
${dueDate ? `set reminderProps to reminderProps & {due date:date "${dueDate}"}` : ''}

set newReminder to make new reminder at targetList with properties reminderProps
return "success"
end tell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'

// Artifacts 相关的常量定义
const ARTIFACTS_INFO = `
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { presenter } from '@/presenter'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import axios from 'axios'

// Schema definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import axios from 'axios'

// Schema definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { BuiltinKnowledgeConfig, MCPTextContent, QueryResult } from '@shared/presenter'
import { presenter } from '@/presenter'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { presenter } from '@/presenter' // 导入全局的 presenter 对象
import { eventBus } from '@/eventbus' // 引入 eventBus
import { TAB_EVENTS } from '@/events'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ListPromptsRequestSchema,
GetPromptRequestSchema
} from '@modelcontextprotocol/sdk/types.js'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { presenter } from '@/presenter'
import { eventBus } from '@/eventbus'
import { CONFIG_EVENTS } from '@/events'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import axios from 'axios'
import { presenter } from '@/presenter'
import { nanoid } from 'nanoid'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import axios from 'axios'

// Schema definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import axios from 'axios'

// Schema definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { createTwoFilesPatch } from 'diff'
import { minimatch } from 'minimatch'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { glob } from 'glob'

// Schema definitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import fs from 'fs/promises'
import path from 'path'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { presenter } from '@/presenter'
import { ChatMessage, ChatMessageContent } from '@shared/presenter'
// import { GenerateCompletionOptions } from '@/presenter/llmProviderPresenter' // Assuming this path and type exist - using any for now
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { presenter } from '@/presenter'
import { eventBus } from '@/eventbus'
import { TAB_EVENTS, MEETING_EVENTS, CONVERSATION_EVENTS } from '@/events'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import { ContentEnricher } from '@/presenter/threadPresenter/contentEnricher'
import { app } from 'electron'
import path from 'path'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
import { z } from 'zod'
import { zodToJsonSchema } from 'zod-to-json-schema'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport'
import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
import axios from 'axios'

// Schema definitions
Expand Down
1 change: 1 addition & 0 deletions tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"composite": true,
"resolveJsonModule": false,
"types": ["electron-vite/node"],
"moduleResolution": "bundler",
"baseUrl": ".",
"paths": {
"@/*": [
Expand Down