totopo 3.0.0-rc-8 → 3.0.0

package/dist/commands/dev.js

@@ -7,7 +7,7 @@ import { existsSync } from "node:fs";
 import { join, relative } from "node:path";
 import { cancel, isCancel, log, outro, select } from "@clack/prompts";
 import { buildAgentContextDocs, buildAgentMountArgs, injectAgentContext } from "../lib/agent-context.js";
-import { CONTAINER_POST_START, CONTAINER_WORKSPACE, LABEL_MANAGED, LABEL_PROFILE, LABEL_SHADOWS } from "../lib/constants.js";
+import { CONTAINER_POST_START, CONTAINER_WORKSPACE, LABEL_MANAGED, LABEL_PROFILE, LABEL_SHADOWS, PROFILE } from "../lib/constants.js";
 import { buildDockerfile, buildImageWithTempfile } from "../lib/dockerfile-builder.js";
 import { buildShadowMountArgs, ensureShadowsInSync, expandShadowPatterns } from "../lib/shadows.js";
 import { readTotopoYaml } from "../lib/totopo-yaml.js";
@@ -35,9 +35,9 @@ async function promptWorkdir(workspaceDir, cwd) {
 async function selectProfile(ctx, profiles) {
     const profileNames = Object.keys(profiles);
     if (profileNames.length <= 1) {
-        return profileNames[0] ?? "default";
+        return profileNames[0] ?? PROFILE.default;
     }
-    const currentProfile = readActiveProfile(ctx.workspaceId) ?? "default";
+    const currentProfile = readActiveProfile(ctx.workspaceId) ?? PROFILE.default;
     const choice = await select({
         message: "Profile:",
         options: profileNames.map((name) => {

package/dist/commands/menu.js

@@ -6,11 +6,12 @@ import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { styleText } from "node:util";
 import { box, cancel, isCancel, select } from "@clack/prompts";
+import { PROFILE } from "../lib/constants.js";
 import { readActiveProfile } from "../lib/workspace-identity.js";
 export async function run(args) {
     const { ctx, workspaceRunning } = args;
     // --- Read workspace config -----------------------------------------------------------------------------------------------------------
-    const activeProfile = readActiveProfile(ctx.workspaceId) ?? "default";
+    const activeProfile = readActiveProfile(ctx.workspaceId) ?? PROFILE.default;
     const hasGit = existsSync(join(ctx.workspaceRoot, ".git"));
     // --- Status box ----------------------------------------------------------------------------------------------------------------------
     const containerStatus = workspaceRunning ? "running" : "stopped";

package/dist/commands/workspace.js

@@ -4,6 +4,7 @@
 import { spawnSync } from "node:child_process";
 import { relative } from "node:path";
 import { cancel, confirm, isCancel, log, multiselect, note, outro, path, select, text } from "@clack/prompts";
+import { PROFILE } from "../lib/constants.js";
 import { countPatternHits } from "../lib/shadows.js";
 import { buildDefaultTotopoYaml, readTotopoYaml, writeTotopoYaml } from "../lib/totopo-yaml.js";
 import { readActiveProfile, writeActiveProfile } from "../lib/workspace-identity.js";
@@ -20,7 +21,7 @@ async function profileMenu(ctx) {
         log.info("No profiles defined in totopo.yaml.");
         return;
     }
-    const currentProfile = readActiveProfile(ctx.workspaceId) ?? "default";
+    const currentProfile = readActiveProfile(ctx.workspaceId) ?? PROFILE.default;
     note(`Active profile: ${currentProfile}`, "Profiles");
     if (profileNames.length <= 1) {
         log.info("Only one profile defined. Add more profiles in totopo.yaml to switch between them.");

package/dist/lib/constants.js

@@ -28,3 +28,9 @@ export const CONTAINER_NAME_PREFIX = "totopo-";
 export const LABEL_MANAGED = "totopo.managed";
 export const LABEL_SHADOWS = "totopo.shadows";
 export const LABEL_PROFILE = "totopo.profile";
+// Built-in profile names (must match keys in buildDefaultTotopoYaml in totopo-yaml.ts)
+export const PROFILE = {
+    default: "default",
+    slim: "slim",
+    custom: "custom",
+};

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

@@ -24,10 +24,10 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { log } from "@clack/prompts";
 import { load as loadYaml } from "js-yaml";
-import { AGENTS_DIR, CONTAINER_NAME_PREFIX, GLOBAL_ENV_FILE, LOCK_FILE, PROJECTS_DIR, SHADOWS_DIR, TOTOPO_DIR, TOTOPO_YAML, WORKSPACES_DIR, } from "./constants.js";
+import { AGENTS_DIR, LOCK_FILE, PROFILE, SHADOWS_DIR, TOTOPO_DIR, TOTOPO_YAML, WORKSPACES_DIR } from "./constants.js";
 import { safeRmSync } from "./safe-rm.js";
 import { buildDefaultTotopoYaml, readTotopoYaml, slugifyForWorkspaceId, validateWorkspaceId, writeTotopoYaml, } from "./totopo-yaml.js";
-import { findTotopoYamlDir, getWorkspacesBaseDir, initWorkspaceDir } from "./workspace-identity.js";
+import { findTotopoYamlDir, getWorkspacesBaseDir, initWorkspaceDir, LOCK_KEYS } from "./workspace-identity.js";
 function isV2ProjectDir(dirPath) {
     return existsSync(join(dirPath, "meta.json"));
 }
@@ -134,7 +134,7 @@ function migrateSingleV2Workspace(v2, existingIds) {
     }
     const newDir = join(getWorkspacesBaseDir(), workspaceId);
     initWorkspaceDir(workspaceId, v2.projectRoot);
-    const oldAgents = join(getWorkspacesBaseDir(), v2.hashId, AGENTS_DIR);
+    const oldAgents = join(getWorkspacesBaseDir(), v2.hashId, "agents");
     const newAgents = join(newDir, AGENTS_DIR);
     if (existsSync(oldAgents)) {
         try {
@@ -144,7 +144,7 @@ function migrateSingleV2Workspace(v2, existingIds) {
             log.warn(`Could not copy agent memory for "${v2.displayName}"`);
         }
     }
-    const oldShadows = join(getWorkspacesBaseDir(), v2.hashId, SHADOWS_DIR);
+    const oldShadows = join(getWorkspacesBaseDir(), v2.hashId, "shadows");
     const newShadows = join(newDir, SHADOWS_DIR);
     if (existsSync(oldShadows)) {
         try {
@@ -166,7 +166,7 @@ function migrateSingleV2Workspace(v2, existingIds) {
  * Stops running containers first because they have bind mounts into the old path.
  */
 function migrateProjectsDir() {
-    const oldDir = join(homedir(), TOTOPO_DIR, PROJECTS_DIR);
+    const oldDir = join(homedir(), ".totopo", "projects");
     const newDir = join(homedir(), TOTOPO_DIR, WORKSPACES_DIR);
     if (!existsSync(oldDir))
         return;
@@ -175,11 +175,11 @@ function migrateProjectsDir() {
         safeRmSync(oldDir, { recursive: true });
         return;
     }
-    const psResult = spawnSync("docker", ["ps", "--filter", `name=${CONTAINER_NAME_PREFIX}`, "--format", "{{.Names}}"], {
+    const psResult = spawnSync("docker", ["ps", "--filter", "name=totopo-", "--format", "{{.Names}}"], {
         encoding: "utf8",
         stdio: "pipe",
     });
-    const projectContainerNames = new Set(entries.map((e) => `${CONTAINER_NAME_PREFIX}${e}`));
+    const projectContainerNames = new Set(entries.map((e) => `totopo-${e}`));
     const running = (psResult.stdout ?? "")
         .trim()
         .split("\n")
@@ -269,7 +269,7 @@ function migrateTotopoYaml(cwd) {
  * API keys are now declared per-workspace via env_file in totopo.yaml.
  */
 function migrateGlobalEnv() {
-    const globalEnv = join(homedir(), TOTOPO_DIR, GLOBAL_ENV_FILE);
+    const globalEnv = join(homedir(), ".totopo", ".env");
     if (!existsSync(globalEnv))
         return;
     log.warn("Removed legacy ~/.totopo/.env - API keys are now declared per-workspace via env_file in totopo.yaml.\n" +
@@ -295,8 +295,30 @@ function migrateLockFileFormat() {
             const [firstLine, secondLine] = lines;
             if (!firstLine || firstLine.includes("="))
                 continue; // empty or already new format
-            const activeProfile = secondLine ?? "default";
-            writeFileSync(lockPath, `yaml=${firstLine}\nprofile=${activeProfile}\nlast-cli-update=\n`);
+            const activeProfile = secondLine ?? PROFILE.default;
+            writeFileSync(lockPath, `${LOCK_KEYS.workspaceRoot}=${firstLine}\n${LOCK_KEYS.activeProfile}=${activeProfile}\n${LOCK_KEYS.lastCliUpdate}=\n`);
+        }
+        catch {
+            // unreadable -- skip, will surface as a broken workspace elsewhere
+        }
+    }
+}
+/**
+ * v3-rc-8 and earlier: Rename the "yaml" key to "root" in .lock files.
+ * The "yaml" key name was misleading — it holds the workspace root path, not YAML content.
+ * Detects old format by presence of a line starting with "yaml=". Idempotent.
+ */
+function migrateLockKeyYamlToRoot() {
+    const baseDir = getWorkspacesBaseDir();
+    if (!existsSync(baseDir))
+        return;
+    for (const entry of readdirSync(baseDir)) {
+        const lockPath = join(baseDir, entry, LOCK_FILE);
+        try {
+            const content = readFileSync(lockPath, "utf8");
+            if (!content.includes("yaml="))
+                continue;
+            writeFileSync(lockPath, content.replace(/^yaml=/m, `${LOCK_KEYS.workspaceRoot}=`));
         }
         catch {
             // unreadable -- skip, will surface as a broken workspace elsewhere
@@ -306,13 +328,16 @@ function migrateLockFileFormat() {
 // Order matters: migrateProjectsDir must run before migrateV2Workspaces because
 // step 2 scans ~/.totopo/workspaces/ which only exists after step 1 renames projects/.
 // Steps 3 and 4 are independent of each other and of steps 1-2.
-// migrateLockFileFormat must run last so all workspace dirs are in their final location first.
+// migrateLockFileFormat and migrateLockKeyYamlToRoot must run last so all workspace
+// dirs are in their final location first. migrateLockKeyYamlToRoot runs after
+// migrateLockFileFormat so the latter always writes "root=" for freshly upgraded files.
 const MIGRATIONS = [
     { from: "v3-rc-1/rc-2", description: "Rename ~/.totopo/projects/ to ~/.totopo/workspaces/", run: migrateProjectsDir },
     { from: "v2.x", description: "Hash-based dirs to workspace_id-based dirs + totopo.yaml", run: migrateV2Workspaces },
     { from: "v3-rc-1/rc-2", description: "Rename project_id to workspace_id in totopo.yaml", run: migrateTotopoYaml },
     { from: "v2.x", description: "Remove legacy ~/.totopo/.env global key file", run: migrateGlobalEnv },
     { from: "v3-rc-6", description: "Upgrade .lock files from positional to key=value format", run: migrateLockFileFormat },
+    { from: "v3-rc-8", description: "Rename 'yaml' key to 'root' in .lock files", run: migrateLockKeyYamlToRoot },
 ];
 /** Run all migrations in order. Called early in bin/totopo.js startup. */
 export function runMigration(cwd) {

package/dist/lib/workspace-identity.js

@@ -5,11 +5,11 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { AGENTS_DIR, CONTAINER_NAME_PREFIX, LOCK_FILE, SHADOWS_DIR, TOTOPO_DIR, TOTOPO_YAML, WORKSPACES_DIR } from "./constants.js";
+import { AGENTS_DIR, CONTAINER_NAME_PREFIX, LOCK_FILE, PROFILE, SHADOWS_DIR, TOTOPO_DIR, TOTOPO_YAML, WORKSPACES_DIR, } from "./constants.js";
 import { readTotopoYaml } from "./totopo-yaml.js";
 /** Maps LockFile field names to their corresponding keys written in the .lock file. */
-const LOCK_KEYS = {
-    workspaceRoot: "yaml",
+export const LOCK_KEYS = {
+    workspaceRoot: "root",
     activeProfile: "profile",
     lastCliUpdate: "last-cli-update",
 };
@@ -53,7 +53,7 @@ function parseLockFile(workspaceId) {
             return null;
         return {
             workspaceRoot: partial.workspaceRoot,
-            activeProfile: partial.activeProfile ?? "default",
+            activeProfile: partial.activeProfile ?? PROFILE.default,
             lastCliUpdate: partial.lastCliUpdate ?? "",
         };
     }
@@ -77,7 +77,7 @@ export function writeLockFile(workspaceId, workspaceRoot) {
     const existing = parseLockFile(workspaceId);
     writeLockFileInternal(workspaceId, {
         workspaceRoot,
-        activeProfile: existing?.activeProfile ?? "default",
+        activeProfile: existing?.activeProfile ?? PROFILE.default,
         lastCliUpdate: existing?.lastCliUpdate ?? "",
     });
 }
@@ -105,7 +105,7 @@ export function writeLastCliUpdate(workspaceId, timestamp) {
 }
 // --- Workspace directory initialization --------------------------------------------------------------------------------------------------
 /** Initialize ~/.totopo/workspaces/<workspace_id>/ with lock file and subdirs. */
-export function initWorkspaceDir(workspaceId, workspaceRoot, activeProfile = "default") {
+export function initWorkspaceDir(workspaceId, workspaceRoot, activeProfile = PROFILE.default) {
     const dir = getWorkspaceDir(workspaceId);
     mkdirSync(join(dir, AGENTS_DIR), { recursive: true });
     mkdirSync(join(dir, SHADOWS_DIR), { recursive: true });

package/package.json

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