totopo 3.5.0 → 3.5.1-rc-2

package/README.md

@@ -194,10 +194,10 @@ totopo keeps all three CLIs on their latest published versions, checking for upd
 For convenience, every Claude session opens with a status line at the bottom of the terminal:
 
 ```
-Opus 4.7 high · 174k / 1M (17%) · ▓░░░░░░░░░ (13% used, resets in 3 hr 35 min)
+174k / 1M (17%) · Opus 4.7 high · Claude Code v2.1.132 · ▓░░░░░░░░░ (12% used, resets in 3 hr 35 min)
 ```
 
-Model and reasoning effort, current context usage with token count colored by absolute size (green below 100k, yellow up to 500k, red beyond), and a 10-block gauge of the 5-hour rate-limit window with current usage and time-to-reset (subscriber accounts only). Ask Claude `/totopo-statusline` to customize or restore the default.
+Four segments: current context usage (count / window / percentage), model and reasoning effort, the installed Claude Code CLI version with a freshness hint that escalates as the install ages, and a 10-block gauge of the 5-hour rate-limit window with current usage and time-to-reset (subscriber accounts only). The line stays on a calm grey baseline and only escalates to yellow or red when something genuinely warrants attention. Ask Claude `/totopo-statusline` to customize or restore the default.
 
 ### Persistent Agent Memory
 

package/dist/commands/dev.js

@@ -11,6 +11,7 @@ import { buildAgentContextDocs, buildAgentMountArgs, injectAgentContext } from "
 import { CONTAINER_STARTUP, CONTAINER_WORKSPACE, GIT_MODE, LABEL_GIT_MODE, LABEL_MANAGED, LABEL_PROFILE, LABEL_RUNTIME_ENV, LABEL_SHADOWS, PROFILE, RUNTIME_ENV, } from "../lib/constants.js";
 import { buildDockerfile, buildImageWithTempfile } from "../lib/dockerfile-builder.js";
 import { isImageStale } from "../lib/migrate-to-latest.js";
+import { buildPnpmStoreMountArgs } from "../lib/pnpm-store.js";
 import { buildShadowMountArgs, ensureShadowsInSync, expandShadowPatterns } from "../lib/shadows.js";
 import { readTotopoYaml } from "../lib/totopo-yaml.js";
 import { readActiveProfile, readGitMode, writeActiveProfile } from "../lib/workspace-identity.js";
@@ -122,8 +123,9 @@ export function startContainer(opts) {
     }
     // --- Build mount args ----------------------------------------------------------------------------------------------------------------
     const agentMounts = buildAgentMountArgs(cacheDir);
+    const pnpmStoreMounts = buildPnpmStoreMountArgs(cacheDir);
     // Shadow mounts must come AFTER the workspace mount to overlay correctly
-    const mountArgs = ["-v", `${workspaceRoot}:${CONTAINER_WORKSPACE}`, ...shadowMountArgs, ...agentMounts];
+    const mountArgs = ["-v", `${workspaceRoot}:${CONTAINER_WORKSPACE}`, ...shadowMountArgs, ...agentMounts, ...pnpmStoreMounts];
     // --- Container labels ----------------------------------------------------------------------------------------------------------------
     const labelArgs = [
         "--label",

package/dist/lib/constants.js

@@ -13,6 +13,7 @@ export const PROJECTS_DIR = "projects"; // legacy v3-rc-1/rc-2; only referenced
 // Workspace cache subdirectories (under ~/.totopo/workspaces/<id>/)
 export const AGENTS_DIR = "agents";
 export const SHADOWS_DIR = "shadows";
+export const PNPM_STORE_DIR = "pnpm-store";
 // Filenames
 export const TOTOPO_YAML = "totopo.yaml";
 export const LOCK_FILE = ".lock";

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

@@ -533,6 +533,11 @@ export function isImageStale(containerName) {
     });
     if (constantsCheck.status !== 0)
         return true;
+    // v3.5.1: explicit pnpm store-dir baked into ~/.npmrc to prevent pnpm's volume-check
+    // relocation, which would otherwise create .pnpm-store at the repo root.
+    const npmrcCheck = spawnSync("docker", ["exec", containerName, "grep", "-q", "^store-dir=", "/home/devuser/.npmrc"], { stdio: "pipe" });
+    if (npmrcCheck.status !== 0)
+        return true;
     // SHA-256 of the host claude-statusline.sh vs the file inside the container - any refinement to
     // the shipped script triggers an automatic rebuild prompt on next session.
     const hostScriptPath = join(PACKAGE_ROOT, "templates", "claude-statusline.sh");

