mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-07-09 07:25:43 +08:00
Fix/resolve different bugs (#964)
* 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.
This commit is contained in:
106
server/routes/git.test.js
Normal file
106
server/routes/git.test.js
Normal file
@@ -0,0 +1,106 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
|
||||
import { parseGitLogWithStats, parseGitStatusOutput } from './git.js';
|
||||
|
||||
// Builds `git status --porcelain=v1 -z` output: NUL-separated entries with a
|
||||
// trailing NUL, exactly as git emits it.
|
||||
const porcelain = (...entries) => entries.join('\0') + '\0';
|
||||
|
||||
test('parseGitStatusOutput buckets files and reports index-side staging', () => {
|
||||
const output = porcelain(
|
||||
'M staged-modified.ts',
|
||||
' M unstaged-modified.ts',
|
||||
'MM staged-and-unstaged.ts',
|
||||
'A staged-new.ts',
|
||||
'D staged-deleted.ts',
|
||||
' D unstaged-deleted.ts',
|
||||
'?? untracked.ts',
|
||||
);
|
||||
|
||||
const result = parseGitStatusOutput(output);
|
||||
|
||||
assert.deepEqual(result.modified, ['staged-modified.ts', 'unstaged-modified.ts', 'staged-and-unstaged.ts']);
|
||||
assert.deepEqual(result.added, ['staged-new.ts']);
|
||||
assert.deepEqual(result.deleted, ['staged-deleted.ts', 'unstaged-deleted.ts']);
|
||||
assert.deepEqual(result.untracked, ['untracked.ts']);
|
||||
// Only index-side (X) changes count as staged.
|
||||
assert.deepEqual(result.staged, [
|
||||
'staged-modified.ts',
|
||||
'staged-and-unstaged.ts',
|
||||
'staged-new.ts',
|
||||
'staged-deleted.ts',
|
||||
]);
|
||||
});
|
||||
|
||||
test('parseGitStatusOutput keeps paths with spaces intact (-z output has no quoting)', () => {
|
||||
const result = parseGitStatusOutput(porcelain('M src/my folder/some file.ts'));
|
||||
assert.deepEqual(result.modified, ['src/my folder/some file.ts']);
|
||||
assert.deepEqual(result.staged, ['src/my folder/some file.ts']);
|
||||
});
|
||||
|
||||
test('parseGitStatusOutput tracks the post-rename path and skips the original', () => {
|
||||
const output = porcelain('R renamed-to.ts', 'renamed-from.ts', ' M other.ts');
|
||||
const result = parseGitStatusOutput(output);
|
||||
|
||||
assert.deepEqual(result.modified, ['renamed-to.ts', 'other.ts']);
|
||||
assert.deepEqual(result.staged, ['renamed-to.ts']);
|
||||
// The pre-rename path is metadata, not a change entry.
|
||||
assert.equal(JSON.stringify(result).includes('renamed-from.ts'), false);
|
||||
});
|
||||
|
||||
test('parseGitStatusOutput never reports merge conflicts as staged', () => {
|
||||
const output = porcelain('UU conflicted.ts', 'AA both-added.ts', 'DD both-deleted.ts');
|
||||
const result = parseGitStatusOutput(output);
|
||||
|
||||
assert.deepEqual(result.modified, ['conflicted.ts', 'both-added.ts', 'both-deleted.ts']);
|
||||
assert.deepEqual(result.staged, []);
|
||||
});
|
||||
|
||||
test('parseGitStatusOutput handles empty output', () => {
|
||||
assert.deepEqual(parseGitStatusOutput(''), {
|
||||
modified: [],
|
||||
added: [],
|
||||
deleted: [],
|
||||
untracked: [],
|
||||
staged: [],
|
||||
});
|
||||
});
|
||||
|
||||
// Builds one `git log --pretty=format:%H%x1f%P%x1f%D%x1f%an%x1f%ae%x1f%ad%x1f%s` line.
|
||||
const US = '';
|
||||
const logLine = (hash, parents, refs, subject) =>
|
||||
[hash, parents, refs, 'Alice', 'a@x.com', '2026-07-06T10:00:00+03:00', subject].join(US);
|
||||
|
||||
test('parseGitLogWithStats parses commits with parents, refs, and shortstat lines', () => {
|
||||
const output = [
|
||||
logLine('c3', 'c2', 'HEAD -> main, origin/main, tag: v1.0', 'feat: add | pipes | to subject'),
|
||||
' 3 files changed, 10 insertions(+), 2 deletions(-)',
|
||||
'',
|
||||
logLine('c2', 'c1 c0', '', 'Merge branch feature'),
|
||||
'',
|
||||
logLine('c0', '', '', 'initial commit'),
|
||||
' 1 file changed, 1 insertion(+)',
|
||||
].join('\n');
|
||||
|
||||
const commits = parseGitLogWithStats(output);
|
||||
|
||||
assert.equal(commits.length, 3);
|
||||
assert.deepEqual(commits[0].parents, ['c2']);
|
||||
assert.deepEqual(commits[0].refs, ['HEAD -> main', 'origin/main', 'tag: v1.0']);
|
||||
// Pipes in the subject survive because fields are joined with .
|
||||
assert.equal(commits[0].message, 'feat: add | pipes | to subject');
|
||||
assert.equal(commits[0].stats, '3 files changed, 10 insertions(+), 2 deletions(-)');
|
||||
|
||||
// Merge commit: two parents, no shortstat line.
|
||||
assert.deepEqual(commits[1].parents, ['c1', 'c0']);
|
||||
assert.equal(commits[1].stats, '');
|
||||
|
||||
// Root commit: no parents.
|
||||
assert.deepEqual(commits[2].parents, []);
|
||||
assert.equal(commits[2].stats, '1 file changed, 1 insertion(+)');
|
||||
});
|
||||
|
||||
test('parseGitLogWithStats handles empty output', () => {
|
||||
assert.deepEqual(parseGitLogWithStats(''), []);
|
||||
});
|
||||
Reference in New Issue
Block a user