fix dependency issues from bad merge conflict resolution

RhysSullivan · RhysSullivan · commit 9531191bc083 · 2026-04-07T21:46:35.000-07:00
PR RhysSullivan#96's merge accidentally reverted the knip cleanup, removing unlisted deps and re-adding unused ones. This restores the correct dependency graph and re-adds knip for future detection.
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ apps/desktop/resources/
 
 # cloud local dev database
 .pglite
+.claude/
diff --git a/apps/cloud/package.json b/apps/cloud/package.json
@@ -4,9 +4,9 @@
   "private": true,
   "type": "module",
   "dependencies": {
+    "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "catalog:",
-    "@effect/platform-bun": "catalog:",
-    "@effect/sql-pg": "^0.28.0",
+    "@executor/api": "workspace:*",
     "@executor/execution": "workspace:*",
     "@executor/plugin-google-discovery": "workspace:*",
     "@executor/plugin-graphql": "workspace:*",
diff --git a/apps/local/package.json b/apps/local/package.json
@@ -7,6 +7,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
+    "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "catalog:",
     "@effect/platform-node": "catalog:",
     "@effect/sql": "catalog:",
@@ -26,16 +27,11 @@
     "@executor/sdk": "workspace:*",
     "@executor/storage-file": "workspace:*",
     "@modelcontextprotocol/sdk": "^1.12.1",
-    "@shikijs/langs": "^4.0.2",
-    "@shikijs/themes": "^4.0.2",
     "@tanstack/react-router": "catalog:",
     "@tanstack/react-start": "catalog:",
     "effect": "catalog:",
     "react": "catalog:",
-    "react-dom": "catalog:",
-    "shiki": "^4.0.2",
-    "streamdown": "^2.5.0",
-    "tailwindcss": "catalog:"
+    "react-dom": "catalog:"
   },
   "devDependencies": {
     "@tailwindcss/vite": "catalog:",
diff --git a/apps/marketing/package.json b/apps/marketing/package.json
@@ -16,7 +16,6 @@
     "wrangler": "^4.0.0"
   },
   "dependencies": {
-    "@astrojs/tailwind": "^6.0.2",
     "@astrojs/cloudflare": "^13.0.0",
     "@executor/sdk": "workspace:*",
     "@executor/plugin-openapi": "workspace:*",
diff --git a/bun.lock b/bun.lock
diff --git a/knip.config.ts b/knip.config.ts
@@ -0,0 +1,75 @@
+import type { KnipConfig } from "knip";
+
+const config: KnipConfig = {
+  workspaces: {
+    ".": {},
+    "apps/cli": {},
+    "apps/local": {
+      entry: ["src/server.ts", "src/routes/**/*.tsx", "src/server/*.ts"],
+    },
+    "apps/cloud": {
+      entry: ["src/server.ts", "src/routes/**/*.tsx", "src/server/*.ts"],
+    },
+    "apps/desktop": {
+      entry: ["src/preload.ts"],
+    },
+    "apps/marketing": {
+      entry: ["src/pages/**/*.astro", "src/pages/**/*.ts"],
+    },
+    "packages/react": {
+      entry: [
+        "src/api/*.tsx",
+        "src/plugins/*.tsx",
+        "src/pages/*.tsx",
+        "src/components/*.tsx",
+        "src/hooks/*.ts",
+        "src/lib/*.ts",
+      ],
+    },
+    "packages/core/*": {
+      includeEntryExports: true,
+    },
+    "packages/kernel/*": {
+      includeEntryExports: true,
+    },
+    "packages/hosts/*": {
+      includeEntryExports: true,
+    },
+    "packages/plugins/keychain": {
+      includeEntryExports: true,
+    },
+    "packages/plugins/file-secrets": {
+      includeEntryExports: true,
+    },
+    "packages/plugins/google-discovery": {
+      includeEntryExports: true,
+    },
+    "packages/plugins/onepassword": {
+      includeEntryExports: true,
+      ignoreDependencies: ["@executor/react"],
+    },
+    "packages/plugins/graphql": {
+      includeEntryExports: true,
+    },
+    "packages/plugins/openapi": {
+      includeEntryExports: true,
+    },
+    "packages/plugins/mcp": {
+      includeEntryExports: true,
+    },
+  },
+  ignore: [
+    ".reference/**",
+    "**/*.d.ts",
+    "packages/kernel/runtime-deno-subprocess/src/deno-subprocess-worker.mjs",
+  ],
+  ignoreDependencies: [
+    "bun-types",
+  ],
+  ignoreBinaries: [
+    "tar",
+    "python3",
+  ],
+};
+
+export default config;
diff --git a/package.json b/package.json
@@ -29,7 +29,6 @@
   ],
   "catalog": {
     "effect": "^3.21.0",
-    "@effect/cluster": "^0.58.0",
     "@effect/experimental": "^0.60.0",
     "@effect/sql": "^0.51.0",
     "@effect/sql-sqlite-bun": "^0.52.0",
@@ -81,6 +80,7 @@
     "@effect/platform": "catalog:",
     "@effect/vitest": "catalog:",
     "effect": "catalog:",
+    "knip": "^6.3.0",
     "oxlint": "^1.56.0",
     "turbo": "^2.5.6",
     "typescript": "^5.9.3",
diff --git a/packages/core/api/src/errors.ts b/packages/core/api/src/errors.ts
diff --git a/packages/core/config/package.json b/packages/core/config/package.json
@@ -12,7 +12,6 @@
   },
   "dependencies": {
     "@effect/platform": "catalog:",
-    "@executor/sdk": "workspace:*",
     "effect": "catalog:",
     "jsonc-parser": "^3.3.1"
   },
