Skip to content

fix(control-plane): reuse canonical lease digest matcher #5377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangruiteng merged 2 commits into from
Oct 1, 2026
Merged

fix(control-plane): reuse canonical lease digest matcher #5377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30dd19c
fix(control-plane): reuse canonical lease digest matcher
Duang777 Sep 30, 2026
8d00626
Merge origin/main into codex/fix-lease-workspace-digest-owner
Duang777 Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion loopx/control_plane/work_items/task_lease_workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {realpath, stat, readFile, lstat, opendir} from "node:fs/promises";
import {platform} from "node:os";
import {createHash} from "node:crypto";
import {isAbsolute, resolve} from "node:path";
import {BARE_SHA256_PATTERN} from "../content_digest.ts";
import type {JsonObject} from "../effect_program.ts";
import {EffectRuntimeRequestError} from "../effect_runtime_errors.ts";
import {requireJsonObject} from "../runtime_decode.ts";
Expand All @@ -23,7 +24,7 @@ export function leaseWorkspace(value: unknown): LeaseWorkspace | null {
if (value == null) return null;
const row = requireJsonObject(value, "lease worktree identity");
if (Object.keys(row).sort().join(",") !== "common_directory,host,repository,worktree" ||
[row.host, row.common_directory, row.worktree].some(v => typeof v !== "string" || !/^[a-f0-9]{64}$/u.test(v))) {
[row.host, row.common_directory, row.worktree].some(v => typeof v !== "string" || !BARE_SHA256_PATTERN.test(v))) {
throw new EffectRuntimeRequestError("invalid lease worktree identity");
}
const repository = leaseWriteRepository(row.repository);
Expand Down
1 change: 1 addition & 0 deletions tests/control_plane_ts/content_digest_single_owner.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ const CANONICAL_CONSUMERS = [
"control_plane/work_items/task_lease_acquire.ts",
"control_plane/work_items/task_lease_lifecycle.ts",
"control_plane/work_items/task_lease_lifecycle_request.ts",
"control_plane/work_items/task_lease_workspace.ts",
];

function packageFiles(dir: string, base = ""): string[] {
Expand Down
Loading