@vellumai/assistant 0.8.2 → 0.8.3

package/ARCHITECTURE.md

@@ -290,18 +290,17 @@ When a voice call's ASK_GUARDIAN consultation times out before the guardian resp
 
 **Key source files:**
 
-| File                                                    | Purpose                                                                                                                                                                                            |
-| ------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `src/memory/guardian-action-store.ts`                   | Follow-up state machine with atomic transitions (`startFollowupFromExpiredRequest`, `progressFollowupState`, `finalizeFollowup`) and query helpers for pending/expired/follow-up deliveries        |
-| `src/runtime/guardian-action-message-composer.ts`       | 2-tier text generation: daemon-injected LLM generator with deterministic fallback templates. Covers all scenarios from timeout acknowledgment through follow-up completion                         |
-| `src/runtime/guardian-action-conversation-turn.ts`      | Follow-up decision engine: classifies guardian replies into `call_back`, `decline`, or `keep_pending` dispositions using LLM tool calling                                                          |
-| `src/runtime/guardian-action-followup-executor.ts`      | Action dispatch: resolves counterparty from call session, executes `call_back` (outbound call via `startCall`), finalizes follow-up state                                                          |
-| `src/daemon/guardian-action-generators.ts`              | Daemon-injected generator factories: `createGuardianActionCopyGenerator` (latency-optimized text rewriting) and `createGuardianFollowUpConversationGenerator` (tool-calling intent classification) |
-| `src/calls/call-controller.ts`                          | Voice timeout handling: marks requests as timed out, sends expiry notices, injects `[GUARDIAN_TIMEOUT]` instruction for generated voice response                                                   |
-| `src/runtime/routes/inbound-message-handler.ts`         | Late reply interception for Telegram channels: matches late answers to expired requests, routes follow-up conversation turns, dispatches actions                                                   |
-| `src/daemon/conversation-process.ts`                    | Late reply interception for mac channel: same logic as inbound-message-handler but using conversation-ID-based delivery lookup                                                                     |
-| `src/calls/guardian-action-sweep.ts`                    | Periodic sweep for stale pending requests; sends expiry notices to guardian destinations                                                                                                           |
-| `src/memory/migrations/030-guardian-action-followup.ts` | Schema migration adding follow-up columns (`followup_state`, `late_answer_text`, `late_answered_at`, `followup_action`, `followup_completed_at`)                                                   |
+| File                                                    | Purpose                                                                                                                                                                                     |
+| ------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `src/memory/guardian-action-store.ts`                   | Follow-up state machine with atomic transitions (`startFollowupFromExpiredRequest`, `progressFollowupState`, `finalizeFollowup`) and query helpers for pending/expired/follow-up deliveries |
+| `src/runtime/guardian-action-message-composer.ts`       | 2-tier text generation: daemon-injected LLM generator with deterministic fallback templates. Covers all scenarios from timeout acknowledgment through follow-up completion                  |
+| `src/runtime/guardian-action-followup-executor.ts`      | Action dispatch: resolves counterparty from call session, executes `call_back` (outbound call via `startCall`), finalizes follow-up state                                                   |
+| `src/daemon/guardian-action-generators.ts`              | Daemon-injected generator factory: `createGuardianActionCopyGenerator` (latency-optimized text rewriting for guardian-facing copy)                                                          |
+| `src/calls/call-controller.ts`                          | Voice timeout handling: marks requests as timed out, sends expiry notices, injects `[GUARDIAN_TIMEOUT]` instruction for generated voice response                                            |
+| `src/runtime/routes/inbound-message-handler.ts`         | Late reply interception for Telegram channels: matches late answers to expired requests, routes follow-up conversation turns, dispatches actions                                            |
+| `src/daemon/conversation-process.ts`                    | Late reply interception for mac channel: same logic as inbound-message-handler but using conversation-ID-based delivery lookup                                                              |
+| `src/calls/guardian-action-sweep.ts`                    | Periodic sweep for stale pending requests; sends expiry notices to guardian destinations                                                                                                    |
+| `src/memory/migrations/030-guardian-action-followup.ts` | Schema migration adding follow-up columns (`followup_state`, `late_answer_text`, `late_answered_at`, `followup_action`, `followup_completed_at`)                                            |
 
 ### WhatsApp Channel (Meta Cloud API)
 

