@firstpick/pi-package-webui 0.1.4 → 0.1.6

package/index.ts

@@ -11,6 +11,8 @@ const webuiBin = path.join(packageRoot, "bin", "pi-webui.mjs");
 const DEFAULT_HOST = "127.0.0.1";
 const DEFAULT_PORT = 31415;
 const START_TIMEOUT_MS = 12_000;
+const START_TIMEOUT_PER_RESTORED_TAB_MS = 4_000;
+const START_TIMEOUT_MAX_MS = 60_000;
 
 type WebuiAddress = {
   host: string;
@@ -292,7 +294,18 @@ async function fetchRestorableTabs(url: string, existing: ExistingWebui, options
   const baseUrl = url.replace(/\/$/, "");
   const detailed = await fetchJsonWithTimeout(`${baseUrl}/api/webui-status?detailed=1&events=0`, {}, 7_000);
   const statusData = detailed?.ok && detailed.body?.ok === true ? detailed.body.data : undefined;
-  return mergeRestorableTabsFromStatusSources([statusData?.restorableTabs, statusData?.tabs, existing.restorableTabs, existing.tabs], options);
+
+  // Restart should preserve the tabs that are currently open in the Web UI.
+  // Older servers may expose recently closed tabs through `restorableTabs`, so
+  // prefer explicit live tab lists whenever the running server provides them.
+  const openTabSources: unknown[] = [];
+  const detailedTabs = statusData?.tabs;
+  if (Array.isArray(detailedTabs)) openTabSources.push(detailedTabs);
+  if (Array.isArray(existing.tabs)) openTabSources.push(existing.tabs);
+  if (openTabSources.length > 0) return mergeRestorableTabsFromStatusSources(openTabSources, options);
+
+  // Legacy fallback for servers that predate `tabs` in status/health payloads.
+  return mergeRestorableTabsFromStatusSources([statusData?.restorableTabs, existing.restorableTabs], options);
 }
 
 function sleep(ms: number): Promise<void> {
@@ -449,7 +462,12 @@ function terminateFailedChild(child: WebuiChild): void {
   child.stderr.destroy();
 }
 
-function waitForWebuiUrl(child: WebuiChild): Promise<string> {
+function startupTimeoutMs(restoreTabCount: number): number {
+  const extraTabs = Math.max(0, restoreTabCount - 1);
+  return Math.min(START_TIMEOUT_MAX_MS, START_TIMEOUT_MS + extraTabs * START_TIMEOUT_PER_RESTORED_TAB_MS);
+}
+
+function waitForWebuiUrl(child: WebuiChild, timeoutMs = START_TIMEOUT_MS): Promise<string> {
   return new Promise((resolve, reject) => {
     let settled = false;
     let output = "";
@@ -472,8 +490,8 @@ function waitForWebuiUrl(child: WebuiChild): Promise<string> {
     };
 
     const timeout = setTimeout(() => {
-      finish(new Error(`Timed out waiting for Pi Web UI to start. Output:\n${output.trim() || "(no output)"}`));
-    }, START_TIMEOUT_MS);
+      finish(new Error(`Timed out after ${Math.round(timeoutMs / 1000)}s waiting for Pi Web UI to start. Output:\n${output.trim() || "(no output)"}`));
+    }, timeoutMs);
 
     child.stdout.on("data", inspect);
     child.stderr.on("data", inspect);
@@ -501,7 +519,7 @@ async function startWebui(options: StartWebuiOptions, ctx: ExtensionCommandConte
     windowsHide: true,
   });
 
-  return waitForWebuiUrl(child);
+  return waitForWebuiUrl(child, startupTimeoutMs(restoreTabs.length));
 }
 
 type WebuiStatusFetchResult = {
@@ -741,6 +759,34 @@ function statusUsage(): string {
   ].join("\n");
 }
 
+type WebuiTreeNavigateArgs = {
+  entryId: string;
+  summarize?: boolean;
+  customInstructions?: string;
+  replaceInstructions?: boolean;
+  label?: string;
+};
+
+function parseWebuiTreeNavigateArgs(args: string): WebuiTreeNavigateArgs {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(args || "{}");
+  } catch (error) {
+    throw new Error(`Invalid Web UI tree navigation payload: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  if (!parsed || typeof parsed !== "object") throw new Error("Web UI tree navigation payload must be an object");
+  const payload = parsed as Record<string, unknown>;
+  const entryId = typeof payload.entryId === "string" ? payload.entryId.trim() : "";
+  if (!entryId) throw new Error("Web UI tree navigation requires entryId");
+  return {
+    entryId,
+    summarize: payload.summarize === true,
+    customInstructions: typeof payload.customInstructions === "string" ? payload.customInstructions : undefined,
+    replaceInstructions: payload.replaceInstructions === true,
+    label: typeof payload.label === "string" ? payload.label : undefined,
+  };
+}
+
 export default function (pi: ExtensionAPI) {
   const startWebuiHandler = async (args: string, ctx: ExtensionCommandContext) => {
     let options: StartWebuiOptions;
@@ -780,11 +826,6 @@ export default function (pi: ExtensionAPI) {
     handler: startWebuiHandler,
   });
 
-  pi.registerCommand("start-webui", {
-    description: "Alias for /webui-start",
-    handler: startWebuiHandler,
-  });
-
   pi.registerCommand("webui-status", {
     description: "Show Pi Web UI URL, online state, network exposure, and optional detailed runtime info",
     handler: async (args, ctx) => {
@@ -807,4 +848,35 @@ export default function (pi: ExtensionAPI) {
       }
     },
   });
+
+  pi.registerCommand("webui-tree-navigate", {
+    description: "Internal Web UI helper for browser session-tree navigation",
+    handler: async (args, ctx) => {
+      let payload: WebuiTreeNavigateArgs;
+      try {
+        payload = parseWebuiTreeNavigateArgs(args);
+      } catch (error) {
+        ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
+        return;
+      }
+
+      try {
+        await ctx.waitForIdle();
+        const result = (await ctx.navigateTree(payload.entryId, {
+          summarize: payload.summarize,
+          customInstructions: payload.customInstructions,
+          replaceInstructions: payload.replaceInstructions,
+          label: payload.label,
+        })) as { cancelled: boolean; editorText?: string };
+        if (result.cancelled) {
+          ctx.ui.notify("Web UI tree navigation cancelled.", "warning");
+          return;
+        }
+        if (typeof result.editorText === "string") ctx.ui.setEditorText(result.editorText);
+        ctx.ui.notify("Web UI navigated the session tree.", "info");
+      } catch (error) {
+        ctx.ui.notify(`Web UI tree navigation failed:\n${error instanceof Error ? error.message : String(error)}`, "error");
+      }
+    },
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firstpick/pi-package-webui",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Pi Web UI companion package with a local browser UI CLI plus /webui-start and /webui-status commands.",
   "license": "MIT",
   "type": "module",
@@ -15,7 +15,29 @@
   ],
   "pi": {
     "extensions": [
-      "./index.ts"
+      "./index.ts",
+      "../pi-extension-git-footer-status/index.ts",
+      "../pi-extension-release-aur/index.ts",
+      "../pi-extension-release-npm/index.ts",
+      "../pi-extension-stats/index.ts",
+      "../pi-extension-todo-progress/index.ts",
+      "node_modules/@firstpick/pi-extension-git-footer-status/index.ts",
+      "node_modules/@firstpick/pi-extension-release-aur/index.ts",
+      "node_modules/@firstpick/pi-extension-release-npm/index.ts",
+      "node_modules/@firstpick/pi-extension-stats/index.ts",
+      "node_modules/@firstpick/pi-extension-todo-progress/index.ts"
+    ],
+    "skills": [
+      "../pi-extension-release-aur/skills",
+      "node_modules/@firstpick/pi-extension-release-aur/skills"
+    ],
+    "prompts": [
+      "../pi-package-prompts-git-pr/prompts",
+      "node_modules/@firstpick/pi-prompts-git-pr/prompts"
+    ],
+    "themes": [
+      "../pi-package-themes-bundle/themes",
+      "node_modules/@firstpick/pi-themes-bundle/themes"
     ]
   },
   "bin": {
@@ -26,8 +48,16 @@
     "test": "node tests/mobile-static.test.mjs"
   },
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "^0.78.0",
-    "@firstpick/pi-themes-bundle": "^0.1.0"
+    "@earendil-works/pi-coding-agent": "^0.78.0"
+  },
+  "optionalDependencies": {
+    "@firstpick/pi-extension-git-footer-status": "^0.2.1",
+    "@firstpick/pi-extension-release-aur": "^0.1.3",
+    "@firstpick/pi-extension-release-npm": "^0.3.3",
+    "@firstpick/pi-extension-stats": "^0.2.0",
+    "@firstpick/pi-extension-todo-progress": "^0.1.7",
+    "@firstpick/pi-prompts-git-pr": "^0.1.0",
+    "@firstpick/pi-themes-bundle": "^0.1.1"
   },
   "files": [
     "index.ts",