Merge pull request #63 from tyulyukov/marcode/port-cursor-acp

feat(provider): port Cursor ACP support and unify provider system

Author: tyulyukov

apps/desktop/package.json

@@ -23,6 +23,7 @@
     "@marcode/contracts": "workspace:*",
     "@marcode/shared": "workspace:*",
     "@types/node": "catalog:",
+    "effect-acp": "workspace:*",
     "tsdown": "catalog:",
     "typescript": "catalog:",
     "vitest": "catalog:"

apps/desktop/src/windowReveal.test.ts

@@ -14,6 +14,8 @@ describe("bindFirstRevealTrigger", () => {
       [
         (fire: () => void) => window.once("ready-to-show", fire),
         (fire: () => void) => webContents.once("did-finish-load", fire),
+        (fire) => window.once("ready-to-show", fire),
+        (fire) => webContents.once("did-finish-load", fire),
       ],
       reveal,
     );
@@ -30,8 +32,8 @@ describe("bindFirstRevealTrigger", () => {
 
     bindFirstRevealTrigger(
       [
-        (fire: () => void) => window.once("ready-to-show", fire),
-        (fire: () => void) => webContents.once("did-finish-load", fire),
+        (fire) => window.once("ready-to-show", fire),
+        (fire) => webContents.once("did-finish-load", fire),
       ],
       reveal,
     );
@@ -48,8 +50,8 @@ describe("bindFirstRevealTrigger", () => {
 
     bindFirstRevealTrigger(
       [
-        (fire: () => void) => window.once("ready-to-show", fire),
-        (fire: () => void) => webContents.once("did-finish-load", fire),
+        (fire) => window.once("ready-to-show", fire),
+        (fire) => webContents.once("did-finish-load", fire),
       ],
       reveal,
     );
@@ -64,7 +66,7 @@ describe("bindFirstRevealTrigger", () => {
     const window = new EventEmitter();
     const reveal = vi.fn();
 
-    bindFirstRevealTrigger([(fire: () => void) => window.once("ready-to-show", fire)], reveal);
+    bindFirstRevealTrigger([(fire) => window.once("ready-to-show", fire)], reveal);
 
     window.emit("ready-to-show");
     window.emit("ready-to-show");

apps/desktop/tsdown.config.ts

@@ -20,7 +20,7 @@ export default defineConfig([
     ...shared,
     entry: ["src/main.ts"],
     clean: true,
-    noExternal: (id) => id.startsWith("@marcode/"),
+    noExternal: (id) => id.startsWith("@marcode/") || id.startsWith("effect-acp"),
     define: embeddedJiraDefines,
   },
   {

apps/server/package.json

@@ -30,6 +30,7 @@
     "@effect/platform-node": "catalog:",
     "@effect/platform-node-shared": "catalog:",
     "@effect/sql-sqlite-bun": "catalog:",
+    "@opencode-ai/sdk": "^1.3.15",
     "@pierre/diffs": "^1.1.0-beta.16",
     "effect": "catalog:",
     "node-pty": "^1.1.0",
@@ -43,6 +44,7 @@
     "@marcode/web": "workspace:*",
     "@types/bun": "catalog:",
     "@types/node": "catalog:",
+    "effect-acp": "workspace:*",
     "tsdown": "catalog:",
     "typescript": "catalog:",
     "vitest": "catalog:"