@generativereality/cctabs 0.4.3 → 0.4.5

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.4.3",
+  "version": "0.4.5",
   "author": {
     "name": "generativereality",
     "url": "https://cctabs.com"

package/dist/index.js

@@ -11,7 +11,7 @@ import { consola } from "consola";
 import * as p from "@clack/prompts";
 //#region package.json
 var name = "@generativereality/cctabs";
-var version = "0.4.3";
+var version = "0.4.5";
 var description = "Claude Code tab manager. Terminal tabs as the UI, no tmux.";
 var package_default = {
 	name,
@@ -709,7 +709,8 @@ var TabbyAdapter = class {
 			cwd: opts.cwd,
 			title: opts.title,
 			command: opts.command,
-			args: opts.args
+			args: opts.args,
+			afterActive: opts.afterActive ?? false
 		}))?.uuid;
 		if (!uuid) throw new Error("Tabby plugin did not return a tab uuid");
 		return {
@@ -717,6 +718,10 @@ var TabbyAdapter = class {
 			tabId: uuid
 		};
 	}
+	async reorderTabs(order) {
+		this.ensureHealthy();
+		await this.http("POST", "/api/tabs/reorder", { order });
+	}
 	async sendInput(blockId, text) {
 		return this.http("POST", `/api/tabs/${blockId}/send`, { data: text });
 	}
@@ -1263,24 +1268,26 @@ function ensureConfigExists() {
 	return CONFIG_PATH;
 }
 //#endregion
+//#region src/core/shell.ts
+/**
+* POSIX single-quote escape one argv token. Several commands join the
+* configured `claude.flags` into a raw shell string and send it as terminal
+* input, so any value with shell metacharacters must be quoted or the shell
+* mangles it before `claude` sees it — e.g. a `--model opus[1m]` flag
+* glob-expands under zsh ("no matches found: opus[1m]") and the launch
+* silently falls back to the default model. Single quotes are inert in every
+* POSIX shell; embedded single quotes are closed, escaped, and reopened ('\'').
+*/
+function shellQuoteArg(arg) {
+	return `'${arg.replace(/'/g, "'\\''")}'`;
+}
+//#endregion
 //#region src/core/open-session.ts
 function shellQuoteEnv$1(env) {
 	const entries = Object.entries(env);
 	if (!entries.length) return "";
 	return entries.map(([k, v]) => `${k}=${JSON.stringify(v)}`).join(" ") + " ";
 }
