@generativereality/cctabs 0.4.1 → 0.4.3

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.1",
+  "version": "0.4.3",
   "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.1";
+var version = "0.4.3";
 var description = "Claude Code tab manager. Terminal tabs as the UI, no tmux.";
 var package_default = {
 	name,
@@ -335,7 +335,7 @@ var WaveAdapter = class {
 	async confirmScrollbackEmpty(blockId, attempts = 3, intervalMs = 500) {
 		for (let i = 0; i < attempts; i++) {
 			if (this.scrollback(blockId, 10).trim()) return false;
-			if (i < attempts - 1) await sleep$1(intervalMs);
+			if (i < attempts - 1) await sleep$2(intervalMs);
 		}
 		return true;
 	}
@@ -365,7 +365,7 @@ var WaveAdapter = class {
 	async newTab(focusWindowId) {
 		if (focusWindowId) {
 			await this.focusWindow(focusWindowId);
-			await sleep$1(300);
+			await sleep$2(300);
 		}
 		const r = spawnSync("osascript", ["-e", [
 			"tell application \"Wave\" to activate",
@@ -381,7 +381,7 @@ var WaveAdapter = class {
 	async waitForNewBlock(beforeIds, timeoutMs = 15e3) {
 		const deadline = Date.now() + timeoutMs;
 		while (Date.now() < deadline) {
-			await sleep$1(250);
+			await sleep$2(250);
 			for (const b of this.blocksList()) if (b.view === "term" && !beforeIds.has(b.blockid)) return {
 				blockId: b.blockid,
 				tabId: b.tabid
@@ -509,7 +509,7 @@ var WaveAdapter = class {
 		}));
 	}
 };
-function sleep$1(ms) {
+function sleep$2(ms) {
 	return new Promise((r) => setTimeout(r, ms));
 }
 //#endregion
@@ -636,7 +636,7 @@ var TabbyAdapter = class {
 	async confirmScrollbackEmpty(blockId, attempts = 3, intervalMs = 500) {
 		for (let i = 0; i < attempts; i++) {
 			if (this.scrollback(blockId, 10).trim()) return false;
-			if (i < attempts - 1) await sleep(intervalMs);
+			if (i < attempts - 1) await sleep$1(intervalMs);
 		}
 		return true;
 	}
@@ -685,7 +685,7 @@ var TabbyAdapter = class {
 	async waitForNewBlock(beforeIds, timeoutMs = 15e3) {
 		const deadline = Date.now() + timeoutMs;
 		while (Date.now() < deadline) {
-			await sleep(250);
+			await sleep$1(250);
 			for (const b of this.blocksList()) if (!beforeIds.has(b.blockid)) return {
 				blockId: b.blockid,
 				tabId: b.tabid
@@ -816,7 +816,7 @@ var TabbyAdapter = class {
 		}
 	}
 };
-function sleep(ms) {
+function sleep$1(ms) {
 	return new Promise((r) => setTimeout(r, ms));
 }
 /**
@@ -1269,6 +1269,18 @@ function shellQuoteEnv$1(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;
@@ -1282,21 +1294,31 @@ async function waitForScrollbackMatch(adapter, blockId, pattern, label, timeoutM
 	}
 	throw new Error(`Timed out waiting for ${label}`);
 }
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 /**
 * Wait for Claude's input prompt, then send the initial task and reliably
 * submit it.
 *
-* Reliability matters because a naive "send text, then send \r" loses the
-* Enter for multi-line prompts: the terminal treats the burst as a bracketed
-* paste and swallows a \r that arrives inside the paste window, leaving the
-* text sitting unsent in the input box. We fix that two ways:
-*   1. Wrap the prompt in explicit bracketed-paste markers so the (possibly
-*      multi-line) text is ingested as one paste and the following Enter lands
-*      *outside* it — an unambiguous submit, not a newline.
-*   2. Verify the turn actually started (a spinner / "esc to interrupt" hint
-*      appears only while Claude is processing, never at the idle prompt), and
-*      re-send Enter a few times if not, since a large paste can still be
-*      mid-ingest when the first Enter arrives.
+* The naive "send text, then send \r" is unreliable for two distinct reasons,
+* each handled by its own verify-and-retry stage:
+*
+*   1. The paste can be *dropped*. The welcome-screen placeholder (`❯ Try "…"`)
+*      renders several seconds before the input handler is fully attached, so
+*      input sent the instant `❯` appears lands in a not-ready terminal and is
+*      silently lost — the box stays empty and a later Enter does nothing.
+*      Fix: after pasting, confirm the text actually landed in the box and
+*      re-paste if not (clearing first so a retry never duplicates).
+*
+*   2. The Enter can be *swallowed*. A burst of "text then \r" is seen as one
+*      bracketed paste and the \r is absorbed as a newline rather than a
+*      submit. Fix: wrap the prompt in explicit bracketed-paste markers so the
+*      Enter lands outside the paste, then confirm a turn actually started
+*      (spinner / "esc to interrupt" appear only while Claude is processing)
+*      and re-send Enter a few times if not.
+*
+* Landed-detection handles both render shapes observed empirically: a short
+* prompt is echoed inline (so a distinctive prompt substring appears), while a
+* long / multi-line prompt collapses to a "[Pasted text #N +M lines]" chip.
 */
 async function sendInitialPrompt(adapter, blockId, initialPromptFile) {
 	try {
@@ -1306,16 +1328,37 @@ async function sendInitialPrompt(adapter, blockId, initialPromptFile) {
 		throw new Error("Claude prompt (❯) never appeared — not sending initial prompt. Check that claude started successfully.");
 	}
 	const prompt = readFileSync(initialPromptFile, "utf-8").trimEnd();
-	await adapter.sendInput(blockId, `\x1b[200~${prompt}\x1b[201~`);
+	const sentinel = prompt.replace(/\s+/g, "").slice(0, 24);
+	const landed = () => {
+		const c = adapter.scrollback(blockId, 60).replace(/\s+/g, "");
+		return sentinel.length >= 4 && c.includes(sentinel) || c.includes("[Pastedtext");
+	};
+	let inBox = false;
+	for (let attempt = 0; attempt < 3 && !inBox; attempt++) {
+		if (attempt > 0) {
+			await adapter.sendInput(blockId, "");
+			await sleep(200);
+		}
+		await adapter.sendInput(blockId, `\x1b[200~${prompt}\x1b[201~`);
+		for (let i = 0; i < 8; i++) {
+			await sleep(300);
+			if (landed()) {
+				inBox = true;
+				break;
+			}
+		}
+	}
+	if (!inBox) {
+		consola.warn("Initial prompt may not have landed in the input box — switch to the tab and press Enter (re-type if the box is empty).");
+		return;
+	}
 	for (let attempt = 0; attempt < 4; attempt++) {
-		await new Promise((r) => setTimeout(r, attempt === 0 ? 300 : 500));
 		await adapter.sendInput(blockId, "\r");
-		await new Promise((r) => setTimeout(r, 500));
+		await sleep(500);
 		const tail = adapter.scrollback(blockId, 40);
-		const compact = tail.replace(/\s+/g, "");
-		if (/[✻✽✶✳✢]/.test(tail) || /esctointerrupt/i.test(compact)) return;
+		if (/[✻✽✶✳✢]/.test(tail) || /esctointerrupt/i.test(tail.replace(/\s+/g, ""))) return;
 	}
-	consola.warn("Could not confirm the initial prompt was submitted — it may be sitting in the input box. Press Enter in the tab to send it.");
+	consola.warn("Could not confirm the initial prompt was submitted — switch to the tab and press Enter to send it.");
 }
 async function openSession(opts) {
 	const { tabName, claudeCmd, workspaceQuery, initialPromptFile, envVars, modelOverride } = opts;
@@ -1333,7 +1376,7 @@ async function openSession(opts) {
 		tPhase = now;
 	};
 	if (adapter.openTabDirect) {
-		const extraFlags = config.claude.flags.join(" ");
+		const extraFlags = config.claude.flags.map(shellQuoteArg).join(" ");
 		const namePart = claudeCmd.includes("--resume") ? "" : ` --name ${JSON.stringify(tabName)}`;
 		const modelPart = modelOverride ? ` --model ${JSON.stringify(modelOverride)}` : "";
 		const envPrefix = envVars ? shellQuoteEnv$1(envVars) : "";
@@ -1346,6 +1389,7 @@ async function openSession(opts) {
 			command: shell,
 			args: [
 				"-l",
+				"-i",
 				"-c",
 				launch
 			]
@@ -1381,7 +1425,7 @@ async function openSession(opts) {
 		throw new Error("Shell prompt never appeared in new tab — aborting. Check your shell profile (e.g. nvm default alias).");
 	}
 	mark("shellPrompt");
-	const extraFlags = config.claude.flags.join(" ");
+	const extraFlags = config.claude.flags.map(shellQuoteArg).join(" ");
 	const namePart = claudeCmd.includes("--resume") ? "" : ` --name ${JSON.stringify(tabName)}`;
 	const modelPart = modelOverride ? ` --model ${JSON.stringify(modelOverride)}` : "";
 	const envPrefix = envVars ? shellQuoteEnv$1(envVars) : "";
@@ -2698,18 +2742,18 @@ function checkTabbyPlugin() {
 }
 /**
 * Probe whether `node` is findable in a freshly spawned shell — the canonical
-* symptom of the macOS non-login PATH bug. Spawning `zsh -l -c 'command -v
-* node'` simulates the same login-shell init (/etc/zprofile → path_helper)
-* that cctabs now uses when it opens new Tabby tabs. If this fails, brand-new
-* tabs will also fail to find Node, every plugin MCP that shells out to npx
-* will ENOENT, and the cctabs CLI itself becomes unusable from inside those
-* tabs (chicken-and-egg). The remediation hint covers both the upstream-fix
-* path (rely on a recent cctabs that defaults to `-l`) and the dotfile
-* workaround for users on older versions or non-Tabby terminals.
+* symptom of the macOS PATH-sourcing bug. Spawning `zsh -l -i -c 'command -v
+* node'` simulates the same login + interactive shell init (/etc/zprofile →
+* path_helper, then ~/.zshrc) that cctabs uses when it opens new Tabby tabs.
+* If this fails, brand-new tabs will also fail to find Node, every plugin MCP
+* that shells out to npx will ENOENT, and the cctabs CLI itself becomes
+* unusable from inside those tabs (chicken-and-egg). The flags must match
+* open-session.ts to keep the doctor honest.
 */
 function checkSpawnedShellPath() {
 	const r = spawnSync("zsh", [
 		"-l",
+		"-i",
 		"-c",
 		"command -v node"
 	], {
@@ -2724,8 +2768,8 @@ function checkSpawnedShellPath() {
 	return {
 		name: "Spawned shell PATH",
 		status: "warn",
-		detail: r.error?.message ?? r.stderr?.trim() ?? "node not found in a login zsh",
-		hint: "A login zsh cannot find `node`. Either node is not installed, or PATH is broken. On macOS, `/usr/local/bin` is added by /etc/zprofile's path_helper — non-login shells skip it. Add `export PATH=\"/usr/local/bin:$PATH\"` to ~/.zshenv as a belt-and-braces fix."
+		detail: r.error?.message ?? r.stderr?.trim() ?? "node not found in a login+interactive zsh",
+		hint: "A login+interactive zsh cannot find `node`. Either node is not installed, or PATH is broken. cctabs spawns tabs with `zsh -l -i -c` so both ~/.zprofile and ~/.zshrc are sourced — if your PATH-extending logic lives elsewhere (e.g. a sourced file that bails on non-interactive), move the `export PATH=...` lines into ~/.zshenv as a belt-and-braces fix."
 	};
 }
 function checkWaveDb() {

package/package.json

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