circuschief 0.7.0 → 1.0.0

package/packages/server/src/services/queryParamBuilder.js

@@ -0,0 +1,90 @@
+import { createClaudeCodeSpawner } from './nodeSpawnHelper.js';
+import {
+  buildSystemPromptConfig,
+  getPermissionModeForSession,
+  getSandboxModeForSession,
+} from './sessionPrompts.js';
+
+/**
+ * Build query parameters for the Claude Code adapter.
+ * @returns {Object}
+ */
+function buildClaudeCodeQueryParams({
+  prompt, workingDirectory, controller, session, sessionId, systemPrompt,
+  model, sessionEnv, resumeSessionId = null,
+}) {
+  const isVCR = Boolean(process.env.VCR_MODE);
+  const effectiveModel = isVCR ? 'claude-haiku-4-5-20251001' : model;
+
+  return {
+    prompt,
+    options: {
+      cwd: workingDirectory,
+      abortController: controller,
+      includePartialMessages: true,
+      permissionMode: getPermissionModeForSession(session.mode),
+      // Match normal Claude Code CLI behavior: load user-level settings
+      // such as configured MCP servers, then project/local overrides.
+      settingSources: ['user', 'project', 'local'],
+      ...(resumeSessionId && { resume: resumeSessionId }),
+      env: sessionEnv,
+      spawnClaudeCodeProcess: createClaudeCodeSpawner(),
+      model: effectiveModel,
+      systemPrompt: buildSystemPromptConfig(sessionId, session.projectId, systemPrompt, session.mode),
+    },
+  };
+}
+
+/**
+ * Build query parameters for the Codex adapter.
+ *
+ * Codex in v1 is a simple Chat-Completions-shaped executor. It does not need
+ * or accept Claude-specific options such as permissionMode, settingSources,
+ * includePartialMessages, spawnClaudeCodeProcess, or resume.
+ *
+ * @returns {Object}
+ */
+function buildCodexQueryParams({
+  prompt, workingDirectory, controller, session, sessionId, systemPrompt, model, sessionEnv,
+}) {
+  const isVCR = Boolean(process.env.VCR_MODE);
+  const effectiveModel = isVCR ? 'gpt-4o-mini' : model;
+
+  return {
+    prompt,
+    options: {
+      cwd: workingDirectory,
+      abortController: controller,
+      env: sessionEnv,
+      model: effectiveModel,
+      effortLevel: session?.effortLevel ?? null,
+      systemPrompt: buildSystemPromptConfig(sessionId, session.projectId, systemPrompt, session.mode),
+      sandboxMode: getSandboxModeForSession(session?.mode),
+    },
+  };
+}
+
+/**
+ * Build query parameters for executing a session via the configured agent.
+ * Shared by runSession, continueSession, and continueSessionWithExistingMessage.
+ *
+ * @param {Object} options
+ * @param {string} options.prompt - The prompt text to send
+ * @param {string} options.workingDirectory - Session working directory
+ * @param {AbortController} options.controller - Abort controller for the session
+ * @param {Object} options.session - Session object from DB
+ * @param {string} options.sessionId - Session ID
+ * @param {string|null} options.systemPrompt - Custom system prompt from project settings
+ * @param {string|null} options.model - Model to use
+ * @param {Object} options.sessionEnv - Environment variables for the session
+ * @param {string|null} [options.resumeSessionId] - Session ID to resume (null for new session)
+ * @param {string} [options.agentType] - 'claude-code' (default) | 'codex'
+ * @returns {Object} Query parameters for agent.execute()
+ */
+export function buildQueryParams(options) {
+  const { agentType = 'claude-code' } = options || {};
+  if (agentType === 'codex') {
+    return buildCodexQueryParams(options);
+  }
+  return buildClaudeCodeQueryParams(options);
+}

package/packages/server/src/services/sessionDuplicator.js

@@ -3,7 +3,6 @@ import {
   conversations,
   messages,
   canvasItems,
-  sessionNotes,
   sessionSummaries,
   projects,
 } from '../db/index.js';
