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.
193 lines
6.9 KiB
TypeScript
193 lines
6.9 KiB
TypeScript
import fsSync from 'node:fs';
|
|
import path from 'node:path';
|
|
|
|
import Database from 'better-sqlite3';
|
|
|
|
import { sessionsDb } from '@/modules/database/index.js';
|
|
import type { IProviderSessionSynchronizer } from '@/shared/interfaces.js';
|
|
import {
|
|
getOpenCodeDatabasePath,
|
|
normalizeProviderTimestamp,
|
|
normalizeSessionName,
|
|
readJsonRecord,
|
|
readOptionalString,
|
|
unwrapJsonStringLiteral,
|
|
} from '@/shared/utils.js';
|
|
|
|
type OpenCodeSessionRow = {
|
|
id: string;
|
|
directory: string | null;
|
|
title: string | null;
|
|
time_created: number | null;
|
|
time_updated: number | null;
|
|
worktree: string | null;
|
|
};
|
|
|
|
type SynchronizeRowsResult = {
|
|
processed: number;
|
|
firstSessionId: string | null;
|
|
};
|
|
|
|
/**
|
|
* Session indexer for OpenCode's SQLite-backed session store.
|
|
*/
|
|
export class OpenCodeSessionSynchronizer implements IProviderSessionSynchronizer {
|
|
private readonly provider = 'opencode' as const;
|
|
|
|
/**
|
|
* Scans OpenCode's shared opencode.db and upserts active sessions into DB.
|
|
*/
|
|
async synchronize(since?: Date): Promise<number> {
|
|
const result = this.synchronizeRows(since);
|
|
return result.processed;
|
|
}
|
|
|
|
/**
|
|
* Handles watcher changes for opencode.db.
|
|
*/
|
|
async synchronizeFile(filePath: string): Promise<string | null> {
|
|
if (path.basename(filePath) !== 'opencode.db') {
|
|
return null;
|
|
}
|
|
|
|
const result = this.synchronizeRows(undefined, 1);
|
|
return result.firstSessionId;
|
|
}
|
|
|
|
private synchronizeRows(since?: Date, limit?: number): SynchronizeRowsResult {
|
|
const dbPath = getOpenCodeDatabasePath();
|
|
if (!fsSync.existsSync(dbPath)) {
|
|
return { processed: 0, firstSessionId: null };
|
|
}
|
|
|
|
const db = new Database(dbPath, { readonly: true, fileMustExist: true });
|
|
try {
|
|
const sinceMillis = since?.getTime() ?? null;
|
|
const limitClause = limit ? 'LIMIT ?' : '';
|
|
const params = limit ? [sinceMillis, sinceMillis, limit] : [sinceMillis, sinceMillis];
|
|
const rows = db.prepare(`
|
|
SELECT
|
|
s.id AS id,
|
|
s.directory AS directory,
|
|
s.title AS title,
|
|
s.time_created AS time_created,
|
|
s.time_updated AS time_updated,
|
|
p.worktree AS worktree
|
|
FROM session s
|
|
LEFT JOIN project p ON p.id = s.project_id
|
|
WHERE s.time_archived IS NULL
|
|
AND (? IS NULL OR COALESCE(s.time_updated, s.time_created, 0) >= ?)
|
|
ORDER BY COALESCE(s.time_updated, s.time_created, 0) DESC, s.id DESC
|
|
${limitClause}
|
|
`).all(...params) as OpenCodeSessionRow[];
|
|
|
|
let processed = 0;
|
|
let firstSessionId: string | null = null;
|
|
for (const row of rows) {
|
|
const indexedSessionId = this.upsertSession(db, row);
|
|
if (!indexedSessionId) {
|
|
continue;
|
|
}
|
|
|
|
if (!firstSessionId) {
|
|
firstSessionId = indexedSessionId;
|
|
}
|
|
processed += 1;
|
|
}
|
|
|
|
return { processed, firstSessionId };
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : String(error);
|
|
console.warn('[OpenCodeProvider] Failed to synchronize sessions:', message);
|
|
return { processed: 0, firstSessionId: null };
|
|
} finally {
|
|
db.close();
|
|
}
|
|
}
|
|
|
|
private upsertSession(db: Database.Database, row: OpenCodeSessionRow): string | null {
|
|
const sessionId = readOptionalString(row.id);
|
|
const projectPath = readOptionalString(row.directory) ?? readOptionalString(row.worktree);
|
|
if (!sessionId || !projectPath) {
|
|
return null;
|
|
}
|
|
|
|
const fallbackTitle = 'Untitled OpenCode Session';
|
|
const pendingAppSession = sessionsDb.getSessionByProviderSessionId(sessionId)
|
|
?? sessionsDb.getSessionById(sessionId)
|
|
?? sessionsDb.findLatestPendingAppSession(this.provider, projectPath);
|
|
if (pendingAppSession && !pendingAppSession.provider_session_id) {
|
|
// Slow networks can let the sqlite watcher index opencode.db before the
|
|
// runtime reports its provider id back through the websocket mapping.
|
|
// Bind that id to the fresh app row first so the watcher does not create
|
|
// a temporary provider-id sidebar entry for the same session.
|
|
sessionsDb.assignProviderSessionId(pendingAppSession.session_id, sessionId);
|
|
}
|
|
|
|
// App-created sessions are keyed by an app id, so disk-discovered provider
|
|
// ids must be resolved through the provider-id mapping first.
|
|
const existingSession = sessionsDb.getSessionByProviderSessionId(sessionId)
|
|
?? sessionsDb.getSessionById(sessionId);
|
|
const existingName = existingSession?.custom_name;
|
|
|
|
// Sessions started by sending a message from cloudcli carry a distinct
|
|
// app-allocated session_id mapped to the provider id. For these we title the
|
|
// conversation from the first user message the user typed, matching how the
|
|
// app titles a brand-new conversation. Sessions discovered purely by
|
|
// indexing (session_id === provider_session_id) keep OpenCode's own stored
|
|
// title.
|
|
const isAppCreated =
|
|
existingSession != null &&
|
|
existingSession.provider_session_id != null &&
|
|
existingSession.session_id !== existingSession.provider_session_id;
|
|
|
|
let nextName: string | undefined;
|
|
if (existingName && existingName !== fallbackTitle) {
|
|
nextName = existingName;
|
|
} else if (isAppCreated) {
|
|
nextName = this.readFirstUserText(db, sessionId) ?? readOptionalString(row.title);
|
|
} else {
|
|
nextName = readOptionalString(row.title) ?? this.readFirstUserText(db, sessionId);
|
|
}
|
|
|
|
// OpenCode stores every session in one shared sqlite database, so jsonl_path
|
|
// must stay null to avoid deleting opencode.db when one app session is removed.
|
|
// Return the canonical stored row id so watcher-triggered sidebar updates
|
|
// stay on the app session once provider_session_id has already been mapped.
|
|
return sessionsDb.createSession(
|
|
sessionId,
|
|
this.provider,
|
|
projectPath,
|
|
normalizeSessionName(nextName, fallbackTitle),
|
|
normalizeProviderTimestamp(row.time_created),
|
|
normalizeProviderTimestamp(row.time_updated ?? row.time_created),
|
|
null,
|
|
);
|
|
}
|
|
|
|
private readFirstUserText(db: Database.Database, sessionId: string): string | undefined {
|
|
try {
|
|
const row = db.prepare(`
|
|
SELECT p.data AS data
|
|
FROM message m
|
|
INNER JOIN part p
|
|
ON p.session_id = m.session_id
|
|
AND p.message_id = m.id
|
|
WHERE m.session_id = ?
|
|
AND json_extract(m.data, '$.role') = 'user'
|
|
AND json_extract(p.data, '$.type') = 'text'
|
|
ORDER BY COALESCE(m.time_created, 0), COALESCE(p.time_created, 0)
|
|
LIMIT 1
|
|
`).get(sessionId) as { data: string | null } | undefined;
|
|
|
|
const data = readJsonRecord(row?.data);
|
|
const text = readOptionalString(data?.text);
|
|
// OpenCode persists the first prompt as a JSON string literal (e.g.
|
|
// `"hello"`), so decode it to avoid titling the session with quotes.
|
|
return text === undefined ? undefined : unwrapJsonStringLiteral(text);
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
}
|