@opencode-cloud/core 6.2.0 → 6.3.1

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "opencode-cloud-core"
-version = "6.2.0"
+version = "6.3.1"
 edition = "2024"
 rust-version = "1.88"
 license = "MIT"

package/package.json

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

package/src/config/mod.rs

@@ -65,7 +65,7 @@ pub fn ensure_data_dir() -> Result<PathBuf> {
 /// If the config file doesn't exist, creates a new one with default values.
 /// Supports JSONC (JSON with comments).
 /// Rejects unknown fields for strict validation.
-pub fn load_config() -> Result<Config> {
+pub fn load_config_or_default() -> Result<Config> {
     let config_path =
         get_config_path().ok_or_else(|| anyhow::anyhow!("Could not determine config file path"))?;
 

package/src/docker/Dockerfile

@@ -516,7 +516,7 @@ RUN echo 'export PATH="/home/opencode/.local/bin:$PATH"' >> /home/opencode/.zshr
 # Clone the fork and build opencode from source (as non-root user)
 # Pin to specific commit for reproducibility
 # Build opencode from source (BuildKit cache mounts disabled for now)
-RUN OPENCODE_COMMIT="ed7d5c6d7fcaf0a4ab94894f8825a08a55eebb67" \
+RUN OPENCODE_COMMIT="ecaebed0934eeda267a66226eb8c2106beaf68c8" \
     && rm -rf /tmp/opencode-repo \
     && git clone --depth 1 https://github.com/pRizz/opencode.git /tmp/opencode-repo \
     && cd /tmp/opencode-repo \

package/src/docker/exec.rs

@@ -82,6 +82,76 @@ pub async fn exec_command(
     Ok(output)
 }
 
+/// Execute a command and capture output plus exit code
+///
+/// Returns a tuple of (output, exit_code). Exit code is -1 if not available.
+pub async fn exec_command_with_status(
+    client: &DockerClient,
+    container: &str,
+    cmd: Vec<&str>,
+) -> Result<(String, i64), DockerError> {
+    let exec_config = CreateExecOptions {
+        attach_stdout: Some(true),
+        attach_stderr: Some(true),
+        cmd: Some(cmd.iter().map(|s| s.to_string()).collect()),
+        user: Some("root".to_string()),
+        ..Default::default()
+    };
+
+    let exec = client
+        .inner()
+        .create_exec(container, exec_config)
+        .await
+        .map_err(|e| DockerError::Container(format!("Failed to create exec: {e}")))?;
+
+    let exec_id = exec.id.clone();
+    let start_config = StartExecOptions {
+        detach: false,
+        ..Default::default()
+    };
+
+    let mut output = String::new();
+
+    match client
+        .inner()
+        .start_exec(&exec.id, Some(start_config))
+        .await
+        .map_err(|e| DockerError::Container(format!("Failed to start exec: {e}")))?
+    {
+        StartExecResults::Attached {
+            output: mut stream, ..
+        } => {
+            while let Some(result) = stream.next().await {
+                match result {
+                    Ok(log_output) => {
+                        output.push_str(&log_output.to_string());
+                    }
+                    Err(e) => {
+                        return Err(DockerError::Container(format!(
+                            "Error reading exec output: {e}"
+                        )));
+                    }
+                }
+            }
+        }
+        StartExecResults::Detached => {
+            return Err(DockerError::Container(
+                "Exec unexpectedly detached".to_string(),
+            ));
+        }
+    }
+
+    let inspect = client
+        .inner()
+        .inspect_exec(&exec_id)
+        .await
+        .map_err(|e| DockerError::Container(format!("Failed to inspect exec: {e}")))?;
+
+    let exit_code = inspect.exit_code.unwrap_or(-1);
+
+    Ok((output, exit_code))
+}
+
 /// Execute a command with stdin input and capture output
 ///
 /// Creates an exec instance with stdin attached, writes the provided data to

package/src/docker/mod.rs

@@ -50,7 +50,9 @@ pub use update::{UpdateResult, has_previous_image, rollback_image, update_image}
 pub use version::{VERSION_LABEL, get_cli_version, get_image_version, versions_compatible};
 
 // Container exec operations
-pub use exec::{exec_command, exec_command_exit_code, exec_command_with_stdin};
+pub use exec::{
+    exec_command, exec_command_exit_code, exec_command_with_status, exec_command_with_stdin,
+};
 
 // User management operations
 pub use users::{

package/src/lib.rs

@@ -14,7 +14,7 @@ pub mod version;
 pub use version::{get_version, get_version_long};
 
 // Re-export config types and functions
-pub use config::{Config, get_hosts_path, load_config, save_config};
+pub use config::{Config, get_hosts_path, load_config_or_default, save_config};
 
 // Re-export singleton types
 pub use singleton::{InstanceLock, SingletonError};