@@ -47,10 +46,7 @@ export async function duplicateSession(sourceSessionId, options = {}) {
     // 5. Duplicate canvas items
     canvasItems.duplicateForSession(sourceSessionId, newSession.id);
 
-    // 6. Duplicate session notes
-    sessionNotes.duplicateForSession(sourceSessionId, newSession.id);
-
-    // 7. Duplicate session summary (if exists)
+    // 6. Duplicate session summary (if exists)
     sessionSummaries.duplicateForSession(sourceSessionId, newSession.id);
 
     // Return the updated session

package/packages/server/src/services/sessionExecution.js

@@ -1,14 +1,13 @@
 import { sessions, messages, attachments, conversations } from '../database.js';
-import { createClaudeCodeSpawner } from './nodeSpawnHelper.js';
 import { createCodexSpawner } from './codexSpawnHelper.js';
-import { resolveProviderFromModel, buildSessionEnv } from './sessionProvider.js';
+import { resolveProviderFromModel, resolveProviderMetadataFromModel, buildSessionEnv } from './sessionProvider.js';
 import { agentGateway } from '../agents/AgentGateway.js';
 import { LoggingAgentWrapper } from '../agents/LoggingAgentWrapper.js';
 import { VCRAgentAdapter } from '../agents/vcr/VCRAgentAdapter.js';
+import { isE2ESpawnCaptureEnabled } from './e2eSpawnCapture.js';
+export { buildQueryParams } from './queryParamBuilder.js';
+import { buildQueryParams } from './queryParamBuilder.js';
 import {
-  buildSystemPromptConfig,
-  getPermissionModeForSession,
-  getSandboxModeForSession,
   buildPromptWithAttachments,
 } from './sessionPrompts.js';
 import {
@@ -23,6 +22,7 @@ import {
 import { shouldRescheduleOnError, _checkProactiveReschedule } from './sessionErrors.js';
 import { schedulerService } from './schedulerService.js';
 import { buildConversationContextForModelSwitch, buildConversationContextForContinuation } from './conversationContext.js';
+import { ensureWorktreeCommitAttributionHook } from './gitService.js';
 import { broadcastToSession } from '../websocket.js';
 import { WS_MESSAGE_TYPES } from '../../../shared/src/index.js';
 
@@ -40,6 +40,34 @@ function buildAgentConfig(agentType) {
   return {};
 }
 
+export function buildAgentEnv(sessionEnv, commitAttributionOverride) {
+  const env = { ...(sessionEnv || {}) };
+  if (commitAttributionOverride) {
+    env.CIRCUSCHIEF_COMMIT_ATTRIBUTION = commitAttributionOverride;
+  } else {
+    delete env.CIRCUSCHIEF_COMMIT_ATTRIBUTION;
+  }
+  return env;
+}
+
+async function resolveInitialSessionModelEnv(session, model) {
+  const effectiveModel = model || session.model;
+  const provider = resolveProviderFromModel(effectiveModel);
+  const providerMetadata = resolveProviderMetadataFromModel(effectiveModel);
+  const commitAttributionOverride = providerMetadata?.commitAttributionOverride ?? null;
+
+  if (session.gitWorktree && commitAttributionOverride) {
+    await ensureWorktreeCommitAttributionHook(session.gitWorktree);
+  }
+
+  const baseSessionEnv = buildSessionEnv(provider, session.thinkingEnabled, session.effortLevel);
+  return {
+    effectiveModel,
+    sessionEnv: buildAgentEnv(baseSessionEnv, commitAttributionOverride),
+    commitAttributionOverride,
+  };
+}
+
 /**
  * Create the agent for a session, using gateway + logging + VCR.
  *
@@ -56,7 +84,7 @@ export function createAgentForSession(agentType = 'claude-code', config = {}) {
   const baseAgent = agentGateway.createAgent(agentType, mergedConfig);
 
   // Wrap with VCR adapter if in VCR mode
-  const agent = process.env.VCR_MODE
+  const agent = process.env.VCR_MODE && !isE2ESpawnCaptureEnabled()
     ? new VCRAgentAdapter(baseAgent, { cassetteDir: 'tests/e2e/cassettes' })
     : baseAgent;
 
@@ -64,97 +92,6 @@ export function createAgentForSession(agentType = 'claude-code', config = {}) {
   return new LoggingAgentWrapper(agent);
 }
 
-/**
- * Build query parameters for the Claude Code adapter.
- * @returns {Object}
- */
-function buildClaudeCodeQueryParams({
-  prompt, workingDirectory, controller, session, sessionId, systemPrompt,
-  model, sessionEnv, resumeSessionId = null,
-}) {
-  const isVCR = Boolean(process.env.VCR_MODE);
-  const effectiveModel = isVCR ? 'claude-haiku-4-5-20251001' : model;
-
-  return {
-    prompt,
-    options: {
-      cwd: workingDirectory,
-      abortController: controller,
-      includePartialMessages: true,
-      permissionMode: getPermissionModeForSession(session.mode),
-      // Match normal Claude Code CLI behavior: load user-level settings
-      // such as configured MCP servers, then project/local overrides.
-      settingSources: ['user', 'project', 'local'],
-      ...(resumeSessionId && { resume: resumeSessionId }),
-      env: sessionEnv,
-      spawnClaudeCodeProcess: createClaudeCodeSpawner(),
-      model: effectiveModel,
-      systemPrompt: buildSystemPromptConfig(sessionId, session.projectId, systemPrompt, session.mode),
-    },
-  };
-}
-
-/**
- * Build query parameters for the Codex adapter.
- *
- * Codex in v1 is a simple Chat-Completions-shaped executor — it doesn't need
- * or accept Claude-specific options (permissionMode, settingSources,
- * includePartialMessages, spawnClaudeCodeProcess, resume).
- *
- * Codex does have its own sandboxing model, driven from {@code session.mode}
- * via {@link getSandboxModeForSession}. Codex CLI v0.124.0 also supports
- * resume via `codex resume` / `codex exec resume`, but Circus Chief v1
- * intentionally does NOT pass a resume token — wiring is deferred to a
- * later phase (see canvas plan §Phase 4.5).
- *
- * @returns {Object}
- */
-function buildCodexQueryParams({
-  prompt, workingDirectory, controller, session, sessionId, systemPrompt, model, sessionEnv,
-}) {
-  const isVCR = Boolean(process.env.VCR_MODE);
-  // In VCR mode, force the cheapest commonly-cassetted OpenAI model.
-  const effectiveModel = isVCR ? 'gpt-4o-mini' : model;
-
-  return {
-    prompt,
-    options: {
-      cwd: workingDirectory,
-      abortController: controller,
-      env: sessionEnv,
-      model: effectiveModel,
-      effortLevel: session?.effortLevel ?? null,
-      systemPrompt: buildSystemPromptConfig(sessionId, session.projectId, systemPrompt, session.mode),
-      sandboxMode: getSandboxModeForSession(session?.mode),
-    },
-  };
-}
-
-/**
- * Build query parameters for executing a session via the configured agent.
- * Shared by runSession, continueSession, and continueSessionWithExistingMessage.
- *
- * @param {Object} options
- * @param {string} options.prompt - The prompt text to send
- * @param {string} options.workingDirectory - Session working directory
- * @param {AbortController} options.controller - Abort controller for the session
- * @param {Object} options.session - Session object from DB
- * @param {string} options.sessionId - Session ID
- * @param {string|null} options.systemPrompt - Custom system prompt from project settings
- * @param {string|null} options.model - Model to use
- * @param {Object} options.sessionEnv - Environment variables for the session
- * @param {string|null} [options.resumeSessionId] - Session ID to resume (null for new session)
- * @param {string} [options.agentType] - 'claude-code' (default) | 'codex'
- * @returns {Object} Query parameters for agent.execute()
- */
-export function buildQueryParams(options) {
-  const { agentType = 'claude-code' } = options || {};
-  if (agentType === 'codex') {
-    return buildCodexQueryParams(options);
-  }
-  return buildClaudeCodeQueryParams(options);
-}
-
 /**
  * Execute the agent stream loop and handle post-turn completion, errors, and cleanup.
  * This is the shared core of runSession, continueSession, and continueSessionWithExistingMessage.
@@ -260,7 +197,12 @@ function buildContinueModelAndEnv(session, sessionId, model) {
 
   // Derive provider from the effective model ID (returns null for Anthropic/SDK defaults)
   const provider = resolveProviderFromModel(effectiveModel);
-  const sessionEnv = buildSessionEnv(provider, session.thinkingEnabled, session.effortLevel);
+  const providerMetadata = resolveProviderMetadataFromModel(effectiveModel);
+  const commitAttributionOverride = providerMetadata?.commitAttributionOverride ?? null;
+  const sessionEnv = buildAgentEnv(
+    buildSessionEnv(provider, session.thinkingEnabled, session.effortLevel),
+    commitAttributionOverride
+  );
 
   // Check if model changed from the session's last requested model
   // When model changes, we can't resume the previous session - thinking blocks and
@@ -275,7 +217,13 @@ function buildContinueModelAndEnv(session, sessionId, model) {
     updatedSession = sessions.getById(sessionId); // refresh
   }
 
-  return { effectiveModel, sessionEnv, modelChanged, session: updatedSession };
+  return {
+    effectiveModel,
+    sessionEnv,
+    commitAttributionOverride,
+    modelChanged,
+    session: updatedSession,
+  };
 }
 
 /**
@@ -286,7 +234,7 @@ function buildContinueModelAndEnv(session, sessionId, model) {
 async function buildContinueParams({
   sessionId, session, model, systemPrompt, effectiveModel, sessionEnv,
   modelChanged, activeConversation, promptWithAttachments,
-  workingDirectory, controller, agentType, agent,
+  workingDirectory, controller, agentType, agent, commitAttributionOverride,
 }) {
   // Only resume if we have a session ID AND model hasn't changed AND the
   // agent supports resume.
@@ -308,6 +256,7 @@ async function buildContinueParams({
     sessionEnv,
     resumeSessionId: canResume ? activeConversation.claudeSessionId : null,
     agentType,
+    commitAttributionOverride,
   });
 
   // Logging metadata for agent call tracking
@@ -394,11 +343,15 @@ export async function continueSessionCore(sessionId, content, workingDirectory,
   // Resolve model/provider and detect model changes
   const modelEnv = buildContinueModelAndEnv(session, sessionId, model);
   session = modelEnv.session;
+  if (session.gitWorktree && modelEnv.commitAttributionOverride) {
+    await ensureWorktreeCommitAttributionHook(session.gitWorktree);
+  }
 
   // Build query params and agent call meta
   const { queryParams, agentCallMeta } = await buildContinueParams({
     sessionId, session, model, systemPrompt,
     effectiveModel: modelEnv.effectiveModel, sessionEnv: modelEnv.sessionEnv,
+    commitAttributionOverride: modelEnv.commitAttributionOverride,
     modelChanged: modelEnv.modelChanged, activeConversation, promptWithAttachments,
     workingDirectory, controller, agentType, agent,
   });
@@ -459,14 +412,8 @@ export async function runSessionCore(sessionId, prompt, workingDirectory, config
   const agentType = session.agentType || 'claude-code';
   const agent = createAgentForSession(agentType);
 
-  // Resolve the effective model: fall back to session.model as defense-in-depth
-  // (draftSessionService already resolves the model upstream, but this ensures
-  // correctness if called directly).
-  const effectiveModel = model || session.model;
-
-  // Derive provider from the effective model ID (returns null for Anthropic/SDK defaults)
-  const provider = resolveProviderFromModel(effectiveModel);
-  const sessionEnv = buildSessionEnv(provider, session.thinkingEnabled, session.effortLevel);
+  const { effectiveModel, sessionEnv, commitAttributionOverride } =
+    await resolveInitialSessionModelEnv(session, model);
 
   const queryParams = buildQueryParams({
     prompt: promptWithAttachments,
@@ -478,6 +425,7 @@ export async function runSessionCore(sessionId, prompt, workingDirectory, config
     model: effectiveModel,
     sessionEnv,
     agentType,
+    commitAttributionOverride,
   });
 
   // Log query params for debugging third-party provider issues

package/packages/server/src/services/sessionPrompts.js

@@ -162,10 +162,7 @@ CRITICAL: Do NOT start coding until you have presented a plan and received appro
  */
 function buildCanvasWriteSystemPrompt(session) {
   const apiUrl = getApiBaseUrl();
-  // Use root session ID, fall back to session.id if getRootSessionId returns null, fall back to 'unknown-session' if session is null
-  const sessionId = session
-    ? (sessions.getRootSessionId(session.id) || session.id)
-    : 'unknown-session';
+  const sessionId = session?.id || 'unknown-session';
   return `When you generate artifacts that should be displayed on the canvas (images, markdown documents, code snippets, data visualizations, PDFs), POST them to:
 
 POST ${apiUrl}/api/sessions/${sessionId}/canvas
@@ -187,10 +184,7 @@ The file type is automatically detected from the file extension. Supported forma
  */
 function buildCanvasReadSystemPrompt(session) {
   const apiUrl = getApiBaseUrl();
-  // Use root session ID, fall back to session.id if getRootSessionId returns null, fall back to 'unknown-session' if session is null
-  const sessionId = session
-    ? (sessions.getRootSessionId(session.id) || session.id)
-    : 'unknown-session';
+  const sessionId = session?.id || 'unknown-session';
   return `## Reading from Canvas
 
 To list all files on the canvas:
@@ -225,9 +219,10 @@ function buildSessionCrudOps(apiUrl, projectId) {
 \`\`\`bash
 curl -X POST ${apiUrl}/api/projects/${projectId}/sessions \\
   -H "Content-Type: application/json" \\
-  -d '{"prompt": "Your task description here", "name": "Optional session name"}'
+  -d '{"prompt": "Your task description here"}'
 \`\`\`
-Optional fields: \`name\`, \`mode\`, \`thinkingEnabled\` (boolean), \`effortLevel\` (low/medium/high/max/auto), \`gitBranch\`, \`gitMode\`, \`parentSessionId\` (to create a child session)
+Only \`prompt\` is required. Omitted settings are automatically derived from the project's session defaults, then system defaults, matching UI behavior.
+Optional override fields: \`name\`, \`mode\`, \`thinkingEnabled\` (boolean), \`effortLevel\` (low/medium/high/max/auto), \`model\`, \`providerId\`, \`gitBranch\`, \`gitMode\`, \`templateId\`, \`nextTemplateId\`, \`parentSessionId\` (to create a related follow-up session from the current session), \`startImmediately\`, \`scheduledAt\` (ISO 8601 date-time string with timezone, e.g. \`"2026-06-12T14:00:00Z"\`), \`autoRescheduleEnabled\`, \`rescheduleDelayMinutes\`, \`rescheduleOnTokenLimit\`, \`rescheduleOnServiceError\`, \`maxRescheduleCount\`, \`maxTotalTokens\`, and \`rescheduleAtTokenCount\`.
 
 ### Send a Follow-up Message
 \`\`\`bash
@@ -258,8 +253,8 @@ curl -X PATCH ${apiUrl}/api/sessions/<session_id> \\
 \`\`\``;
 }
 
-/** Build project, notes, and summary operations section */
-function buildProjectNotesOps(apiUrl) {
+/** Build project and summary operations section */
+function buildProjectOps(apiUrl, sessionId) {
   return `### Project Operations
 \`\`\`bash
 curl ${apiUrl}/api/projects                          # List all projects
@@ -271,18 +266,10 @@ curl -X POST ${apiUrl}/api/projects \\
 \`\`\`
 Optional field: \`systemPrompt\`
 
-### Session Notes
+### Workflow Summary
 \`\`\`bash
-curl ${apiUrl}/api/sessions/<session_id>/notes       # Get notes
-curl -X POST ${apiUrl}/api/sessions/<session_id>/notes \\
-  -H "Content-Type: application/json" \\
-  -d '{"content": "Note content"}'
-\`\`\`
-
-### Session Summary
-\`\`\`bash
-curl "${apiUrl}/api/sessions/<session_id>/summary?generate=true"
-curl -X POST ${apiUrl}/api/sessions/<session_id>/summary  # Regenerate
+curl "${apiUrl}/api/sessions/${sessionId}/summary?generate=true"
+curl -X POST ${apiUrl}/api/sessions/${sessionId}/summary  # Regenerate
 \`\`\``;
 }
 
@@ -299,7 +286,7 @@ You can create and modify sessions in this system using curl or similar HTTP too
 
 ${buildSessionCrudOps(apiUrl, projectId)}
 
-${buildProjectNotesOps(apiUrl)}`;
+${buildProjectOps(apiUrl, sessionId)}`;
 }
 
 /**
@@ -336,7 +323,7 @@ ${laneContext}
 curl ${apiUrl}/api/projects/${projectId}/kanban
 \`\`\`
 
-### Add This Session to the Board
+### Add Current Workflow to the Board
 \`\`\`bash
 curl -X POST ${apiUrl}/api/projects/${projectId}/kanban/cards \\
   -H "Content-Type: application/json" \\
@@ -394,26 +381,6 @@ This session is running in an isolated git worktree:
 CRITICAL: Do NOT use \`cd\` to navigate to the main repository. Your working directory is already set to the worktree. Running \`cd /home/ubuntu/workspace/circus-chief && ...\` will escape the worktree isolation and affect the main repository instead.`;
 }
 
-/**
- * Build child session context for system prompt
- * @param {Object} session - Session object
- * @returns {string} Child session context or empty string
- */
-function buildChildSessionContext(session) {
-  if (!session || !session.parentSessionId) {
-    return '';
-  }
-
-  // Get root session ID using existing method
-  const rootSessionId = sessions.getRootSessionId(session.id);
-
-  return `## Child Session
-
-This session is part of a multi-session workflow:
-- Parent Session ID: ${session.parentSessionId}
-- Root Session ID: ${rootSessionId}`;
-}
-
 /**
  * Build the full system prompt configuration
  * @param {string} sessionId
@@ -432,7 +399,6 @@ export function buildSystemPromptConfig(sessionId, projectId, customSystemPrompt
   const kanbanApiInstructions = buildKanbanApiInstructions(sessionId, projectId);
   const attachmentsContext = getSessionAttachmentsContext(sessionId);
   const worktreeContext = buildWorktreeContext(session);
-  const childSessionContext = buildChildSessionContext(session);
   const basePrompt = customSystemPrompt || DEFAULT_SYSTEM_PROMPT;
 
   // Prepend plan mode instructions if in plan mode
@@ -442,7 +408,6 @@ export function buildSystemPromptConfig(sessionId, projectId, customSystemPrompt
   const parts = [
     modePrompt,
     basePrompt,
-    childSessionContext,
     worktreeContext,
     attachmentsContext,
     canvasWriteInstructions,

package/packages/server/src/services/sessionProvider.js

@@ -11,6 +11,16 @@ export function resolveProviderFromModel(modelId) {
   return modelProviders.getProviderByModelId(modelId);
 }
 
+export function resolveProviderMetadataFromModel(modelId) {
+  if (!modelId) {
+    return modelProviders.getById?.('anthropic-default') || null;
+  }
+  if (typeof modelProviders.getProviderMetadataByModelId === 'function') {
+    return modelProviders.getProviderMetadataByModelId(modelId);
+  }
+  return modelProviders.getProviderByModelId(modelId);
+}
+
 /**
  * Resolve the agent type (claude-code vs codex) for a given model ID.
  * Uses the owning provider's kind:

package/packages/server/src/services/summaryService.js

@@ -200,18 +200,19 @@ function updateSessionFromSummary(sessionId, session, summaryData) {
   if (summaryData.sessionTitle || summaryData.prUrl) {
     const updateData = {};
     const freshSession = sessions.getById(sessionId);
+    const shouldApplySummaryPrUrl = summaryData.prUrl && !freshSession.prUrlAutoLinkDisabled;
 
     if (summaryData.sessionTitle && !freshSession.manuallyNamed) {
       updateData.name = summaryData.sessionTitle;
     }
 
-    if (summaryData.prUrl) {
+    if (shouldApplySummaryPrUrl) {
       updateData.prUrl = summaryData.prUrl;
     }
 
     const updatedSession = sessions.update(sessionId, updateData);
 
-    if (summaryData.prUrl) {
+    if (shouldApplySummaryPrUrl) {
       propagatePrUrlToParent(sessionId, summaryData.prUrl);
     }
 
@@ -521,7 +522,7 @@ export function propagatePrUrlToParent(sessionId, prUrl) {
   if (!rootId || rootId === sessionId) return;
 
   const root = sessions.getById(rootId);
-  if (!root || root.prUrl) return; // Don't overwrite existing PR URL
+  if (!root || root.prUrl || root.prUrlAutoLinkDisabled) return; // Don't overwrite existing or user-cleared PR URL
 
   sessions.update(root.id, { prUrl });
 
@@ -536,6 +537,7 @@ export {
   MAX_MESSAGES, MIN_MESSAGES_FOR_SUMMARY, MAX_RETRIES, DEFAULT_SESSION_TITLE_PROMPT,
   SUMMARY_SYSTEM_PROMPT, formatMessages, buildIncrementalPrompt, parseSummaryResponse,
   stripMarkdownCodeBlock as _stripMarkdownCodeBlock, trackMessageMetadata as _trackMessageMetadata,
+  updateSessionFromSummary as _updateSessionFromSummary,
 };
 export { callSummaryModel };
 export { callClaude } from './summaryClaudeClient.js';

package/packages/server/src/services/summaryStaleCheck.js

@@ -3,10 +3,24 @@
  * Extracted from summaryService.js for modularity.
  */
 
-import { sessionSummaries, messages } from '../database.js';
+import { sessionSummaries, messages, sessions } from '../database.js';
 
 /**
- * Check if a summary is stale (message count or last message ID has changed)
+ * Check if any descendant session has a summary newer than the given timestamp.
+ * @param {string} sessionId
+ * @param {number} generatedAt
+ * @returns {boolean}
+ */
+function hasNewerDescendantSummary(sessionId, generatedAt) {
+  const descendantIds = sessions.getAllDescendantIds(sessionId);
+  if (descendantIds.length === 0) return false;
+
+  const descendantSummaries = sessionSummaries.getBySessionIds(descendantIds);
+  return descendantSummaries.some(ds => ds.generatedAt > generatedAt);
+}
+
+/**
+ * Check if a summary is stale (message count, last message ID, or descendant summaries have changed)
  * @param {string} sessionId
  * @returns {boolean}
  */
@@ -27,9 +41,14 @@ export function isSummaryStale(sessionId) {
     }
 
     // Also validate count as a secondary check (defensive programming)
-    return allMessages.length !== summary.messageCount;
+    if (allMessages.length !== summary.messageCount) return true;
   }
 
   // Fallback to count-based staleness detection for old summaries
-  return allMessages.length !== summary.messageCount;
+  if (allMessages.length !== summary.messageCount) return true;
+
+  // Check if any descendant session has a newer summary
+  if (hasNewerDescendantSummary(sessionId, summary.generatedAt)) return true;
+
+  return false;
 }

package/packages/server/src/services/templateTriggerService.js

@@ -4,7 +4,7 @@ import { setupGitForSession } from './gitSessionSetup.js';
 import { runSession } from './sessionManager.js';
 import { broadcastToProject } from '../websocket.js';
 import { WS_MESSAGE_TYPES } from '../../../shared/src/index.js';
-import { resolveAgentTypeFromModel } from './sessionProvider.js';
+import { resolveAgentTypeFromModel, resolveProviderMetadataFromModel } from './sessionProvider.js';
 
 const liquid = new Liquid();
 
@@ -100,6 +100,8 @@ async function resolveWorkingDirectory(parentSession, project, settings, newSess
     gitBranch: settings.gitBranch,
     sessionId: newSessionId,
     worktreeBasePath: project.worktreePath || null,
+    commitAttributionOverride:
+      resolveProviderMetadataFromModel(settings.model)?.commitAttributionOverride ?? null,
   });
   return { workingDirectory: gitSetup.workingDirectory, gitWorktree: gitSetup.gitWorktree };
 }