diff --git a/packages/core/storage-postgres/package.json b/packages/core/storage-postgres/package.json
@@ -8,8 +8,6 @@
     "./schema": "./src/schema.ts"
   },
   "dependencies": {
-    "@effect/sql": "catalog:",
-    "@effect/sql-pg": "^0.28.0",
     "@executor/sdk": "workspace:*",
     "drizzle-orm": "catalog:",
     "effect": "catalog:",
diff --git a/packages/hosts/mcp/package.json b/packages/hosts/mcp/package.json
@@ -19,8 +19,6 @@
     "zod": "^4.3.0"
   },
   "devDependencies": {
-    "@effect/vitest": "catalog:",
-    "@executor/codemode-core": "workspace:*",
     "@types/node": "catalog:",
     "bun-types": "catalog:",
     "vitest": "catalog:"
diff --git a/packages/kernel/core/package.json b/packages/kernel/core/package.json
@@ -18,7 +18,6 @@
     "effect": "catalog:"
   },
   "devDependencies": {
-    "@effect/vitest": "catalog:",
     "@types/node": "catalog:",
     "bun-types": "catalog:",
     "vitest": "catalog:"
diff --git a/packages/kernel/ir/package.json b/packages/kernel/ir/package.json
@@ -15,7 +15,6 @@
     "effect": "catalog:"
   },
   "devDependencies": {
-    "@effect/vitest": "catalog:",
     "@types/node": "catalog:",
     "bun-types": "catalog:",
     "vitest": "catalog:"
diff --git a/packages/plugins/file-secrets/package.json b/packages/plugins/file-secrets/package.json
@@ -16,7 +16,6 @@
     "effect": "catalog:"
   },
   "devDependencies": {
-    "@effect/vitest": "catalog:",
     "@types/node": "catalog:",
     "bun-types": "catalog:",
     "vitest": "catalog:"
diff --git a/packages/plugins/google-discovery/package.json b/packages/plugins/google-discovery/package.json
@@ -42,7 +42,6 @@
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@effect/vitest": "catalog:",
     "@executor/react": "workspace:*",
     "@types/node": "catalog:",
     "@types/react": "catalog:",
diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@effect/platform": "catalog:",
-    "@effect/platform-node": "catalog:",
     "@executor/sdk": "workspace:*",
     "effect": "catalog:"
   },
diff --git a/packages/plugins/mcp/package.json b/packages/plugins/mcp/package.json
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@effect/platform": "catalog:",
-    "@effect/platform-node": "catalog:",
     "@executor/sdk": "workspace:*",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "effect": "catalog:"
diff --git a/packages/plugins/onepassword/package.json b/packages/plugins/onepassword/package.json
@@ -23,7 +23,6 @@
     "effect": "catalog:"
   },
   "devDependencies": {
-    "@effect/vitest": "catalog:",
     "@types/node": "catalog:",
     "@types/react": "catalog:",
     "bun-types": "catalog:",
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -15,17 +15,20 @@
   "dependencies": {
     "@base-ui/react": "^1.3.0",
     "@effect/platform": "catalog:",
-    "@effect-atom/atom": "^0.5.3",
     "@effect-atom/atom-react": "^0.5.0",
     "@executor/api": "workspace:*",
+    "@executor/plugin-google-discovery": "workspace:*",
+    "@executor/plugin-graphql": "workspace:*",
+    "@executor/plugin-mcp": "workspace:*",
+    "@executor/plugin-onepassword": "workspace:*",
+    "@executor/plugin-openapi": "workspace:*",
     "@executor/sdk": "workspace:*",
-    "@hookform/resolvers": "^5.2.2",
+    "@tanstack/react-router": "catalog:",
     "@shikijs/langs": "^4.0.2",
     "@shikijs/themes": "^4.0.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "date-fns": "^4.1.0",
     "effect": "catalog:",
     "embla-carousel-react": "^8.6.0",
     "input-otp": "^1.4.2",
@@ -41,8 +44,7 @@
     "sonner": "^2.0.7",
     "streamdown": "^2.5.0",
     "tailwind-merge": "^3.3.0",
-    "vaul": "^1.1.2",
-    "zod": "^4.3.6"
+    "vaul": "^1.1.2"
   },
   "devDependencies": {
     "@types/react": "catalog:",

Original file line number	Diff line number	Diff line change
`@@ -46,3 +46,4 @@ apps/desktop/resources/`
`46`	`46`
`47`	`47`	`# cloud local dev database`
`48`	`48`	`.pglite`
	`49`	`+.claude/`