package/dist/lib/pnpm-store.js

@@ -0,0 +1,20 @@
+// =========================================================================================================================================
+// src/lib/pnpm-store.ts - Per-workspace pnpm global store mount
+// pnpm hardlinks from its global store into node_modules. Hardlinks cannot cross filesystems, so when the global store sits on the
+// container overlay FS while /workspace is a host bind mount, pnpm falls back to creating a per-project .pnpm-store inside the project -
+// which then ends up on the host repo. Mounting a host-side cache dir onto pnpm's default global store path puts the store on the same
+// device as the workspace and node_modules shadow, eliminating the fallback.
+// =========================================================================================================================================
+import { mkdirSync } from "node:fs";
+import { join } from "node:path";
+import { CONTAINER_HOME, PNPM_STORE_DIR } from "./constants.js";
+const CONTAINER_PNPM_STORE = `${CONTAINER_HOME}/.local/share/pnpm/store`;
+/**
+ * Lazily creates the host-side pnpm store directory under the workspace cache dir
+ * and returns -v args mounting it onto pnpm's default global store path in the container.
+ */
+export function buildPnpmStoreMountArgs(workspaceCacheDir) {
+    const hostStore = join(workspaceCacheDir, PNPM_STORE_DIR);
+    mkdirSync(hostStore, { recursive: true });
+    return ["-v", `${hostStore}:${CONTAINER_PNPM_STORE}`];
+}

package/package.json

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

package/templates/Dockerfile

@@ -85,8 +85,9 @@ RUN npm install -g \
 # ---------------------------------------------------------------------------
 RUN groupadd --gid 1001 devuser && \
     useradd --uid 1001 --gid devuser --shell /bin/bash --create-home devuser && \
-    mkdir -p /home/devuser/.local/state /home/devuser/.local/share /home/devuser/.local/bin && \
+    mkdir -p /home/devuser/.local/state /home/devuser/.local/share /home/devuser/.local/share/pnpm /home/devuser/.local/bin && \
     date -u +"%Y-%m-%dT%H:%M:%S.000Z" > /home/devuser/.ai-cli-updated && \
+    printf 'store-dir=/home/devuser/.local/share/pnpm/store\npackage-import-method=copy\n' > /home/devuser/.npmrc && \
     chown -R devuser:devuser /home/devuser
 
 # ---------------------------------------------------------------------------

package/templates/claude-statusline.sh

@@ -4,11 +4,15 @@
 # Baked into the container image at /usr/local/share/totopo/claude-statusline.sh
 # Referenced from ~/.claude/settings.json -> statusLine.command
 #
-# Render pattern:
-#   <model> <effort> · <tokens>k / <ctx> (<pct>%) · <bar> (<rate>% used, resets in <hr> hr <min> min)
+# Render pattern (4 segments separated by mid-dot):
+#   1. <tokens>k / <ctx> (<pct>%)
+#   2. <model> <effort>
+#   3. Claude Code v<version> (<age>[, hint])
+#   4. <bar> (<rate>% used, resets in <hr> hr <min> min)
 #
 # Designed to degrade gracefully: every field uses jq's // fallback, and any field that goes
 # missing in a future Claude Code release is silently skipped rather than failing the script.
+# The Claude Code segment is also skipped silently when its data sources are unavailable.
 #
 # To customize or revert, ask Claude: /totopo-statusline
 # =============================================================================
@@ -57,6 +61,7 @@ YELLOW='\033[33m'
 RED='\033[31m'
 BLUE='\033[34m'
 GREY='\033[90m'
+GREY_LIGHT='\033[38;5;245m'
 RESET='\033[0m'
 
 # Normalize tokens & pct (may arrive empty when current_usage is null).
