codebay 0.12.0 → 0.13.0

package/src/avatars/flower.ts

@@ -2,15 +2,14 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'flower',
-	robot: true,
 	pixels: [
-		'..#..#..',
-		'.###.##.',
-		'########',
-		'.######.',
-		'..####..',
 		'...##...',
-		'..##.##.',
+		'..#+##..',
+		'.#.##.#.',
+		'###++#+#',
+		'#+#++###',
+		'.#.##.#.',
+		'..##+#..',
 		'...##...'
 	]
 };

package/src/avatars/fox.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'fox',
-	robot: true,
 	pixels: [
-		'##....##',
-		'##....##',
-		'########',
-		'###..###',
-		'########',
-		'########',
-		'.######.',
-		'..####..'
+		'#...+...',
+		'##.++...',
+		'###++...',
+		'#####..#',
+		'##.#####',
+		'#######.',
+		'######..',
+		'#####...'
 	]
 };
 

package/src/avatars/frog.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'frog',
-	robot: true,
 	pixels: [
-		'.#....#.',
-		'###..###',
+		'........',
+		'........',
+		'.##..##.',
+		'#..##..#',
+		'#..##..#',
 		'########',
 		'########',
-		'########',
-		'########',
-		'.######.',
-		'..####..'
+		'.######.'
 	]
 };
 

package/src/avatars/key.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'key',
-	robot: true,
 	pixels: [
 		'.####...',
 		'##..##..',
 		'##..##..',
-		'##..##..',
 		'.####...',
 		'..##....',
 		'..####..',
-		'..##.##.'
+		'..##....',
+		'..####..'
 	]
 };
 

package/src/avatars/mushroom.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'mushroom',
-	robot: true,
 	pixels: [
 		'..####..',
-		'.######.',
-		'########',
-		'########',
+		'.##.###.',
+		'#.###.##',
 		'########',
 		'..####..',
 		'..####..',
-		'.######.'
+		'..####..',
+		'...##...'
 	]
 };
 

package/src/avatars/octopus.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'octopus',
-	robot: true,
 	pixels: [
-		'..####..',
+		'.#..###.',
+		'#..####.',
+		'#..#.#..',
+		'#..###..',
 		'.######.',
-		'###..###',
-		'########',
-		'########',
-		'########',
-		'.######.',
-		'#.#.#.#.'
+		'...#####',
+		'##.##.#.',
+		'.###..##'
 	]
 };
 

package/src/avatars/owl.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'owl',
-	robot: true,
 	pixels: [
+		'.#....#.',
 		'#......#',
-		'##....##',
-		'.######.',
-		'.#.##.#.',
-		'.#.##.#.',
-		'.######.',
-		'.######.',
-		'..#..#..'
+		'########',
+		'#..##..#',
+		'#..##..#',
+		'########',
+		'###..###',
+		'.###.##.'
 	]
 };
 

package/src/avatars/penguin.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'penguin',
-	robot: true,
 	pixels: [
-		'..####..',
-		'.######.',
-		'.##..##.',
-		'.#.##.#.',
-		'##...##.',
-		'##...##.',
-		'#######.',
-		'.#....#.'
+		'..++++..',
+		'.++++++.',
+		'.+.++.+.',
+		'.++..++.',
+		'++##.#++',
+		'+######+',
+		'+######+',
+		'.######.'
 	]
 };
 

package/src/avatars/planet.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'planet',
-	robot: true,
 	pixels: [
-		'...###..',
-		'..#####.',
-		'#.#####.',
-		'.#######',
-		'..#####.',
-		'..####..',
-		'.###....',
-		'........'
+		'.....+++',
+		'...###.+',
+		'..####+.',
+		'.####+#.',
+		'.###+##.',
+		'+##+###.',
+		'+.+###..',
+		'++......'
 	]
 };
 

package/src/avatars/rabbit.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'rabbit',
-	robot: true,
 	pixels: [
 		'.#....#.',
 		'.##..##.',
 		'.##..##.',
 		'..####..',
-		'.######.',
+		'.#.##.#.',
+		'########',
 		'###..###',
-		'#..##..#',
-		'.######.'
+		'.#.##.#.'
 	]
 };
 

