@generativereality/cctabs 0.1.3 → 0.1.4

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "cctabs",
   "description": "Claude Code tab manager. Terminal tabs as the UI, no tmux. Claude can orchestrate its own sibling sessions.",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "author": {
     "name": "generativereality",
     "url": "https://cctabs.com"

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/cctabs";
-var version = "0.1.3";
+var version = "0.1.4";
 var description = "Claude Code tab manager. Terminal tabs as the UI, no tmux.";
 var package_default = {
 	name,
@@ -202,14 +202,17 @@ var WaveAdapter = class {
 		this.jwt = process.env.WAVETERM_JWT ?? "";
 	}
 	blocksList() {
+		const wsId = process.env.WAVETERM_WORKSPACEID ?? "";
+		const args = [
+			"blocks",
+			"list",
+			"--json",
+			"--timeout",
+			"15000"
+		];
+		if (wsId) args.push("--workspace", wsId);
 		try {
-			const out = execFileSync("wsh", [
-				"blocks",
-				"list",
-				"--json",
-				"--timeout",
-				"15000"
-			], { encoding: "utf-8" });
+			const out = execFileSync("wsh", args, { encoding: "utf-8" });
 			return JSON.parse(out);
 		} catch {
 			return [];
@@ -325,27 +328,37 @@ var WaveAdapter = class {
 			tabsById.set(b.tabid, arr);
 		}
 		const tabNames = /* @__PURE__ */ new Map();
-		let workspaces = [];
+		let rawWorkspaces = [];
 		try {
 			for (const tabId of tabsById.keys()) {
 				const td = await this.getTab(tabId);
 				tabNames.set(tabId, td.name ?? tabId.slice(0, 8));
 			}
-			workspaces = await this.workspaceList();
+			rawWorkspaces = await this.workspaceList();
 		} catch {} finally {
 			this.closeSocket();
 		}
-		if (!workspaces.length) {
-			const wsId = process.env.WAVETERM_WORKSPACEID ?? "";
-			workspaces = [{
-				workspacedata: {
-					oid: wsId,
-					name: wsId.slice(0, 8) || "default",
-					tabids: [...tabsById.keys()]
-				},
-				windowid: ""
-			}];
-		}
+		const currentWsId = process.env.WAVETERM_WORKSPACEID ?? "";
+		const tabIdsHere = [...tabsById.keys()];
+		const existing = rawWorkspaces.find((w) => w.workspacedata.oid === currentWsId);
+		const workspaces = [];
+		if (currentWsId) workspaces.push({
+			workspacedata: {
+				oid: currentWsId,
+				name: existing?.workspacedata.name ?? (currentWsId.slice(0, 8) || "current"),
+				tabids: tabIdsHere
+			},
+			windowid: existing?.windowid ?? ""
+		});
+		for (const ws of rawWorkspaces) if (ws.workspacedata.oid !== currentWsId) workspaces.push(ws);
+		if (!workspaces.length) workspaces.push({
+			workspacedata: {
+				oid: "",
+				name: "default",
+				tabids: tabIdsHere
+			},
+			windowid: ""
+		});
 		return {
 			blocks,
 			tabsById,
@@ -856,6 +869,39 @@ function listSessionNames(dir) {
 	}
 	return results.sort((a, b) => b.mtime - a.mtime);
 }
+/**
+* Resolve a session ID prefix (e.g. "19aae7b4") to the full UUID by scanning
+* `~/.claude/projects/`. Returns the input unchanged if it already looks like
+* a full UUID, or null if no unique match exists. Pass `dir` to scope the
+* search to one project; otherwise every project is checked.
+*
+* `claude --resume <prefix>` does NOT accept truncated IDs — it treats them
+* as a search query and shows the picker. So callers must expand prefixes
+* before forwarding to claude.
+*/
+function expandSessionId(input, dir) {
+	if (!input) return null;
+	if (/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i.test(input)) return input;
+	const projectsRoot = join(homedir(), ".claude", "projects");
+	if (!existsSync(projectsRoot)) return null;
+	const projectDirs = dir ? [join(projectsRoot, pathToProjectSlug(dir))] : readdirSync(projectsRoot).map((d) => join(projectsRoot, d)).filter((p) => {
+		try {
+			return statSync(p).isDirectory();
+		} catch {
+			return false;
+		}
+	});
+	const matches = [];
+	for (const pd of projectDirs) {
+		if (!existsSync(pd)) continue;
+		for (const f of readdirSync(pd)) {
+			if (extname(f) !== ".jsonl") continue;
+			const id = basename(f, ".jsonl");
+			if (id.startsWith(input) && !matches.includes(id)) matches.push(id);
+		}
+	}
+	return matches.length === 1 ? matches[0] : null;
+}
 //#endregion
 //#region src/commands/resume.ts
 function formatAge(mtimeMs) {
@@ -897,8 +943,14 @@ const resumeCommand = define({
 		}
 		const explicitSession = ctx.values.session;
 		let sessionId;
-		if (explicitSession) sessionId = explicitSession;
-		else {
+		if (explicitSession) {
+			const expanded = expandSessionId(explicitSession, dir) ?? expandSessionId(explicitSession);
+			if (!expanded) {
+				consola.error(`Session '${explicitSession}' not found (or matches multiple sessions). Pass the full UUID.`);
+				process.exit(1);
+			}
+			sessionId = expanded;
+		} else {
 			const sessions = findSessionsByName(dir, name);
 			if (sessions.length === 0) {
 				consola.error(`No session named "${name}" in ${dir}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@generativereality/cctabs",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Claude Code tab manager. Terminal tabs as the UI, no tmux.",
   "type": "module",
   "bin": {