totopo 3.7.0-rc-1 → 3.7.0

package/README.md

@@ -127,27 +127,26 @@ profiles:
     description: "Base image: Node.js, git, and AI CLIs"
     dockerfile_hook: |
       # No extras — uses the totopo base image as-is (Node.js + git + AI CLIs).
-  extended:
-    description: Base image + Go, Java, Rust, and Bun
-    dockerfile_hook: |
-      # Go
-      RUN apt-get update && apt-get install -y --no-install-recommends golang-go && rm -rf /var/lib/apt/lists/*
-      # Java (headless JDK — includes javac; needed for Kotlin, Scala, Android tooling)
-      RUN apt-get update && apt-get install -y --no-install-recommends default-jdk-headless && rm -rf /var/lib/apt/lists/*
-      # Rust (system-wide install — devuser can use cargo and rustc)
-      ENV RUSTUP_HOME=/usr/local/rustup
-      ENV CARGO_HOME=/usr/local/cargo
-      ENV PATH=/usr/local/cargo/bin:$PATH
-      RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path && chmod -R a+rx /usr/local/cargo /usr/local/rustup
-      # Bun (fast JS runtime, bundler, and package manager)
-      ENV BUN_INSTALL=/usr/local/bun
-      ENV PATH=/usr/local/bun/bin:$PATH
-      RUN curl -fsSL https://bun.sh/install | bash
+
+  # Uncomment to enable additional runtimes (Go, Java, Rust, Bun):
+  # extended:
+  #   description: Base image + Go, Java, Rust, and Bun
+  #   dockerfile_hook: |
+  #     # Go
+  #     RUN apt-get update && apt-get install -y --no-install-recommends golang-go && rm -rf /var/lib/apt/lists/*
+  #     # Java (headless JDK)
+  #     RUN apt-get update && apt-get install -y --no-install-recommends default-jdk-headless && rm -rf /var/lib/apt/lists/*
+  #     # Rust (system-wide)
+  #     ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo PATH=/usr/local/cargo/bin:$PATH
+  #     RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path && chmod -R a+rx /usr/local/cargo /usr/local/rustup
+  #     # Bun
+  #     ENV BUN_INSTALL=/usr/local/bun PATH=/usr/local/bun/bin:$PATH
+  #     RUN curl -fsSL https://bun.sh/install | bash
   # Add more profiles here — or ask the agent inside the container to set one up for you.
 
 ```
 
-Two profiles are set by default. When multiple profiles are defined, totopo prompts you to pick one at session start (the choice is remembered). A profile change triggers a container rebuild on the next session.
+New workspaces ship with the `default` profile active and an `extended` profile (Go, Java, Rust, Bun) included as a commented-out template — uncomment to enable. When multiple profiles are defined, totopo prompts you to pick one at session start (the choice is remembered). A profile change triggers a container rebuild on the next session.
 
 The base image is defined in [`templates/Dockerfile`](templates/Dockerfile) — inspect it to see what's already included before adding your own layers. To force a fully fresh build (no Docker layer cache), use **Manage Workspace > Clean rebuild**.
 

package/dist/commands/dev.js

@@ -103,7 +103,10 @@ function stopAndRemoveContainer(containerName) {
 }
 // --- Run startup checks (AI CLI update + readiness validation) ---------------------------------------------------------------------------
 function runStartup(containerName, quiet) {
-    const result = spawnSync("docker", ["exec", "-u", "root", containerName, "node", CONTAINER_STARTUP], {
+    // The SPACE-to-skip prompt in startup.mjs needs raw-mode stdin (-i) and a PTY (-t).
+    // Omitted when quiet so test output stays pipe-capturable.
+    const ttyFlags = quiet ? [] : ["-i", "-t"];
+    const result = spawnSync("docker", ["exec", "-u", "root", ...ttyFlags, containerName, "node", CONTAINER_STARTUP], {
         stdio: quiet ? "pipe" : "inherit",
     });
     return result.status === 0;

package/dist/commands/onboard.js

@@ -121,7 +121,7 @@ export async function run(cwd) {
         const workspaceId = deriveUniqueWorkspaceId(inputId, workspaceRoot);
         // Build and write totopo.yaml
         yaml = buildDefaultTotopoYaml(workspaceId);
-        writeTotopoYaml(workspaceRoot, yaml);
+        writeTotopoYaml(workspaceRoot, yaml, { includeExtendedTemplate: true });
         log.success(`Created ${toTildePath(join(workspaceRoot, TOTOPO_YAML))}`);
     }
     // --- Non-git warning -----------------------------------------------------------------------------------------------------------------

package/dist/commands/workspace.js

@@ -197,7 +197,7 @@ async function resetTotopoYaml(ctx) {
     if (isCancel(confirmed) || !confirmed)
         return;
     const freshYaml = buildDefaultTotopoYaml(yaml.workspace_id);
-    writeTotopoYaml(ctx.workspaceRoot, freshYaml);
+    writeTotopoYaml(ctx.workspaceRoot, freshYaml, { includeExtendedTemplate: true });
     log.success("totopo.yaml reset to defaults.");
     await promptStopContainer(ctx);
 }

package/dist/lib/migrate-to-latest.js

@@ -119,7 +119,7 @@ function migrateSingleV2Workspace(v2, existingIds) {
         if (v2.shadowPaths.length > 0) {
             yaml.shadow_paths = [...new Set([...(yaml.shadow_paths ?? []), ...v2.shadowPaths])];
         }
-        writeTotopoYaml(v2.projectRoot, yaml);
+        writeTotopoYaml(v2.projectRoot, yaml, { includeExtendedTemplate: true });
         log.info(`Created totopo.yaml for "${v2.displayName}" (workspace_id: ${workspaceId})`);
     }
     const newDir = join(getWorkspacesBaseDir(), workspaceId);

package/dist/lib/totopo-yaml.js

@@ -89,7 +89,7 @@ const YAML_COMMENTS = {
         "# When multiple profiles exist, totopo prompts you to pick one on session start.",
 };
 /** Write totopo.yaml to a directory with schema header and inline comments. */
