Method merge

packages/server/src/services/workspace.service.ts:1857–1877

(id: string, commitMessageOrOptions?: string | MergeWorkspaceOptions)

        // worktree 清理失败时记录警告但不阻断删除
        console.warn(
          `[WorkspaceService] Failed to remove worktree for workspace ${id}: ${err instanceof Error ? err.message : err}`
        );
      }
    }

    // 删除数据库记录（级联删除 sessions/services）
    await this.backgroundService.releaseLogsForWorkspace?.(id);
    await prisma.workspace.delete({ where: { id } });
    return true;
  }

  // ── Diff ─────────────────────────────────────────────────────────────────────

  async getDiff(id: string) {
    const workspace = await prisma.workspace.findUnique({
      where: { id },
      include: { task: { include: { project: true } } },
    });

    if (!workspace) {
      throw new NotFoundError('Workspace', id);
    }
    ensureProjectIsMutable(workspace.task.project, 'read workspace diff');
    this.assertWorktreeWorkspace(workspace);