zxkane
diff --git a/‎docker/Dockerfile‎
Lines changed: 21 additions & 14 deletions b/‎docker/Dockerfile‎
Lines changed: 21 additions & 14 deletions
diff --git a/‎docker/agent-server-custom/Dockerfile‎
Lines changed: 14 additions & 10 deletions b/‎docker/agent-server-custom/Dockerfile‎
Lines changed: 14 additions & 10 deletions
@@ -19,45 +19,52 @@
 # This prevents Docker build cache from silently using a stale base image layer.
 # To update: docker manifest inspect docker.openhands.dev/openhands/openhands:<version>
 # and use the top-level digest (sha256:...) from the manifest list.
-ARG OPENHANDS_VERSION=1.6.0
-ARG OPENHANDS_IMAGE_DIGEST=sha256:5c0dc26f467bf8e47a6e76308edb7a30af4084b17e23a3460b5467008b12111b
+ARG OPENHANDS_VERSION=1.7.0
+# Multi-arch manifest list digest (linux/amd64 + linux/arm64) for openhands/openhands:1.7.0.
+# Refresh: docker buildx imagetools inspect docker.openhands.dev/openhands/openhands:<version>
+ARG OPENHANDS_IMAGE_DIGEST=sha256:916abcb15cc451d96853bd41c55117bb2ff3de0b9914cdcd861d338055798dc6
 FROM docker.openhands.dev/openhands/openhands:${OPENHANDS_VERSION}@${OPENHANDS_IMAGE_DIGEST}
 
 # Upgrade system packages to fix CVEs (openssl, gnutls28, etc.)
 RUN apt-get update && apt-get upgrade -y && rm -rf /var/lib/apt/lists/*
 
 # Install boto3 for AWS Bedrock support (required by litellm for AWS authentication)
-# Upgrade openhands-tools to match agent-server-custom SDK (v1.15.0)
-RUN pip install --no-cache-dir boto3 openhands-tools==1.15.0
+# Upgrade openhands-tools to match agent-server-custom SDK (v1.19.1)
+RUN pip install --no-cache-dir boto3 openhands-tools==1.19.1
 
 # ─── Build-time: Download patched upstream files from fork ───────────────────
 # Replaces the old apply-patch.sh (2000+ line regex patching at startup).
 # The fork (zxkane/openhands) has clean per-feature commits against the release tag.
 # See docker/CLAUDE.md for the full list of patched files and fork branch strategy.
-# Pin to commit SHA for reproducible builds (tag: custom-v1.6.0-fargate-r1)
-# Fargate branch: RemoteSandboxService compatible, multi-tenant isolation, Bedrock enhancements
-ARG FORK_REF=7a481ec3a7ec071851a3a854bd0c76b338c88e7b
+# Pin to commit SHA for reproducible builds (branch: custom/v1.7.0-fargate).
+# Fargate branch: RemoteSandboxService compatible, multi-tenant isolation, V1 Cognito wiring.
+ARG FORK_REF=bb3fe51c920eec0b51bc7e118e340b582db0649f
 COPY download-fork-patches.sh /opt/download-fork-patches.sh
 RUN FORK_REF=${FORK_REF} sh /opt/download-fork-patches.sh
 
 # ─── Custom modules (NEW files, not upstream modifications) ──────────────────
+#
+# v1.7.0: COPY destinations migrated to V1 paths (openhands.app_server.*).
+# Upstream deleted openhands/server/user_auth/ and openhands/storage/{settings,
+# secrets,conversation}/ in v1.7.0. The custom modules now extend the V1 ABCs
+# (UserAuth / SettingsStore / SecretsStore) and live alongside the upstream
+# defaults under openhands/app_server/{user_auth,settings,secrets}/.
+# cognito_file_conversation_store.py is dropped — there is no V1 equivalent;
+# multi-tenant conversation isolation runs through CognitoSQLAppConversationInfoService.
 
 # Patched auth_user_context.py for webhook authentication from Docker internal network
 COPY patched/ /app/patched/
 
-# Cognito user authentication (Lambda@Edge header-based identity)
-COPY cognito_user_auth.py /app/openhands/server/user_auth/
-
-# User-scoped conversation storage (S3 path: users/{user_id}/conversations/{sid}/)
-COPY cognito_file_conversation_store.py /app/openhands/storage/conversation/
+# Cognito user authentication (Lambda@Edge header-based identity) — V1 path
+COPY cognito_user_auth.py /app/openhands/app_server/user_auth/
 
 # User config loader for MCP configurations from S3
 COPY user_config_loader.py /app/openhands/server/user_config_loader.py
 
 # User-scoped settings and secrets stores for multi-tenancy (CRITICAL SECURITY)
 # Store data at users/{user_id}/settings.json and users/{user_id}/secrets.json
-COPY s3_settings_store.py /app/openhands/storage/settings/
-COPY s3_secrets_store.py /app/openhands/storage/secrets/
+COPY s3_settings_store.py /app/openhands/app_server/settings/
+COPY s3_secrets_store.py /app/openhands/app_server/secrets/
 
 # Multi-tenant conversation isolation (user_id-based filtering)
 COPY cognito_sql_conversation_info_service.py /app/openhands/app_server/app_conversation/
 
@@ -1,13 +1,14 @@
 # Custom agent-server build with boto3 included in PyInstaller bundle
 # This builds the agent-server binary from source with boto3/botocore as hidden imports
 #
-# Build-time patches (Patch 23-26) are applied via apply-sdk-patches.py
-# These patches MUST be at build time because PyInstaller creates an immutable binary.
-# Runtime patches are in docker/apply-patch.sh for the OpenHands container.
+# Build-time patches are applied via apply-sdk-patches.py — see that file for the
+# active patch set. These patches MUST be at build time because PyInstaller
+# creates an immutable binary. Runtime patches are in docker/apply-startup.sh
+# for the OpenHands container.
 
 # Stage 1: Build the binary
 # LAST_UPDATED forces CDK to rebuild when bumped (picks up base image security patches)
-ARG LAST_UPDATED=2026-04-08
+ARG LAST_UPDATED=2026-05-14
 FROM python:3.12-slim-bookworm AS builder
 
 # Install build dependencies
@@ -20,13 +21,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Install uv for fast package management
 RUN pip install uv
 
-# Clone the OpenHands SDK repository
+# Clone the OpenHands SDK repository.
+# Pinned to v1.19.1 alongside the OpenHands v1.7.0 upgrade (PR #81). The fork
+# patches in apply-sdk-patches.py are anchored against this exact version.
 WORKDIR /build
-RUN git clone --depth 1 --branch v1.15.0 https://github.com/OpenHands/software-agent-sdk.git .
+ARG SDK_VERSION=v1.19.1
+RUN git clone --depth 1 --branch ${SDK_VERSION} https://github.com/OpenHands/software-agent-sdk.git .
 
 # Copy and run SDK patches
-# Patches 23, 25-27: Handle invalid/masked secrets + Bedrock max_output_tokens
-# See apply-sdk-patches.py for detailed documentation
+# Patches 23, 25-26, 28-32: secret-resume validators + Bedrock listing/region/env
+# See apply-sdk-patches.py for detailed documentation.
 COPY apply-sdk-patches.py /build/
 RUN python3 /build/apply-sdk-patches.py /build
 
@@ -194,8 +198,8 @@ RUN id -u openhands 2>/dev/null || useradd -m -s /bin/bash openhands
 # Copy the built binary
 COPY --from=builder /build/dist/openhands-agent-server /usr/local/bin/openhands-agent-server
 
-# Copy VSCode server from official agent-server image
-COPY --from=ghcr.io/openhands/agent-server:1.15.0-python /openhands/.openvscode-server /openhands/.openvscode-server
+# Copy VSCode server from official agent-server image (must track SDK_VERSION above)
+COPY --from=ghcr.io/openhands/agent-server:1.19.1-python /openhands/.openvscode-server /openhands/.openvscode-server
 
 # Set permissions
 RUN chown -R openhands:openhands /openhands && \