@scotthamilton77/sidekick 0.1.6 → 0.1.7

package/assets/sidekick/defaults/features/statusline.defaults.yaml

@@ -17,30 +17,51 @@ settings:
   #   {tokenUsageEffective}     - Current tokens + compaction buffer (e.g., "90k")
   #   {tokenPercentageActual}   - Actual usage as % of context window (e.g., "22%")
   #   {tokenPercentageEffective}- Effective usage as % of context window (e.g., "45%")
+  #   Note: After context compaction, token metrics display "⟳ compacted" or "⟳"
+  #   until fresh data arrives from the next status update.
   #   {logs}                    - Warning/error counts (e.g., "⚠0 ✗0")
   #   {cost}                    - Session cost (e.g., "$0.15")
   #   {duration}                - Session duration (e.g., "12m")
-  #   {cwd}                     - Current working directory
-  #   {branch}                  - Git branch with icon (e.g., "⎇ main")
+  #   {cwd}                     - Current working directory (home-shortened)
+  #   {branch}                  - Git branch name (raw, use prefix for icon)
+  #   {projectDirShort}         - Project directory basename (e.g., "claude-code-sidekick")
+  #   {projectDirFull}          - Project directory full path (home-shortened)
+  #   {worktreeName}            - Worktree name (empty if not in worktree)
+  #   {worktreeOrBranch}        - Worktree name if in worktree, else branch name
   #   {title}                   - Session title
   #   {summary}                 - Session summary/intent
   #   {personaName}             - Current persona name (empty if disabled or no persona)
   #
-  # Conditional prefix/suffix syntax:
+  # Token attributes:
   #   {token,prefix='...',suffix='...'}
   #   - prefix and suffix only render when the token value is non-empty
   #   - Either or both can be specified
   #   - Use backslash to escape quotes: \'
   #   - Example: {personaName,prefix='[',suffix='] | '} → "[jarvis] | " or "" (if empty)
   #
+  #   {token,maxLength=N}                    - Maximum visible character width
+  #   {token,maxLength=N,truncateStyle='...'} - Truncation strategy (default: suffix)
+  #     - 'suffix': Right-truncate with trailing ellipsis (e.g., "claude-co…")
+  #     - 'prefix': Left-truncate with leading ellipsis (e.g., "…-sidekick")
+  #     - 'path':   Path-aware truncation (e.g., "project/…/src")
+  #
+  #   {token,wrapAt=N,prefix='...',wrapPrefix='...',wrapSuffix='...'}
+  #     - wrapAt=N: Line width threshold for responsive wrapping
+  #     - wrapPrefix: Alternative prefix used when line exceeds wrapAt (default: prefix)
+  #     - wrapSuffix: Alternative suffix used when line exceeds wrapAt (default: suffix)
+  #     - Example: {title,wrapAt=80,prefix=' | ',wrapPrefix='\n'} wraps to newline if >80 cols
+  #
   # Example configurations:
   #   Simple ratio:     "{tokenUsageActual}/{contextWindow}"          → "45k/200k"
   #   Percentage only:  "{tokenPercentageActual}"                     → "22%"
   #   Bar + percent:    "{contextBar} {tokenPercentageActual}"        → "🪙 ▓▓▒|░░░ 22%"
   #   With buffer:      "{tokenUsageActual}|{tokenUsageEffective}"    → "45k|90k"
   #   Verbose:          "{contextBar} {tokenUsageActual}/{contextWindow} ({tokenPercentageEffective})"
+  #   Worktree-aware: "{worktreeOrBranch,prefix=' ∗ '}"                → " ∗ my-worktree" or " ∗ main"
+  #   Project name:   "{projectDirShort}"                               → "claude-code-sidekick"
+  #   Worktree badge: "{worktreeName,prefix=' [wt:',suffix=']'}"       → " [wt:feature-x]" or ""
   #
-  format: "{personaName,prefix='[',suffix='] | '}{model,prefix='[',suffix='] | '}{contextBar} {tokenPercentageActual} | {logs} | {cwd}{branch} | {title}\n{summary}"
+  format: "{personaName,prefix='[',suffix='] | '}{model,prefix='[',suffix='] | '}{contextBar} {tokenPercentageActual} | {logs} | {projectDirShort,maxLength=40}: {cwd,maxLength=40,truncateStyle='path'}{worktreeOrBranch,prefix=' ∗ ',maxLength=40}{title,wrapAt=120,prefix=' | ',wrapPrefix='\\n'}{summary,wrapAt=120,prefix=' | ',wrapPrefix='\\n'}"
 
   # Threshold configuration for visual warnings
   thresholds:
@@ -86,7 +107,7 @@ settings:
     colors:
       model: blue
       tokens: green
-      title: blue
+      title: cyan
       summary: magenta
       cwd: white
       duration: white

