@henryqw/pi-herdr-clone 0.2.2 → 0.2.4

package/extensions/clone-tab.ts

@@ -194,8 +194,7 @@ async function launchCloneAgent(
 }
 
 export default function herdrCloneExtension(pi: ExtensionAPI): void {
-	const herdr = createHerdrClient<{ cwd: string }>((command, args, options) =>
-		pi.exec(command, [...args], options));
+	const herdr = createHerdrClient<{ cwd: string }>(pi.exec.bind(pi));
 
 	pi.registerCommand("clone-tab", {
 		description: "Clone the current conversation path into a new Herdr tab",
@@ -212,28 +211,20 @@ export default function herdrCloneExtension(pi: ExtensionAPI): void {
 				return { createdTab, cloneFile };
 			};
 			const { createdTab, cloneFile } = source.checkout ? await withWorktreeLock(source.checkout, mutate) : await mutate();
-			let tabId: string | undefined;
-			let rootPaneId: string | undefined;
+			let tab: ReturnType<typeof parseCreatedTab>;
 			try {
-				const tabResponse: unknown = JSON.parse(createdTab.stdout);
-				if (!tabResponse || typeof tabResponse !== "object" || Array.isArray(tabResponse)) {
-					throw new Error("Herdr tab create returned invalid JSON");
-				}
-				const result = (tabResponse as {
-					result?: { tab?: { tab_id?: unknown }; root_pane?: { pane_id?: unknown } };
-				}).result;
-				tabId = requiredString(result?.tab?.tab_id, "Herdr tab response tab_id");
-				rootPaneId = requiredString(result?.root_pane?.pane_id, `Herdr tab ${tabId} root pane_id`);
+				tab = parseCreatedTab(createdTab, source.workspaceId);
 			} catch (error) {
 				throw new Error(
-					`Clone launch could not be confirmed after creating a Herdr tab; retained${tabId ? ` Herdr tab ${tabId} and` : ""} session ${cloneFile}: ${errorMessage(error)}`,
+					`Clone launch could not be confirmed after creating a Herdr tab; retained session ${cloneFile}: ${errorMessage(error)}`,
 					{ cause: error },
 				);
 			}
-			const agentName = await launchCloneAgent(herdr, ctx, rootPaneId!, cloneFile, `Herdr tab ${tabId}, root pane ${rootPaneId}, and session ${cloneFile}`);
+			const { tabId, rootPaneId } = tab;
+			const agentName = await launchCloneAgent(herdr, ctx, rootPaneId, cloneFile, `Herdr tab ${tabId}, root pane ${rootPaneId}, and session ${cloneFile}`);
 
 			try {
-				await herdr.run(["tab", "focus", tabId!], { cwd: ctx.cwd });
+				await herdr.run(["tab", "focus", tabId], { cwd: ctx.cwd });
 			} catch (error) {
 				ctx.ui.notify(
 					`Clone agent ${agentName} started in Herdr tab ${tabId} (root pane ${rootPaneId}), but focus failed: ${errorMessage(error)}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-herdr-clone",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Clone the current Pi conversation path into a new Herdr tab.",
   "keywords": [
     "pi-package",
@@ -28,7 +28,7 @@
     "@earendil-works/pi-coding-agent": "^0.84.2"
   },
   "dependencies": {
-    "@henryqw/pi-herdr": "^0.2.0"
+    "@henryqw/pi-herdr": "^0.3.0"
   },
   "repository": {
     "type": "git",