mirror of
https://github.com/OpenHands/OpenHands.git
synced 2026-10-07 16:08:23 +08:00
* settings: persist app preferences and disabled_skills on the agent-server The local agent-server now exposes app_preferences on the persisted settings (OpenHands/software-agent-sdk#3539): language, sound notifications, analytics consent, git identity, and disabled_skills are returned on GET /api/settings under app_preferences and updated via a new app_preferences_diff field on PATCH /api/settings. This brings the local agent-server to parity with the cloud, which has always accepted the same keys at the top level. Drops the localStorage workaround that mirrored these fields in two keys (openhands-agent-server-app-preferences and openhands-agent-server-disabled-skills), along with the app-preferences-store.ts module and the DISABLED_SKILLS_STORAGE_KEY helpers it depended on. - SettingsService.transformApiResponse reads app_preferences from the server response and hoists each field onto the flat Settings shape so consumers (settings.language, settings.disabled_skills, …) keep working unchanged. - SettingsService.saveSettings routes the same set of fields through the new app_preferences_diff for local backends and through the existing app_preferences flat-spread path for cloud backends. - New legacy-app-preferences-migration.ts runs once on first getSettings() after upgrade: when the server reports an app_preferences block AND legacy localStorage values are still present, it pushes them up via app_preferences_diff and clears the legacy keys. Pre-1.27 servers (which omit app_preferences entirely) cause the migration to no-op so existing data isn't dropped before the server can accept it. - Updated MSW handlers to round-trip app_preferences and app_preferences_diff so the mock backend matches production. - Test coverage: 5 new tests in __tests__/api/settings-service.test.ts for the local round-trip, the mixed diff routing, the legacy migration, and the pre-1.27 skip path. Closes the localStorage workaround called out in the recent audit of agent-canvas localStorage usage (items 3 and 4: disabled_skills and app-preferences fields). Depends on agent-server 1.27 / SDK PR #3539. Co-authored-by: openhands <openhands@all-hands.dev> * settings: read/write app preferences via misc_settings container Follow-up to the localStorage cleanup in this PR + SDK refactor in openhands/software-agent-sdk#3543. The agent-server now exposes frontend-owned settings under a generic misc_settings container instead of a top-level app_preferences field. Wire shape changes: Before: After: GET /api/settings GET /api/settings -> { app_preferences: {...} } -> { misc_settings: { app_preferences: {...} } } PATCH /api/settings PATCH /api/settings body.app_preferences_diff (shallow body.misc_settings_diff (deep-merged, overlay, replaces named fields) same semantics as agent_settings_diff) Why the rename to misc_settings: the previous name pinned the API to a single 'frontend-owned' namespace. Adding a future category like ui_preferences (sidebar layout / view modes) would have required either yet another top-level field or shoehorning unrelated UI state into AppPreferences. With misc_settings as a container, new categories drop in as nested fields without churning the top-level shape. Changes: - settings-service.api.ts * SettingsApiResponse.app_preferences -> .misc_settings (typed) * SettingsUpdateRequest.app_preferences_diff -> .misc_settings_diff * Add MiscSettings interface * transformApiResponse reads response.misc_settings?.app_preferences * saveSettings emits { misc_settings_diff: { app_preferences } } * Local 'has any diffs' check tracks misc_settings_diff * Doc comments updated; semantics noted as deep-merge - legacy-app-preferences-migration.ts * Gate on serverResponse.misc_settings, not .app_preferences * pushDiff callback now wraps the diff in { app_preferences: ... } - src/mocks/settings-handlers.ts * GET handler returns misc_settings.app_preferences * PATCH handler accepts misc_settings_diff; deep-merges nested app_preferences into the persisted block * Internal mock state stores under misc_settings to match wire shape - __tests__/api/settings-service.test.ts * Four tests updated to assert the new wire shape (local PATCH body, GET round-trip, mixed-diff routing, legacy localStorage migration) * Pre-1.27 detection test now keys off missing misc_settings - AGENTS.md * App-preferences note rewritten for the misc_settings container, explains deep-merge semantics, and documents the in-flight rename (flat shape introduced in #3539 never shipped to users) Cloud path is unchanged: cloud /api/v1/settings still accepts the fields as flat top-level keys, mirrored by saveCloudSettings. Verification: $ npm run typecheck exit 0 $ npm test -- __tests__/api/settings-service.test.ts \ __tests__/api/mock-settings-handlers.test.ts 23 tests passed $ npm test 3009 passed | 12 skipped | 9 todo $ npm run lint All matched files use Prettier code style! $ npm run build built in 1.50s Co-authored-by: openhands <openhands@all-hands.dev> * Bump agent-server default to 1.27.0 Co-authored-by: openhands <openhands@all-hands.dev> --------- Co-authored-by: openhands <openhands@all-hands.dev>
448 lines
14 KiB
JavaScript
448 lines
14 KiB
JavaScript
#!/usr/bin/env node
|
|
|
|
/**
|
|
* Check SDK Version Sync
|
|
*
|
|
* Verifies that the released automation package (openhands-automation on PyPI)
|
|
* uses the SDK version expected for that automation release for all agent SDK libraries:
|
|
* - openhands-sdk
|
|
* - openhands-tools
|
|
* - openhands-workspace
|
|
* - openhands-agent-server
|
|
*
|
|
* This script checks the RELEASED PyPI version of openhands-automation (as specified
|
|
* by versions.automation in config/defaults.json), not the main branch.
|
|
* versions.automationSdk records the SDK dependency version for that
|
|
* released automation package and may intentionally lag versions.agentServer.
|
|
*
|
|
* This script is run in CI to catch version drift between projects.
|
|
*
|
|
* Usage:
|
|
* node scripts/check-sdk-version-sync.mjs
|
|
* EXPECTED_SDK_VERSION=1.27.0 node scripts/check-sdk-version-sync.mjs
|
|
* node scripts/check-sdk-version-sync.mjs --check-pypi
|
|
*
|
|
* Environment variables:
|
|
* EXPECTED_SDK_VERSION - Override the expected version (instead of reading from config/defaults.json)
|
|
* AUTOMATION_PACKAGE_NAME - Override the automation package name (default: openhands-automation)
|
|
* AUTOMATION_PACKAGE_VERSION - Override the automation package version (instead of reading from config/defaults.json)
|
|
*
|
|
* Options:
|
|
* --check-pypi Also check the latest SDK version on PyPI
|
|
* --help Show help
|
|
*
|
|
* Exit codes:
|
|
* 0 - All SDK versions match
|
|
* 1 - Version mismatch detected or error occurred
|
|
*/
|
|
|
|
import { readFileSync } from "node:fs";
|
|
import { dirname, join } from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
import process from "node:process";
|
|
|
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
const projectRoot = join(__dirname, "..");
|
|
|
|
// Parse command line arguments
|
|
const args = process.argv.slice(2);
|
|
const checkPyPI = args.includes("--check-pypi");
|
|
const showHelp = args.includes("--help") || args.includes("-h");
|
|
|
|
if (showHelp) {
|
|
console.log(`
|
|
SDK Version Sync Check
|
|
|
|
Verifies that the released openhands-automation package on PyPI uses the
|
|
SDK version expected for that automation release.
|
|
|
|
The automation version is read from config/defaults.json (versions.automation).
|
|
The expected SDK dependency version is read from versions.automationSdk,
|
|
falling back to versions.agentServer for older configs.
|
|
|
|
Usage:
|
|
node scripts/check-sdk-version-sync.mjs [options]
|
|
|
|
Options:
|
|
--check-pypi Also check the latest SDK version on PyPI
|
|
--help, -h Show this help
|
|
|
|
Environment variables:
|
|
EXPECTED_SDK_VERSION Override the expected SDK version (instead of reading from config/defaults.json)
|
|
AUTOMATION_PACKAGE_NAME Override the automation package name (default: openhands-automation)
|
|
AUTOMATION_PACKAGE_VERSION Override the automation package version (instead of reading from config/defaults.json)
|
|
|
|
Triggering from other repos:
|
|
The automation repo or SDK repo can trigger this check via GitHub repository_dispatch:
|
|
|
|
curl -X POST \\
|
|
-H "Authorization: token \$GITHUB_TOKEN" \\
|
|
-H "Accept: application/vnd.github.v3+json" \\
|
|
https://api.github.com/repos/OpenHands/agent-canvas/dispatches \\
|
|
-d '{"event_type": "sdk-version-check", "client_payload": {"version": "1.27.0"}}'
|
|
`);
|
|
process.exit(0);
|
|
}
|
|
|
|
// ANSI color codes for terminal output
|
|
const colors = {
|
|
reset: "\x1b[0m",
|
|
red: "\x1b[31m",
|
|
green: "\x1b[32m",
|
|
yellow: "\x1b[33m",
|
|
cyan: "\x1b[36m",
|
|
dim: "\x1b[2m",
|
|
};
|
|
|
|
// SDK packages that must have matching versions
|
|
const SDK_PACKAGES = [
|
|
"openhands-sdk",
|
|
"openhands-tools",
|
|
"openhands-workspace",
|
|
"openhands-agent-server",
|
|
];
|
|
|
|
// Configurable automation package (can be overridden via env)
|
|
const AUTOMATION_PACKAGE_NAME = process.env.AUTOMATION_PACKAGE_NAME || "openhands-automation";
|
|
|
|
// Default retry configuration
|
|
const RETRY_COUNT = 3;
|
|
const RETRY_DELAY_MS = 1000;
|
|
|
|
/**
|
|
* Normalize a version string for comparison.
|
|
* Handles variations like "1.22" vs "1.22.0" by ensuring consistent format.
|
|
*/
|
|
function normalizeVersion(version) {
|
|
if (!version) return null;
|
|
|
|
// Remove any pre-release or build metadata for base comparison
|
|
const baseVersion = version.split(/[-+]/)[0];
|
|
|
|
// Split into parts and pad to 3 parts (major.minor.patch)
|
|
const parts = baseVersion.split(".").map((p) => parseInt(p, 10) || 0);
|
|
while (parts.length < 3) {
|
|
parts.push(0);
|
|
}
|
|
|
|
return parts.slice(0, 3).join(".");
|
|
}
|
|
|
|
/**
|
|
* Compare two versions for equality (handles semantic equivalence)
|
|
*/
|
|
function versionsEqual(v1, v2) {
|
|
return normalizeVersion(v1) === normalizeVersion(v2);
|
|
}
|
|
|
|
/**
|
|
* Sleep for a given number of milliseconds
|
|
*/
|
|
function sleep(ms) {
|
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
}
|
|
|
|
// ── Centralized config ──────────────────────────────────────────────────────
|
|
let SHARED_DEFAULTS;
|
|
try {
|
|
SHARED_DEFAULTS = JSON.parse(
|
|
readFileSync(join(projectRoot, "config", "defaults.json"), "utf-8"),
|
|
);
|
|
if (!SHARED_DEFAULTS.versions?.agentServer || !SHARED_DEFAULTS.versions?.automationSdk) {
|
|
throw new Error("missing required fields: versions.agentServer, versions.automationSdk");
|
|
}
|
|
} catch (err) {
|
|
console.error(`${colors.red}Failed to load config/defaults.json: ${err.message}${colors.reset}`);
|
|
console.error("Ensure the file exists and contains valid JSON with required fields.");
|
|
process.exit(1);
|
|
}
|
|
|
|
/**
|
|
* Read the default agent-server SDK version from config/defaults.json.
|
|
*/
|
|
function getDefaultAgentServerVersion() {
|
|
return { version: SHARED_DEFAULTS.versions.agentServer, source: "config/defaults.json" };
|
|
}
|
|
|
|
/**
|
|
* Read the expected automation SDK dependency version from environment
|
|
* or config/defaults.json.
|
|
*/
|
|
function getExpectedVersion() {
|
|
// Allow override via environment variable (useful for CI triggers).
|
|
const envVersion = process.env.EXPECTED_SDK_VERSION;
|
|
if (envVersion && envVersion.trim()) {
|
|
return { version: envVersion.trim(), source: "EXPECTED_SDK_VERSION env var" };
|
|
}
|
|
|
|
return {
|
|
version: SHARED_DEFAULTS.versions.automationSdk,
|
|
source: "config/defaults.json (versions.automationSdk)",
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Fetch the latest version of a package from PyPI
|
|
*/
|
|
async function fetchPyPIVersion(packageName) {
|
|
const url = `https://pypi.org/pypi/${packageName}/json`;
|
|
try {
|
|
const response = await fetch(url);
|
|
if (!response.ok) {
|
|
return null;
|
|
}
|
|
const data = await response.json();
|
|
return data.info?.version || null;
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Read the automation version from env var or config/defaults.json
|
|
*/
|
|
function getAutomationVersion() {
|
|
// Allow override via environment variable
|
|
const envVersion = process.env.AUTOMATION_PACKAGE_VERSION;
|
|
if (envVersion && envVersion.trim()) {
|
|
return { version: envVersion.trim(), source: "AUTOMATION_PACKAGE_VERSION env var" };
|
|
}
|
|
|
|
return {
|
|
version: SHARED_DEFAULTS.versions.automation,
|
|
source: "config/defaults.json (versions.automation)",
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Fetch package metadata from PyPI and extract dependencies (with retry)
|
|
*/
|
|
async function fetchPyPIDependencies(packageName, version) {
|
|
const url = `https://pypi.org/pypi/${packageName}/${version}/json`;
|
|
|
|
console.log(`${colors.dim}Fetching ${url}${colors.reset}`);
|
|
|
|
let lastError;
|
|
for (let attempt = 0; attempt < RETRY_COUNT; attempt++) {
|
|
try {
|
|
const response = await fetch(url);
|
|
|
|
// 404 is a config issue, don't retry
|
|
if (response.status === 404) {
|
|
throw new Error(
|
|
`Package ${packageName}==${version} not found on PyPI (404). Check the package name and version.`,
|
|
);
|
|
}
|
|
|
|
if (!response.ok) {
|
|
throw new Error(
|
|
`Failed to fetch ${packageName}==${version} from PyPI: ${response.status} ${response.statusText}`,
|
|
);
|
|
}
|
|
|
|
const data = await response.json();
|
|
return data.info?.requires_dist || [];
|
|
} catch (err) {
|
|
lastError = err;
|
|
|
|
// Don't retry on 404 (config issue)
|
|
if (err.message.includes("not found on PyPI (404)")) {
|
|
throw err;
|
|
}
|
|
|
|
// Retry on other errors (network issues, 5xx, etc.)
|
|
if (attempt < RETRY_COUNT - 1) {
|
|
const delay = RETRY_DELAY_MS * (attempt + 1);
|
|
console.log(
|
|
`${colors.yellow}Retry ${attempt + 1}/${RETRY_COUNT - 1} after ${delay}ms...${colors.reset}`,
|
|
);
|
|
await sleep(delay);
|
|
}
|
|
}
|
|
}
|
|
|
|
throw lastError;
|
|
}
|
|
|
|
/**
|
|
* Parse PyPI requires_dist array and extract SDK package versions
|
|
*
|
|
* PyPI returns dependencies in PEP 508 format like:
|
|
* "openhands-sdk>=1.27.0,<2.0.0"
|
|
* "openhands-tools==1.27.0"
|
|
* "openhands-workspace (>=1.27.0)"
|
|
*/
|
|
function parseSdkVersionsFromRequiresDist(requiresDist) {
|
|
const versions = {};
|
|
|
|
for (const pkg of SDK_PACKAGES) {
|
|
for (const dep of requiresDist) {
|
|
// Check if the dependency starts with our package name
|
|
// The package name may be followed by whitespace, operators, or parentheses
|
|
if (!dep.toLowerCase().startsWith(pkg.toLowerCase())) {
|
|
continue;
|
|
}
|
|
|
|
// Extract the version number - look for patterns like:
|
|
// ">=1.27.0", "==1.27.0", "(>=1.27.0)", "~=1.27.0"
|
|
// After the package name and before any comma or closing paren
|
|
const versionPattern = /[><=~!]+\s*([0-9]+(?:\.[0-9]+)*)/;
|
|
const match = dep.match(versionPattern);
|
|
if (match) {
|
|
versions[pkg] = match[1];
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
return versions;
|
|
}
|
|
|
|
/**
|
|
* Main entry point
|
|
*/
|
|
async function main() {
|
|
console.log("");
|
|
console.log(
|
|
`${colors.cyan}SDK Version Sync Check${colors.reset}`,
|
|
);
|
|
console.log("─".repeat(50));
|
|
console.log("");
|
|
|
|
try {
|
|
// Get expected version from env var or config/defaults.json
|
|
const { version: expectedVersion, source: versionSource } = getExpectedVersion();
|
|
console.log(
|
|
`Expected automation SDK version: ${colors.green}${expectedVersion}${colors.reset} (from ${versionSource})`,
|
|
);
|
|
|
|
const { version: agentServerVersion } = getDefaultAgentServerVersion();
|
|
if (!versionsEqual(agentServerVersion, expectedVersion)) {
|
|
console.log(
|
|
`${colors.yellow}Note:${colors.reset} DEFAULT_AGENT_SERVER_VERSION is ${agentServerVersion}; automation release dependencies may lag while a compatible automation package is pending.`,
|
|
);
|
|
}
|
|
|
|
// Get automation version from env var or config/defaults.json
|
|
const { version: automationVersion, source: automationSource } = getAutomationVersion();
|
|
console.log(
|
|
`Automation package: ${colors.cyan}${AUTOMATION_PACKAGE_NAME}==${automationVersion}${colors.reset} (from ${automationSource})`,
|
|
);
|
|
|
|
// Optionally check PyPI for the latest SDK version
|
|
if (checkPyPI) {
|
|
console.log("");
|
|
console.log("Checking latest SDK versions on PyPI:");
|
|
for (const pkg of SDK_PACKAGES) {
|
|
const pypiVersion = await fetchPyPIVersion(pkg);
|
|
if (pypiVersion) {
|
|
const status = versionsEqual(pypiVersion, expectedVersion)
|
|
? colors.green
|
|
: colors.yellow;
|
|
console.log(` ${pkg.padEnd(25)} ${status}${pypiVersion}${colors.reset}`);
|
|
} else {
|
|
console.log(` ${pkg.padEnd(25)} ${colors.dim}(not found on PyPI)${colors.reset}`);
|
|
}
|
|
}
|
|
}
|
|
|
|
console.log("");
|
|
|
|
// Fetch automation package dependencies from PyPI
|
|
const requiresDist = await fetchPyPIDependencies(AUTOMATION_PACKAGE_NAME, automationVersion);
|
|
const automationVersions = parseSdkVersionsFromRequiresDist(requiresDist);
|
|
|
|
// Check each SDK package
|
|
let hasErrors = false;
|
|
let foundAny = false;
|
|
const mismatches = [];
|
|
|
|
console.log(`Checking ${AUTOMATION_PACKAGE_NAME}==${automationVersion} SDK dependencies:`);
|
|
console.log("");
|
|
|
|
for (const pkg of SDK_PACKAGES) {
|
|
const actualVersion = automationVersions[pkg];
|
|
|
|
if (actualVersion) {
|
|
foundAny = true;
|
|
if (versionsEqual(actualVersion, expectedVersion)) {
|
|
console.log(
|
|
` ${pkg.padEnd(25)} ${colors.green}✓ ${actualVersion}${colors.reset}`,
|
|
);
|
|
} else {
|
|
hasErrors = true;
|
|
console.log(
|
|
` ${pkg.padEnd(25)} ${colors.red}✗ ${actualVersion} (expected ${expectedVersion})${colors.reset}`,
|
|
);
|
|
mismatches.push({
|
|
package: pkg,
|
|
expected: expectedVersion,
|
|
actual: actualVersion,
|
|
});
|
|
}
|
|
} else {
|
|
// Package not found - might be a transitive dependency, not an error
|
|
console.log(
|
|
` ${pkg.padEnd(25)} ${colors.dim}- not a direct dependency${colors.reset}`,
|
|
);
|
|
}
|
|
}
|
|
|
|
console.log("");
|
|
|
|
if (!foundAny) {
|
|
console.log(
|
|
`${colors.yellow}Warning: No SDK packages found in ${AUTOMATION_PACKAGE_NAME}==${automationVersion} dependencies${colors.reset}`,
|
|
);
|
|
console.log("This might indicate a parsing issue or the package is not yet published.");
|
|
console.log("");
|
|
process.exit(1);
|
|
}
|
|
|
|
if (hasErrors) {
|
|
console.log(
|
|
`${colors.red}Version mismatch detected!${colors.reset}`,
|
|
);
|
|
console.log("");
|
|
console.log(`The released ${AUTOMATION_PACKAGE_NAME}==${automationVersion} uses different SDK versions than expected for that automation release.`);
|
|
console.log("");
|
|
console.log("Mismatched packages:");
|
|
for (const m of mismatches) {
|
|
console.log(` - ${m.package}: ${m.actual} (expected ${m.expected})`);
|
|
}
|
|
console.log("");
|
|
console.log("To fix, update one of the following:");
|
|
console.log(
|
|
` 1. Update versions.automationSdk in config/defaults.json to match the automation release`,
|
|
);
|
|
console.log(
|
|
` 2. Release a new version of ${AUTOMATION_PACKAGE_NAME} with SDK dependencies pinned to ${expectedVersion}`,
|
|
);
|
|
console.log(
|
|
` 3. Update versions.automation in config/defaults.json to a newer release`,
|
|
);
|
|
console.log("");
|
|
process.exit(1);
|
|
}
|
|
|
|
console.log(
|
|
`${colors.green}All SDK versions are in sync!${colors.reset}`,
|
|
);
|
|
console.log("");
|
|
} catch (error) {
|
|
console.error(`${colors.red}Error: ${error.message}${colors.reset}`);
|
|
process.exit(1);
|
|
}
|
|
}
|
|
|
|
// Export for testing
|
|
export {
|
|
normalizeVersion,
|
|
versionsEqual,
|
|
parseSdkVersionsFromRequiresDist,
|
|
SDK_PACKAGES,
|
|
AUTOMATION_PACKAGE_NAME,
|
|
};
|
|
|
|
main();
|