@generativereality/agentherder 0.1.2 → 0.1.4

package/dist/index.js

@@ -10,7 +10,7 @@ import { consola } from "consola";
 import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "fs";
 //#region package.json
 var name = "@generativereality/agentherder";
-var version = "0.1.2";
+var version = "0.1.4";
 var description = "Agent session manager for AI coding tools. Terminal tabs as the UI, no tmux.";
 var package_default = {
 	name,
@@ -534,6 +534,7 @@ async function openSession(opts) {
 	const extraFlags = config.claude.flags.join(" ");
 	const cmd = `cd ${JSON.stringify(dir)} && ${claudeCmd} --name ${JSON.stringify(tabName)}${extraFlags ? " " + extraFlags : ""}\n`;
 	await adapter.sendInput(blockId, cmd);
+	await new Promise((r) => setTimeout(r, 2e3));
 	adapter.closeSocket();
 	return tabId;
 }
@@ -617,20 +618,63 @@ const resumeCommand = define({
 function pathToProjectSlug(dir) {
 	return resolve(dir).replace(/\//g, "-");
 }
-/** Find the most recent Claude Code session ID for a directory */
-function findLatestSessionId(dir) {
-	const slug = pathToProjectSlug(dir);
-	const projectDir = join(homedir(), ".claude", "projects", slug);
+/** Find the most recent .jsonl session file in a Claude project directory */
+function latestJsonlIn(projectDir) {
 	if (!existsSync(projectDir)) return null;
-	const jsonlFiles = readdirSync(projectDir).filter((f) => extname(f) === ".jsonl").map((f) => ({
+	const files = readdirSync(projectDir).filter((f) => extname(f) === ".jsonl").map((f) => ({
 		name: f,
 		mtime: statSync(join(projectDir, f)).mtimeMs
 	})).sort((a, b) => b.mtime - a.mtime);
-	if (!jsonlFiles.length) return null;
-	return basename(jsonlFiles[0].name, ".jsonl");
+	return files.length ? basename(files[0].name, ".jsonl") : null;
+}
+/**
+* Find the most recent Claude Code session ID for a directory.
+* Also checks worktree subdirectories (.claude/worktrees/*) since tabs
+* opened with --worktree run from a worktree path, not the repo root.
+*/
+function findLatestSessionId(dir) {
+	const projectsRoot = join(homedir(), ".claude", "projects");
+	const direct = latestJsonlIn(join(projectsRoot, pathToProjectSlug(dir)));
+	if (direct) return direct;
+	const worktreesDir = join(dir, ".claude", "worktrees");
+	if (existsSync(worktreesDir)) {
+		const candidates = [];
+		for (const entry of readdirSync(worktreesDir)) {
+			const projectDir = join(projectsRoot, pathToProjectSlug(join(worktreesDir, entry)));
+			const id = latestJsonlIn(projectDir);
+			if (id) {
+				const mtime = statSync(join(projectDir, id + ".jsonl")).mtimeMs;
+				candidates.push({
+					id,
+					mtime
+				});
+			}
+		}
+		if (candidates.length) {
+			candidates.sort((a, b) => b.mtime - a.mtime);
+			return candidates[0].id;
+		}
+	}
+	return null;
 }
 //#endregion
 //#region src/commands/fork.ts
+/** If dir is inside .claude/worktrees/<name>, return the repo root instead */
+function resolveSessionDir(dir) {
+	const worktreeMarker = `${join(".claude", "worktrees")}/`;
+	const idx = dir.indexOf(worktreeMarker);
+	if (idx !== -1) {
+		const repoRoot = dir.slice(0, idx - 1);
+		return {
+			sessionLookupDir: repoRoot,
+			openDir: repoRoot
+		};
+	}
+	return {
+		sessionLookupDir: dir,
+		openDir: dir
+	};
+}
 const forkCommand = define({
 	name: "fork",
 	description: "Fork a session into a new tab (claude --resume <id> --fork-session)",
@@ -672,16 +716,16 @@ const forkCommand = define({
 			consola.error(`Tab "${tabName}" has no terminal block`);
 			process.exit(1);
 		}
-		const sourceDir = termBlocks[0].meta?.["cmd:cwd"] ?? process.cwd();
-		const sessionId = findLatestSessionId(sourceDir);
+		const { sessionLookupDir, openDir } = resolveSessionDir(termBlocks[0].meta?.["cmd:cwd"] ?? process.cwd());
+		const sessionId = findLatestSessionId(sessionLookupDir);
 		if (!sessionId) {
-			consola.error(`No Claude session found for ${sourceDir}`);
-			consola.info(`Looked in ~/.claude/projects/${pathToProjectSlug(sourceDir)}/`);
+			consola.error(`No Claude session found for ${sessionLookupDir}`);
+			consola.info(`Looked in ~/.claude/projects/${pathToProjectSlug(sessionLookupDir)}/`);
 			process.exit(1);
 		}
 		const newTabId = await openSession({
 			tabName: newName,
-			dir: sourceDir,
+			dir: openDir,
 			claudeCmd: `claude --resume ${sessionId} --fork-session`
 		});
 		consola.success(`Forked "${tabName}" → "${newName}" [${newTabId.slice(0, 8)}]`);
@@ -707,7 +751,7 @@ const closeCommand = define({
 		const { tabsById, tabNames } = await adapter.getAllData();
 		const matches = adapter.resolveTab(query, tabsById, tabNames);
 		if (!matches.length) {
-			consola.error(`No tab matching '${query}'`);
+			consola.error(`No tab matching '${query}' (tabs in workspaces with no open window are not visible — open that workspace first)`);
 			process.exit(1);
 		}
 		if (matches.length > 1) {
@@ -766,11 +810,11 @@ const renameCommand = define({
 //#region src/commands/scrollback.ts
 const scrollbackCommand = define({
 	name: "scrollback",
-	description: "Show terminal output for a block (default: last 50 lines)",
+	description: "Show terminal output for a tab or block (default: last 50 lines)",
 	args: {
-		block: {
+		target: {
 			type: "positional",
-			description: "Block ID prefix"
+			description: "Tab name, tab ID prefix, or block ID prefix"
 		},
 		lines: {
 			type: "number",
@@ -782,22 +826,39 @@ const scrollbackCommand = define({
 		const query = ctx.positionals[1];
 		const lines = ctx.values.lines ?? 50;
 		if (!query) {
-			consola.error("Block ID is required");
+			consola.error("Tab name or block ID is required");
 			process.exit(1);
 		}
 		const adapter = requireWaveAdapter();
-		const blocks = adapter.blocksList();
-		const matches = adapter.resolveBlock(query, blocks);
-		if (!matches.length) {
-			consola.error(`No block matching '${query}'`);
-			process.exit(1);
-		}
-		if (matches.length > 1) {
-			consola.error(`Multiple blocks match '${query}':`);
-			for (const b of matches) consola.log(`  ${b.blockid}`);
+		const { tabsById, tabNames } = await adapter.getAllData();
+		const tabMatches = adapter.resolveTab(query, tabsById, tabNames);
+		let blockId;
+		if (tabMatches.length === 1) {
+			const blocks = (tabsById.get(tabMatches[0]) ?? []).filter((b) => b.view === "term");
+			if (!blocks.length) {
+				consola.error(`Tab "${tabNames.get(tabMatches[0])}" has no terminal block`);
+				process.exit(1);
+			}
+			blockId = blocks[0].blockid;
+		} else if (tabMatches.length > 1) {
+			consola.error(`Multiple tabs match '${query}':`);
+			for (const tid of tabMatches) consola.log(`  "${tabNames.get(tid)}"  [${tid.slice(0, 8)}]`);
 			process.exit(1);
+		} else {
+			const allBlocks = adapter.blocksList();
+			const blockMatches = adapter.resolveBlock(query, allBlocks);
+			if (!blockMatches.length) {
+				consola.error(`No tab or block matching '${query}' (tabs in workspaces with no open window are not visible — open that workspace first)`);
+				process.exit(1);
+			}
+			if (blockMatches.length > 1) {
+				consola.error(`Multiple blocks match '${query}':`);
+				for (const b of blockMatches) consola.log(`  ${b.blockid}`);
+				process.exit(1);
+			}
+			blockId = blockMatches[0].blockid;
 		}
-		process.stdout.write(adapter.scrollback(matches[0].blockid, lines));
+		process.stdout.write(adapter.scrollback(blockId, lines));
 	}
 });
 //#endregion
@@ -861,7 +922,7 @@ const sendCommand = define({
 			const allBlocks = adapter.blocksList();
 			const blockMatches = adapter.resolveBlock(query, allBlocks);
 			if (!blockMatches.length) {
-				consola.error(`No tab or block matching '${query}'`);
+				consola.error(`No tab or block matching '${query}' (tabs in workspaces with no open window are not visible — open that workspace first)`);
 				process.exit(1);
 			}
 			if (blockMatches.length > 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@generativereality/agentherder",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Agent session manager for AI coding tools. Terminal tabs as the UI, no tmux.",
   "type": "module",
   "bin": {