sticky-note-cli 2.5.2 → 2.5.4

package/bin/cli.js

@@ -21,7 +21,7 @@ const { execSync, execFileSync } = require("child_process");
 // Constants
 // ──────────────────────────────────────────────
 
-const VERSION = "2.5.2";
+const VERSION = require("../package.json").version;
 
 const HOOK_FILES = [
   "sticky-utils.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sticky-note-cli",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "Human-to-human handoff for AI coding assistants. Git-backed shared memory for Claude Code and Copilot CLI.",
   "license": "MIT",
   "bin": {

package/templates/hooks/on-stop.js

@@ -8,6 +8,7 @@
  */
 
 const crypto = require("crypto");
+const { execFileSync } = require("child_process");
 
 function safeExit() {
   try {
@@ -35,8 +36,117 @@ const {
   getBranch,
   getSessionId,
   detectTool,
+  extractSessionFromAudit,
+  readHeadSha,
+  normalizeSep,
+  useCloud,
+  cloudReadThreads,
+  cloudWriteThread,
+  cloudAppendAudit,
 } = utils;
 
+// Files that belong to sticky-note internals — exclude from files_touched.
+const STICKY_FILES_PREFIX = [
+  ".sticky-note/sticky-note.json",
+  ".sticky-note/sticky-note-audit.jsonl",
+  ".sticky-note/audit/",
+  ".sticky-note/presence/",
+  ".sticky-note/.sticky-session",
+  ".sticky-note/.sticky-head",
+  ".sticky-note/.sticky-resume",
+  ".sticky-note/.sticky-debug.jsonl",
+  ".sticky-note/sticky-note-config.json",
+  ".sticky-note/.sticky-presence.json",
+  ".sticky-note/.sticky-injected",
+  ".sticky-note/.sticky-active-resume",
+];
+
+/**
+ * Collect files changed since session start using git diff.
+ * Mirrors getGitFilesTouched() from session-end.js.
+ */
+function getGitFilesTouched() {
+  const files = new Set();
+  const savedSha = readHeadSha();
+
+  try {
+    if (savedSha && /^[0-9a-f]+$/i.test(savedSha)) {
+      const result = execFileSync("git", ["diff", "--name-only", savedSha, "HEAD"], {
+        encoding: "utf-8",
+        timeout: 5000,
+        stdio: ["pipe", "pipe", "pipe"],
+      });
+      for (const f of result.trim().split(/\r?\n/)) {
+        const trimmed = f.trim();
+        if (trimmed) files.add(trimmed);
+      }
+    }
+
+    const unstaged = execFileSync("git", ["diff", "--name-only"], {
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    for (const f of unstaged.trim().split(/\r?\n/)) {
+      const trimmed = f.trim();
+      if (trimmed) files.add(trimmed);
+    }
+
+    const staged = execFileSync("git", ["diff", "--cached", "--name-only"], {
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    for (const f of staged.trim().split(/\r?\n/)) {
+      const trimmed = f.trim();
+      if (trimmed) files.add(trimmed);
+    }
+  } catch (_) {
+    // ignore — git may not be available
+  }
+
+  return Array.from(files).filter((f) => {
+    const normalized = normalizeSep(f);
+    return !STICKY_FILES_PREFIX.some((p) => normalized === p || normalized.startsWith(p));
+  });
+}
+
+/**
+ * Build a narrative string from audit trail prompts.
+ * Mirrors the audit-fallback path from session-end.js extractNarrative().
+ */
+function buildNarrativeFromAudit(auditData) {
+  const prompts = auditData.prompts || [];
+  if (!prompts.length) return "";
+  if (prompts.length === 1) return prompts[0].substring(0, 300).trim();
+  let summary = prompts[0].substring(0, 150).trim();
+  if (prompts.length > 2) {
+    summary += ` ... (${prompts.length} prompts total) ... ${prompts[prompts.length - 1].substring(0, 100).trim()}`;
+  } else {
+    summary += ` -> ${prompts[prompts.length - 1].substring(0, 100).trim()}`;
+  }
+  return summary.substring(0, 300);
+}
+
+/**
+ * Classify work type from audit tool counts (lightweight version of
+ * analyzeSessionActivities from session-end.js).
+ */
+function classifyWorkType(auditData) {
+  const tools = auditData.tools || {};
+  const files = auditData.files || [];
+  const editLike = new Set(["edit", "create", "write", "Edit", "Write", "Create", "MultiEdit", "multi_edit"]);
+  let editCount = 0;
+  for (const [t, c] of Object.entries(tools)) {
+    if (editLike.has(t)) editCount += c;
+  }
+  const readCount = tools["Read"] || tools["read"] || 0;
+  if (editCount > 0) return "feature-development";
+  if (readCount > 0 && editCount === 0) return "code-review";
+  if (files.length > 0) return "general";
+  return "general";
+}
+
 function buildHandoffSummary(thread, reason) {
   const parts = [];
   const files = thread.files_touched || [];
@@ -67,7 +177,7 @@ function buildHandoffSummary(thread, reason) {
   return parts.length ? parts.join(" | ") : "Session stopped -- no summary available";
 }
 
-function main() {
+async function main() {
   let hookInput = {};
   try {
     if (!process.stdin.isTTY) {
@@ -85,15 +195,53 @@ function main() {
   const now = new Date().toISOString();
   const reason = hookInput.reason || "";
 
+  const cloud = useCloud();
   const memoryPath = getMemoryPath();
   const memory = loadJson(memoryPath, { version: "2", project: "", threads: [] });
 
+  if (cloud) {
+    const cloudThreads = await cloudReadThreads();
+    if (cloudThreads) memory.threads = cloudThreads;
+  }
+
+  // Extract session data from audit trail and git (the key fix —
+  // previously this hook created bare threads with no context).
+  const auditData = extractSessionFromAudit(sessionId);
+  const auditFiles = auditData.files || [];
+  const gitFiles = getGitFilesTouched();
+  const allFiles = [...new Set([...auditFiles, ...gitFiles])];
+  const narrative = buildNarrativeFromAudit(auditData);
+  const workType = classifyWorkType(auditData);
+
   const threads = memory.threads || [];
   let found = false;
 
   for (const thread of threads) {
     if (thread.session_id === sessionId && (thread.status === "open" || thread.status === "stuck")) {
       thread.last_activity_at = now;
+      // Enrich with extracted data
+      if (allFiles.length) {
+        thread.files_touched = [...new Set([...(thread.files_touched || []), ...allFiles])];
+      }
+      if (narrative && !thread.narrative) {
+        thread.narrative = narrative;
+      }
+      if (workType !== "general" || !thread.work_type) {
+        thread.work_type = workType;
+      }
+      // Merge audit tool counts
+      const auditTools = auditData.tools || {};
+      const prevCalls = thread.tool_calls || {};
+      for (const [tn, cnt] of Object.entries(auditTools)) {
+        prevCalls[tn] = (prevCalls[tn] || 0) + cnt;
+      }
+      thread.tool_calls = prevCalls;
+      // Store prompts if not already present
+      const storedPrompts = (auditData.prompts || []).slice(0, 20).map((p) => p.substring(0, 300));
+      if (storedPrompts.length && !(thread.prompts || []).length) {
+        thread.prompts = storedPrompts;
+      }
+
       thread.handoff_summary = buildHandoffSummary(thread, reason);
       if (reason) {
         thread.last_note = reason.substring(0, 200);
@@ -104,6 +252,7 @@ function main() {
   }
 
   if (!found && sessionId !== "unknown") {
+    const storedPrompts = (auditData.prompts || []).slice(0, 20).map((p) => p.substring(0, 300));
     const thread = {
       id: crypto.randomUUID(),
       user,
@@ -113,29 +262,46 @@ function main() {
       created_at: now,
       closed_at: now,
       last_activity_at: now,
-      files_touched: [],
-      last_note: reason ? reason.substring(0, 200) : "Session stopped",
-      narrative: "",
+      files_touched: allFiles,
+      last_note: reason ? reason.substring(0, 200) : (narrative || "Session stopped"),
+      narrative,
       failed_approaches: [],
-      handoff_summary: buildHandoffSummary({}, reason),
+      handoff_summary: "",
       related_session_ids: [],
       tool: detectTool(hookInput),
       session_id: sessionId,
+      work_type: workType,
+      tool_calls: auditData.tools || {},
+      prompts: storedPrompts,
+      contributors: [user],
+      resume_history: [],
     };
+    thread.handoff_summary = buildHandoffSummary(thread, reason);
     threads.push(thread);
   }
 
-  appendAuditLine({
+  const auditEntry = {
     type: "stop",
     user,
     ts: now,
     session_id: sessionId,
     reason: reason ? reason.substring(0, 200) : "stop_checkpoint",
-  });
+  };
+  appendAuditLine(auditEntry);
+  if (cloud) {
+    cloudAppendAudit(auditEntry).catch(() => {});
+  }
 
   saveMemoryMerged(memoryPath, memory);
+  if (cloud) {
+    const threadToSync = threads.find(t => t.session_id === sessionId);
+    if (threadToSync) {
+      cloudWriteThread(threadToSync).catch(() => {});
+    }
+  }
   const reasonStr = reason ? reason.substring(0, 60) : "checkpoint";
-  const statusMsg = `[STICKY-NOTE] Session stopped - handoff saved (${reasonStr})`;
+  const fileCount = allFiles.length;
+  const statusMsg = `[STICKY-NOTE] Session stopped - handoff saved (${reasonStr}, ${fileCount} file${fileCount !== 1 ? "s" : ""})`;
   try {
     process.stdout.write(JSON.stringify({ output: statusMsg }) + "\n");
   } catch (_) {
@@ -144,8 +310,4 @@ function main() {
   process.exit(0);
 }
 
-try {
-  main();
-} catch (_) {
-  safeExit();
-}
+main().catch(() => safeExit());

package/templates/hooks/sticky-codex.sh

@@ -1,71 +1,71 @@
-#!/usr/bin/env bash
-# sticky-codex.sh — Codex wrapper for Sticky Note V2
-#
-# Captures Codex stdout/stderr to a temp session log.
-# On exit: calls session-end.js with the transcript for
-# narrative + failed_approaches extraction.
-#
-# Usage:
-#   sticky-codex [codex args...]
-#
-# Setup:
-#   npx sticky-note init --codex
-#   alias sticky-codex="/path/to/.claude/hooks/sticky-codex.sh"
-#
-# Limitation: Context is printed to terminal after Codex exits,
-# not injected into the Codex window. Per-prompt surfacing not available.
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-STICKY_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)/.sticky-note"
-SESSION_ID="codex-$(date +%s)-$$"
-TRANSCRIPT_FILE=$(mktemp "${TMPDIR:-/tmp}/sticky-codex-XXXXXX.log")
-USER="${USER:-${USERNAME:-unknown}}"
-
-# Ensure .sticky-note directory exists
-mkdir -p "$STICKY_DIR"
-
-# Print context from sticky-note before starting Codex
-echo ""
-echo "📌 Sticky Note — injecting context for Codex session $SESSION_ID"
-echo ""
-
-if [ -f "$STICKY_DIR/sticky-note.json" ]; then
-    node "$SCRIPT_DIR/session-start.js" <<EOF 2>/dev/null || true
-{"session_id": "$SESSION_ID"}
-EOF
-fi
-
-echo "─────────────────────────────────────────────"
-echo ""
-
-# Run Codex, capturing output
-codex "$@" 2>&1 | tee "$TRANSCRIPT_FILE"
-CODEX_EXIT=$?
-
-echo ""
-echo "─────────────────────────────────────────────"
-echo "📌 Sticky Note — processing Codex session..."
-
-# Parse transcript for narrative + failed_approaches
-PARSED=$(node "$SCRIPT_DIR/parse-transcript.js" "$TRANSCRIPT_FILE" 2>/dev/null || echo '{"narrative":"","failed_approaches":[]}')
-
-# Call session-end.js with the transcript info + parsed data
-node "$SCRIPT_DIR/session-end.js" <<EOF 2>/dev/null || true
-{
-    "session_id": "$SESSION_ID",
-    "transcript_path": "$TRANSCRIPT_FILE",
-    "parsed_transcript": ${PARSED},
-    "hook_event_name": "sessionEnd",
-    "reason": "codex_exit"
-}
-EOF
-
-# Cleanup transcript
-rm -f "$TRANSCRIPT_FILE"
-
-echo "[OK] Session $SESSION_ID recorded."
-echo ""
-
-exit $CODEX_EXIT
+#!/usr/bin/env bash
+# sticky-codex.sh — Codex wrapper for Sticky Note V2
+#
+# Captures Codex stdout/stderr to a temp session log.
+# On exit: calls session-end.js with the transcript for
+# narrative + failed_approaches extraction.
+#
+# Usage:
+#   sticky-codex [codex args...]
+#
+# Setup:
+#   npx sticky-note init --codex
+#   alias sticky-codex="/path/to/.claude/hooks/sticky-codex.sh"
+#
+# Limitation: Context is printed to terminal after Codex exits,
+# not injected into the Codex window. Per-prompt surfacing not available.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+STICKY_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)/.sticky-note"
+SESSION_ID="codex-$(date +%s)-$$"
+TRANSCRIPT_FILE=$(mktemp "${TMPDIR:-/tmp}/sticky-codex-XXXXXX.log")
+USER="${USER:-${USERNAME:-unknown}}"
+
+# Ensure .sticky-note directory exists
+mkdir -p "$STICKY_DIR"
+
+# Print context from sticky-note before starting Codex
+echo ""
+echo "📌 Sticky Note — injecting context for Codex session $SESSION_ID"
+echo ""
+
+if [ -f "$STICKY_DIR/sticky-note.json" ]; then
+    node "$SCRIPT_DIR/session-start.js" <<EOF 2>/dev/null || true
+{"session_id": "$SESSION_ID"}
+EOF
+fi
+
+echo "─────────────────────────────────────────────"
+echo ""
+
+# Run Codex, capturing output
+codex "$@" 2>&1 | tee "$TRANSCRIPT_FILE"
+CODEX_EXIT=$?
+
+echo ""
+echo "─────────────────────────────────────────────"
+echo "📌 Sticky Note — processing Codex session..."
+
+# Parse transcript for narrative + failed_approaches
+PARSED=$(node "$SCRIPT_DIR/parse-transcript.js" "$TRANSCRIPT_FILE" 2>/dev/null || echo '{"narrative":"","failed_approaches":[]}')
+
+# Call session-end.js with the transcript info + parsed data
+node "$SCRIPT_DIR/session-end.js" <<EOF 2>/dev/null || true
+{
+    "session_id": "$SESSION_ID",
+    "transcript_path": "$TRANSCRIPT_FILE",
+    "parsed_transcript": ${PARSED},
+    "hook_event_name": "sessionEnd",
+    "reason": "codex_exit"
+}
+EOF
+
+# Cleanup transcript
+rm -f "$TRANSCRIPT_FILE"
+
+echo "[OK] Session $SESSION_ID recorded."
+echo ""
+
+exit $CODEX_EXIT