package/docker-entrypoint.sh

@@ -5,11 +5,22 @@ set -eu
 # processes (the `assistant` user, bun's tmpdir, scratch writes) can use it.
 chmod 1777 /tmp 2>/dev/null || true
 
+KATA_APT_INIT_PID=""
 if [ "${VELLUM_SANDBOX_RUNTIME:-}" = "kata" ] && [ -x /app/assistant/docker-init-apt-root.sh ]; then
+  export VELLUM_APT_DATA_ROOT="${VELLUM_APT_DATA_ROOT:-/data/system}"
   . /app/assistant/docker-kata-apt-env.sh
-  /app/assistant/docker-init-apt-root.sh
+  # Warm the chroot used by kata apt wrappers without blocking assistant readiness.
+  /app/assistant/docker-init-apt-root.sh &
+  KATA_APT_INIT_PID="$!"
 fi
 
+wait_for_kata_apt_root() {
+  if [ -n "${KATA_APT_INIT_PID}" ]; then
+    wait "${KATA_APT_INIT_PID}"
+    KATA_APT_INIT_PID=""
+  fi
+}
+
 if [ "$(id -u)" = "0" ] && [ "${VELLUM_WORKSPACE_DIR:-}" = "/workspace" ] && [ -d /workspace ]; then
   git config --global --add safe.directory /workspace >/dev/null 2>&1 || true
   git config --global --add safe.directory '/workspace/*' >/dev/null 2>&1 || true