-/**
-* POSIX single-quote escape one argv token. The configured `claude.flags` are
-* joined into a raw shell string and sent as terminal input, so any value with
-* shell metacharacters must be quoted or the shell mangles it before `claude`
-* sees it — e.g. a `--model opus[1m]` flag glob-expands under zsh ("no matches
-* found: opus[1m]") and the launch silently falls back to the default model.
-* Single quotes are inert in every POSIX shell; embedded single quotes are
-* closed, escaped, and reopened ('\'').
-*/
-function shellQuoteArg(arg) {
-	return `'${arg.replace(/'/g, "'\\''")}'`;
-}
 /** Poll scrollback until a pattern is visible, then return. Rejects on timeout. */
 async function waitForScrollbackMatch(adapter, blockId, pattern, label, timeoutMs, pollInterval = 1e3) {
 	const deadline = Date.now() + timeoutMs;
@@ -1327,6 +1334,12 @@ async function sendInitialPrompt(adapter, blockId, initialPromptFile) {
 		adapter.closeSocket();
 		throw new Error("Claude prompt (❯) never appeared — not sending initial prompt. Check that claude started successfully.");
 	}
+	if (/trustthisfolder|Yes,?Itrustthis|Isthisaproject/i.test(adapter.scrollback(blockId, 40).replace(/\s+/g, ""))) for (let attempt = 0; attempt < 18; attempt++) {
+		const screen = adapter.scrollback(blockId, 14).replace(/\s+/g, "");
+		if (/automode|foragents|Try["'“]/i.test(screen)) break;
+		await adapter.sendInput(blockId, "\r");
+		await sleep(800);
+	}
 	const prompt = readFileSync(initialPromptFile, "utf-8").trimEnd();
 	const sentinel = prompt.replace(/\s+/g, "").slice(0, 24);
 	const landed = () => {
@@ -1360,9 +1373,57 @@ async function sendInitialPrompt(adapter, blockId, initialPromptFile) {
 	}
 	consola.warn("Could not confirm the initial prompt was submitted — switch to the tab and press Enter to send it.");
 }
+/**
+* Auto-advance Claude's "resume" picker that appears when `claude --resume <id>`
+* reattaches a large/old session:
+*
+*   ❯ 1. Resume from summary (recommended)
+*     2. Resume full session as-is
+*     3. Don't ask me again
+*
+* It blocks the tab until you choose, which is why a plain `restore` leaves
+* such tabs stuck. cctabs always wants the FULL session — the whole point of
+* restore is to bring the conversation back intact, not a lossy summary — so we
+* select option 2.
+*
+* Like the trust dialog, the picker has a brief not-ready window as it paints,
+* so we poll for it to appear, settle, then navigate. The default highlight is
+* option 1, so we move the cursor DOWN exactly once to reach option 2. We send
+* ↓ only once on purpose: spamming it across retries could land on option 3
+* ("Don't ask me again"), which permanently changes the user's config. The
+* confirm is the part we retry — re-pressing Enter on the same row is safe, and
+* if the single ↓ was ever dropped the worst case is a (still-usable) summary
+* resume, never option 3.
+*/
+async function confirmResumePicker(adapter, blockId) {
+	const stripped = (n) => adapter.scrollback(blockId, n).replace(/\s+/g, "");
+	const pickerVisible = (n) => {
+		const c = stripped(n);
+		return /Resumefromsummary/i.test(c) && /Resumefullsession/i.test(c);
+	};
+	let appeared = false;
+	for (let i = 0; i < 25; i++) {
+		if (pickerVisible(30)) {
+			appeared = true;
+			break;
+		}
+		await sleep(1e3);
+	}
+	if (!appeared) return;
+	await sleep(1200);
+	await adapter.sendInput(blockId, "\x1B[B");
+	await sleep(250);
+	for (let attempt = 0; attempt < 8; attempt++) {
+		await adapter.sendInput(blockId, "\r");
+		await sleep(900);
+		if (!pickerVisible(8)) return;
+	}
+	consola.warn("Could not confirm the resume picker was dismissed — switch to the tab and pick \"Resume full session as-is\".");
+}
 async function openSession(opts) {
-	const { tabName, claudeCmd, workspaceQuery, initialPromptFile, envVars, modelOverride } = opts;
+	const { tabName, claudeCmd, workspaceQuery, initialPromptFile, envVars, modelOverride, afterActive } = opts;
 	const tailDelayMs = opts.tailDelayMs ?? 2e3;
+	const isResume = /--resume\b/.test(claudeCmd);
 	const dir = resolve(opts.dir.replace(/^~/, homedir()));
 	if (!existsSync(dir)) throw new Error(`Directory does not exist: ${dir}`);
 	const config = loadConfig();
@@ -1382,7 +1443,7 @@ async function openSession(opts) {
 		const envPrefix = envVars ? shellQuoteEnv$1(envVars) : "";
 		const claudeCore = `claude${extraFlags ? " " + extraFlags : ""} ${claudeCmd.replace(/^claude\s*/, "")}${namePart}${modelPart}`.replace(/\s+/g, " ").trim();
 		const shell = process.env.SHELL ?? "/bin/zsh";
-		const launch = `${envPrefix}exec ${claudeCore}`;
+		const launch = `${envPrefix}${claudeCore}; exec ${shell} -l -i`;
 		const { blockId, tabId } = await adapter.openTabDirect({
 			cwd: dir,
 			title: tabName,
@@ -1392,9 +1453,14 @@ async function openSession(opts) {
 				"-i",
 				"-c",
 				launch
-			]
+			],
+			afterActive
 		});
 		mark("openTabDirect");
+		if (isResume) {
+			await confirmResumePicker(adapter, blockId);
+			mark("resumePicker");
+		}
 		if (initialPromptFile) await sendInitialPrompt(adapter, blockId, initialPromptFile);
 		adapter.closeSocket();
 		return tabId;
@@ -1431,6 +1497,10 @@ async function openSession(opts) {
 	const envPrefix = envVars ? shellQuoteEnv$1(envVars) : "";
 	const cmd = `cd ${JSON.stringify(dir)} && ${envPrefix}claude${extraFlags ? " " + extraFlags : ""} ${claudeCmd.replace(/^claude\s*/, "")}${namePart}${modelPart}\r`;
 	await adapter.sendInput(blockId, cmd);
+	if (isResume) {
+		await confirmResumePicker(adapter, blockId);
+		mark("resumePicker");
+	}
 	if (initialPromptFile) await sendInitialPrompt(adapter, blockId, initialPromptFile);
 	if (tailDelayMs > 0) await new Promise((r) => setTimeout(r, tailDelayMs));
 	mark("tail");
@@ -1721,7 +1791,8 @@ const newCommand = define({
 			workspaceQuery: workspace,
 			initialPromptFile,
 			envVars,
-			modelOverride: resolvedModel
+			modelOverride: resolvedModel,
+			afterActive: true
 		});
 		const wt = useWorktree ? ` (worktree: .claude/worktrees/${name})` : "";
 		const be = backendName ? ` [backend: ${backendName}${resolvedModel ? ` → ${resolvedModel}` : ""}]` : "";
@@ -1863,13 +1934,14 @@ const resumeCommand = define({
 						dir,
 						claudeCmd: `claude --resume ${sessionId} --name ${JSON.stringify(name)}`,
 						envVars,
-						modelOverride: resolvedModel
+						modelOverride: resolvedModel,
+						afterActive: true
 					});
 					consola.success(`Tab "${name}" [${newTabId.slice(0, 8)}] → claude --resume ${sessionId.slice(0, 8)}… at ${dir} (recreated)`);
 					return;
 				}
 			}
-			const extraFlags = loadConfig().claude.flags.join(" ");
+			const extraFlags = loadConfig().claude.flags.map(shellQuoteArg).join(" ");
 			const envPrefix = envVars ? shellQuoteEnv(envVars) : "";
 			const modelPart = resolvedModel ? ` --model ${JSON.stringify(resolvedModel)}` : "";
 			const cmd = `cd ${JSON.stringify(dir)} && ${envPrefix}claude${extraFlags ? " " + extraFlags : ""} --resume ${sessionId} --name ${JSON.stringify(name)}${modelPart}\r`;
@@ -1894,7 +1966,8 @@ const resumeCommand = define({
 				dir,
 				claudeCmd: `claude --resume ${sessionId} --name ${JSON.stringify(name)}`,
 				envVars,
-				modelOverride: resolvedModel
+				modelOverride: resolvedModel,
+				afterActive: true
 			});
 			consola.success(`Tab "${name}" [${tabId.slice(0, 8)}] → claude --resume ${sessionId.slice(0, 8)}… at ${dir} (new tab)`);
 		} else {
@@ -1979,7 +2052,8 @@ const forkCommand = define({
 		const newTabId = await openSession({
 			tabName: newName,
 			dir: openDir,
-			claudeCmd: `claude --resume ${sessionId} --fork-session`
+			claudeCmd: `claude --resume ${sessionId} --fork-session`,
+			afterActive: true
 		});
 		consola.success(`Forked "${tabName}" → "${newName}" [${newTabId.slice(0, 8)}]`);
 		consola.info(`session: ${sessionId}`);
@@ -2240,6 +2314,15 @@ const configCommand = define({
 });
 //#endregion
 //#region src/commands/restore.ts
+/**
+* Settle after each direct-spawn (Tabby) recreate, before creating the next
+* tab. A freshly created tab spawns its PTY only once it becomes the active
+* tab, and each new tab steals activation from the previous one — so without
+* this gap only the last-created tab actually launches Claude. One second is
+* comfortably longer than a PTY fork + shell exec, while keeping a full restore
+* snappy.
+*/
+const SPAWN_SETTLE_MS = 1e3;
 function readStdinSync() {
 	if (process.stdin.isTTY) return "";
 	try {
@@ -2347,7 +2430,7 @@ async function runManifestMode(manifestPath, createMissing, dryRun) {
 	const wsTabIds = currentWsData ? new Set(currentWsData.workspacedata.tabids) : new Set(tabsById.keys());
 	const results = [];
 	const toSpawn = [];
-	const extraFlags = loadConfig().claude.flags.join(" ");
+	const extraFlags = loadConfig().claude.flags.map(shellQuoteArg).join(" ");
 	for (const entry of entries) {
 		let resolvedSessionId = entry.session_id;
 		if (entry.session_id) {
@@ -2486,7 +2569,9 @@ async function runLegacyMode(rawDir, dryRun) {
 	const { tabsById, workspaces, tabNames } = await adapter.getAllData();
 	const currentTab = adapter.currentTabId();
 	const tabs = [];
+	const originalOrder = [];
 	for (const wsp of workspaces) for (const tabId of wsp.workspacedata.tabids) {
+		originalOrder.push(tabId);
 		if (tabId === currentTab) continue;
 		const blocks = (tabsById.get(tabId) ?? []).filter((b) => b.view === "term");
 		if (!blocks.length) continue;
@@ -2508,7 +2593,7 @@ async function runLegacyMode(rawDir, dryRun) {
 		return;
 	}
 	consola.info(`Found ${toResume.length} tab(s) to restore:`);
-	const extraFlags = loadConfig().claude.flags.join(" ");
+	const extraFlags = loadConfig().claude.flags.map(shellQuoteArg).join(" ");
 	const results = [];
 	const toRecreate = [];
 	const resolved = [];
@@ -2570,8 +2655,20 @@ async function runLegacyMode(rawDir, dryRun) {
 		await Promise.all(unknownTabs.map(async (r) => {
 			emptyById.set(r.tab.tabId, await adapter.confirmScrollbackEmpty(r.tab.blockId));
 		}));
+		const claimedNames = /* @__PURE__ */ new Set();
 		for (const r of resolved) {
 			const { tab, sessionId, sessionDir } = r;
+			if (claimedNames.has(tab.name)) {
+				const blockIds = (tabsById.get(tab.tabId) ?? []).map((b) => b.blockid);
+				for (const bid of blockIds) adapter.deleteBlock(bid);
+				consola.log(`  ${tab.name} — duplicate dead tab, closing (already restoring one)`);
+				results.push({
+					name: tab.name,
+					result: "duplicate dead tab — closed"
+				});
+				continue;
+			}
+			claimedNames.add(tab.name);
 			if (tab.status === "unknown" && emptyById.get(tab.tabId)) {
 				const blockIds = (tabsById.get(tab.tabId) ?? []).map((b) => b.blockid);
 				toRecreate.push({
@@ -2615,6 +2712,7 @@ async function runLegacyMode(rawDir, dryRun) {
 		for (const t of toRecreate) for (const bid of t.blockIds) adapter.deleteBlock(bid);
 		adapter.closeSocket();
 		consola.info(`Recreating ${toRecreate.length} dead tab(s)…`);
+		const recreatedIds = /* @__PURE__ */ new Map();
 		const recreateOne = async (t) => {
 			try {
 				const newTabId = await openSession({
@@ -2623,6 +2721,7 @@ async function runLegacyMode(rawDir, dryRun) {
 					claudeCmd: `claude --resume ${t.sessionId} --name ${JSON.stringify(t.name)}`,
 					tailDelayMs: 500
 				});
+				recreatedIds.set(t.tabId, newTabId);
 				const r = results.find((x) => x.name === t.name);
 				r.result = `✔ recreated [${newTabId.slice(0, 8)}]`;
 			} catch (err) {
@@ -2630,8 +2729,19 @@ async function runLegacyMode(rawDir, dryRun) {
 				r.result = `✘ recreate failed: ${err.message}`;
 			}
 		};
-		if (typeof adapter.openTabDirect === "function") await Promise.all(toRecreate.map(recreateOne));
-		else for (const t of toRecreate) await recreateOne(t);
+		const usesDirectSpawn = typeof adapter.openTabDirect === "function";
+		for (const t of toRecreate) {
+			await recreateOne(t);
+			if (usesDirectSpawn) await new Promise((r) => setTimeout(r, SPAWN_SETTLE_MS));
+		}
+		if (recreatedIds.size && typeof adapter.reorderTabs === "function") {
+			const desiredOrder = originalOrder.map((id) => recreatedIds.get(id) ?? id);
+			try {
+				await adapter.reorderTabs(desiredOrder);
+			} catch (err) {
+				consola.warn(`Could not restore tab order: ${err.message}`);
+			}
+		}
 	} else adapter.closeSocket();
 	console.log("\nRestore summary:");
 	for (const r of results) console.log(`  ${r.name}: ${r.result}`);
@@ -3372,7 +3482,7 @@ const importCommand = define({
 			mkdirSync(targetProjectDir, { recursive: true });
 			copyFileSync(srcJsonl, targetJsonl);
 			const config = loadConfig();
-			const claudeCmd = `claude${config.claude.flags.length ? " " + config.claude.flags.join(" ") : ""} --resume ${entry.sessionId} --name ${JSON.stringify(entry.name)}`;
+			const claudeCmd = `claude${config.claude.flags.length ? " " + config.claude.flags.map(shellQuoteArg).join(" ") : ""} --resume ${entry.sessionId} --name ${JSON.stringify(entry.name)}`;
 			try {
 				await openSession({
 					tabName: entry.name,

package/package.json

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

package/skills/cctabs/SKILL.md

@@ -281,6 +281,18 @@ cctabs restore ~/Dev/myapp        # restrict the search to one project dir
 
 If a session was started in a different `cwd` than the tab's current directory (common after `cd`-ing inside the tab), the global search still finds it via the recorded session metadata — no need to guess the right dir.
 
+### The "Resume from summary / full session" picker
+
+When `claude --resume` reattaches a large or old session, Claude first shows a blocking picker:
+
+```
+❯ 1. Resume from summary (recommended)
+  2. Resume full session as-is
+  3. Don't ask me again
+```
+
+**Always pick option 2, "Resume full session as-is."** The point of `restore` is to bring the conversation back intact — resuming from a summary discards the live context you're restoring for. `restore` auto-advances this picker for you (it moves down once to option 2 and confirms), so you normally never see it. If you ever do drive it manually (e.g. sending keys to a tab), send **↓ then Enter** — never the bare Enter that would accept the summary, and never option 3, which permanently silences the prompt in that session's config.
+
 ## Workflow: Moving sessions across machines
 
 Use `export` + `import` to migrate a tab (or a whole workspace) — and its underlying Claude conversation — from one machine to another, e.g. when switching laptops or sharing a debug session with a teammate.