agileflow 2.83.0 → 2.84.0

package/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.84.0] - 2026-01-11
+
+### Added
+- File awareness, smart merge, and simplified auto-update
+
 ## [2.83.0] - 2026-01-10
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agileflow",
-  "version": "2.83.0",
+  "version": "2.84.0",
   "description": "AI-driven agile development system for Claude Code, Cursor, Windsurf, and more",
   "keywords": [
     "agile",

package/scripts/agileflow-configure.js

@@ -788,16 +788,14 @@ function enableFeature(feature, options = {}) {
 
   // Handle autoupdate (metadata only, no hooks needed)
   if (feature === 'autoupdate') {
-    const frequency = options.checkFrequency || 'daily';
     updateMetadata({
       updates: {
         autoUpdate: true,
-        checkFrequency: frequency,
         showChangelog: true,
       },
     });
-    success(`Auto-update enabled (check frequency: ${frequency})`);
-    info('AgileFlow will automatically update on session start');
+    success('Auto-update enabled');
+    info('AgileFlow will check for updates every session and update automatically');
     return true; // Skip settings.json write for this feature
   }
 

package/scripts/agileflow-statusline.sh

@@ -385,11 +385,11 @@ PYTHON
       SESSION_COLOR="$SESSION_GREEN"   # Light green - plenty of time
     fi
 
-    # Build compact display: "⏱2h15m" or "⏱45m"
+    # Build compact display: "~2h15m" or "~45m" (tilde indicates remaining time)
     if [ "$RH" -gt 0 ]; then
-      SESSION_DISPLAY="${SESSION_COLOR}⏱${RH}h${RM}m${RESET}"
+      SESSION_DISPLAY="${SESSION_COLOR}~${RH}h${RM}m${RESET}"
     else
-      SESSION_DISPLAY="${SESSION_COLOR}⏱${RM}m${RESET}"
+      SESSION_DISPLAY="${SESSION_COLOR}~${RM}m${RESET}"
     fi
   fi
 fi
@@ -520,6 +520,47 @@ if git rev-parse --git-dir > /dev/null 2>&1; then
   fi
 fi
 
+# ============================================================================
+# Session Info (Multi-session awareness)
+# ============================================================================
+# Show current session if in a non-main session
+SESSION_INFO=""
+SHOW_SESSION=true  # New component - default enabled
+
+# Check component setting
+if [ "$COMPONENTS" != "null" ] && [ -n "$COMPONENTS" ]; then
+  SHOW_SESSION=$(echo "$COMPONENTS" | jq -r '.session | if . == null then true else . end')
+fi
+
+if [ "$SHOW_SESSION" = "true" ]; then
+  REGISTRY_FILE=".agileflow/sessions/registry.json"
+  if [ -f "$REGISTRY_FILE" ]; then
+    # Get current working directory
+    CWD=$(pwd)
+
+    # Find session matching current directory
+    SESSION_DATA=$(jq -r --arg cwd "$CWD" '
+      .sessions | to_entries[] | select(.value.path == $cwd) |
+      {id: .key, nickname: .value.nickname, is_main: .value.is_main}
+    ' "$REGISTRY_FILE" 2>/dev/null)
+
+    if [ -n "$SESSION_DATA" ]; then
+      SESSION_NUM=$(echo "$SESSION_DATA" | jq -r '.id')
+      SESSION_NICK=$(echo "$SESSION_DATA" | jq -r '.nickname // empty')
+      IS_MAIN=$(echo "$SESSION_DATA" | jq -r '.is_main // false')
+
+      # Only show for non-main sessions
+      if [ "$IS_MAIN" != "true" ] && [ -n "$SESSION_NUM" ]; then
+        if [ -n "$SESSION_NICK" ] && [ "$SESSION_NICK" != "null" ]; then
+          SESSION_INFO="${DIM}[${RESET}${MAGENTA}S${SESSION_NUM}${RESET}${DIM}:${RESET}${SESSION_NICK}${DIM}]${RESET}"
+        else
+          SESSION_INFO="${DIM}[${RESET}${MAGENTA}S${SESSION_NUM}${RESET}${DIM}]${RESET}"
+        fi
+      fi
+    fi
+  fi
+fi
+
 # ============================================================================
 # Build Status Line
 # ============================================================================
@@ -533,6 +574,12 @@ if [ "$SHOW_AGILEFLOW" = "true" ] && [ -n "$AGILEFLOW_DISPLAY" ]; then
   OUTPUT="${AGILEFLOW_DISPLAY}"
 fi
 
+# Session info (if in a non-main session)
+if [ "$SHOW_SESSION" = "true" ] && [ -n "$SESSION_INFO" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${SESSION_INFO}"
+fi
+
 # Model with subtle styling (if enabled and available)
 if [ "$SHOW_MODEL" = "true" ] && [ -n "$MODEL_DISPLAY" ]; then
   [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"

package/scripts/agileflow-welcome.js

@@ -22,6 +22,22 @@ const { getProjectRoot } = require('../lib/paths');
 // Session manager path (relative to script location)
 const SESSION_MANAGER_PATH = path.join(__dirname, 'session-manager.js');
 
+// Story claiming module
+let storyClaiming;
+try {
+  storyClaiming = require('./lib/story-claiming.js');
+} catch (e) {
+  // Story claiming not available
+}
+
+// File tracking module
+let fileTracking;
+try {
+  fileTracking = require('./lib/file-tracking.js');
+} catch (e) {
+  // File tracking not available
+}
+
 // Update checker module
 let updateChecker;
 try {
@@ -481,14 +497,18 @@ function getChangelogEntries(version) {
 async function runAutoUpdate(rootDir) {
   try {
     console.log(`${c.skyBlue}Updating AgileFlow...${c.reset}`);
-    execSync('npx agileflow update', {
+    // Use --force to skip prompts for non-interactive auto-update
+    execSync('npx agileflow@latest update --force', {
       cwd: rootDir,
       encoding: 'utf8',
       stdio: 'inherit',
+      timeout: 120000, // 2 minute timeout
     });
+    console.log(`${c.mintGreen}Update complete!${c.reset}`);
     return true;
   } catch (e) {
-    console.log(`${c.peach}Auto-update failed. Run manually: npx agileflow update${c.reset}`);
+    console.log(`${c.peach}Auto-update failed: ${e.message}${c.reset}`);
+    console.log(`${c.dim}Run manually: npx agileflow update${c.reset}`);
     return false;
   }
 }
@@ -722,16 +742,19 @@ function formatTable(
     lines.push(fullRow(`  Run: ${c.skyBlue}npx agileflow update${c.reset}`, ''));
   }
 
-  // Show "just updated" changelog
-  if (updateInfo.justUpdated && updateInfo.changelog && updateInfo.changelog.length > 0) {
+  // Always show "What's new" section with current version changelog
+  // Get changelog entries for current version (even if not just updated)
+  const changelogEntries = updateInfo.changelog && updateInfo.changelog.length > 0
+    ? updateInfo.changelog
+    : getChangelogEntries(info.version);
+
+  if (changelogEntries && changelogEntries.length > 0) {
     lines.push(fullDivider());
-    lines.push(
-      fullRow(
-        `${c.mintGreen}✨${c.reset} What's new in ${c.softGold}v${info.version}${c.reset}:`,
-        ''
-      )
-    );
-    for (const entry of updateInfo.changelog.slice(0, 2)) {
+    const headerText = updateInfo.justUpdated
+      ? `${c.mintGreen}✨${c.reset} Just updated to ${c.softGold}v${info.version}${c.reset}:`
+      : `${c.teal}📋${c.reset} What's new in ${c.softGold}v${info.version}${c.reset}:`;
+    lines.push(fullRow(headerText, ''));
+    for (const entry of changelogEntries.slice(0, 2)) {
       lines.push(fullRow(`  ${c.teal}•${c.reset} ${truncate(entry, W - 6)}`, ''));
     }
     lines.push(fullRow(`  Run ${c.skyBlue}/agileflow:whats-new${c.reset} for full changelog`, ''));
@@ -976,6 +999,56 @@ async function main() {
       `${c.slate}   Run ${c.skyBlue}/agileflow:session:new${c.reset}${c.slate} to create isolated workspace.${c.reset}`
     );
   }
+
+  // Story claiming: cleanup stale claims and show warnings
+  if (storyClaiming) {
+    try {
+      // Clean up stale claims (dead PIDs, expired TTL)
+      const cleanupResult = storyClaiming.cleanupStaleClaims({ rootDir });
+      if (cleanupResult.ok && cleanupResult.cleaned > 0) {
+        console.log('');
+        console.log(
+          `${c.dim}Cleaned ${cleanupResult.cleaned} stale story claim(s)${c.reset}`
+        );
+      }
+
+      // Show stories claimed by other sessions
+      const othersResult = storyClaiming.getStoriesClaimedByOthers({ rootDir });
+      if (othersResult.ok && othersResult.stories && othersResult.stories.length > 0) {
+        console.log('');
+        console.log(storyClaiming.formatClaimedStories(othersResult.stories));
+        console.log('');
+        console.log(
+          `${c.slate}   These stories are locked - pick a different one to avoid conflicts.${c.reset}`
+        );
+      }
+    } catch (e) {
+      // Silently ignore story claiming errors
+    }
+  }
+
+  // File tracking: cleanup stale touches and show overlap warnings
+  if (fileTracking) {
+    try {
+      // Clean up stale file touches (dead PIDs, expired TTL)
+      const cleanupResult = fileTracking.cleanupStaleTouches({ rootDir });
+      if (cleanupResult.ok && cleanupResult.cleaned > 0) {
+        console.log('');
+        console.log(
+          `${c.dim}Cleaned ${cleanupResult.cleaned} stale file tracking session(s)${c.reset}`
+        );
+      }
+
+      // Show file overlaps with other sessions
+      const overlapsResult = fileTracking.getMyFileOverlaps({ rootDir });
+      if (overlapsResult.ok && overlapsResult.overlaps && overlapsResult.overlaps.length > 0) {
+        console.log('');
+        console.log(fileTracking.formatFileOverlaps(overlapsResult.overlaps));
+      }
+    } catch (e) {
+      // Silently ignore file tracking errors
+    }
+  }
 }
 
 main().catch(console.error);

package/scripts/check-update.js

@@ -1,20 +1,15 @@
 #!/usr/bin/env node
 
 /**
- * check-update.js - Check for AgileFlow updates with caching
+ * check-update.js - Check for AgileFlow updates
  *
- * Features:
- * - Checks npm registry for latest version
- * - Caches results to avoid excessive requests
- * - Configurable check frequency (hourly, daily, weekly)
- * - Returns structured JSON for easy parsing
+ * Simple update checker:
+ * - Always checks npm registry for latest version
+ * - Auto-updates if update is available (enabled by default)
+ * - Fast npm metadata lookup (~100-500ms)
  *
  * Usage:
- *   node check-update.js [--force] [--json]
- *
- * Options:
- *   --force  Bypass cache and check npm directly
- *   --json   Output as JSON (default is human-readable)
+ *   node check-update.js [--json]
  *
  * Environment:
  *   DEBUG_UPDATE=1  Enable debug logging
@@ -66,12 +61,9 @@ function getInstalledVersion(rootDir) {
 // Get update configuration from metadata
 function getUpdateConfig(rootDir) {
   const defaults = {
-    autoUpdate: false,
-    checkFrequency: 'daily', // hourly, daily, weekly, never
+    autoUpdate: true, // Auto-update enabled by default
     showChangelog: true,
-    lastCheck: null,
     lastSeenVersion: null,
-    latestVersion: null,
   };
 
   const metadataPath = path.join(rootDir, 'docs/00-meta/agileflow-metadata.json');
@@ -109,34 +101,6 @@ function saveUpdateConfig(rootDir, config) {
   return true;
 }
 
-// Check if cache is still valid
-function isCacheValid(config) {
-  if (!config.lastCheck) return false;
-
-  const now = Date.now();
-  const lastCheck = new Date(config.lastCheck).getTime();
-  const age = now - lastCheck;
-
-  // Convert frequency to milliseconds
-  const frequencies = {
-    hourly: 60 * 60 * 1000, // 1 hour
-    daily: 24 * 60 * 60 * 1000, // 24 hours
-    weekly: 7 * 24 * 60 * 60 * 1000, // 7 days
-    never: Infinity,
-  };
-
-  const maxAge = frequencies[config.checkFrequency] || frequencies.daily;
-
-  debugLog('Cache check', {
-    lastCheck: config.lastCheck,
-    ageMs: age,
-    maxAgeMs: maxAge,
-    valid: age < maxAge,
-  });
-
-  return age < maxAge;
-}
-
 // Fetch latest version from npm
 async function fetchLatestVersion() {
   return new Promise(resolve => {
@@ -205,8 +169,8 @@ function compareVersions(a, b) {
   return 0;
 }
 
-// Main check function
-async function checkForUpdates(options = {}) {
+// Main check function - always checks npm
+async function checkForUpdates() {
   const rootDir = getProjectRoot();
   const installedVersion = getInstalledVersion(rootDir);
   const config = getUpdateConfig(rootDir);
@@ -218,7 +182,6 @@ async function checkForUpdates(options = {}) {
     autoUpdate: config.autoUpdate,
     justUpdated: false,
     previousVersion: config.lastSeenVersion,
-    fromCache: false,
     error: null,
   };
 
@@ -234,21 +197,8 @@ async function checkForUpdates(options = {}) {
     result.previousVersion = config.lastSeenVersion;
   }
 
-  // Use cache if valid and not forced
-  if (!options.force && isCacheValid(config) && config.latestVersion) {
-    result.latest = config.latestVersion;
-    result.fromCache = true;
-  } else if (config.checkFrequency !== 'never') {
-    // Fetch from npm
-    result.latest = await fetchLatestVersion();
-
-    // Update cache
-    if (result.latest) {
-      config.lastCheck = new Date().toISOString();
-      config.latestVersion = result.latest;
-      saveUpdateConfig(rootDir, config);
-    }
-  }
+  // Always fetch from npm
+  result.latest = await fetchLatestVersion();
 
   // Compare versions
   if (result.latest && compareVersions(installedVersion, result.latest) < 0) {
@@ -269,7 +219,6 @@ function markVersionSeen(version) {
 // CLI interface
 async function main() {
   const args = process.argv.slice(2);
-  const force = args.includes('--force');
   const jsonOutput = args.includes('--json');
   const markSeen = args.includes('--mark-seen');
 
@@ -286,7 +235,7 @@ async function main() {
     return;
   }
 
-  const result = await checkForUpdates({ force });
+  const result = await checkForUpdates();
 
   if (jsonOutput) {
     console.log(JSON.stringify(result, null, 2));