From 9385c4231ce6997f21d9eedd01b107b3ac262254 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Fri, 27 Dec 2024 21:23:50 +0800
Subject: [PATCH] update

---
 clients/vscode/src/chat/utils.ts | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/clients/vscode/src/chat/utils.ts b/clients/vscode/src/chat/utils.ts
index 33103f02c757..d1d0147d62bf 100644
--- a/clients/vscode/src/chat/utils.ts
+++ b/clients/vscode/src/chat/utils.ts
@@ -72,8 +72,12 @@ export function chatPanelFilepathToLocalUri(filepath: Filepath, gitProvider: Git
   if (filepath.kind === "uri") {
     try {
       if (isNotebook) {
-        return generateLocalNotebookCellUri(Uri.parse(filepath.uri), 0);
+        const handle = chatPanelFilePathToNotebookCellHandle(filepath.uri);
+        if (typeof handle === 'number') {
+          return generateLocalNotebookCellUri(Uri.parse(filepath.uri), handle);
+        }
       }
+
       return Uri.parse(filepath.uri, true);
     } catch (e) {
       // FIXME(@icycodes): this is a hack for uri is relative filepaths in workspaces
@@ -103,26 +107,33 @@ function chatPanelFilepathToVscodeNotebookCellUri(root: Uri, filepath: FilepathI
     return null;
   }
 
-  const fileUri = Uri.parse(filepath.filepath);
-  const fragment = fileUri.fragment;
+  const filePathUri = Uri.parse(filepath.filepath);
+  const notebookUri = Uri.joinPath(root, filePathUri.path);
 
-  const uri = Uri.joinPath(root, fileUri.path);
+  const handle = chatPanelFilePathToNotebookCellHandle(filepath.filepath)
+  if (typeof handle === "undefined") {
+    logger.warn(`Invalid filepath params.`, filepath);
+    return null;
+  }
+  return generateLocalNotebookCellUri(notebookUri, handle);
+}
 
+function chatPanelFilePathToNotebookCellHandle(filepath: string): number | undefined {
   let handle: number | undefined;
 
+  const fileUri = Uri.parse(filepath);
+  const fragment = fileUri.fragment;
   const searchParams = new URLSearchParams(fragment);
-
   if (searchParams.has("cell")) {
     const cellString = searchParams.get("cell")?.toString() || "";
     handle = parseInt(cellString, 10);
   }
 
   if (typeof handle === "undefined" || isNaN(handle)) {
-    logger.warn(`Invalid handle in filepath.`, filepath.filepath);
-    return null;
+    return undefined
   }
 
-  return generateLocalNotebookCellUri(uri, handle);
+  return handle
 }
 
 export function vscodePositionToChatPanelPosition(position: VSCodePosition): ChatPanelPosition {