@taskforcehq/taskforce 0.3.319 → 0.3.321

package/dist/TaskforceCore.js

@@ -54,6 +54,7 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
     const isPricingRoute = location.pathname === '/pricing';
     const isPlansRoute = location.pathname === '/plans';
     const isPlansScreen = location.pathname === '/' && String(routeQuery.get('screen') || '').trim().toLowerCase() === 'plans';
+    const plansPath = buildPlansPath();
     const planSelectionPath = buildPlansPath({ gate: 'plan_selection_required' });
     const navigate = useNavigate();
     const [loginEmail, setLoginEmail] = useState('');
@@ -579,14 +580,44 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
         persistWorkspaceSyncStatePatch,
         refreshSetupContext
     ]);
-    const nextPath = useMemo(() => {
+    const nextTarget = useMemo(() => {
         const raw = new URLSearchParams(location.search).get('next') || '/';
-        if (!raw.startsWith('/'))
-            return '/';
-        if (raw === '/login')
+        if (raw.startsWith('/')) {
+            if (raw === '/login')
+                return '/';
+            return raw;
+        }
+        try {
+            const parsed = new URL(raw);
+            const host = parsed.hostname.toLowerCase();
+            const isLocal = host === 'localhost' || host === '127.0.0.1' || host === '::1';
+            const isTaskforceHost = host === 'taskforcehq.ai' || host.endsWith('.taskforcehq.ai');
+            if ((parsed.protocol === 'http:' || parsed.protocol === 'https:') && (isLocal || isTaskforceHost)) {
+                return parsed.toString();
+            }
+        }
+        catch {
             return '/';
-        return raw;
+        }
+        return '/';
     }, [location.search]);
+    const nextPath = useMemo(() => nextTarget.startsWith('/') ? nextTarget : '/', [nextTarget]);
+    const navigateToPostAuthTarget = useCallback((target, options) => {
+        if (!target)
+            return;
+        if (target.startsWith('/')) {
+            navigate(target, { replace: options?.replace === true });
+            return;
+        }
+        if (typeof window !== 'undefined') {
+            if (options?.replace === true) {
+                window.location.replace(target);
+            }
+            else {
+                window.location.assign(target);
+            }
+        }
+    }, [navigate]);
     const shouldReturnToCloudWorkspaceSelection = useMemo(() => {
         try {
             const parsed = new URL(nextPath, 'https://taskforce.local');
@@ -622,9 +653,9 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
                 interval: selectedSignupPlanVersionId ? resolvedSignupInterval : null
             });
         }
-        return nextPath;
+        return nextTarget;
     }, [
-        nextPath,
+        nextTarget,
         planSelectionPath,
         resolvedSignupInterval,
         selectedSignupPlanId,
@@ -688,9 +719,13 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
             ? resolveWorkspaceSetupPath()
             : pendingPostAuthRedirect.path;
         const currentRoute = `${location.pathname}${location.search}${location.hash || ''}`;
-        if (currentRoute !== destination) {
-            navigate(destination, { replace: true });
+        if (destination.startsWith('/')) {
+            if (currentRoute !== destination) {
+                navigate(destination, { replace: true });
+            }
+            return;
         }
+        navigateToPostAuthTarget(destination, { replace: true });
     }, [
         authSessionResolved,
         cloudAccountAccessPending,
@@ -699,6 +734,7 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
         location.pathname,
         location.search,
         navigate,
+        navigateToPostAuthTarget,
         pendingPostAuthRedirect,
         resolveWorkspaceSetupPath
     ]);
@@ -726,9 +762,13 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
             ? pendingPostAuthRedirect.path
             : planSelectionPath;
         const currentRoute = `${location.pathname}${location.search}${location.hash || ''}`;
-        if (currentRoute !== destination) {
-            navigate(destination, { replace: true });
+        if (destination.startsWith('/')) {
+            if (currentRoute !== destination) {
+                navigate(destination, { replace: true });
+            }
+            return;
         }
+        navigateToPostAuthTarget(destination, { replace: true });
     }, [
         accountAccessGate?.canAccessApp,
         accountAccessGateResolved,
@@ -739,6 +779,7 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
         location.pathname,
         location.search,
         navigate,
+        navigateToPostAuthTarget,
         pendingPostAuthRedirect,
         planSelectionPath
     ]);
