@grackle-ai/server 0.40.0 → 0.41.1

package/dist/ws-bridge.js

@@ -14,7 +14,7 @@ import * as findingStore from "./finding-store.js";
 import * as personaStore from "./persona-store.js";
 import { v4 as uuid } from "uuid";
 import { join } from "node:path";
-import { LOGS_DIR, SESSION_STATUS, TASK_STATUS, eventTypeToString, } from "@grackle-ai/common";
+import { LOGS_DIR, SESSION_STATUS, TASK_STATUS, DEFAULT_MCP_PORT, eventTypeToString, } from "@grackle-ai/common";
 import { resolvePersona } from "./resolve-persona.js";
 import * as settingsStore from "./settings-store.js";
 import { isAllowedSettingKey } from "./settings-store.js";
@@ -26,8 +26,13 @@ import { buildTaskSystemContext } from "./utils/system-context.js";
 import { slugify } from "./utils/slugify.js";
 import { processEventStream } from "./event-processor.js";
 import * as processorRegistry from "./processor-registry.js";
-import { broadcast, setWssInstance, broadcastEnvironments, envRowToWs } from "./ws-broadcast.js";
-import { buildMcpServersJson } from "./grpc-service.js";
+import { setWssInstance, envRowToWs } from "./ws-broadcast.js";
+import { emit } from "./event-bus.js";
+import { buildMcpServersJson, toDialableHost } from "./grpc-service.js";
+import { createScopedToken } from "@grackle-ai/mcp";
+import { loadOrCreateApiKey } from "./api-key.js";
+import { reanimateAgent } from "./reanimate-agent.js";
+import { ConnectError } from "@connectrpc/connect";
 import { computeTaskStatus } from "./compute-task-status.js";
 import { exec } from "./utils/exec.js";
 import { formatGhError } from "./utils/format-gh-error.js";
@@ -111,20 +116,17 @@ async function autoProvisionEnvironment(ws, environmentId, env, logContext) {
     }
     logger.info({ environmentId, ...logContext }, "Auto-provisioning environment");
     envRegistry.updateEnvironmentStatus(environmentId, "connecting");
