Remove hollow Url=String alias (§3); ground RestTransportConfig.base_url as Uri

dsl/ctrl/code_change_workflow.dag

@@ -4,7 +4,7 @@ import ctrl.process_algebra { ProcessNodeId }
 import ctrl.pr_digests { MergeReadinessVerdict, Ready, NotReady }
 import ctrl.review_verdict { MergeReadinessTally }
 import extdeps.github.pulls { PullRequest, Open, Closed }
-import std.types { CommitSha, NonEmptyStr, Timestamp, Url }
+import std.types { CommitSha, NonEmptyStr, Timestamp }
 
 type CodeChangeActiveStage
   = ChangeOpen

dsl/ctrl/pr_digests.dag

@@ -2,14 +2,14 @@ module ctrl.pr_digests
 
 import extdeps.github.pulls { PullRequest, PullReview, ReviewComment }
 import extdeps.github.errors { GitHubErrorShape }
-import std.types { Url }
+import std.types { NonEmptyStr }
 
 type MergeReadinessVerdict
   = Ready
   | NotReady { first_reason: String, more_reasons: List<String> }
 
 type AttachedUrl {
-  url: Url
+  url: NonEmptyStr
   container: AttachedUrlContainer
   context: AttachedUrlTextContext
 }

dsl/ctrl/review_verdict.dag

@@ -1,6 +1,6 @@
 module ctrl.review_verdict
 
-import std.types { ArtifactId, CommitSha, ContentHash, NonEmptyStr, Timestamp, Url }
+import std.types { ArtifactId, CommitSha, ContentHash, NonEmptyStr, Timestamp }
 
 type ReviewProvider
   = OpenaiPro
