Merge upstream/main (1547 commits) into local main
Resolved 7 conflicts and reconciled local patches with upstream's evolved API: - packages/core/src/plugin-loader.ts: dropped local createContextFor()/buildContext() in favor of upstream's createRouteContext() which provides the same TaskStore- override capability our patch added. - packages/dashboard/src/routes.ts: removed local manual plugin-route mounter (upstream's createPluginRouter handles this with richer response support); kept registerPluginExemptPath loop so external webhook plugins (telemetry- watcher, Grafana/Sentry) still bypass daemon-token auth. Removed obsolete resolveHeartbeatMonitorFor (replaced by upstream's resolveHeartbeatMonitor). - packages/dashboard/src/routes/register-agent-runtime-routes.ts: ported 4 call sites to upstream's isHeartbeatMonitorForProject + resolveHeartbeatMonitor dual-fallback pattern (multi-project monitor resolution). - packages/cli/package.json: combined upstream's pi-ai 0.73.0 + dockerode bumps with our cross-spawn dep for vendored pi-claude-cli. - pnpm-workspace.yaml: kept telemetry-watcher entry alongside upstream's new plugin entries (droid-runtime, cursor-runtime, agent-browser, whatsapp-chat, roadmap, even-realities-glasses, even-cards, reports). - packages/dashboard/app/components/SetupWizardModal.css: kept z-index:110 fix (wizard stacks above ModelOnboardingModal) and added upstream's overflow-y/overscroll-behavior on .setup-wizard-overlay. - pnpm-lock.yaml: took upstream verbatim; pnpm install regenerated to include cross-spawn. Typechecks: @fusion/core and @fusion/dashboard pass cleanly.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@runfusion/fusion",
|
||||
"version": "0.4.1",
|
||||
"version": "0.26.0",
|
||||
"license": "MIT",
|
||||
"description": "Fusion CLI: HTTP API server, daemon, dashboard launcher, and task tooling for the Fusion AI coding agent.",
|
||||
"homepage": "https://github.com/Runfusion/Fusion#readme",
|
||||
@@ -34,29 +34,38 @@
|
||||
"dist/**/*.js.map",
|
||||
"dist/client/**",
|
||||
"dist/pi-claude-cli/**",
|
||||
"dist/droid-cli/**",
|
||||
"dist/plugins/**",
|
||||
"skill/**",
|
||||
"README.md"
|
||||
],
|
||||
"scripts": {
|
||||
"dev": "tsx src/bin.ts",
|
||||
"prebuild": "node ../../scripts/sync-fusion-skill-tools.mjs",
|
||||
"prepack": "node ./scripts/prepare-publish-manifest.mjs prepack",
|
||||
"postpack": "node ./scripts/prepare-publish-manifest.mjs postpack",
|
||||
"build": "tsup",
|
||||
"build:exe": "bun run build.ts",
|
||||
"build:exe:all": "bun run build.ts --all",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"test": "vitest run --silent=passed-only --reporter=dot",
|
||||
"test:build-exe": "FUSION_TEST_BUILD_EXE=1 vitest run --config vitest.build-exe.config.ts --silent=passed-only --reporter=dot"
|
||||
"test:slow-cli": "cross-env FUSION_TEST_SLOW_CLI=1 vitest run src/commands/__tests__/agent-export.test.ts --silent=passed-only --reporter=dot",
|
||||
"test:extension-integration": "cross-env FUSION_TEST_EXTENSION_INTEGRATION=1 vitest run src/__tests__/extension-integration.test.ts --silent=passed-only --reporter=dot",
|
||||
"test:build-exe": "cross-env FUSION_TEST_BUILD_EXE=1 vitest run --config vitest.build-exe.config.ts --silent=passed-only --reporter=dot",
|
||||
"test:pre-release": "pnpm test:slow-cli && pnpm test:build-exe"
|
||||
},
|
||||
"dependencies": {
|
||||
"@mariozechner/pi-ai": "^0.70.0",
|
||||
"@mariozechner/pi-coding-agent": "^0.70.0",
|
||||
"@mariozechner/pi-ai": "^0.73.0",
|
||||
"@mariozechner/pi-coding-agent": "^0.73.0",
|
||||
"cross-spawn": "^7.0.6",
|
||||
"dockerode": "^4.0.12",
|
||||
"express": "^5.1.0",
|
||||
"ink": "^6.8.0",
|
||||
"ink-spinner": "^5.0.0",
|
||||
"ink-text-input": "^6.0.0",
|
||||
"ioredis": "^5.6.0",
|
||||
"multer": "^2.1.1",
|
||||
"node-pty": "npm:@homebridge/node-pty-prebuilt-multiarch@^0.13.1",
|
||||
"react": "^19.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
@@ -80,9 +89,12 @@
|
||||
"@fusion/dashboard": "workspace:*",
|
||||
"@fusion/engine": "workspace:*",
|
||||
"@fusion/pi-claude-cli": "workspace:*",
|
||||
"@fusion/pi-llama-cpp": "workspace:*",
|
||||
"@types/node": "^22.0.0",
|
||||
"@types/react": "^19.0.0",
|
||||
"@vitest/coverage-v8": "^3.1.0",
|
||||
"cross-env": "^7.0.0",
|
||||
"esbuild": "^0.25.12",
|
||||
"ink-testing-library": "^4.0.0",
|
||||
"tsup": "^8.5.1",
|
||||
"tsx": "^4.19.0",
|
||||
|
||||
Reference in New Issue
Block a user