feat(notify): ensure all WhatsApp messages include session ID and min 2 options

- Add session ID to all notification titles: [Claude <id>]
- formatSummaryMessage now accepts sessionId parameter
- generateSuggestions always returns minimum 2 options
- notifyReviewReady ensures min 2 options (Approve/Request changes)
- notifyTaskComplete adds options (Start next task/View details)
- notifyError adds options (Retry/View logs)
- notifyWithYesNo already has 2 options (Yes/No)

Author: jonathanpeterwu

src/cli/claude-sm.ts

@@ -429,28 +429,39 @@ class ClaudeSM {
       };
 
       const summary = await generateSessionSummary(context);
-      const message = formatSummaryMessage(summary);
+      const message = formatSummaryMessage(summary, this.config.instanceId);
 
       console.log(chalk.cyan('\nSending session summary via WhatsApp...'));
 
-      // Build options from suggestions for interactive response
-      const options = summary.suggestions.slice(0, 4).map((s) => ({
+      // Build options from suggestions for interactive response (always min 2)
+      let options = summary.suggestions.slice(0, 4).map((s) => ({
         key: s.key,
         label: s.label,
         action: s.action,
       }));
 
+      // Ensure minimum 2 options
+      if (options.length < 2) {
+        const defaults = [
+          { key: '1', label: 'Start new session', action: 'claude-sm' },
+          {
+            key: '2',
+            label: 'View logs',
+            action: 'tail -30 ~/.claude/logs/*.log',
+          },
+        ];
+        options = defaults.slice(0, 2 - options.length).concat(options);
+        options.forEach((o, i) => (o.key = String(i + 1)));
+      }
+
       const result = await sendNotification({
         type: 'task_complete',
-        title: 'Claude Session Complete',
+        title: `Claude Session ${this.config.instanceId}`,
         message,
-        prompt:
-          options.length > 0
-            ? {
-                type: 'options',
-                options,
-              }
-            : undefined,
+        prompt: {
+          type: 'options',
+          options,
+        },
       });
 
       if (result.success) {

src/hooks/session-summary.ts

@@ -207,6 +207,28 @@ async function generateSuggestions(
 
   // Sort by priority (highest first) and re-key
   suggestions.sort((a, b) => b.priority - a.priority);
+
+  // Ensure minimum 2 options always
+  if (suggestions.length < 2) {
+    // Add default options if not enough suggestions
+    if (suggestions.length === 0) {
+      suggestions.push({
+        key: '1',
+        label: 'Start new Claude session',
+        action: 'claude-sm',
+        priority: 50,
+      });
+    }
+    if (suggestions.length < 2) {
+      suggestions.push({
+        key: '2',
+        label: 'View session logs',
+        action: 'cat ~/.claude/logs/claude-*.log | tail -30',
+        priority: 40,
+      });
+    }
+  }
+
   suggestions.forEach((s, i) => {
     s.key = String(i + 1);
   });
@@ -252,13 +274,18 @@ export async function generateSessionSummary(
 /**
  * Format session summary as WhatsApp message
  */
-export function formatSummaryMessage(summary: SessionSummary): string {
+export function formatSummaryMessage(
+  summary: SessionSummary,
+  sessionId?: string
+): string {
   const statusEmoji = summary.status === 'success' ? '' : '';
   const exitInfo =
     summary.exitCode !== null ? ` | Exit: ${summary.exitCode}` : '';
+  const sessionInfo = sessionId ? ` | Session: ${sessionId}` : '';
 
   let message = `Claude session complete ${statusEmoji}\n`;
-  message += `Duration: ${summary.duration}${exitInfo} | Branch: ${summary.branch}\n\n`;
+  message += `Duration: ${summary.duration}${exitInfo}${sessionInfo}\n`;
+  message += `Branch: ${summary.branch}\n\n`;
 
   if (summary.suggestions.length > 0) {
     message += `What to do next:\n`;

src/hooks/sms-notify.ts

@@ -524,30 +524,51 @@ export function processIncomingResponse(
   return { matched: false, prompt };
 }
 
+// Get session ID from environment or generate short ID
+function getSessionId(): string {
+  return (
+    process.env['CLAUDE_INSTANCE_ID'] ||
+    process.env['STACKMEMORY_SESSION_ID'] ||
+    Math.random().toString(36).substring(2, 8)
+  );
+}
+
 // Convenience functions for common notifications
 
 export async function notifyReviewReady(
   title: string,
   description: string,
   options?: { label: string; action?: string }[]
 ): Promise<{ success: boolean; promptId?: string; error?: string }> {
+  const sessionId = getSessionId();
+
+  // Ensure minimum 2 options
+  let finalOptions = options || [];
+  if (finalOptions.length < 2) {
+    const defaults = [
+      { label: 'Approve', action: 'echo "Approved"' },
+      { label: 'Request changes', action: 'echo "Changes requested"' },
+    ];
+    finalOptions = [...finalOptions, ...defaults].slice(
+      0,
+      Math.max(2, finalOptions.length)
+    );
+  }
+
   const payload: NotificationPayload = {
     type: 'review_ready',
-    title: `Review Ready: ${title}`,
+    title: `[Claude ${sessionId}] Review Ready: ${title}`,
     message: description,
-  };
-
-  if (options && options.length > 0) {
-    payload.prompt = {
+    prompt: {
       type: 'options',
-      options: options.map((opt, i) => ({
+      options: finalOptions.map((opt, i) => ({
         key: String(i + 1),
         label: opt.label,
         action: opt.action,
       })),
       question: 'What would you like to do?',
-    };
-  }
+    },
+  };
 
   return sendSMSNotification(payload);
 }
@@ -558,9 +579,10 @@ export async function notifyWithYesNo(
   yesAction?: string,
   noAction?: string
 ): Promise<{ success: boolean; promptId?: string; error?: string }> {
+  const sessionId = getSessionId();
   return sendSMSNotification({
     type: 'custom',
-    title,
+    title: `[Claude ${sessionId}] ${title}`,
     message: question,
     prompt: {
       type: 'yesno',
@@ -575,22 +597,42 @@ export async function notifyWithYesNo(
 export async function notifyTaskComplete(
   taskName: string,
   summary: string
-): Promise<{ success: boolean; error?: string }> {
+): Promise<{ success: boolean; promptId?: string; error?: string }> {
+  const sessionId = getSessionId();
   return sendSMSNotification({
     type: 'task_complete',
-    title: `Task Complete: ${taskName}`,
+    title: `[Claude ${sessionId}] Task Complete: ${taskName}`,
     message: summary,
+    prompt: {
+      type: 'options',
+      options: [
+        { key: '1', label: 'Start next task', action: 'claude-sm' },
+        { key: '2', label: 'View details', action: 'stackmemory status' },
+      ],
+    },
   });
 }
 
 export async function notifyError(
   error: string,
   context?: string
-): Promise<{ success: boolean; error?: string }> {
+): Promise<{ success: boolean; promptId?: string; error?: string }> {
+  const sessionId = getSessionId();
   return sendSMSNotification({
     type: 'error',
-    title: 'Error Alert',
+    title: `[Claude ${sessionId}] Error Alert`,
     message: context ? `${error}\n\nContext: ${context}` : error,
+    prompt: {
+      type: 'options',
+      options: [
+        { key: '1', label: 'Retry', action: 'claude-sm' },
+        {
+          key: '2',
+          label: 'View logs',
+          action: 'tail -50 ~/.claude/logs/*.log',
+        },
+      ],
+    },
   });
 }