@workscribe/cli 3.0.0 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workscribe/cli",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Passive developer work journal — automatic terminal activity summaries",
   "homepage": "https://workscribe.co",
   "repository": {

package/shell/hook.bash

@@ -1,9 +1,26 @@
 # Workscribe — developer work journal
 # Do not edit this block manually. Managed by `workscribe init`.
 # workscribe:hook:start
+# workscribe:hook-version 2
+# Now in milliseconds, or nothing: bash 5's $EPOCHREALTIME, else `date +%s` (macOS's bash 3.2 has no $EPOCHREALTIME,
+# and its BSD date has no %N)
+_workscribe_now_ms() {
+  if [[ -n "${EPOCHREALTIME:-}" ]]; then
+    local micros=${EPOCHREALTIME//[.,]/}
+    [[ $micros =~ ^[0-9]+$ ]] && echo $(( 10#$micros / 1000 ))
+    return 0
+  fi
+  local seconds
+  seconds=$(date +%s 2>/dev/null)
+  [[ $seconds =~ ^[0-9]+$ ]] && echo $(( seconds * 1000 ))
+  return 0
+}
+
 _workscribe_preexec() {
+  # The DEBUG trap also fires for the rest of the rc file — nothing before the first prompt is the user's command
+  [[ -n "${_workscribe_primed:-}" ]] || return 0
   if [ "$BASH_COMMAND" != "_workscribe_precmd" ]; then
-    _workscribe_cmd_start=$(date +%s%3N 2>/dev/null || echo 0)
+    _workscribe_cmd_start=$(_workscribe_now_ms)
     _workscribe_last_cmd="$BASH_COMMAND"
     _workscribe_git_before=$(git rev-parse HEAD 2>/dev/null || echo "")
   fi
@@ -13,17 +30,21 @@ _workscribe_precmd() {
   local exit_code=$?
   command -v workscribe &>/dev/null || return 0
   if [[ -n "$_workscribe_last_cmd" ]]; then
-    local now
-    now=$(date +%s%3N 2>/dev/null || echo 0)
-    local duration=$(( now - _workscribe_cmd_start ))
+    # The command is captured even when it can't be timed: no duration rather than no event
+    local now duration=""
+    now=$(_workscribe_now_ms)
+    if [[ $now =~ ^[0-9]+$ && $_workscribe_cmd_start =~ ^[0-9]+$ ]]; then
+      duration=$(( now - _workscribe_cmd_start ))
+    fi
     command workscribe _capture \
       --cmd "$_workscribe_last_cmd" \
       --cwd "$PWD" \
       --exit "$exit_code" \
-      --duration "$duration" \
+      ${duration:+--duration "$duration"} \
       ${_workscribe_git_before:+--git-before "$_workscribe_git_before"} \
       > /dev/null 2>&1 &
     _workscribe_last_cmd=""
+    _workscribe_cmd_start=""
     _workscribe_git_before=""
   fi
   # Skip the alert check on the first precmd: it fires before the shell has

package/shell/hook.zsh

@@ -1,6 +1,10 @@
 # Workscribe — developer work journal
 # Do not edit this block manually. Managed by `workscribe init`.
 # workscribe:hook:start
+# workscribe:hook-version 2
+# $EPOCHREALTIME exists only once zsh/datetime is loaded — plain zsh doesn't load it
+zmodload zsh/datetime 2>/dev/null
+
 _workscribe_preexec() {
   _workscribe_cmd_start=$EPOCHREALTIME
   _workscribe_cmd="$1"
@@ -11,16 +15,22 @@ _workscribe_precmd() {
   local exit_code=$?
   command -v workscribe > /dev/null 2>&1 || return 0
   if [[ -n "$_workscribe_cmd" ]]; then
-    local _raw_ms=$(( ($EPOCHREALTIME - $_workscribe_cmd_start) * 1000 ))
-    local duration_ms=${_raw_ms%%.*}
+    # Optional flags as an array: zsh doesn't word-split ${x:+--flag "$x"}, which would pass "--flag value" as one
+    # argument. And the command is captured even when it can't be timed.
+    local -a _workscribe_args
+    if [[ -n "$_workscribe_cmd_start" && -n "$EPOCHREALTIME" ]]; then
+      local _raw_ms=$(( (EPOCHREALTIME - _workscribe_cmd_start) * 1000 ))
+      _workscribe_args+=(--duration "${_raw_ms%%.*}")
+    fi
+    [[ -n "$_workscribe_git_before" ]] && _workscribe_args+=(--git-before "$_workscribe_git_before")
     command workscribe _capture \
       --cmd "$_workscribe_cmd" \
       --cwd "$PWD" \
       --exit "$exit_code" \
-      --duration "$duration_ms" \
-      ${_workscribe_git_before:+--git-before "$_workscribe_git_before"} \
+      "${_workscribe_args[@]}" \
       > /dev/null 2>&1 &!
     _workscribe_cmd=""
+    _workscribe_cmd_start=""
     _workscribe_git_before=""
   fi
   # Skip the alert check on the first precmd: it fires before the shell has