@jetcrab/pi-desk 1.1.25 → 1.1.29-dev

package/src/common/l2_biz/project-preview/l2-project-preview-navigation.ts

@@ -1,19 +1,12 @@
-import type { L4Locale } from '@common/l4_foundation/locale/l4-locale'
-import { L2_PROJECT_HISTORY_MESSAGES } from './l2-project-history-messages'
-
 export const L2_PROJECT_PREVIEW_PATH = '/project-preview'
 
 export function buildL2ProjectPreviewHref(cwd?: string | null): string {
   return cwd ? `${L2_PROJECT_PREVIEW_PATH}?cwd=${encodeURIComponent(cwd)}` : L2_PROJECT_PREVIEW_PATH
 }
 
-export function buildL2ProjectPreviewTitle(
-  cwd: string | null | undefined,
-  locale: L4Locale
-): string {
-  const directory = cwd?.trim() || null
-  const name = directory?.replaceAll('\\', '/').split('/').filter(Boolean).at(-1) ?? directory
-  return [name, L2_PROJECT_HISTORY_MESSAGES[locale].previewTitle, 'Pi Desk']
-    .filter(Boolean)
-    .join(' · ')
+export function buildL2ProjectPreviewTitle(cwd: string | null | undefined): string {
+  const directory = cwd?.trim()
+  if (!directory) return 'Pi Desk'
+  const name = directory.replaceAll('\\', '/').split('/').filter(Boolean).at(-1) ?? directory
+  return name === directory ? directory : `${name} – ${directory}`
 }

package/src/common/l2_biz/work-session/l2-work-session-search-contract.ts

@@ -0,0 +1,26 @@
+import { z } from 'zod'
+import {
+  L3PiSessionSearchMatchSchema,
+  L3PiSessionSearchQuerySchema
+} from '@common/l3_modules/pi/l3-pi-session-search-contract'
+import { L2WorkIdSchema } from './l2-work-session-contract'
+
+export const L2WorkSessionSearchRequestSchema = L3PiSessionSearchQuerySchema.extend({
+  query: z.string().trim().min(1).max(120)
+})
+
+export const L2WorkSessionSearchResponseSchema = z
+  .object({
+    sessions: z.array(
+      z
+        .object({
+          workId: L2WorkIdSchema,
+          matches: z.array(L3PiSessionSearchMatchSchema).min(1).max(4)
+        })
+        .strict()
+    )
+  })
+  .strict()
+
+export type L2WorkSessionSearchRequest = z.infer<typeof L2WorkSessionSearchRequestSchema>
+export type L2WorkSessionSearchResponse = z.infer<typeof L2WorkSessionSearchResponseSchema>

package/src/common/l2_biz/work-session/l2-work-session-tree-contract.ts

@@ -86,7 +86,7 @@ export const L2WorkSessionTreeEntryGetResponseSchema = z
   })
   .strict()
 