package/src/avatars/robot.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'robot',
-	robot: true,
 	pixels: [
-		'...##...',
-		'...#....',
 		'.######.',
+		'...##...',
+		'########',
+		'########',
 		'#.####.#',
-		'#..##..#',
-		'.######.',
-		'.#####..',
-		'.######.'
+		'#.####.#',
+		'###..###',
+		'########'
 	]
 };
 

package/src/avatars/snail.ts

@@ -2,15 +2,14 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'snail',
-	robot: true,
 	pixels: [
-		'.####..#',
-		'#....#.#',
+		'........',
+		'.....#.#',
+		'.##..#.#',
 		'#.##.#.#',
-		'#.#..#.#',
-		'#....##.',
-		'#...#.#.',
-		'######.#',
+		'##.#.#.#',
+		'#..##.#.',
+		'########',
 		'.######.'
 	]
 };

package/src/avatars/star.ts

@@ -2,16 +2,15 @@ import type { AvatarArt } from './types.ts';
 
 const art: AvatarArt = {
 	name: 'star',
-	robot: true,
 	pixels: [
+		'...#....',
 		'...##...',
 		'...##...',
-		'########',
+		'..####..',
 		'.######.',
-		'.######.',
-		'.##..##.',
-		'##....##',
-		'#......#'
+		'..####..',
+		'...##...',
+		'....#...'
 	]
 };
 

package/src/components/SettingsView.svelte

@@ -42,14 +42,17 @@
 	import {
 		CLAUDE_PERMISSION_MODES,
 		CLAUDE_EFFORT_LEVELS,
+		CLAUDE_OUTPUT_STYLES,
 		type ClaudePermissionMode,
 		type ClaudeEffortLevel,
+		type ClaudeOutputStyle,
 		type InstanceMode
 	} from '../types.ts';
 	import Terminal from '@lucide/svelte/icons/terminal';
 	import LayoutTemplate from '@lucide/svelte/icons/layout-template';
 	import ShieldCheck from '@lucide/svelte/icons/shield-check';
 	import Gauge from '@lucide/svelte/icons/gauge';
+	import MessageSquare from '@lucide/svelte/icons/message-square';
 	import { installPopupBackTrap } from '../lib/popup-nav.ts';
 
 	/** Every settings form action fails with the same `{ error }` shape. */
@@ -60,6 +63,7 @@
 		defaultMode,
 		claudePermissionMode,
 		claudeEffortLevel,
+		claudeOutputStyle,
 		defaultImage,
 		builtinImage,
 		disableBuildCache,
@@ -100,6 +104,7 @@
 		defaultMode: InstanceMode;
 		claudePermissionMode: ClaudePermissionMode;
 		claudeEffortLevel: ClaudeEffortLevel;
+		claudeOutputStyle: ClaudeOutputStyle;
 		defaultImage: string;
 		builtinImage: string;
 		disableBuildCache: boolean;
@@ -292,6 +297,33 @@
 		effortFormEl?.requestSubmit();
 	}
 
+	// svelte-ignore state_referenced_locally
+	let outputStyleChoice = $state<ClaudeOutputStyle>(claudeOutputStyle);
+	let savingOutputStyle = $state(false);
+	let outputStyleError = $state<string | null>(null);
+	let outputStyleFormEl: HTMLFormElement | undefined;
+
+	const outputStyleOpts = saveOpts<{ style: ClaudeOutputStyle }>({
+		setSaving: (v) => (savingOutputStyle = v),
+		setError: (v) => (outputStyleError = v),
+		setMsg: () => {},
+		onSuccess: (data) => {
+			if (data?.style) outputStyleChoice = data.style;
+		}
+	});
+
+	const OUTPUT_STYLE_LABELS: Record<ClaudeOutputStyle, string> = {
+		default: 'Default',
+		none: 'None',
+		Concise: 'Concise'
+	};
+
+	function chooseOutputStyle(next: ClaudeOutputStyle) {
+		if (next === outputStyleChoice) return;
+		flushSync(() => (outputStyleChoice = next));
+		outputStyleFormEl?.requestSubmit();
+	}
+
 	// svelte-ignore state_referenced_locally
 	let image = $state(defaultImage);
 	let savingImage = $state(false);
@@ -973,6 +1005,48 @@
 			{/if}
 		</section>
 
