Revert "🐛 区分网页安装标签来源"

This reverts commit eb6dd93.

Author: cyfung1031

src/app/service/service_worker/client.ts

@@ -52,7 +52,7 @@ export class ScriptClient extends Client {
 
   // 获取安装信息
   getInstallInfo(uuid: string) {
-    return this.do<[boolean, ScriptInfo, { byWebRequest?: boolean; openedInNewTab?: boolean }]>("getInstallInfo", uuid);
+    return this.do<[boolean, ScriptInfo, { byWebRequest?: boolean }]>("getInstallInfo", uuid);
   }
 
   install(params: TScriptInstallParam): Promise<TScriptInstallReturn> {

src/app/service/service_worker/script.ts

@@ -74,12 +74,6 @@ export type TScriptInstallReturn = {
   updatetime: number | undefined; // 实际生效的更新时间（时间戳，毫秒）
 };
 
-type InstallPageOptions = {
-  source: InstallSource;
-  byWebRequest?: boolean;
-  openedInNewTab?: boolean;
-};
-
 export type TRestoreResult = {
   restored: string[];
   conflicts: { uuid: string; name: string }[];
@@ -143,7 +137,7 @@ export class ScriptService {
         // 读取脚本url内容, 进行安装
         const logger = this.logger.with({ url: targetUrl });
         logger.debug("install script");
-        this.openInstallPageByUrl(targetUrl, { source: "user", byWebRequest: true, openedInNewTab: true })
+        this.openInstallPageByUrl(targetUrl, { source: "user", byWebRequest: true })
           .catch((e) => {
             logger.error("install script error", Logger.E(e));
             // 不再重定向当前url
@@ -367,7 +361,7 @@ export class ScriptService {
 
   public async openInstallPageByUrl(
     url: string,
-    options: InstallPageOptions
+    options: { source: InstallSource; byWebRequest?: boolean }
   ): Promise<{ success: boolean; msg: string }> {
     try {
       const installPageUrl = await this.getInstallPageUrl(url, options);
@@ -380,7 +374,10 @@ export class ScriptService {
     }
   }
 
-  public async getInstallPageUrl(url: string, options: InstallPageOptions): Promise<string> {
+  public async getInstallPageUrl(
+    url: string,
+    options: { source: InstallSource; byWebRequest?: boolean }
+  ): Promise<string> {
     const uuid = uuidv4();
     try {
       await this.openUpdateOrInstallPage(uuid, url, options, false);
@@ -1169,7 +1166,7 @@ export class ScriptService {
   async openUpdateOrInstallPage(
     uuid: string,
     url: string,
-    options: InstallPageOptions,
+    options: { source: InstallSource; byWebRequest?: boolean },
     update: boolean,
     logger?: Logger
   ) {

src/pages/install/useInstallData.test.ts

@@ -304,21 +304,6 @@ describe("useInstallData 数据流编排", () => {
       expect(closeSpy).not.toHaveBeenCalled();
     });
 
-    it("webNavigation 新开标签即使带 byWebRequest 且 history.length > 1 也应关闭", async () => {
-      const result = await setupReady({ byWebRequest: true, openedInNewTab: true });
-      const closeSpy = vi.spyOn(window, "close").mockImplementation(() => {});
-      const backSpy = vi.spyOn(window.history, "back").mockImplementation(() => {});
-      vi.spyOn(window.history, "length", "get").mockReturnValue(2);
-
-      await act(async () => {
-        await result.current.install();
-        await new Promise((r) => setTimeout(r, 320));
-      });
-
-      expect(closeSpy).toHaveBeenCalledOnce();
-      expect(backSpy).not.toHaveBeenCalled();
-    });
-
     it("byWebRequest 但 history.length 为 1 时应关闭无处可退的标签", async () => {
       const result = await setupReady({ byWebRequest: true });
       const closeSpy = vi.spyOn(window, "close").mockImplementation(() => {});

src/pages/install/useInstallData.ts

@@ -125,18 +125,18 @@ const buildScriptInfo = (uuid: string, code: string, url: string, metadata: SCMe
 });
 
 // 安装页可能是专为安装打开的新标签，也可能由 declarativeNetRequest 接管用户原标签。
-// webNavigation 入口同样带有 byWebRequest 标记，但它通过 chrome.tabs.create() 打开独立标签，
-// 因此必须额外保留 openedInNewTab 来源；只有真正接管用户原标签且确实有历史可退时才返回。
+// 独立新标签可能继承多条历史，DNR 入口也可能没有上一页，因此必须同时检查入口与历史栈：
+// 仅在 DNR 接管且确实有历史可退时返回，否则关闭当前独立安装标签。
 // install()/close() 等可能在短时间内被重复触发(如用户连续点击、close 与 install 的
 // setTimeout 前后脚打到)，leaveInstallPageRunning 防止 back()/close() 被并发调用多次；
 // 推到 requestAnimationFrame 里执行，让触发它的那次交互(如按钮点击态)先完成一帧渲染。
 let leaveInstallPageRunning = false;
-const leaveInstallPage = (byWebRequest: boolean, openedInNewTab: boolean) => {
+const leaveInstallPage = (byWebRequest: boolean) => {
   if (leaveInstallPageRunning) return;
   leaveInstallPageRunning = true;
   requestAnimationFrame(() => {
     leaveInstallPageRunning = false;
-    if (byWebRequest && !openedInNewTab && window.history.length > 1) {
+    if (byWebRequest && window.history.length > 1) {
       window.history.back();
     } else {
       window.close();
@@ -191,7 +191,6 @@ export function useInstallData(): UseInstallData {
   const handleRef = useRef<FileSystemFileHandle | null>(null);
   const skillUuidRef = useRef<string | null>(null);
   const byWebRequestRef = useRef(false);
-  const openedInNewTabRef = useRef(false);
 
   useEffect(() => {
     const params = new URLSearchParams(location.search);
@@ -202,7 +201,6 @@ export function useInstallData(): UseInstallData {
     const urlIdx = location.search.indexOf("url=");
     const rawUrl = !uuid && urlIdx !== -1 ? location.search.slice(urlIdx + 4) : null;
     byWebRequestRef.current = params.get("byWebRequest") === "1";
-    openedInNewTabRef.current = false;
     let cancelled = false;
 
     const failed = (e: unknown) => {
@@ -269,7 +267,6 @@ export function useInstallData(): UseInstallData {
           if (code === undefined) throw new Error(t("install:script_info_load_failed"));
           info.code = code;
           byWebRequestRef.current = cached?.[2]?.byWebRequest === true;
-          openedInNewTabRef.current = cached?.[2]?.openedInNewTab === true;
           await loadFromInfo(info, !!cached?.[0], cached?.[2] || {});
         } else if (rawUrl) {
           // .cat.md URL → Skill 安装流程(DNR 把 *.cat.md 重定向到安装页),不走脚本解析;仅 agent 启用时
@@ -374,8 +371,7 @@ export function useInstallData(): UseInstallData {
           await scriptClient.install({ script, code: info.code });
           notify.success(t("install:success"));
         }
-        if (closeAfterInstall)
-          setTimeout(() => leaveInstallPage(byWebRequestRef.current, openedInNewTabRef.current), 300);
+        if (closeAfterInstall) setTimeout(() => leaveInstallPage(byWebRequestRef.current), 300);
       } catch (e) {
         notify.error(`${t("install:failed")}: ${(e as Error)?.message || String(e)}`);
       }
@@ -399,7 +395,7 @@ export function useInstallData(): UseInstallData {
     if (opts?.noMoreUpdates && info && !info.userSubscribe) {
       void scriptClient.setCheckUpdateUrl(info.uuid, false);
     }
-    leaveInstallPage(byWebRequestRef.current, openedInNewTabRef.current);
+    leaveInstallPage(byWebRequestRef.current);
   }, []);
 
   // 监听文件变更后自动重装,并刷新视图代码
@@ -456,7 +452,7 @@ export function useInstallData(): UseInstallData {
     try {
       await agentClient.completeSkillInstall(uuid);
       notify.success(t("install:success"));
-      setTimeout(() => leaveInstallPage(byWebRequestRef.current, openedInNewTabRef.current), 300);
+      setTimeout(() => leaveInstallPage(byWebRequestRef.current), 300);
     } catch (e) {
       notify.error(`${t("install:failed")}: ${(e as Error)?.message || String(e)}`);
     }
@@ -465,7 +461,7 @@ export function useInstallData(): UseInstallData {
   const cancelSkill = useCallback(() => {
     const uuid = skillUuidRef.current;
     if (uuid) void agentClient.cancelSkillInstall(uuid);
-    leaveInstallPage(byWebRequestRef.current, openedInNewTabRef.current);
+    leaveInstallPage(byWebRequestRef.current);
   }, []);
 
   // 重新触发加载(供加载失败后的重试按钮)