@opencode-cloud/core 3.2.0 → 3.2.1

package/Cargo.toml

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

package/package.json

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

package/src/config/mod.rs

@@ -15,7 +15,7 @@ use anyhow::{Context, Result};
 use jsonc_parser::parse_to_serde_value;
 
 pub use paths::{get_config_dir, get_config_path, get_data_dir, get_hosts_path, get_pid_path};
-pub use schema::{Config, validate_bind_address};
+pub use schema::{CommitSha, Config, validate_bind_address};
 pub use validation::{
     ValidationError, ValidationWarning, display_validation_error, display_validation_warning,
     validate_config,

package/src/config/schema.rs

@@ -4,6 +4,50 @@
 
 use serde::{Deserialize, Serialize};
 use std::net::{IpAddr, Ipv4Addr};
+use std::ops::Deref;
+
+/// Validated opencode commit SHA (7-40 hex characters)
+#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
+#[serde(transparent)]
+pub struct CommitSha(String);
+
+impl CommitSha {
+    pub fn parse(value: &str) -> Result<Self, String> {
+        let trimmed = value.trim();
+        if trimmed.is_empty() {
+            return Err("Commit cannot be empty".to_string());
+        }
+        if !(7..=40).contains(&trimmed.len()) {
+            return Err("Commit must be 7-40 hex characters".to_string());
+        }
+        if !trimmed.chars().all(|c| c.is_ascii_hexdigit()) {
+            return Err("Commit must be a hexadecimal SHA".to_string());
+        }
+        Ok(Self(trimmed.to_string()))
+    }
+
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+}
+
+impl Deref for CommitSha {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        self.as_str()
+    }
+}
+
+impl<'de> Deserialize<'de> for CommitSha {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let value = String::deserialize(deserializer)?;
+        CommitSha::parse(&value).map_err(serde::de::Error::custom)
+    }
+}
 
 /// Main configuration structure for opencode-cloud
 ///
@@ -112,6 +156,11 @@ pub struct Config {
     #[serde(default = "default_image_source")]
     pub image_source: String,
 
+    /// Override opencode commit used when building the Docker image (optional)
+    /// Must be a 7-40 character hex commit SHA.
+    #[serde(default)]
+    pub opencode_commit: Option<CommitSha>,
+
     /// When to check for updates: 'always' (every start), 'once' (once per version), 'never'
     #[serde(default = "default_update_check")]
     pub update_check: String,
@@ -225,6 +274,7 @@ impl Default for Config {
             cockpit_port: default_cockpit_port(),
             cockpit_enabled: default_cockpit_enabled(),
             image_source: default_image_source(),
+            opencode_commit: None,
             update_check: default_update_check(),
             mounts: Vec::new(),
         }
@@ -366,6 +416,7 @@ mod tests {
             cockpit_port: 9090,
             cockpit_enabled: true,
             image_source: default_image_source(),
+            opencode_commit: None,
             update_check: default_update_check(),
             mounts: Vec::new(),
         };

package/src/docker/Dockerfile

@@ -35,7 +35,7 @@
 FROM ubuntu:24.04 AS runtime
 
 # Pin opencode fork commit used during build
-ARG OPENCODE_COMMIT=798ccdba1265b7e5499ba49db2f99ca1dd4a15d7
+ARG OPENCODE_COMMIT=dac099a4892689d11abedb0fcc1098b50e0958c8
 
 # OCI Labels for image metadata
 LABEL org.opencontainers.image.title="opencode-cloud"

package/src/docker/dockerfile.rs

@@ -7,9 +7,27 @@
 //! clearly indicate this is the sandboxed container environment that the
 //! opencode-cloud CLI deploys, not the CLI tool itself.
 
+use std::collections::HashMap;
+
 /// The Dockerfile for building the opencode-cloud-sandbox container image
 pub const DOCKERFILE: &str = include_str!("Dockerfile");
 
+/// Build arg name for the opencode commit used in the Dockerfile.
+pub const OPENCODE_COMMIT_BUILD_ARG: &str = "OPENCODE_COMMIT";
+
+/// Default opencode commit pinned in the Dockerfile.
+pub const OPENCODE_COMMIT_DEFAULT: &str = "dac099a4892689d11abedb0fcc1098b50e0958c8";
+
+/// Build args for overriding the opencode commit in the Dockerfile.
+pub fn build_args_for_opencode_commit(
+    maybe_commit: Option<&str>,
+) -> Option<HashMap<String, String>> {
+    let commit = maybe_commit?;
+    let mut args = HashMap::new();
+    args.insert(OPENCODE_COMMIT_BUILD_ARG.to_string(), commit.to_string());
+    Some(args)
+}
+
 // =============================================================================
 // Docker Image Naming
 // =============================================================================

package/src/docker/image.rs

@@ -81,6 +81,7 @@ pub async fn build_image(
     tag: Option<&str>,
     progress: &mut ProgressReporter,
     no_cache: bool,
+    build_args: Option<HashMap<String, String>>,
 ) -> Result<String, DockerError> {
     let tag = tag.unwrap_or(IMAGE_TAG_DEFAULT);
     let full_name = format!("{IMAGE_NAME_GHCR}:{tag}");
@@ -100,6 +101,7 @@ pub async fn build_image(
             .unwrap_or_default()
             .as_nanos()
     );
+    let build_args = build_args.unwrap_or_default();
     let options = BuildImageOptions {
         t: full_name.clone(),
         dockerfile: "Dockerfile".to_string(),
@@ -107,6 +109,7 @@ pub async fn build_image(
         session: Some(session_id),
         rm: true,
         nocache: no_cache,
+        buildargs: build_args,
         ..Default::default()
     };
 

package/src/docker/mod.rs

@@ -38,7 +38,10 @@ pub use health::{
 };
 
 // Dockerfile constants
-pub use dockerfile::{DOCKERFILE, IMAGE_NAME_DOCKERHUB, IMAGE_NAME_GHCR, IMAGE_TAG_DEFAULT};
+pub use dockerfile::{
+    DOCKERFILE, IMAGE_NAME_DOCKERHUB, IMAGE_NAME_GHCR, IMAGE_TAG_DEFAULT,
+    OPENCODE_COMMIT_BUILD_ARG, OPENCODE_COMMIT_DEFAULT, build_args_for_opencode_commit,
+};
 
 // Image operations
 pub use image::{build_image, image_exists, pull_image};