-    broadcastEnvironments();
+    emit("environment.changed", {});
     try {
         const config = safeParseAdapterConfig(env.adapterConfig, environmentId);
         const powerlineToken = env.powerlineToken || "";
         for await (const provEvent of reconnectOrProvision(environmentId, adapter, config, powerlineToken, !!env.bootstrapped)) {
             logger.info({ environmentId, stage: provEvent.stage, ...logContext }, "Auto-provision progress");
-            broadcast({
-                type: "provision_progress",
-                payload: {
-                    environmentId,
-                    stage: provEvent.stage,
-                    message: provEvent.message,
-                    progress: provEvent.progress,
-                },
+            emit("environment.provision_progress", {
+                environmentId,
+                stage: provEvent.stage,
+                message: provEvent.message,
+                progress: provEvent.progress,
             });
         }
         conn = await adapter.connect(environmentId, config, powerlineToken);
@@ -133,32 +135,26 @@ async function autoProvisionEnvironment(ws, environmentId, env, logContext) {
         await tokenBroker.pushToEnv(environmentId);
         envRegistry.updateEnvironmentStatus(environmentId, "connected");
         envRegistry.markBootstrapped(environmentId);
-        broadcastEnvironments();
+        emit("environment.changed", {});
         logger.info({ environmentId, ...logContext }, "Auto-provision complete");
-        broadcast({
-            type: "provision_progress",
-            payload: {
-                environmentId,
-                stage: "ready",
-                message: "Environment connected",
-                progress: 1,
-            },
+        emit("environment.provision_progress", {
+            environmentId,
+            stage: "ready",
+            message: "Environment connected",
+            progress: 1,
         });
         return conn;
     }
     catch (err) {
         logger.error({ environmentId, ...logContext, err }, "Auto-provision failed");
         envRegistry.updateEnvironmentStatus(environmentId, "error");
-        broadcastEnvironments();
+        emit("environment.changed", {});
         const errorMessage = err instanceof Error ? err.message : String(err);
-        broadcast({
-            type: "provision_progress",
-            payload: {
-                environmentId,
-                stage: "error",
-                message: `Auto-provision failed: ${errorMessage}`,
-                progress: 0,
-            },
+        emit("environment.provision_progress", {
+            environmentId,
+            stage: "error",
+            message: `Auto-provision failed: ${errorMessage}`,
+            progress: 0,
         });
         sendWs(ws, {
             type: "error",
@@ -212,13 +208,10 @@ async function startTaskSession(ws, task, options) {
         systemContext = systemPrompt + "\n\n" + systemContext;
     }
     sessionStore.createSession(sessionId, environmentId, runtime, freshTask.title, model, logPath, freshTask.id, resolved.personaId);
-    broadcast({
-        type: "task_started",
-        payload: {
-            taskId: freshTask.id,
-            sessionId,
-            projectId: freshTask.projectId,
-        },
+    emit("task.started", {
+        taskId: freshTask.id,
+        sessionId,
+        projectId: freshTask.projectId,
     });
     // Re-push stored tokens + provider credentials (scoped to runtime) so they're fresh for this session.
     // For local envs, skip file tokens — the PowerLine is on the same machine.
@@ -236,6 +229,11 @@ async function startTaskSession(ws, task, options) {
     catch {
         logger.warn("Failed to parse persona.mcpServers JSON; ignoring");
     }
+    // Build MCP broker URL + scoped token so runtimes can call the MCP server.
+    const mcpPort = parseInt(process.env.GRACKLE_MCP_PORT || String(DEFAULT_MCP_PORT), 10);
+    const mcpDialHost = toDialableHost(process.env.GRACKLE_HOST || "127.0.0.1");
+    const mcpUrl = `http://${mcpDialHost}:${mcpPort}/mcp`;
+    const mcpToken = createScopedToken({ sub: freshTask.id, pid: freshTask.projectId, per: resolved.personaId, sid: sessionId }, loadOrCreateApiKey());
     const powerlineReq = create(powerline.SpawnRequestSchema, {
         sessionId,
         runtime,
@@ -250,6 +248,8 @@ async function startTaskSession(ws, task, options) {
         projectId: freshTask.projectId,
         taskId: freshTask.id,
         mcpServersJson,
+        mcpUrl,
+        mcpToken,
     });
     processEventStream(conn.client.spawn(powerlineReq), {
         sessionId,
@@ -529,11 +529,27 @@ async function handleMessage(ws, msg, subscriptions) {
             if (session.taskId) {
                 const task = taskStore.getTask(session.taskId);
                 if (task) {
-                    broadcast({ type: "task_updated", payload: { taskId: task.id, projectId: task.projectId } });
+                    emit("task.updated", { taskId: task.id, projectId: task.projectId });
                 }
             }
             break;
         }
+        case "resume_agent": {
+            const resumeSessionId = msg.payload?.sessionId;
+            if (!resumeSessionId) {
+                sendWs(ws, { type: "error", payload: { message: "sessionId required" } });
+                return;
+            }
+            try {
+                reanimateAgent(resumeSessionId);
+                sendWs(ws, { type: "agent_resumed", payload: { sessionId: resumeSessionId } });
+            }
+            catch (err) {
+                const message = err instanceof ConnectError ? err.message : String(err);
+                sendWs(ws, { type: "error", payload: { message } });
+            }
+            break;
+        }
         // ─── Projects ──────────────────────────────────────────
         case "list_projects": {
             const rows = projectStore.listProjects();
@@ -574,15 +590,14 @@ async function handleMessage(ws, msg, subscriptions) {
             // useWorktrees defaults to true when not specified
             const createUseWorktrees = msg.payload?.useWorktrees ?? true;
             projectStore.createProject(id, name, msg.payload?.description || "", msg.payload?.repoUrl || "", msg.payload?.defaultEnvironmentId || "", createUseWorktrees, typeof msg.payload?.worktreeBasePath === "string" ? msg.payload.worktreeBasePath.trim() : "", msg.payload?.defaultPersonaId || "");
-            const row = projectStore.getProject(id);
-            broadcast({ type: "project_created", payload: { project: row } });
+            emit("project.created", { projectId: id });
             break;
         }
         case "archive_project": {
             const projectId = msg.payload?.projectId;
             if (projectId)
                 projectStore.archiveProject(projectId);
-            broadcast({ type: "project_archived", payload: { projectId } });
+            emit("project.archived", { projectId });
             break;
         }
         case "update_project": {
@@ -620,7 +635,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 worktreeBasePath: worktreeBasePathVal,
                 defaultPersonaId: defaultPersonaIdVal,
             });
-            broadcast({ type: "project_updated", payload: { projectId } });
+            emit("project.updated", { projectId });
             break;
         }
         // ─── Personas ──────────────────────────────────────────
@@ -666,7 +681,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 personaId = `${slugify(personaName) || "persona"}-${uuid().slice(0, 4)}`;
             }
             personaStore.createPersona(personaId, personaName, msg.payload?.description || "", personaSystemPrompt, msg.payload?.toolConfig || "{}", msg.payload?.runtime || "", msg.payload?.model || "", msg.payload?.maxTurns || 0, msg.payload?.mcpServers || "[]");
-            broadcast({ type: "persona_created", payload: { personaId } });
+            emit("persona.created", { personaId });
             break;
         }
         case "get_persona": {
@@ -702,10 +717,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 return;
             }
             personaStore.updatePersona(updatePersonaId, msg.payload?.name || existingPersona.name, msg.payload?.description || existingPersona.description, msg.payload?.systemPrompt || existingPersona.systemPrompt, msg.payload?.toolConfig || existingPersona.toolConfig, msg.payload?.runtime || existingPersona.runtime, msg.payload?.model || existingPersona.model, msg.payload?.maxTurns || existingPersona.maxTurns, msg.payload?.mcpServers || existingPersona.mcpServers);
-            broadcast({
-                type: "persona_updated",
-                payload: { personaId: updatePersonaId },
-            });
+            emit("persona.updated", { personaId: updatePersonaId });
             break;
         }
         case "delete_persona": {
@@ -713,10 +725,7 @@ async function handleMessage(ws, msg, subscriptions) {
             if (!deletePersonaId)
                 return;
             personaStore.deletePersona(deletePersonaId);
-            broadcast({
-                type: "persona_deleted",
-                payload: { personaId: deletePersonaId },
-            });
+            emit("persona.deleted", { personaId: deletePersonaId });
             break;
         }
         // ─── Settings ────────────────────────────────────────────
@@ -754,7 +763,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 }
             }
             settingsStore.setSetting(key, value);
-            broadcast({ type: "setting_changed", payload: { key, value } });
+            emit("setting.changed", { key, value });
             break;
         }
         // ─── Tasks ─────────────────────────────────────────────
@@ -834,16 +843,7 @@ async function handleMessage(ws, msg, subscriptions) {
             try {
                 const id = uuid().slice(0, 8);
                 taskStore.createTask(id, projectId, title, msg.payload?.description || "", msg.payload?.dependsOn || [], slugify(project.name), parentTaskId, canDecompose, msg.payload?.defaultPersonaId || "");
-                const row = taskStore.getTask(id);
-                broadcast({
-                    type: "task_created",
-                    payload: {
-                        task: row
-                            ? { ...row, dependsOn: safeParseJsonArray(row.dependsOn) }
-                            : null,
-                        requestId,
-                    },
-                });
+                emit("task.created", { taskId: id, projectId, requestId });
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : "Failed to create task";
@@ -897,10 +897,7 @@ async function handleMessage(ws, msg, subscriptions) {
                     sendWs(ws, { type: "error", payload: { message: String(err) } });
                     return;
                 }
-                broadcast({
-                    type: "task_started",
-                    payload: { taskId: updateTaskId, sessionId: lateBindSessionId, projectId: existingTask.projectId },
-                });
+                emit("task.started", { taskId: updateTaskId, sessionId: lateBindSessionId, projectId: existingTask.projectId });
                 break;
             }
             // Only allow editing not_started tasks (non-late-bind path)
@@ -929,17 +926,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 ? msg.payload.defaultPersonaId
                 : undefined;
             taskStore.updateTask(updateTaskId, updatedTitle, updatedDescription, existingTask.status, updatedDependsOn, updatedDefaultPersonaId);
-            const updatedRow = taskStore.getTask(updateTaskId);
-            broadcast({
-                type: "task_updated",
-                payload: {
-                    taskId: updateTaskId,
-                    projectId: existingTask.projectId,
-                    task: updatedRow
-                        ? { ...updatedRow, dependsOn: safeParseJsonArray(updatedRow.dependsOn) }
-                        : null,
-                },
-            });
+            emit("task.updated", { taskId: updateTaskId, projectId: existingTask.projectId });
             break;
         }
         case "start_task": {
@@ -999,10 +986,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 },
             });
             if (task) {
-                broadcast({
-                    type: "task_completed",
-                    payload: { taskId, projectId: task.projectId },
-                });
+                emit("task.completed", { taskId, projectId: task.projectId });
             }
             break;
         }
@@ -1055,10 +1039,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 projectId: task.projectId,
                 taskId: task.id,
             });
-            broadcast({
-                type: "task_started",
-                payload: { taskId: task.id, sessionId: latestSession.id, projectId: task.projectId },
-            });
+            emit("task.started", { taskId: task.id, sessionId: latestSession.id, projectId: task.projectId });
             break;
         }
         case "delete_task": {
@@ -1107,7 +1088,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 sendWs(ws, { type: "error", payload: { message: `Failed to delete task ${taskId}: no rows affected` } });
                 return;
             }
-            broadcast({ type: "task_deleted", payload: { taskId, projectId: deletedTask.projectId } });
+            emit("task.deleted", { taskId, projectId: deletedTask.projectId });
             break;
         }
         // ─── Task Sessions ─────────────────────────────────────
@@ -1258,7 +1239,7 @@ async function handleMessage(ws, msg, subscriptions) {
             }
             logger.info({ environmentId, adapterType: env.adapterType }, "Provisioning environment");
             envRegistry.updateEnvironmentStatus(environmentId, "connecting");
-            broadcastEnvironments();
+            emit("environment.changed", {});
             // Run provision in background, broadcasting progress to all connected clients
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             (async () => {
@@ -1267,14 +1248,11 @@ async function handleMessage(ws, msg, subscriptions) {
                     const powerlineToken = env.powerlineToken || "";
                     for await (const event of reconnectOrProvision(environmentId, adapter, config, powerlineToken, !!env.bootstrapped)) {
                         logger.info({ environmentId, stage: event.stage, message: event.message }, "Provision progress");
-                        broadcast({
-                            type: "provision_progress",
-                            payload: {
-                                environmentId,
-                                stage: event.stage,
-                                message: event.message,
-                                progress: event.progress,
-                            },
+                        emit("environment.provision_progress", {
+                            environmentId,
+                            stage: event.stage,
+                            message: event.message,
+                            progress: event.progress,
                         });
                     }
                     logger.info({ environmentId }, "Provision complete, calling adapter.connect");
@@ -1285,31 +1263,25 @@ async function handleMessage(ws, msg, subscriptions) {
                     envRegistry.updateEnvironmentStatus(environmentId, "connected");
                     envRegistry.markBootstrapped(environmentId);
                     logger.info({ environmentId }, "Environment connected");
-                    broadcast({
-                        type: "provision_progress",
-                        payload: {
-                            environmentId,
-                            stage: "ready",
-                            message: "Environment connected",
-                            progress: 1,
-                        },
+                    emit("environment.provision_progress", {
+                        environmentId,
+                        stage: "ready",
+                        message: "Environment connected",
+                        progress: 1,
                     });
                 }
                 catch (err) {
                     logger.error({ environmentId, err }, "Provision failed");
                     envRegistry.updateEnvironmentStatus(environmentId, "error");
                     const errorMessage = err instanceof Error ? err.message : String(err);
-                    broadcast({
-                        type: "provision_progress",
-                        payload: {
-                            environmentId,
-                            stage: "error",
-                            message: `Connection failed: ${errorMessage}`,
-                            progress: 0,
-                        },
+                    emit("environment.provision_progress", {
+                        environmentId,
+                        stage: "error",
+                        message: `Connection failed: ${errorMessage}`,
+                        progress: 0,
                     });
                 }
-                broadcastEnvironments();
+                emit("environment.changed", {});
             })();
             break;
         }
@@ -1338,7 +1310,7 @@ async function handleMessage(ws, msg, subscriptions) {
             adapterManager.removeConnection(environmentId);
             envRegistry.updateEnvironmentStatus(environmentId, "disconnected");
             logger.info({ environmentId }, "Environment stopped");
-            broadcastEnvironments();
+            emit("environment.changed", {});
             break;
         }
         case "add_environment": {
@@ -1399,8 +1371,8 @@ async function handleMessage(ws, msg, subscriptions) {
             }
             envRegistry.addEnvironment(id, displayName, adapterType, adapterConfig);
             logger.info({ id, displayName, adapterType }, "Environment added via WebSocket");
-            broadcast({ type: "environment_added", payload: { environmentId: id } });
-            broadcastEnvironments();
+            emit("environment.added", { environmentId: id });
+            emit("environment.changed", {});
             break;
         }
         case "remove_environment": {
@@ -1435,8 +1407,8 @@ async function handleMessage(ws, msg, subscriptions) {
             sessionStore.deleteByEnvironment(environmentId);
             envRegistry.removeEnvironment(environmentId);
             logger.info({ environmentId }, "Environment removed");
-            broadcast({ type: "environment_removed", payload: { environmentId } });
-            broadcastEnvironments();
+            emit("environment.removed", { environmentId });
+            emit("environment.changed", {});
             break;
         }
         // ─── Codespaces ─────────────────────────────────────
@@ -1536,7 +1508,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 value,
                 expiresAt: msg.payload?.expiresAt || "",
             });
-            broadcast({ type: "token_changed" });
+            emit("token.changed", {});
             break;
         }
         case "delete_token": {
@@ -1546,7 +1518,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 return;
             }
             await tokenBroker.deleteToken(tokenName);
-            broadcast({ type: "token_changed" });
+            emit("token.changed", {});
             break;
         }
         case "get_credential_providers": {
@@ -1563,10 +1535,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 return;
             }
             credentialProviders.setCredentialProviders(msg.payload);
-            broadcast({
-                type: "credential_providers",
-                payload: credentialProviders.getCredentialProviders(),
-            });
+            emit("credential.providers_changed", credentialProviders.getCredentialProviders());
             break;
         }
     }