@paperclipai/server 0.3.1 → 2026.3.17-canary.2

package/dist/services/workspace-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-runtime.d.ts","sourceRoot":"","sources":["../../src/services/workspace-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-runtime.d.ts","sourceRoot":"","sources":["../../src/services/workspace-runtime.ts"],"names":[],"mappings":"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"}

package/dist/services/workspace-runtime.js

@@ -21,6 +21,16 @@ function stableStringify(value) {
     }
     return JSON.stringify(value);
 }
+export function sanitizeRuntimeServiceBaseEnv(baseEnv) {
+    const env = { ...baseEnv };
+    for (const key of Object.keys(env)) {
+        if (key.startsWith("PAPERCLIP_")) {
+            delete env[key];
+        }
+    }
+    delete env.DATABASE_URL;
+    return env;
+}
 function stableRuntimeServiceId(input) {
     if (input.reportId)
         return input.reportId;
@@ -44,6 +54,7 @@ function toRuntimeServiceRef(record, overrides) {
         companyId: record.companyId,
         projectId: record.projectId,
         projectWorkspaceId: record.projectWorkspaceId,
+        executionWorkspaceId: record.executionWorkspaceId,
         issueId: record.issueId,
         serviceName: record.serviceName,
         status: record.status,
@@ -115,12 +126,17 @@ function resolveConfiguredPath(value, baseDir) {
     }
     return path.resolve(baseDir, value);
 }
-async function runGit(args, cwd) {
+function formatCommandForDisplay(command, args) {
+    return [command, ...args]
+        .map((part) => (/^[A-Za-z0-9_./:-]+$/.test(part) ? part : JSON.stringify(part)))
+        .join(" ");
+}
+async function executeProcess(input) {
     const proc = await new Promise((resolve, reject) => {
-        const child = spawn("git", args, {
-            cwd,
+        const child = spawn(input.command, input.args, {
+            cwd: input.cwd,
             stdio: ["ignore", "pipe", "pipe"],
-            env: process.env,
+            env: input.env ?? process.env,
         });
         let stdout = "";
         let stderr = "";
@@ -133,14 +149,42 @@ async function runGit(args, cwd) {
         child.on("error", reject);
         child.on("close", (code) => resolve({ stdout, stderr, code }));
     });
+    return proc;
+}
+async function runGit(args, cwd) {
+    const proc = await executeProcess({
+        command: "git",
+        args,
+        cwd,
+    });
     if (proc.code !== 0) {
         throw new Error(proc.stderr.trim() || proc.stdout.trim() || `git ${args.join(" ")} failed`);
     }
     return proc.stdout.trim();
 }
+function gitErrorIncludes(error, needle) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.toLowerCase().includes(needle.toLowerCase());
+}
 async function directoryExists(value) {
     return fs.stat(value).then((stats) => stats.isDirectory()).catch(() => false);
 }
+function terminateChildProcess(child) {
+    if (!child.pid)
+        return;
+    if (process.platform !== "win32") {
+        try {
+            process.kill(-child.pid, "SIGTERM");
+            return;
+        }
+        catch {
+            // Fall through to the direct child kill.
+        }
+    }
+    if (!child.killed) {
+        child.kill("SIGTERM");
+    }
+}
 function buildWorkspaceCommandEnv(input) {
     const env = { ...process.env };
     env.PAPERCLIP_WORKSPACE_CWD = input.worktreePath;
@@ -165,22 +209,11 @@ function buildWorkspaceCommandEnv(input) {
 }
 async function runWorkspaceCommand(input) {
     const shell = process.env.SHELL?.trim() || "/bin/sh";
-    const proc = await new Promise((resolve, reject) => {
-        const child = spawn(shell, ["-c", input.command], {
-            cwd: input.cwd,
-            env: input.env,
-            stdio: ["ignore", "pipe", "pipe"],
-        });
-        let stdout = "";
-        let stderr = "";
-        child.stdout?.on("data", (chunk) => {
-            stdout += String(chunk);
-        });
-        child.stderr?.on("data", (chunk) => {
-            stderr += String(chunk);
-        });
-        child.on("error", reject);
-        child.on("close", (code) => resolve({ stdout, stderr, code }));
+    const proc = await executeProcess({
+        command: shell,
+        args: ["-c", input.command],
+        cwd: input.cwd,
+        env: input.env,
     });
     if (proc.code === 0)
         return;
@@ -189,11 +222,90 @@ async function runWorkspaceCommand(input) {
         ? `${input.label} failed: ${details}`
         : `${input.label} failed with exit code ${proc.code ?? -1}`);
 }
+async function recordGitOperation(recorder, input) {
+    if (!recorder) {
+        return runGit(input.args, input.cwd);
+    }
+    let stdout = "";
+    let stderr = "";
+    let code = null;
+    await recorder.recordOperation({
+        phase: input.phase,
+        command: formatCommandForDisplay("git", input.args),
+        cwd: input.cwd,
+        metadata: input.metadata ?? null,
+        run: async () => {
+            const result = await executeProcess({
+                command: "git",
+                args: input.args,
+                cwd: input.cwd,
+            });
+            stdout = result.stdout;
+            stderr = result.stderr;
+            code = result.code;
+            return {
+                status: result.code === 0 ? "succeeded" : "failed",
+                exitCode: result.code,
+                stdout: result.stdout,
+                stderr: result.stderr,
+                system: result.code === 0 ? input.successMessage ?? null : null,
+            };
+        },
+    });
+    if (code !== 0) {
+        const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
+        throw new Error(details.length > 0
+            ? `${input.failureLabel ?? `git ${input.args.join(" ")}`} failed: ${details}`
+            : `${input.failureLabel ?? `git ${input.args.join(" ")}`} failed with exit code ${code ?? -1}`);
+    }
+    return stdout.trim();
+}
+async function recordWorkspaceCommandOperation(recorder, input) {
+    if (!recorder) {
+        await runWorkspaceCommand(input);
+        return;
+    }
+    let stdout = "";
+    let stderr = "";
+    let code = null;
+    await recorder.recordOperation({
+        phase: input.phase,
+        command: input.command,
+        cwd: input.cwd,
+        metadata: input.metadata ?? null,
+        run: async () => {
+            const shell = process.env.SHELL?.trim() || "/bin/sh";
+            const result = await executeProcess({
+                command: shell,
+                args: ["-c", input.command],
+                cwd: input.cwd,
+                env: input.env,
+            });
+            stdout = result.stdout;
+            stderr = result.stderr;
+            code = result.code;
+            return {
+                status: result.code === 0 ? "succeeded" : "failed",
+                exitCode: result.code,
+                stdout: result.stdout,
+                stderr: result.stderr,
+                system: result.code === 0 ? input.successMessage ?? null : null,
+            };
+        },
+    });
+    if (code === 0)
+        return;
+    const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
+    throw new Error(details.length > 0
+        ? `${input.label} failed: ${details}`
+        : `${input.label} failed with exit code ${code ?? -1}`);
+}
 async function provisionExecutionWorktree(input) {
     const provisionCommand = asString(input.strategy.provisionCommand, "").trim();
     if (!provisionCommand)
         return;
-    await runWorkspaceCommand({
+    await recordWorkspaceCommandOperation(input.recorder, {
+        phase: "workspace_provision",
         command: provisionCommand,
         cwd: input.worktreePath,
         env: buildWorkspaceCommandEnv({
@@ -206,8 +318,47 @@ async function provisionExecutionWorktree(input) {
             created: input.created,
         }),
         label: `Execution workspace provision command "${provisionCommand}"`,
+        metadata: {
+            repoRoot: input.repoRoot,
+            worktreePath: input.worktreePath,
+            branchName: input.branchName,
+            created: input.created,
+        },
+        successMessage: `Provisioned workspace at ${input.worktreePath}\n`,
     });
 }
+function buildExecutionWorkspaceCleanupEnv(input) {
+    const env = sanitizeRuntimeServiceBaseEnv(process.env);
+    env.PAPERCLIP_WORKSPACE_CWD = input.workspace.cwd ?? "";
+    env.PAPERCLIP_WORKSPACE_PATH = input.workspace.cwd ?? "";
+    env.PAPERCLIP_WORKSPACE_WORKTREE_PATH =
+        input.workspace.providerRef ?? input.workspace.cwd ?? "";
+    env.PAPERCLIP_WORKSPACE_BRANCH = input.workspace.branchName ?? "";
+    env.PAPERCLIP_WORKSPACE_BASE_CWD = input.projectWorkspaceCwd ?? "";
+    env.PAPERCLIP_WORKSPACE_REPO_ROOT = input.projectWorkspaceCwd ?? "";
+    env.PAPERCLIP_WORKSPACE_REPO_URL = input.workspace.repoUrl ?? "";
+    env.PAPERCLIP_WORKSPACE_REPO_REF = input.workspace.baseRef ?? "";
+    env.PAPERCLIP_PROJECT_ID = input.workspace.projectId ?? "";
+    env.PAPERCLIP_PROJECT_WORKSPACE_ID = input.workspace.projectWorkspaceId ?? "";
+    env.PAPERCLIP_ISSUE_ID = input.workspace.sourceIssueId ?? "";
+    return env;
+}
+async function resolveGitRepoRootForWorkspaceCleanup(worktreePath, projectWorkspaceCwd) {
+    if (projectWorkspaceCwd) {
+        const resolvedProjectWorkspaceCwd = path.resolve(projectWorkspaceCwd);
+        const gitDir = await runGit(["rev-parse", "--git-common-dir"], resolvedProjectWorkspaceCwd)
+            .catch(() => null);
+        if (gitDir) {
+            const resolvedGitDir = path.resolve(resolvedProjectWorkspaceCwd, gitDir);
+            return path.dirname(resolvedGitDir);
+        }
+    }
+    const gitDir = await runGit(["rev-parse", "--git-common-dir"], worktreePath).catch(() => null);
+    if (!gitDir)
+        return null;
+    const resolvedGitDir = path.resolve(worktreePath, gitDir);
+    return path.dirname(resolvedGitDir);
+}
 export async function realizeExecutionWorkspace(input) {
     const rawStrategy = parseObject(input.config.workspaceStrategy);
     const strategyType = asString(rawStrategy.type, "project_primary");
@@ -242,6 +393,25 @@ export async function realizeExecutionWorkspace(input) {
     if (existingWorktree) {
         const existingGitDir = await runGit(["rev-parse", "--git-dir"], worktreePath).catch(() => null);
         if (existingGitDir) {
+            if (input.recorder) {
+                await input.recorder.recordOperation({
+                    phase: "worktree_prepare",
+                    cwd: repoRoot,
+                    metadata: {
+                        repoRoot,
+                        worktreePath,
+                        branchName,
+                        baseRef,
+                        created: false,
+                        reused: true,
+                    },
+                    run: async () => ({
+                        status: "succeeded",
+                        exitCode: 0,
+                        system: `Reused existing git worktree at ${worktreePath}\n`,
+                    }),
+                });
+            }
             await provisionExecutionWorktree({
                 strategy: rawStrategy,
                 base: input.base,
@@ -251,6 +421,7 @@ export async function realizeExecutionWorkspace(input) {
                 issue: input.issue,
                 agent: input.agent,
                 created: false,
+                recorder: input.recorder ?? null,
             });
             return {
                 ...input.base,
@@ -264,7 +435,42 @@ export async function realizeExecutionWorkspace(input) {
         }
         throw new Error(`Configured worktree path "${worktreePath}" already exists and is not a git worktree.`);
     }
-    await runGit(["worktree", "add", "-B", branchName, worktreePath, baseRef], repoRoot);
+    try {
+        await recordGitOperation(input.recorder, {
+            phase: "worktree_prepare",
+            args: ["worktree", "add", "-b", branchName, worktreePath, baseRef],
+            cwd: repoRoot,
+            metadata: {
+                repoRoot,
+                worktreePath,
+                branchName,
+                baseRef,
+                created: true,
+            },
+            successMessage: `Created git worktree at ${worktreePath}\n`,
+            failureLabel: `git worktree add ${worktreePath}`,
+        });
+    }
+    catch (error) {
+        if (!gitErrorIncludes(error, "already exists")) {
+            throw error;
+        }
+        await recordGitOperation(input.recorder, {
+            phase: "worktree_prepare",
+            args: ["worktree", "add", worktreePath, branchName],
+            cwd: repoRoot,
+            metadata: {
+                repoRoot,
+                worktreePath,
+                branchName,
+                baseRef,
+                created: false,
+                reusedExistingBranch: true,
+            },
+            successMessage: `Attached existing branch ${branchName} at ${worktreePath}\n`,
+            failureLabel: `git worktree add ${worktreePath}`,
+        });
+    }
     await provisionExecutionWorktree({
         strategy: rawStrategy,
         base: input.base,
@@ -274,6 +480,7 @@ export async function realizeExecutionWorkspace(input) {
         issue: input.issue,
         agent: input.agent,
         created: true,
+        recorder: input.recorder ?? null,
     });
     return {
         ...input.base,
@@ -285,6 +492,134 @@ export async function realizeExecutionWorkspace(input) {
         created: true,
     };
 }
+export async function cleanupExecutionWorkspaceArtifacts(input) {
+    const warnings = [];
+    const workspacePath = input.workspace.providerRef ?? input.workspace.cwd;
+    const cleanupEnv = buildExecutionWorkspaceCleanupEnv({
+        workspace: input.workspace,
+        projectWorkspaceCwd: input.projectWorkspace?.cwd ?? null,
+    });
+    const createdByRuntime = input.workspace.metadata?.createdByRuntime === true;
+    const cleanupCommands = [
+        input.projectWorkspace?.cleanupCommand ?? null,
+        input.teardownCommand ?? null,
+    ]
+        .map((value) => asString(value, "").trim())
+        .filter(Boolean);
+    for (const command of cleanupCommands) {
+        try {
+            await recordWorkspaceCommandOperation(input.recorder, {
+                phase: "workspace_teardown",
+                command,
+                cwd: workspacePath ?? input.projectWorkspace?.cwd ?? process.cwd(),
+                env: cleanupEnv,
+                label: `Execution workspace cleanup command "${command}"`,
+                metadata: {
+                    workspaceId: input.workspace.id,
+                    workspacePath,
+                    branchName: input.workspace.branchName,
+                    providerType: input.workspace.providerType,
+                },
+                successMessage: `Completed cleanup command "${command}"\n`,
+            });
+        }
+        catch (err) {
+            warnings.push(err instanceof Error ? err.message : String(err));
+        }
+    }
+    if (input.workspace.providerType === "git_worktree" && workspacePath) {
+        const repoRoot = await resolveGitRepoRootForWorkspaceCleanup(workspacePath, input.projectWorkspace?.cwd ?? null);
+        const worktreeExists = await directoryExists(workspacePath);
+        if (worktreeExists) {
+            if (!repoRoot) {
+                warnings.push(`Could not resolve git repo root for "${workspacePath}".`);
+            }
+            else {
+                try {
+                    await recordGitOperation(input.recorder, {
+                        phase: "worktree_cleanup",
+                        args: ["worktree", "remove", "--force", workspacePath],
+                        cwd: repoRoot,
+                        metadata: {
+                            workspaceId: input.workspace.id,
+                            workspacePath,
+                            branchName: input.workspace.branchName,
+                            cleanupAction: "worktree_remove",
+                        },
+                        successMessage: `Removed git worktree ${workspacePath}\n`,
+                        failureLabel: `git worktree remove ${workspacePath}`,
+                    });
+                }
+                catch (err) {
+                    warnings.push(err instanceof Error ? err.message : String(err));
+                }
+            }
+        }
+        if (createdByRuntime && input.workspace.branchName) {
+            if (!repoRoot) {
+                warnings.push(`Could not resolve git repo root to delete branch "${input.workspace.branchName}".`);
+            }
+            else {
+                try {
+                    await recordGitOperation(input.recorder, {
+                        phase: "worktree_cleanup",
+                        args: ["branch", "-d", input.workspace.branchName],
+                        cwd: repoRoot,
+                        metadata: {
+                            workspaceId: input.workspace.id,
+                            workspacePath,
+                            branchName: input.workspace.branchName,
+                            cleanupAction: "branch_delete",
+                        },
+                        successMessage: `Deleted branch ${input.workspace.branchName}\n`,
+                        failureLabel: `git branch -d ${input.workspace.branchName}`,
+                    });
+                }
+                catch (err) {
+                    const message = err instanceof Error ? err.message : String(err);
+                    warnings.push(`Skipped deleting branch "${input.workspace.branchName}": ${message}`);
+                }
+            }
+        }
+    }
+    else if (input.workspace.providerType === "local_fs" && createdByRuntime && workspacePath) {
+        const projectWorkspaceCwd = input.projectWorkspace?.cwd ? path.resolve(input.projectWorkspace.cwd) : null;
+        const resolvedWorkspacePath = path.resolve(workspacePath);
+        const containsProjectWorkspace = projectWorkspaceCwd
+            ? (resolvedWorkspacePath === projectWorkspaceCwd ||
+                projectWorkspaceCwd.startsWith(`${resolvedWorkspacePath}${path.sep}`))
+            : false;
+        if (containsProjectWorkspace) {
+            warnings.push(`Refusing to remove path "${workspacePath}" because it contains the project workspace.`);
+        }
+        else {
+            await fs.rm(resolvedWorkspacePath, { recursive: true, force: true });
+            if (input.recorder) {
+                await input.recorder.recordOperation({
+                    phase: "workspace_teardown",
+                    cwd: projectWorkspaceCwd ?? process.cwd(),
+                    metadata: {
+                        workspaceId: input.workspace.id,
+                        workspacePath: resolvedWorkspacePath,
+                        cleanupAction: "remove_local_fs",
+                    },
+                    run: async () => ({
+                        status: "succeeded",
+                        exitCode: 0,
+                        system: `Removed local workspace directory ${resolvedWorkspacePath}\n`,
+                    }),
+                });
+            }
+        }
+    }
+    const cleaned = !workspacePath ||
+        !(await directoryExists(workspacePath));
+    return {
+        cleanedPath: workspacePath,
+        cleaned,
+        warnings,
+    };
+}
 async function allocatePort() {
     return await new Promise((resolve, reject) => {
         const server = net.createServer();
@@ -336,8 +671,9 @@ function resolveServiceScopeId(input) {
         : "run";
     if (scopeType === "project_workspace")
         return { scopeType, scopeId: input.workspace.workspaceId ?? input.workspace.projectId };
-    if (scopeType === "execution_workspace")
-        return { scopeType, scopeId: input.workspace.cwd };
+    if (scopeType === "execution_workspace") {
+        return { scopeType, scopeId: input.executionWorkspaceId ?? input.workspace.cwd };
+    }
     if (scopeType === "agent")
         return { scopeType, scopeId: input.agent.id };
     return { scopeType: "run", scopeId: input.runId };
@@ -371,6 +707,7 @@ function toPersistedWorkspaceRuntimeService(record) {
         companyId: record.companyId,
         projectId: record.projectId,
         projectWorkspaceId: record.projectWorkspaceId,
+        executionWorkspaceId: record.executionWorkspaceId,
         issueId: record.issueId,
         scopeType: record.scopeType,
         scopeId: record.scopeId,
@@ -406,6 +743,7 @@ async function persistRuntimeServiceRecord(db, record) {
         set: {
             projectId: values.projectId,
             projectWorkspaceId: values.projectWorkspaceId,
+            executionWorkspaceId: values.executionWorkspaceId,
             issueId: values.issueId,
             scopeType: values.scopeType,
             scopeId: values.scopeId,
@@ -444,7 +782,7 @@ export function normalizeAdapterManagedRuntimeServices(input) {
             (scopeType === "project_workspace"
                 ? input.workspace.workspaceId
                 : scopeType === "execution_workspace"
-                    ? input.workspace.cwd
+                    ? input.executionWorkspaceId ?? input.workspace.cwd
                     : scopeType === "agent"
                         ? input.agent.id
                         : input.runId) ??
@@ -468,6 +806,7 @@ export function normalizeAdapterManagedRuntimeServices(input) {
             companyId: input.agent.companyId,
             projectId: report.projectId ?? input.workspace.projectId,
             projectWorkspaceId: report.projectWorkspaceId ?? input.workspace.workspaceId,
+            executionWorkspaceId: input.executionWorkspaceId ?? null,
             issueId: report.issueId ?? input.issue?.id ?? null,
             serviceName,
             status,
@@ -510,7 +849,10 @@ async function startLocalRuntimeService(input) {
         port,
     });
     const serviceCwd = resolveConfiguredPath(renderTemplate(serviceCwdTemplate, templateData), input.workspace.cwd);
-    const env = { ...process.env, ...input.adapterEnv };
+    const env = {
+        ...sanitizeRuntimeServiceBaseEnv(process.env),
+        ...input.adapterEnv,
+    };
     for (const [key, value] of Object.entries(envConfig)) {
         if (typeof value === "string") {
             env[key] = renderTemplate(value, templateData);
@@ -524,7 +866,7 @@ async function startLocalRuntimeService(input) {
     const child = spawn(shell, ["-lc", command], {
         cwd: serviceCwd,
         env,
-        detached: false,
+        detached: process.platform !== "win32",
         stdio: ["ignore", "pipe", "pipe"],
     });
     let stderrExcerpt = "";
@@ -550,7 +892,7 @@ async function startLocalRuntimeService(input) {
         await waitForReadiness({ service: input.service, url });
     }
     catch (err) {
-        child.kill("SIGTERM");
+        terminateChildProcess(child);
         throw new Error(`Failed to start runtime service "${serviceName}": ${err instanceof Error ? err.message : String(err)}${stderrExcerpt ? ` | stderr: ${stderrExcerpt.trim()}` : ""}`);
     }
     const envFingerprint = createHash("sha256").update(stableStringify(envConfig)).digest("hex");
@@ -559,6 +901,7 @@ async function startLocalRuntimeService(input) {
         companyId: input.agent.companyId,
         projectId: input.workspace.projectId,
         projectWorkspaceId: input.workspace.workspaceId,
+        executionWorkspaceId: input.executionWorkspaceId ?? null,
         issueId: input.issue?.id ?? null,
         serviceName,
         status: "running",
@@ -605,8 +948,8 @@ async function stopRuntimeService(serviceId) {
     record.status = "stopped";
     record.lastUsedAt = new Date().toISOString();
     record.stoppedAt = new Date().toISOString();
-    if (record.child && !record.child.killed) {
-        record.child.kill("SIGTERM");
+    if (record.child && record.child.pid) {
+        terminateChildProcess(record.child);
     }
     runtimeServicesById.delete(serviceId);
     if (record.reuseKey) {
@@ -614,6 +957,19 @@ async function stopRuntimeService(serviceId) {
     }
     await persistRuntimeServiceRecord(record.db, record);
 }
+async function markPersistedRuntimeServicesStoppedForExecutionWorkspace(input) {
+    const now = new Date();
+    await input.db
+        .update(workspaceRuntimeServices)
+        .set({
+        status: "stopped",
+        healthStatus: "unknown",
+        stoppedAt: now,
+        lastUsedAt: now,
+        updatedAt: now,
+    })
+        .where(and(eq(workspaceRuntimeServices.executionWorkspaceId, input.executionWorkspaceId), inArray(workspaceRuntimeServices.status, ["starting", "running"])));
+}
 function registerRuntimeService(db, record) {
     record.db = db;
     runtimeServicesById.set(record.id, record);
@@ -650,6 +1006,7 @@ export async function ensureRuntimeServicesForRun(input) {
             const { scopeType, scopeId } = resolveServiceScopeId({
                 service,
                 workspace: input.workspace,
+                executionWorkspaceId: input.executionWorkspaceId,
                 issue: input.issue,
                 runId: input.runId,
                 agent: input.agent,
@@ -680,6 +1037,7 @@ export async function ensureRuntimeServicesForRun(input) {
                 agent: input.agent,
                 issue: input.issue,
                 workspace: input.workspace,
+                executionWorkspaceId: input.executionWorkspaceId,
                 adapterEnv: input.adapterEnv,
                 service,
                 onLog: input.onLog,
@@ -719,6 +1077,29 @@ export async function releaseRuntimeServicesForRun(runId) {
         }
     }
 }
+export async function stopRuntimeServicesForExecutionWorkspace(input) {
+    const normalizedWorkspaceCwd = input.workspaceCwd ? path.resolve(input.workspaceCwd) : null;
+    const matchingServiceIds = Array.from(runtimeServicesById.values())
+        .filter((record) => {
+        if (record.executionWorkspaceId === input.executionWorkspaceId)
+            return true;
+        if (!normalizedWorkspaceCwd || !record.cwd)
+            return false;
+        const resolvedCwd = path.resolve(record.cwd);
+        return (resolvedCwd === normalizedWorkspaceCwd ||
+            resolvedCwd.startsWith(`${normalizedWorkspaceCwd}${path.sep}`));
+    })
+        .map((record) => record.id);
+    for (const serviceId of matchingServiceIds) {
+        await stopRuntimeService(serviceId);
+    }
+    if (input.db) {
+        await markPersistedRuntimeServicesStoppedForExecutionWorkspace({
+            db: input.db,
+            executionWorkspaceId: input.executionWorkspaceId,
+        });
+    }
+}
 export async function listWorkspaceRuntimeServicesForProjectWorkspaces(db, companyId, projectWorkspaceIds) {
     if (projectWorkspaceIds.length === 0)
         return new Map();
@@ -779,6 +1160,7 @@ export async function persistAdapterManagedRuntimeServices(input) {
             companyId: ref.companyId,
             projectId: ref.projectId,
             projectWorkspaceId: ref.projectWorkspaceId,
+            executionWorkspaceId: ref.executionWorkspaceId,
             issueId: ref.issueId,
             scopeType: ref.scopeType,
             scopeId: ref.scopeId,
@@ -807,6 +1189,7 @@ export async function persistAdapterManagedRuntimeServices(input) {
             set: {
                 projectId: ref.projectId,
                 projectWorkspaceId: ref.projectWorkspaceId,
+                executionWorkspaceId: ref.executionWorkspaceId,
                 issueId: ref.issueId,
                 scopeType: ref.scopeType,
                 scopeId: ref.scopeId,