@devrouter/cli 0.0.27 → 0.0.29

package/dist/devrouter.js

@@ -46,10 +46,23 @@ function buildDevrouterSection() {
     "- `devrouter up`",
     "- `devrouter tls install` (required when repo defines tcp/postgres apps)",
     "- `devrouter app ls --repo .`",
-    "- `devrouter app run <host-app> --repo . --yes`",
-    "- `devrouter ls`"
+    "- Linked devcontainer worktree: `devrouter workspace ensure .`",
+    "- Host/docker runtime app only: `devrouter app run <host-app> --repo . --yes`",
+    "- `devrouter ls`",
+    DEVROUTER_END_SENTINEL
   ].join("\n");
 }
+function replaceDevrouterSection(content) {
+  const start = content.indexOf(DEVROUTER_SENTINEL);
+  if (start < 0) return void 0;
+  const endSentinel = content.indexOf(DEVROUTER_END_SENTINEL, start);
+  const legacyEnd = content.indexOf(LEGACY_DEVROUTER_SECTION_END, start);
+  let end = -1;
+  if (endSentinel >= 0) end = endSentinel + DEVROUTER_END_SENTINEL.length;
+  else if (legacyEnd >= 0) end = legacyEnd + LEGACY_DEVROUTER_SECTION_END.length;
+  if (end < 0) return void 0;
+  return `${content.slice(0, start)}${buildDevrouterSection()}${content.slice(end)}`;
+}
 function writeRepoFile(repoPath, relPath, content) {
   const absolutePath = (0, import_node_path.join)(repoPath, relPath);
   (0, import_node_fs.mkdirSync)((0, import_node_path.dirname)(absolutePath), { recursive: true });
@@ -61,7 +74,10 @@ function ensureAgentsMdSection(repoPath) {
   if ((0, import_node_fs.existsSync)(filePath)) {
     const content = (0, import_node_fs.readFileSync)(filePath, "utf-8");
     if (content.includes(DEVROUTER_SENTINEL)) {
-      return { path: filePath, written: false };
+      const updated = replaceDevrouterSection(content);
+      if (updated === void 0 || updated === content) return { path: filePath, written: false };
+      (0, import_node_fs.writeFileSync)(filePath, updated, "utf-8");
+      return { path: filePath, written: true };
     }
     (0, import_node_fs.writeFileSync)(filePath, `${content.trimEnd()}
 
@@ -79,13 +95,15 @@ function ensureSkillFile(repoPath) {
   const filePath = writeRepoFile(repoPath, DEVROUTER_SKILL_REL_PATH, DEVROUTER_SKILL_CONTENT);
   return { path: filePath, written: true };
 }
-var import_node_fs, import_node_path, DEVROUTER_SENTINEL, AGENTS_MD, DEVROUTER_SKILL_REL_PATH, DEVROUTER_SKILL_CONTENT;
+var import_node_fs, import_node_path, DEVROUTER_SENTINEL, DEVROUTER_END_SENTINEL, LEGACY_DEVROUTER_SECTION_END, AGENTS_MD, DEVROUTER_SKILL_REL_PATH, DEVROUTER_SKILL_CONTENT;
 var init_agents_md = __esm({
   "src/core/agents-md.ts"() {
     "use strict";
     import_node_fs = require("fs");
     import_node_path = require("path");
     DEVROUTER_SENTINEL = "<!-- devrouter -->";
+    DEVROUTER_END_SENTINEL = "<!-- /devrouter -->";
+    LEGACY_DEVROUTER_SECTION_END = "- `devrouter ls`";
     AGENTS_MD = "AGENTS.md";
     DEVROUTER_SKILL_REL_PATH = ".agents/skills/devrouter/SKILL.md";
     DEVROUTER_SKILL_CONTENT = `---
@@ -222,7 +240,7 @@ Run several worktrees of one repo in parallel without host/route collisions. A *
 - **Identity**: each linked worktree stores one authoritative identity in Git metadata. First use reuses an exact-path DevPod or derives a sanitized branch/path slug. Later flags or \`DEVROUTER_WORKSPACE\` may repeat the identity but cannot rename it. Ambiguous identities fail closed. The primary checkout remains non-namespaced.
 - **When active**: hosts auto-namespace (\`web.localhost\` \u2192 \`web.<ws>.localhost\`), \`\${WORKSPACE}\` in \`upstream\` is substituted with the token, and the docker \`router\` key is suffixed per workspace. The runtime config is computed in memory only \u2014 the committed \`.devrouter.yml\` is never rewritten.
 - **TLS**: namespaced hosts (\`web.<ws>.localhost\`) are not covered by the \`*.localhost\` wildcard; devrouter auto-extends the mkcert cert SANs for active hosts when TLS is enabled.
-- **devcontainer integration**: \`devcontainer.json\` lists the base compose file, then \`\${localEnv:DEVCONTAINER_COMPOSE_OVERLAY:docker-compose.default.yml}\`. The default overlay contains \`services: {}\`; \`.devcontainer/docker-compose.devrouter.yml\` passes \`WORKSPACE\` and \`DEVROUTER_WORKSPACE\` into the app and bind-mounts \`\${DEVROUTER_GIT_COMMON_DIR}\` to the same absolute app-container path. The app exposes \`\${WORKSPACE}-app\`; the proxy uses \`upstream: \${WORKSPACE}-app:<port>\`.
+- **devcontainer integration**: managed scaffolds list the base compose file, then \`\${localEnv:DEVCONTAINER_COMPOSE_OVERLAY:docker-compose.default.yml}\`; custom repositories may keep another default overlay. Selecting \`.devcontainer/docker-compose.devrouter.yml\` for linked worktrees must pass \`WORKSPACE\` and \`DEVROUTER_WORKSPACE\` across the combined base/overlay config and bind-mount \`\${DEVROUTER_GIT_COMMON_DIR}\` to the same absolute app-container path. The app exposes \`\${WORKSPACE}-app\`; the proxy uses \`upstream: \${WORKSPACE}-app:<port>\`.
 - **Lifecycle**: \`devrouter workspace up <branch>\` creates and starts a new worktree under the repository's ignored \`trees/<workspace>\` directory; \`devrouter workspace ensure .\` is the canonical startup/reconciliation command in an existing linked worktree; \`workspace ls\` lists identity/route state; \`workspace down\` serializes teardown with ensure. Ensure proves exact DevPod ownership, overlay/Git mounts, env, aliases, health, Git, HTTP route reachability, and unique running TCP upstream ownership before success, with one bounded recreate for stale state.
 
 ## Secret manager interop (Infisical/Doppler)
@@ -310,7 +328,7 @@ For devcontainer onboarding:
 7. In a linked worktree, start and prove the devcontainer with \`devrouter workspace ensure .\` (use \`devpod up .\` for a primary checkout)
 8. \`devrouter repo devcontainer verify --repo . --live --yes --json\`
 
-For existing host/docker runtime apps:
+For host/docker runtime apps only:
 
 1. \`devrouter setup --repo . --yes\`
 2. \`devrouter doctor --repo .\`
@@ -1769,7 +1787,7 @@ function loadRepoConfig(repoPath) {
   const config = parseConfig(parsed ?? {}, configPath);
   const requiredVersion = config.devrouter?.version;
   if (requiredVersion && !hasWarnedVersionMismatch) {
-    const cliVersion = true ? "0.0.27" : "0.0.0-dev";
+    const cliVersion = true ? "0.0.29" : "0.0.0-dev";
     if (cliVersion !== "0.0.0-dev" && compareSemver(requiredVersion, cliVersion) > 0) {
       hasWarnedVersionMismatch = true;
       process.stderr.write(
@@ -4372,7 +4390,7 @@ async function buildDoctorReport(options = {}) {
       const config = runtimeConfig.config;
       loadedConfig = config;
       loadedWorkspace = runtimeConfig.workspace;
-      const cliVersion = true ? "0.0.27" : "0.0.0-dev";
+      const cliVersion = true ? "0.0.29" : "0.0.0-dev";
       const configVersion = config.devrouter?.version;
       if (configVersion && cliVersion !== "0.0.0-dev" && compareSemver(configVersion, cliVersion) > 0) {
         addCheck(checks, {
@@ -8171,6 +8189,7 @@ async function workspaceEnsure(requestedRepoPath, options = {}) {
           await waitForContainerPreflight(repoPath, commonDir, workspace, upstreamHosts, 0);
         } catch {
           await recreateAndWait();
+          recreated = true;
         }
       }
       ensureRouterFiles();
@@ -8187,8 +8206,19 @@ async function workspaceEnsure(requestedRepoPath, options = {}) {
         }
       }
       startRouterStack();
-      replaceHostRoutesForRepo(repoPath, routeInputs(repoPath, workspace, apps));
-      await waitForHttpRoutes(apps, options.httpTimeoutMs ?? DEFAULT_READINESS_TIMEOUT_MS);
+      const routes = routeInputs(repoPath, workspace, apps);
+      replaceHostRoutesForRepo(repoPath, routes);
+      try {
+        await waitForHttpRoutes(apps, options.httpTimeoutMs ?? DEFAULT_READINESS_TIMEOUT_MS);
+      } catch (error) {
+        replaceHostRoutesForRepo(repoPath, []);
+        if (!hadExactDevpod || recreated) {
+          throw error;
+        }
+        await recreateAndWait();
+        replaceHostRoutesForRepo(repoPath, routes);
+        await waitForHttpRoutes(apps, options.httpTimeoutMs ?? DEFAULT_READINESS_TIMEOUT_MS);
+      }
       const urls = apps.map(
         (app) => app.protocol === "tcp" ? `${app.tcpProtocol}://${app.host}:${String(TCP_PROTOCOL_REGISTRY[app.tcpProtocol].port)}` : routeUrl3(app.host)
       );
@@ -8535,7 +8565,7 @@ var init_version = __esm({
 
 // src/cli.ts
 var import_commander = require("commander");
-var CLI_VERSION = true ? "0.0.27" : "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.29" : "0.0.0-dev";
 var VERSION_FLAGS = /* @__PURE__ */ new Set(["-V", "--version"]);
 function withErrorHandling(action2) {
   return async (...args) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrouter/cli",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Local dev routing CLI with shared Traefik reverse proxy",
   "author": "Roland Schlaefli",
   "homepage": "https://github.com/rschlaefli/devrouter#readme",

package/upgrade-prompts/0.0.28.md

@@ -0,0 +1,26 @@
+You are upgrading a repository that uses devrouter to version 0.0.28.
+
+Changes in this release:
+- Generated agent guidance now uses `devrouter workspace ensure .` for linked devcontainer worktrees.
+- `devrouter repo agents` refreshes its existing generated `AGENTS.md` section and preserves content outside its owned markers.
+- Host/docker `devrouter app run` guidance is explicitly separate.
+- Custom repositories may retain their existing default compose overlay. The combined base and worktree overlay must still pass both `WORKSPACE` and `DEVROUTER_WORKSPACE`.
+- No CLI flags, configuration schema, or workspace lifecycle behavior changed from 0.0.27.
+
+Task:
+1) Bump `.devrouter.yml` `devrouter.version` to `0.0.28`.
+2) Refresh discoverability artifacts with `devrouter repo agents --repo <repo>`.
+3) Preserve a repository-specific default compose overlay if it is intentional.
+4) Confirm the combined base plus `.devcontainer/docker-compose.devrouter.yml` config passes both workspace identity variables.
+
+Validation:
+- `devrouter -V --repo <repo>` shows installed and local version `0.0.28`.
+- The generated `AGENTS.md` section tells linked devcontainer worktrees to run `devrouter workspace ensure .`.
+- The generated Devrouter skill does not require `docker-compose.default.yml` for custom repositories.
+- Existing `devrouter workspace ensure .` runtime and route proof still pass from a linked worktree.
+
+Report:
+- `.devrouter.yml` version before and after
+- generated guidance paths
+- workspace ensure result
+- unresolved risks or manual follow-ups

package/upgrade-prompts/0.0.29.md

@@ -0,0 +1,12 @@
+# Upgrade to devrouter 0.0.29
+
+## What changed
+
+`workspace ensure` now uses the one-total-recreate budget for HTTP readiness failures on existing exact workspaces. Routes are removed before recovery, verified after recreation, and removed again if the retry fails. No new CLI flags, config schema, or dependencies.
+
+## Steps
+
+1. Open `.devrouter.yml` and bump `devrouter.version` from `0.0.28` to `0.0.29`.
+2. Run `devrouter -V --repo <repo>` and confirm the reported version is `0.0.29`.
+3. From an existing linked worktree, run `devrouter workspace ensure .`.
+4. Report the route results.