@cloudcli-ai/cloudcli 1.37.3 → 1.37.4

package/dist-server/server/modules/projects/projects.routes.js

@@ -1,11 +1,19 @@
 import express from 'express';
 import { createProject, updateProjectDisplayName } from '../../modules/projects/services/project-management.service.js';
+import { createProjectCloneRouter } from '../../modules/projects/project-clone.routes.js';
+import { createPendingCloneRequests } from '../../modules/projects/services/project-clone-request.service.js';
 import { startCloneProject } from '../../modules/projects/services/project-clone.service.js';
 import { getProjectTaskMaster } from '../../modules/projects/services/projects-has-taskmaster.service.js';
 import { AppError, asyncHandler, createApiSuccessResponse } from '../../shared/utils.js';
 import { getArchivedProjectsWithSessions, getProjectSessionsPage, getProjectsWithSessions } from '../../modules/projects/services/projects-with-sessions-fetch.service.js';
 import { deleteOrArchiveProject, restoreArchivedProject } from '../../modules/projects/services/project-delete.service.js';
 import { applyLegacyStarredProjectIds, toggleProjectStar } from '../../modules/projects/services/project-star.service.js';
+/**
+ * How long a posted clone request waits for its progress stream to be opened.
+ * The client opens the stream as soon as the POST resolves, so this only has
+ * to outlast a slow round trip.
+ */
+const PENDING_CLONE_REQUEST_TTL_MS = 60_000;
 const router = express.Router();
 function readQueryStringValue(value) {
     if (typeof value === 'string') {
@@ -38,15 +46,6 @@ function parseNonNegativeIntQuery(value, name, fallback) {
     }
     return parsedValue;
 }
-function resolveRouteErrorMessage(error) {
-    if (error instanceof AppError) {
-        return error.message;
-    }
-    if (error instanceof Error && error.message) {
-        return error.message;
-    }
-    return 'Failed to clone repository';
-}
 router.get('/', asyncHandler(async (req, res) => {
     const skipSynchronization = readQueryStringValue(req.query.skipSynchronization).trim() === '1' ||
         readQueryStringValue(req.query.skipSync).trim() === '1';
@@ -84,7 +83,7 @@ router.post('/create-project', asyncHandler(async (req, res) => {
         throw new AppError('Repository cloning is not supported on create-project', {
             code: 'CLONE_NOT_SUPPORTED_ON_CREATE_PROJECT',
             statusCode: 400,
-            details: 'Use /api/projects/clone-progress for cloning workflows',
+            details: 'Use /api/projects/clone for cloning workflows',
         });
     }
     const projectCreationResult = await createProject({
@@ -109,62 +108,10 @@ router.post('/migrate-legacy-stars', asyncHandler(async (req, res) => {
     const { updated } = applyLegacyStarredProjectIds(projectIds);
     res.json({ success: true, updated });
 }));
-router.get('/clone-progress', async (req, res) => {
-    res.setHeader('Content-Type', 'text/event-stream');
-    res.setHeader('Cache-Control', 'no-cache');
-    res.setHeader('Connection', 'keep-alive');
-    res.flushHeaders();
-    const sendEvent = (type, data) => {
-        if (res.writableEnded) {
-            return;
-        }
-        res.write(`data: ${JSON.stringify({ type, ...data })}\n\n`);
-    };
-    let cloneOperation = null;
-    const closeListener = () => {
-        cloneOperation?.cancel();
-    };
-    req.on('close', closeListener);
-    try {
-        const queryParams = req.query;
-        const workspacePath = readQueryStringValue(queryParams.path);
-        const githubUrl = readQueryStringValue(queryParams.githubUrl);
-        const githubTokenId = readOptionalNumericQueryValue(queryParams.githubTokenId);
-        const newGithubToken = readQueryStringValue(queryParams.newGithubToken) || null;
-        const authenticatedUser = req.user;
-        const userId = authenticatedUser?.id;
-        if (userId === undefined || userId === null) {
-            throw new AppError('Authenticated user is required', {
-                code: 'AUTHENTICATION_REQUIRED',
-                statusCode: 401,
-            });
-        }
-        cloneOperation = await startCloneProject({
-            workspacePath,
-            githubUrl,
-            githubTokenId,
-            newGithubToken,
-            userId,
-        }, {
-            onProgress: (message) => {
-                sendEvent('progress', { message });
-            },
-            onComplete: ({ project, message }) => {
-                sendEvent('complete', { project, message });
-            },
-        });
-        await cloneOperation.waitForCompletion;
-    }
-    catch (error) {
-        sendEvent('error', { message: resolveRouteErrorMessage(error) });
-    }
-    finally {
-        req.off('close', closeListener);
-        if (!res.writableEnded) {
-            res.end();
-        }
-    }
-});
+router.use(createProjectCloneRouter({
+    startCloneProject,
+    pendingCloneRequests: createPendingCloneRequests(PENDING_CLONE_REQUEST_TTL_MS),
+}));
 router.get('/:projectId/taskmaster', asyncHandler(async (req, res) => {
     const projectId = typeof req.params.projectId === 'string' ? req.params.projectId : '';
     const taskMasterDetails = await getProjectTaskMaster(projectId);

package/dist-server/server/modules/projects/projects.routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"projects.routes.js","sourceRoot":"","sources":["../../../../server/modules/projects/projects.routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"projects.routes.js","sourceRoot":"","sources":["../../../../server/modules/projects/projects.routes.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/projects/services/project-clone-request.service.js

@@ -0,0 +1,36 @@
+import { randomUUID } from 'node:crypto';
+/**
+ * Holds clone requests between the POST that submits them and the EventSource
+ * GET that runs them. The browser's EventSource can only issue a bare GET, so
+ * whatever it needs has to travel in the URL — and a URL is written to access
+ * logs, proxy logs and browser history. The token therefore arrives in a POST
+ * body and waits here, and the GET carries nothing but the opaque id.
+ *
+ * Every entry is bound to the user who posted it, is handed out once, and is
+ * dropped after `ttlMs` whether or not it was claimed.
+ */
+export function createPendingCloneRequests(ttlMs) {
+    const pending = new Map();
+    return {
+        add(userId, request) {
+            const cloneId = randomUUID();
+            const expiry = setTimeout(() => {
+                pending.delete(cloneId);
+            }, ttlMs);
+            // An abandoned request must not keep the process alive on shutdown.
+            expiry.unref();
+            pending.set(cloneId, { userId, request, expiry });
+            return cloneId;
+        },
+        claim(cloneId, userId) {
+            const entry = pending.get(cloneId);
+            if (!entry || entry.userId !== userId) {
+                return null;
+            }
+            clearTimeout(entry.expiry);
+            pending.delete(cloneId);
+            return entry.request;
+        },
+    };
+}
+//# sourceMappingURL=project-clone-request.service.js.map

package/dist-server/server/modules/projects/services/project-clone-request.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-clone-request.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-clone-request.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAoBzC;;;;;;;;;GASG;AACH,MAAM,UAAU,0BAA0B,CAAC,KAAa;IACtD,MAAM,OAAO,GAAG,IAAI,GAAG,EAA6B,CAAC;IAErD,OAAO;QACL,GAAG,CAAC,MAAM,EAAE,OAAO;YACjB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC7B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC1B,CAAC,EAAE,KAAK,CAAC,CAAC;YACV,oEAAoE;YACpE,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAClD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,KAAK,CAAC,OAAO,EAAE,MAAM;YACnB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACxB,OAAO,KAAK,CAAC,OAAO,CAAC;QACvB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist-server/server/modules/projects/services/project-clone.service.js

@@ -17,14 +17,39 @@ async function defaultPathExists(targetPath) {
         throw error;
     }
 }
-function sanitizeGitError(message, token) {
-    if (!message || !token) {
-        return message;
+/**
+ * The only origin the credential helper answers for. The token is a GitHub
+ * token; a helper that answered every challenge would hand it to whatever
+ * host the clone URL names — and over plain http, in the clear.
+ */
+const GITHUB_TOKEN_CREDENTIAL_SCOPE = 'credential.https://github.com.helper';
+/**
+ * Builds the environment the clone runs in. The token never goes into the
+ * clone URL: git echoes that URL on stderr (which is the SSE progress stream),
+ * it sits in the process argv (readable through /proc) and it is written to the
+ * cloned repo's `.git/config` as the remote. Instead env-only config points git
+ * at a credential helper that reads the token from its own environment, so no
+ * channel git exposes carries it. The empty first helper entry clears any
+ * helper configured on the machine so a credential stored there cannot shadow
+ * the one the user selected; the helper itself is scoped to github.com over
+ * https, so a clone from any other host gets no credential at all.
+ */
+function buildGitCloneEnvironment(githubToken) {
+    if (!githubToken) {
+        return { ...process.env, GIT_TERMINAL_PROMPT: '0' };
     }
-    const escapedToken = token.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    return message.replace(new RegExp(escapedToken, 'g'), '***');
+    return {
+        ...process.env,
+        GIT_CONFIG_COUNT: '2',
+        GIT_CONFIG_KEY_0: 'credential.helper',
+        GIT_CONFIG_VALUE_0: '',
+        GIT_CONFIG_KEY_1: GITHUB_TOKEN_CREDENTIAL_SCOPE,
+        GIT_CONFIG_VALUE_1: '!f() { echo username=x-access-token; echo "password=$CLOUDCLI_GITHUB_TOKEN"; }; f',
+        CLOUDCLI_GITHUB_TOKEN: githubToken,
+        GIT_TERMINAL_PROMPT: '0',
+    };
 }
-function resolveCloneFailureMessage(lastError, sanitizedError) {
+function resolveCloneFailureMessage(lastError) {
     if (lastError.includes('Authentication failed') || lastError.includes('could not read Username')) {
         return 'Authentication failed. Please check your credentials.';
     }
@@ -34,10 +59,7 @@ function resolveCloneFailureMessage(lastError, sanitizedError) {
     if (lastError.includes('already exists')) {
         return 'Directory already exists';
     }
-    if (sanitizedError) {
-        return sanitizedError;
-    }
-    return 'Git clone failed';
+    return lastError || 'Git clone failed';
 }
 function resolveErrorMessage(error) {
     if (error instanceof AppError) {
@@ -61,12 +83,9 @@ const defaultDependencies = {
         const tokenRow = githubTokensDb.getGithubTokenById(userId, tokenId);
         return tokenRow;
     },
-    spawnGitClone: (cloneUrl, clonePath) => spawn('git', ['clone', '--progress', '--', cloneUrl, clonePath], {
+    spawnGitClone: (cloneUrl, clonePath, environment) => spawn('git', ['clone', '--progress', '--', cloneUrl, clonePath], {
         stdio: ['ignore', 'pipe', 'pipe'],
-        env: {
-            ...process.env,
-            GIT_TERMINAL_PROMPT: '0',
-        },
+        env: environment,
     }),
     registerProject: async (projectPath, customName) => createProject({
         projectPath,
@@ -76,7 +95,36 @@ const defaultDependencies = {
         console.error(message, error);
     },
 };
-export async function startCloneProject(input, handlers, dependencies = defaultDependencies) {
+/**
+ * Whether a clone URL embeds a credential: any password, or a username on an
+ * http(s) URL. An SSH URL's `git@` is a login name, not a secret.
+ */
+function carriesCredentials(url) {
+    let parsed;
+    try {
+        parsed = new URL(url);
+    }
+    catch {
+        // scp-like `git@github.com:org/repo.git` and bare paths are not URLs;
+        // an scp-like user is an SSH login, which is not a credential.
+        return false;
+    }
+    if (parsed.password) {
+        return true;
+    }
+    return Boolean(parsed.username) && (parsed.protocol === 'http:' || parsed.protocol === 'https:');
+}
+function isParsableUrl(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export async function startCloneProject(input, handlers, dependencyOverrides = {}) {
+    const dependencies = { ...defaultDependencies, ...dependencyOverrides };
     const normalizedWorkspacePath = input.workspacePath.trim();
     const normalizedGithubUrl = input.githubUrl.trim();
     if (!normalizedWorkspacePath) {
@@ -97,6 +145,23 @@ export async function startCloneProject(input, handlers, dependencies = defaultD
             statusCode: 400,
         });
     }
+    // An http(s) string the URL parser rejects (a bad port, a space in the
+    // host) is one curl rejects too — but only after git has carried it, and
+    // any credential in it, on its command line.
+    if (/^https?:/i.test(normalizedGithubUrl) && !isParsableUrl(normalizedGithubUrl)) {
+        throw new AppError('Invalid githubUrl', {
+            code: 'INVALID_GITHUB_URL',
+            statusCode: 400,
+        });
+    }
+    if (carriesCredentials(normalizedGithubUrl)) {
+        // The token field is the only way in: a credential in the URL would ride
+        // git's argv, its stderr and the clone's `.git/config`.
+        throw new AppError('Put the token in the token field, not in the URL', {
+            code: 'GITHUB_URL_CARRIES_CREDENTIALS',
+            statusCode: 400,
+        });
+    }
     const pathValidation = await dependencies.validatePath(normalizedWorkspacePath);
     if (!pathValidation.valid || !pathValidation.resolvedPath) {
         throw new AppError(pathValidation.error || 'Invalid workspace path', {
@@ -136,21 +201,11 @@ export async function startCloneProject(input, handlers, dependencies = defaultD
             statusCode: 409,
         });
     }
-    let cloneUrl = normalizedGithubUrl;
-    if (githubToken) {
-        try {
-            const url = new URL(normalizedGithubUrl);
-            url.username = githubToken;
-            url.password = '';
-            cloneUrl = url.toString();
-        }
-        catch {
-            // SSH URLs cannot be represented by URL constructor and are used as-is.
-        }
-    }
     handlers.onProgress(`Cloning into '${repoName}'...`);
-    const gitProcess = dependencies.spawnGitClone(cloneUrl, clonePath);
+    const gitProcess = dependencies.spawnGitClone(normalizedGithubUrl, clonePath, buildGitCloneEnvironment(githubToken));
     let lastError = '';
+    // `git clone --progress` writes every byte of its progress to stderr. Git
+    // was handed a credential-free URL, so each chunk is forwarded as it arrives.
     gitProcess.stdout?.on('data', (data) => {
         const message = data.toString().trim();
         if (message) {
@@ -159,8 +214,8 @@ export async function startCloneProject(input, handlers, dependencies = defaultD
     });
     gitProcess.stderr?.on('data', (data) => {
         const message = data.toString().trim();
-        lastError = message;
         if (message) {
+            lastError = message;
             handlers.onProgress(message);
         }
     });
@@ -183,8 +238,7 @@ export async function startCloneProject(input, handlers, dependencies = defaultD
                 }
                 return;
             }
-            const sanitizedError = sanitizeGitError(lastError, githubToken);
-            const errorMessage = resolveCloneFailureMessage(lastError, sanitizedError);
+            const errorMessage = resolveCloneFailureMessage(lastError);
             try {
                 await dependencies.removePath(clonePath);
             }

package/dist-server/server/modules/projects/services/project-clone.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-clone.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-clone.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project-clone.service.js","sourceRoot":"","sources":["../../../../../server/modules/projects/services/project-clone.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/projects/tests/project-clone.routes.test.js

@@ -0,0 +1,191 @@
+import assert from 'node:assert/strict';
+import { once } from 'node:events';
+import test from 'node:test';
+import express from 'express';
+import { createProjectCloneRouter } from '../../../modules/projects/project-clone.routes.js';
+import { createPendingCloneRequests } from '../../../modules/projects/services/project-clone-request.service.js';
+import { AppError } from '../../../shared/utils.js';
+/**
+ * A clone runner that reports one progress line and completes at once. What
+ * it was asked to clone is recorded so a test can check the request survived
+ * the POST -> claim -> run hand-off intact.
+ */
+function createFakeCloneRunner(inputs) {
+    return async (input, handlers) => {
+        inputs.push(input);
+        handlers.onProgress('Receiving objects: 100% (20/20), done.');
+        handlers.onComplete({ project: { projectId: 'project-1' }, message: 'Repository cloned successfully' });
+        return { waitForCompletion: Promise.resolve(), cancel: () => undefined };
+    };
+}
+const unexpectedCloneRunner = async () => {
+    throw new Error('startCloneProject must not run before the progress stream is opened');
+};
+// The auth middleware is mounted ahead of the router in production; here the
+// `x-user-id` header plays its part so a test can act as two different users.
+async function withProjectsServer(options, run) {
+    const app = express();
+    app.use(express.json());
+    app.use((req, _res, next) => {
+        const userId = req.header('x-user-id');
+        if (userId) {
+            req.user = { id: Number(userId) };
+        }
+        next();
+    });
+    app.use('/api/projects', createProjectCloneRouter({
+        startCloneProject: options.startCloneProject,
+        pendingCloneRequests: createPendingCloneRequests(options.pendingCloneTtlMs ?? 60_000),
+    }));
+    app.use((error, _req, res, _next) => {
+        if (error instanceof AppError) {
+            res.status(error.statusCode).json({ error: error.code });
+            return;
+        }
+        res.status(500).json({ error: 'INTERNAL_ERROR' });
+    });
+    const server = app.listen(0, '127.0.0.1');
+    await once(server, 'listening');
+    try {
+        const address = server.address();
+        await run(`http://127.0.0.1:${address.port}`);
+    }
+    finally {
+        await new Promise((resolve, reject) => {
+            server.close((error) => error ? reject(error) : resolve());
+        });
+    }
+}
+const cloneBody = {
+    path: '/workspace/root',
+    githubUrl: 'https://github.com/example/repo.git',
+    githubTokenId: null,
+    newGithubToken: 'ghp_supersecrettoken1234567890abcd',
+};
+async function postClone(baseUrl, userId, body = cloneBody) {
+    const response = await fetch(`${baseUrl}/api/projects/clone`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json', 'x-user-id': String(userId) },
+        body: JSON.stringify(body),
+    });
+    return { status: response.status, body: await response.json() };
+}
+async function openProgress(baseUrl, userId, cloneId) {
+    const response = await fetch(`${baseUrl}/api/projects/clone-progress?cloneId=${encodeURIComponent(cloneId)}`, { headers: { 'x-user-id': String(userId) } });
+    const text = await response.text();
+    const events = text
+        .split('\n\n')
+        .filter((frame) => frame.startsWith('data: '))
+        .map((frame) => JSON.parse(frame.slice('data: '.length)));
+    return { status: response.status, contentType: response.headers.get('content-type') ?? '', text, events };
+}
+test('POST /clone parks the request under a fresh id without spawning anything', async () => {
+    await withProjectsServer({ startCloneProject: unexpectedCloneRunner }, async (baseUrl) => {
+        const first = await postClone(baseUrl, 1);
+        const second = await postClone(baseUrl, 1);
+        assert.equal(first.status, 200);
+        assert.match(first.body.cloneId ?? '', /^[0-9a-f-]{36}$/);
+        assert.notEqual(first.body.cloneId, second.body.cloneId);
+    });
+});
+test('POST /clone requires an authenticated user', async () => {
+    await withProjectsServer({ startCloneProject: unexpectedCloneRunner }, async (baseUrl) => {
+        const response = await fetch(`${baseUrl}/api/projects/clone`, {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(cloneBody),
+        });
+        assert.equal(response.status, 401);
+    });
+});
+test('GET /clone-progress streams the clone the id names, then retires the id', async () => {
+    const inputs = [];
+    await withProjectsServer({ startCloneProject: createFakeCloneRunner(inputs) }, async (baseUrl) => {
+        const { body } = await postClone(baseUrl, 7, { ...cloneBody, githubTokenId: 12, newGithubToken: null });
+        assert.equal(inputs.length, 0, 'the POST alone must not start a clone');
+        const stream = await openProgress(baseUrl, 7, body.cloneId ?? '');
+        assert.equal(stream.status, 200);
+        assert.match(stream.contentType, /^text\/event-stream/);
+        assert.deepEqual(stream.events.map((event) => event.type), ['progress', 'complete']);
+        assert.equal(stream.events[0]?.message, 'Receiving objects: 100% (20/20), done.');
+        assert.deepEqual(inputs, [{
+                workspacePath: '/workspace/root',
+                githubUrl: 'https://github.com/example/repo.git',
+                githubTokenId: 12,
+                newGithubToken: null,
+                userId: 7,
+            }]);
+        const replay = await openProgress(baseUrl, 7, body.cloneId ?? '');
+        assert.equal(replay.status, 404, 'a claimed id must not run the clone twice');
+    });
+});
+test('GET /clone-progress hands the posted token to the clone without it touching the URL', async () => {
+    const inputs = [];
+    await withProjectsServer({ startCloneProject: createFakeCloneRunner(inputs) }, async (baseUrl) => {
+        const { body } = await postClone(baseUrl, 1);
+        const stream = await openProgress(baseUrl, 1, body.cloneId ?? '');
+        assert.equal(stream.status, 200);
+        assert.equal(inputs[0]?.newGithubToken, cloneBody.newGithubToken);
+        assert.ok(!(body.cloneId ?? '').includes(cloneBody.newGithubToken));
+    });
+});
+test('GET /clone-progress rejects an unknown id with 404', async () => {
+    await withProjectsServer({ startCloneProject: unexpectedCloneRunner }, async (baseUrl) => {
+        const stream = await openProgress(baseUrl, 1, 'not-a-clone-id');
+        assert.equal(stream.status, 404);
+        assert.deepEqual(JSON.parse(stream.text), { error: 'CLONE_REQUEST_NOT_FOUND' });
+    });
+});
+test('GET /clone-progress rejects another user id with 404 and keeps it for its owner', async () => {
+    const inputs = [];
+    await withProjectsServer({ startCloneProject: createFakeCloneRunner(inputs) }, async (baseUrl) => {
+        const { body } = await postClone(baseUrl, 1);
+        const foreign = await openProgress(baseUrl, 2, body.cloneId ?? '');
+        assert.equal(foreign.status, 404);
+        assert.equal(inputs.length, 0, 'a foreign claim must not run the clone');
+        const owner = await openProgress(baseUrl, 1, body.cloneId ?? '');
+        assert.equal(owner.status, 200);
+        assert.equal(inputs[0]?.userId, 1);
+    });
+});
+test('GET /clone-progress rejects an expired id with 404', async () => {
+    await withProjectsServer({ startCloneProject: unexpectedCloneRunner, pendingCloneTtlMs: 20 }, async (baseUrl) => {
+        const { body } = await postClone(baseUrl, 1);
+        await new Promise((resolve) => setTimeout(resolve, 60));
+        const stream = await openProgress(baseUrl, 1, body.cloneId ?? '');
+        assert.equal(stream.status, 404);
+    });
+});
+test('GET /clone-progress cancels a clone whose client left before the git process existed', async () => {
+    // The close listener could only cancel an operation it already had; a
+    // client gone during validation left git cloning for nobody, under an id
+    // no reconnect could reach.
+    let releaseStart = () => undefined;
+    const started = new Promise((resolve) => { releaseStart = resolve; });
+    let cancelled = 0;
+    let resolveRun = () => undefined;
+    const runFinished = new Promise((resolve) => { resolveRun = resolve; });
+    const slowRunner = async () => {
+        await started;
+        return {
+            waitForCompletion: new Promise((resolve) => { setTimeout(resolve, 20); }).then(() => resolveRun()),
+            cancel: () => { cancelled += 1; },
+        };
+    };
+    await withProjectsServer({ startCloneProject: slowRunner }, async (baseUrl) => {
+        const { body } = await postClone(baseUrl, 1);
+        const controller = new AbortController();
+        const request = fetch(`${baseUrl}/api/projects/clone-progress?cloneId=${encodeURIComponent(body.cloneId ?? '')}`, { headers: { 'x-user-id': '1' }, signal: controller.signal });
+        // Headers are flushed before the runner is awaited; drop the client
+        // while the runner is still "validating".
+        await new Promise((resolve) => { setTimeout(resolve, 50); });
+        controller.abort();
+        await request.catch(() => undefined);
+        await new Promise((resolve) => { setTimeout(resolve, 50); });
+        assert.equal(cancelled, 0, 'nothing to cancel yet');
+        releaseStart();
+        await runFinished;
+        assert.equal(cancelled, 1, 'the operation is cancelled as soon as it exists');
+    });
+});
+//# sourceMappingURL=project-clone.routes.test.js.map

package/dist-server/server/modules/projects/tests/project-clone.routes.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-clone.routes.test.js","sourceRoot":"","sources":["../../../../../server/modules/projects/tests/project-clone.routes.test.ts"],"names":[],"mappings":"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"}