+		<section class="card">
+			<form
+				class="row"
+				method="POST"
+				action="?/claudeOutputStyle"
+				bind:this={outputStyleFormEl}
+				{@attach enhance(outputStyleOpts)}
+			>
+				<div class="label">
+					<MessageSquare size={20} />
+					<div class="text">
+						<div class="name">Claude output style</div>
+						<div class="desc">
+							The output style Claude Code starts new sessions in, written to
+							<code>~/.claude/settings.json</code>. <strong>Default</strong> inherits your host
+							<code>~/.claude/settings.json</code> (including any custom styles);
+							<strong>None</strong>
+							forces it off. Applies on create and rebuild, not to already-running instances.
+						</div>
+					</div>
+				</div>
+				<input type="hidden" name="style" value={outputStyleChoice} />
+				<div class="mode-toggle" role="group" aria-label="Claude output style">
+					{#each CLAUDE_OUTPUT_STYLES as option (option)}
+						<button
+							type="button"
+							class="mode-btn"
+							class:active={outputStyleChoice === option}
+							aria-pressed={outputStyleChoice === option}
+							disabled={savingOutputStyle}
+							onclick={() => chooseOutputStyle(option)}
+						>
+							{OUTPUT_STYLE_LABELS[option]}
+						</button>
+					{/each}
+				</div>
+			</form>
+			{#if outputStyleError}
+				<div class="sub"><div class="msg error">{outputStyleError}</div></div>
+			{/if}
+		</section>
+
 		<section class="card">
 			<form
 				class="row image-row"

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

@@ -8,20 +8,25 @@ import type { Injection } from '../lib/injections.server.ts';
  * 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`.
+ * devcontainer CLI's `$_REMOTE_USER`). Claude Code 2.x's native binary — installed by npm's
+ * postinstall as much as by the standalone installer — lands under that user's `$HOME`, so both
+ * branches run as that user via `run_as`; running as root would strand the binary in `/root`.
+ * Success is judged by `claude --version` (as the user), not `command -v claude`, so a stranded
+ * binary the wrapper still resolves falls through to the standalone installer instead of passing.
  */
 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' +
+	'u="${1:-${_REMOTE_USER:-root}}"\n' +
+	// Fall back to a home the remote user owns, never root's, so `su -m` can't strand the binary in /root.
+	'h="$(getent passwd "$u" 2>/dev/null | cut -d: -f6)"; [ -n "$h" ] || { [ "$u" = root ] && h=/root || h="/home/$u"; }\n' +
+	'run_as() { if [ "$(id -un)" = "$u" ]; then HOME="$h" sh -c "$1"; else HOME="$h" su -m "$u" -c "$1"; fi; }\n' +
+	"if command -v npm >/dev/null 2>&1 && run_as 'npm install -g @anthropic-ai/claude-code@latest >/dev/null 2>&1'; then\n" +
+	'  p="$(run_as \'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' +
+	"  if run_as 'claude --version >/dev/null 2>&1'; 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' +

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

@@ -8,29 +8,63 @@ import type { Injection } from '../lib/injections.server.ts';
  * was current when the layer was first baked. This re-checks at boot and only reinstalls when
  * behind — no-op if Claude Code isn't installed (project-owned images own their tooling) or
  * npm/registry is unreachable, and it echoes `updated <old> -> <new>` so `apply()` can log it.
+ *
+ * `$1` is the container's remote user. Claude Code 2.x ships a native binary that npm's
+ * postinstall drops into the *invoking* user's HOME, so the reinstall (and the `claude --version`
+ * probes) run as that user via `run_as` — a root reinstall would strand the binary in `/root`,
+ * exactly as the standalone installer in `claude-code-install.ts` would. Success is judged by a
+ * post-install `claude --version` (as the remote user), not npm's exit code, so a stranded or
+ * half-downloaded binary surfaces as a failure instead of a false `updated`.
  */
+const RUN_AS_PRELUDE =
+	'u="${1:-root}"; ' +
+	// Fall back to a home the remote user actually owns, never root's — otherwise `su -m` below
+	// would strand the native binary in /root, the exact failure this exists to prevent.
+	'h="$(getent passwd "$u" 2>/dev/null | cut -d: -f6)"; [ -n "$h" ] || { [ "$u" = root ] && h=/root || h="/home/$u"; }; ' +
+	'run_as() { if [ "$(id -un)" = "$u" ]; then HOME="$h" sh -c "$1"; else HOME="$h" su -m "$u" -c "$1"; fi; }; ' +
+	"ver() { run_as 'claude --version 2>/dev/null' | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' | head -n1; }; ";
+
+const NPM_INSTALL_CMD = 'npm install -g @anthropic-ai/claude-code@latest >/dev/null 2>&1';
+
+/**
+ * Prefer the remote user — correct HOME and ownership on the common image whose global prefix is
+ * chowned to that user. Fall back to a root install with HOME pointed at the user's home when the
+ * user can't write a root-owned global prefix (`su` would EACCES there). Success is decided by the
+ * post-install `ver()`, so neither branch's exit status matters.
+ */
+const REINSTALL =
+	`if run_as '${NPM_INSTALL_CMD}'; then :; ` +
+	`elif [ "$(id -un)" != "$u" ]; then HOME="$h" ${NPM_INSTALL_CMD} || true; fi; `;
+
 export const UPDATE_SCRIPT =
 	'command -v claude >/dev/null 2>&1 || exit 0; ' +
 	'command -v npm >/dev/null 2>&1 || exit 0; ' +
-	"installed=$(claude --version 2>/dev/null | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' | head -n1); " +
+	RUN_AS_PRELUDE +
+	'installed="$(ver)"; ' +
 	'latest=$(npm view @anthropic-ai/claude-code version 2>/dev/null); ' +
 	'if [ -z "$latest" ]; then exit 0; fi; ' +
 	'if [ "$installed" = "$latest" ]; then echo "current $latest"; exit 0; fi; ' +
-	'npm install -g @anthropic-ai/claude-code@latest >/dev/null 2>&1 || exit 1; ' +
-	'echo "updated $installed -> $latest"';
+	REINSTALL +
+	'now="$(ver)"; ' +
+	'if [ "$now" = "$latest" ]; then echo "updated ${installed:-none} -> $now"; exit 0; fi; ' +
+	'exit 1';
 
 /**
  * Same check with the latest version supplied by the host as `$0` (exec args, never interpolated
- * into the script), skipping the in-container `npm view` registry round-trip.
+ * into the script), skipping the in-container `npm view` registry round-trip. `$1` is the remote
+ * user — see `UPDATE_SCRIPT` above for why the reinstall must run as that user.
  */
 export const PINNED_UPDATE_SCRIPT =
 	'latest="$0"; ' +
 	'command -v claude >/dev/null 2>&1 || exit 0; ' +
 	'command -v npm >/dev/null 2>&1 || exit 0; ' +
-	"installed=$(claude --version 2>/dev/null | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' | head -n1); " +
+	RUN_AS_PRELUDE +
+	'installed="$(ver)"; ' +
 	'if [ "$installed" = "$latest" ]; then echo "current $latest"; exit 0; fi; ' +
-	'npm install -g @anthropic-ai/claude-code@latest >/dev/null 2>&1 || exit 1; ' +
-	'echo "updated $installed -> $latest"';
+	REINSTALL +
+	'now="$(ver)"; ' +
+	'if [ "$now" = "$latest" ]; then echo "updated ${installed:-none} -> $now"; exit 0; fi; ' +
+	'exit 1';
 
 /** Anything looser could smuggle shell metacharacters out of a corrupted DB row into a container. */
 export const VERSION_RE = /^\d+\.\d+\.\d+$/;
@@ -84,12 +118,13 @@ export const claudeCodeUpdate: Injection = {
 	async apply(target, log) {
 		log('Checking Claude Code is up to date…\n');
 		const latest = await resolveLatestVersion();
-		// Omitting remoteUser runs as root, which the global npm reinstall needs.
+		// Runs as root (remoteUser omitted) so the script can `su -m` into the remote user for the
+		// reinstall, keeping Claude Code 2.x's native binary in that user's HOME (see UPDATE_SCRIPT).
 		const res = await execInContainer(
 			{ containerId: target.containerId },
 			latest
-				? { script: PINNED_UPDATE_SCRIPT, args: [latest], capture: true }
-				: { script: UPDATE_SCRIPT, capture: true }
+				? { script: PINNED_UPDATE_SCRIPT, args: [latest, target.remoteUser ?? ''], capture: true }
+				: { script: UPDATE_SCRIPT, args: ['claude-update', target.remoteUser ?? ''], capture: true }
 		);
 		if (!res.ok) {
 			log(`⚠ Claude Code update check failed: ${res.error} — keeping the installed version\n`);

package/src/container-injections/claude-output-style.ts

@@ -0,0 +1,84 @@
+import { readdir, readFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { getOption } from '../lib/db.server.ts';
+import { writeContainerFile } from '../lib/container-files.server.ts';
+import {
+	claudeConfigFile,
+	mergeClaudeSettings,
+	readClaudeSettings
+} from '../lib/claude-settings.server.ts';
+import { readHostClaudeSettings } from './claude-statusline.ts';
+import { normalizeOutputStyle } from '../types.ts';
+import type { ClaudeOutputStyle } from '../types.ts';
+import type { ContainerTarget, Injection } from '../lib/injections.server.ts';
+
+/** Also read by the settings-page `serverProps` to seed the UI. */
+export function getClaudeOutputStyle(): ClaudeOutputStyle {
+	return normalizeOutputStyle(getOption('claude_output_style'));
+}
+
+/** The `outputStyle` actually applied: the setting itself, the host's value when inheriting, or null. */
+export async function resolveEffectiveOutputStyle(): Promise<string | null> {
+	const setting = getClaudeOutputStyle();
+	if (setting === 'none') return null;
+	if (setting !== 'default') return setting;
+	const style = (await readHostClaudeSettings())?.outputStyle;
+	return typeof style === 'string' && style.trim() ? style.trim() : null;
+}
+
+/** The host's custom output-style definitions, so a non-built-in name resolves inside the container. */
+export async function readHostOutputStyleFiles(): Promise<{ name: string; content: string }[]> {
+	const dir = join(homedir(), '.claude', 'output-styles');
+	let names: string[];
+	try {
+		names = (await readdir(dir)).filter((n) => n.endsWith('.md'));
+	} catch {
+		return [];
+	}
+	const files = await Promise.all(
+		names.map(async (name) => {
+			try {
+				return { name, content: await readFile(join(dir, name), 'utf8') };
+			} catch {
+				return null;
+			}
+		})
+	);
+	return files.filter((f): f is { name: string; content: string } => f !== null);
+}
+
+/** Writes Claude Code's `outputStyle` default into the container, mirroring host custom-style files. */
+export const claudeOutputStyle: Injection = {
+	id: 'claude-output-style',
+	label: 'output style',
+
+	async apply(target: ContainerTarget, log) {
+		const style = await resolveEffectiveOutputStyle();
+		if (!style) {
+			log('No Claude output style to apply; skipped\n');
+			return;
+		}
+		for (const file of await readHostOutputStyleFiles()) {
+			await writeContainerFile(
+				target,
+				claudeConfigFile(`output-styles/${file.name}`, '644'),
+				file.content
+			);
+		}
+		log(`Setting Claude output style (${style})…\n`);
+		const result = await mergeClaudeSettings(target, { outputStyle: style });
+		log(
+			result.ok
+				? '✓ Claude output style configured in container\n'
+				: `⚠ Claude output style injection failed: ${result.error}\n`
+		);
+	},
+
+	async check(target) {
+		const expected = await resolveEffectiveOutputStyle();
+		const settings = await readClaudeSettings(target);
+		const actual = settings?.outputStyle;
+		return expected === null ? actual == null : actual === expected;
+	}
+};

package/src/lib/injections.server.ts

@@ -17,6 +17,7 @@ import { attentionHooks } from '../container-injections/attention-hooks.ts';
 import { claudeStatusline } from '../container-injections/claude-statusline.ts';
 import { claudeModel } from '../container-injections/claude-model.ts';
 import { claudeEffortLevel } from '../container-injections/claude-effort-level.ts';
+import { claudeOutputStyle } from '../container-injections/claude-output-style.ts';
 import { claudePermissionMode } from '../container-injections/claude-permission-mode.ts';
 import { claudeTrust } from '../container-injections/claude-trust.ts';
 import { claudeAliases } from '../container-injections/claude-aliases.ts';
@@ -78,7 +79,10 @@ function buildStages(claudeInjection: Injection): Injection[][] {
 		// claude-trust edits ~/.claude.json, which the stage-1 Claude slot also writes.
 		// custom-env-vars writes nothing (values ride containerEnv) — it only verifies + health-checks.
 		[claudeTrust, hostEnvVars, customEnvVars],
-		[claudeNoCoauthor]
+		[claudeNoCoauthor],
+		// A settings.json writer of its own: every other stage already has one, and same-stage
+		// settings.json writers race — so output style merges last, on its own.
+		[claudeOutputStyle]
 	];
 }