package/dist/bin.js

@@ -56904,8 +56904,7 @@ var require_gitignore = __commonJS({
       ".sidekick/.env.local",
       ".sidekick/sidekick*.pid",
       ".sidekick/sidekick*.token",
-      ".sidekick/*.local.yaml",
-      ".sidekick/features.yaml"
+      ".sidekick/*.local.yaml"
     ];
     async function installGitignoreSection(projectDir) {
       const gitignorePath = path.join(projectDir, ".gitignore");
@@ -71472,23 +71471,25 @@ var require_stage_default_user_prompt = __commonJS({
       });
       if (!(0, types_1.isDaemonContext)(context))
         return;
-      const daemonCtx = context;
       context.handlers.register({
         id: "reminders:throttle-register-ups-session-start",
         priority: 49,
         filter: { kind: "hook", hooks: ["SessionStart"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context.sessionId;
           if (!sessionId)
             return;
           const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.USER_PROMPT_SUBMIT, {
             context: { sessionId },
-            assets: daemonCtx.assets
+            assets: handlerCtx.assets
           });
           if (reminder) {
-            await (0, throttle_utils_js_1.registerThrottledReminder)(daemonCtx, sessionId, types_js_1.ReminderIds.USER_PROMPT_SUBMIT, "UserPromptSubmit", reminder);
+            await (0, throttle_utils_js_1.registerThrottledReminder)(handlerCtx, sessionId, types_js_1.ReminderIds.USER_PROMPT_SUBMIT, "UserPromptSubmit", reminder);
           }
         }
       });
@@ -71496,48 +71497,57 @@ var require_stage_default_user_prompt = __commonJS({
         id: "reminders:throttle-reset-session-start",
         priority: 48,
         filter: { kind: "hook", hooks: ["SessionStart"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context.sessionId;
           if (!sessionId)
             return;
-          await (0, throttle_utils_js_1.resetThrottleCounters)(daemonCtx, sessionId);
+          await (0, throttle_utils_js_1.resetThrottleCounters)(handlerCtx, sessionId);
         }
       });
       context.handlers.register({
         id: "reminders:throttle-reset-bulk",
         priority: 49,
         filter: { kind: "transcript", eventTypes: ["BulkProcessingComplete"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isTranscriptEvent)(event))
             return;
           if (event.metadata.isBulkProcessing)
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context?.sessionId;
           if (!sessionId)
             return;
-          await (0, throttle_utils_js_1.resetThrottleCounters)(daemonCtx, sessionId);
+          await (0, throttle_utils_js_1.resetThrottleCounters)(handlerCtx, sessionId);
         }
       });
       context.handlers.register({
         id: "reminders:throttle-restage",
         priority: 50,
         filter: { kind: "transcript", eventTypes: ["UserPrompt", "AssistantMessage"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isTranscriptEvent)(event))
             return;
           if (event.metadata.isBulkProcessing)
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context?.sessionId;
           if (!sessionId)
             return;
-          const remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
+          const remindersState = (0, state_js_1.createRemindersState)(handlerCtx.stateService);
           const result = await remindersState.reminderThrottle.read(sessionId);
           const state = { ...result.data };
           if (Object.keys(state).length === 0)
             return;
-          const featureConfig = daemonCtx.config.getFeature("reminders");
+          const featureConfig = handlerCtx.config.getFeature("reminders");
           const config = { ...types_js_1.DEFAULT_REMINDERS_SETTINGS, ...featureConfig.settings };
           const thresholds = config.reminder_thresholds ?? {};
           let changed = false;
@@ -71555,12 +71565,12 @@ var require_stage_default_user_prompt = __commonJS({
                 toolsThisTurn: metrics.toolsThisTurn,
                 toolCount: metrics.toolCount
               };
-              await (0, reminder_utils_js_1.stageReminder)(daemonCtx, typedEntry.targetHook, {
+              await (0, reminder_utils_js_1.stageReminder)(handlerCtx, typedEntry.targetHook, {
                 ...typedEntry.cachedReminder,
                 stagedAt
               });
               state[reminderId] = { ...typedEntry, messagesSinceLastStaging: 0 };
-              daemonCtx.logger.debug("Throttle: re-staged reminder", {
+              handlerCtx.logger.debug("Throttle: re-staged reminder", {
                 sessionId,
                 reminderId,
                 messageCount: newCount,
@@ -75588,7 +75598,7 @@ var require_types3 = __commonJS({
     });
     exports2.DEFAULT_STATUSLINE_CONFIG = {
       enabled: true,
-      format: "[{model}] | {contextBar} {tokenPercentageActual} | {logs} | {cwd}{branch}\n{title} | {summary}",
+      format: "{personaName,prefix='[',suffix='] | '}{model,prefix='[',suffix='] | '}{contextBar} {tokenPercentageActual} | {logs} | {cwd,maxLength=40,truncateStyle='path'}{branch,prefix=' \u2217 ',maxLength=40}{title,wrapAt=80,prefix=' | ',wrapPrefix='\\n'}\n{summary}",
       thresholds: {
         tokens: { warning: 1e5, critical: 16e4 },
         cost: { warning: 0.5, critical: 1 },
@@ -75600,7 +75610,7 @@ var require_types3 = __commonJS({
         colors: {
           model: "blue",
           tokens: "green",
-          title: "blue",
+          title: "cyan",
           summary: "magenta",
           cwd: "white",
           duration: "white"
@@ -75696,6 +75706,76 @@ var require_types3 = __commonJS({
   }
 });
 
+// ../feature-statusline/dist/ansi-utils.js
+var require_ansi_utils = __commonJS({
+  "../feature-statusline/dist/ansi-utils.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.stripAnsi = stripAnsi;
+    exports2.visibleLength = visibleLength;
+    var ANSI_REGEX = /\x1b\[[0-9;?]*[0-9A-PR-TZcf-nqry=><~]|\x1b\][^\x07]*\x07/g;
+    function stripAnsi(str) {
+      return str.replace(ANSI_REGEX, "");
+    }
+    function visibleLength(str) {
+      return stripAnsi(str).length;
+    }
+  }
+});
+
+// ../feature-statusline/dist/truncation.js
+var require_truncation = __commonJS({
+  "../feature-statusline/dist/truncation.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.truncateSuffix = truncateSuffix;
+    exports2.truncatePrefix = truncatePrefix;
+    exports2.truncatePath = truncatePath;
+    var ansi_utils_js_1 = require_ansi_utils();
+    function truncateSuffix(str, maxLength) {
+      if ((0, ansi_utils_js_1.visibleLength)(str) <= maxLength)
+        return str;
+      const plain = (0, ansi_utils_js_1.stripAnsi)(str);
+      if (maxLength <= 1)
+        return "\u2026";
+      return plain.slice(0, maxLength - 1) + "\u2026";
+    }
+    function truncatePrefix(str, maxLength) {
+      if ((0, ansi_utils_js_1.visibleLength)(str) <= maxLength)
+        return str;
+      const plain = (0, ansi_utils_js_1.stripAnsi)(str);
+      if (maxLength <= 1)
+        return "\u2026";
+      return "\u2026" + plain.slice(-(maxLength - 1));
+    }
+    function truncatePath(str, maxLength) {
+      const plain = (0, ansi_utils_js_1.stripAnsi)(str);
+      if (plain.length <= maxLength)
+        return str;
+      const parts = plain.split("/");
+      if (parts.length === 1) {
+        return truncatePrefix(plain, maxLength);
+      }
+      if (parts.length === 2) {
+        return truncatePrefix(plain, maxLength);
+      }
+      const first = parts[0];
+      const last = parts[parts.length - 1];
+      const candidate = `${first}/\u2026/${last}`;
+      if (candidate.length <= maxLength) {
+        return candidate;
+      }
+      const fixedPart = `/\u2026/${last}`;
+      const availableForFirst = maxLength - fixedPart.length;
+      if (availableForFirst <= 1) {
+        return truncatePrefix(plain, maxLength);
+      }
+      const truncatedFirst = truncatePrefix(first, availableForFirst);
+      return `${truncatedFirst}${fixedPart}`;
+    }
+  }
+});
+
 // ../feature-session-summary/dist/state.js
 var require_state4 = __commonJS({
   "../feature-session-summary/dist/state.js"(exports2) {
@@ -77352,7 +77432,6 @@ var require_formatter = __commonJS({
     exports2.formatTokens = formatTokens;
     exports2.formatCost = formatCost;
     exports2.formatDuration = formatDuration;
-    exports2.shortenPath = shortenPath;
     exports2.formatCwd = formatCwd;
     exports2.formatBranch = formatBranch;
     exports2.formatLogs = formatLogs;
@@ -77362,6 +77441,8 @@ var require_formatter = __commonJS({
     exports2.formatContextBar = formatContextBar;
     exports2.getContextBarStatus = getContextBarStatus;
     exports2.calculateContextUsage = calculateContextUsage;
+    var ansi_utils_js_1 = require_ansi_utils();
+    var truncation_js_1 = require_truncation();
     var types_js_1 = require_types3();
     var ANSI = {
       reset: "\x1B[0m",
@@ -77403,6 +77484,59 @@ var require_formatter = __commonJS({
       const colorName = name;
       return ANSI[colorName] ?? "";
     }
+    function parseTokenOptions(optionsStr) {
+      if (!optionsStr)
+        return {};
+      const options = {};
+      const stringPattern = /(\w+)='((?:[^'\\]|\\.)*)'/g;
+      let match;
+      while ((match = stringPattern.exec(optionsStr)) !== null) {
+        const key = match[1];
+        const val = match[2].replace(/\\'/g, "'").replace(/\\\\/g, "\\");
+        switch (key) {
+          case "prefix":
+            options.prefix = val;
+            break;
+          case "suffix":
+            options.suffix = val;
+            break;
+          case "truncateStyle":
+            options.truncateStyle = val;
+            break;
+          case "wrapPrefix":
+            options.wrapPrefix = val;
+            break;
+          case "wrapSuffix":
+            options.wrapSuffix = val;
+            break;
+        }
+      }
+      const numPattern = /(\w+)=(\d+)(?=[,}]|$)/g;
+      while ((match = numPattern.exec(optionsStr)) !== null) {
+        const key = match[1];
+        const val = parseInt(match[2], 10);
+        switch (key) {
+          case "maxLength":
+            options.maxLength = val;
+            break;
+          case "wrapAt":
+            options.wrapAt = val;
+            break;
+        }
+      }
+      return options;
+    }
+    function applyTruncation(value, maxLength, style) {
+      switch (style) {
+        case "prefix":
+          return (0, truncation_js_1.truncatePrefix)(value, maxLength);
+        case "path":
+          return (0, truncation_js_1.truncatePath)(value, maxLength);
+        case "suffix":
+        default:
+          return (0, truncation_js_1.truncateSuffix)(value, maxLength);
+      }
+    }
     var Formatter = class {
       theme;
       useColors;
@@ -77418,50 +77552,121 @@ var require_formatter = __commonJS({
        * (e.g., a snarky comment containing "|") are preserved.
        */
       format(template, viewModel) {
+        template = template.replace(/\\n/g, "\n");
         const branchColor = this.theme.colors.branch ?? viewModel.branchColor;
         const symbolMode = (0, types_js_1.normalizeSymbolMode)(this.theme.useNerdFonts);
         const logsText = formatLogs(viewModel.warningCount, viewModel.errorCount, symbolMode);
         const convertedSummary = this.convertMarkdown(viewModel.summary);
         const convertedTitle = this.convertMarkdown(viewModel.title);
-        const tokens = {
-          model: this.colorize(viewModel.model, this.theme.colors.model),
-          // Atomic token placeholders - each can be used independently in templates
-          contextWindow: this.colorize(viewModel.contextWindow, this.theme.colors.tokens),
-          tokenUsageActual: this.colorizeByStatus(viewModel.tokenUsageActual, viewModel.tokensStatus),
-          tokenUsageEffective: this.colorizeByStatus(viewModel.tokenUsageEffective, viewModel.tokensStatus),
-          tokenPercentageActual: this.colorizeByStatus(viewModel.tokenPercentageActual, viewModel.tokensStatus),
-          tokenPercentageEffective: this.colorizeByStatus(viewModel.tokenPercentageEffective, viewModel.tokensStatus),
-          cost: this.colorizeByStatus(viewModel.cost, viewModel.costStatus),
-          duration: this.colorize(viewModel.duration, this.theme.colors.duration),
-          cwd: this.colorize(viewModel.cwd, this.theme.colors.cwd),
-          branch: viewModel.branch ? ` ${this.colorize(viewModel.branch, branchColor)}` : "",
-          summary: this.colorize(convertedSummary, this.theme.colors.summary),
-          title: this.colorize(convertedTitle, this.theme.colors.title),
-          contextBar: formatContextBar(viewModel.contextUsage, this.useColors, symbolMode),
-          logs: this.colorizeByStatus(logsText, viewModel.logStatus),
-          // Persona name token - empty string when no persona or disabled
-          personaName: viewModel.personaName ? this.colorize(viewModel.personaName, this.theme.colors.persona ?? "cyan") : ""
+        const rawTokens = {
+          model: viewModel.model,
+          contextWindow: viewModel.contextWindow,
+          tokenUsageActual: viewModel.tokenUsageActual,
+          tokenUsageEffective: viewModel.tokenUsageEffective,
+          tokenPercentageActual: viewModel.tokenPercentageActual,
+          tokenPercentageEffective: viewModel.tokenPercentageEffective,
+          cost: viewModel.cost,
+          duration: viewModel.duration,
+          cwd: viewModel.cwd,
+          branch: viewModel.branch,
+          projectDirShort: viewModel.projectDirShort,
+          projectDirFull: viewModel.projectDirFull,
+          worktreeName: viewModel.worktreeName,
+          worktreeOrBranch: viewModel.worktreeOrBranch,
+          summary: convertedSummary,
+          title: convertedTitle,
+          logs: logsText,
+          personaName: viewModel.personaName,
+          // Pre-formatted tokens (already contain ANSI if colors enabled)
+          contextBar: formatContextBar(viewModel.contextUsage, this.useColors, symbolMode)
+        };
+        const personaColor = this.theme.colors.persona ?? "cyan";
+        const colorizeToken = (tokenName, value) => {
+          switch (tokenName) {
+            case "tokenUsageActual":
+            case "tokenUsageEffective":
+            case "tokenPercentageActual":
+            case "tokenPercentageEffective":
+              return this.colorizeByStatus(value, viewModel.tokensStatus);
+            case "cost":
+              return this.colorizeByStatus(value, viewModel.costStatus);
+            case "logs":
+              return this.colorizeByStatus(value, viewModel.logStatus);
+            case "model":
+              return this.colorize(value, this.theme.colors.model);
+            case "contextWindow":
+              return this.colorize(value, this.theme.colors.tokens);
+            case "duration":
+              return this.colorize(value, this.theme.colors.duration);
+            case "cwd":
+            case "projectDirShort":
+            case "projectDirFull":
+              return this.colorize(value, this.theme.colors.cwd);
+            case "branch":
+            case "worktreeOrBranch":
+            case "worktreeName":
+              return this.colorize(value, branchColor);
+            case "summary":
+              return this.colorize(value, this.theme.colors.summary);
+            case "title":
+              return this.colorize(value, this.theme.colors.title);
+            case "personaName":
+              return this.colorize(value, personaColor);
+            case "contextBar":
+              return value;
+            // already formatted with colors
+            default:
+              return value;
+          }
         };
         const EMPTY_MARKER = "\0EMPTY\0";
-        let result = template.replace(/\{(\w+)(?:,([^}]*))?\}/g, (_match, tokenName, optionsStr) => {
-          const value = tokens[tokenName] ?? "";
-          let prefix = "";
-          let suffix = "";
-          if (optionsStr) {
-            const prefixMatch = optionsStr.match(/prefix='((?:[^'\\]|\\.)*)'/);
-            if (prefixMatch) {
-              prefix = prefixMatch[1].replace(/\\'/g, "'").replace(/\\\\/g, "\\");
-            }
-            const suffixMatch = optionsStr.match(/suffix='((?:[^'\\]|\\.)*)'/);
-            if (suffixMatch) {
-              suffix = suffixMatch[1].replace(/\\'/g, "'").replace(/\\\\/g, "\\");
-            }
+        let currentLineWidth = 0;
+        const TOKEN_REGEX = /\{(\w+)(?:,([^}]*))?\}/g;
+        let result = "";
+        let lastIndex = 0;
+        let match;
+        while ((match = TOKEN_REGEX.exec(template)) !== null) {
+          const literal = template.slice(lastIndex, match.index);
+          result += literal;
+          const literalNewline = literal.lastIndexOf("\n");
+          if (literalNewline >= 0) {
+            currentLineWidth = (0, ansi_utils_js_1.visibleLength)(literal.slice(literalNewline + 1));
+          } else {
+            currentLineWidth += (0, ansi_utils_js_1.visibleLength)(literal);
           }
+          const tokenName = match[1];
+          const optionsStr = match[2];
+          let value = rawTokens[tokenName] ?? "";
           if (!value) {
-            return EMPTY_MARKER;
+            result += EMPTY_MARKER;
+            lastIndex = TOKEN_REGEX.lastIndex;
+            continue;
           }
-          return prefix + value + suffix;
-        });
+          const options = parseTokenOptions(optionsStr);
+          if (options.maxLength !== void 0 && tokenName !== "contextBar") {
+            value = applyTruncation(value, options.maxLength, options.truncateStyle ?? "suffix");
+          }
+          const colorized = colorizeToken(tokenName, value);
+          let prefix = options.prefix ?? "";
+          let suffix = options.suffix ?? "";
+          if (options.wrapAt !== void 0) {
+            const candidateWidth = currentLineWidth + (0, ansi_utils_js_1.visibleLength)(prefix) + (0, ansi_utils_js_1.visibleLength)(value);
+            if (candidateWidth > options.wrapAt) {
+              prefix = options.wrapPrefix ?? prefix;
+              suffix = options.wrapSuffix ?? suffix;
+            }
+          }
+          const segment = prefix + colorized + suffix;
+          const lastNewlineInSegment = segment.lastIndexOf("\n");
+          if (lastNewlineInSegment >= 0) {
+            currentLineWidth = (0, ansi_utils_js_1.visibleLength)(segment.slice(lastNewlineInSegment + 1));
+          } else {
+            currentLineWidth += (0, ansi_utils_js_1.visibleLength)(segment);
+          }
+          result += segment;
+          lastIndex = TOKEN_REGEX.lastIndex;
+        }
+        result += template.slice(lastIndex);
         result = result.replace(new RegExp(`\\s*[|\\n]\\s*${EMPTY_MARKER}\\s*[|\\n]\\s*`, "g"), " | ");
         result = result.replace(new RegExp(`^${EMPTY_MARKER}\\s*[|\\n]\\s*`), "");
         result = result.replace(new RegExp(`\\s*[|\\n]\\s*${EMPTY_MARKER}$`), "");
@@ -77538,41 +77743,14 @@ var require_formatter = __commonJS({
       }
       return `${seconds}s`;
     }
-    function shortenPath(fullPath, homeDir) {
-      const MAX_LENGTH = 20;
-      let path = fullPath;
-      if (homeDir && path.startsWith(homeDir)) {
-        path = "~" + path.slice(homeDir.length);
-      }
-      if (path.length <= MAX_LENGTH) {
-        return path;
-      }
-      const parts = path.split("/");
-      if (parts.length >= 2) {
-        let shortened = "\u2026/" + parts.slice(-2).join("/");
-        if (shortened.length > MAX_LENGTH) {
-          shortened = "\u2026/" + parts.slice(-1)[0];
-        }
-        if (shortened.length > MAX_LENGTH) {
-          return shortened.slice(0, MAX_LENGTH);
-        }
-        return shortened;
+    function formatCwd(fullPath, homeDir) {
+      if (homeDir && fullPath.startsWith(homeDir)) {
+        return "~" + fullPath.slice(homeDir.length);
       }
-      return "\u2026" + path.slice(-(MAX_LENGTH - 1));
+      return fullPath;
     }
-    function formatCwd(fullPath, homeDir, symbolMode = "full") {
-      const icon = symbolMode === "full" ? "\u{1F4C1} " : "";
-      return `${icon}${shortenPath(fullPath, homeDir)}`;
-    }
-    function formatBranch(branch, symbolMode) {
-      if (!branch)
-        return "";
-      const icons = {
-        full: "\u2387",
-        safe: "\u2217",
-        ascii: "*"
-      };
-      return `${icons[symbolMode]} ${branch}`;
+    function formatBranch(branch) {
+      return branch;
     }
     function formatLogs(warningCount, errorCount, symbolMode = "full") {
       const symbols = {
@@ -77762,11 +77940,49 @@ var require_context_overhead_reader = __commonJS({
 var require_statusline_service = __commonJS({
   "../feature-statusline/dist/statusline-service.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.StatuslineService = void 0;
     exports2.createStatuslineService = createStatuslineService;
     exports2.deterministicIndex = deterministicIndex;
     var core_1 = require_dist4();
+    var path = __importStar(require("node:path"));
     var formatter_js_1 = require_formatter();
     var git_provider_js_1 = require_git_provider();
     var state_reader_js_1 = require_state_reader();
@@ -77788,6 +78004,10 @@ var require_statusline_service = __commonJS({
       branchColor: "",
       displayMode: "setup_warning",
       title: "",
+      projectDirShort: "",
+      projectDirFull: "",
+      worktreeName: "",
+      worktreeOrBranch: "",
       warningCount: 0,
       errorCount: 0,
       logStatus: "normal",
@@ -78186,6 +78406,10 @@ var require_statusline_service = __commonJS({
         const effectivePercentage = Math.round(totalWithBuffer / contextWindowSize * 100);
         const logStatus = logMetrics.errorCount >= this.config.thresholds.logs.critical ? "critical" : logMetrics.warningCount >= this.config.thresholds.logs.warning ? "warning" : "normal";
         const personaName = persona && persona.id !== "disabled" ? persona.display_name : "";
+        const worktree = this.hookInput?.worktree;
+        const projectRoot = worktree?.original_cwd || this.hookInput?.workspace?.project_dir || this.cwd;
+        const projectDirShort = path.basename(projectRoot);
+        const homeShorten = (p) => this.homeDir && p.startsWith(this.homeDir) ? "~" + p.slice(this.homeDir.length) : p;
         return {
           model: this.formatModelName(modelName),
           contextWindow: (0, formatter_js_1.formatTokens)(contextWindowSize),
@@ -78197,9 +78421,13 @@ var require_statusline_service = __commonJS({
           cost: (0, formatter_js_1.formatCost)(costUsd),
           costStatus: (0, formatter_js_1.getThresholdStatus)(costUsd, this.config.thresholds.cost),
           duration: (0, formatter_js_1.formatDuration)(durationMs),
-          cwd: (0, formatter_js_1.formatCwd)(this.cwd, this.homeDir, (0, types_js_1.normalizeSymbolMode)(this.config.theme.useNerdFonts)),
-          branch: (0, formatter_js_1.formatBranch)(branch, (0, types_js_1.normalizeSymbolMode)(this.config.theme.useNerdFonts)),
+          cwd: (0, formatter_js_1.formatCwd)(this.cwd, this.homeDir),
+          branch: (0, formatter_js_1.formatBranch)(branch),
           branchColor: (0, formatter_js_1.getBranchColor)(branch),
+          projectDirShort,
+          projectDirFull: homeShorten(projectRoot),
+          worktreeName: worktree?.name ?? "",
+          worktreeOrBranch: worktree?.name ?? branch,
           displayMode,
           summary: summaryText,
           title,
@@ -78322,8 +78550,25 @@ var require_dist7 = __commonJS({
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.getDefaultOverhead = exports2.readContextOverhead = exports2.createStatuslineService = exports2.StatuslineService = exports2.getThresholdStatus = exports2.formatBranch = exports2.shortenPath = exports2.formatDuration = exports2.formatCost = exports2.formatTokens = exports2.createFormatter = exports2.Formatter = exports2.createGitProvider = exports2.GitProvider = exports2.createStateReader = exports2.StateReader = void 0;
+    exports2.getDefaultOverhead = exports2.readContextOverhead = exports2.createStatuslineService = exports2.StatuslineService = exports2.getThresholdStatus = exports2.formatBranch = exports2.formatDuration = exports2.formatCost = exports2.formatTokens = exports2.createFormatter = exports2.Formatter = exports2.createGitProvider = exports2.GitProvider = exports2.createStateReader = exports2.StateReader = exports2.truncatePath = exports2.truncatePrefix = exports2.truncateSuffix = exports2.visibleLength = exports2.stripAnsi = void 0;
     __exportStar(require_types3(), exports2);
+    var ansi_utils_js_1 = require_ansi_utils();
+    Object.defineProperty(exports2, "stripAnsi", { enumerable: true, get: function() {
+      return ansi_utils_js_1.stripAnsi;
+    } });
+    Object.defineProperty(exports2, "visibleLength", { enumerable: true, get: function() {
+      return ansi_utils_js_1.visibleLength;
+    } });
+    var truncation_js_1 = require_truncation();
+    Object.defineProperty(exports2, "truncateSuffix", { enumerable: true, get: function() {
+      return truncation_js_1.truncateSuffix;
+    } });
+    Object.defineProperty(exports2, "truncatePrefix", { enumerable: true, get: function() {
+      return truncation_js_1.truncatePrefix;
+    } });
+    Object.defineProperty(exports2, "truncatePath", { enumerable: true, get: function() {
+      return truncation_js_1.truncatePath;
+    } });
     var state_reader_js_1 = require_state_reader();
     Object.defineProperty(exports2, "StateReader", { enumerable: true, get: function() {
       return state_reader_js_1.StateReader;
@@ -78354,9 +78599,6 @@ var require_dist7 = __commonJS({
     Object.defineProperty(exports2, "formatDuration", { enumerable: true, get: function() {
       return formatter_js_1.formatDuration;
     } });
-    Object.defineProperty(exports2, "shortenPath", { enumerable: true, get: function() {
-      return formatter_js_1.shortenPath;
-    } });
     Object.defineProperty(exports2, "formatBranch", { enumerable: true, get: function() {
       return formatter_js_1.formatBranch;
     } });
@@ -78496,7 +78738,18 @@ Examples:
             cache_creation_input_tokens: num(currentUsage.cache_creation_input_tokens, 0),
             cache_read_input_tokens: num(currentUsage.cache_read_input_tokens, 0)
           } : null
-        }
+        },
+        // Parse optional worktree data (only present in worktree sessions)
+        worktree: raw.worktree ? (() => {
+          const wt = raw.worktree;
+          return {
+            name: typeof wt.name === "string" ? wt.name : "",
+            path: typeof wt.path === "string" ? wt.path : "",
+            branch: typeof wt.branch === "string" ? wt.branch : "",
+            original_cwd: typeof wt.original_cwd === "string" ? wt.original_cwd : void 0,
+            original_branch: typeof wt.original_branch === "string" ? wt.original_branch : void 0
+          };
+        })() : void 0
       };
     }
     async function handleStatuslineCommand(projectDir, logger, stdout, options = {}) {
@@ -82788,7 +83041,7 @@ var require_cli = __commonJS({
     var promises_12 = require("node:fs/promises");
     var node_stream_1 = require("node:stream");
     var yargs_parser_1 = __importDefault2(require_build());
-    var VERSION = true ? "0.1.6" : "dev";
+    var VERSION = true ? "0.1.7" : "dev";
     var SANDBOX_ERROR_MESSAGE = `Error: Daemon commands cannot run in sandbox mode.
 
 Claude Code's sandbox blocks Unix socket operations required for daemon IPC.

package/dist/daemon.js

@@ -55928,8 +55928,7 @@ var require_gitignore = __commonJS({
       ".sidekick/.env.local",
       ".sidekick/sidekick*.pid",
       ".sidekick/sidekick*.token",
-      ".sidekick/*.local.yaml",
-      ".sidekick/features.yaml"
+      ".sidekick/*.local.yaml"
     ];
     async function installGitignoreSection(projectDir2) {
       const gitignorePath = path.join(projectDir2, ".gitignore");
@@ -70319,23 +70318,25 @@ var require_stage_default_user_prompt = __commonJS({
       });
       if (!(0, types_1.isDaemonContext)(context))
         return;
-      const daemonCtx = context;
       context.handlers.register({
         id: "reminders:throttle-register-ups-session-start",
         priority: 49,
         filter: { kind: "hook", hooks: ["SessionStart"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context.sessionId;
           if (!sessionId)
             return;
           const reminder = (0, reminder_utils_js_1.resolveReminder)(types_js_1.ReminderIds.USER_PROMPT_SUBMIT, {
             context: { sessionId },
-            assets: daemonCtx.assets
+            assets: handlerCtx.assets
           });
           if (reminder) {
-            await (0, throttle_utils_js_1.registerThrottledReminder)(daemonCtx, sessionId, types_js_1.ReminderIds.USER_PROMPT_SUBMIT, "UserPromptSubmit", reminder);
+            await (0, throttle_utils_js_1.registerThrottledReminder)(handlerCtx, sessionId, types_js_1.ReminderIds.USER_PROMPT_SUBMIT, "UserPromptSubmit", reminder);
           }
         }
       });
@@ -70343,48 +70344,57 @@ var require_stage_default_user_prompt = __commonJS({
         id: "reminders:throttle-reset-session-start",
         priority: 48,
         filter: { kind: "hook", hooks: ["SessionStart"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isHookEvent)(event) || !(0, types_1.isSessionStartEvent)(event))
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context.sessionId;
           if (!sessionId)
             return;
-          await (0, throttle_utils_js_1.resetThrottleCounters)(daemonCtx, sessionId);
+          await (0, throttle_utils_js_1.resetThrottleCounters)(handlerCtx, sessionId);
         }
       });
       context.handlers.register({
         id: "reminders:throttle-reset-bulk",
         priority: 49,
         filter: { kind: "transcript", eventTypes: ["BulkProcessingComplete"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isTranscriptEvent)(event))
             return;
           if (event.metadata.isBulkProcessing)
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context?.sessionId;
           if (!sessionId)
             return;
-          await (0, throttle_utils_js_1.resetThrottleCounters)(daemonCtx, sessionId);
+          await (0, throttle_utils_js_1.resetThrottleCounters)(handlerCtx, sessionId);
         }
       });
       context.handlers.register({
         id: "reminders:throttle-restage",
         priority: 50,
         filter: { kind: "transcript", eventTypes: ["UserPrompt", "AssistantMessage"] },
-        handler: async (event) => {
+        handler: async (event, ctx) => {
           if (!(0, types_1.isTranscriptEvent)(event))
             return;
           if (event.metadata.isBulkProcessing)
             return;
+          if (!(0, types_1.isDaemonContext)(ctx))
+            return;
+          const handlerCtx = ctx;
           const sessionId = event.context?.sessionId;
           if (!sessionId)
             return;
-          const remindersState = (0, state_js_1.createRemindersState)(daemonCtx.stateService);
+          const remindersState = (0, state_js_1.createRemindersState)(handlerCtx.stateService);
           const result = await remindersState.reminderThrottle.read(sessionId);
           const state = { ...result.data };
           if (Object.keys(state).length === 0)
             return;
-          const featureConfig = daemonCtx.config.getFeature("reminders");
+          const featureConfig = handlerCtx.config.getFeature("reminders");
           const config = { ...types_js_1.DEFAULT_REMINDERS_SETTINGS, ...featureConfig.settings };
           const thresholds = config.reminder_thresholds ?? {};
           let changed = false;
@@ -70402,12 +70412,12 @@ var require_stage_default_user_prompt = __commonJS({
                 toolsThisTurn: metrics.toolsThisTurn,
                 toolCount: metrics.toolCount
               };
-              await (0, reminder_utils_js_1.stageReminder)(daemonCtx, typedEntry.targetHook, {
+              await (0, reminder_utils_js_1.stageReminder)(handlerCtx, typedEntry.targetHook, {
                 ...typedEntry.cachedReminder,
                 stagedAt
               });
               state[reminderId] = { ...typedEntry, messagesSinceLastStaging: 0 };
-              daemonCtx.logger.debug("Throttle: re-staged reminder", {
+              handlerCtx.logger.debug("Throttle: re-staged reminder", {
                 sessionId,
                 reminderId,
                 messageCount: newCount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scotthamilton77/sidekick",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "AI pair programming assistant with personas, session tracking, and contextual nudges",
   "bin": {
     "sidekick": "dist/bin.js"