@@ -99,7 +99,7 @@ type ReviewArtifact {
   pr_number: Int
 
   source_commit_sha: CommitSha?
-  source_url: Url?
+  source_url: NonEmptyStr?
   body_hash: ContentHash?
   body_text: String
   observed_at: Timestamp?

dsl/extdeps/cloud/gcp/sts.dag

@@ -1,6 +1,6 @@
 module extdeps.cloud.gcp.sts
 
-import std.types { Url, HttpMethod, AuthScheme }
+import std.types { NonEmptyStr, HttpMethod, AuthScheme }
 import extdeps.cloud.gcp.errors { GcpErrorShape, GcpOAuth2ErrorShape }
 import extdeps.github.errors { GitHubErrorShape }
 
@@ -34,7 +34,7 @@ type MetadataRuntime {}
 
 data metadata_runtime: MetadataRuntime = {}
 
-data sts_endpoint: Url = "https://sts.googleapis.com/v1/token"
+data sts_endpoint: NonEmptyStr = "https://sts.googleapis.com/v1/token"
 
 data default_grant_type: String = "urn:ietf:params:oauth:grant-type:token-exchange"
 

dsl/extdeps/git/git.dag

@@ -1,6 +1,6 @@
 module extdeps.git
 
-import std.types { CommitSha, Email, FilePath, GitRef, Timestamp, Url }
+import std.types { CommitSha, Email, FilePath, GitRef, NonEmptyStr, Timestamp }
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
@@ -28,7 +28,7 @@ type GitBranch {
 
 type GitRemote {
   name: String
-  url: Url
+  url: NonEmptyStr
   fetch_refspec: String
 }
 

dsl/extdeps/git/versioning.dag

@@ -1,6 +1,6 @@
 module extdeps.git.versioning
 
-import std.types { Url }
+import std.types { NonEmptyStr }
 import std.integer { NonNegativeInt }
 import std.algebra { Ordering, Equal, Greater }
 import std.nat { nat_compare }
@@ -36,7 +36,7 @@ data git_2_0_release: GitReleaseVersion = {
   patch: 0
 }
 
-data git_release_versioning_spec_url: Url = "https://git-scm.com/docs/BreakingChanges.html"
+data git_release_versioning_spec_url: NonEmptyStr = "https://git-scm.com/docs/BreakingChanges.html"
 
 type GitVersionConstraint = VersionConstraint where brand("GitVersionConstraint")
 

dsl/extdeps/github/checks.dag

@@ -1,7 +1,7 @@
 module extdeps.github.checks
 
 import extdeps.github.github { default_api_base, default_per_page }
-import std.types { CommitSha, Timestamp, Url }
+import std.types { CommitSha, NonEmptyStr, Timestamp }
 import extdeps.github.errors { GitHubErrorShape }
 import std.credentials { EnvVar }
 import extdeps.external_authority { ExternalAuthority }
@@ -104,7 +104,7 @@ type CheckRun {
   started_at: Timestamp?
   completed_at: Timestamp?
   output: CheckOutput
-  html_url: Url
+  html_url: NonEmptyStr
 }
 
 type CheckRunList {

dsl/extdeps/github/errors.dag

@@ -1,6 +1,5 @@
 module extdeps.github.errors
 
-import std.types { Url }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
 
@@ -13,7 +12,7 @@ data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
 
 type GitHubErrorShape {
   message: String
-  documentation_url: Url?
+  documentation_url: String?
 }
 
 data github_error_example: GitHubErrorShape = {

dsl/extdeps/github/gists.dag

@@ -1,7 +1,7 @@
 module extdeps.github.gists
 
 import extdeps.github.github { GitHubUser, default_api_base }
-import std.types { Timestamp, GistId, Url, HttpMethod, AuthScheme }
+import std.types { Timestamp, GistId, NonEmptyStr, HttpMethod, AuthScheme }
 import extdeps.github.errors { GitHubErrorShape }
 
 import extdeps.external_authority { ExternalAuthority }
@@ -29,7 +29,7 @@ type Gist {
   owner: GitHubUser
   created_at: Timestamp
   updated_at: Timestamp
-  html_url: Url
+  html_url: NonEmptyStr
 }
 
 service github.Gist {
@@ -53,7 +53,7 @@ service github.Gist {
     }
     output {
       id: GistId
-      html_url: Url
+      html_url: NonEmptyStr
     }
     transport rest {
       method: POST,

dsl/extdeps/github/github.dag

@@ -1,6 +1,6 @@
 module extdeps.github.github
 
-import std.types { Timestamp, Url }
+import std.types { NonEmptyStr, Timestamp }
 
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
@@ -49,7 +49,7 @@ type Pagination {
 
 type GitHubPermission = PermRead | PermWrite | PermAdmin
 
-data default_api_base: Url = "https://api.github.com"
+data default_api_base: NonEmptyStr = "https://api.github.com"
 
 data default_per_page: Int = 30
 

dsl/extdeps/github/pulls.dag

@@ -1,7 +1,7 @@
 module extdeps.github.pulls
 
 import extdeps.github.github { GitHubUser, default_api_base, default_per_page }
-import std.types { CommitSha, FilePath, GitRef, Timestamp, Url, HttpMethod, AuthScheme }
+import std.types { CommitSha, FilePath, GitRef, NonEmptyStr, Timestamp, HttpMethod, AuthScheme }
 import extdeps.github.errors { GitHubErrorShape }
 import std.credentials { CredentialSource, EnvVar }
 import std.serialization { WireFormat, Text }
@@ -38,7 +38,7 @@ type PullRequest {
   title: String
   body: String?
   state: PullRequestState
-  html_url: Url
+  html_url: NonEmptyStr
   user: GitHubUser
   head: PullRequestRef
   base: PullRequestRef
@@ -50,7 +50,7 @@ type PullRequest {
 
 type IssueComment {
   id: Int
-  html_url: Url
+  html_url: NonEmptyStr
   body: String
   created_at: Timestamp
 }
@@ -150,7 +150,7 @@ service github.Pulls {
     }
     output {
       id: Int from "id"
-      html_url: Url from "html_url"
+      html_url: NonEmptyStr from "html_url"
     }
     transport rest {
       method: POST,
@@ -202,7 +202,7 @@ service github.Pulls {
     }
     output {
       id: Int from "id"
-      html_url: Url from "html_url"
+      html_url: NonEmptyStr from "html_url"
     }
     transport rest {
       method: POST,
@@ -246,7 +246,7 @@ type PullReview {
   body: String
   state: ReviewState
   commit_id: CommitSha
-  html_url: Url
+  html_url: NonEmptyStr
 }
 
 data structural_coverage_gap_github_pull_review_response_residual: List<CoverageClosureEntry> = [
@@ -271,5 +271,5 @@ type ReviewComment {
   line: Int?
   original_line: Int?
   body: String
-  html_url: Url
+  html_url: NonEmptyStr
 }

dsl/extdeps/github/workflow_runs.dag

@@ -2,7 +2,7 @@ module extdeps.github.workflow_runs
 
 import extdeps.github.github { GitHubUser, default_api_base, default_per_page }
 import extdeps.github.errors { GitHubErrorShape }
-import std.types { CommitSha, Timestamp, Url }
+import std.types { CommitSha, NonEmptyStr, Timestamp }
 import std.credentials { EnvVar }
 import extdeps.external_authority { ExternalAuthority }
 import extdeps.uri { Uri, Https }
@@ -48,7 +48,7 @@ type WorkflowRun {
   conclusion: WorkflowRunConclusion?
   workflow_id: Int
   run_number: Int
-  html_url: Url
+  html_url: NonEmptyStr
   created_at: Timestamp
   updated_at: Timestamp
 }

dsl/extdeps/transports/rest.dag

@@ -1,6 +1,6 @@
 module extdeps.transports.rest
 
-import std.types { HttpMethod, Url }
+import std.types { HttpMethod }
 import std.serialization { WireFormat }
 import std.fidelity { TransportFidelity }
 import extdeps.external_authority { ExternalAuthority }
@@ -16,7 +16,7 @@ data extdeps_external_authority_anchor: ExternalAuthority = ExternalAuthority {
 data rest_transport_fidelity: TransportFidelity = TransportFidelity { depth: L, hermetic: false }
 
 type RestTransportConfig {
-  base_url: Url
+  base_url: Uri
   auth_token: String?
   auth_header: String?
   headers: Map<String, String>

dsl/extdeps/uri.dag

@@ -1,6 +1,6 @@
 module extdeps.uri
 
-import std.types { NonEmptyStr, Url }
+import std.types { NonEmptyStr }
 
 type UriScheme
   = Http

dsl/gunbc/digest_render.dag

@@ -2,12 +2,12 @@ module gunbc.digest_render
 
 import extdeps.github.pulls { PullRequest, PullReview, PullRequestState, ReviewState, Open }
 import std.render { kv_pair, list_block }
-import std.types { Url }
+import std.types { NonEmptyStr }
 
 type PullRequestDigestSubject {
   number: Int
   title: String
-  url: Url
+  url: NonEmptyStr
   state: PullRequestState
   draft: Bool
   head_sha: String
@@ -117,7 +117,7 @@ fn render_pull_request_digest_line(view: PullRequestDigestView) -> String {
 fn render_pull_request_digest_block(view: PullRequestDigestView) -> String {
   let entries = [
     kv_pair(key: "PR", sep: ": ", value: "#\{view.subject.number\} \{view.subject.title\}"),
-    kv_pair(key: "URL", sep: ": ", value: view.subject.url as String),
+    kv_pair(key: "URL", sep: ": ", value: view.subject.url),
     kv_pair(key: "Base", sep: ": ", value: view.subject.base_ref),
     kv_pair(key: "Head", sep: ": ", value: view.subject.head_sha),
     kv_pair(key: "State", sep: ": ", value: render_pull_request_state(state: view.subject.state)),

dsl/gunbc/workflow/types.dag

@@ -6,10 +6,10 @@ import std.types {
   FilePath,
   Milliseconds,
   NonEmptyStr,
-  Timestamp,
-  Url
+  Timestamp
 }
 import extdeps.cloud.gcp.gcp { GcpProjectId, ServiceAccountEmail }
+import extdeps.uri { Uri }
 
 type ArtifactKind = Design | Review | Plan | CiReport
 type AuthorSource = Llm | Human
@@ -49,7 +49,7 @@ type TrackedIssue {
   title: String
   body: String
   stage: IssueLifecycleStage
-  url: Url?
+  url: NonEmptyStr?
   author: String?
   labels: List<String>
   created_at: Timestamp?
@@ -113,7 +113,7 @@ type PipelineArtifact {
   stage: IssueLifecycleStage
   kind: ArtifactKind
   content: String
-  url: Url?
+  url: NonEmptyStr?
 }
 
 type IssueState = Open | Closed
@@ -191,7 +191,7 @@ type ArtifactType
 
 type ArtifactPayload
   = Inline { body: String }
-  | BlobRef { uri: Url, size_bytes: Int }
+  | BlobRef { uri: Uri, size_bytes: Int }
 
 type Artifact {
   artifact_id: NonEmptyStr
@@ -240,7 +240,7 @@ type RuntimeProfile
 type LaunchConfig {
   worker_count: Int
   drain_flag_path: String?
-  drain_flag_url: Url?
+  drain_flag_url: NonEmptyStr?
 }
 
 type InfraIntent {

dsl/std/types.dag

@@ -122,8 +122,6 @@ type GistId       = String
 type Secret       nominal_opaque = String
 type SecretValue  = Secret where non_empty
 
-type Url          = String
-
 type SemVer       = String
 type NonEmptyStr     = String where non_empty
 type LanguageId      = String where non_empty

dsl/test/claim/code_change_workflow_witness_test.dag

@@ -20,10 +20,10 @@ import extdeps.github.pulls {
   PullRequest, PullRequestRef, PullRequestState, Open, Closed,
 }
 import extdeps.github.github { GitHubUser, User }
-import std.types { CommitSha, NonEmptyStr, Timestamp, Url }
+import std.types { CommitSha, NonEmptyStr, Timestamp }
 
 data witness_repo: NonEmptyStr = "gunb-ai/gunbc"
-data witness_pr_url: Url = "https://github.com/gunb-ai/gunbc/pull/1"
+data witness_pr_url: NonEmptyStr = "https://github.com/gunb-ai/gunbc/pull/1"
 data witness_head_sha: CommitSha = "abc1234def5678901234567890abcd1234567890"
 data witness_merged_at: Timestamp = "2026-06-18T01:00:00Z"
 data witness_node: ProcessNodeId = "session-calm-swift-738"

dsl/test/claim/extdeps_github_errors_url_grounding_witness_test.dag

@@ -1,9 +1,9 @@
 module test.claim.extdeps_github_errors_url_grounding_witness
 
 import extdeps.github.errors { GitHubErrorShape, github_error_example }
-import std.types { Url }
+import std.types { NonEmptyStr }
 
-data sample_docs_url: Url = "https://docs.github.com/rest"
+data sample_docs_url: NonEmptyStr = "https://docs.github.com/rest"
 
 fn w_github_error_shape_documentation_url_grounded() -> Bool {
   let row = GitHubErrorShape {