package/packages/shared/src/constants.js

@@ -20,6 +20,9 @@ export const WS_RECONNECT_MAX_DELAY = 30000;
 
 export const TOAST_DURATION = 5000;
 
+/** Default delay (in minutes) before auto-rescheduling a session. */
+export const DEFAULT_RESCHEDULE_DELAY_MINUTES = 60;
+
 export const DEFAULT_SYSTEM_PROMPT = `You are Claude Code, an AI coding assistant. You help users with software engineering tasks including writing code, debugging, refactoring, and explaining code. You have full access to the shell and can execute any commands needed to assist the user. Be helpful, accurate, and thorough.
 
 IMPORTANT: Your working directory is already set correctly for this session. NEVER use \`cd\` to change to a hardcoded project path before running commands (e.g., \`cd /path/to/project && git status\`). This bypasses git worktree isolation and causes commands to run in the wrong directory. Always run commands directly without changing directory.

package/packages/shared/src/contracts/commandButtons.js

@@ -1,15 +1,29 @@
 import { z } from 'zod';
 
+const OPTION_TOKEN_DASHES = /(^|\s)([-\u2010-\u2015\u2212]+)(?=[A-Za-z0-9-])/g;
+const UNICODE_DASHES = /[\u2010-\u2015\u2212]/g;
+const HAS_UNICODE_DASH = /[\u2010-\u2015\u2212]/;
+
+export function normalizeCommandOptionDashes(command) {
+  return command.replace(OPTION_TOKEN_DASHES, (match, prefix, dashes) => {
+    if (!HAS_UNICODE_DASH.test(dashes)) {
+      return match;
+    }
+
+    return `${prefix}${dashes.replace(UNICODE_DASHES, '-')}`;
+  });
+}
+
 export const CreateCommandButtonRequest = z.object({
   label: z.string().min(1, 'Label is required'),
-  command: z.string().min(1, 'Command is required'),
+  command: z.string().min(1, 'Command is required').transform(normalizeCommandOptionDashes),
   sortOrder: z.number().int().optional().default(0),
   showOnList: z.boolean().optional().default(false),
 });
 
 export const UpdateCommandButtonRequest = z.object({
   label: z.string().min(1).optional(),
-  command: z.string().min(1).optional(),
+  command: z.string().min(1).transform(normalizeCommandOptionDashes).optional(),
   sortOrder: z.number().int().optional(),
   showOnList: z.boolean().optional(),
 }).refine(obj => Object.keys(obj).length > 0, 'At least one field must be provided for update');

package/packages/shared/src/contracts/projects.js

@@ -46,7 +46,7 @@ export const ProjectSessionDefaultsRequest = z.object({
   thinkingEnabled: z.boolean().nullable().optional(),
   effortLevel: z.enum(['low', 'medium', 'high', 'max', 'auto']).nullable().optional(),
   startImmediately: z.boolean().nullable().optional(),
-  gitMode: z.enum(['branch', 'worktree']).nullable().optional(),
+  gitMode: z.enum(['branch', 'worktree', 'current']).nullable().optional(),
   gitBranch: z.string().nullable().optional(),
   model: z.string().nullable().optional(),
   providerId: z.string().nullable().optional(),
@@ -59,7 +59,7 @@ export const ProjectSessionDefaultsResponse = z.object({
   thinkingEnabled: z.boolean().nullable(),
   effortLevel: z.enum(['low', 'medium', 'high', 'max', 'auto']).nullable(),
   startImmediately: z.boolean().nullable(),
-  gitMode: z.enum(['branch', 'worktree']).nullable(),
+  gitMode: z.enum(['branch', 'worktree', 'current']).nullable(),
   gitBranch: z.string().nullable(),
   model: z.string().nullable(),
   providerId: z.string().nullable(),