@@ -23,6 +34,7 @@ fi
 if [ -d /workspace/.entrypoint.d ]; then
   for hook in /workspace/.entrypoint.d/*.sh; do
     [ -r "$hook" ] || continue
+    wait_for_kata_apt_root
     . "$hook" || echo "Warning: workspace hook $hook exited $?" >&2
   done
 fi

package/docker-init-apt-root.sh

@@ -2,17 +2,79 @@
 set -eu
 
 DATA_ROOT="${VELLUM_APT_DATA_ROOT:-/data/system}"
+ROOT_PARENT="$(dirname "${DATA_ROOT}")"
 SENTINEL="${DATA_ROOT}/.rootfs-initialized"
+BOOTSTRAP_ROOT="${DATA_ROOT}.bootstrap.$$"
+PROBE_ROOT="${DATA_ROOT}.probe.$$"
+LOCK_DIR="${DATA_ROOT}.rootfs-init.lock"
+LOCK_PID="${LOCK_DIR}/pid"
 HOST_PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 
 if [ "${VELLUM_SANDBOX_RUNTIME:-}" != "kata" ]; then
   exit 0
 fi
 
+case "${DATA_ROOT}" in
+  ''|/)
+    echo "Warning: invalid VELLUM_APT_DATA_ROOT '${DATA_ROOT}'; falling back to image-root apt installs" >&2
+    exit 0
+    ;;
+esac
+
 # Bootstrap the alternate root with the host toolchain so the wrapper
 # binaries in /usr/local/bin do not recurse back into this script.
 export PATH="${HOST_PATH}"
 
+rootfs_ready() {
+  [ -f "${SENTINEL}" ] && [ -x "${DATA_ROOT}/bin/sh" ] && [ -x "${DATA_ROOT}/usr/bin/apt-get" ]
+}
+
+acquire_init_lock() {
+  if ! mkdir -p "${ROOT_PARENT}"; then
+    return 1
+  fi
+
+  while ! mkdir "${LOCK_DIR}" 2>/dev/null; do
+    if [ ! -d "${LOCK_DIR}" ]; then
+      return 1
+    fi
+
+    if rootfs_ready; then
+      exit 0
+    fi
+
+    if [ ! -r "${LOCK_PID}" ]; then
+      sleep 1
+      if [ ! -r "${LOCK_PID}" ]; then
+        rm -rf "${LOCK_DIR}" 2>/dev/null || return 1
+      fi
+      continue
+    fi
+
+    lock_pid="$(cat "${LOCK_PID}" 2>/dev/null || true)"
+    case "${lock_pid}" in
+      ''|*[!0-9]*)
+        sleep 1
+        if [ "$(cat "${LOCK_PID}" 2>/dev/null || true)" = "${lock_pid}" ]; then
+          rm -rf "${LOCK_DIR}" 2>/dev/null || return 1
+        fi
+        ;;
+      *)
+        if kill -0 "${lock_pid}" 2>/dev/null; then
+          sleep 1
+        else
+          rm -rf "${LOCK_DIR}" 2>/dev/null || return 1
+        fi
+        ;;
+    esac
+  done
+
+  printf '%s\n' "$$" >"${LOCK_PID}" 2>/dev/null || true
+  trap 'rm -rf "${LOCK_DIR}" "${BOOTSTRAP_ROOT}" "${PROBE_ROOT}"' EXIT
+  trap 'rm -rf "${LOCK_DIR}" "${BOOTSTRAP_ROOT}" "${PROBE_ROOT}"; exit 130' INT
+  trap 'rm -rf "${LOCK_DIR}" "${BOOTSTRAP_ROOT}" "${PROBE_ROOT}"; exit 143' TERM
+}
+
 check_sane_mount() {
   target="$1"
   probe_dev="${target}/.apt-test-dev-null"
@@ -55,19 +117,29 @@ EOF
   return 0
 }
 
-if [ -f "${SENTINEL}" ] && [ -x "${DATA_ROOT}/bin/sh" ] && [ -x "${DATA_ROOT}/usr/bin/apt-get" ]; then
+if rootfs_ready; then
   exit 0
 fi
 
-if grep -qs " ${DATA_ROOT} .*noexec" /proc/mounts; then
+if ! acquire_init_lock; then
+  echo "Warning: ${DATA_ROOT} cannot host the apt rootfs lock; falling back to image-root apt installs" >&2
+  exit 0
+fi
+
+if rootfs_ready; then
+  exit 0
+fi
+
+if grep -qs " ${DATA_ROOT} .*noexec" /proc/mounts || grep -qs " ${ROOT_PARENT} .*noexec" /proc/mounts; then
   echo "Warning: ${DATA_ROOT} is mounted noexec; skipping persistent apt rootfs bootstrap" >&2
   exit 0
 fi
 
-if ! check_sane_mount "${DATA_ROOT}"; then
+if ! check_sane_mount "${PROBE_ROOT}"; then
   echo "Warning: ${DATA_ROOT} cannot host a chrootable apt rootfs here; falling back to image-root apt installs" >&2
   exit 0
 fi
+rm -rf "${PROBE_ROOT}"
 
 if [ -x "${DATA_ROOT}/bin/sh" ] && [ -x "${DATA_ROOT}/usr/bin/apt-get" ]; then
   touch "${SENTINEL}"
@@ -87,8 +159,9 @@ fi
 MIRROR="${VELLUM_APT_DATA_MIRROR:-http://deb.debian.org/debian}"
 ARCH="$(/usr/bin/dpkg --print-architecture)"
 
-mkdir -p "${DATA_ROOT}"
-
-debootstrap --variant=minbase --arch="${ARCH}" "${SUITE}" "${DATA_ROOT}" "${MIRROR}"
+rm -rf "${BOOTSTRAP_ROOT}"
+debootstrap --variant=minbase --arch="${ARCH}" "${SUITE}" "${BOOTSTRAP_ROOT}" "${MIRROR}"
 
+rm -rf "${DATA_ROOT}"
+mv "${BOOTSTRAP_ROOT}" "${DATA_ROOT}"
 touch "${SENTINEL}"