@zalom/plastic 1.0.0-beta.7 → 1.0.0-beta.8

package/hooks/statusline

@@ -84,9 +84,34 @@ else
 fi
 INDEX_DIR=$(dirname "$INDEX")
 
-# --- Most-recently-accessed active intent (mirror dashboard: last savepoint ts) ---
+# --- Current-session work-unit: the live bridge wins over savepoint recency ---
+# The statusline receives the real session_id on stdin; the session's bridge
+# (plastic-{session_id}.json) is the authoritative "what THIS session is driving".
+# This beats the shared, savepoint-recency heuristic so parallel sessions on one
+# store no longer overwrite each other's line. grep/sed only - no jq, no ruby.
 WORK=""
-if [ -f "$INDEX" ]; then
+SID=$(json_str "session_id")
+if [ -n "$SID" ]; then
+  BRIDGE="${PLASTIC_TMP:-/tmp}/plastic-${SID}.json"
+  if [ -f "$BRIDGE" ]; then
+    # Bridge JSON is pretty-printed (one field per line). Scope extraction to the
+    # "intent" object so a sibling top-level "id"/"name" can never win (the intent
+    # object holds only string fields, so the first "}" closes it). grep/sed only.
+    INTENT_BLOCK=$(sed -n '/"intent"[[:space:]]*:[[:space:]]*{/,/}/p' "$BRIDGE" 2>/dev/null)
+    B_ID=$(printf '%s\n' "$INTENT_BLOCK" | grep -o '"id"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 \
+      | sed 's/.*"id"[[:space:]]*:[[:space:]]*"//;s/"$//')
+    B_NAME=$(printf '%s\n' "$INTENT_BLOCK" | grep -o '"name"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 \
+      | sed 's/.*"name"[[:space:]]*:[[:space:]]*"//;s/"$//')
+    if [ -n "$B_ID" ] && [ -n "$B_NAME" ]; then
+      EMDASH=$'\342\200\224'
+      WORK="${B_ID} ${EMDASH} ${B_NAME}"
+    fi
+  fi
+fi
+
+# --- Most-recently-accessed active intent (mirror dashboard: last savepoint ts) ---
+# Fallback only: runs when no session bridge resolved a work-unit above.
+if [ -z "$WORK" ] && [ -f "$INDEX" ]; then
   BEST_TS=""
   while IFS= read -r line; do
     [ -z "$line" ] && continue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zalom/plastic",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.8",
   "description": "Intent-driven idea development system for AI coding agents",
   "type": "module",
   "bin": {

package/scripts/lib/bridge.rb

@@ -58,11 +58,20 @@ module Bridge
   end
 
   # Resolve a bridge session: first non-empty of explicit, CLAUDE_SESSION_ID,
-  # then a derived key. Never returns nil/empty. Whitespace-only counts as empty.
+  # CLAUDE_CODE_SESSION_ID, then a derived key. Never returns nil/empty.
+  # Whitespace-only counts as empty.
+  #
+  # The CLAUDE_CODE_SESSION_ID fallback (intent 79) is additive: it only changes
+  # behavior when CLAUDE_SESSION_ID is blank but CLAUDE_CODE_SESSION_ID is set —
+  # the bg/headless case where the real session id lives in CLAUDE_CODE_SESSION_ID.
+  # Keying by the real id (instead of a derived hash) lets the statusline, which
+  # receives that same id on stdin, find the bridge by direct filename lookup.
   def self.resolve_session(explicit, intent_id:, store:)
     return explicit.to_s.strip unless blank?(explicit)
     env = ENV["CLAUDE_SESSION_ID"]
     return env.to_s.strip unless blank?(env)
+    code_env = ENV["CLAUDE_CODE_SESSION_ID"]
+    return code_env.to_s.strip unless blank?(code_env)
     derive_key(store, intent_id)
   end
 
@@ -386,7 +395,7 @@ module Bridge
   # (mid-session intent creation). Re-derives intent state, then sets build.auto.
   def self.arm_auto(session, intent_id:, intent_dir:, store:, name:)
     key = resolve_session(session, intent_id: intent_id, store: store)
-    if blank?(session) && blank?(ENV["CLAUDE_SESSION_ID"])
+    if blank?(session) && blank?(ENV["CLAUDE_SESSION_ID"]) && blank?(ENV["CLAUDE_CODE_SESSION_ID"])
       $stderr.puts "plastic: no session id available; arming auto with derived bridge key #{key}"
     end
     data = derive(key, intent_id: intent_id, intent_dir: intent_dir, store: store, name: name)