feat: project repository keys across public clients
This commit is contained in:
@@ -192,7 +192,12 @@ resource_key?: string | null,
|
||||
/**
|
||||
* Producer-owned monotonic revision for this Worker subject.
|
||||
*/
|
||||
subject_revision: number, state: SubscriptionWorkerState, has_running_internal_workers: boolean, workspace_id?: string | null, display_name?: string | null, profile?: string | null, repository_id?: string | null, working_directory_id?: SubscriptionWorkdirId | null, };
|
||||
subject_revision: number, state: SubscriptionWorkerState, has_running_internal_workers: boolean, workspace_id?: string | null, display_name?: string | null, profile?: string | null, repository_id?: string | null,
|
||||
/**
|
||||
* Workspace-facing Repository key. Runtime producers leave this unset and
|
||||
* Workspace Server projections replace `repository_id` with this field.
|
||||
*/
|
||||
repository_key?: string | null, working_directory_id?: SubscriptionWorkdirId | null, };
|
||||
|
||||
export type SubscriptionWorkdir = { working_directory_id: SubscriptionWorkdirId, repository_id: string, state: string, primary_worker_id?: SubscriptionWorkerId | null, };
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ export type DeleteRepositorySshHostTrustRequest = {
|
||||
export type RepositoryAccessMode = "read_only" | "read_write";
|
||||
|
||||
export type RepositorySshAccessBinding = {
|
||||
repository_id: string;
|
||||
repository_key: string;
|
||||
credential_id: string;
|
||||
host_trust_id: string;
|
||||
access: RepositoryAccessMode;
|
||||
|
||||
@@ -23,7 +23,7 @@ export type TicketAssignmentPrincipalSummary = { "kind": "user", account_id: str
|
||||
|
||||
export type TicketActionEligibility = { can_assign_orchestrator: boolean, can_unassign_orchestrator: boolean, can_queue: boolean, can_start_manual_coder: boolean, queue_tickets: Array<string>, blockers: Array<string>, };
|
||||
|
||||
export type TicketMergeRequestSummary = { merge_request_id: string, repository_id: string, state: string, review_status: string, selector_from: string | null, selector_to: string, updated_at: string, current_subject_ref: string | null, review_subject_ref: string | null, review_requested_at: string | null, review_submitted_at: string | null, review_excerpt: string | null, };
|
||||
export type TicketMergeRequestSummary = { merge_request_id: string, repository_key: string, state: string, review_status: string, selector_from: string | null, selector_to: string, updated_at: string, current_subject_ref: string | null, review_subject_ref: string | null, review_requested_at: string | null, review_submitted_at: string | null, review_excerpt: string | null, };
|
||||
|
||||
export type MergeRequestListItem = { summary: TicketMergeRequestSummary, ticket_ids: Array<string>, thread_event_count: number, };
|
||||
|
||||
@@ -49,4 +49,4 @@ export type TicketRelationNotice = { related_ticket: string, kind: string, messa
|
||||
|
||||
export type TicketRelationView = { outgoing: Array<TicketRelation>, incoming: Array<DerivedTicketRelation>, blockers: Array<TicketRelationBlocker>, notices: Array<TicketRelationNotice>, };
|
||||
|
||||
export type TicketDetail = { id: string, resource_key: string, title: string, state: string, readiness: string | null, priority: string, created_at: string | null, updated_at: string | null, item_revision: string, queued_by: string | null, queued_at: string | null, repository_id: string | null, ref_selector: string | null, risk_flags: Array<string>, body: string, body_truncated: boolean, event_count: number, events: Array<TicketEventDetail>, event_page: QueryPage, artifact_count: number, artifacts: Array<string>, relations: TicketRelationView, linked_objectives: Array<ObjectiveLinkSummary>, implementation_reports: Array<TicketEvidenceEvent>, assignments: Array<TicketRoleAssignmentSummary>, current_coder: TicketAssignmentSummary | null, assignment_diagnostics: Array<string>, action_eligibility: TicketActionEligibility, merge_request: TicketMergeRequestSummary | null, evidence: TicketEvidenceSummary, resolution: string | null, record_source: string, };
|
||||
export type TicketDetail = { id: string, resource_key: string, title: string, state: string, readiness: string | null, priority: string, created_at: string | null, updated_at: string | null, item_revision: string, queued_by: string | null, queued_at: string | null, repository_key: string | null, ref_selector: string | null, risk_flags: Array<string>, body: string, body_truncated: boolean, event_count: number, events: Array<TicketEventDetail>, event_page: QueryPage, artifact_count: number, artifacts: Array<string>, relations: TicketRelationView, linked_objectives: Array<ObjectiveLinkSummary>, implementation_reports: Array<TicketEvidenceEvent>, assignments: Array<TicketRoleAssignmentSummary>, current_coder: TicketAssignmentSummary | null, assignment_diagnostics: Array<string>, action_eligibility: TicketActionEligibility, merge_request: TicketMergeRequestSummary | null, evidence: TicketEvidenceSummary, resolution: string | null, record_source: string, };
|
||||
|
||||
@@ -3,22 +3,77 @@
|
||||
|
||||
export type DiagnosticSeverity = "info" | "warning" | "error";
|
||||
|
||||
export type Diagnostic = { code: string, severity: DiagnosticSeverity, message: string, };
|
||||
export type Diagnostic = {
|
||||
code: string;
|
||||
severity: DiagnosticSeverity;
|
||||
message: string;
|
||||
};
|
||||
|
||||
export type WorkingDirectoryMaterializerKind = "runtime_git_cache" | "local_git_worktree";
|
||||
export type WorkingDirectoryMaterializerKind =
|
||||
| "runtime_git_cache"
|
||||
| "local_git_worktree";
|
||||
|
||||
export type WorkingDirectoryStatusKind = "active" | "cleanup_pending" | "corrupted" | "not_found" | "unknown";
|
||||
export type WorkingDirectoryStatusKind =
|
||||
| "active"
|
||||
| "cleanup_pending"
|
||||
| "corrupted"
|
||||
| "not_found"
|
||||
| "unknown";
|
||||
|
||||
export type WorkingDirectoryCleanupTarget = { kind: string, working_directory_id: string, repository_id: string, };
|
||||
export type WorkingDirectoryCleanupTarget = {
|
||||
kind: string;
|
||||
working_directory_id: string;
|
||||
repository_key: string;
|
||||
};
|
||||
|
||||
export type WorkingDirectoryOccupancy = { runtime_id: string, worker_id: string, display_name: string, linked_at: string, };
|
||||
export type WorkingDirectoryOccupancy = {
|
||||
runtime_id: string;
|
||||
worker_id: string;
|
||||
display_name: string;
|
||||
linked_at: string;
|
||||
};
|
||||
|
||||
export type WorkingDirectorySummary = { working_directory_id: string, repository_id: string, creation_selector?: string | null, creation_ref?: string | null, creation_tree?: string | null, current_selector?: string | null, current_ref?: string | null, current_tree?: string | null, observed_at_epoch_seconds?: number | null, materializer_kind: WorkingDirectoryMaterializerKind, cleanup_target?: WorkingDirectoryCleanupTarget | null, status: WorkingDirectoryStatusKind, cleanliness?: string | null, primary_worker_id?: string | null, occupied_by?: WorkingDirectoryOccupancy | null, };
|
||||
export type WorkingDirectorySummary = {
|
||||
working_directory_id: string;
|
||||
repository_key: string;
|
||||
creation_selector?: string | null;
|
||||
creation_ref?: string | null;
|
||||
creation_tree?: string | null;
|
||||
current_selector?: string | null;
|
||||
current_ref?: string | null;
|
||||
current_tree?: string | null;
|
||||
observed_at_epoch_seconds?: number | null;
|
||||
materializer_kind: WorkingDirectoryMaterializerKind;
|
||||
cleanup_target?: WorkingDirectoryCleanupTarget | null;
|
||||
status: WorkingDirectoryStatusKind;
|
||||
cleanliness?: string | null;
|
||||
primary_worker_id?: string | null;
|
||||
occupied_by?: WorkingDirectoryOccupancy | null;
|
||||
};
|
||||
|
||||
export type WorkingDirectoryCreateRequest = { runtime_id?: string | null, repository_id: string, selector?: string | null, operation_id?: string | null, };
|
||||
export type WorkingDirectoryCreateRequest = {
|
||||
runtime_id?: string | null;
|
||||
repository_key: string;
|
||||
selector?: string | null;
|
||||
operation_id?: string | null;
|
||||
};
|
||||
|
||||
export type WorkingDirectoryListResponse = { workspace_id: string, items: Array<WorkingDirectorySummary>, diagnostics: Array<Diagnostic>, };
|
||||
export type WorkingDirectoryListResponse = {
|
||||
workspace_id: string;
|
||||
items: Array<WorkingDirectorySummary>;
|
||||
diagnostics: Array<Diagnostic>;
|
||||
};
|
||||
|
||||
export type WorkingDirectoryDetailResponse = { workspace_id: string, runtime_id: string, item: WorkingDirectorySummary, diagnostics: Array<Diagnostic>, };
|
||||
export type WorkingDirectoryDetailResponse = {
|
||||
workspace_id: string;
|
||||
runtime_id: string;
|
||||
item: WorkingDirectorySummary;
|
||||
diagnostics: Array<Diagnostic>;
|
||||
};
|
||||
|
||||
export type WorkingDirectoryCreateResponse = { workspace_id: string, runtime_id: string, item: WorkingDirectorySummary, diagnostics: Array<Diagnostic>, };
|
||||
export type WorkingDirectoryCreateResponse = {
|
||||
workspace_id: string;
|
||||
runtime_id: string;
|
||||
item: WorkingDirectorySummary;
|
||||
diagnostics: Array<Diagnostic>;
|
||||
};
|
||||
|
||||
@@ -14,8 +14,7 @@ export type WorkspaceCatalogListResponse = Array<WorkspaceSummary>;
|
||||
|
||||
export type WorkspaceRepositoryRecord = {
|
||||
workspace_id: string;
|
||||
repository_id: string;
|
||||
name: string;
|
||||
repository_key: string;
|
||||
kind: string;
|
||||
provider: string | null;
|
||||
source: RepositorySource;
|
||||
@@ -175,8 +174,7 @@ export type GitRepositorySummary = {
|
||||
};
|
||||
|
||||
export type RepositorySummary = {
|
||||
id: string;
|
||||
display_name: string;
|
||||
repository_key: string;
|
||||
kind: string;
|
||||
provider: string;
|
||||
source: RepositorySource;
|
||||
@@ -216,7 +214,7 @@ export type RepositoryDetailResponse = {
|
||||
|
||||
export type RepositoryLogResponse = {
|
||||
workspace_id: string;
|
||||
repository_id: string;
|
||||
repository_key: string;
|
||||
default_selector?: string | null;
|
||||
limit: number;
|
||||
items: Array<GitCommitSummary>;
|
||||
|
||||
@@ -19,7 +19,7 @@ export type MergeRequestThreadEvent = {
|
||||
export type MergeRequestRecord = {
|
||||
merge_request_id: string;
|
||||
workspace_id: string;
|
||||
repository_id: string;
|
||||
repository_key: string;
|
||||
selector_from: string | null;
|
||||
selector_to: string;
|
||||
ticket_ids: string[];
|
||||
|
||||
@@ -112,12 +112,12 @@ export function parseRepositoryAccessProjection(
|
||||
bindings.forEach((binding, index) => {
|
||||
const bindingPath = `${path}.bindings[${index}]`;
|
||||
const bindingRecord = readRecord(binding, bindingPath, [
|
||||
"repository_id",
|
||||
"repository_key",
|
||||
"credential_id",
|
||||
"host_trust_id",
|
||||
"access",
|
||||
]);
|
||||
readString(bindingRecord, "repository_id", bindingPath);
|
||||
readString(bindingRecord, "repository_key", bindingPath);
|
||||
readString(bindingRecord, "credential_id", bindingPath);
|
||||
readString(bindingRecord, "host_trust_id", bindingPath);
|
||||
const access = readString(bindingRecord, "access", bindingPath);
|
||||
|
||||
@@ -11,7 +11,7 @@ import type {
|
||||
|
||||
const SUMMARY_KEYS = new Set([
|
||||
"working_directory_id",
|
||||
"repository_id",
|
||||
"repository_key",
|
||||
"creation_selector",
|
||||
"creation_ref",
|
||||
"creation_tree",
|
||||
@@ -28,7 +28,7 @@ const SUMMARY_KEYS = new Set([
|
||||
]);
|
||||
const CREATE_REQUEST_KEYS = new Set([
|
||||
"runtime_id",
|
||||
"repository_id",
|
||||
"repository_key",
|
||||
"selector",
|
||||
"operation_id",
|
||||
]);
|
||||
@@ -36,7 +36,7 @@ const DIAGNOSTIC_KEYS = new Set(["code", "severity", "message"]);
|
||||
const CLEANUP_TARGET_KEYS = new Set([
|
||||
"kind",
|
||||
"working_directory_id",
|
||||
"repository_id",
|
||||
"repository_key",
|
||||
]);
|
||||
const OCCUPANCY_KEYS = new Set([
|
||||
"runtime_id",
|
||||
@@ -81,7 +81,7 @@ export function validateWorkingDirectoryCreateRequest(
|
||||
"Workdir create request",
|
||||
);
|
||||
const request: WorkingDirectoryCreateRequest = {
|
||||
repository_id: stringField(record, "repository_id"),
|
||||
repository_key: stringField(record, "repository_key"),
|
||||
};
|
||||
assignOptionalString(request, record, "runtime_id");
|
||||
assignOptionalString(request, record, "selector");
|
||||
@@ -110,7 +110,7 @@ function parseSummary(value: unknown): WorkingDirectorySummary {
|
||||
const record = exactRecord(value, SUMMARY_KEYS, "Workdir summary");
|
||||
const summary: WorkingDirectorySummary = {
|
||||
working_directory_id: stringField(record, "working_directory_id"),
|
||||
repository_id: stringField(record, "repository_id"),
|
||||
repository_key: stringField(record, "repository_key"),
|
||||
materializer_kind: enumField(record, "materializer_kind", [
|
||||
"runtime_git_cache",
|
||||
"local_git_worktree",
|
||||
@@ -166,7 +166,7 @@ function parseCleanupTarget(value: unknown): WorkingDirectoryCleanupTarget {
|
||||
return {
|
||||
kind: stringField(record, "kind"),
|
||||
working_directory_id: stringField(record, "working_directory_id"),
|
||||
repository_id: stringField(record, "repository_id"),
|
||||
repository_key: stringField(record, "repository_key"),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -18,8 +18,8 @@ export type CreateWorkspaceRequest = {
|
||||
operation_key: string;
|
||||
display_name: string;
|
||||
repository: {
|
||||
repository_key: string;
|
||||
uri: string;
|
||||
display_name: string | null;
|
||||
default_ref: string | null;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -170,8 +170,7 @@ function repositorySummary(value: unknown, path: string): RepositorySummary {
|
||||
exactKeys(
|
||||
item,
|
||||
[
|
||||
"id",
|
||||
"display_name",
|
||||
"repository_key",
|
||||
"kind",
|
||||
"provider",
|
||||
"source",
|
||||
@@ -200,8 +199,7 @@ function repositorySummary(value: unknown, path: string): RepositorySummary {
|
||||
repositoryDiagnostic(entry, `${path}.diagnostics[${index}]`)
|
||||
);
|
||||
return {
|
||||
id: string(item.id, `${path}.id`),
|
||||
display_name: string(item.display_name, `${path}.display_name`),
|
||||
repository_key: string(item.repository_key, `${path}.repository_key`),
|
||||
kind: string(item.kind, `${path}.kind`),
|
||||
provider: string(item.provider, `${path}.provider`),
|
||||
source: repositorySource(item.source, `${path}.source`),
|
||||
@@ -263,8 +261,7 @@ function workspaceRepositoryRecord(
|
||||
item,
|
||||
[
|
||||
"workspace_id",
|
||||
"repository_id",
|
||||
"name",
|
||||
"repository_key",
|
||||
"kind",
|
||||
"provider",
|
||||
"source",
|
||||
@@ -287,8 +284,7 @@ function workspaceRepositoryRecord(
|
||||
}
|
||||
return {
|
||||
workspace_id: string(item.workspace_id, `${path}.workspace_id`),
|
||||
repository_id: string(item.repository_id, `${path}.repository_id`),
|
||||
name: string(item.name, `${path}.name`),
|
||||
repository_key: string(item.repository_key, `${path}.repository_key`),
|
||||
kind: string(item.kind, `${path}.kind`),
|
||||
provider: nullableString(item.provider, `${path}.provider`),
|
||||
source: repositorySource(item.source, `${path}.source`),
|
||||
@@ -573,7 +569,7 @@ export function parseRepositoryLogResponse(
|
||||
response,
|
||||
[
|
||||
"workspace_id",
|
||||
"repository_id",
|
||||
"repository_key",
|
||||
"default_selector",
|
||||
"limit",
|
||||
"items",
|
||||
@@ -586,9 +582,9 @@ export function parseRepositoryLogResponse(
|
||||
response.workspace_id,
|
||||
"repository log response.workspace_id",
|
||||
),
|
||||
repository_id: string(
|
||||
response.repository_id,
|
||||
"repository log response.repository_id",
|
||||
repository_key: string(
|
||||
response.repository_key,
|
||||
"repository log response.repository_key",
|
||||
),
|
||||
default_selector: optionalNullableString(
|
||||
response.default_selector,
|
||||
|
||||
@@ -128,7 +128,7 @@ Deno.test("workspace Worker list lives on the dedicated Workers page", async ()
|
||||
workersNav.includes("worker.display_name || worker.label") &&
|
||||
workersNav.includes("worker-status-dot") &&
|
||||
workersNav.includes("worker-status-spinner") &&
|
||||
workersNav.includes("worker.repository_id ?? '—'") &&
|
||||
workersNav.includes("worker.repository_key ?? '—'") &&
|
||||
workersNav.includes("worker.working_directory_id ?? '—'") &&
|
||||
!workersNav.includes('aria-disabled="true"'),
|
||||
"Workers sidebar should link to the Worker list page and show state indicators with repository/workdir metadata",
|
||||
@@ -207,13 +207,13 @@ Deno.test("workspace Tickets surface provides Kanban and lifecycle controls", as
|
||||
);
|
||||
const repositoryLoad = await Deno.readTextFile(
|
||||
new URL(
|
||||
"./../../../routes/w/[workspaceId]/repositories/[repositoryId]/+page.ts",
|
||||
"./../../../routes/w/[workspaceId]/repositories/[repositoryKey]/+page.ts",
|
||||
import.meta.url,
|
||||
),
|
||||
);
|
||||
const repositoryPage = await Deno.readTextFile(
|
||||
new URL(
|
||||
"./../../../routes/w/[workspaceId]/repositories/[repositoryId]/+page.svelte",
|
||||
"./../../../routes/w/[workspaceId]/repositories/[repositoryKey]/+page.svelte",
|
||||
import.meta.url,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -17,7 +17,7 @@ function workdir(
|
||||
): WorkingDirectorySummary {
|
||||
return {
|
||||
working_directory_id: "workdir-1",
|
||||
repository_id: "repository-1",
|
||||
repository_key: "repository-1",
|
||||
current_selector,
|
||||
current_ref,
|
||||
materializer_kind: "local_git_worktree",
|
||||
@@ -25,7 +25,7 @@ function workdir(
|
||||
cleanup_target: {
|
||||
kind: "local_git_worktree",
|
||||
working_directory_id: "workdir-1",
|
||||
repository_id: "repository-1",
|
||||
repository_key: "repository-1",
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
</span>
|
||||
<span class="worker-nav-label">{worker.display_name || worker.label}</span>
|
||||
<small class="worker-nav-meta">
|
||||
{worker.repository_id ?? '—'}・{worker.working_directory_id ?? '—'}
|
||||
{worker.repository_key ?? '—'}・{worker.working_directory_id ?? '—'}
|
||||
</small>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@@ -118,8 +118,7 @@ export type WorkerLaunchProfileCandidate = {
|
||||
};
|
||||
|
||||
export type WorkingDirectoryRepositoryOption = {
|
||||
id: string;
|
||||
display_name: string;
|
||||
repository_key: string;
|
||||
default_selector?: string | null;
|
||||
};
|
||||
|
||||
@@ -149,7 +148,7 @@ export type CleanupWorkdirCandidate = {
|
||||
action: CleanupTargetKind;
|
||||
workdir_id: string;
|
||||
runtime_id: string;
|
||||
repository_id: string;
|
||||
repository_key: string;
|
||||
reason: string;
|
||||
blocking_reason?: string | null;
|
||||
linked_worker_ids: string[];
|
||||
|
||||
@@ -44,12 +44,12 @@ const options: WorkerLaunchOptionsResponse = {
|
||||
{ id: "builtin:coder", label: "Coder", description: "code" },
|
||||
],
|
||||
repositories: [
|
||||
{ id: "repo", display_name: "Repo", default_selector: "HEAD" },
|
||||
{ repository_key: "repo", default_selector: "HEAD" },
|
||||
],
|
||||
working_directories: [
|
||||
{
|
||||
working_directory_id: "wd-1-repo",
|
||||
repository_id: "repo",
|
||||
repository_key: "repo",
|
||||
creation_selector: "HEAD",
|
||||
creation_ref: "0123456789abcdef",
|
||||
current_selector: null,
|
||||
@@ -61,7 +61,7 @@ const options: WorkerLaunchOptionsResponse = {
|
||||
cleanup_target: {
|
||||
kind: "git_worktree",
|
||||
working_directory_id: "wd-1-repo",
|
||||
repository_id: "repo",
|
||||
repository_key: "repo",
|
||||
},
|
||||
},
|
||||
],
|
||||
@@ -75,7 +75,7 @@ Deno.test("defaultWorkerLaunchForm uses the Backend-published Workspace default
|
||||
profile: "",
|
||||
initial_text: "hello",
|
||||
working_directory_id: "",
|
||||
working_directory_repository_id: "",
|
||||
working_directory_repository_key: "",
|
||||
working_directory_selector: "",
|
||||
relative_cwd: "",
|
||||
});
|
||||
@@ -85,7 +85,7 @@ Deno.test("defaultWorkerLaunchForm uses the Backend-published Workspace default
|
||||
assertEquals(form.profile, "builtin:coder");
|
||||
assertEquals(form.initial_text, "hello");
|
||||
assertEquals(form.working_directory_id, "wd-1-repo");
|
||||
assertEquals(form.working_directory_repository_id, "repo");
|
||||
assertEquals(form.working_directory_repository_key, "repo");
|
||||
assertEquals(form.working_directory_selector, "HEAD");
|
||||
});
|
||||
|
||||
@@ -103,7 +103,7 @@ Deno.test("defaultWorkerLaunchForm preserves an available Ticket role profile",
|
||||
profile: "builtin:reviewer",
|
||||
initial_text: "Review the ticket.",
|
||||
working_directory_id: "",
|
||||
working_directory_repository_id: "repo",
|
||||
working_directory_repository_key: "repo",
|
||||
working_directory_selector: "HEAD",
|
||||
relative_cwd: "",
|
||||
});
|
||||
@@ -133,7 +133,7 @@ Deno.test("defaultWorkerLaunchForm skips occupied working directories", () => {
|
||||
profile: "",
|
||||
initial_text: "hello",
|
||||
working_directory_id: "",
|
||||
working_directory_repository_id: "",
|
||||
working_directory_repository_key: "",
|
||||
working_directory_selector: "",
|
||||
relative_cwd: "",
|
||||
},
|
||||
@@ -149,8 +149,7 @@ Deno.test("defaultWorkerLaunchForm preserves a Ticket repository target", () =>
|
||||
repositories: [
|
||||
...options.repositories,
|
||||
{
|
||||
id: "ticket-repo",
|
||||
display_name: "Ticket repo",
|
||||
repository_key: "ticket-repo",
|
||||
default_selector: "main",
|
||||
},
|
||||
],
|
||||
@@ -159,7 +158,7 @@ Deno.test("defaultWorkerLaunchForm preserves a Ticket repository target", () =>
|
||||
{
|
||||
...options.working_directories[0],
|
||||
working_directory_id: "ticket-workdir",
|
||||
repository_id: "ticket-repo",
|
||||
repository_key: "ticket-repo",
|
||||
creation_selector: "work/ticket",
|
||||
},
|
||||
],
|
||||
@@ -170,14 +169,14 @@ Deno.test("defaultWorkerLaunchForm preserves a Ticket repository target", () =>
|
||||
profile: "builtin:coder",
|
||||
initial_text: "Work on a ticket.",
|
||||
working_directory_id: "",
|
||||
working_directory_repository_id: "ticket-repo",
|
||||
working_directory_repository_key: "ticket-repo",
|
||||
working_directory_selector: "work/ticket",
|
||||
relative_cwd: "",
|
||||
},
|
||||
);
|
||||
|
||||
assertEquals(form.working_directory_id, "ticket-workdir");
|
||||
assertEquals(form.working_directory_repository_id, "ticket-repo");
|
||||
assertEquals(form.working_directory_repository_key, "ticket-repo");
|
||||
assertEquals(form.working_directory_selector, "work/ticket");
|
||||
});
|
||||
|
||||
@@ -188,7 +187,7 @@ Deno.test("buildCreateWorkspaceWorkerRequest sends working_directory id and rela
|
||||
profile: "builtin:coder",
|
||||
initial_text: "go",
|
||||
working_directory_id: "wd-1-repo",
|
||||
working_directory_repository_id: "repo",
|
||||
working_directory_repository_key: "repo",
|
||||
working_directory_selector: "main",
|
||||
relative_cwd: "crates/yoi",
|
||||
});
|
||||
@@ -212,7 +211,7 @@ Deno.test("buildCreateWorkspaceWorkerRequest sends no initial segments for an em
|
||||
profile: "builtin:companion",
|
||||
initial_text: " ",
|
||||
working_directory_id: "",
|
||||
working_directory_repository_id: "",
|
||||
working_directory_repository_key: "",
|
||||
working_directory_selector: "",
|
||||
relative_cwd: "",
|
||||
});
|
||||
@@ -227,7 +226,7 @@ Deno.test("buildCreateWorkspaceWorkerRequest omits working_directory for embedde
|
||||
profile: "builtin:companion",
|
||||
initial_text: "chat",
|
||||
working_directory_id: "",
|
||||
working_directory_repository_id: "",
|
||||
working_directory_repository_key: "",
|
||||
working_directory_selector: "",
|
||||
relative_cwd: "",
|
||||
});
|
||||
|
||||
@@ -11,7 +11,7 @@ export type WorkerLaunchFormState = {
|
||||
profile: string;
|
||||
initial_text: string;
|
||||
working_directory_id: string;
|
||||
working_directory_repository_id: string;
|
||||
working_directory_repository_key: string;
|
||||
working_directory_selector: string;
|
||||
relative_cwd: string;
|
||||
};
|
||||
@@ -54,20 +54,20 @@ export function defaultWorkerLaunchForm(
|
||||
const preferredWorkingDirectory = workdirlessRuntime
|
||||
? undefined
|
||||
: availableWorkingDirectories.find((directory) =>
|
||||
Boolean(current.working_directory_repository_id) &&
|
||||
directory.repository_id === current.working_directory_repository_id &&
|
||||
Boolean(current.working_directory_repository_key) &&
|
||||
directory.repository_key === current.working_directory_repository_key &&
|
||||
(!current.working_directory_selector ||
|
||||
(directory.current_selector ?? directory.creation_selector) ===
|
||||
current.working_directory_selector)
|
||||
) ?? availableWorkingDirectories.find((directory) =>
|
||||
Boolean(current.working_directory_repository_id) &&
|
||||
directory.repository_id === current.working_directory_repository_id
|
||||
) ?? (current.working_directory_repository_id
|
||||
Boolean(current.working_directory_repository_key) &&
|
||||
directory.repository_key === current.working_directory_repository_key
|
||||
) ?? (current.working_directory_repository_key
|
||||
? undefined
|
||||
: availableWorkingDirectories[0]);
|
||||
const preferredRepository =
|
||||
options?.repositories.find((repository) =>
|
||||
repository.id === current.working_directory_repository_id
|
||||
repository.repository_key === current.working_directory_repository_key
|
||||
) ??
|
||||
options?.repositories[0];
|
||||
|
||||
@@ -86,8 +86,8 @@ export function defaultWorkerLaunchForm(
|
||||
)
|
||||
? current.working_directory_id
|
||||
: preferredWorkingDirectory?.working_directory_id || "",
|
||||
working_directory_repository_id: current.working_directory_repository_id ||
|
||||
preferredRepository?.id || "",
|
||||
working_directory_repository_key: current.working_directory_repository_key ||
|
||||
preferredRepository?.repository_key || "",
|
||||
working_directory_selector: current.working_directory_selector ||
|
||||
preferredRepository?.default_selector || "HEAD",
|
||||
relative_cwd: current.relative_cwd,
|
||||
|
||||
@@ -9,7 +9,7 @@ import { compareWorkersForSidebar } from './workers';
|
||||
import type { Worker } from './types';
|
||||
|
||||
export type SidebarWorker = Worker & {
|
||||
repository_id: string | null;
|
||||
repository_key: string | null;
|
||||
working_directory_id: string | null;
|
||||
has_running_internal_workers: boolean;
|
||||
};
|
||||
@@ -97,7 +97,7 @@ function projectWorker(worker: SubscriptionWorker): SidebarWorker {
|
||||
can_stop: worker.state !== 'stopped' && worker.state !== 'cancelled',
|
||||
can_spawn_followup: false,
|
||||
},
|
||||
repository_id: worker.repository_id ?? null,
|
||||
repository_key: worker.repository_key ?? null,
|
||||
working_directory_id: worker.working_directory_id ?? null,
|
||||
has_running_internal_workers: worker.has_running_internal_workers,
|
||||
working_directory: null,
|
||||
|
||||
@@ -88,7 +88,7 @@ Deno.test("ticket worker launch uses the common Worker route and bounded Ticket
|
||||
const ticket = {
|
||||
id: "00001KYRRDVH9",
|
||||
title: "Ticket panel API",
|
||||
repository_id: "main repo",
|
||||
repository_key: "main repo",
|
||||
ref_selector: "work/ticket",
|
||||
} as TicketDetail;
|
||||
|
||||
@@ -102,7 +102,7 @@ Deno.test("ticket worker launch uses the common Worker route and bounded Ticket
|
||||
assertEquals(url.pathname, "/w/workspace%20one/workers/new");
|
||||
assertEquals(url.searchParams.get("ticketId"), ticket.id);
|
||||
assertEquals(url.searchParams.get("ticketRole"), "reviewer");
|
||||
assertEquals(url.searchParams.get("repositoryId"), "main repo");
|
||||
assertEquals(url.searchParams.get("repositoryKey"), "main repo");
|
||||
assertEquals(url.searchParams.get("refSelector"), "work/ticket");
|
||||
assertEquals(
|
||||
url.searchParams.get("initialInput"),
|
||||
|
||||
@@ -120,7 +120,7 @@ export function ticketWorkerLaunchHref(
|
||||
workspaceId: string,
|
||||
ticket: Pick<
|
||||
TicketDetail,
|
||||
"id" | "title" | "repository_id" | "ref_selector"
|
||||
"id" | "title" | "repository_key" | "ref_selector"
|
||||
>,
|
||||
role: TicketWorkerRole,
|
||||
): string {
|
||||
@@ -130,8 +130,8 @@ export function ticketWorkerLaunchHref(
|
||||
ticketRole: role,
|
||||
initialInput: ticketWorkerMessage(ticket.id, role),
|
||||
});
|
||||
if (ticket.repository_id) {
|
||||
params.set("repositoryId", ticket.repository_id);
|
||||
if (ticket.repository_key) {
|
||||
params.set("repositoryKey", ticket.repository_key);
|
||||
}
|
||||
if (ticket.ref_selector) {
|
||||
params.set("refSelector", ticket.ref_selector);
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
let creating = $state(false);
|
||||
let creationError = $state<string | null>(null);
|
||||
let displayName = $state("");
|
||||
let repositoryKey = $state("");
|
||||
let repositoryUri = $state("");
|
||||
let repositoryName = $state("Main");
|
||||
let defaultRef = $state("");
|
||||
let lastSubmission = $state<{
|
||||
signature: string;
|
||||
@@ -48,7 +48,7 @@
|
||||
const normalized = {
|
||||
displayName: displayName.trim(),
|
||||
repositoryUri: repositoryUri.trim(),
|
||||
repositoryName: repositoryName.trim(),
|
||||
repositoryKey: repositoryKey.trim(),
|
||||
defaultRef: defaultRef.trim(),
|
||||
};
|
||||
const signature = JSON.stringify(normalized);
|
||||
@@ -58,8 +58,8 @@
|
||||
operation_key: createOperationKey(),
|
||||
display_name: normalized.displayName,
|
||||
repository: {
|
||||
repository_key: normalized.repositoryKey,
|
||||
uri: normalized.repositoryUri,
|
||||
display_name: normalized.repositoryName || null,
|
||||
default_ref: normalized.defaultRef || null,
|
||||
},
|
||||
};
|
||||
@@ -132,7 +132,7 @@
|
||||
<code>{workspace.workspace_id}</code>
|
||||
{#if workspace.repositories[0]}
|
||||
<span class="workspace-repository-summary">
|
||||
{workspace.repositories[0].display_name}
|
||||
{workspace.repositories[0].repository_key}
|
||||
<small>
|
||||
{workspace.repositories[0].default_selector ?? "repository default"} ·
|
||||
{workspace.repositories[0].kind}
|
||||
@@ -169,8 +169,8 @@
|
||||
</label>
|
||||
<div class="workspace-create-row">
|
||||
<label>
|
||||
Repository display name
|
||||
<input bind:value={repositoryName} autocomplete="off" />
|
||||
Repository key
|
||||
<input bind:value={repositoryKey} required pattern="[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9]" maxlength="64" autocomplete="off" />
|
||||
</label>
|
||||
<label>
|
||||
Default ref
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
</strong>
|
||||
</div>
|
||||
<p class="ticket-summary">
|
||||
Repository {mergeRequest.repository_id} · {item.ticket_ids.length} linked Ticket{item.ticket_ids.length === 1 ? "" : "s"} · review {mergeRequest.review_status}
|
||||
Repository {mergeRequest.repository_key} · {item.ticket_ids.length} linked Ticket{item.ticket_ids.length === 1 ? "" : "s"} · review {mergeRequest.review_status}
|
||||
</p>
|
||||
</div>
|
||||
<div class="ticket-meta">
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@
|
||||
<section class="ticket-detail-section">
|
||||
<div class="ticket-section-heading"><h2>Selectors</h2></div>
|
||||
<dl class="ticket-facts">
|
||||
<div><dt>Repository</dt><dd>{mergeRequest.repository_id}</dd></div>
|
||||
<div><dt>Repository</dt><dd>{mergeRequest.repository_key}</dd></div>
|
||||
<div><dt>State</dt><dd>{mergeRequest.state}</dd></div>
|
||||
<div><dt>Source selector</dt><dd><code>{mergeRequest.selector_from ?? "requires repair"}</code></dd></div>
|
||||
<div><dt>Source revision</dt><dd>{mergeRequest.source.status}{mergeRequest.source.ref ? ` · ${mergeRequest.source.ref}` : ""}</dd></div>
|
||||
|
||||
+2
-2
@@ -6,7 +6,7 @@
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>{data.repository?.item.display_name ?? data.repositoryId} · Repository</title>
|
||||
<title>{data.repository?.item.repository_key ?? data.repositoryKey} · Repository</title>
|
||||
</svelte:head>
|
||||
|
||||
<section class="card repository-detail-card">
|
||||
@@ -14,7 +14,7 @@
|
||||
{#if data.repository}
|
||||
<div class="repository-detail-heading">
|
||||
<div>
|
||||
<h3>{data.repository.item.display_name}</h3>
|
||||
<h3>{data.repository.item.repository_key}</h3>
|
||||
</div>
|
||||
<span class="status-pill" class:warn={data.repository.item.observed_status !== 'ready'}>{data.repository.item.observed_status}</span>
|
||||
</div>
|
||||
+4
-4
@@ -7,20 +7,20 @@ import type { PageLoad } from "./$types";
|
||||
|
||||
export const load: PageLoad = async ({ fetch, params }) => {
|
||||
const workspaceId = params.workspaceId;
|
||||
const repositoryId = params.repositoryId;
|
||||
const repositoryKey = params.repositoryKey;
|
||||
const [repositoryResult, logResult] = await Promise.all([
|
||||
loadJson<unknown>(
|
||||
fetch,
|
||||
workspaceApiPath(
|
||||
workspaceId,
|
||||
`/repositories/${encodeURIComponent(repositoryId)}`,
|
||||
`/repositories/${encodeURIComponent(repositoryKey)}`,
|
||||
),
|
||||
),
|
||||
loadJson<unknown>(
|
||||
fetch,
|
||||
workspaceApiPath(
|
||||
workspaceId,
|
||||
`/repositories/${encodeURIComponent(repositoryId)}/log`,
|
||||
`/repositories/${encodeURIComponent(repositoryKey)}/log`,
|
||||
),
|
||||
),
|
||||
]);
|
||||
@@ -50,7 +50,7 @@ export const load: PageLoad = async ({ fetch, params }) => {
|
||||
}
|
||||
|
||||
return {
|
||||
repositoryId,
|
||||
repositoryKey,
|
||||
repository,
|
||||
repositoryError,
|
||||
repositoryLog: log,
|
||||
@@ -16,8 +16,7 @@
|
||||
return kind === 'ssh' || kind === 'http' || kind === 'https';
|
||||
}
|
||||
let showAddRepository = $state(false);
|
||||
let repositoryId = $state('');
|
||||
let displayName = $state('');
|
||||
let repositoryKey = $state('');
|
||||
let source = $state('');
|
||||
let defaultRef = $state('');
|
||||
let pending = $state(false);
|
||||
@@ -39,15 +38,13 @@
|
||||
method: 'POST',
|
||||
headers: { 'content-type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
repository_id: repositoryId,
|
||||
display_name: displayName,
|
||||
repository_key: repositoryKey,
|
||||
source,
|
||||
default_ref: defaultRef || null,
|
||||
}),
|
||||
});
|
||||
if (!response.ok) throw new Error(await responseError(response));
|
||||
repositoryId = '';
|
||||
displayName = '';
|
||||
repositoryKey = '';
|
||||
source = '';
|
||||
defaultRef = '';
|
||||
showAddRepository = false;
|
||||
@@ -82,12 +79,9 @@
|
||||
<h2>Add Repository</h2>
|
||||
<div class="settings-form-grid">
|
||||
<label>
|
||||
Repository ID
|
||||
<input bind:value={repositoryId} required pattern="[A-Za-z0-9_.-]+" maxlength="128" autocomplete="off" />
|
||||
</label>
|
||||
<label>
|
||||
Display name
|
||||
<input bind:value={displayName} required maxlength="256" autocomplete="off" />
|
||||
Repository key
|
||||
<input bind:value={repositoryKey} required pattern="[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9]" maxlength="64" autocomplete="off" />
|
||||
<small>1–64 lowercase letters, digits, or hyphens; no leading or trailing hyphen.</small>
|
||||
</label>
|
||||
<label class="settings-form-field-wide">
|
||||
Source
|
||||
@@ -133,13 +127,12 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each data.repositories.items as repository (repository.id)}
|
||||
{#each data.repositories.items as repository (repository.repository_key)}
|
||||
<tr>
|
||||
<td>
|
||||
<a class="inline-link" href={workspaceRoute(data.workspaceId, `/repositories/${encodeURIComponent(repository.id)}`)}>
|
||||
<strong>{repository.display_name}</strong>
|
||||
<a class="inline-link" href={workspaceRoute(data.workspaceId, `/repositories/${encodeURIComponent(repository.repository_key)}`)}>
|
||||
<strong><code>{repository.repository_key}</code></strong>
|
||||
</a>
|
||||
<small><code>{repository.id}</code></small>
|
||||
</td>
|
||||
<td>
|
||||
<span>{sourceLabel(repository.source.kind)}</span>
|
||||
|
||||
@@ -234,9 +234,9 @@
|
||||
<h3>Active access projection</h3>
|
||||
<p>Config revision {accessProjection.config_revision} · <code>{accessProjection.projection_digest}</code></p>
|
||||
{#if accessProjection.bindings.length === 0}<p>No repository access bindings are active.</p>{/if}
|
||||
{#each accessProjection.bindings as binding (binding.repository_id)}
|
||||
{#each accessProjection.bindings as binding (binding.repository_key)}
|
||||
<div class="card">
|
||||
<strong>{binding.repository_id}</strong>
|
||||
<strong>{binding.repository_key}</strong>
|
||||
<p>{binding.access} · credential <code>{binding.credential_id}</code> · host trust <code>{binding.host_trust_id}</code></p>
|
||||
</div>
|
||||
{/each}
|
||||
|
||||
+2
-2
@@ -25,7 +25,7 @@
|
||||
});
|
||||
|
||||
function repositoryProvider(workdir: WorkingDirectorySummary): string | null {
|
||||
return data.repositories?.items.find((repository) => repository.id === workdir.repository_id)
|
||||
return data.repositories?.items.find((repository) => repository.repository_key === workdir.repository_key)
|
||||
?.provider ?? null;
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
{@const cleanup = cleanupCandidate(workdir)}
|
||||
<tr>
|
||||
<td><code>{workdir.working_directory_id}</code></td>
|
||||
<td>{workdir.repository_id}</td>
|
||||
<td>{workdir.repository_key}</td>
|
||||
<td><code>{currentRevision(workdir)}</code></td>
|
||||
<td>{workdir.status}</td>
|
||||
<td>{workdir.cleanliness ?? 'unknown'}</td>
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
let editing = $state(false);
|
||||
let editTitle = $state(loadedTicket.title);
|
||||
let editBody = $state(loadedTicket.body);
|
||||
let repositoryId = $state(loadedTicket.repository_id ?? "");
|
||||
let repositoryKey = $state(loadedTicket.repository_key ?? "");
|
||||
let refSelector = $state(loadedTicket.ref_selector ?? "");
|
||||
let nextState = $state(loadedTicket.state);
|
||||
let transitionReason = $state("");
|
||||
@@ -68,7 +68,7 @@
|
||||
ticket.assignments.find((assignment) => assignment.role === "coder") ?? null,
|
||||
);
|
||||
const selectedRepository = $derived(
|
||||
(loadedRepositories?.items ?? []).find((repository: RepositorySummary) => repository.id === repositoryId) ?? null,
|
||||
(loadedRepositories?.items ?? []).find((repository: RepositorySummary) => repository.repository_key === repositoryKey) ?? null,
|
||||
);
|
||||
const effectiveRefSelector = $derived(refSelector.trim() || selectedRepository?.default_ref || "");
|
||||
const targetCandidateValid = $derived(
|
||||
@@ -78,10 +78,10 @@
|
||||
effectiveRefSelector.length > 0,
|
||||
);
|
||||
const persistedTargetValid = $derived(
|
||||
ticket.repository_id !== null &&
|
||||
ticket.repository_key !== null &&
|
||||
ticket.ref_selector !== null &&
|
||||
(loadedRepositories?.items ?? []).some((repository: RepositorySummary) =>
|
||||
repository.id === ticket.repository_id && (repository.diagnostics ?? []).length === 0
|
||||
repository.repository_key === ticket.repository_key && (repository.diagnostics ?? []).length === 0
|
||||
),
|
||||
);
|
||||
const implementationStartEligible = $derived(
|
||||
@@ -99,7 +99,7 @@
|
||||
ticket = updatedTicket;
|
||||
editTitle = updatedTicket.title;
|
||||
editBody = updatedTicket.body;
|
||||
repositoryId = updatedTicket.repository_id ?? "";
|
||||
repositoryKey = updatedTicket.repository_key ?? "";
|
||||
refSelector = updatedTicket.ref_selector ?? "";
|
||||
nextState = updatedTicket.state;
|
||||
}
|
||||
@@ -266,10 +266,10 @@
|
||||
async function saveTarget(event: SubmitEvent) {
|
||||
event.preventDefault();
|
||||
await mutate("target", "", {
|
||||
target: repositoryId
|
||||
target: repositoryKey
|
||||
? {
|
||||
action: "set",
|
||||
repository_id: repositoryId,
|
||||
repository_key: repositoryKey,
|
||||
ref_selector: refSelector.trim() || null,
|
||||
}
|
||||
: { action: "clear" },
|
||||
@@ -279,13 +279,13 @@
|
||||
async function markReady() {
|
||||
if (!targetCandidateValid || busy) return;
|
||||
if (
|
||||
ticket.repository_id !== repositoryId ||
|
||||
ticket.repository_key !== repositoryKey ||
|
||||
(ticket.ref_selector ?? "") !== refSelector.trim()
|
||||
) {
|
||||
const saved = await mutate("target", "", {
|
||||
target: {
|
||||
action: "set",
|
||||
repository_id: repositoryId,
|
||||
repository_key: repositoryKey,
|
||||
ref_selector: refSelector.trim() || null,
|
||||
},
|
||||
}, "PATCH");
|
||||
@@ -540,10 +540,10 @@
|
||||
<header><h2>Repository target</h2></header>
|
||||
<form class="ticket-control-form" onsubmit={saveTarget}>
|
||||
<label>Repository
|
||||
<select bind:value={repositoryId} disabled={ticket.state !== "planning"}>
|
||||
<select bind:value={repositoryKey} disabled={ticket.state !== "planning"}>
|
||||
<option value="">Not assigned</option>
|
||||
{#each loadedRepositories?.items ?? [] as repository}
|
||||
<option value={repository.id}>{repository.display_name}</option>
|
||||
<option value={repository.repository_key}>{repository.repository_key}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</label>
|
||||
|
||||
@@ -146,9 +146,9 @@
|
||||
function workerDirectory(worker: Worker): string {
|
||||
const directory = worker.working_directory;
|
||||
if (!directory) return '—';
|
||||
const provider = data.repositories?.items.find((repository) => repository.id === directory.repository_id)
|
||||
const provider = data.repositories?.items.find((repository) => repository.repository_key === directory.repository_key)
|
||||
?.provider;
|
||||
return `${directory.repository_id} · ${formatCurrentWorkdirRevision(directory, provider)}`;
|
||||
return `${directory.repository_key} · ${formatCurrentWorkdirRevision(directory, provider)}`;
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -28,9 +28,9 @@
|
||||
};
|
||||
|
||||
function workdirOptionLabel(directory: WorkingDirectorySummary): string {
|
||||
const provider = data.repositories?.items.find((repository) => repository.id === directory.repository_id)
|
||||
const provider = data.repositories?.items.find((repository) => repository.repository_key === directory.repository_key)
|
||||
?.provider;
|
||||
return `${directory.repository_id} · ${formatCurrentWorkdirRevision(directory, provider)}`;
|
||||
return `${directory.repository_key} · ${formatCurrentWorkdirRevision(directory, provider)}`;
|
||||
}
|
||||
|
||||
let { data }: PageProps = $props();
|
||||
@@ -59,7 +59,7 @@
|
||||
);
|
||||
let initialText = $state(ticketContext?.initialInput ?? '');
|
||||
let workingDirectoryId = $state('');
|
||||
let workingDirectoryRepositoryId = $state(ticketContext?.repositoryId ?? '');
|
||||
let workingDirectoryRepositoryKey = $state(ticketContext?.repositoryKey ?? '');
|
||||
let workingDirectorySelector = $state(ticketContext?.refSelector ?? 'HEAD');
|
||||
let relativeCwd = $state('');
|
||||
let creatingWorkingDirectory = $state(false);
|
||||
@@ -123,7 +123,7 @@
|
||||
profile,
|
||||
initial_text: initialText,
|
||||
working_directory_id: workingDirectoryId,
|
||||
working_directory_repository_id: workingDirectoryRepositoryId,
|
||||
working_directory_repository_key: workingDirectoryRepositoryKey,
|
||||
working_directory_selector: workingDirectorySelector,
|
||||
relative_cwd: relativeCwd,
|
||||
});
|
||||
@@ -131,8 +131,8 @@
|
||||
displayName = form.display_name;
|
||||
profile = form.profile;
|
||||
workingDirectoryId = form.working_directory_id ||
|
||||
(ticketContext?.repositoryId ? NEW_WORKING_DIRECTORY_VALUE : '');
|
||||
workingDirectoryRepositoryId = form.working_directory_repository_id;
|
||||
(ticketContext?.repositoryKey ? NEW_WORKING_DIRECTORY_VALUE : '');
|
||||
workingDirectoryRepositoryKey = form.working_directory_repository_key;
|
||||
workingDirectorySelector = form.working_directory_selector;
|
||||
relativeCwd = form.relative_cwd;
|
||||
} catch (err) {
|
||||
@@ -156,7 +156,7 @@
|
||||
submitError = { message: 'embedded Runtime does not create workdirs', diagnostics: [] };
|
||||
return;
|
||||
}
|
||||
if (!workingDirectoryRepositoryId) {
|
||||
if (!workingDirectoryRepositoryKey) {
|
||||
submitError = { message: 'select a repository before creating a workdir', diagnostics: [] };
|
||||
return;
|
||||
}
|
||||
@@ -165,7 +165,7 @@
|
||||
try {
|
||||
const request = validateWorkingDirectoryCreateRequest({
|
||||
runtime_id: runtimeId,
|
||||
repository_id: workingDirectoryRepositoryId,
|
||||
repository_key: workingDirectoryRepositoryKey,
|
||||
...(workingDirectorySelector ? { selector: workingDirectorySelector } : {}),
|
||||
});
|
||||
const response = await fetch(
|
||||
@@ -220,7 +220,7 @@
|
||||
profile,
|
||||
initial_text: initialText,
|
||||
working_directory_id: workingDirectoryId,
|
||||
working_directory_repository_id: workingDirectoryRepositoryId,
|
||||
working_directory_repository_key: workingDirectoryRepositoryKey,
|
||||
working_directory_selector: workingDirectorySelector,
|
||||
relative_cwd: relativeCwd,
|
||||
})),
|
||||
@@ -339,10 +339,10 @@
|
||||
<div class="new-working-directory-fields">
|
||||
<label>
|
||||
<span>Repository</span>
|
||||
<select bind:value={workingDirectoryRepositoryId}>
|
||||
<select bind:value={workingDirectoryRepositoryKey}>
|
||||
{#if options?.repositories.length}
|
||||
{#each options.repositories as repository}
|
||||
<option value={repository.id}>{repository.display_name}</option>
|
||||
<option value={repository.repository_key}>{repository.repository_key}</option>
|
||||
{/each}
|
||||
{:else}
|
||||
<option value="" disabled>No configured repositories</option>
|
||||
@@ -354,7 +354,7 @@
|
||||
<input bind:value={workingDirectorySelector} autocomplete="off" placeholder="HEAD" />
|
||||
</label>
|
||||
</div>
|
||||
<button type="button" disabled={creatingWorkingDirectory || !runtimeId || !workingDirectoryRepositoryId} onclick={() => void createWorkingDirectory()}>
|
||||
<button type="button" disabled={creatingWorkingDirectory || !runtimeId || !workingDirectoryRepositoryKey} onclick={() => void createWorkingDirectory()}>
|
||||
{creatingWorkingDirectory ? 'Creating…' : 'Create workdir'}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -11,7 +11,7 @@ export function load(
|
||||
ticketTitle: url.searchParams.get("ticketTitle") ?? ticketId,
|
||||
ticketRole,
|
||||
initialInput: url.searchParams.get("initialInput") ?? "",
|
||||
repositoryId: url.searchParams.get("repositoryId") ?? "",
|
||||
repositoryKey: url.searchParams.get("repositoryKey") ?? "",
|
||||
refSelector: url.searchParams.get("refSelector") ?? "HEAD",
|
||||
}
|
||||
: null,
|
||||
|
||||
@@ -25,7 +25,7 @@ function detail(thread: MergeRequestThreadEvent[]): MergeRequestDetail {
|
||||
return {
|
||||
merge_request_id: "MR-1",
|
||||
workspace_id: "W",
|
||||
repository_id: "main",
|
||||
repository_key: "main",
|
||||
ticket_ids: ["T-1"],
|
||||
selector_from: "work/ticket",
|
||||
selector_to: "develop",
|
||||
|
||||
@@ -25,8 +25,7 @@ test("Repository settings use the scoped list and typed create collection", () =
|
||||
"workspaceApiPath(params.workspaceId, \"/repositories\")",
|
||||
"workspaceApiPath(data.workspaceId, '/repositories')",
|
||||
"method: 'POST'",
|
||||
"repository_id: repositoryId",
|
||||
"display_name: displayName",
|
||||
"repository_key: repositoryKey",
|
||||
"default_ref: defaultRef || null",
|
||||
"await invalidateAll()",
|
||||
]) {
|
||||
|
||||
@@ -66,7 +66,7 @@ Deno.test("Repository Access parsers accept generated response contracts", () =>
|
||||
config_revision: 4,
|
||||
projection_digest: "sha256:projection",
|
||||
bindings: [{
|
||||
repository_id: "main",
|
||||
repository_key: "main",
|
||||
credential_id: "deploy-key",
|
||||
host_trust_id: "gitea",
|
||||
access: "read_only",
|
||||
@@ -77,7 +77,7 @@ Deno.test("Repository Access parsers accept generated response contracts", () =>
|
||||
config_revision: 4,
|
||||
projection_digest: "sha256:projection",
|
||||
bindings: [{
|
||||
repository_id: "main",
|
||||
repository_key: "main",
|
||||
credential_id: "deploy-key",
|
||||
host_trust_id: "gitea",
|
||||
access: "read_only",
|
||||
@@ -114,7 +114,7 @@ Deno.test("Repository Access parsers reject missing and wrong-typed fields", ()
|
||||
config_revision: 4,
|
||||
projection_digest: "sha256:projection",
|
||||
bindings: [{
|
||||
repository_id: "main",
|
||||
repository_key: "main",
|
||||
credential_id: "deploy-key",
|
||||
host_trust_id: "gitea",
|
||||
access: "admin",
|
||||
|
||||
@@ -56,7 +56,7 @@ test("Repository Access renders the shared access projection fields", () => {
|
||||
"accessProjection.config_revision",
|
||||
"accessProjection.projection_digest",
|
||||
"accessProjection.bindings",
|
||||
"binding.repository_id",
|
||||
"binding.repository_key",
|
||||
"binding.credential_id",
|
||||
"binding.host_trust_id",
|
||||
"binding.access",
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
|
||||
const summary = {
|
||||
working_directory_id: "workdir-1",
|
||||
repository_id: "main",
|
||||
repository_key: "main",
|
||||
materializer_kind: "runtime_git_cache",
|
||||
status: "active",
|
||||
occupied_by: {
|
||||
@@ -60,7 +60,7 @@ Deno.test("Workdir REST validation rejects stale response JSON", () => {
|
||||
Deno.test("Workdir REST validation enforces create operation fields", () => {
|
||||
const request = validateWorkingDirectoryCreateRequest({
|
||||
runtime_id: "arcadia",
|
||||
repository_id: "main",
|
||||
repository_key: "main",
|
||||
selector: "develop",
|
||||
operation_id: "operation-1",
|
||||
});
|
||||
@@ -71,7 +71,7 @@ Deno.test("Workdir REST validation enforces create operation fields", () => {
|
||||
for (
|
||||
const invalid of [
|
||||
{ runtime_id: "arcadia", operation_id: "operation-1" },
|
||||
{ repository_id: "main", operation_key: "operation-1" },
|
||||
{ repository_key: "main", operation_key: "operation-1" },
|
||||
]
|
||||
) {
|
||||
let rejected = false;
|
||||
|
||||
@@ -58,8 +58,7 @@ Deno.test("workspace catalog enriches each visible workspace without dropping si
|
||||
return Promise.resolve(Response.json({
|
||||
workspace_id: "w-a",
|
||||
items: [{
|
||||
id: "main",
|
||||
display_name: "Main",
|
||||
repository_key: "main",
|
||||
kind: "git",
|
||||
provider: "git",
|
||||
source: { kind: "local_path", uri: "/srv/alpha" },
|
||||
@@ -78,7 +77,7 @@ Deno.test("workspace catalog enriches each visible workspace without dropping si
|
||||
|
||||
const items = await loadWorkspaceCatalog(fetcher as typeof fetch);
|
||||
assertEquals(items.length, 2);
|
||||
assertEquals(items[0].repositories[0].id, "main");
|
||||
assertEquals(items[0].repositories[0].repository_key, "main");
|
||||
assertEquals(items[1].repositories, []);
|
||||
assertEquals(typeof items[1].repository_error, "string");
|
||||
});
|
||||
@@ -89,8 +88,8 @@ Deno.test("workspace creation preserves caller-owned operation key across retry"
|
||||
operation_key: "web-create-1",
|
||||
display_name: "Alpha",
|
||||
repository: {
|
||||
repository_key: "main",
|
||||
uri: "/srv/alpha",
|
||||
display_name: "Main",
|
||||
default_ref: "develop",
|
||||
},
|
||||
};
|
||||
|
||||
@@ -22,8 +22,7 @@ function assertThrows(operation: () => unknown, expected: string): void {
|
||||
const repositoryList = {
|
||||
workspace_id: "w-a",
|
||||
items: [{
|
||||
id: "main",
|
||||
display_name: "Main",
|
||||
repository_key: "main",
|
||||
kind: "git",
|
||||
provider: "git",
|
||||
source: { kind: "local_path", uri: "/srv/alpha" },
|
||||
@@ -38,8 +37,8 @@ const repositoryList = {
|
||||
|
||||
Deno.test("generated repository wrapper validates current Backend JSON", () => {
|
||||
const parsed = parseRepositoryListResponse(repositoryList);
|
||||
if (parsed.items[0]?.id !== "main") {
|
||||
throw new Error("repository id was not preserved");
|
||||
if (parsed.items[0]?.repository_key !== "main") {
|
||||
throw new Error("repository key was not preserved");
|
||||
}
|
||||
if (parsed.items[0]?.source.kind !== "local_path") {
|
||||
throw new Error("repository source kind was not preserved");
|
||||
@@ -49,11 +48,11 @@ Deno.test("generated repository wrapper validates current Backend JSON", () => {
|
||||
Deno.test("stale repository aliases fail closed at the JSON boundary", () => {
|
||||
const stale = structuredClone(repositoryList) as Record<string, unknown>;
|
||||
const items = stale.items as Array<Record<string, unknown>>;
|
||||
items[0].repository_id = items[0].id;
|
||||
delete items[0].id;
|
||||
items[0].id = items[0].repository_key;
|
||||
delete items[0].repository_key;
|
||||
assertThrows(
|
||||
() => parseRepositoryListResponse(stale),
|
||||
".repository_id is not part",
|
||||
".id is not part",
|
||||
);
|
||||
});
|
||||
|
||||
@@ -129,7 +128,7 @@ Deno.test("Repository settings consume the validated shared wire shape", async (
|
||||
for (
|
||||
const token of [
|
||||
"parseRepositoryListResponse",
|
||||
"repository.id",
|
||||
"repository.repository_key",
|
||||
"repository.observed_status",
|
||||
"sourceLabel(repository.source.kind)",
|
||||
"supportsRepositoryAccess(repository.source.kind)",
|
||||
@@ -141,8 +140,8 @@ Deno.test("Repository settings consume the validated shared wire shape", async (
|
||||
}
|
||||
for (
|
||||
const staleToken of [
|
||||
"repository.repository_id",
|
||||
"repository.observed.status",
|
||||
"repository.id",
|
||||
"repository.display_name",
|
||||
"repository.source.kind === 'remote_git'",
|
||||
]
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user