gsd-init 1.0.16 → 1.0.17

package/bin/gsd-init.js

@@ -13,22 +13,24 @@ const readline = require('readline');
 const TEMPLATES_DIR = path.join(__dirname, '..', 'templates');
 
 const TEMPLATE_FILES = [
-  { src: 'agents/gsd-observer.md',      dst: 'agents/gsd-observer.md' },
-  { src: 'hooks/gsd-stop-hook.sh',      dst: 'hooks/gsd-stop-hook.sh' },
-  { src: 'scripts/start-observer.sh',   dst: 'scripts/start-observer.sh' },
-  { src: 'scripts/start-worker.sh',     dst: 'scripts/start-worker.sh' },
-  { src: 'scripts/wake-observer.sh',    dst: 'scripts/wake-observer.sh' },
-  { src: 'scripts/notify-worker.sh',    dst: 'scripts/notify-worker.sh' },
-  { src: 'scripts/teardown.sh',         dst: 'scripts/teardown.sh' },
-  { src: 'scripts/listen.sh',           dst: 'scripts/listen.sh' },
-  { src: 'scripts/start.sh',            dst: 'scripts/start.sh' },
-  { src: 'scripts/verify.sh',           dst: 'scripts/verify.sh' },
-  { src: 'schema/event.json',           dst: 'schema/event.json' },
-  { src: 'schema/response.json',        dst: 'schema/response.json' },
+  { src: 'agents/gsd-observer.md',              dst: 'agents/gsd-observer.md' },
+  { src: 'hooks/gsd-stop-hook.sh',              dst: 'hooks/gsd-stop-hook.sh' },
+  { src: 'hooks/gsd-session-end-hook.sh',       dst: 'hooks/gsd-session-end-hook.sh' },
+  { src: 'scripts/start-observer.sh',           dst: 'scripts/start-observer.sh' },
+  { src: 'scripts/start-worker.sh',             dst: 'scripts/start-worker.sh' },
+  { src: 'scripts/wake-observer.sh',            dst: 'scripts/wake-observer.sh' },
+  { src: 'scripts/notify-worker.sh',            dst: 'scripts/notify-worker.sh' },
+  { src: 'scripts/teardown.sh',                 dst: 'scripts/teardown.sh' },
+  { src: 'scripts/listen.sh',                   dst: 'scripts/listen.sh' },
+  { src: 'scripts/start.sh',                    dst: 'scripts/start.sh' },
+  { src: 'scripts/verify.sh',                   dst: 'scripts/verify.sh' },
+  { src: 'schema/event.json',                   dst: 'schema/event.json' },
+  { src: 'schema/response.json',                dst: 'schema/response.json' },
 ];
 
 const SH_FILES = [
   'hooks/gsd-stop-hook.sh',
+  'hooks/gsd-session-end-hook.sh',
   'scripts/start-observer.sh',
   'scripts/start-worker.sh',
   'scripts/wake-observer.sh',
@@ -43,13 +45,23 @@ function gsdRoot(projDir) {
   return process.env.GSD_INIT_OBS_ROOT || path.join(projDir, '.gsd');
 }
 
-function makeGsdEntry(projDir) {
+function makeGsdStopEntry(projDir) {
   return {
     matcher: '',
     hooks: [{ type: 'command', command: path.join(gsdRoot(projDir), 'hooks', 'gsd-stop-hook.sh') }]
   };
 }
 
+function makeGsdSessionEndEntry(projDir) {
+  return {
+    matcher: '',
+    hooks: [{ type: 'command', command: path.join(gsdRoot(projDir), 'hooks', 'gsd-session-end-hook.sh') }]
+  };
+}
+
+// Keep old name as alias for backwards compat
+function makeGsdEntry(projDir) { return makeGsdStopEntry(projDir); }
+
 function getSettingsLabel(settingsPath) {
   if (!fs.existsSync(settingsPath)) return '[create]';
   var data;
@@ -102,10 +114,10 @@ function chmodScripts(obsRoot) {
     catch (e) { /* ignore */ }
   }
 }
-function mergeSettings(projDir, entry) {
+function mergeSettings(projDir, stopEntry, sessionEndEntry) {
   var settingsPath = path.join(projDir, '.claude', 'settings.json');
   if (!fs.existsSync(settingsPath)) {
-    var newData = { hooks: { Stop: [entry] } };
+    var newData = { hooks: { Stop: [stopEntry], SessionEnd: [sessionEndEntry] } };
     fs.writeFileSync(settingsPath, JSON.stringify(newData, null, 2) + '\n');
     return;
   }
@@ -114,15 +126,26 @@ function mergeSettings(projDir, entry) {
   try { data = JSON.parse(raw); }
   catch (e) { throw new Error('Malformed JSON in ' + settingsPath + ': ' + e.message); }
 
+  if (!data.hooks) data.hooks = {};
+
   var stopArr = (data.hooks && data.hooks.Stop) ? data.hooks.Stop : [];
-  var alreadyRegistered = stopArr.some(function(e) {
+  var stopRegistered = stopArr.some(function(e) {
     return JSON.stringify(e).includes('gsd-stop-hook.sh');
   });
-  if (alreadyRegistered) return;
+  if (!stopRegistered) {
+    if (!data.hooks.Stop) data.hooks.Stop = [];
+    data.hooks.Stop.push(stopEntry);
+  }
+
+  var endArr = (data.hooks && data.hooks.SessionEnd) ? data.hooks.SessionEnd : [];
+  var endRegistered = endArr.some(function(e) {
+    return JSON.stringify(e).includes('gsd-session-end-hook.sh');
+  });
+  if (!endRegistered) {
+    if (!data.hooks.SessionEnd) data.hooks.SessionEnd = [];
+    data.hooks.SessionEnd.push(sessionEndEntry);
+  }
 
-  if (!data.hooks) data.hooks = {};
-  if (!data.hooks.Stop) data.hooks.Stop = [];
-  data.hooks.Stop.push(entry);
   fs.writeFileSync(settingsPath, JSON.stringify(data, null, 2) + '\n');
 }
 function prompt(question) {
@@ -166,7 +189,8 @@ async function run() {
     projDir = process.cwd();
   }
   var obsRoot = gsdRoot(projDir);
-  var gsdEntry = makeGsdEntry(projDir);
+  var gsdStopEntry = makeGsdStopEntry(projDir);
+  var gsdSessionEndEntry = makeGsdSessionEndEntry(projDir);
 
   var ops = planInstall(TEMPLATES_DIR, obsRoot, projDir);
 
@@ -220,7 +244,7 @@ async function run() {
   catch (e) { console.error('Error setting permissions in ' + obsRoot + ': ' + e.message); process.exit(1); }
 
   // Step 5: merge settings.json
-  try { mergeSettings(projDir, gsdEntry); }
+  try { mergeSettings(projDir, gsdStopEntry, gsdSessionEndEntry); }
   catch (e) { console.error(e.message); process.exit(1); }
 
   printSummary(projDir, projectName);
@@ -233,5 +257,5 @@ if (require.main === module) {
 module.exports = {
   planInstall, getSettingsLabel, formatDryRun, mkdirpSync,
   copyTemplates, chmodScripts, mergeSettings, printSummary,
-  TEMPLATE_FILES, SH_FILES, makeGsdEntry, gsdRoot, run
+  TEMPLATE_FILES, SH_FILES, makeGsdEntry, makeGsdStopEntry, makeGsdSessionEndEntry, gsdRoot, run
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gsd-init",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Set up GSD observer/worker tmux system in a project",
   "bin": {
     "gsd-init": "bin/gsd.js"

package/templates/hooks/gsd-session-end-hook.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+# GSD Session End Hook — fires when Worker Claude session terminates.
+# Sends a session_end event to the Observer so it can do a final review.
+# Does NOT block — session is ending, fire-and-forget only.
+#
+# Environment variables (all optional, have defaults):
+#   GSD_OBSERVER_ENABLED     — set to 1 to activate (default: off)
+#   GSD_OBSERVER_SESSION     — tmux session name for Observer (default: gsd-observer)
+#   GSD_OBSERVER_PANE        — pane id for Observer (default: 0.0)
+#   GSD_PROJECT_DIR          — project directory (default: pwd)
+#   GSD_WORKER_SESSION       — worker tmux session (default: gsd-worker)
+#   GSD_WORKER_PANE          — worker pane id (default: 0.0)
+
+set -euo pipefail
+SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../scripts"
+
+OBSERVER_ENABLED="${GSD_OBSERVER_ENABLED:-}"
+OBSERVER_SESSION="${GSD_OBSERVER_SESSION:-gsd-observer}"
+OBSERVER_PANE="${GSD_OBSERVER_PANE:-0.0}"
+PROJECT_DIR="${GSD_PROJECT_DIR:-$(pwd)}"
+WORKER_SESSION="${GSD_WORKER_SESSION:-gsd-worker}"
+WORKER_PANE="${GSD_WORKER_PANE:-0.0}"
+
+# --- Guard: disabled ---
+if [ -z "$OBSERVER_ENABLED" ]; then
+  exit 0
+fi
+
+log() { echo "[gsd-session-end] $*" >&2; }
+
+# --- Generate event_id ---
+event_id=$(uuidgen 2>/dev/null || date +%s%N | md5sum | cut -c1-8)
+
+# --- Write session_end event JSON ---
+event_file="/tmp/gsd-event-${event_id}.json"
+timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+
+cat > "${event_file}.tmp" <<EOF
+{
+  "event_id": "${event_id}",
+  "event_type": "session_end",
+  "gsd_phase": "session_end",
+  "observer_mode": "audit",
+  "context_summary": "Worker Claude session ended — final review opportunity",
+  "artifacts": {
+    "plan": null,
+    "research": null,
+    "changed_files": [],
+    "test_results": null
+  },
+  "worker_session": "${WORKER_SESSION}",
+  "worker_pane": "${WORKER_SESSION}:${WORKER_PANE}",
+  "project_dir": "${PROJECT_DIR}",
+  "timestamp": "${timestamp}"
+}
+EOF
+mv "${event_file}.tmp" "$event_file"
+log "Session-end event written: $event_file"
+
+# --- Wake Observer (fire-and-forget, no polling) ---
+"$SCRIPTS_DIR/wake-observer.sh" "$event_id" "$OBSERVER_SESSION" "$OBSERVER_PANE" || \
+  log "WARNING: wake-observer.sh failed — Observer not notified of session end"
+
+exit 0

package/templates/scripts/gsd-session-end-hook.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+# GSD Session End Hook — fires when Worker Claude session terminates.
+# Sends a session_end event to the Observer so it can do a final review.
+# Does NOT block — session is ending, fire-and-forget only.
+#
+# Environment variables (all optional, have defaults):
+#   GSD_OBSERVER_ENABLED     — set to 1 to activate (default: off)
+#   GSD_OBSERVER_SESSION     — tmux session name for Observer (default: gsd-observer)
+#   GSD_OBSERVER_PANE        — pane id for Observer (default: 0.0)
+#   GSD_PROJECT_DIR          — project directory (default: pwd)
+#   GSD_WORKER_SESSION       — worker tmux session (default: gsd-worker)
+#   GSD_WORKER_PANE          — worker pane id (default: 0.0)
+
+set -euo pipefail
+SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+OBSERVER_ENABLED="${GSD_OBSERVER_ENABLED:-}"
+OBSERVER_SESSION="${GSD_OBSERVER_SESSION:-gsd-observer}"
+OBSERVER_PANE="${GSD_OBSERVER_PANE:-0.0}"
+PROJECT_DIR="${GSD_PROJECT_DIR:-$(pwd)}"
+WORKER_SESSION="${GSD_WORKER_SESSION:-gsd-worker}"
+WORKER_PANE="${GSD_WORKER_PANE:-0.0}"
+
+# --- Guard: disabled ---
+if [ -z "$OBSERVER_ENABLED" ]; then
+  exit 0
+fi
+
+log() { echo "[gsd-session-end] $*" >&2; }
+
+# --- Generate event_id ---
+event_id=$(uuidgen 2>/dev/null || date +%s%N | md5sum | cut -c1-8)
+
+# --- Write session_end event JSON ---
+event_file="/tmp/gsd-event-${event_id}.json"
+timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+
+cat > "${event_file}.tmp" <<EOF
+{
+  "event_id": "${event_id}",
+  "event_type": "session_end",
+  "gsd_phase": "session_end",
+  "observer_mode": "audit",
+  "context_summary": "Worker Claude session ended — final review opportunity",
+  "artifacts": {
+    "plan": null,
+    "research": null,
+    "changed_files": [],
+    "test_results": null
+  },
+  "worker_session": "${WORKER_SESSION}",
+  "worker_pane": "${WORKER_SESSION}:${WORKER_PANE}",
+  "project_dir": "${PROJECT_DIR}",
+  "timestamp": "${timestamp}"
+}
+EOF
+mv "${event_file}.tmp" "$event_file"
+log "Session-end event written: $event_file"
+
+# --- Wake Observer (fire-and-forget, no polling) ---
+"$SCRIPTS_DIR/wake-observer.sh" "$event_id" "$OBSERVER_SESSION" "$OBSERVER_PANE" || \
+  log "WARNING: wake-observer.sh failed — Observer not notified of session end"
+
+exit 0

package/templates/scripts/wake-observer.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 if [ $# -lt 3 ]; then
   echo "Usage: wake-observer.sh <event_id> <observer_session> <observer_pane>" >&2
@@ -35,8 +36,10 @@ if [ "$ready" -eq 0 ]; then
 fi
 
 # Inject task into Observer pane
+# Quote the notify script path to handle spaces in SCRIPTS_DIR
+notify_cmd="'${SCRIPTS_DIR}/notify-worker.sh'"
 tmux send-keys -t "$full_target" \
-  "Read ${event_path} and respond as GSD Observer. Write response to /tmp/gsd-response-${event_id}.json then run ${SCRIPTS_DIR}/notify-worker.sh ${event_id}" \
+  "Read ${event_path} and respond as GSD Observer. Write response to /tmp/gsd-response-${event_id}.json then run ${notify_cmd} ${event_id}" \
   Enter
 
 echo "[wake-observer] Observer woken for event ${event_id}" >&2