@wjarka/cezarion 0.13.6 → 0.14.0

package/dist/server/server.js

@@ -62,7 +62,8 @@ import { PROJECT_ID_RE, defaultWorkspaceConfig, effectiveSkillsAutoUpdate, loadW
 import { CONTROL_CHARS_RE, DEFAULT_AGENT_ACCOUNT_ID, defaultAgentAccountStore, isAbsoluteConfigDir, loadAgentAccounts, mergeWriteAgentAccounts, } from '../workspace/agent-accounts.js';
 import { defaultAgentProfile, listAgentProfiles, profileDirState, resolveProfileEnvForRoot, resolveStoredProfile, sameProfileDir, } from '../workspace/agent-profiles.js';
 import { PROFILE_CAPABLE_PROVIDERS, profileEnv, supportsProfiles } from '../core/agent-profiles.js';
-import { withEnvPrefix } from '../core/shell-env.js';
+import { quoteExecutable, withEnvPrefix } from '../core/shell-env.js';
+import { resolveCursorExecutable } from '../core/cursor-model-catalog.js';
 import { allocateProjectSlug, listProjects, normalizeProjectTags, probeProjectStatus, registerProject, removeProject, shouldRegisterProject, } from '../workspace/projects.js';
 import { mergeWriteWorkspaceUiState, readWorkspaceUiState } from '../workspace/ui-state.js';
 import { checkoutRepo } from './checkout.js';
@@ -1363,7 +1364,7 @@ export function createApp(deps) {
             workspaceEvents.emit('provider-status', row);
         return c.json(result);
     })
-        .post('/providers/connect', jsonZodValidator(providerConnectSchema, { message: 'provider must be claude, codex, opencode, or pi' }), async (c) => {
+        .post('/providers/connect', jsonZodValidator(providerConnectSchema, { message: 'provider must be claude, codex, opencode, pi, or cursor' }), async (c) => {
         const body = { data: c.req.valid('json') };
         const provider = body.data.provider;
         // A NAMED account is refused in hosted mode before anything is resolved, exactly like every
@@ -2558,6 +2559,7 @@ export function createApp(deps) {
                 codex: z.string().trim().min(1).max(200).nullable().optional(),
                 opencode: z.string().trim().min(1).max(200).nullable().optional(),
                 pi: z.string().trim().min(1).max(200).nullable().optional(),
+                cursor: z.string().trim().min(1).max(200).nullable().optional(),
             })
                 .optional(),
         })
@@ -3013,7 +3015,11 @@ export function createApp(deps) {
     // nothing. The stored record itself is never touched.
     const withUsage = (run) => {
         const usage = currentUsage(run.id);
-        return usage ? { ...run, usage } : run;
+        const sessionStep = [...run.steps].reverse().find(step => step.sessionId);
+        const sessionId = sessionStep?.sessionId;
+        const backend = sessionStep?.backend ?? run.runner ?? 'claude';
+        const command = backend === 'cursor' && sessionId ? resumeCommand(backend, sessionId) : null;
+        return { ...run, ...(usage ? { usage } : {}), ...(command ? { cliResumeCommand: command } : {}) };
     };
     // The inbox half of a composer launch (#374). Since the cockpit's "▶ Run"
     // prefills `/new` instead of calling POST /api/todos/:id/start (never launch
@@ -3465,16 +3471,17 @@ export function createApp(deps) {
         const sessionId = sessionStep?.sessionId;
         if (!sessionId)
             return c.json({ error: 'no agent session to resume' }, 409);
-        const blocked = await providerActionError([providerForExistingRun(run)]);
+        const backend = sessionStep?.backend ?? run.runner ?? 'claude';
+        const blocked = await providerActionError([backend]);
         if (blocked)
             return c.json({ error: blocked }, 409);
         const cwd = run.worktreePath && existsSync(run.worktreePath) ? run.worktreePath : repoRoot;
-        const command = resumeCommand(run.runner, sessionId);
+        const command = resumeCommand(backend, sessionId);
         // Fails closed on an id we do not recognise — see resumeCommand (#431).
         if (!command)
             return c.json({ error: 'the recorded session id has an unexpected shape' }, 409);
         // The account that OWNS this session, not the project's current one (spec 2026-07-29).
-        const account = await handoffEnv(run.runner ?? 'claude', sessionStep?.profileId);
+        const account = await handoffEnv(backend, sessionStep?.profileId);
         if ('error' in account)
             return c.json({ error: account.error }, 409);
         const fallback = handoffFallbackCommand(cwd, command, account.env);
@@ -3548,7 +3555,7 @@ export function createApp(deps) {
             return c.json({ opened: true, path: filePath });
         }
         // Coding-agent CLI handoff (#cli-handoff, #402): open a terminal in the worktree that resumes
-        // THIS run's session when the chosen CLI is the run's own runner (and a session exists), or
+        // THIS run's latest session when the chosen CLI owns it (and a session exists), or
         // starts a fresh CLI there otherwise. Same terminal launcher the Terminal button uses.
         // Records that predate the runner choice carry no `runner` at all — they default to Claude
         // everywhere else (resumeCommand, the client's resumeHint/cliTargetResumes), so the match
@@ -3569,8 +3576,10 @@ export function createApp(deps) {
             const sessionId = sessionStep?.sessionId;
             // An id resumeCommand refuses (#431) degrades to a fresh CLI in the worktree,
             // exactly like a run that never recorded a session.
-            const resume = sessionId && cliRunner === (run.runner ?? 'claude') ? resumeCommand(cliRunner, sessionId) : null;
-            const command = resume ?? cliRunner;
+            const resume = sessionId && cliRunner === (sessionStep?.backend ?? run.runner ?? 'claude') ? resumeCommand(cliRunner, sessionId) : null;
+            const command = resume ?? (cliRunner === 'cursor' ? quoteExecutable(resolveCursorExecutable(), process.platform) : cliRunner);
+            if (command === null)
+                return c.json({ error: 'the configured Cursor executable cannot be used in a terminal command' }, 409);
             // BOTH branches carry the account (spec 2026-07-29-agent-profiles): a resume needs the
             // config dir that holds its session, and a FRESH CLI in this worktree should still open
             // on the account the project works under — otherwise "Open in → Claude CLI" quietly
@@ -4813,6 +4822,7 @@ export function createApp(deps) {
             codex: modelPresetSchema,
             opencode: modelPresetSchema,
             pi: modelPresetSchema,
+            cursor: modelPresetSchema,
         })
             .optional(),
         // Concurrency + memory guard (Settings → Resources). maxParallel clamps to
@@ -5382,6 +5392,10 @@ export function resumeCommand(runner, sessionId) {
             return `codex resume ${sessionId}`;
         case 'opencode':
             return `opencode --session ${sessionId}`;
+        case 'cursor': {
+            const executable = quoteExecutable(resolveCursorExecutable(), process.platform);
+            return executable === null ? null : `${executable} --resume ${sessionId}`;
+        }
         case 'pi':
             return `pi --session ${sessionId}`;
         default: