Merge branch 'master' into add-troubleshooting-section

Author: ali90h

apps/desktop/src/components/Rule.svelte

@@ -1,5 +1,7 @@
 <script lang="ts">
 	import ReduxResult from '$components/ReduxResult.svelte';
+	import { CLAUDE_CODE_SERVICE } from '$lib/codegen/claude';
+	import { sessionMessage } from '$lib/codegen/types';
 	import {
 		semanticTypeToString,
 		treeStatusToShortString,
@@ -23,6 +25,7 @@
 
 	const stackService = inject(STACK_SERVICE);
 	const rulesService = inject(RULES_SERVICE);
+	const claudeCodeService = inject(CLAUDE_CODE_SERVICE);
 
 	const [deleteRule, deletingRule] = rulesService.deleteWorkspaceRule;
 
@@ -86,9 +89,22 @@
 			<Icon name="tag" opacity={0.6} />
 			<span class="text-12 truncate">{semanticTypeToString(filter.subject.type)}</span>
 		{:else if filter.type === 'claudeCodeSessionId'}
-			<Icon name="tag" opacity={0.6} />
-			<!-- TODO: Make an API call to get a rich name for the session, instead of rendering a UUID -->
-			<span class="text-12 truncate">{filter.subject}</span>
+			{@const sessionDetails = claudeCodeService.sessionDetails(projectId, filter.subject)}
+			<ReduxResult {projectId} result={sessionDetails.current}>
+				{#snippet loading()}
+					<Icon name="tag" opacity={0.6} />
+					<span class="text-12 truncate">{filter.subject}</span>
+				{/snippet}
+				{#snippet error()}
+					<Icon name="tag" opacity={0.6} />
+					<span class="text-12 truncate">{filter.subject}</span>
+				{/snippet}
+				{#snippet children(sessionDetails)}
+					{@const title = sessionMessage(sessionDetails) ?? filter.subject}
+					<Icon name="tag" opacity={0.6} />
+					<span class="text-12 truncate" {title}>{title}</span>
+				{/snippet}
+			</ReduxResult>
 		{/if}
 	</div>
 {/snippet}

apps/desktop/src/components/profileSettings/ExperimentalSettings.svelte

@@ -70,25 +70,6 @@
 		{/snippet}
 	</SectionCard>
 
-	<SectionCard labelFor="single-branch" roundedTop={false} orientation="row">
-		{#snippet title()}
-			Single-branch mode
-		{/snippet}
-		{#snippet caption()}
-			Stay in the workspace view when leaving the gitbutler/workspace branch.
-		{/snippet}
-		{#snippet actions()}
-			<Toggle
-				id="rules"
-				checked={$settingsStore?.featureFlags.singleBranch}
-				onclick={() =>
-					settingsService.updateFeatureFlags({
-						singleBranch: !$settingsStore?.featureFlags.singleBranch
-					})}
-			/>
-		{/snippet}
-	</SectionCard>
-
 	{#if $user?.role === 'admin'}
 		<Spacer margin={20} />
 		{#if $settingsStore?.featureFlags.actions}
@@ -110,6 +91,30 @@
 			</SectionCard>
 		{/if}
 
+		<SectionCard
+			labelFor="single-branch"
+			roundedTop={false}
+			roundedBottom={false}
+			orientation="row"
+		>
+			{#snippet title()}
+				Single-branch mode
+			{/snippet}
+			{#snippet caption()}
+				Stay in the workspace view when leaving the gitbutler/workspace branch.
+			{/snippet}
+			{#snippet actions()}
+				<Toggle
+					id="rules"
+					checked={$settingsStore?.featureFlags.singleBranch}
+					onclick={() =>
+						settingsService.updateFeatureFlags({
+							singleBranch: !$settingsStore?.featureFlags.singleBranch
+						})}
+				/>
+			{/snippet}
+		</SectionCard>
+
 		<SectionCard labelFor="codegen" roundedTop={false} roundedBottom={false} orientation="row">
 			{#snippet title()}
 				Codegen (Claude Code)

apps/desktop/src/lib/codegen/claude.ts

@@ -1,4 +1,4 @@
-import { type ClaudeMessage } from '$lib/codegen/types';
+import { type ClaudeMessage, type ClaudeSessionDetails } from '$lib/codegen/types';
 import { hasTauriExtra } from '$lib/state/backendQuery';
 import { invalidatesItem, providesItem, ReduxTag } from '$lib/state/tags';
 import { InjectionToken } from '@gitbutler/shared/context';
@@ -20,6 +20,13 @@ export class ClaudeCodeService {
 	get messages() {
 		return this.api.endpoints.getMessages.useQuery;
 	}
+
+	sessionDetails(projectId: string, sessionId: string) {
+		return this.api.endpoints.getSessionDetails.useQuery({
+			projectId,
+			sessionId
+		});
+	}
 }
 
 function injectEndpoints(api: ClientState['backendApi']) {
@@ -42,6 +49,16 @@ function injectEndpoints(api: ClientState['backendApi']) {
 					invalidatesItem(ReduxTag.EditChangesSinceInitial, args.projectId + args.stackId)
 				]
 			}),
+			getSessionDetails: build.query<
+				ClaudeSessionDetails,
+				{ projectId: string; sessionId: string }
+			>({
+				extraOptions: { command: 'claude_get_session_details' },
+				query: (args) => args,
+				providesTags: (_result, _error, args) => [
+					...providesItem(ReduxTag.ClaudeSessionDetails, args.projectId + args.sessionId)
+				]
+			}),
 			getMessages: build.query<ClaudeMessage[], { projectId: string; stackId: string }>({
 				extraOptions: { command: 'claude_get_messages' },
 				query: (args) => args,

apps/desktop/src/lib/codegen/types.ts

@@ -103,3 +103,16 @@ export type ClaudeMessageContent =
 			type: 'userInput';
 			subject: { message: string };
 	  };
+
+/**
+ * Details about a Claude session, extracted from the Claude transcript.
+ * This data is derived just in time, i.e. not persisted by GitButler.
+ */
+export type ClaudeSessionDetails = {
+	summary: string | null;
+	lastPrompt: string | null;
+};
+
+export function sessionMessage(sessionDetails: ClaudeSessionDetails): string | undefined {
+	return sessionDetails.summary ?? sessionDetails.lastPrompt ?? undefined;
+}

apps/desktop/src/lib/state/tags.ts

@@ -1,7 +1,5 @@
 // TODO: Refactor this enum into an object conataining invalidation rules.
 export enum ReduxTag {
-	InitalEditListing = 'InitialEditListing',
-	EditChangesSinceInitial = 'EditChangesSinceInitial',
 	HeadMetadata = 'HeadMetadata',
 	Diff = 'Diff',
 	Stacks = 'Stacks',
@@ -25,7 +23,10 @@ export enum ReduxTag {
 	SnapshotDiff = 'SnapshotDiff',
 	WorkspaceRules = 'WorkspaceRules',
 	Project = 'Project',
-	ClaudeCodeTranscript = 'ClaudeCodeTranscript'
+	ClaudeCodeTranscript = 'ClaudeCodeTranscript',
+	ClaudeSessionDetails = 'ClaudeSessionDetails',
+	InitalEditListing = 'InitialEditListing',
+	EditChangesSinceInitial = 'EditChangesSinceInitial'
 }
 
 type Tag<T extends string | number> = {