codebay 0.10.0 → 0.10.1

package/.mochi/manifest.json

@@ -5,8 +5,8 @@
   "componentEntryUrls": {
     "AppShell_2rtnxn6pgp2rh": "/_mochi/client/_hydrate-AppShell_2rtnxn6pgp2rh-rx6arrv5.js",
     "InstanceView_2ma45l9bybfhl": "/_mochi/client/_hydrate-InstanceView_2ma45l9bybfhl-c9y47dat.js",
-    "SettingsView_8hmarwmf8onq": "/_mochi/client/_hydrate-SettingsView_8hmarwmf8onq-d61feq89.js",
-    "AvatarsView_257s9yq1wwr4f": "/_mochi/client/_hydrate-AvatarsView_257s9yq1wwr4f-jpjdmgpe.js"
+    "AvatarsView_257s9yq1wwr4f": "/_mochi/client/_hydrate-AvatarsView_257s9yq1wwr4f-jpjdmgpe.js",
+    "SettingsView_8hmarwmf8onq": "/_mochi/client/_hydrate-SettingsView_8hmarwmf8onq-d61feq89.js"
   },
   "cssFileUrls": {
     "$mochi/templates/DefaultError.svelte": "/_mochi/css/DefaultError-2b0daamydxgb2.css",
@@ -14,8 +14,8 @@
     "$mochi/templates/BackLink.svelte": "/_mochi/css/BackLink-2wlu0eovz9j86.css",
     "src/components/AppShell.svelte": "/_mochi/css/AppShell-36mpg5smnbmuw.css",
     "src/components/InstanceView.svelte": "/_mochi/css/InstanceView-1pd7j16bd2b16.css",
-    "src/components/SettingsView.svelte": "/_mochi/css/SettingsView-n3oy75uonzp2.css",
     "src/components/AvatarsView.svelte": "/_mochi/css/AvatarsView-2llo48w0wt0xn.css",
+    "src/components/SettingsView.svelte": "/_mochi/css/SettingsView-n3oy75uonzp2.css",
     "src/components/TerminalSplit.svelte": "/_mochi/css/TerminalSplit-2416xfuln89a3.css",
     "src/components/DashboardView.svelte": "/_mochi/css/DashboardView-1cy4xpqhja9sx.css",
     "src/components/IdeBar.svelte": "/_mochi/css/IdeBar-3bgr3m5z0lpeg.css",
@@ -28,25 +28,25 @@
     "node_modules/svelte-french-toast/dist/components/ToastBar.svelte": "/_mochi/css/ToastBar-3havgkmtofntq.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/AppBar.svelte": "/_mochi/css/AppBar-3bxinv4pabv8l.css",
+    "src/components/AvatarEditor.svelte": "/_mochi/css/AvatarEditor-2mdq8ss346drw.css",
     "src/components/Avatar.svelte": "/_mochi/css/Avatar-3pi30db6ozvf0.css",
+    "src/components/HealthBox.svelte": "/_mochi/css/HealthBox-er2her0jukwl.css",
     "src/components/Button.svelte": "/_mochi/css/Button-oharop2xz6am.css",
-    "src/components/CoinButton.svelte": "/_mochi/css/CoinButton-1rej3sh3tkjud.css",
     "src/components/ThemePicker.svelte": "/_mochi/css/ThemePicker-1ir8jyocm8mvi.css",
-    "src/components/AvatarEditor.svelte": "/_mochi/css/AvatarEditor-2mdq8ss346drw.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/InstanceCard.svelte": "/_mochi/css/InstanceCard-3vnltxnbxkvay.css",
+    "node_modules/svelte-french-toast/dist/components/ToastWrapper.svelte": "/_mochi/css/ToastWrapper-1fbnym10rm2nv.css",
     "src/components/TopBar.svelte": "/_mochi/css/TopBar-2y76zxwehrfos.css",
+    "src/components/InstanceCard.svelte": "/_mochi/css/InstanceCard-3vnltxnbxkvay.css",
+    "src/components/FolderBrowser.svelte": "/_mochi/css/FolderBrowser-2pxp9z1o7zixk.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/BranchBox.svelte": "/_mochi/css/BranchBox-1yqu1q2mgnjwz.css",
-    "src/components/PortsBox.svelte": "/_mochi/css/PortsBox-1t25b5yg7jva3.css",
     "src/components/Brand.svelte": "/_mochi/css/Brand-1bh2b800g5vrn.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/SettingsCog.svelte": "/_mochi/css/SettingsCog-jftyadvo64qo.css"
+    "src/components/InstanceFilter.svelte": "/_mochi/css/InstanceFilter-3q6x0jt0hcgpz.css"
   },
   "clientFiles": {
     "/_mochi/css/DefaultError-2b0daamydxgb2.css": "svelte-css/DefaultError-2b0daamydxgb2.css",
@@ -54,8 +54,8 @@
     "/_mochi/css/BackLink-2wlu0eovz9j86.css": "svelte-css/BackLink-2wlu0eovz9j86.css",
     "/_mochi/css/AppShell-36mpg5smnbmuw.css": "svelte-css/AppShell-36mpg5smnbmuw.css",
     "/_mochi/css/InstanceView-1pd7j16bd2b16.css": "svelte-css/InstanceView-1pd7j16bd2b16.css",
-    "/_mochi/css/SettingsView-n3oy75uonzp2.css": "svelte-css/SettingsView-n3oy75uonzp2.css",
     "/_mochi/css/AvatarsView-2llo48w0wt0xn.css": "svelte-css/AvatarsView-2llo48w0wt0xn.css",
+    "/_mochi/css/SettingsView-n3oy75uonzp2.css": "svelte-css/SettingsView-n3oy75uonzp2.css",
     "/_mochi/css/TerminalSplit-2416xfuln89a3.css": "svelte-css/TerminalSplit-2416xfuln89a3.css",
     "/_mochi/css/DashboardView-1cy4xpqhja9sx.css": "svelte-css/DashboardView-1cy4xpqhja9sx.css",
     "/_mochi/css/IdeBar-3bgr3m5z0lpeg.css": "svelte-css/IdeBar-3bgr3m5z0lpeg.css",
@@ -68,25 +68,25 @@
     "/_mochi/css/ToastBar-3havgkmtofntq.css": "svelte-css/ToastBar-3havgkmtofntq.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/AppBar-3bxinv4pabv8l.css": "svelte-css/AppBar-3bxinv4pabv8l.css",
+    "/_mochi/css/AvatarEditor-2mdq8ss346drw.css": "svelte-css/AvatarEditor-2mdq8ss346drw.css",
     "/_mochi/css/Avatar-3pi30db6ozvf0.css": "svelte-css/Avatar-3pi30db6ozvf0.css",
+    "/_mochi/css/HealthBox-er2her0jukwl.css": "svelte-css/HealthBox-er2her0jukwl.css",
     "/_mochi/css/Button-oharop2xz6am.css": "svelte-css/Button-oharop2xz6am.css",
-    "/_mochi/css/CoinButton-1rej3sh3tkjud.css": "svelte-css/CoinButton-1rej3sh3tkjud.css",
     "/_mochi/css/ThemePicker-1ir8jyocm8mvi.css": "svelte-css/ThemePicker-1ir8jyocm8mvi.css",
-    "/_mochi/css/AvatarEditor-2mdq8ss346drw.css": "svelte-css/AvatarEditor-2mdq8ss346drw.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/InstanceCard-3vnltxnbxkvay.css": "svelte-css/InstanceCard-3vnltxnbxkvay.css",
+    "/_mochi/css/ToastWrapper-1fbnym10rm2nv.css": "svelte-css/ToastWrapper-1fbnym10rm2nv.css",
     "/_mochi/css/TopBar-2y76zxwehrfos.css": "svelte-css/TopBar-2y76zxwehrfos.css",
+    "/_mochi/css/InstanceCard-3vnltxnbxkvay.css": "svelte-css/InstanceCard-3vnltxnbxkvay.css",
+    "/_mochi/css/FolderBrowser-2pxp9z1o7zixk.css": "svelte-css/FolderBrowser-2pxp9z1o7zixk.css",
     "/_mochi/css/ToastMessage-2jfwb2og2lfa8.css": "svelte-css/ToastMessage-2jfwb2og2lfa8.css",
-    "/_mochi/css/ToastWrapper-1fbnym10rm2nv.css": "svelte-css/ToastWrapper-1fbnym10rm2nv.css",
-    "/_mochi/css/BranchBox-1yqu1q2mgnjwz.css": "svelte-css/BranchBox-1yqu1q2mgnjwz.css",
-    "/_mochi/css/PortsBox-1t25b5yg7jva3.css": "svelte-css/PortsBox-1t25b5yg7jva3.css",
     "/_mochi/css/Brand-1bh2b800g5vrn.css": "svelte-css/Brand-1bh2b800g5vrn.css",
-    "/_mochi/css/InstanceFilter-3q6x0jt0hcgpz.css": "svelte-css/InstanceFilter-3q6x0jt0hcgpz.css",
-    "/_mochi/css/CredMenu-9hwgeptp7crb.css": "svelte-css/CredMenu-9hwgeptp7crb.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/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",
@@ -101,8 +101,8 @@
     "/_mochi/client/chunk-wvtkwfsh.js": "svelte-client/chunk-wvtkwfsh.js",
     "/_mochi/client/_hydrate-AppShell_2rtnxn6pgp2rh-rx6arrv5.js": "svelte-client/_hydrate-AppShell_2rtnxn6pgp2rh-rx6arrv5.js",
     "/_mochi/client/_hydrate-InstanceView_2ma45l9bybfhl-c9y47dat.js": "svelte-client/_hydrate-InstanceView_2ma45l9bybfhl-c9y47dat.js",
-    "/_mochi/client/_hydrate-SettingsView_8hmarwmf8onq-d61feq89.js": "svelte-client/_hydrate-SettingsView_8hmarwmf8onq-d61feq89.js",
     "/_mochi/client/_hydrate-AvatarsView_257s9yq1wwr4f-jpjdmgpe.js": "svelte-client/_hydrate-AvatarsView_257s9yq1wwr4f-jpjdmgpe.js",
+    "/_mochi/client/_hydrate-SettingsView_8hmarwmf8onq-d61feq89.js": "svelte-client/_hydrate-SettingsView_8hmarwmf8onq-d61feq89.js",
     "/_mochi/client/chunk-p20tkpde.js": "svelte-client/chunk-p20tkpde.js",
     "/_mochi/client/chunk-0fjx3z3r.js": "svelte-client/chunk-0fjx3z3r.js"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codebay",
-	"version": "0.10.0",
+	"version": "0.10.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/lib/devcontainer.server.ts

@@ -150,6 +150,16 @@ export const INJECTIONS_DONE_FILE = '.codebay-injections-done';
  */
 export const TERMINAL_LAUNCHED_MARKER = '.codebay-terminal-launched';
 
+/**
+ * Far above the ~107s a real injection phase measures: at 60s this expired mid-phase and released
+ * the launcher into the window where `claude-code-update`'s `npm install -g` had unlinked the
+ * binary. `provision()` writes the sentinel on its failure path too, so a dead boot never waits here.
+ */
+const INJECTIONS_WAIT_SECONDS = 600;
+
+/** Long enough to ride out an in-flight `npm install -g` of Claude Code. */
+const CLAUDE_BINARY_WAIT_SECONDS = 60;
+
 /**
  * An auto-launched `claude` that starts mid-injection reads `~/.claude.json` before the trust
  * keys land and clobbers them on its next rewrite, so hold it until the sentinel appears.
@@ -157,7 +167,20 @@ export const TERMINAL_LAUNCHED_MARKER = '.codebay-terminal-launched';
  */
 const WAIT_FOR_INJECTIONS =
 	`[ -e "$HOME/${INJECTIONS_DONE_FILE}" ] || echo "Waiting for codebay setup to finish…"; ` +
-	`i=0; until [ -e "$HOME/${INJECTIONS_DONE_FILE}" ] || [ "$i" -ge 60 ]; do sleep 1; i=$((i + 1)); done; `;
+	`i=0; until [ -e "$HOME/${INJECTIONS_DONE_FILE}" ] || [ "$i" -ge ${INJECTIONS_WAIT_SECONDS} ]; do sleep 1; i=$((i + 1)); done; ` +
+	`[ -e "$HOME/${INJECTIONS_DONE_FILE}" ] || echo "codebay: setup did not finish in time — starting anyway"; `;
+
+/**
+ * Never exec a binary that may not be there: the update injection unlinks `claude` while it
+ * reinstalls, and an IDE-mode project image is free to ship no Claude Code at all — both used to
+ * surface as a bare `command not found` under the "Waiting for codebay setup" line. The retry is
+ * skipped once the sentinel exists, since no injection can be mid-reinstall by then and a missing
+ * binary is permanent. No single quotes: this is spliced into the single-quoted tmux commands below.
+ */
+const launchClaude = (permissionMode: ClaudePermissionMode): string =>
+	`if [ ! -e "$HOME/${INJECTIONS_DONE_FILE}" ]; then i=0; until command -v claude >/dev/null 2>&1 || [ "$i" -ge ${CLAUDE_BINARY_WAIT_SECONDS} ]; do sleep 1; i=$((i + 1)); done; fi; ` +
+	`if command -v claude >/dev/null 2>&1; then claude ${claudePermissionFlags(permissionMode)}; ` +
+	`else echo "codebay: claude is not installed in this container — check the boot log, then Rebuild"; fi; `;
 
 /**
  * claude scans `~/.claude/ide/*.lock` once at startup and never retries, so it must not race
@@ -192,7 +215,7 @@ const terminalTask = (permissionMode: ClaudePermissionMode) => ({
 	type: 'shell',
 	command:
 		// `"$SHELL"` must reach tmux unexpanded; VS Code would substitute a `${…}` form first.
-		`if command -v tmux >/dev/null 2>&1; then exec tmux new-session -A -s ${TMUX_SESSION} '${WAIT_FOR_INJECTIONS}${WAIT_FOR_IDE_BRIDGE}${SOURCE_INJECTED_ENV}claude ${claudePermissionFlags(permissionMode)}; exec "$SHELL" -l'; fi; ` +
+		`if command -v tmux >/dev/null 2>&1; then exec tmux new-session -A -s ${TMUX_SESSION} '${WAIT_FOR_INJECTIONS}${WAIT_FOR_IDE_BRIDGE}${SOURCE_INJECTED_ENV}${launchClaude(permissionMode)}exec "$SHELL" -l'; fi; ` +
 		// Without tmux there's no run-once gate, and folderOpen re-fires on every workspace load.
 		'MARK="$HOME/' +
 		TERMINAL_LAUNCHED_MARKER +
@@ -200,7 +223,8 @@ const terminalTask = (permissionMode: ClaudePermissionMode) => ({
 		WAIT_FOR_INJECTIONS +
 		WAIT_FOR_IDE_BRIDGE +
 		SOURCE_INJECTED_ENV +
-		`claude ${claudePermissionFlags(permissionMode)}; exec \${env:SHELL} -l`,
+		launchClaude(permissionMode) +
+		'exec ${env:SHELL} -l',
 	presentation: { reveal: 'always', panel: 'shared', focus: true },
 	runOptions: { runOn: 'folderOpen' },
 	problemMatcher: []
@@ -273,11 +297,12 @@ const ttydLaunchScript = (permissionMode: ClaudePermissionMode): string =>
 	WAIT_FOR_INJECTIONS +
 	'\n' +
 	`if command -v tmux >/dev/null 2>&1; then\n` +
-	`  exec tmux new-session -A -s ${TMUX_SESSION} '${SOURCE_INJECTED_ENV}claude ${claudePermissionFlags(permissionMode)}; exec "$SHELL" -l'\n` +
+	`  exec tmux new-session -A -s ${TMUX_SESSION} '${SOURCE_INJECTED_ENV}${launchClaude(permissionMode)}exec "$SHELL" -l'\n` +
 	'fi\n' +
 	SOURCE_INJECTED_ENV +
 	'\n' +
-	`claude ${claudePermissionFlags(permissionMode)}\n` +
+	launchClaude(permissionMode) +
+	'\n' +
 	'exec "$SHELL" -l\n';
 
 // ttyd defaults to read-only, so --writable is required for keyboard input. Guarded by `pgrep -x`

package/src/lib/instances.server.ts

@@ -47,7 +47,7 @@ import {
 	writeOverrideConfig
 } from './devcontainer.server.ts';
 import { writeContainerFile } from './container-files.server.ts';
-import { execInContainer } from './exec.server.ts';
+import { execInContainer, type ExecTarget } from './exec.server.ts';
 import { clearAttention, getAttention } from './bridge.server.ts';
 import { proxyPathFor } from './proxy.server.ts';
 import { resolveInjectionStages } from './injections.server.ts';
@@ -97,6 +97,27 @@ interface LiveState {
 const globalForReg = globalThis as unknown as { __codebayRegistry?: Map<string, LiveState> };
 const registry: Map<string, LiveState> = (globalForReg.__codebayRegistry ??= new Map());
 
+/**
+ * The ids `provision()` is currently building. A `creating` row is only left alone while its boot
+ * is actually in flight — otherwise a server restart mid-boot would strand it there forever, since
+ * reconcile skips `creating` and `rebuildInstance` refuses to touch it.
+ */
+const globalForBoots = globalThis as unknown as { __codebayProvisioning?: Set<string> };
+const inFlight: Set<string> = (globalForBoots.__codebayProvisioning ??= new Set());
+
+/**
+ * Whether reconcile may re-derive a row's status from Docker. A live boot owns its own row until it
+ * opens the instance itself; an orphaned `creating` row (the manager restarted mid-boot) must not
+ * be left there, since nothing else would ever move it and Rebuild refuses to touch a booting row.
+ */
+export function reconcilesFromDocker(
+	row: Pick<InstanceRow, 'id' | 'status'>,
+	building: ReadonlySet<string>
+): boolean {
+	if (row.status === 'error') return false;
+	return row.status !== 'creating' || !building.has(row.id);
+}
+
 function live(id: string): LiveState {
 	let state = registry.get(id);
 	if (!state) {
@@ -333,6 +354,9 @@ function failInstance(id: string, err: unknown): void {
 }
 
 async function boot(row: InstanceRow, opts: { branch?: string } = {}): Promise<void> {
+	// Claims the row for the copy/clone phase, which runs ahead of the build; provision() re-claims
+	// it and owns the release from there.
+	inFlight.add(row.id);
 	try {
 		const sourceStart = Date.now();
 		if (isRepoUrl(row.source_path)) {
@@ -349,6 +373,7 @@ async function boot(row: InstanceRow, opts: { branch?: string } = {}): Promise<v
 		}
 		await seedDeclaredPorts(row);
 	} catch (err) {
+		inFlight.delete(row.id);
 		failInstance(row.id, err);
 		return;
 	}
@@ -396,6 +421,9 @@ async function rescueHijackedPort(row: InstanceRow): Promise<void> {
 
 /** Never re-copies the workspace, so in-container edits survive a rebuild. */
 async function provision(row: InstanceRow, opts: { noCache?: boolean } = {}): Promise<void> {
+	// Held so the `catch` can release the container-side launcher's wait on a boot that dies.
+	let containerId: string | null = null;
+	inFlight.add(row.id);
 	try {
 		// On a rebuild `devcontainer up --remove-existing-container` discards the old container's
 		// ~/.claude, so drain it first; a first boot has no container_id and skips straight past.
@@ -437,11 +465,13 @@ async function provision(row: InstanceRow, opts: { noCache?: boolean } = {}): Pr
 			);
 		}
 
+		containerId = result.containerId;
+		// The row deliberately stays `creating` until the injections below finish: `running` is what
+		// opens the IDE/terminal to the user, and a container whose setup is still landing isn't ready.
 		updateInstance(row.id, {
 			container_id: result.containerId,
 			remote_workspace_folder: result.remoteWorkspaceFolder ?? null,
 			remote_user: result.remoteUser ?? null,
-			status: 'running',
 			error: null
 		});
 
@@ -450,11 +480,6 @@ async function provision(row: InstanceRow, opts: { noCache?: boolean } = {}): Pr
 		row.container_id = result.containerId;
 		row.remote_workspace_folder = result.remoteWorkspaceFolder ?? null;
 		row.remote_user = result.remoteUser ?? null;
-		row.status = 'running';
-
-		// Start the health monitor now so the IDE mounts as soon as code-server answers,
-		// instead of after every injection plus a full reconcile/health poll cycle.
-		triggerReconcile();
 
 		const target = {
 			containerId: result.containerId,
@@ -478,22 +503,43 @@ async function provision(row: InstanceRow, opts: { noCache?: boolean } = {}): Pr
 		appendLog(row.id, `⏱ injections: ${elapsed(injectionsStart)}\n`);
 
 		// Unblocks the terminal launcher's wait; written even after ⚠s — its timeout is the fallback.
-		await writeContainerFile(target, { dir: '$HOME', name: INJECTIONS_DONE_FILE }, 'done\n').catch(
-			() => undefined
-		);
+		await writeInjectionsDone(row.id, target);
 
 		// postStartCommand ran before the injections above, and its launcher bails when the binary
 		// is missing — so a container whose build-time ttyd install failed got it too late to be
 		// started. No-ops (one accessibility probe) whenever postStart already brought the port up.
 		await relaunchSurface(row);
 
+		// Everything the instance needs is in place, so open it to the user: this is what lights up
+		// Open IDE/terminal, the proxy, and the health and log-capture monitors.
+		updateInstance(row.id, { status: 'running' });
+		row.status = 'running';
+
 		appendLog(row.id, `\n✓ Instance running — open it via the proxy at ${proxyPathFor(row.id)}\n`);
 		triggerReconcile();
 	} catch (err) {
+		// The launcher waits minutes for the sentinel, so a boot that will never write it must say so.
+		if (containerId)
+			await writeInjectionsDone(row.id, { containerId, remoteUser: row.remote_user });
 		failInstance(row.id, err);
+	} finally {
+		inFlight.delete(row.id);
 	}
 }
 
+/**
+ * `writeContainerFile` reports failure by return value rather than throwing, and a sentinel that
+ * never lands leaves the launcher waiting out its whole bound — so surface it in the boot log.
+ */
+async function writeInjectionsDone(id: string, target: ExecTarget): Promise<void> {
+	const res = await writeContainerFile(
+		target,
+		{ dir: '$HOME', name: INJECTIONS_DONE_FILE },
+		'done\n'
+	).catch((err: Error) => ({ ok: false, error: err.message }));
+	if (!res.ok) appendLog(id, `⚠ Could not mark setup complete in the container: ${res.error}\n`);
+}
+
 /** The first instance keeps the bare name; later collisions get a `#2`, `#3`, … suffix. */
 function uniqueName(desired: string, excludeId?: string): string {
 	const taken = new Set(
@@ -563,10 +609,19 @@ export async function listInstances(): Promise<Instance[]> {
 	const branches = new Map<string, string | null>();
 	await Promise.all(
 		rows.map(async (row) => {
-			if (!row.container_id || row.status === 'creating' || row.status === 'error') return;
+			if (!row.container_id || !reconcilesFromDocker(row, inFlight)) return;
 			const running = await isRunning(row.container_id);
 			const next: InstanceStatus = running ? 'running' : 'stopped';
 			if (next !== row.status) {
+				// Only reachable for a `creating` row whose boot died with the manager, and its
+				// injections will never finish — so stop the container-side launcher waiting on them.
+				if (row.status === 'creating') {
+					appendLog(row.id, `\n⚠ Setup was interrupted — Rebuild to run it again\n`);
+					void writeInjectionsDone(row.id, {
+						containerId: row.container_id,
+						remoteUser: row.remote_user
+					});
+				}
 				updateInstance(row.id, { status: next });
 				row.status = next;
 			}
@@ -672,7 +727,10 @@ export function removeForwardedPort(id: string, containerPort: number): Instance
 export function rebuildInstance(id: string, opts: { noCache?: boolean } = {}): InstanceRow {
 	const row = getInstance(id);
 	if (!row) throw new Error('Instance not found');
-	if (row.status === 'creating') return row; // a build is already in flight
+	if (inFlight.has(id)) return row; // a build is already in flight
+	// Claimed before the broadcast below, which reconciles synchronously: an unclaimed `creating`
+	// row reads as orphaned, and reconcile would flip it straight back off `creating`.
+	inFlight.add(id);
 	updateInstance(id, { status: 'creating', error: null });
 	triggerReconcile();
 	const fresh = getInstance(id)!;