@@ -82,7 +87,17 @@ awk_out=$(awk -v t="$used_tokens" -v r="$rate_pct" 'BEGIN {
   if (r != "") {
     if (r > 100) r = 100;
     if (r < 0) r = 0;
-    filled = int(r / 10);
+    # Rounding tiers protect the two endpoints from misleading reads:
+    #   exactly 0  -> empty bar; any non-zero usage rounds up to at least 1 block
+    #   1-9        -> 1 block (round up so a sliver never reads as empty)
+    #   10-90      -> nearest 10 (round half up via int((r+5)/10))
+    #   91-99      -> 9 blocks (round down so the bar never reads as full until truly 100)
+    #   exactly 100 -> full bar
+    if (r <= 0) filled = 0;
+    else if (r >= 100) filled = 10;
+    else if (r > 90) filled = 9;
+    else if (r < 10) filled = 1;
+    else filled = int((r + 5) / 10);
     bar = "";
     for (i = 0; i < filled; i++) bar = bar "▓";
     for (i = filled; i < 10; i++) bar = bar "░";
@@ -99,11 +114,12 @@ awk_out=$(awk -v t="$used_tokens" -v r="$rate_pct" 'BEGIN {
 $awk_out
 EOF
 
-# Bar color by rate-limit usage: <50% green, <80% yellow, >=80% red.
-bar_color="$GREEN"
+# Bar color by rate-limit usage: <50% light grey, <80% yellow, >=80% red.
+# Light grey at the calm baseline keeps the line quiet until usage actually warrants attention.
+bar_color="$GREY_LIGHT"
 if [ -n "$rate_pct" ]; then
   if [ "$rate_pct" -lt 50 ]; then
-    bar_color="$GREEN"
+    bar_color="$GREY_LIGHT"
   elif [ "$rate_pct" -lt 80 ]; then
     bar_color="$YELLOW"
   else
@@ -143,30 +159,91 @@ case "$rate_resets_at" in
     ;;
 esac
 
-# Mid-dot separator between segments.
-SEP=" ${GREY}·${RESET} "
+# Claude Code installed version + freshness of last update.
+# Version comes from the npm package metadata; the timestamp file is written at image build time
+# (Dockerfile) and at session start by startup.mjs after a successful `npm install -g ... @latest`.
+# Both paths are stable and outside the default shadow patterns.
+cc_pkg="/usr/lib/node_modules/@anthropic-ai/claude-code/package.json"
+cc_ts_file="/home/devuser/.ai-cli-updated"
+
+cc_version=""
+[ -r "$cc_pkg" ] && cc_version=$(jq -r '.version // ""' "$cc_pkg" 2>/dev/null)
+
+# Days since last successful update; clamped to >= 0 to absorb clock skew.
+# Empty string when the timestamp file is missing or unparseable -- segment then omits the parens.
+cc_age_days=""
+if [ -r "$cc_ts_file" ]; then
+  cc_iso=$(tr -d '[:space:]' < "$cc_ts_file" 2>/dev/null)
+  if [ -n "$cc_iso" ]; then
+    cc_secs=$(date -d "$cc_iso" +%s 2>/dev/null)
+    if [ -n "$cc_secs" ]; then
+      cc_now=$(date +%s)
+      cc_age_days=$(( (cc_now - cc_secs) / 86400 ))
+      [ "$cc_age_days" -lt 0 ] && cc_age_days=0
+    fi
+  fi
+fi
 
-# Model + effort
-out=""
-if [ -n "$model_display" ]; then
-  out="${BLUE}${model_display}${RESET}"
-  [ -n "$effort" ] && out="${out} ${GREY}${effort}${RESET}"
+# Build the Claude Code segment. Empty when version is unknown.
+# Age tiers (whole parens content takes the staleness color):
+#   <1d   -> no parens          (fresh: just the version)
+#   1-6d  -> "Nd ago"           grey
+#   7-29d -> "Nw ago, <hint>"   yellow
+#   >=30d -> "Nmo ago, <hint>"  red
+# Hint reads "open a new totopo session to update" -- the auto-update only runs at container start,
+# so restarting Claude inside the same container does not refresh the CLI.
+cc_seg=""
+if [ -n "$cc_version" ]; then
+  cc_seg="${GREY_LIGHT}Claude Code v${cc_version}${RESET}"
+  if [ -n "$cc_age_days" ] && [ "$cc_age_days" -ge 1 ]; then
+    if [ "$cc_age_days" -lt 7 ]; then
+      cc_age_label="${cc_age_days}d ago"
+      cc_age_color="$GREY"
+    elif [ "$cc_age_days" -lt 30 ]; then
+      cc_weeks=$((cc_age_days / 7))
+      cc_age_label="${cc_weeks}w ago, open a new totopo session to update"
+      cc_age_color="$YELLOW"
+    else
+      cc_months=$((cc_age_days / 30))
+      cc_age_label="${cc_months}mo ago, open a new totopo session to update"
+      cc_age_color="$RED"
+    fi
+    cc_seg="${cc_seg} ${cc_age_color}(${cc_age_label})${RESET}"
+  fi
 fi
 
-# <tokens> [/ <ctx>] (<pct>%)
+# Mid-dot separator between segments.
+SEP=" ${GREY}·${RESET} "
+
+# Segment 1: tokens (always rendered; used_tokens defaults to 0).
 ctx_seg="${tokens_color}${tokens_label}${RESET}"
 [ -n "$ctx_size" ] && ctx_seg="${ctx_seg} ${GREY}/ ${ctx_size}${RESET}"
 ctx_seg="${ctx_seg} ${GREY}(${used_pct}%)${RESET}"
-if [ -n "$out" ]; then
-  out="${out}${SEP}${ctx_seg}"
-else
-  out="${ctx_seg}"
+
+# Segment 2: model + effort (rendered only when model name is present; effort shares model color).
+model_seg=""
+if [ -n "$model_display" ]; then
+  model_seg="${BLUE}${model_display}${RESET}"
+  [ -n "$effort" ] && model_seg="${model_seg} ${BLUE}${effort}${RESET}"
 fi
 
-# <bar> (<rate>% used, resets in <hr> hr <min> min)  -- only when rate-limit data is present
+# Segment 3: cc_seg (computed above; may be empty).
+
+# Segment 4: rate-limit gauge (rendered only when rate-limit data is present).
+quota_seg=""
 if [ -n "$bar" ] && [ -n "$reset_label" ]; then
   quota_seg="${bar_color}${bar}${RESET} ${GREY}(${rate_pct}% used, resets in ${reset_label})${RESET}"
-  out="${out}${SEP}${quota_seg}"
 fi
 
+# Join non-empty segments with SEP, in order: tokens -> model -> claude-code -> gauge.
+out=""
+for seg in "$ctx_seg" "$model_seg" "$cc_seg" "$quota_seg"; do
+  [ -z "$seg" ] && continue
+  if [ -z "$out" ]; then
+    out="$seg"
+  else
+    out="${out}${SEP}${seg}"
+  fi
+done
+
 printf '%b\n' "$out"

package/templates/skills/totopo-statusline/SKILL.md

@@ -24,15 +24,18 @@ Tell the user which state they are in, and the exact command path if custom.
 
 ## Step 2 - Explain the totopo default render pattern
 
-Three segments separated by a mid-dot. Example:
+Four segments, left to right, separated by a mid-dot:
 
 ```
-Opus 4.7 high · 174k / 1M (17%) · ▓░░░░░░░░░ (13% used, resets in 3 hr 35 min)
+174k / 1M (17%) · Opus 4.7 high · Claude Code v2.1.132 · ▓░░░░░░░░░ (12% used, resets in 3 hr 35 min)
 ```
 
-- Model name (blue) + reasoning effort (grey, hidden if unsupported).
-- Tokens used / context window size / percentage. Token count is colored: green below 100k, yellow up to 500k, red beyond.
-- 10-block gauge of the 5-hour rate-limit window (each block = 10%; green below 50%, yellow below 80%, red at or above 80%) followed by current usage and time until reset. Whole segment is hidden for free accounts and before the first API response.
+1. **Tokens** - current context-window usage (count / window size / percentage).
+2. **Model** - name and reasoning effort.
+3. **Claude Code** - installed CLI version, with a freshness hint shown only once the install starts to age.
+4. **Rate-limit gauge** - share of the 5-hour window used and time until it resets. Hidden on free accounts and before the first API response.
+
+Most of the line stays calm; individual segments turn **yellow** or **red** when something deserves attention - typically a nudge to *clear or compact the context*, *update the harness by opening a new totopo session*, or *watch the rate-limit window*.
 
 ## Step 3 - Ask the user what they want
 
@@ -49,6 +52,14 @@ Based on the current state:
 
 ## Step 4 - Apply the chosen action
 
+### Permissions: you perform the edits
+
+Every action in this step involves editing `~/.claude/settings.json` and/or writing scripts under `~/.claude/`. **You** make those edits directly with the `Edit` and `Write` tools - do not tell the user to run the change themselves.
+
+If write access to those paths is not pre-approved, Claude Code will surface its standard permission prompt to the user. **That prompt is the expected approval flow, not a refusal signal** - go ahead and call the tool, and the user will grant permission when they see it.
+
+Do not apologise for "lacking permission" and do not redirect the work back to the user. The only correct response to a custom-status-line revert request (or any other action below) is to attempt the edit yourself.
+
 ### Install the default explicitly
 
 Edit `~/.claude/settings.json` so it contains: