@generativereality/cctabs 0.4.3 → 0.4.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.4.3",
+  "version": "0.4.4",
   "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.4";
 var description = "Claude Code tab manager. Terminal tabs as the UI, no tmux.";
 var package_default = {
 	name,
@@ -1263,24 +1263,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 +1329,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 = () => {
@@ -1382,7 +1390,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,
@@ -1869,7 +1877,7 @@ const resumeCommand = define({
 					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`;
@@ -2240,6 +2248,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 +2364,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) {
@@ -2508,7 +2525,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 = [];
@@ -2630,8 +2647,11 @@ 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));
+		}
 	} else adapter.closeSocket();
 	console.log("\nRestore summary:");
 	for (const r of results) console.log(`  ${r.name}: ${r.result}`);
@@ -3372,7 +3392,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.4",
   "description": "Claude Code tab manager. Terminal tabs as the UI, no tmux.",
   "type": "module",
   "bin": {