@opencode-cloud/core 16.0.0 → 18.0.0

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "opencode-cloud-core"
-version = "16.0.0"
+version = "18.0.0"
 edition = "2024"
 rust-version = "1.89"
 license = "MIT"

package/README.md

@@ -192,7 +192,7 @@ occ start --port 8080
 # Start and open browser
 occ start --open
 
-# Check service status
+# Check service status (includes broker health: Healthy/Degraded/Unhealthy)
 occ status
 
 # View logs
@@ -204,7 +204,7 @@ occ logs -f
 # View opencode-broker logs (systemd/journald required)
 occ logs --broker
 
-# Dump opencode-broker logs (no follow)
+# Troubleshoot broker health issues reported by `occ status`
 occ logs --broker --no-follow
 
 # Note: Broker logs require systemd/journald. This is enabled by default on supported Linux

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-cloud/core",
-  "version": "16.0.0",
+  "version": "18.0.0",
   "description": "Core NAPI bindings for opencode-cloud (internal package)",
   "main": "index.js",
   "types": "index.d.ts",

package/src/docker/Dockerfile

@@ -1,6 +1,12 @@
 # =============================================================================
 # opencode-cloud Container Image
 # =============================================================================
+# IMPORTANT:
+# Keep scripts/service/config assets in `packages/core/src/docker/files/`
+# and COPY them into the image instead of embedding large inline shell blocks.
+# When adding files, also update `packages/core/src/docker/image.rs`
+# (`create_build_context`) so CLI-driven Docker builds include them.
+#
 # A comprehensive development environment for AI-assisted coding with opencode.
 #
 # Features:
@@ -578,13 +584,17 @@ RUN chmod +x /usr/local/bin/entrypoint.sh
 # Note: Don't set USER here - entrypoint needs root to use runuser
 # The tini mode drops privileges to opencode user via runuser
 
+# Healthcheck script asset
+COPY packages/core/src/docker/files/healthcheck.sh /usr/local/bin/healthcheck.sh
+RUN chmod +x /usr/local/bin/healthcheck.sh
+
 # -----------------------------------------------------------------------------
 # Health Check
 # -----------------------------------------------------------------------------
-# Check that opencode main page responds
+# Check broker readiness (process + socket) and opencode web response
 # Works for both tini and systemd modes
 HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
-    CMD ["sh", "-c", "OPENCODE_PORT=\"${OPENCODE_PORT:-${PORT:-3000}}\"; curl -f -H \"Accept: text/html\" \"http://localhost:${OPENCODE_PORT}/\" || exit 1"]
+    CMD ["/usr/local/bin/healthcheck.sh"]
 
 # -----------------------------------------------------------------------------
 # opencode Artifacts

package/src/docker/files/entrypoint.sh

@@ -5,10 +5,44 @@ log() {
     echo "[opencode-cloud] $*"
 }
 
+read_opencode_cloud_version() {
+    local version_file="/etc/opencode-cloud-version"
+    local version
+
+    if [ -r "${version_file}" ]; then
+        version="$(head -n 1 "${version_file}" 2>/dev/null | tr -d "\r\n")"
+    else
+        version=""
+    fi
+
+    if [ -z "${version}" ]; then
+        printf "dev"
+    else
+        printf "%s" "${version}"
+    fi
+}
+
+print_welcome_banner() {
+    local version
+    version="$(read_opencode_cloud_version)"
+
+    log "----------------------------------------------------------------------"
+    log "Welcome to opencode-cloud-sandbox"
+    log "You are running opencode-cloud v${version}"
+    log "For questions, problems, and feature requests, file an issue:"
+    log "  https://github.com/pRizz/opencode-cloud/issues"
+    log "opencode-cloud runs opencode in a Docker sandbox; use occ/opencode-cloud CLI to manage users, mounts, and updates."
+    log "Quick start: occ user add <username> | occ status | occ logs -f"
+    log "Docs: https://github.com/pRizz/opencode-cloud#readme"
+    log "----------------------------------------------------------------------"
+}
+
 OPENCODE_PORT="${OPENCODE_PORT:-${PORT:-3000}}"
 OPENCODE_HOST="${OPENCODE_HOST:-0.0.0.0}"
 export OPENCODE_PORT OPENCODE_HOST
 
+print_welcome_banner
+
 detect_droplet() {
     local hint="${OPENCODE_CLOUD_ENV:-}"
     if [ -n "${hint}" ]; then
@@ -63,13 +97,6 @@ if [ -n "${non_persistent_paths}" ]; then
     log "================================================================="
 fi
 
-log "----------------------------------------------------------------------"
-log "If you created this container via opencode-cloud CLI, add users with:"
-log "  occ user add   (or: opencode-cloud user add)"
-log "Learn more: occ --help (or: opencode-cloud --help)"
-log "Docs: https://github.com/pRizz/opencode-cloud#readme"
-log "----------------------------------------------------------------------"
-
 if [ "${USE_SYSTEMD:-}" = "1" ]; then
     exec /sbin/init
 else

package/src/docker/files/healthcheck.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -eu
+
+opencode_port="${OPENCODE_PORT:-${PORT:-3000}}"
+
+if [ -d /run/systemd/system ]; then
+    systemctl is-active --quiet opencode-broker.service
+else
+    pgrep -x opencode-broker >/dev/null
+fi
+
+test -S /run/opencode/auth.sock
+curl -fsS -H "Accept: text/html" "http://localhost:${opencode_port}/" >/dev/null

package/src/docker/image.rs

@@ -895,6 +895,12 @@ fn create_build_context() -> Result<Vec<u8>, std::io::Error> {
             include_bytes!("files/entrypoint.sh"),
             0o644,
         )?;
+        append_bytes(
+            &mut tar,
+            "packages/core/src/docker/files/healthcheck.sh",
+            include_bytes!("files/healthcheck.sh"),
+            0o644,
+        )?;
         append_bytes(
             &mut tar,
             "packages/core/src/docker/files/opencode-broker.service",
@@ -1006,18 +1012,31 @@ mod tests {
         let cursor = Cursor::new(context);
         let decoder = GzDecoder::new(cursor);
         let mut archive = Archive::new(decoder);
-        let mut found = false;
+        let mut found_entrypoint = false;
+        let mut found_healthcheck = false;
 
         for entry in archive.entries().expect("should read archive entries") {
             let entry = entry.expect("should read entry");
             let path = entry.path().expect("should read entry path");
             if path == std::path::Path::new("packages/core/src/docker/files/entrypoint.sh") {
-                found = true;
+                found_entrypoint = true;
+            }
+            if path == std::path::Path::new("packages/core/src/docker/files/healthcheck.sh") {
+                found_healthcheck = true;
+            }
+            if found_entrypoint && found_healthcheck {
                 break;
             }
         }
 
-        assert!(found, "entrypoint asset should be in the build context");
+        assert!(
+            found_entrypoint,
+            "entrypoint asset should be in the build context"
+        );
+        assert!(
+            found_healthcheck,
+            "healthcheck asset should be in the build context"
+        );
     }
 
     #[test]