codebay 0.9.0 → 0.9.1

package/.mochi/manifest.json

@@ -4,8 +4,8 @@
   "bootstrapUrl": "/_mochi/client/HydratableIsland-k6q8esj4.js",
   "componentEntryUrls": {
     "AppShell_2rtnxn6pgp2rh": "/_mochi/client/_hydrate-AppShell_2rtnxn6pgp2rh-sg96rp17.js",
-    "AvatarsView_257s9yq1wwr4f": "/_mochi/client/_hydrate-AvatarsView_257s9yq1wwr4f-92hepzby.js",
     "InstanceView_2ma45l9bybfhl": "/_mochi/client/_hydrate-InstanceView_2ma45l9bybfhl-p3f649gk.js",
+    "AvatarsView_257s9yq1wwr4f": "/_mochi/client/_hydrate-AvatarsView_257s9yq1wwr4f-92hepzby.js",
     "SettingsView_8hmarwmf8onq": "/_mochi/client/_hydrate-SettingsView_8hmarwmf8onq-dzmgmv78.js"
   },
   "cssFileUrls": {
@@ -13,8 +13,8 @@
     "$mochi/templates/ClientStats/ClientStats.svelte": "/_mochi/css/ClientStats-19qzckq40p2q9.css",
     "$mochi/templates/BackLink.svelte": "/_mochi/css/BackLink-2wlu0eovz9j86.css",
     "src/components/AppShell.svelte": "/_mochi/css/AppShell-36mpg5smnbmuw.css",
-    "src/components/AvatarsView.svelte": "/_mochi/css/AvatarsView-2llo48w0wt0xn.css",
     "src/components/InstanceView.svelte": "/_mochi/css/InstanceView-3vzow3ttxzlh3.css",
+    "src/components/AvatarsView.svelte": "/_mochi/css/AvatarsView-2llo48w0wt0xn.css",
     "src/components/SettingsView.svelte": "/_mochi/css/SettingsView-2qfauz68axro1.css",
     "src/components/TerminalSplit.svelte": "/_mochi/css/TerminalSplit-2416xfuln89a3.css",
     "src/components/DashboardView.svelte": "/_mochi/css/DashboardView-1cy4xpqhja9sx.css",
@@ -26,35 +26,35 @@
     "node_modules/svelte-french-toast/dist/components/LoaderIcon.svelte": "/_mochi/css/LoaderIcon-soq5wt3p05ye.css",
     "node_modules/svelte-french-toast/dist/components/ErrorIcon.svelte": "/_mochi/css/ErrorIcon-2x0tzsqxskw28.css",
     "node_modules/svelte-french-toast/dist/components/ToastBar.svelte": "/_mochi/css/ToastBar-3havgkmtofntq.css",
-    "src/components/Avatar.svelte": "/_mochi/css/Avatar-3pi30db6ozvf0.css",
-    "src/components/AvatarEditor.svelte": "/_mochi/css/AvatarEditor-2mdq8ss346drw.css",
-    "src/components/AppBar.svelte": "/_mochi/css/AppBar-3bxinv4pabv8l.css",
     "src/components/Skeleton.svelte": "/_mochi/css/Skeleton-8k69usiju43h.css",
     "src/components/StatusBadge.svelte": "/_mochi/css/StatusBadge-3mq0j7z6aq4j.css",
     "src/components/HealthBox.svelte": "/_mochi/css/HealthBox-er2her0jukwl.css",
+    "src/components/AvatarEditor.svelte": "/_mochi/css/AvatarEditor-2mdq8ss346drw.css",
+    "src/components/AppBar.svelte": "/_mochi/css/AppBar-3bxinv4pabv8l.css",
+    "src/components/Avatar.svelte": "/_mochi/css/Avatar-3pi30db6ozvf0.css",
     "src/components/Button.svelte": "/_mochi/css/Button-2vtbrzb5kgu25.css",
     "src/components/ThemePicker.svelte": "/_mochi/css/ThemePicker-1ir8jyocm8mvi.css",
     "src/components/CoinButton.svelte": "/_mochi/css/CoinButton-1rej3sh3tkjud.css",
-    "src/components/TerminalPane.svelte": "/_mochi/css/TerminalPane-3bwgk6ulzq6b3.css",
+    "src/components/FolderBrowser.svelte": "/_mochi/css/FolderBrowser-2pxp9z1o7zixk.css",
     "src/components/TopBar.svelte": "/_mochi/css/TopBar-2q87li6yt8ids.css",
     "src/components/InstanceCard.svelte": "/_mochi/css/InstanceCard-3vnltxnbxkvay.css",
-    "src/components/FolderBrowser.svelte": "/_mochi/css/FolderBrowser-2pxp9z1o7zixk.css",
+    "src/components/TerminalPane.svelte": "/_mochi/css/TerminalPane-3bwgk6ulzq6b3.css",
     "node_modules/svelte-french-toast/dist/components/ToastMessage.svelte": "/_mochi/css/ToastMessage-2jfwb2og2lfa8.css",
     "node_modules/svelte-french-toast/dist/components/ToastWrapper.svelte": "/_mochi/css/ToastWrapper-1fbnym10rm2nv.css",
     "src/components/Brand.svelte": "/_mochi/css/Brand-1bh2b800g5vrn.css",
+    "src/components/SettingsCog.svelte": "/_mochi/css/SettingsCog-jftyadvo64qo.css",
+    "src/components/CredMenu.svelte": "/_mochi/css/CredMenu-9hwgeptp7crb.css",
     "src/components/InstanceFilter.svelte": "/_mochi/css/InstanceFilter-3q6x0jt0hcgpz.css",
-    "src/components/PortsBox.svelte": "/_mochi/css/PortsBox-1t25b5yg7jva3.css",
     "src/components/BranchBox.svelte": "/_mochi/css/BranchBox-1yqu1q2mgnjwz.css",
-    "src/components/SettingsCog.svelte": "/_mochi/css/SettingsCog-jftyadvo64qo.css",
-    "src/components/CredMenu.svelte": "/_mochi/css/CredMenu-9hwgeptp7crb.css"
+    "src/components/PortsBox.svelte": "/_mochi/css/PortsBox-1t25b5yg7jva3.css"
   },
   "clientFiles": {
     "/_mochi/css/DefaultError-2b0daamydxgb2.css": "svelte-css/DefaultError-2b0daamydxgb2.css",
     "/_mochi/css/ClientStats-19qzckq40p2q9.css": "svelte-css/ClientStats-19qzckq40p2q9.css",
     "/_mochi/css/BackLink-2wlu0eovz9j86.css": "svelte-css/BackLink-2wlu0eovz9j86.css",
     "/_mochi/css/AppShell-36mpg5smnbmuw.css": "svelte-css/AppShell-36mpg5smnbmuw.css",
-    "/_mochi/css/AvatarsView-2llo48w0wt0xn.css": "svelte-css/AvatarsView-2llo48w0wt0xn.css",
     "/_mochi/css/InstanceView-3vzow3ttxzlh3.css": "svelte-css/InstanceView-3vzow3ttxzlh3.css",
+    "/_mochi/css/AvatarsView-2llo48w0wt0xn.css": "svelte-css/AvatarsView-2llo48w0wt0xn.css",
     "/_mochi/css/SettingsView-2qfauz68axro1.css": "svelte-css/SettingsView-2qfauz68axro1.css",
     "/_mochi/css/TerminalSplit-2416xfuln89a3.css": "svelte-css/TerminalSplit-2416xfuln89a3.css",
     "/_mochi/css/DashboardView-1cy4xpqhja9sx.css": "svelte-css/DashboardView-1cy4xpqhja9sx.css",
@@ -66,27 +66,27 @@
     "/_mochi/css/LoaderIcon-soq5wt3p05ye.css": "svelte-css/LoaderIcon-soq5wt3p05ye.css",
     "/_mochi/css/ErrorIcon-2x0tzsqxskw28.css": "svelte-css/ErrorIcon-2x0tzsqxskw28.css",
     "/_mochi/css/ToastBar-3havgkmtofntq.css": "svelte-css/ToastBar-3havgkmtofntq.css",
-    "/_mochi/css/Avatar-3pi30db6ozvf0.css": "svelte-css/Avatar-3pi30db6ozvf0.css",
-    "/_mochi/css/AvatarEditor-2mdq8ss346drw.css": "svelte-css/AvatarEditor-2mdq8ss346drw.css",
-    "/_mochi/css/AppBar-3bxinv4pabv8l.css": "svelte-css/AppBar-3bxinv4pabv8l.css",
     "/_mochi/css/Skeleton-8k69usiju43h.css": "svelte-css/Skeleton-8k69usiju43h.css",
     "/_mochi/css/StatusBadge-3mq0j7z6aq4j.css": "svelte-css/StatusBadge-3mq0j7z6aq4j.css",
     "/_mochi/css/HealthBox-er2her0jukwl.css": "svelte-css/HealthBox-er2her0jukwl.css",
+    "/_mochi/css/AvatarEditor-2mdq8ss346drw.css": "svelte-css/AvatarEditor-2mdq8ss346drw.css",
+    "/_mochi/css/AppBar-3bxinv4pabv8l.css": "svelte-css/AppBar-3bxinv4pabv8l.css",
+    "/_mochi/css/Avatar-3pi30db6ozvf0.css": "svelte-css/Avatar-3pi30db6ozvf0.css",
     "/_mochi/css/Button-2vtbrzb5kgu25.css": "svelte-css/Button-2vtbrzb5kgu25.css",
     "/_mochi/css/ThemePicker-1ir8jyocm8mvi.css": "svelte-css/ThemePicker-1ir8jyocm8mvi.css",
     "/_mochi/css/CoinButton-1rej3sh3tkjud.css": "svelte-css/CoinButton-1rej3sh3tkjud.css",
-    "/_mochi/css/TerminalPane-3bwgk6ulzq6b3.css": "svelte-css/TerminalPane-3bwgk6ulzq6b3.css",
+    "/_mochi/css/FolderBrowser-2pxp9z1o7zixk.css": "svelte-css/FolderBrowser-2pxp9z1o7zixk.css",
     "/_mochi/css/TopBar-2q87li6yt8ids.css": "svelte-css/TopBar-2q87li6yt8ids.css",
     "/_mochi/css/InstanceCard-3vnltxnbxkvay.css": "svelte-css/InstanceCard-3vnltxnbxkvay.css",
-    "/_mochi/css/FolderBrowser-2pxp9z1o7zixk.css": "svelte-css/FolderBrowser-2pxp9z1o7zixk.css",
+    "/_mochi/css/TerminalPane-3bwgk6ulzq6b3.css": "svelte-css/TerminalPane-3bwgk6ulzq6b3.css",
     "/_mochi/css/ToastMessage-2jfwb2og2lfa8.css": "svelte-css/ToastMessage-2jfwb2og2lfa8.css",
     "/_mochi/css/ToastWrapper-1fbnym10rm2nv.css": "svelte-css/ToastWrapper-1fbnym10rm2nv.css",
     "/_mochi/css/Brand-1bh2b800g5vrn.css": "svelte-css/Brand-1bh2b800g5vrn.css",
-    "/_mochi/css/InstanceFilter-3q6x0jt0hcgpz.css": "svelte-css/InstanceFilter-3q6x0jt0hcgpz.css",
-    "/_mochi/css/PortsBox-1t25b5yg7jva3.css": "svelte-css/PortsBox-1t25b5yg7jva3.css",
-    "/_mochi/css/BranchBox-1yqu1q2mgnjwz.css": "svelte-css/BranchBox-1yqu1q2mgnjwz.css",
     "/_mochi/css/SettingsCog-jftyadvo64qo.css": "svelte-css/SettingsCog-jftyadvo64qo.css",
     "/_mochi/css/CredMenu-9hwgeptp7crb.css": "svelte-css/CredMenu-9hwgeptp7crb.css",
+    "/_mochi/css/InstanceFilter-3q6x0jt0hcgpz.css": "svelte-css/InstanceFilter-3q6x0jt0hcgpz.css",
+    "/_mochi/css/BranchBox-1yqu1q2mgnjwz.css": "svelte-css/BranchBox-1yqu1q2mgnjwz.css",
+    "/_mochi/css/PortsBox-1t25b5yg7jva3.css": "svelte-css/PortsBox-1t25b5yg7jva3.css",
     "/_mochi/import-css/index-0nwv3654.css": "import-css/index-0nwv3654.css",
     "/_mochi/import-css/index-xndx4980.css": "import-css/index-xndx4980.css",
     "/_mochi/import-css/xterm-1yy1hf1g.css": "import-css/xterm-1yy1hf1g.css",
@@ -99,8 +99,8 @@
     "/_mochi/client/chunk-v65n8th6.js": "svelte-client/chunk-v65n8th6.js",
     "/_mochi/client/chunk-rs41by6w.js": "svelte-client/chunk-rs41by6w.js",
     "/_mochi/client/_hydrate-AppShell_2rtnxn6pgp2rh-sg96rp17.js": "svelte-client/_hydrate-AppShell_2rtnxn6pgp2rh-sg96rp17.js",
-    "/_mochi/client/_hydrate-AvatarsView_257s9yq1wwr4f-92hepzby.js": "svelte-client/_hydrate-AvatarsView_257s9yq1wwr4f-92hepzby.js",
     "/_mochi/client/_hydrate-InstanceView_2ma45l9bybfhl-p3f649gk.js": "svelte-client/_hydrate-InstanceView_2ma45l9bybfhl-p3f649gk.js",
+    "/_mochi/client/_hydrate-AvatarsView_257s9yq1wwr4f-92hepzby.js": "svelte-client/_hydrate-AvatarsView_257s9yq1wwr4f-92hepzby.js",
     "/_mochi/client/_hydrate-SettingsView_8hmarwmf8onq-dzmgmv78.js": "svelte-client/_hydrate-SettingsView_8hmarwmf8onq-dzmgmv78.js",
     "/_mochi/client/chunk-mpv3qx28.js": "svelte-client/chunk-mpv3qx28.js",
     "/_mochi/client/chunk-2j95sv83.js": "svelte-client/chunk-2j95sv83.js"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codebay",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"description": "Web UI for spinning up isolated devcontainer instances from any local folder, each with a browser-based VS Code (code-server) — built for parallel Claude Code workflows.",
 	"type": "module",
 	"license": "MIT",

package/src/container-injections/claude-code-install.ts

@@ -0,0 +1,67 @@
+import { checkPresence, execInContainer } from '../lib/exec.server.ts';
+import type { Injection } from '../lib/injections.server.ts';
+
+/**
+ * Sniffs before installing, because a project-supplied image usually ships its own Claude Code —
+ * and because the alternative (the upstream node feature) installs via nvm, which hard-fails on
+ * any image that sets NPM_CONFIG_PREFIX. Neither branch here touches nvm: npm when the image has
+ * Node, else the standalone installer, which needs no Node at all.
+ *
+ * `$1` is the remote user (the injection passes it; the build-time feature falls back to the
+ * devcontainer CLI's `$_REMOTE_USER`) — the standalone installer puts the binary under that
+ * user's `$HOME`, so running it as root would strand it in `/root`.
+ */
+export const INSTALL_SCRIPT =
+	'if command -v claude >/dev/null 2>&1; then exit 0; fi\n' +
+	'if command -v npm >/dev/null 2>&1 && npm install -g @anthropic-ai/claude-code@latest >/dev/null 2>&1; then\n' +
+	'  p="$(npm prefix -g 2>/dev/null)"\n' +
+	// npm's global bin is off PATH whenever the image sets its own NPM_CONFIG_PREFIX, so a bare
+	// `command -v` would miss an install that just succeeded — and so would the terminal launcher.
+	'  [ -n "$p" ] && [ -x "$p/bin/claude" ] && ln -sf "$p/bin/claude" /usr/local/bin/claude 2>/dev/null\n' +
+	'  if command -v claude >/dev/null 2>&1 || [ -x "$p/bin/claude" ]; then exit 0; fi\n' +
+	'fi\n' +
+	'u="${1:-${_REMOTE_USER:-root}}"\n' +
+	'h="$(getent passwd "$u" 2>/dev/null | cut -d: -f6)"; [ -n "$h" ] || h="$HOME"\n' +
+	'f="$(mktemp)"\n' +
+	'if command -v curl >/dev/null 2>&1; then curl -fsSL https://claude.ai/install.sh -o "$f"\n' +
+	'elif command -v wget >/dev/null 2>&1; then wget -qO "$f" https://claude.ai/install.sh\n' +
+	'else echo "no curl/wget to fetch the Claude Code installer" >&2; exit 1; fi\n' +
+	'chmod 0755 "$f"\n' +
+	// -m keeps the HOME set here, so the installer targets the remote user's home, not root's.
+	'if [ "$(id -un)" = "$u" ]; then "$f" >/dev/null 2>&1\n' +
+	'else HOME="$h" su -m "$u" -c "\'$f\'" >/dev/null 2>&1; fi\n' +
+	'rm -f "$f"\n' +
+	// The installer's ~/.local/bin is on no other user's PATH, and often not even on its own.
+	'ln -sf "$h/.local/bin/claude" /usr/local/bin/claude 2>/dev/null || true\n' +
+	'command -v claude >/dev/null 2>&1 || [ -x "$h/.local/bin/claude" ]\n';
+
+const CHECK_SCRIPT = 'command -v claude >/dev/null 2>&1 && echo 1 || echo 0';
+
+/**
+ * The runtime fallback to the build-time `codebay-claude` feature, mirroring tmux/ttyd. Terminal
+ * mode only: there the launcher *is* `claude`, so a missing binary leaves a bare shell — IDE-mode
+ * instances on a project image keep owning their own tooling.
+ */
+export const claudeCodeInstall: Injection = {
+	id: 'claude-code-install',
+	label: 'Claude Code',
+	modes: ['terminal'],
+
+	async apply(target, log) {
+		log('Checking Claude Code is installed…\n');
+		// Omitting remoteUser runs as root, which the global npm install and the symlink need.
+		const install = await execInContainer(
+			{ containerId: target.containerId },
+			{ script: INSTALL_SCRIPT, args: ['claude-install', target.remoteUser ?? ''] }
+		);
+		log(
+			install.ok
+				? '✓ Claude Code available\n'
+				: `⚠ Claude Code install failed: ${install.error} — the terminal opens a plain shell\n`
+		);
+	},
+
+	async check(target) {
+		return checkPresence(target, CHECK_SCRIPT);
+	}
+};

package/src/lib/devcontainer.server.ts

@@ -4,6 +4,7 @@ import { basename, dirname, join, relative } from 'node:path';
 import { homedir } from 'node:os';
 import { INSTALL_SCRIPT as TMUX_INSTALL_SCRIPT } from '../container-injections/tmux.ts';
 import { INSTALL_SCRIPT as TTYD_INSTALL_SCRIPT } from '../container-injections/ttyd.ts';
+import { INSTALL_SCRIPT as CLAUDE_INSTALL_SCRIPT } from '../container-injections/claude-code-install.ts';
 import { EXTENSION_ID as CLAUDE_CODE_EXTENSION_ID } from '../container-injections/claude-code-ide-extension.ts';
 import {
 	CODE_SERVER_PORT,
@@ -19,7 +20,11 @@ import type { PortForward } from '../types.ts';
 
 const CODE_SERVER_FEATURE = 'ghcr.io/coder/devcontainer-features/code-server:1';
 
-/** Installs the Claude Code CLI into the default image. Needs Node — supplied by NODE_FEATURE. */
+/**
+ * Installs the Claude Code CLI into the default image. Needs Node — supplied by NODE_FEATURE.
+ * Default-image only: NODE_FEATURE installs via nvm, which refuses to run when the image sets
+ * NPM_CONFIG_PREFIX, so a project-supplied image gets the sniffing CLAUDE_FEATURE_DIR instead.
+ */
 const CLAUDE_CODE_FEATURE = 'ghcr.io/anthropics/devcontainer-features/claude-code:1.0';
 
 /** Node.js — required by the Claude Code feature, which no longer bundles it. */
@@ -71,12 +76,32 @@ const TTYD_FEATURE_INSTALL =
 	') || echo "codebay-ttyd: install failed (non-fatal); the manager retries after the container starts"\n' +
 	'exit 0\n';
 
+/** Relative to .devcontainer/. Only written for terminal-mode instances on a project-supplied config. */
+const CLAUDE_FEATURE_DIR = 'codebay-claude';
+
+const CLAUDE_FEATURE_METADATA = {
+	id: 'codebay-claude',
+	version: '1.0.0',
+	name: 'Claude Code (Codebay, best-effort)',
+	description:
+		"Installs Claude Code at image build time when the project's own image doesn't already ship it. Never fails the build."
+};
+
+/** Best-effort like tmux/ttyd: build time is the only reliable moment to fetch in an egress-firewalled container. */
+const CLAUDE_FEATURE_INSTALL =
+	'#!/bin/sh\n' +
+	'(\n' +
+	`${CLAUDE_INSTALL_SCRIPT}\n` +
+	') || echo "codebay-claude: install failed (non-fatal); the manager retries after the container starts"\n' +
+	'exit 0\n';
+
 /** Manager-dropped files the project's own .gitignore won't cover, kept out of git status. */
 const MANAGER_GIT_EXCLUDES = [
 	'/.devcontainer/code-server-settings.json',
 	'/.devcontainer/devcontainer-lock.json',
 	'/.devcontainer/codebay-tmux/',
 	'/.devcontainer/codebay-ttyd/',
+	'/.devcontainer/codebay-claude/',
 	'/.devcontainer/codebay-terminal.sh',
 	'/.vscode/tasks.json'
 ];
@@ -413,18 +438,26 @@ export async function writeOverrideConfig(
 		`./${relative(dirname(target), join(workspaceDir, '.devcontainer', dir))}`;
 	const tmuxFeatureKey = featureKey(TMUX_FEATURE_DIR);
 	const ttydFeatureKey = featureKey(TTYD_FEATURE_DIR);
+	const claudeFeatureKey = featureKey(CLAUDE_FEATURE_DIR);
 
 	// Terminal mode swaps code-server for ttyd; otherwise (tmux, tooling) the two are identical.
-	// Node/Claude/gh: always in terminal mode (its launcher *is* `claude`), else only the default image.
+	// Claude Code: the default image needs the upstream features, while terminal mode on a
+	// project-supplied image gets the local one, which installs only what that image lacks — the
+	// upstream Node feature would run nvm, which any image setting NPM_CONFIG_PREFIX breaks on.
+	// IDE mode on a project config stays hands-off: the project owns its tooling.
+	const needsClaude = isTerminal || !hadConfig;
 	config.features = {
 		...(config.features ?? {}),
 		...(isTerminal
 			? { [ttydFeatureKey]: {} }
 			: { [CODE_SERVER_FEATURE]: { host: '0.0.0.0', port: CODE_SERVER_PORT, auth: 'none' } }),
 		[tmuxFeatureKey]: {},
-		...(isTerminal || !hadConfig
-			? { [NODE_FEATURE]: {}, [CLAUDE_CODE_FEATURE]: {}, [GITHUB_CLI_FEATURE]: {} }
-			: {})
+		...(needsClaude ? { [GITHUB_CLI_FEATURE]: {} } : {}),
+		...(!hadConfig
+			? { [NODE_FEATURE]: {}, [CLAUDE_CODE_FEATURE]: {} }
+			: isTerminal
+				? { [claudeFeatureKey]: {} }
+				: {})
 	};
 
 	const servedPort = isTerminal ? TTYD_PORT : CODE_SERVER_PORT;
@@ -465,6 +498,8 @@ export async function writeOverrideConfig(
 
 	await writeTmuxFeature(workspaceDir);
 
+	if (isTerminal && hadConfig) await writeClaudeFeature(workspaceDir);
+
 	await writeLocalGitExclude(workspaceDir);
 
 	return { imageSource };
@@ -554,6 +589,19 @@ async function writeTmuxFeature(workspaceDir: string): Promise<void> {
 	await chmod(installPath, 0o755);
 }
 
+async function writeClaudeFeature(workspaceDir: string): Promise<void> {
+	const dir = join(workspaceDir, '.devcontainer', CLAUDE_FEATURE_DIR);
+	await mkdir(dir, { recursive: true }).catch(() => {});
+	await writeFile(
+		join(dir, 'devcontainer-feature.json'),
+		JSON.stringify(CLAUDE_FEATURE_METADATA, null, 2) + '\n',
+		'utf8'
+	);
+	const installPath = join(dir, 'install.sh');
+	await writeFile(installPath, CLAUDE_FEATURE_INSTALL, 'utf8');
+	await chmod(installPath, 0o755);
+}
+
 async function writeTtydFeature(workspaceDir: string): Promise<void> {
 	const dir = join(workspaceDir, '.devcontainer', TTYD_FEATURE_DIR);
 	await mkdir(dir, { recursive: true }).catch(() => {});

package/src/lib/injections.server.ts

@@ -8,6 +8,7 @@ import { gitIdentity } from '../container-injections/git-identity.ts';
 import { claudeCodeCredentials } from '../container-injections/claude-code-credentials.ts';
 import { claudeCodeCustom } from '../container-injections/claude-code-custom.ts';
 import { claudeCodeIdeExtension } from '../container-injections/claude-code-ide-extension.ts';
+import { claudeCodeInstall } from '../container-injections/claude-code-install.ts';
 import { claudeCodeUpdate } from '../container-injections/claude-code-update.ts';
 import { claudeCodeModels } from '../container-injections/claude-code-models.ts';
 import { githubCredentials } from '../container-injections/github-credentials.ts';
@@ -54,6 +55,8 @@ const BASE_INJECTIONS_HEAD: Injection[] = [
 	tmux,
 	// Terminal-mode only (filtered by resolveInjections); a download, so run it early like tmux.
 	ttyd,
+	// Terminal-mode only, and ahead of every claude-* step in the tail, which all assume a binary.
+	claudeCodeInstall,
 	gitIdentity
 ];
 

package/src/lib/instances.server.ts

@@ -524,6 +524,10 @@ export async function addForwardedPort(id: string, containerPort: number): Promi
 	if (!Number.isInteger(containerPort) || containerPort < 1 || containerPort > 65535) {
 		throw new Error('Port must be an integer between 1 and 65535');
 	}
+	// Forwards publish on PUBLISH_HOST (0.0.0.0 under HOST=0.0.0.0), so forwarding the port the
+	// instance is actually served on would republish code-server/ttyd — neither of which has auth
+	// of its own — outside the Basic-Auth-gated proxy. Scoped to the live surface on purpose: in
+	// terminal mode nothing listens on 8080, and it's far too common an app port to reserve.
 	const reserved = row.mode === 'terminal' ? TTYD_PORT : CODE_SERVER_PORT;
 	if (containerPort === reserved) {
 		throw new Error(

package/src/lib/proxy.server.ts

@@ -50,33 +50,17 @@ interface RelayState {
 	client?: WebSocket;
 	/** Frames received from the browser before the upstream socket is open. */
 	pending: Frame[];
-	/** Frames the upstream sent before the browser socket existed (connect-first path only). */
-	inbound?: Frame[];
 	/** The client's requested subprotocols, forwarded upstream — ttyd requires its `tty` one. */
 	subprotocols?: string[];
 }
 
-/** Opens the upstream socket and buffers anything it emits until the browser socket is wired up. */
-function connectUpstream(
-	url: string,
-	subprotocols: string[]
-): Promise<{ client: WebSocket; inbound: Frame[] }> {
-	return new Promise((resolve, reject) => {
-		const client = new WebSocket(url, subprotocols);
-		client.binaryType = 'arraybuffer';
-		const inbound: Frame[] = [];
-		client.onmessage = (e) => inbound.push(e.data as Frame);
-		client.onopen = () => resolve({ client, inbound });
-		client.onerror = () => reject(new Error('upstream websocket error'));
-	});
-}
-
 async function proxyHttp(event: MochiApiEvent, port: number, rest: string): Promise<Response> {
 	const headers = new Headers(event.request.headers);
 	headers.set('host', `127.0.0.1:${port}`);
 	headers.delete('accept-encoding'); // ask for an unencoded body so we can stream it verbatim
 	// code-server runs with `--auth none`, so forwarding this would only leak the app password.
-	// `cookie` is deliberately kept: the manager sets none, so every cookie here is code-server's.
+	// `cookie` is deliberately kept: the manager's only same-origin cookie is the UI theme, so
+	// anything else here belongs to the upstream and has to survive the round trip.
 	headers.delete('authorization');
 	const hasBody = event.method !== 'GET' && event.method !== 'HEAD';
 	let upstream: Response;
@@ -110,7 +94,7 @@ async function proxyHttp(event: MochiApiEvent, port: number, rest: string): Prom
 	});
 }
 
-async function proxyUpgrade(event: MochiApiEvent, port: number, rest: string): Promise<Response> {
+function proxyUpgrade(event: MochiApiEvent, port: number, rest: string): Response {
 	const requested = event.request.headers.get('sec-websocket-protocol');
 	const subprotocols = requested
 		? requested
@@ -118,32 +102,18 @@ async function proxyUpgrade(event: MochiApiEvent, port: number, rest: string): P
 				.map((s) => s.trim())
 				.filter(Boolean)
 		: undefined;
-	const upstreamWsUrl = `ws://127.0.0.1:${port}${rest}${event.url.search}`;
-
-	const state: RelayState = { upstreamWsUrl, pending: [], subprotocols };
-	let selected: string | undefined;
-
-	// When subprotocols are in play, open the upstream first so the 101 echoes the one it actually
-	// negotiated instead of guessing its first offer — a mismatch would leave the browser and
-	// upstream disagreeing on the protocol. code-server offers none and connects lazily in open().
-	if (subprotocols) {
-		try {
-			const { client, inbound } = await connectUpstream(upstreamWsUrl, subprotocols);
-			state.client = client;
-			state.inbound = inbound;
-			selected = client.protocol || undefined;
-		} catch {
-			return new Response('Upstream WebSocket unreachable', { status: 502 });
-		}
-	}
-
 	const data: MochiWsData<RelayState> = {
 		__mochiRoutePattern: PROXY_WS_PATTERN,
 		__mochiOpenedAt: performance.now(),
 		__mochiPath: event.url.pathname,
-		user: state
+		user: {
+			upstreamWsUrl: `ws://127.0.0.1:${port}${rest}${event.url.search}`,
+			pending: [],
+			subprotocols
+		}
 	};
-	const headers = selected ? { 'Sec-WebSocket-Protocol': selected } : undefined;
+	// Echo the first offered subprotocol back so the browser's handshake confirms it (ttyd offers `tty`).
+	const headers = subprotocols?.[0] ? { 'Sec-WebSocket-Protocol': subprotocols[0] } : undefined;
 	// Bun's Server is typed with a fixed WebSocketData; Mochi casts the same way for its own upgrades.
 	const ok = (
 		event.server as unknown as {
@@ -153,10 +123,7 @@ async function proxyUpgrade(event: MochiApiEvent, port: number, rest: string): P
 			) => boolean;
 		}
 	).upgrade(event.request, { data, headers });
-	if (!ok) {
-		if (state.client) safeClose(state.client, 1000, ''); // don't orphan the pre-opened upstream
-		return new Response('WebSocket upgrade failed', { status: 426 });
-	}
+	if (!ok) return new Response('WebSocket upgrade failed', { status: 426 });
 	// Bun already sent the real 101; this is ignored, but Mochi's resolve chain reads a status.
 	return new Response(null, { status: 101 });
 }
@@ -179,7 +146,7 @@ export const proxyRoutes: Record<string, MochiRouteValue> = {
 
 		// An upgrade is a GET carrying `Upgrade: websocket`, so Bun routes it here too.
 		if (event.request.headers.get('upgrade')?.toLowerCase() === 'websocket') {
-			return await proxyUpgrade(event, port, rest);
+			return proxyUpgrade(event, port, rest);
 		}
 		return proxyHttp(event, port, rest);
 	}),
@@ -189,27 +156,16 @@ export const proxyRoutes: Record<string, MochiRouteValue> = {
 		upgrade: () => false,
 		open(ws: ServerWebSocket<MochiWsData<RelayState>>) {
 			const state = ws.data.user;
-			// Pre-opened during the handshake when a subprotocol was negotiated; otherwise connect now.
-			const client =
-				state.client ??
-				(state.subprotocols
-					? new WebSocket(state.upstreamWsUrl, state.subprotocols)
-					: new WebSocket(state.upstreamWsUrl));
+			const client = state.subprotocols
+				? new WebSocket(state.upstreamWsUrl, state.subprotocols)
+				: new WebSocket(state.upstreamWsUrl);
 			client.binaryType = 'arraybuffer';
 			state.client = client;
 
-			// Drain whatever the upstream sent before this socket existed (connect-first path only).
-			if (state.inbound) {
-				for (const frame of state.inbound) {
-					try {
-						ws.send(frame as never);
-					} catch {
-						/* browser socket closed */
-					}
-				}
-				state.inbound = undefined;
-			}
-
+			client.onopen = () => {
+				for (const frame of state.pending) sendFrame(client, frame);
+				state.pending = [];
+			};
 			client.onmessage = (e) => {
 				try {
 					ws.send(e.data);
@@ -219,17 +175,6 @@ export const proxyRoutes: Record<string, MochiRouteValue> = {
 			};
 			client.onclose = (e) => safeClose(ws, e.code, e.reason);
 			client.onerror = () => safeClose(ws, 1011, 'upstream error');
-
-			// A pre-opened socket already fired `onopen`, so flush now; a lazy one flushes on open.
-			if (client.readyState === WebSocket.OPEN) {
-				for (const frame of state.pending) sendFrame(client, frame);
-				state.pending = [];
-			} else {
-				client.onopen = () => {
-					for (const frame of state.pending) sendFrame(client, frame);
-					state.pending = [];
-				};
-			}
 		},
 		message(ws: ServerWebSocket<MochiWsData<RelayState>>, message) {
 			const state = ws.data.user;