mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-07-09 07:25:43 +08:00
* fix: don't overlap thinking banner over conversation * feat: support message queue and add attention indicator * fix(shell): use c to copy for claude * fix: strip timestamp tags from cursor * fix: select project when loading session from direct URL * feat: support attached images for all providers * feat(opencode): support permission options * fix: resolve source control and chat UX bugs - make staging real in the git panel: new /stage and /unstage endpoints, /status now reports the actual index via porcelain -z (handles renames, conflicts, and paths with spaces), and Stage/Unstage All run real git commands instead of toggling client-side state - add branch search to the header dropdown and Branches tab - persist the chosen permission mode per provider so a brand-new chat keeps it once the session id arrives, instead of reverting to default - replace cmdk's fuzzy model search with strict token matching so "chatgpt" no longer surfaces unrelated models - unit tests for the git status parser * feat(git): commit graph in history view and cross-spawn everywhere - render a VSCode-style commit graph in the source control history: lane-assignment algorithm, SVG strip with colored rails, merge and branch curves, commit dots, and branch/tag badges per commit - /commits returns parents and ref decorations across all branches (--branches --remotes --tags --topo-order) using unit-separator fields so pipes in commit subjects can't break parsing - collect stats via a single --shortstat pass instead of one `git show --stat` call per commit; raise the history limit to 50 - replace child_process spawn with cross-spawn in all runtimes, routes, and services: it resolves .cmd shims and PATHEXT on Windows (fixing taskmaster's npx invocations) and delegates to native spawn elsewhere, removing the per-file win32 ternaries - unit tests for the log parser and lane assignment * fix: remove gemini support since google discontinued it * fix: address code review findings - validate chat image attachments server-side: only files inside the ~/.cloudcli/assets upload store may reach provider file reads - harden asset serving with nosniff and attachment disposition for SVGs to prevent stored XSS - show the timestamp on image-only user messages - serialize git stage/unstage calls and defer the status re-sync so rapid toggles can't interleave or flicker - use a literal hex fallback for commit ref badges (alpha suffix on a var() string produced invalid CSS) - stop binding a URL session to a guening project instead - add the missing attentionRequiredIndicator key to all sidebar locales - clean up dangling conjunctions left the de/ru/tr/ja/zh-CN/zh-TW READMEs * fix: address code scanning findings - enforce a second image trust boundary in the provider builders: buildClaudeUserContent/buildCodexInputItems only accept files inside the upload store or the run's working directory (CodeQL path injection) - drop an always-true selectedProject check in handleSubmit - remove the unused resume option from spawnCursor * fix: use CodeQL-recognized containment check for image reads Replace the path.relative guard in isPathInsideDirectory with the resolve + startsWith(root + sep) idiom so the path-injection barrier is visible to code scanning; behavior is unchanged. * fix(security): canonicalize Claude image attachment reads Resolve image attachment paths with realpath before reading so symlinks inside allowed roots cannot escape to arbitrary files. Preserve support for symlinked project/upload roots and add focused coverage for both cases. * fix: show agent subtask * fix(sessions): title app-created sessions from the first user message App-created sessions (started by sending a message from cloudcli) were titled with placeholder names — "Untitled Codex Session" from the disk indexer and, briefly, "New session" from the empty canonical upsert — before a later sync finally settled on the right text, causing the sidebar title to flicker. - Codex/OpenCode synchronizers now title app-created sessions (distinct app id mapped to a provider id) from the first user message, while sessions found purely by indexing keep their existing setup. Claude keeps its AI-generated titles; Cursor already used the first message. - Decode OpenCode's JSON-string-literal prompts so titles no longer surface wrapped in quotes; hoist unwrapJsonStringLiteral into shared/utils since it's now used by both the reader and synchronizer. - Guard the sidebar upsert merge so an empty summary can never blank out a title that is already set. - Add codex/opencode synchronizer tests for the app-created vs indexed naming paths. * fix(chat): make message queuing reliable across sessions and turn boundaries Queued messages had four related defects: - A queued message flashed and then vanished at flush time: concurrent transcript refreshes (the `complete` handler racing the watcher-triggered update) could resolve out of order, letting a stale response overwrite newer server messages after the optimistic row was pruned. Session slots now carry a monotonic fetch ticket and discard stale fetch/refresh/ fetchMore responses. - Switching sessions flushed the previous session's queued draft into the newly viewed one (sending it with the wrong provider's settings, e.g. a Claude model into a Codex session). The composer flush is now scoped to its session, and a draft restored into an idle session sends after a short grace period so a live-run ack can cancel it. - The thinking banner never appeared for a queued turn: the chat handler's session-keyed completeRun safety net could fire after a queued message had already started the session's next run, emitting a spurious `complete` that killed it. The safety net is now scoped to its own run via completeRunIfCurrent (with a regression test). - Queued messages only sent while their session was being viewed. Drafts now persist their send options (model, effort, permissions) at queue time, and a new app-level useQueuedMessageAutoSend hook dispatches a non-viewed session's queued message as soon as its run completes, using the storage key as the claim ticket to prevent double sends.
324 lines
9.4 KiB
TypeScript
324 lines
9.4 KiB
TypeScript
import { access, mkdir, rm } from 'node:fs/promises';
|
|
import path from 'node:path';
|
|
|
|
// cross-spawn: drop-in spawn with Windows .cmd/PATHEXT resolution.
|
|
import spawn from 'cross-spawn';
|
|
|
|
import { githubTokensDb } from '@/modules/database/index.js';
|
|
import { createProject } from '@/modules/projects/services/project-management.service.js';
|
|
import type { WorkspacePathValidationResult } from '@/shared/types.js';
|
|
import { AppError, validateWorkspacePath } from '@/shared/utils.js';
|
|
|
|
type CloneProjectInput = {
|
|
workspacePath: string;
|
|
githubUrl: string;
|
|
githubTokenId?: number | null;
|
|
newGithubToken?: string | null;
|
|
userId: number | string;
|
|
};
|
|
|
|
type CloneCompletePayload = {
|
|
project: Record<string, unknown>;
|
|
message: string;
|
|
};
|
|
|
|
type CloneProjectEventHandlers = {
|
|
onProgress: (message: string) => void;
|
|
onComplete: (payload: CloneCompletePayload) => void;
|
|
};
|
|
|
|
type GitCloneProcess = {
|
|
stdout: NodeJS.ReadableStream | null;
|
|
stderr: NodeJS.ReadableStream | null;
|
|
on(event: 'close', listener: (code: number | null) => void): void;
|
|
on(event: 'error', listener: (error: NodeJS.ErrnoException) => void): void;
|
|
kill(): void;
|
|
};
|
|
|
|
type CloneProjectDependencies = {
|
|
validatePath: (requestedPath: string) => Promise<WorkspacePathValidationResult>;
|
|
ensureDirectory: (directoryPath: string) => Promise<void>;
|
|
pathExists: (targetPath: string) => Promise<boolean>;
|
|
removePath: (targetPath: string) => Promise<void>;
|
|
getGithubTokenById: (
|
|
tokenId: number,
|
|
userId: number,
|
|
) => Promise<{ github_token: string } | null>;
|
|
spawnGitClone: (cloneUrl: string, clonePath: string) => GitCloneProcess;
|
|
registerProject: (projectPath: string, customName: string) => Promise<{ project: Record<string, unknown> }>;
|
|
logError: (message: string, error: unknown) => void;
|
|
};
|
|
|
|
export type CloneProjectOperation = {
|
|
waitForCompletion: Promise<void>;
|
|
cancel: () => void;
|
|
};
|
|
|
|
async function defaultPathExists(targetPath: string): Promise<boolean> {
|
|
try {
|
|
await access(targetPath);
|
|
return true;
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
|
|
return false;
|
|
}
|
|
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
function sanitizeGitError(message: string, token: string | null): string {
|
|
if (!message || !token) {
|
|
return message;
|
|
}
|
|
|
|
const escapedToken = token.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
return message.replace(new RegExp(escapedToken, 'g'), '***');
|
|
}
|
|
|
|
function resolveCloneFailureMessage(lastError: string, sanitizedError: string): string {
|
|
if (lastError.includes('Authentication failed') || lastError.includes('could not read Username')) {
|
|
return 'Authentication failed. Please check your credentials.';
|
|
}
|
|
|
|
if (lastError.includes('Repository not found')) {
|
|
return 'Repository not found. Please check the URL and ensure you have access.';
|
|
}
|
|
|
|
if (lastError.includes('already exists')) {
|
|
return 'Directory already exists';
|
|
}
|
|
|
|
if (sanitizedError) {
|
|
return sanitizedError;
|
|
}
|
|
|
|
return 'Git clone failed';
|
|
}
|
|
|
|
function resolveErrorMessage(error: unknown): string {
|
|
if (error instanceof AppError) {
|
|
return error.message;
|
|
}
|
|
|
|
if (error instanceof Error && error.message) {
|
|
return error.message;
|
|
}
|
|
|
|
return 'Unexpected error';
|
|
}
|
|
|
|
const defaultDependencies: CloneProjectDependencies = {
|
|
validatePath: validateWorkspacePath,
|
|
ensureDirectory: async (directoryPath: string): Promise<void> => {
|
|
await mkdir(directoryPath, { recursive: true });
|
|
},
|
|
pathExists: defaultPathExists,
|
|
removePath: async (targetPath: string): Promise<void> => {
|
|
await rm(targetPath, { recursive: true, force: true });
|
|
},
|
|
getGithubTokenById: async (
|
|
tokenId: number,
|
|
userId: number,
|
|
): Promise<{ github_token: string } | null> => {
|
|
const tokenRow = githubTokensDb.getGithubTokenById(userId, tokenId) as
|
|
| { github_token: string }
|
|
| null;
|
|
return tokenRow;
|
|
},
|
|
spawnGitClone: (cloneUrl: string, clonePath: string): GitCloneProcess =>
|
|
spawn('git', ['clone', '--progress', '--', cloneUrl, clonePath], {
|
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
env: {
|
|
...process.env,
|
|
GIT_TERMINAL_PROMPT: '0',
|
|
},
|
|
}) as unknown as GitCloneProcess,
|
|
registerProject: async (
|
|
projectPath: string,
|
|
customName: string,
|
|
): Promise<{ project: Record<string, unknown> }> =>
|
|
createProject({
|
|
projectPath,
|
|
customName,
|
|
}) as Promise<{ project: Record<string, unknown> }>,
|
|
logError: (message: string, error: unknown): void => {
|
|
console.error(message, error);
|
|
},
|
|
};
|
|
|
|
export async function startCloneProject(
|
|
input: CloneProjectInput,
|
|
handlers: CloneProjectEventHandlers,
|
|
dependencies: CloneProjectDependencies = defaultDependencies,
|
|
): Promise<CloneProjectOperation> {
|
|
const normalizedWorkspacePath = input.workspacePath.trim();
|
|
const normalizedGithubUrl = input.githubUrl.trim();
|
|
|
|
if (!normalizedWorkspacePath) {
|
|
throw new AppError('workspacePath and githubUrl are required', {
|
|
code: 'WORKSPACE_PATH_REQUIRED',
|
|
statusCode: 400,
|
|
});
|
|
}
|
|
|
|
if (!normalizedGithubUrl) {
|
|
throw new AppError('workspacePath and githubUrl are required', {
|
|
code: 'GITHUB_URL_REQUIRED',
|
|
statusCode: 400,
|
|
});
|
|
}
|
|
|
|
if (normalizedGithubUrl.startsWith('-')) {
|
|
throw new AppError('Invalid githubUrl', {
|
|
code: 'INVALID_GITHUB_URL',
|
|
statusCode: 400,
|
|
});
|
|
}
|
|
|
|
const pathValidation = await dependencies.validatePath(normalizedWorkspacePath);
|
|
if (!pathValidation.valid || !pathValidation.resolvedPath) {
|
|
throw new AppError(pathValidation.error || 'Invalid workspace path', {
|
|
code: 'INVALID_PROJECT_PATH',
|
|
statusCode: 400,
|
|
});
|
|
}
|
|
|
|
const absolutePath = pathValidation.resolvedPath;
|
|
await dependencies.ensureDirectory(absolutePath);
|
|
|
|
let githubToken: string | null = null;
|
|
if (typeof input.githubTokenId === 'number') {
|
|
const numericUserId =
|
|
typeof input.userId === 'number' ? input.userId : Number.parseInt(String(input.userId), 10);
|
|
if (Number.isNaN(numericUserId)) {
|
|
throw new AppError('Authenticated user is required', {
|
|
code: 'AUTHENTICATION_REQUIRED',
|
|
statusCode: 401,
|
|
});
|
|
}
|
|
|
|
const token = await dependencies.getGithubTokenById(input.githubTokenId, numericUserId);
|
|
if (!token) {
|
|
throw new AppError('GitHub token not found', {
|
|
code: 'GITHUB_TOKEN_NOT_FOUND',
|
|
statusCode: 404,
|
|
});
|
|
}
|
|
|
|
githubToken = token.github_token;
|
|
} else if (input.newGithubToken && input.newGithubToken.trim().length > 0) {
|
|
githubToken = input.newGithubToken.trim();
|
|
}
|
|
|
|
const sanitizedGithubUrl = normalizedGithubUrl.replace(/\/+$/, '').replace(/\.git$/, '');
|
|
const repoName = sanitizedGithubUrl.split('/').pop() || 'repository';
|
|
const clonePath = path.join(absolutePath, repoName);
|
|
|
|
if (await dependencies.pathExists(clonePath)) {
|
|
throw new AppError(
|
|
`Directory "${repoName}" already exists. Please choose a different location or remove the existing directory.`,
|
|
{
|
|
code: 'CLONE_TARGET_ALREADY_EXISTS',
|
|
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);
|
|
let lastError = '';
|
|
|
|
gitProcess.stdout?.on('data', (data: Buffer | string) => {
|
|
const message = data.toString().trim();
|
|
if (message) {
|
|
handlers.onProgress(message);
|
|
}
|
|
});
|
|
|
|
gitProcess.stderr?.on('data', (data: Buffer | string) => {
|
|
const message = data.toString().trim();
|
|
lastError = message;
|
|
if (message) {
|
|
handlers.onProgress(message);
|
|
}
|
|
});
|
|
|
|
const waitForCompletion = new Promise<void>((resolve, reject) => {
|
|
gitProcess.on('close', async (code) => {
|
|
if (code === 0) {
|
|
try {
|
|
const createdProject = await dependencies.registerProject(clonePath, repoName);
|
|
handlers.onComplete({
|
|
project: createdProject.project,
|
|
message: 'Repository cloned successfully',
|
|
});
|
|
resolve();
|
|
} catch (error) {
|
|
reject(
|
|
new AppError(`Clone succeeded but failed to add project: ${resolveErrorMessage(error)}`, {
|
|
code: 'CLONE_PROJECT_REGISTRATION_FAILED',
|
|
statusCode: 500,
|
|
}),
|
|
);
|
|
}
|
|
return;
|
|
}
|
|
|
|
const sanitizedError = sanitizeGitError(lastError, githubToken);
|
|
const errorMessage = resolveCloneFailureMessage(lastError, sanitizedError);
|
|
|
|
try {
|
|
await dependencies.removePath(clonePath);
|
|
} catch (cleanupError) {
|
|
dependencies.logError('Failed to clean up after clone failure:', cleanupError);
|
|
}
|
|
|
|
reject(
|
|
new AppError(errorMessage, {
|
|
code: 'GIT_CLONE_FAILED',
|
|
statusCode: 500,
|
|
}),
|
|
);
|
|
});
|
|
|
|
gitProcess.on('error', (error) => {
|
|
if (error.code === 'ENOENT') {
|
|
reject(
|
|
new AppError('Git is not installed or not in PATH', {
|
|
code: 'GIT_NOT_FOUND',
|
|
statusCode: 500,
|
|
}),
|
|
);
|
|
return;
|
|
}
|
|
|
|
reject(
|
|
new AppError(error.message, {
|
|
code: 'GIT_EXECUTION_FAILED',
|
|
statusCode: 500,
|
|
}),
|
|
);
|
|
});
|
|
});
|
|
|
|
return {
|
|
waitForCompletion,
|
|
cancel: () => {
|
|
gitProcess.kill();
|
|
},
|
|
};
|
|
}
|