-export const L2WorkSessionBranchActionSchema = z.enum(['tree', 'fork', 'clone'])
+export const L2WorkSessionBranchActionSchema = z.enum(['tree', 'fork', 'clone', 'resend'])
 
 export const L2WorkSessionBranchRequestSchema = z.discriminatedUnion('action', [
   z
@@ -97,6 +97,14 @@ export const L2WorkSessionBranchRequestSchema = z.discriminatedUnion('action', [
       entryId: L2PiEntryIdSchema
     })
     .strict(),
+  z
+    .object({
+      action: z.literal('resend'),
+      workId: L2WorkIdSchema,
+      sessionId: L2PiSessionIdSchema,
+      entryId: L2PiEntryIdSchema
+    })
+    .strict(),
   z
     .object({
       action: z.literal('fork'),

package/src/common/l2_biz/workbench/l2-workbench-locale-messages.ts

@@ -4,6 +4,12 @@ export const L2_WORKBENCH_LOCALE_MESSAGES = {
   en: {
     ...L2_TERMINAL_LOCALE_MESSAGES.en,
     toolsAndContext: 'Tools and context',
+    searchWorkSessions: 'Search work sessions',
+    clearSessionSearch: 'Clear search',
+    searchingSessions: 'Searching…',
+    noSessionSearchMatches: 'No matching work sessions',
+    sessionSearchFailed: 'Could not search work sessions',
+    retrySessionSearch: 'Retry',
     sessionContextDescription: 'Tools, system instructions and services for this session',
     mcpSession: 'Session MCP',
     modelAutomaticRouting: 'Automatic routing',
@@ -453,6 +459,12 @@ export const L2_WORKBENCH_LOCALE_MESSAGES = {
   'zh-CN': {
     ...L2_TERMINAL_LOCALE_MESSAGES['zh-CN'],
     toolsAndContext: '工具与上下文',
+    searchWorkSessions: '搜索工作会话',
+    clearSessionSearch: '清空搜索',
+    searchingSessions: '正在搜索…',
+    noSessionSearchMatches: '没有匹配的工作会话',
+    sessionSearchFailed: '搜索工作会话失败',
+    retrySessionSearch: '重试',
     sessionContextDescription: '当前会话的工具、系统提示词和服务',
     mcpSession: '会话 MCP',
     modelAutomaticRouting: '自动路由',

package/src/common/l2_biz/workbench/l2-workbench-picker-messages.ts

@@ -8,6 +8,7 @@ export const L2_WORKBENCH_PICKER_MESSAGES = {
     scopeUserMatches: 'User messages {{count}}',
     scopeAssistantMatches: 'AI replies {{count}}',
     loadUserFailed: 'Could not load user messages',
+    loadHistoryFailed: 'Could not load past sessions',
     ignoredRestoreTitle: 'Restore ignored folder',
     browseOtherTitle: 'Choose a project folder',
     replaceTitle: 'Replace work session',
@@ -109,6 +110,7 @@ export const L2_WORKBENCH_PICKER_MESSAGES = {
     kindSession: 'Session',
     kindLabel: 'Label',
     treeIntent: 'Switch the current session branch',
+    resendIntent: 'Resend this message in a new branch',
     forkIntent: 'Start a session from a user message',
     cloneIntent: 'Clone the current session',
     runningTitle: 'The current session is running',
@@ -124,7 +126,7 @@ export const L2_WORKBENCH_PICKER_MESSAGES = {
     closeBranchPicker: 'Close session branch picker',
     branchSearch: 'Search session branches',
     branchSearchPlaceholder: 'Search messages, tools or labels',
-    branchFilter: 'Filter session tree, current: {{filter}}',
+    branchFilters: 'Filter',
     loadingEntry: 'Loading full content…',
     entryEmpty: 'No text available for this entry',
     entryTruncated: 'Long content has been truncated.',
@@ -151,6 +153,7 @@ export const L2_WORKBENCH_PICKER_MESSAGES = {
     scopeUserMatches: '用户消息 {{count}}',
     scopeAssistantMatches: 'AI 回复 {{count}}',
     loadUserFailed: '加载用户消息失败',
+    loadHistoryFailed: '加载历史会话失败',
     ignoredRestoreTitle: '恢复忽略目录',
     browseOtherTitle: '选择项目目录',
     replaceTitle: '替换工作会话',
@@ -249,6 +252,7 @@ export const L2_WORKBENCH_PICKER_MESSAGES = {
     kindSession: '会话',
     kindLabel: '标签',
     treeIntent: '切换当前会话分支',
+    resendIntent: '从这条消息重新发送',
     forkIntent: '从用户消息新开会话',
     cloneIntent: '克隆当前会话',
     runningTitle: '当前工作会话正在运行',
@@ -263,7 +267,7 @@ export const L2_WORKBENCH_PICKER_MESSAGES = {
     closeBranchPicker: '关闭会话分支选择器',
     branchSearch: '搜索会话分支',
     branchSearchPlaceholder: '搜索消息、工具或标签',
-    branchFilter: '过滤会话树，当前：{{filter}}',
+    branchFilters: '筛选',
     loadingEntry: '正在读取完整内容…',
     entryEmpty: '该节点没有可展示的文字内容',
     entryTruncated: '内容较长，已截断显示。',

package/src/common/l3_modules/conversation/l3-conversation-locale-messages.ts

@@ -27,6 +27,7 @@ export const L3_CONVERSATION_LOCALE_MESSAGES = {
     messageCopyFailed: 'Could not copy the message. Please copy it manually.',
     copied: 'Copied',
     copyMessage: 'Copy message',
+    resendMessage: 'Resend',
     usage: 'Input {{input}} / Output {{output}} / Cached input {{cached}} / {{cost}}',
     chatImage: 'Chat image {{count}}',
     imageLoading: 'Loading image…',
@@ -174,6 +175,7 @@ export const L3_CONVERSATION_LOCALE_MESSAGES = {
     messageCopyFailed: '复制消息失败，请手动复制。',
     copied: '已复制',
     copyMessage: '复制消息',
+    resendMessage: '重发',
     usage: '输入 {{input}} / 输出 {{output}} / 输入缓存 {{cached}} / {{cost}}',
     chatImage: '聊天图片 {{count}}',
     imageLoading: '加载图片…',

package/src/common/l3_modules/pi/l3-pi-session-search-contract.ts

@@ -0,0 +1,26 @@
+import { z } from 'zod'
+import { L3PiEntryIdSchema } from './l3-pi-contract'
+import { L4TimestampMsSchema } from '@common/l4_foundation/l4-timestamp-contract'
+
+export const L3PiSessionSearchScopeSchema = z.enum(['title', 'user', 'assistant', 'sessionId'])
+
+export const L3PiSessionSearchMatchSchema = z
+  .object({
+    scope: L3PiSessionSearchScopeSchema,
+    count: z.number().int().positive(),
+    entryId: L3PiEntryIdSchema.nullable(),
+    timestampMs: L4TimestampMsSchema.nullable(),
+    preview: z.string().min(1).max(160)
+  })
+  .strict()
+
+export const L3PiSessionSearchQuerySchema = z
+  .object({
+    query: z.string().trim().max(120).default(''),
+    searchIn: z.array(L3PiSessionSearchScopeSchema).min(1).max(4).default(['title', 'user'])
+  })
+  .strict()
+
+export type L3PiSessionSearchScope = z.infer<typeof L3PiSessionSearchScopeSchema>
+export type L3PiSessionSearchMatch = z.infer<typeof L3PiSessionSearchMatchSchema>
+export type L3PiSessionSearchQuery = z.infer<typeof L3PiSessionSearchQuerySchema>

package/src/common/l4_foundation/locale/l4-host-error-messages.ts

@@ -103,6 +103,7 @@ export const L4_HOST_ERROR_MESSAGES = {
     branchInputInvalid: 'Invalid branch operation request',
     branchEntryMissing: 'Branch entry not found or no longer available',
     branchForkUserOnly: 'Only user messages can start a new session',
+    branchResendUserOnly: 'Only user messages can be resent',
     branchCloneEmpty: 'There are no messages to clone yet',
     branchFailed: 'Could not perform branch operation',
     taskDetailInvalid: 'Invalid task detail request',
@@ -262,6 +263,7 @@ export const L4_HOST_ERROR_MESSAGES = {
     branchInputInvalid: '分支操作参数无效',
     branchEntryMissing: '分支节点不存在或已失效',
     branchForkUserOnly: '只有用户消息可以 Fork',
+    branchResendUserOnly: '只有用户消息可以重发',
     branchCloneEmpty: '当前会话还没有可克隆的消息',
     branchFailed: '执行分支操作失败',
     taskDetailInvalid: '任务详情参数无效',

package/src/server/l1_entry/api/l1-work-session-branch-route.ts

@@ -1,14 +1,7 @@
 import 'server-only'
 
 import { L2WorkSessionBranchRequestSchema } from '@common/l2_biz/work-session/l2-work-session-tree-contract'
-import {
-  getL2WorkSessionManage,
-  WorkSessionBindingChangedError,
-  WorkSessionBranchBlockedError,
-  WorkSessionBranchEntryNotFoundError,
-  WorkSessionBranchInvalidError,
-  WorkSessionNotFoundError
-} from '@server/l2_biz/work-session/l2-work-session-manage'
+import { getL2WorkSessionManage } from '@server/l2_biz/work-session/l2-work-session-manage'
 import { readL4ClientId } from '@server/l4_foundation/http/l4-client-id'
 import {
   createL4ApiErrorResponse,
@@ -33,27 +26,40 @@ export async function POST(request: Request): Promise<Response> {
 
   try {
     const data = await getL2WorkSessionManage().branchWorkSession(input.data)
-    return createL4ApiSuccessResponse(data, input.data.action === 'tree' ? 200 : 201)
+    return createL4ApiSuccessResponse(
+      data,
+      input.data.action === 'tree' || input.data.action === 'resend' ? 200 : 201
+    )
   } catch (error) {
-    if (error instanceof WorkSessionNotFoundError) {
+    // 管理器由 Node 与 Next 共享，业务异常构造器并非同一实例。
+    if (error instanceof Error && error.name === 'WorkSessionNotFoundError') {
       return createL4ApiErrorResponse(404, '工作会话不存在', { key: 'errors:sessionMissing' })
     }
-    if (error instanceof WorkSessionBranchEntryNotFoundError) {
+    if (error instanceof Error && error.name === 'WorkSessionBranchEntryNotFoundError') {
       return createL4ApiErrorResponse(404, '分支节点不存在或已失效', {
         key: 'errors:branchEntryMissing'
       })
     }
-    if (error instanceof WorkSessionBranchInvalidError) {
+    if (
+      error instanceof Error &&
+      error.name === 'WorkSessionBranchInvalidError' &&
+      'kind' in error
+    ) {
       return createL4ApiErrorResponse(400, error.message, {
-        key: error.kind === 'fork-target' ? 'errors:branchForkUserOnly' : 'errors:branchCloneEmpty'
+        key:
+          error.kind === 'fork-target'
+            ? 'errors:branchForkUserOnly'
+            : error.kind === 'resend-target'
+              ? 'errors:branchResendUserOnly'
+              : 'errors:branchCloneEmpty'
       })
     }
-    if (error instanceof WorkSessionBindingChangedError) {
+    if (error instanceof Error && error.name === 'WorkSessionBindingChangedError') {
       return createL4ApiErrorResponse(409, '工作会话已切换，请重新打开会话树', {
         key: 'errors:sessionTreeChanged'
       })
     }
-    if (error instanceof WorkSessionBranchBlockedError) {
+    if (error instanceof Error && error.name === 'WorkSessionBranchBlockedError') {
       return createL4ApiErrorResponse(409, error.message)
     }
     console.error('[Pi Desk][WorkSessionBranchApi] 执行分支操作失败', {

package/src/server/l1_entry/api/l1-work-session-search-route.ts

@@ -0,0 +1,38 @@
+import 'server-only'
+
+import { L2WorkSessionSearchRequestSchema } from '@common/l2_biz/work-session/l2-work-session-search-contract'
+import { getL2WorkSessionManage } from '@server/l2_biz/work-session/l2-work-session-manage'
+import { readL4ClientId } from '@server/l4_foundation/http/l4-client-id'
+import {
+  createL4ApiErrorResponse,
+  createL4ApiSuccessResponse
+} from '@server/l4_foundation/http/l4-api-response'
+
+export async function POST(request: Request): Promise<Response> {
+  const clientId = readL4ClientId(request)
+  if (!clientId)
+    return createL4ApiErrorResponse(400, '客户端标识无效', { key: 'errors:invalidClient' })
+
+  let payload: unknown
+  try {
+    payload = await request.json()
+  } catch {
+    return createL4ApiErrorResponse(400, '请求 JSON 格式无效', { key: 'errors:invalidJson' })
+  }
+
+  const input = L2WorkSessionSearchRequestSchema.safeParse(payload)
+  if (!input.success) return createL4ApiErrorResponse(400, '工作会话搜索参数无效')
+
+  try {
+    return createL4ApiSuccessResponse(await getL2WorkSessionManage().searchWorkSessions(input.data))
+  } catch (error) {
+    console.error('[Pi Desk][WorkSessionSearchApi] 搜索工作会话失败', {
+      clientId,
+      queryLength: input.data.query.length,
+      searchIn: input.data.searchIn,
+      errorName: error instanceof Error ? error.name : 'UnknownError',
+      errorMessage: error instanceof Error ? error.message : String(error)
+    })
+    return createL4ApiErrorResponse(500, '搜索工作会话失败')
+  }
+}

package/src/server/l2_biz/work-session/l2-work-session-chat-runtime.ts

@@ -190,11 +190,13 @@ export class L2WorkSessionChatRuntime {
       await disposeL4PiWorkSessionRuntime(previous.sessionId)
   }
 
-  async refreshWorkSession(workSession: WorkSession): Promise<void> {
+  async refreshWorkSession(workSession: WorkSession, acceptingCommands = true): Promise<void> {
     const previousSource = this.recordsByWorkId.get(workSession.workId)?.source
     await this.closeRecord(workSession.workId)
     if (previousSource) this.publish({ type: 'source_invalidated', source: previousSource })
-    this.recordsByWorkId.set(workSession.workId, this.buildRecord(workSession))
+    const record = this.buildRecord(workSession)
+    record.acceptingCommands = acceptingCommands
+    this.recordsByWorkId.set(workSession.workId, record)
   }
 
   async removeWorkSession(workSession: WorkSession): Promise<void> {

package/src/server/l2_biz/work-session/l2-work-session-manage.ts

@@ -72,6 +72,12 @@ import {
   type L2WorkSessionRecord,
   type L2WorkSessionStatus
 } from '@common/l2_biz/work-session/l2-work-session-contract'
+import {
+  L2WorkSessionSearchRequestSchema,
+  L2WorkSessionSearchResponseSchema,
+  type L2WorkSessionSearchRequest,
+  type L2WorkSessionSearchResponse
+} from '@common/l2_biz/work-session/l2-work-session-search-contract'
 import {
   L2WorkSessionChangesSchema,
   L2WorkSessionsUpdateSchema,
@@ -102,7 +108,8 @@ import { resolveL4PiSessionPath } from '@server/l4_foundation/pi/l4-pi-session-c
 import {
   getL4PiWorkSessionRuntime,
   L4PiSessionBranchBlockedError,
-  L4PiSessionCloneEmptyError
+  L4PiSessionCloneEmptyError,
+  L4PiSessionResendTargetError
 } from '@server/l4_foundation/pi/l4-pi-work-session-runtime'
 import {
   L4PiSessionEntryNotFoundError,
@@ -196,7 +203,7 @@ export class WorkSessionBranchBlockedError extends Error {
 
 export class WorkSessionBranchInvalidError extends Error {
   constructor(
-    readonly kind: 'fork-target' | 'clone-empty',
+    readonly kind: 'fork-target' | 'clone-empty' | 'resend-target',
     message: string
   ) {
     super(message)
@@ -250,6 +257,19 @@ export class WorkSessionManage {
     })
   }
 
+  searchWorkSessions(inputValue: L2WorkSessionSearchRequest): Promise<L2WorkSessionSearchResponse> {
+    const input = L2WorkSessionSearchRequestSchema.parse(inputValue)
+    return this.runExclusive(async () => {
+      await this.ensureHydrated()
+      return L2WorkSessionSearchResponseSchema.parse({
+        sessions: this.orderedWorkSessions().flatMap((workSession) => {
+          const matches = getL4PiWorkSessionRuntime(workSession.sessionId).search(input)
+          return matches.length > 0 ? [{ workId: workSession.workId, matches }] : []
+        })
+      })
+    })
+  }
+
   runPluginRestart<T>(operation: () => Promise<T>): Promise<T> {
     return this.runExclusive(async () => {
       await this.ensureHydrated()
@@ -681,23 +701,35 @@ export class WorkSessionManage {
       if (!source) throw new WorkSessionNotFoundError(input.workId)
       this.assertSessionBinding(source, input.sessionId)
 
-      if (input.action === 'tree') {
+      if (input.action === 'tree' || input.action === 'resend') {
         const previousItem = this.toListItem(source)
         await this.chat.pauseWorkSession(source.workId)
+        let refreshed = false
         let result: Awaited<ReturnType<WorkSession['branch']>>
         try {
-          result = await source.branch(input.entryId)
-          if (result.changed) await this.chat.refreshWorkSession(source)
-          else this.chat.resumeWorkSession(source.workId)
+          if (input.action === 'resend') {
+            await source.send({
+              mode: 'resend',
+              entryId: input.entryId,
+              onBranchChanged: async () => {
+                await this.chat.refreshWorkSession(source, false)
+                refreshed = true
+              }
+            })
+            result = { changed: true, editorText: null }
+          } else {
+            result = await source.branch(input.entryId)
+            if (result.changed) await this.chat.refreshWorkSession(source)
+          }
         } catch (error) {
-          if (source.branchId !== previousItem.branchId) {
-            await this.chat.refreshWorkSession(source)
+          if (source.branchId !== previousItem.branchId || refreshed) {
+            if (!refreshed) await this.chat.refreshWorkSession(source, false)
             const changes = this.toChanges(previousItem, this.toListItem(source))
             if (changes) this.publishUpdate({ type: 'update', workId: source.workId, changes })
-          } else {
-            this.chat.resumeWorkSession(source.workId)
           }
           this.throwBranchError(error, input.entryId)
+        } finally {
+          this.chat.resumeWorkSession(source.workId)
         }
 
         const item = this.toListItem(source)
@@ -710,6 +742,7 @@ export class WorkSessionManage {
           sessionId: source.sessionId,
           entryId: input.entryId,
           branchId: source.branchId,
+          action: input.action,
           changed: result.changed
         })
         return L2WorkSessionBranchResponseSchema.parse({
@@ -857,6 +890,9 @@ export class WorkSessionManage {
     if (error instanceof L4PiSessionForkTargetError) {
       throw new WorkSessionBranchInvalidError('fork-target', '只有用户消息可以 Fork')
     }
+    if (error instanceof L4PiSessionResendTargetError) {
+      throw new WorkSessionBranchInvalidError('resend-target', '只有用户消息可以重发')
+    }
     if (error instanceof L4PiSessionCloneEmptyError) {
       throw new WorkSessionBranchInvalidError('clone-empty', '当前会话还没有可克隆的消息')
     }

package/src/server/l3_modules/work-session/l3-work-session.ts

@@ -1,7 +1,10 @@
 import 'server-only'
 
 import type { ThinkingLevel } from '@earendil-works/pi-agent-core'
-import { L4PiWorkSessionRuntime } from '@server/l4_foundation/pi/l4-pi-work-session-runtime'
+import {
+  L4PiWorkSessionRuntime,
+  type L4PiResendInput
+} from '@server/l4_foundation/pi/l4-pi-work-session-runtime'
 
 export interface WorkSessionInputImage {
   mimeType: 'image/jpeg' | 'image/png' | 'image/webp' | 'image/gif'
@@ -10,11 +13,13 @@ export interface WorkSessionInputImage {
   height: number
 }
 
-export interface WorkSessionSendInput {
-  mode: 'auto' | 'follow_up'
-  text: string
-  images: WorkSessionInputImage[]
-}
+export type WorkSessionSendInput =
+  | {
+      mode: 'auto' | 'follow_up'
+      text: string
+      images: WorkSessionInputImage[]
+    }
+  | L4PiResendInput
 
 export interface WorkSessionModelInput {
   provider: string

package/src/server/l4_foundation/pi/l4-pi-chat-worker.ts

@@ -899,7 +899,7 @@ export class L4PiChatWorker {
     await session.abort()
   }
 
-  async navigateTree(entryId: string): Promise<boolean> {
+  async navigateTree(entryId: string, beforeUserMessage = false): Promise<boolean> {
     const session = await this.ensureSession()
     this.assertIdle()
     if (this.treeResumeImmediate) clearImmediate(this.treeResumeImmediate)
@@ -913,7 +913,10 @@ export class L4PiChatWorker {
         this.messageGate.pause()
         try {
           this.initialization.setStage('切换会话树')
-          const result = await session.navigateTree(entryId, { summarize: false })
+          const result =
+            beforeUserMessage && previousLeaf === entryId
+              ? await this.navigateLeafUserMessage(session, entryId)
+              : await session.navigateTree(entryId, { summarize: false })
           changed = !result.cancelled
           if (changed) await this.capabilityRuntime.apply()
         } catch (error) {
@@ -948,6 +951,36 @@ export class L4PiChatWorker {
     }
   }
 
+  private async navigateLeafUserMessage(
+    session: AgentSession,
+    entryId: string
+  ): Promise<{ cancelled: boolean }> {
+    const entry = this.sessionManager.getEntry(entryId)!
+    // SDK 对当前 leaf 直接 no-op；重发仍需执行导航钩子并回到该用户消息之前。
+    const result = await session.extensionRunner.emit({
+      type: 'session_before_tree',
+      preparation: {
+        targetId: entryId,
+        oldLeafId: entryId,
+        commonAncestorId: entryId,
+        entriesToSummarize: [],
+        userWantsSummary: false
+      },
+      signal: this.commandLifetime.signal
+    })
+    if (result?.cancel || this.commandLifetime.signal.aborted) return { cancelled: true }
+    if (entry.parentId === null) this.sessionManager.resetLeaf()
+    else this.sessionManager.branch(entry.parentId)
+    if (result?.label) this.sessionManager.appendLabelChange(entryId, result.label)
+    session.refreshContext()
+    await session.extensionRunner.emit({
+      type: 'session_tree',
+      oldLeafId: entryId,
+      newLeafId: this.sessionManager.getLeafId()
+    })
+    return { cancelled: false }
+  }
+
   private resetBranchRuntime(): void {
     if (this.treeNavigation) this.treeNavigation.committed = true
     this.commandLifetime.abort()