-export function writeTotopoYaml(dir, config) {
+export function writeTotopoYaml(dir, config, opts = {}) {
     const filePath = join(dir, TOTOPO_YAML);
     const yamlContent = dumpYaml(config, {
         lineWidth: -1,
@@ -109,11 +109,14 @@ export function writeTotopoYaml(dir, config) {
         output.push(line);
     }
     const body = output.join("\n").trimEnd();
-    writeFileSync(filePath, `${body}\n${PROFILES_FOOTER_COMMENT}\n`);
+    const extendedBlock = opts.includeExtendedTemplate ? `\n\n${EXTENDED_PROFILE_TEMPLATE_PROMPT}\n${renderExtendedAsCommented()}` : "";
+    writeFileSync(filePath, `${body}${extendedBlock}\n${PROFILES_FOOTER_COMMENT}\n`);
 }
 // --- Defaults ----------------------------------------------------------------------------------------------------------------------------
+const DEFAULT_PROFILE_DESCRIPTION = "Base image: Node.js, git, and AI CLIs";
 const DEFAULT_PROFILE_HOOK = `# No extras — uses the totopo base image as-is (Node.js + git + AI CLIs).
 `;
+const EXTENDED_PROFILE_DESCRIPTION = "Base image + Go, Java, Rust, and Bun";
 const EXTENDED_PROFILE_HOOK = `# Go
 RUN apt-get update && apt-get install -y --no-install-recommends golang-go && rm -rf /var/lib/apt/lists/*
 
@@ -133,6 +136,20 @@ RUN curl -fsSL https://bun.sh/install | bash
 `;
 // Appended after the last profile to hint at adding more
 const PROFILES_FOOTER_COMMENT = "  # Add more profiles here — or ask the agent inside the container to set one up for you.";
+const EXTENDED_PROFILE_TEMPLATE_PROMPT = "  # Uncomment to enable additional runtimes (Go, Java, Rust, Bun):";
+/**
+ * Render the `extended` profile as commented-out YAML, indented to live under `profiles:`.
+ * Generated via the same dumpYaml call as the live config so uncommenting (strip leading `# `
+ * from each line) yields YAML the parser/schema accepts without drift.
+ */
+function renderExtendedAsCommented() {
+    const dumped = dumpYaml({ extended: { description: EXTENDED_PROFILE_DESCRIPTION, dockerfile_hook: EXTENDED_PROFILE_HOOK } }, { lineWidth: -1, quotingType: '"', forceQuotes: false });
+    return dumped
+        .split("\n")
+        .map((line) => (line.length === 0 ? "" : `  # ${line}`))
+        .join("\n")
+        .trimEnd();
+}
 /** Create a default TotopoYamlConfig with sane defaults. */
 export function buildDefaultTotopoYaml(workspaceId) {
     return {
@@ -141,13 +158,9 @@ export function buildDefaultTotopoYaml(workspaceId) {
         shadow_paths: [...DEFAULT_SHADOW_PATHS],
         profiles: {
             default: {
-                description: "Base image: Node.js, git, and AI CLIs",
+                description: DEFAULT_PROFILE_DESCRIPTION,
                 dockerfile_hook: DEFAULT_PROFILE_HOOK,
             },
-            extended: {
-                description: "Base image + Go, Java, Rust, and Bun",
-                dockerfile_hook: EXTENDED_PROFILE_HOOK,
-            },
         },
     };
 }
@@ -201,7 +214,7 @@ export function repairTotopoYaml(dir) {
             return { repairedYaml: null, error: `${TOTOPO_YAML} could not be repaired: ${formatValidationErrors(validate.errors)}` };
         }
         const yaml = obj;
-        writeTotopoYaml(dir, yaml);
+        writeTotopoYaml(dir, yaml, { includeExtendedTemplate: fixes.includes("added default profiles") });
         return { repairedYaml: yaml, message: `Repaired ${TOTOPO_YAML}: ${fixes.join(", ")}` };
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "totopo",
-  "version": "3.7.0-rc-1",
+  "version": "3.7.0",
   "description": "Run AI coding agents safely in your local codebase",
   "type": "module",
   "bin": {

package/templates/startup-git-mode.mjs

@@ -45,8 +45,10 @@ function removeWrapperIfPresent() {
 }
 
 function applyAsRoot(gitMode, protocolValue, fail) {
+    // Use absolute path to bypass /usr/local/bin/git (which may already be the read-only
+    // wrapper from a prior strict-mode session and would block this legitimate setup write).
     try {
-        execSync(`git config --system protocol.allow ${protocolValue}`, { stdio: "pipe" });
+        execSync(`/usr/bin/git config --system protocol.allow ${protocolValue}`, { stdio: "pipe" });
     } catch {
         fail("git mode", `failed to set protocol.allow=${protocolValue}`);
     }