mptyl/ThothII
1
0
Fork 0
Code Issues 25 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: resolve workspace publish conflicts

Browse Source
This commit is contained in:
marcopan
2026-08-04 06:57:19 +02:00
parent b75b3af28e
commit 234b40e7cf
7 changed files with 218 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/api/workspaces.ts
+32 -4
View File
@@ -115,11 +115,18 @@ export type PublishWorkspaceRequest =
export interface WorkspaceConflict {
code: "workspace_conflict";
fields: string[];
expected: WorkspaceConflictRevision;
actual: WorkspaceConflictRevision;
base: CanonicalWorkspace;
local: CanonicalWorkspace;
remote: CanonicalWorkspace;
}
export interface WorkspaceConflictRevision {
commit: string;
blob?: string;
}
export interface WorkspaceApiError {
status: number;
code: WorkspaceErrorCode;
@@ -128,13 +135,21 @@ export interface WorkspaceApiError {
}
const conflictFields = new Set([
"workspace.name", "workspace.description", "workspace.language",
"dwh.database", "dwh.schema", "dwh.port", "dwh.timeout_ms", "dwh.supported_transports",
"semantic_index.vector_store.database", "semantic_index.vector_store.schema", "semantic_index.vector_store.collection",
"workspace.schema_version", "workspace.id", "workspace.name", "workspace.description", "workspace.language",
"dwh.engine", "dwh.database", "dwh.schema", "dwh.port", "dwh.timeout_ms", "dwh.supported_transports",
"semantic_index.vector_store.engine", "semantic_index.vector_store.database", "semantic_index.vector_store.schema", "semantic_index.vector_store.collection",
"semantic_index.vector_store.dimensions", "semantic_index.vector_store.distance", "semantic_index.vector_store.port",
"semantic_index.vector_store.timeout_ms", "semantic_index.vector_store.supported_transports",
"semantic_index.embedding.provider", "semantic_index.embedding.model", "semantic_index.embedding.dimensions",
"semantic_index.embedding.timeout_ms", "semantic_index.vector_writer", "llm_policy.default", "llm_policy.allowed",
"diagnostics.dwh_rest.method", "diagnostics.dwh_rest.path", "diagnostics.dwh_rest.auth",
"diagnostics.dwh_rest.response.database", "diagnostics.dwh_rest.response.schema",
"diagnostics.vector_rest.metadata.method", "diagnostics.vector_rest.metadata.path", "diagnostics.vector_rest.metadata.auth",
"diagnostics.vector_rest.metadata.response.collection", "diagnostics.vector_rest.metadata.response.dimensions",
"diagnostics.vector_rest.metadata.response.distance", "diagnostics.vector_rest.reversible_probe.method",
"diagnostics.vector_rest.reversible_probe.path", "diagnostics.vector_rest.reversible_probe.auth",
"diagnostics.vector_rest.reversible_probe.response.operation", "diagnostics.embedding.method", "diagnostics.embedding.path",
"diagnostics.embedding.auth", "diagnostics.embedding.response.model", "diagnostics.embedding.response.dimensions",
]);
const workspaceErrorCodes = new Set<WorkspaceErrorCode>([
@@ -149,6 +164,15 @@ function object(value: unknown): Record<string, unknown> | undefined {
: undefined;
}
function conflictRevision(value: unknown): WorkspaceConflictRevision | undefined {
const source = object(value);
const commit = source?.commit;
const blob = source?.blob;
if (typeof commit !== "string" || !/^[0-9a-f]{40}$/.test(commit)) return undefined;
if (blob !== undefined && (typeof blob !== "string" || !/^[0-9a-f]{40}$/.test(blob))) return undefined;
return { commit, ...(typeof blob === "string" ? { blob } : {}) };
}
/** Sanitized registry error data; it intentionally excludes the raw response body. */
export function asWorkspaceApiError(error: unknown): WorkspaceApiError | undefined {
if (!(error instanceof ApiError)) return undefined;
@@ -173,10 +197,14 @@ export function asWorkspaceConflict(error: unknown): WorkspaceConflict | undefin
const base = payload && sanitizeCanonicalWorkspace(payload.base);
const local = payload && sanitizeCanonicalWorkspace(payload.local);
const remote = payload && sanitizeCanonicalWorkspace(payload.remote);
if (!payload || !fields || !fields.every((field) => conflictFields.has(field)) || !base || !local || !remote) return undefined;
const expected = payload && conflictRevision(payload.expected);
const actual = payload && conflictRevision(payload.actual);
if (!payload || !fields || !fields.every((field) => conflictFields.has(field)) || !expected || !actual || !base || !local || !remote) return undefined;
return {
code: "workspace_conflict",
fields,
expected,
actual,
base,
local,
remote,