@@ -901,8 +942,9 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
             if (shouldDelayAuthenticatedLoginRedirect) {
                 return;
             }
-            if (isLoginRoute && isAuthenticated && !shouldStayOnInviteRoute)
-                navigate(nextPath, { replace: true });
+            if (isLoginRoute && isAuthenticated && !shouldStayOnInviteRoute) {
+                navigateToPostAuthTarget(nextTarget, { replace: true });
+            }
         }
         else {
             if (!isLoginRoute) {
@@ -1243,7 +1285,7 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
                                             || pendingVerificationCommercialState === 'checkout_pending';
                                         setCommercialOnboardingRedirectActive(commercialOnboardingGate);
                                         setPendingPostAuthRedirect({
-                                            path: pendingVerificationRedirectPath || nextPath,
+                                            path: pendingVerificationRedirectPath || nextTarget,
                                             workspaceSetupRequired: pendingVerificationWorkspaceSetupRequired,
                                             commercialOnboardingGate
                                         });
@@ -1299,7 +1341,7 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
                                             setLoginBusy(false);
                                             return;
                                         }
-                                        navigate(nextPath, { replace: true });
+                                        navigateToPostAuthTarget(nextTarget, { replace: true });
                                     }
                                     else if (authMode === 'login') {
                                         if (inviteToken.trim()) {
@@ -1319,14 +1361,14 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
                                         setLoginDisplayName('');
                                         setLoginPassword('');
                                         setLoginPasswordConfirm('');
-                                        navigate(nextPath, { replace: true });
+                                        navigateToPostAuthTarget(nextTarget, { replace: true });
                                     }
                                     else {
                                         setLoginEmail('');
                                         setLoginDisplayName('');
                                         setLoginPassword('');
                                         setLoginPasswordConfirm('');
-                                        navigate(nextPath, { replace: true });
+                                        navigateToPostAuthTarget(nextTarget, { replace: true });
                                     }
                                     setLoginBusy(false);
                                 }, children: loginBusy ? 'Working...' : (authMode === 'login' ? 'Sign In'
@@ -1567,6 +1609,11 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
                                                 });
                                             const result = createResult || saveResult;
                                             if (!result?.success) {
+                                                if (result?.code === 'WORKSPACE_LIMIT_REACHED') {
+                                                    setSetupBusy(false);
+                                                    navigate(plansPath, { replace: true });
+                                                    return;
+                                                }
                                                 setSetupError(result?.error || t('setup.saveWorkspaceFailed'));
                                             }
                                             else {
@@ -1579,8 +1626,7 @@ function TaskforceCoreWithRouter({ config = {}, initialTaskId, onTaskCountChange
                                                     setSetupBusy(false);
                                                     return;
                                                 }
-                                                const shouldApplyStarterPack = workspaceSetupSource === 'local'
-                                                    && Boolean(selectedSetupPack)
+                                                const shouldApplyStarterPack = Boolean(selectedSetupPack)
                                                     && (setupTaxonomySections.categories || setupTaxonomySections.types || setupTaxonomySections.priorities);
                                                 if (shouldApplyStarterPack && selectedSetupPack) {
                                                     const applyResult = await settingsModel.onApplySystemTaxonomyPack({

package/dist/hooks/workspace/useTaskforceWorkspaceBootstrap.js

@@ -622,10 +622,34 @@ export function useTaskforceWorkspaceBootstrap(args) {
         setWorkspaceBootstrapPending(true);
         try {
             await fetchBootstrapConfig({ ignoreAuthGuard });
-            await Promise.all([
-                fetchTasks(tasksSilent, { ignoreAuthGuard }),
-                fetchReferenceData({ ignoreAuthGuard })
-            ]);
+            const workspaceId = String(currentWorkspaceIdRef.current || 'default').trim() || 'default';
+            const deferredStartedAt = getBootstrapTimestamp();
+            void fetchTasks(tasksSilent, { ignoreAuthGuard }).then(() => {
+                logBootstrapDebug('cloud_bootstrap_tasks_loaded_deferred', {
+                    reason,
+                    workspaceId,
+                    durationMs: Math.max(0, Math.round(getBootstrapTimestamp() - deferredStartedAt))
+                });
+            }).catch((error) => {
+                logBootstrapDebug('cloud_bootstrap_tasks_deferred_failed', {
+                    reason,
+                    workspaceId,
+                    error: error instanceof Error ? error.message : String(error)
+                });
+            });
+            void fetchReferenceData({ ignoreAuthGuard }).then(() => {
+                logBootstrapDebug('cloud_bootstrap_reference_data_loaded_deferred', {
+                    reason,
+                    workspaceId,
+                    durationMs: Math.max(0, Math.round(getBootstrapTimestamp() - deferredStartedAt))
+                });
+            }).catch((error) => {
+                logBootstrapDebug('cloud_bootstrap_reference_data_deferred_failed', {
+                    reason,
+                    workspaceId,
+                    error: error instanceof Error ? error.message : String(error)
+                });
+            });
             void fetchPlanningEntities({ ignoreAuthGuard });
             if (includeDeferredArchive) {
                 scheduleDeferredArchiveBootstrap();
@@ -636,7 +660,7 @@ export function useTaskforceWorkspaceBootstrap(args) {
                 authenticated: true,
                 workspaceSetupRequired: false,
                 success: true,
-                workspaceId: String(currentWorkspaceIdRef.current || 'default').trim() || 'default'
+                workspaceId
             });
             return { success: true, authenticated: true, workspaceSetupRequired: false };
         }

package/dist/mcp/runtime.js

@@ -740,6 +740,21 @@ export function createTaskforceMcpServer(options = {}) {
         }))
             .filter((actor) => Boolean(actor.id));
     }
+    function buildTaskWriteSummary(task) {
+        return {
+            id: task?.id || null,
+            referenceLabel: getTaskReferenceLabel(task) || null,
+            title: task?.title || null,
+            status: task?.status || null,
+            assignee: task?.assignee || null,
+            workstreamId: task?.workstreamId || null,
+            scheduledDate: task?.scheduledDate || null,
+            dueDate: task?.dueDate || null,
+            scheduledWeekKey: task?.scheduledWeekKey || null,
+            orderInDay: task?.orderInDay ?? null,
+            updatedAt: task?.updatedAt || null,
+        };
+    }
     function buildAiProfileDescriptor(profile) {
         return {
             id: profile.id,
@@ -2178,7 +2193,7 @@ export function createTaskforceMcpServer(options = {}) {
         const assigneeHint = describeEligibleAssignees();
         const mutatingProfileTokenProperty = {
             type: "string",
-            description: "Optional AI profile token returned by resolve_profile. Pass this when your MCP client does not preserve session identity between calls."
+            description: "Optional AI profile token returned by resolve_profile. Pass this when your MCP client does not preserve session identity between calls. In stateless/cloud MCP clients without ambient AI binding, this is usually required on mutating calls after bootstrap."
         };
         const prefix = `[Project: ${PROJECT_NAME}] `;
         const agentNote = runtimeMode === 'local'
@@ -2190,11 +2205,32 @@ export function createTaskforceMcpServer(options = {}) {
             .filter(Boolean)
             .map((part) => `${part.charAt(0).toUpperCase()}${part.slice(1)}`)
             .join(' ');
+        const nonDestructiveWriteTools = new Set([
+            'add_annotated_attachment_marker',
+            'add_comment',
+            'add_document_review_comment',
+            'bulk_add_annotated_attachment_markers',
+            'create_annotated_attachment_session',
+            'create_document_review_session',
+            'create_initiative',
+            'create_task',
+            'create_workstream',
+            'link_task_context',
+            'resolve_profile',
+            'review_document',
+            'review_image',
+        ]);
         const annotationsForTool = (name) => {
             const title = titleForTool(name);
-            return isMcpWriteToolName(name)
-                ? { title, destructiveHint: true }
-                : { title, readOnlyHint: true };
+            if (!isMcpWriteToolName(name)) {
+                return { title, readOnlyHint: true, destructiveHint: false, openWorldHint: false };
+            }
+            return {
+                title,
+                readOnlyHint: false,
+                destructiveHint: !nonDestructiveWriteTools.has(name),
+                openWorldHint: false,
+            };
         };
         const tools = registeredTools
             .map((tool) => tool.buildDescriptor({
@@ -2915,7 +2951,13 @@ export function createTaskforceMcpServer(options = {}) {
                     workstreamIds: [resolvedWorkstreamId],
                 });
                 return {
-                    content: [{ type: "text", text: JSON.stringify(updated, null, 2) }],
+                    content: [{
+                            type: "text",
+                            text: JSON.stringify({
+                                task: buildTaskWriteSummary(updated),
+                                workstreamId: resolvedWorkstreamId,
+                            }, null, 2)
+                        }],
                 };
             }
             case "clear_task_workstream": {
@@ -2935,7 +2977,14 @@ export function createTaskforceMcpServer(options = {}) {
                     ...(priorWorkstreamId ? { includeWorkstreams: true, workstreamIds: [priorWorkstreamId] } : {}),
                 });
                 return {
-                    content: [{ type: "text", text: JSON.stringify(updated, null, 2) }],
+                    content: [{
+                            type: "text",
+                            text: JSON.stringify({
+                                task: buildTaskWriteSummary(updated),
+                                workstreamId: null,
+                                previousWorkstreamId: priorWorkstreamId,
+                            }, null, 2)
+                        }],
                 };
             }
             case "set_workstream_initiative": {
@@ -4001,7 +4050,7 @@ export function createTaskforceMcpServer(options = {}) {
                                     persistedOrderInDay: result.task.orderInDay ?? null
                                 },
                                 warnings: result.warnings,
-                                task: result.task
+                                task: buildTaskWriteSummary(result.task)
                             }, null, 2)
                         }],
                 };
@@ -4154,6 +4203,7 @@ export function createTaskforceMcpServer(options = {}) {
                         priority: resolveNumberOption('priority', createArgs.priority, getActivePriorities().map(p => ({ value: p.value, label: p.label }))),
                         approach: resolveStringOption('approach', createArgs.approach, getActiveApproaches().map(a => ({ value: a.value, label: a.label }))),
                         assignee: resolveRuntimeTaskAssigneeInput(createAssigneeInput),
+                        workstreamId: createArgs.workstreamId ? resolveWorkstreamByIdentifierOrThrow(createArgs.workstreamId).id : undefined,
                         status: resolveStringOption('status', createArgs.status, STATUS_OPTIONS),
                         complexity: resolveNumberOption('complexity', createArgs.complexity, COMPLEXITY_OPTIONS)
                     };
@@ -4219,7 +4269,7 @@ export function createTaskforceMcpServer(options = {}) {
                         content: [{
                                 type: "text",
                                 text: JSON.stringify({
-                                    task: updated,
+                                    task: buildTaskWriteSummary(updated),
                                     started: true,
                                     claimed: resolved.claimed && updated.assignee === activeAiProfileId,
                                     statusChanged: resolved.previousStatus !== String(updated.status || '').trim(),
@@ -4294,7 +4344,13 @@ export function createTaskforceMcpServer(options = {}) {
                         includeStats: true,
                     });
                     return {
-                        content: [{ type: "text", text: JSON.stringify(updated, null, 2) }],
+                        content: [{
+                                type: "text",
+                                text: JSON.stringify({
+                                    task: buildTaskWriteSummary(updated),
+                                    changedFields: Object.keys(finalUpdates),
+                                }, null, 2)
+                            }],
                     };
                 }
                 catch (error) {
@@ -4385,7 +4441,13 @@ export function createTaskforceMcpServer(options = {}) {
                     includeStats: true,
                 });
                 return {
-                    content: [{ type: "text", text: JSON.stringify(updated, null, 2) }],
+                    content: [{
+                            type: "text",
+                            text: JSON.stringify({
+                                task: buildTaskWriteSummary(updated),
+                                assignee: resolvedAssignee,
+                            }, null, 2)
+                        }],
                 };
             }
             case "bulk_assign_tasks": {

package/dist/mcp/taskPlanningRegistrar.js

@@ -353,6 +353,7 @@ export function registerTaskPlanningTools(registerTool, executeTool) {
                 title: stringProperty('Task title.'),
                 description: stringProperty('Optional task description.'),
                 assignee: stringProperty(`${context.assigneeHint} Call list_assignees to inspect the current eligible IDs.`),
+                workstreamId: stringProperty('Optional workstream ID or workstream reference such as WS-123. Use this to create the task directly inside a workstream without a separate set_task_workstream call.'),
                 category: stringProperty('Task category value.'),
                 type: stringProperty('Task type value.', context.typeEnum),
                 priority: numberProperty(context.priorityDesc),

package/dist/server/routes/admin.js

@@ -262,7 +262,7 @@ export function registerAdminRoutes(deps) {
         const scopeLabels = {
             'tasks:read': 'Read tasks',
             'tasks:write': 'Update tasks',
-            'workspace:read': 'Read workspace details'
+            'workspace:read': 'Read workspace'
         };
         const options = input.workspaces.map((workspace) => {
             const selected = workspace.id === input.preselectedWorkspaceId ? ' selected' : '';
@@ -285,25 +285,19 @@ export function registerAdminRoutes(deps) {
     :root { color-scheme: dark; }
     body { margin: 0; font-family: "Outfit", -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; background: radial-gradient(circle at top, rgba(255,138,0,0.08), transparent 30%), #111126; color: #f8f7ff; }
     .wrap { min-height: 100vh; display: flex; align-items: center; justify-content: center; padding: 32px 24px; }
-    .card { width: min(680px, 100%); background: rgba(22,22,44,0.95); border: 1px solid rgba(255,255,255,0.08); border-radius: 36px; box-shadow: 0 24px 80px rgba(0,0,0,0.35); padding: 44px 56px; }
-    .eyebrow { display: inline-flex; align-items: center; gap: 10px; margin-bottom: 18px; color: rgba(255,255,255,0.55); font-size: 12px; font-weight: 700; letter-spacing: 0.12em; text-transform: uppercase; }
-    .eyebrow-mark { width: 10px; height: 10px; border-radius: 999px; background: linear-gradient(135deg, #ff8a00 0%, #8d6bff 100%); box-shadow: 0 0 18px rgba(255,138,0,0.35); }
-    h1 { margin: 0; font-size: clamp(2.25rem, 5vw, 3rem); line-height: 0.96; letter-spacing: -0.04em; color: #f8f7ff; }
-    .brand-word { font-family: "Russo One", sans-serif; font-size: 0.94em; letter-spacing: -0.03em; }
-    .lede { margin: 18px 0 8px; font-size: 1.15rem; line-height: 1.5; color: rgba(255,255,255,0.78); max-width: 34ch; }
+    .card { width: min(720px, 100%); background: rgba(22,22,44,0.95); border: 1px solid rgba(255,255,255,0.08); border-radius: 32px; box-shadow: 0 24px 80px rgba(0,0,0,0.35); padding: 40px 48px; }
+    h1 { margin: 0; font-size: clamp(1.95rem, 4.2vw, 2.6rem); line-height: 1.02; letter-spacing: -0.035em; color: #f8f7ff; }
+    .lede { margin: 16px 0 8px; font-size: 1.1rem; line-height: 1.45; color: rgba(255,255,255,0.78); max-width: 48ch; text-wrap: pretty; }
     .lede strong { color: #fff; }
-    .user-meta { margin: 0 0 28px; color: rgba(255,255,255,0.5); font-size: 0.9rem; }
+    .session-row { display: flex; align-items: center; gap: 14px; flex-wrap: wrap; margin: 0 0 28px; }
+    .user-meta { margin: 0; color: rgba(255,255,255,0.5); font-size: 0.9rem; }
+    .account-switch { padding: 0; border: 0; min-width: 0; background: transparent; color: #cbd8ff; font-size: 0.9rem; font-weight: 600; box-shadow: none; }
+    .account-switch:hover { transform: none; color: #ffffff; text-decoration: underline; }
     label { display: block; font-size: 13px; font-weight: 700; margin: 24px 0 10px; color: rgba(255,255,255,0.92); letter-spacing: 0.01em; }
     select { width: 100%; border-radius: 18px; border: 1px solid rgba(255,255,255,0.1); background: #1f2039; color: #fff; padding: 16px 18px; font-size: 15px; font-weight: 600; box-shadow: inset 0 1px 0 rgba(255,255,255,0.02); }
     .scopes { display:flex; flex-wrap:wrap; gap:10px; margin-top:8px; }
     .scope-chip { display:inline-flex; padding:8px 14px; border-radius:999px; background:#2a2947; border:1px solid rgba(255,255,255,0.09); font-size:13px; font-weight:600; color:rgba(255,255,255,0.92); }
-    .details { margin-top: 24px; padding: 0; border: 1px solid rgba(255,255,255,0.08); border-radius: 18px; background: rgba(255,255,255,0.04); overflow: hidden; }
-    .details summary { list-style: none; cursor: pointer; padding: 16px 18px; font-size: 0.92rem; font-weight: 700; color: rgba(255,255,255,0.86); }
-    .details summary::-webkit-details-marker { display: none; }
-    .details-body { padding: 0 18px 18px; color: rgba(255,255,255,0.68); font-size: 0.9rem; line-height: 1.5; }
-    .details-row { margin: 0 0 8px; }
-    .details-row strong { color: rgba(255,255,255,0.92); }
-    .legal { margin: 24px 2px 0; color: rgba(255,255,255,0.58); font-size: 0.9rem; line-height: 1.55; max-width: 56ch; }
+    .legal { margin: 28px 2px 0; color: rgba(255,255,255,0.58); font-size: 0.9rem; line-height: 1.55; max-width: 58ch; }
     .error { margin-bottom: 18px; padding: 12px 14px; border-radius: 14px; background: rgba(255,99,132,0.12); color: #ffb6c6; border: 1px solid rgba(255,99,132,0.25); }
     .actions { display:flex; justify-content:flex-end; gap:14px; margin-top: 36px; }
     button { border-radius: 18px; padding: 15px 22px; font-size: 15px; font-weight: 700; cursor: pointer; border: 1px solid rgba(255,255,255,0.08); min-width: 156px; transition: transform 160ms ease, box-shadow 160ms ease, border-color 160ms ease, background-color 160ms ease; }
@@ -313,7 +307,8 @@ export function registerAdminRoutes(deps) {
     a { color: #cbd8ff; }
     @media (max-width: 720px) {
       .card { padding: 30px 22px; border-radius: 28px; }
-      h1 { font-size: 2rem; }
+      h1 { font-size: 1.85rem; }
+      .lede { max-width: none; }
       .actions { flex-direction: column-reverse; }
       button { width: 100%; }
     }
@@ -322,22 +317,17 @@ export function registerAdminRoutes(deps) {
 <body>
   <div class="wrap">
     <form class="card" method="post" action="/oauth/mcp/authorize">
-      <div class="eyebrow"><span class="eyebrow-mark"></span>Taskforce MCP</div>
-      <h1>Authorize <span class="brand-word">Taskforce</span> Connector</h1>
+      <h1>Authorize Taskforce Connector</h1>
       <p class="lede"><strong>${escapeHtml(input.clientName)}</strong> wants to connect to Taskforce for <strong>${escapeHtml(input.userName)}</strong>.</p>
-      ${input.userMeta ? `<p class="user-meta">Signed in as ${escapeHtml(input.userMeta)}</p>` : ''}
+      <div class="session-row">
+        ${input.userMeta ? `<p class="user-meta">Signed in as ${escapeHtml(input.userMeta)}</p>` : ''}
+        <button class="account-switch" type="submit" formaction="/api/taskforce/auth/logout" formmethod="post" formnovalidate>Use different account</button>
+      </div>
       ${input.error ? `<div class="error">${escapeHtml(input.error)}</div>` : ''}
-      <label for="workspaceId">Workspace</label>
+      <label for="workspaceId">Select Workspace</label>
       <select id="workspaceId" name="workspaceId" required>${options}</select>
       <label>Requested Permissions</label>
       <div class="scopes">${scopeBadges}</div>
-      <details class="details">
-        <summary>Technical details</summary>
-        <div class="details-body">
-          <div class="details-row"><strong>Client:</strong> ${escapeHtml(input.clientName)}</div>
-          <div class="details-row"><strong>Redirect URI:</strong> ${escapeHtml(input.redirectUri)}</div>
-        </div>
-      </details>
       <p class="legal">By authorizing this connector, you agree to Taskforce&apos;s <a href="${termsUrl}" target="_blank" rel="noopener noreferrer">Terms of Service</a> and acknowledge the <a href="${privacyUrl}" target="_blank" rel="noopener noreferrer">Privacy Policy</a>.</p>
       <input type="hidden" name="client_id" value="${escapeHtml(input.clientId)}" />
       <input type="hidden" name="redirect_uri" value="${escapeHtml(input.redirectUri)}" />
@@ -345,6 +335,7 @@ export function registerAdminRoutes(deps) {
       <input type="hidden" name="state" value="${escapeHtml(input.state)}" />
       <input type="hidden" name="code_challenge" value="${escapeHtml(input.codeChallenge)}" />
       <input type="hidden" name="code_challenge_method" value="${escapeHtml(input.codeChallengeMethod)}" />
+      <input type="hidden" name="next" value="${escapeHtml(input.authorizeUrl)}" />
       <div class="actions">
         <button type="submit" name="decision" value="deny">Cancel</button>
         <button type="submit" name="decision" value="approve">Authorize</button>
@@ -2667,8 +2658,18 @@ export function registerAdminRoutes(deps) {
             const userIdentity = core.resolveUserIdentity(access.userId);
             const userName = String(userIdentity?.displayName || userIdentity?.email || access.userId).trim() || String(access.userId);
             const userMeta = userIdentity?.email && userIdentity.email !== userName ? String(userIdentity.email).trim() : null;
+            const authorizeUrl = new URL('/oauth/mcp/authorize', resolveMcpOauthIssuer(req));
+            authorizeUrl.searchParams.set('client_id', clientId);
+            authorizeUrl.searchParams.set('redirect_uri', redirectUri);
+            authorizeUrl.searchParams.set('response_type', responseType);
+            authorizeUrl.searchParams.set('code_challenge', codeChallenge);
+            authorizeUrl.searchParams.set('code_challenge_method', codeChallengeMethod);
+            if (state)
+                authorizeUrl.searchParams.set('state', state);
+            if (scopes.length > 0)
+                authorizeUrl.searchParams.set('scope', scopes.join(' '));
             res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-            res.end(renderMcpOauthAuthorizePage({ userName, userMeta, workspaces, preselectedWorkspaceId: preferredWorkspaceId, clientName: clientRecord.clientName, clientId: clientRecord.id, redirectUri, scopes, state, codeChallenge, codeChallengeMethod }));
+            res.end(renderMcpOauthAuthorizePage({ userName, userMeta, authorizeUrl: authorizeUrl.toString(), workspaces, preselectedWorkspaceId: preferredWorkspaceId, clientName: clientRecord.clientName, clientId: clientRecord.id, redirectUri, scopes, state, codeChallenge, codeChallengeMethod }));
         }
         catch (error) {
             const statusCode = resolveErrorStatusCode(error);
@@ -2713,8 +2714,18 @@ export function registerAdminRoutes(deps) {
             const userIdentity = core.resolveUserIdentity(access.userId);
             const userName = String(userIdentity?.displayName || userIdentity?.email || access.userId).trim() || String(access.userId);
             const userMeta = userIdentity?.email && userIdentity.email !== userName ? String(userIdentity.email).trim() : null;
+            const authorizeUrl = new URL('/oauth/mcp/authorize', resolveMcpOauthIssuer(req));
+            authorizeUrl.searchParams.set('client_id', clientId);
+            authorizeUrl.searchParams.set('redirect_uri', redirectUri);
+            authorizeUrl.searchParams.set('response_type', responseType);
+            authorizeUrl.searchParams.set('code_challenge', codeChallenge);
+            authorizeUrl.searchParams.set('code_challenge_method', codeChallengeMethod);
+            if (state)
+                authorizeUrl.searchParams.set('state', state);
+            if (scopes.length > 0)
+                authorizeUrl.searchParams.set('scope', scopes.join(' '));
             res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-            res.end(renderMcpOauthAuthorizePage({ userName, userMeta, workspaces, preselectedWorkspaceId: preferredWorkspaceId, clientName: clientRecord.clientName, clientId: clientRecord.id, redirectUri, scopes, state, codeChallenge, codeChallengeMethod }));
+            res.end(renderMcpOauthAuthorizePage({ userName, userMeta, authorizeUrl: authorizeUrl.toString(), workspaces, preselectedWorkspaceId: preferredWorkspaceId, clientName: clientRecord.clientName, clientId: clientRecord.id, redirectUri, scopes, state, codeChallenge, codeChallengeMethod }));
         }
         catch (error) {
             const statusCode = resolveErrorStatusCode(error);

package/dist/server/routes/auth.js

@@ -2068,7 +2068,31 @@ export function registerAuthRoutes(deps) {
         for (const domain of domains) {
             clearCookies.push(`${clearBase}; Domain=${domain}`);
         }
+        const body = await parseFormBody(req);
+        const requestedNext = String(body.next || '').trim();
+        const next = (() => {
+            if (!requestedNext)
+                return '';
+            try {
+                const parsed = new URL(requestedNext);
+                const host = parsed.hostname.toLowerCase();
+                const isLocal = host === 'localhost' || host === '127.0.0.1' || host === '::1';
+                const isTaskforceHost = host === 'taskforcehq.ai' || host.endsWith('.taskforcehq.ai');
+                if ((parsed.protocol === 'http:' || parsed.protocol === 'https:') && (isLocal || isTaskforceHost)) {
+                    return parsed.toString();
+                }
+            }
+            catch {
+                return '';
+            }
+            return '';
+        })();
         res.setHeader('Set-Cookie', [...new Set(clearCookies)]);
+        if (next) {
+            res.writeHead(303, { Location: next });
+            res.end();
+            return;
+        }
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify({ success: true }));
     });