From ce56111a4c89592b51cbe93cd7b2fd381a0bf2a7 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sun, 13 Sep 2026 17:52:45 -0400
Subject: [PATCH] refactor(protocol): simplify response locations

---
 V2_HTTP_API_AUDIT.md                          |   9 +-
 packages/client/src/effect/api/api.ts         |  80 +++++------
 .../client/src/promise/generated/types.ts     | 126 +++++++++---------
 packages/protocol/openapi.json                |  80 +++++------
 packages/schema/src/location.ts               |   2 +-
 packages/tui/test/mini/runtime.test.ts        |   2 +-
 services/www/openapi.json                     |  80 +++++------
 services/www/public/openapi.json              |  80 +++++------
 8 files changed, 232 insertions(+), 227 deletions(-)

diff --git a/V2_HTTP_API_AUDIT.md b/V2_HTTP_API_AUDIT.md
index f924bfa979e..e5eebac3c59 100644
--- a/V2_HTTP_API_AUDIT.md
+++ b/V2_HTTP_API_AUDIT.md
@@ -28,7 +28,7 @@ Review endpoints in document order. For each endpoint, select one disposition an
 
 ## Progress
 
-- [ ] Group 1: Foundation and placement (4)
+- [x] Group 1: Foundation and placement (4)
 - [ ] Group 2: Configuration and capability catalogs (17)
 - [ ] Group 3: Credentials, integrations, MCP, and web search (22)
 - [ ] Group 4: Session lifecycle (12)
@@ -41,6 +41,11 @@ Review endpoints in document order. For each endpoint, select one disposition an
 
 ## Resolved during audit
 
+### [x] Location response wrappers
+
+- **Decision:** Reduce generic endpoint response locations to `{ directory }`.
+- **Notes:** Full project metadata remains available from `GET /api/location`; no consumers used it from wrapped responses.
+
 ### [x] `GET /api/health` and `GET /api/server`
 
 - **Decision:** Merge and rename
@@ -67,7 +72,7 @@ Review endpoints in document order. For each endpoint, select one disposition an
 | [x] 001–002 | `GET` | `/api/status` | `server.status` | Keep | Replaces the former health and server endpoints. |
 | [x] 003 | `GET` | `/api/location` | `location.get` | Keep | Workspace selectors and response fields removed until workspace support ships. |
 | [x] 004 | `GET` | `/api/project` | `project.list` | Keep | Removed unused `time.initialized`; the database column remains for migration data. |
-| [ ] 005 | `PATCH` | `/api/project/{projectID}` | `project.update` |  |  |
+| [x] 005 | `PATCH` | `/api/project/{projectID}` | `project.update` | Keep | Request and response accepted as-is. |
 
 ## Group 2: Configuration and capability catalogs
 
diff --git a/packages/client/src/effect/api/api.ts b/packages/client/src/effect/api/api.ts
index 90fcdef232e..b3003ad35b2 100644
--- a/packages/client/src/effect/api/api.ts
+++ b/packages/client/src/effect/api/api.ts
@@ -59,14 +59,14 @@ export interface LocationApi<E = never> {
 }
 
 export type AgentListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type AgentListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Agent.Info> }
+export type AgentListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Agent.Info> }
 export type AgentListOperation<E = never> = (input?: AgentListInput) => Effect.Effect<AgentListOutput, E>
 
 export type AgentGetInput = {
   readonly agentID: Agent.ID
   readonly location?: { readonly directory?: string | undefined } | undefined
 }
-export type AgentGetOutput = { readonly location: Location.PublicInfo; readonly data: Agent.Info }
+export type AgentGetOutput = { readonly location: Location.PublicRef; readonly data: Agent.Info }
 export type AgentGetOperation<E = never> = (input: AgentGetInput) => Effect.Effect<AgentGetOutput, E>
 
 export interface AgentApi<E = never> {
@@ -75,7 +75,7 @@ export interface AgentApi<E = never> {
 }
 
 export type PluginListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type PluginListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Plugin.Info> }
+export type PluginListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Plugin.Info> }
 export type PluginListOperation<E = never> = (input?: PluginListInput) => Effect.Effect<PluginListOutput, E>
 
 export type PluginAwaitActivationInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
@@ -88,7 +88,7 @@ export type PluginCheckInput = {
   readonly location?: { readonly directory?: string | undefined } | undefined
   readonly target?: string | undefined
 }
-export type PluginCheckOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Plugin.Info> }
+export type PluginCheckOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Plugin.Info> }
 export type PluginCheckOperation<E = never> = (input?: PluginCheckInput) => Effect.Effect<PluginCheckOutput, E>
 
 export type PluginUpdateInput = {
@@ -1423,11 +1423,11 @@ export interface MessageApi<E = never> {
 }
 
 export type ModelListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type ModelListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Model.Info> }
+export type ModelListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Model.Info> }
 export type ModelListOperation<E = never> = (input?: ModelListInput) => Effect.Effect<ModelListOutput, E>
 
 export type ModelDefaultInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type ModelDefaultOutput = { readonly location: Location.PublicInfo; readonly data: Model.Info | undefined }
+export type ModelDefaultOutput = { readonly location: Location.PublicRef; readonly data: Model.Info | undefined }
 export type ModelDefaultOperation<E = never> = (input?: ModelDefaultInput) => Effect.Effect<ModelDefaultOutput, E>
 
 export interface ModelApi<E = never> {
@@ -1444,14 +1444,14 @@ export interface GenerateApi<E = never> {
 }
 
 export type ProviderListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type ProviderListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Provider.Info> }
+export type ProviderListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Provider.Info> }
 export type ProviderListOperation<E = never> = (input?: ProviderListInput) => Effect.Effect<ProviderListOutput, E>
 
 export type ProviderGetInput = {
   readonly providerID: Provider.ID
   readonly location?: { readonly directory?: string | undefined } | undefined
 }
-export type ProviderGetOutput = { readonly location: Location.PublicInfo; readonly data: Provider.Info }
+export type ProviderGetOutput = { readonly location: Location.PublicRef; readonly data: Provider.Info }
 export type ProviderGetOperation<E = never> = (input: ProviderGetInput) => Effect.Effect<ProviderGetOutput, E>
 
 export interface ProviderApi<E = never> {
@@ -1461,7 +1461,7 @@ export interface ProviderApi<E = never> {
 
 export type IntegrationListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
 export type IntegrationListOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: ReadonlyArray<Integration.Info>
 }
 export type IntegrationListOperation<E = never> = (
@@ -1473,7 +1473,7 @@ export type IntegrationGetInput = {
   readonly location?: { readonly directory?: string | undefined } | undefined
 }
 export type IntegrationGetOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: Integration.Info | undefined
 }
 export type IntegrationGetOperation<E = never> = (input: IntegrationGetInput) => Effect.Effect<IntegrationGetOutput, E>
@@ -1507,7 +1507,7 @@ export type IntegrationOauthConnectInput = {
   readonly label?: string | undefined
 }
 export type IntegrationOauthConnectOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: Integration.Attempt
 }
 export type IntegrationOauthConnectOperation<E = never> = (
@@ -1520,7 +1520,7 @@ export type IntegrationOauthStatusInput = {
   readonly location?: { readonly directory?: string | undefined } | undefined
 }
 export type IntegrationOauthStatusOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: Integration.AttemptStatus
 }
 export type IntegrationOauthStatusOperation<E = never> = (
@@ -1555,7 +1555,7 @@ export type IntegrationCommandConnectInput = {
   readonly label?: string | undefined
 }
 export type IntegrationCommandConnectOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: Integration.CommandAttempt
 }
 export type IntegrationCommandConnectOperation<E = never> = (
@@ -1568,7 +1568,7 @@ export type IntegrationCommandStatusInput = {
   readonly location?: { readonly directory?: string | undefined } | undefined
 }
 export type IntegrationCommandStatusOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: Integration.CommandAttemptStatus
 }
 export type IntegrationCommandStatusOperation<E = never> = (
@@ -1604,7 +1604,7 @@ export interface IntegrationApi<E = never> {
 }
 
 export type McpListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type McpListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Mcp.Server> }
+export type McpListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Mcp.Server> }
 export type McpListOperation<E = never> = (input?: McpListInput) => Effect.Effect<McpListOutput, E>
 
 export type McpAddInput = {
@@ -1637,7 +1637,7 @@ export type McpDisconnectOutput = void
 export type McpDisconnectOperation<E = never> = (input: McpDisconnectInput) => Effect.Effect<McpDisconnectOutput, E>
 
 export type McpResourceCatalogInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type McpResourceCatalogOutput = { readonly location: Location.PublicInfo; readonly data: Mcp.ResourceCatalog }
+export type McpResourceCatalogOutput = { readonly location: Location.PublicRef; readonly data: Mcp.ResourceCatalog }
 export type McpResourceCatalogOperation<E = never> = (
   input?: McpResourceCatalogInput,
 ) => Effect.Effect<McpResourceCatalogOutput, E>
@@ -1704,7 +1704,7 @@ export interface ProjectApi<E = never> {
 }
 
 export type FormRequestListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type FormRequestListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Form.Info> }
+export type FormRequestListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Form.Info> }
 export type FormRequestListOperation<E = never> = (
   input?: FormRequestListInput,
 ) => Effect.Effect<FormRequestListOutput, E>
@@ -1751,7 +1751,7 @@ export interface FormApi<E = never> {
 
 export type PermissionRequestListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
 export type PermissionRequestListOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: ReadonlyArray<Permission.Request>
 }
 export type PermissionRequestListOperation<E = never> = (
@@ -1824,7 +1824,7 @@ export type FileListInput = {
   readonly location?: { readonly directory?: string | undefined } | undefined
   readonly path?: string | undefined
 }
-export type FileListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<FileSystem.Entry> }
+export type FileListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<FileSystem.Entry> }
 export type FileListOperation<E = never> = (input?: FileListInput) => Effect.Effect<FileListOutput, E>
 
 export type FileFindInput = {
@@ -1833,7 +1833,7 @@ export type FileFindInput = {
   readonly type?: "file" | "directory" | undefined
   readonly limit?: number | undefined
 }
-export type FileFindOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<FileSystem.Entry> }
+export type FileFindOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<FileSystem.Entry> }
 export type FileFindOperation<E = never> = (input: FileFindInput) => Effect.Effect<FileFindOutput, E>
 
 export interface FileApi<E = never> {
@@ -1842,7 +1842,7 @@ export interface FileApi<E = never> {
 }
 
 export type CommandListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type CommandListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Command.Info> }
+export type CommandListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Command.Info> }
 export type CommandListOperation<E = never> = (input?: CommandListInput) => Effect.Effect<CommandListOutput, E>
 
 export interface CommandApi<E = never> {
@@ -1850,7 +1850,7 @@ export interface CommandApi<E = never> {
 }
 
 export type SkillListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type SkillListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Skill.Info> }
+export type SkillListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Skill.Info> }
 export type SkillListOperation<E = never> = (input?: SkillListInput) => Effect.Effect<SkillListOutput, E>
 
 export interface SkillApi<E = never> {
@@ -1878,7 +1878,7 @@ export interface EventApi<E = never> {
 }
 
 export type PtyListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type PtyListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Pty.Info> }
+export type PtyListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Pty.Info> }
 export type PtyListOperation<E = never> = (input?: PtyListInput) => Effect.Effect<PtyListOutput, E>
 
 export type PtyCreateInput = {
@@ -1889,14 +1889,14 @@ export type PtyCreateInput = {
   readonly title?: string | undefined
   readonly env?: { readonly [x: string]: string } | undefined
 }
-export type PtyCreateOutput = { readonly location: Location.PublicInfo; readonly data: Pty.Info }
+export type PtyCreateOutput = { readonly location: Location.PublicRef; readonly data: Pty.Info }
 export type PtyCreateOperation<E = never> = (input?: PtyCreateInput) => Effect.Effect<PtyCreateOutput, E>
 
 export type PtyGetInput = {
   readonly ptyID: Pty.ID
   readonly location?: { readonly directory?: string | undefined } | undefined
 }
-export type PtyGetOutput = { readonly location: Location.PublicInfo; readonly data: Pty.Info }
+export type PtyGetOutput = { readonly location: Location.PublicRef; readonly data: Pty.Info }
 export type PtyGetOperation<E = never> = (input: PtyGetInput) => Effect.Effect<PtyGetOutput, E>
 
 export type PtyUpdateInput = {
@@ -1905,7 +1905,7 @@ export type PtyUpdateInput = {
   readonly title?: string | undefined
   readonly size?: { readonly rows: number; readonly cols: number } | undefined
 }
-export type PtyUpdateOutput = { readonly location: Location.PublicInfo; readonly data: Pty.Info }
+export type PtyUpdateOutput = { readonly location: Location.PublicRef; readonly data: Pty.Info }
 export type PtyUpdateOperation<E = never> = (input: PtyUpdateInput) => Effect.Effect<PtyUpdateOutput, E>
 
 export type PtyRemoveInput = {
@@ -1920,7 +1920,7 @@ export type PtyConnectTokenInput = {
   readonly location?: { readonly directory?: string | undefined } | undefined
   readonly "x-opencode-ticket"?: string | undefined
 }
-export type PtyConnectTokenOutput = { readonly location: Location.PublicInfo; readonly data: PtyTicket.ConnectToken }
+export type PtyConnectTokenOutput = { readonly location: Location.PublicRef; readonly data: PtyTicket.ConnectToken }
 export type PtyConnectTokenOperation<E = never> = (
   input: PtyConnectTokenInput,
 ) => Effect.Effect<PtyConnectTokenOutput, E>
@@ -2113,7 +2113,7 @@ export interface ExperimentalApi<E = never> {
 }
 
 export type ShellListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type ShellListOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Shell.Info> }
+export type ShellListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Shell.Info> }
 export type ShellListOperation<E = never> = (input?: ShellListInput) => Effect.Effect<ShellListOutput, E>
 
 export type ShellCreateInput = {
@@ -2123,14 +2123,14 @@ export type ShellCreateInput = {
   readonly timeout: number
   readonly metadata?: { readonly [x: string]: unknown } | undefined
 }
-export type ShellCreateOutput = { readonly location: Location.PublicInfo; readonly data: Shell.Info }
+export type ShellCreateOutput = { readonly location: Location.PublicRef; readonly data: Shell.Info }
 export type ShellCreateOperation<E = never> = (input: ShellCreateInput) => Effect.Effect<ShellCreateOutput, E>
 
 export type ShellGetInput = {
   readonly id: Shell.ID
   readonly location?: { readonly directory?: string | undefined } | undefined
 }
-export type ShellGetOutput = { readonly location: Location.PublicInfo; readonly data: Shell.Info }
+export type ShellGetOutput = { readonly location: Location.PublicRef; readonly data: Shell.Info }
 export type ShellGetOperation<E = never> = (input: ShellGetInput) => Effect.Effect<ShellGetOutput, E>
 
 export type ShellTimeoutInput = {
@@ -2138,7 +2138,7 @@ export type ShellTimeoutInput = {
   readonly location?: { readonly directory?: string | undefined } | undefined
   readonly timeout: number
 }
-export type ShellTimeoutOutput = { readonly location: Location.PublicInfo; readonly data: Shell.Info }
+export type ShellTimeoutOutput = { readonly location: Location.PublicRef; readonly data: Shell.Info }
 export type ShellTimeoutOperation<E = never> = (input: ShellTimeoutInput) => Effect.Effect<ShellTimeoutOutput, E>
 
 export type ShellOutputInput = {
@@ -2148,7 +2148,7 @@ export type ShellOutputInput = {
   readonly limit?: number | undefined
 }
 export type ShellOutputOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: {
     readonly output: string
     readonly cursor: number
@@ -2176,7 +2176,7 @@ export interface ShellApi<E = never> {
 
 export type ReferenceListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
 export type ReferenceListOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: ReadonlyArray<Reference.Info>
 }
 export type ReferenceListOperation<E = never> = (input?: ReferenceListInput) => Effect.Effect<ReferenceListOutput, E>
@@ -2222,15 +2222,15 @@ export interface WorktreeApi<E = never> {
 }
 
 export type VcsGetInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type VcsGetOutput = { readonly location: Location.PublicInfo; readonly data: Vcs.Info }
+export type VcsGetOutput = { readonly location: Location.PublicRef; readonly data: Vcs.Info }
 export type VcsGetOperation<E = never> = (input?: VcsGetInput) => Effect.Effect<VcsGetOutput, E>
 
 export type VcsBaseInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type VcsBaseOutput = { readonly location: Location.PublicInfo; readonly data: Vcs.Base | null }
+export type VcsBaseOutput = { readonly location: Location.PublicRef; readonly data: Vcs.Base | null }
 export type VcsBaseOperation<E = never> = (input?: VcsBaseInput) => Effect.Effect<VcsBaseOutput, E>
 
 export type VcsStatusInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type VcsStatusOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<Vcs.FileStatus> }
+export type VcsStatusOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Vcs.FileStatus> }
 export type VcsStatusOperation<E = never> = (input?: VcsStatusInput) => Effect.Effect<VcsStatusOutput, E>
 
 export type VcsBranchesInput = {
@@ -2238,7 +2238,7 @@ export type VcsBranchesInput = {
   readonly search?: string | undefined
   readonly limit?: number | undefined
 }
-export type VcsBranchesOutput = { readonly location: Location.PublicInfo; readonly data: Vcs.BranchList }
+export type VcsBranchesOutput = { readonly location: Location.PublicRef; readonly data: Vcs.BranchList }
 export type VcsBranchesOperation<E = never> = (input?: VcsBranchesInput) => Effect.Effect<VcsBranchesOutput, E>
 
 export type VcsDiffInput = {
@@ -2247,7 +2247,7 @@ export type VcsDiffInput = {
   readonly base?: string | undefined
   readonly context?: number | undefined
 }
-export type VcsDiffOutput = { readonly location: Location.PublicInfo; readonly data: ReadonlyArray<FileDiff.Info> }
+export type VcsDiffOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<FileDiff.Info> }
 export type VcsDiffOperation<E = never> = (input: VcsDiffInput) => Effect.Effect<VcsDiffOutput, E>
 
 export interface VcsApi<E = never> {
@@ -2290,7 +2290,7 @@ export interface MigrationApi<E = never> {
 
 export type WebsearchProvidersInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
 export type WebsearchProvidersOutput = {
-  readonly location: Location.PublicInfo
+  readonly location: Location.PublicRef
   readonly data: ReadonlyArray<WebSearch.Provider>
 }
 export type WebsearchProvidersOperation<E = never> = (
@@ -2302,7 +2302,7 @@ export type WebsearchQueryInput = {
   readonly query: string
   readonly providerID?: WebSearch.ID | undefined
 }
-export type WebsearchQueryOutput = { readonly location: Location.PublicInfo; readonly data: WebSearch.Response }
+export type WebsearchQueryOutput = { readonly location: Location.PublicRef; readonly data: WebSearch.Response }
 export type WebsearchQueryOperation<E = never> = (input: WebsearchQueryInput) => Effect.Effect<WebsearchQueryOutput, E>
 
 export interface WebsearchApi<E = never> {
diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts
index 260a415ba15..0c4c5e0a4f0 100644
--- a/packages/client/src/promise/generated/types.ts
+++ b/packages/client/src/promise/generated/types.ts
@@ -4,6 +4,8 @@ export type ServerStatus = { version: string; pid: number; urls: Array<string> }
 
 export type LocationPublicInfo = { directory: string; project: { id: string; directory: string; canonical: string } }
 
+export type LocationPublicRef = { directory: string }
+
 export type ModelRef = { id: string; providerID: string; variant?: string }
 
 export type ProviderSettings = { [x: string]: any }
@@ -43,8 +45,6 @@ export type FileDiffInfo = {
   status: "added" | "deleted" | "modified"
 }
 
-export type LocationPublicRef = { directory: string }
-
 export type SessionStatsToolTotals = { calls: number; succeeded: number; failed: number; unfinished: number }
 
 export type SessionStatsToolUsage = {
@@ -435,18 +435,6 @@ export type ConfigPreferences = { shell?: string; websearch?: false | { provider
 
 export type ConfigShellOption = { path: string; name: string; acceptable: boolean }
 
-export type ProviderRequest = {
-  settings: ProviderSettings
-  headers: { [x: string]: string }
-  body: { [x: string]: any }
-}
-
-export type PermissionRule = { action: string; resource: string; effect: PermissionEffect }
-
-export type PluginInfo = { id?: string; source: PluginSource; features: PluginFeatures; state: PluginState }
-
-export type SessionRevert = { messageID: string; partID?: string; snapshot?: string; files?: Array<FileDiffInfo> }
-
 export type SessionMessageLocationSwitched = {
   id: string
   metadata?: { [x: string]: JsonValue }
@@ -477,6 +465,18 @@ export type V2EventServerConnected = {
   data: {}
 }
 
+export type ProviderRequest = {
+  settings: ProviderSettings
+  headers: { [x: string]: string }
+  body: { [x: string]: any }
+}
+
+export type PermissionRule = { action: string; resource: string; effect: PermissionEffect }
+
+export type PluginInfo = { id?: string; source: PluginSource; features: PluginFeatures; state: PluginState }
+
+export type SessionRevert = { messageID: string; partID?: string; snapshot?: string; files?: Array<FileDiffInfo> }
+
 export type SessionStatsTools =
   | { mode: "none" }
   | { mode: "summary"; totals: SessionStatsToolTotals }
@@ -1624,6 +1624,15 @@ export type WorktreeList = Array<WorktreeDirectory>
 
 export type VcsInfo = { branch: VcsBranch }
 
+export type SessionInboxMove = {
+  id: string
+  sessionID: string
+  timeCreated: number
+  type: "move"
+  delivery: SessionInboxDelivery
+  payload: SessionInboxMovePayload
+}
+
 export type PermissionRuleset = Array<PermissionRule>
 
 export type SessionRevertStaged = {
@@ -1636,15 +1645,6 @@ export type SessionRevertStaged = {
   data: { sessionID: string; revert: SessionRevert }
 }
 
-export type SessionInboxMove = {
-  id: string
-  sessionID: string
-  timeCreated: number
-  type: "move"
-  delivery: SessionInboxDelivery
-  payload: SessionInboxMovePayload
-}
-
 export type SessionStatsInfo = {
   range: { from: number; to: number }
   sessions: number
@@ -2610,20 +2610,20 @@ export type AgentListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type AgentListOutput = { location: LocationPublicInfo; data: Array<AgentInfo> }
+export type AgentListOutput = { location: LocationPublicRef; data: Array<AgentInfo> }
 
 export type AgentGetInput = {
   readonly agentID: { readonly agentID: string }["agentID"]
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type AgentGetOutput = { location: LocationPublicInfo; data: AgentInfo }
+export type AgentGetOutput = { location: LocationPublicRef; data: AgentInfo }
 
 export type PluginListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type PluginListOutput = { location: LocationPublicInfo; data: Array<PluginInfo> }
+export type PluginListOutput = { location: LocationPublicRef; data: Array<PluginInfo> }
 
 export type PluginAwaitActivationInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -2636,7 +2636,7 @@ export type PluginCheckInput = {
   readonly target?: { readonly target?: string | undefined }["target"]
 }
 
-export type PluginCheckOutput = { location: LocationPublicInfo; data: Array<PluginInfo> }
+export type PluginCheckOutput = { location: LocationPublicRef; data: Array<PluginInfo> }
 
 export type PluginUpdateInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -4481,13 +4481,13 @@ export type ModelListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type ModelListOutput = { location: LocationPublicInfo; data: Array<ModelInfo> }
+export type ModelListOutput = { location: LocationPublicRef; data: Array<ModelInfo> }
 
 export type ModelDefaultInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type ModelDefaultOutput = { location: LocationPublicInfo; data: ModelInfo | null }
+export type ModelDefaultOutput = { location: LocationPublicRef; data: ModelInfo | null }
 
 export type GenerateTextInput = {
   readonly prompt: {
@@ -4506,27 +4506,27 @@ export type ProviderListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type ProviderListOutput = { location: LocationPublicInfo; data: Array<ProviderInfo> }
+export type ProviderListOutput = { location: LocationPublicRef; data: Array<ProviderInfo> }
 
 export type ProviderGetInput = {
   readonly providerID: { readonly providerID: string }["providerID"]
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type ProviderGetOutput = { location: LocationPublicInfo; data: ProviderInfo }
+export type ProviderGetOutput = { location: LocationPublicRef; data: ProviderInfo }
 
 export type IntegrationListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type IntegrationListOutput = { location: LocationPublicInfo; data: Array<IntegrationInfo> }
+export type IntegrationListOutput = { location: LocationPublicRef; data: Array<IntegrationInfo> }
 
 export type IntegrationGetInput = {
   readonly integrationID: { readonly integrationID: string }["integrationID"]
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type IntegrationGetOutput = { location: LocationPublicInfo; data: IntegrationInfo | null }
+export type IntegrationGetOutput = { location: LocationPublicRef; data: IntegrationInfo | null }
 
 export type IntegrationWellknownAddInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -4577,7 +4577,7 @@ export type IntegrationOauthConnectInput = {
   }["label"]
 }
 
-export type IntegrationOauthConnectOutput = { location: LocationPublicInfo; data: IntegrationAttempt }
+export type IntegrationOauthConnectOutput = { location: LocationPublicRef; data: IntegrationAttempt }
 
 export type IntegrationOauthStatusInput = {
   readonly integrationID: { readonly integrationID: string; readonly attemptID: string }["integrationID"]
@@ -4585,7 +4585,7 @@ export type IntegrationOauthStatusInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type IntegrationOauthStatusOutput = { location: LocationPublicInfo; data: IntegrationAttemptStatus }
+export type IntegrationOauthStatusOutput = { location: LocationPublicRef; data: IntegrationAttemptStatus }
 
 export type IntegrationOauthCompleteInput = {
   readonly integrationID: { readonly integrationID: string; readonly attemptID: string }["integrationID"]
@@ -4611,7 +4611,7 @@ export type IntegrationCommandConnectInput = {
   readonly label?: { readonly methodID: string; readonly label?: string | undefined }["label"]
 }
 
-export type IntegrationCommandConnectOutput = { location: LocationPublicInfo; data: IntegrationCommandAttempt }
+export type IntegrationCommandConnectOutput = { location: LocationPublicRef; data: IntegrationCommandAttempt }
 
 export type IntegrationCommandStatusInput = {
   readonly integrationID: { readonly integrationID: string; readonly attemptID: string }["integrationID"]
@@ -4619,7 +4619,7 @@ export type IntegrationCommandStatusInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type IntegrationCommandStatusOutput = { location: LocationPublicInfo; data: IntegrationCommandAttemptStatus }
+export type IntegrationCommandStatusOutput = { location: LocationPublicRef; data: IntegrationCommandAttemptStatus }
 
 export type IntegrationCommandCancelInput = {
   readonly integrationID: { readonly integrationID: string; readonly attemptID: string }["integrationID"]
@@ -4633,7 +4633,7 @@ export type McpListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type McpListOutput = { location: LocationPublicInfo; data: Array<McpServer> }
+export type McpListOutput = { location: LocationPublicRef; data: Array<McpServer> }
 
 export type McpAddInput = {
   readonly server: { readonly server: string }["server"]
@@ -4696,7 +4696,7 @@ export type McpResourceCatalogInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type McpResourceCatalogOutput = { location: LocationPublicInfo; data: McpResourceCatalog }
+export type McpResourceCatalogOutput = { location: LocationPublicRef; data: McpResourceCatalog }
 
 export type CredentialUpdateInput = {
   readonly credentialID: { readonly credentialID: string }["credentialID"]
@@ -4756,7 +4756,7 @@ export type FormRequestListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type FormRequestListOutput = { location: LocationPublicInfo; data: Array<FormInfo> }
+export type FormRequestListOutput = { location: LocationPublicRef; data: Array<FormInfo> }
 
 export type FormListInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
 
@@ -5607,7 +5607,7 @@ export type PermissionRequestListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type PermissionRequestListOutput = { location: LocationPublicInfo; data: Array<PermissionRequest> }
+export type PermissionRequestListOutput = { location: LocationPublicRef; data: Array<PermissionRequest> }
 
 export type PermissionSavedListInput = { readonly projectID?: { readonly projectID?: string | undefined }["projectID"] }
 
@@ -5737,7 +5737,7 @@ export type FileListInput = {
   }["path"]
 }
 
-export type FileListOutput = { location: LocationPublicInfo; data: Array<FileSystemEntry> }
+export type FileListOutput = { location: LocationPublicRef; data: Array<FileSystemEntry> }
 
 export type FileFindInput = {
   readonly location?: {
@@ -5766,19 +5766,19 @@ export type FileFindInput = {
   }["limit"]
 }
 
-export type FileFindOutput = { location: LocationPublicInfo; data: Array<FileSystemEntry> }
+export type FileFindOutput = { location: LocationPublicRef; data: Array<FileSystemEntry> }
 
 export type CommandListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type CommandListOutput = { location: LocationPublicInfo; data: Array<CommandInfo> }
+export type CommandListOutput = { location: LocationPublicRef; data: Array<CommandInfo> }
 
 export type SkillListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type SkillListOutput = { location: LocationPublicInfo; data: Array<SkillInfo> }
+export type SkillListOutput = { location: LocationPublicRef; data: Array<SkillInfo> }
 
 export type RpcCallInput = {
   readonly rpcID: { readonly rpcID: string; readonly method: string }["rpcID"]
@@ -5795,7 +5795,7 @@ export type PtyListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type PtyListOutput = { location: LocationPublicInfo; data: Array<Pty> }
+export type PtyListOutput = { location: LocationPublicRef; data: Array<Pty> }
 
 export type PtyCreateInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -5836,14 +5836,14 @@ export type PtyCreateInput = {
   }["env"]
 }
 
-export type PtyCreateOutput = { location: LocationPublicInfo; data: Pty }
+export type PtyCreateOutput = { location: LocationPublicRef; data: Pty }
 
 export type PtyGetInput = {
   readonly ptyID: { readonly ptyID: string }["ptyID"]
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type PtyGetOutput = { location: LocationPublicInfo; data: Pty }
+export type PtyGetOutput = { location: LocationPublicRef; data: Pty }
 
 export type PtyUpdateInput = {
   readonly ptyID: { readonly ptyID: string }["ptyID"]
@@ -5855,7 +5855,7 @@ export type PtyUpdateInput = {
   readonly size?: { readonly title?: string; readonly size?: { readonly rows: number; readonly cols: number } }["size"]
 }
 
-export type PtyUpdateOutput = { location: LocationPublicInfo; data: Pty }
+export type PtyUpdateOutput = { location: LocationPublicRef; data: Pty }
 
 export type PtyRemoveInput = {
   readonly ptyID: { readonly ptyID: string }["ptyID"]
@@ -5870,7 +5870,7 @@ export type PtyConnectTokenInput = {
   readonly "x-opencode-ticket"?: { readonly "x-opencode-ticket"?: string | undefined }["x-opencode-ticket"]
 }
 
-export type PtyConnectTokenOutput = { location: LocationPublicInfo; data: PtyTicketConnectToken }
+export type PtyConnectTokenOutput = { location: LocationPublicRef; data: PtyTicketConnectToken }
 
 export type ExperimentalPersistentPtyReadInput = {
   readonly sessionID: { readonly sessionID: string }["sessionID"]
@@ -5978,7 +5978,7 @@ export type ShellListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type ShellListOutput = { location: LocationPublicInfo; data: Array<ShellInfo1> }
+export type ShellListOutput = { location: LocationPublicRef; data: Array<ShellInfo1> }
 
 export type ShellCreateInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -6008,14 +6008,14 @@ export type ShellCreateInput = {
   }["metadata"]
 }
 
-export type ShellCreateOutput = { location: LocationPublicInfo; data: ShellInfo1 }
+export type ShellCreateOutput = { location: LocationPublicRef; data: ShellInfo1 }
 
 export type ShellGetInput = {
   readonly id: { readonly id: string }["id"]
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type ShellGetOutput = { location: LocationPublicInfo; data: ShellInfo1 }
+export type ShellGetOutput = { location: LocationPublicRef; data: ShellInfo1 }
 
 export type ShellTimeoutInput = {
   readonly id: { readonly id: string }["id"]
@@ -6023,7 +6023,7 @@ export type ShellTimeoutInput = {
   readonly timeout: { readonly timeout: number }["timeout"]
 }
 
-export type ShellTimeoutOutput = { location: LocationPublicInfo; data: ShellInfo1 }
+export type ShellTimeoutOutput = { location: LocationPublicRef; data: ShellInfo1 }
 
 export type ShellOutputInput = {
   readonly id: { readonly id: string }["id"]
@@ -6045,7 +6045,7 @@ export type ShellOutputInput = {
 }
 
 export type ShellOutputOutput = {
-  location: LocationPublicInfo
+  location: LocationPublicRef
   data: { output: string; cursor: number; size: number; truncated: boolean }
 }
 
@@ -6060,7 +6060,7 @@ export type ReferenceListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type ReferenceListOutput = { location: LocationPublicInfo; data: Array<ReferenceInfo> }
+export type ReferenceListOutput = { location: LocationPublicRef; data: Array<ReferenceInfo> }
 
 export type WorktreeListInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -6127,19 +6127,19 @@ export type VcsGetInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type VcsGetOutput = { location: LocationPublicInfo; data: VcsInfo }
+export type VcsGetOutput = { location: LocationPublicRef; data: VcsInfo }
 
 export type VcsBaseInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type VcsBaseOutput = { location: LocationPublicInfo; data: VcsBase | null }
+export type VcsBaseOutput = { location: LocationPublicRef; data: VcsBase | null }
 
 export type VcsStatusInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type VcsStatusOutput = { location: LocationPublicInfo; data: Array<VcsFileStatus> }
+export type VcsStatusOutput = { location: LocationPublicRef; data: Array<VcsFileStatus> }
 
 export type VcsBranchesInput = {
   readonly location?: {
@@ -6159,7 +6159,7 @@ export type VcsBranchesInput = {
   }["limit"]
 }
 
-export type VcsBranchesOutput = { location: LocationPublicInfo; data: VcsBranchList }
+export type VcsBranchesOutput = { location: LocationPublicRef; data: VcsBranchList }
 
 export type VcsDiffInput = {
   readonly location?: {
@@ -6188,7 +6188,7 @@ export type VcsDiffInput = {
   }["context"]
 }
 
-export type VcsDiffOutput = { location: LocationPublicInfo; data: Array<FileDiffInfo> }
+export type VcsDiffOutput = { location: LocationPublicRef; data: Array<FileDiffInfo> }
 
 export type DebugLocationListOutput = Array<LocationPublicRef>
 
@@ -6207,7 +6207,7 @@ export type WebsearchProvidersInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
 
-export type WebsearchProvidersOutput = { location: LocationPublicInfo; data: Array<WebSearchProvider> }
+export type WebsearchProvidersOutput = { location: LocationPublicRef; data: Array<WebSearchProvider> }
 
 export type WebsearchQueryInput = {
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -6216,7 +6216,7 @@ export type WebsearchQueryInput = {
 }
 
 export type WebsearchQueryOutput = {
-  location: LocationPublicInfo
+  location: LocationPublicRef
   data: { providerID: string; results: Array<WebSearchResult> }
 }
 
diff --git a/packages/protocol/openapi.json b/packages/protocol/openapi.json
index c179b1ec9c8..cd01151fd38 100644
--- a/packages/protocol/openapi.json
+++ b/packages/protocol/openapi.json
@@ -167,7 +167,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -261,7 +261,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Agent.Info"
@@ -354,7 +354,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -506,7 +506,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -4644,7 +4644,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -4740,7 +4740,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -4926,7 +4926,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -5030,7 +5030,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Provider.Info"
@@ -5133,7 +5133,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -5227,7 +5227,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -5533,7 +5533,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.AttemptEncoded"
@@ -5676,7 +5676,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.AttemptStatus"
@@ -5959,7 +5959,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.CommandAttempt"
@@ -6092,7 +6092,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.CommandAttemptStatus"
@@ -6255,7 +6255,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -6689,7 +6689,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Mcp.ResourceCatalog"
@@ -7140,7 +7140,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -7754,7 +7754,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8533,7 +8533,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8651,7 +8651,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8737,7 +8737,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8823,7 +8823,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -9148,7 +9148,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -9232,7 +9232,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9358,7 +9358,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9458,7 +9458,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9689,7 +9689,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/PtyTicket.ConnectToken"
@@ -10770,7 +10770,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -10854,7 +10854,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -10973,7 +10973,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -11158,7 +11158,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -11296,7 +11296,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "object",
@@ -11407,7 +11407,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -11815,7 +11815,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Vcs.Info"
@@ -11898,7 +11898,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -11998,7 +11998,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12114,7 +12114,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Vcs.BranchList"
@@ -12228,7 +12228,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12544,7 +12544,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12640,7 +12640,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/WebSearch.ResponseEncoded"
diff --git a/packages/schema/src/location.ts b/packages/schema/src/location.ts
index d84a6bfa30d..205329e5fca 100644
--- a/packages/schema/src/location.ts
+++ b/packages/schema/src/location.ts
@@ -32,5 +32,5 @@ export const PublicInfo = Schema.Struct(Struct.omit(Info.fields, ["workspaceID"]
 export interface PublicInfo extends Schema.Schema.Type<typeof PublicInfo> {}
 
 export function response<S extends Schema.Top>(data: S) {
-  return Schema.Struct({ location: PublicInfo, data })
+  return Schema.Struct({ location: PublicRef, data })
 }
diff --git a/packages/tui/test/mini/runtime.test.ts b/packages/tui/test/mini/runtime.test.ts
index 98c2682fe85..65bbf7306a4 100644
--- a/packages/tui/test/mini/runtime.test.ts
+++ b/packages/tui/test/mini/runtime.test.ts
@@ -146,7 +146,7 @@ describe("run interactive runtime", () => {
     await refreshCatalog?.()
     expect(defaultModel).toHaveBeenCalledTimes(1)
     selected.resolve({
-      location: { directory: "/tmp", project: { id: "pro-1", directory: "/tmp", canonical: "/tmp" } },
+      location: { directory: "/tmp" },
       data: model,
     })
     await defaultModelReloaded.promise
diff --git a/services/www/openapi.json b/services/www/openapi.json
index c179b1ec9c8..cd01151fd38 100644
--- a/services/www/openapi.json
+++ b/services/www/openapi.json
@@ -167,7 +167,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -261,7 +261,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Agent.Info"
@@ -354,7 +354,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -506,7 +506,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -4644,7 +4644,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -4740,7 +4740,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -4926,7 +4926,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -5030,7 +5030,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Provider.Info"
@@ -5133,7 +5133,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -5227,7 +5227,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -5533,7 +5533,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.AttemptEncoded"
@@ -5676,7 +5676,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.AttemptStatus"
@@ -5959,7 +5959,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.CommandAttempt"
@@ -6092,7 +6092,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.CommandAttemptStatus"
@@ -6255,7 +6255,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -6689,7 +6689,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Mcp.ResourceCatalog"
@@ -7140,7 +7140,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -7754,7 +7754,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8533,7 +8533,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8651,7 +8651,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8737,7 +8737,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8823,7 +8823,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -9148,7 +9148,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -9232,7 +9232,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9358,7 +9358,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9458,7 +9458,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9689,7 +9689,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/PtyTicket.ConnectToken"
@@ -10770,7 +10770,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -10854,7 +10854,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -10973,7 +10973,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -11158,7 +11158,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -11296,7 +11296,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "object",
@@ -11407,7 +11407,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -11815,7 +11815,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Vcs.Info"
@@ -11898,7 +11898,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -11998,7 +11998,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12114,7 +12114,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Vcs.BranchList"
@@ -12228,7 +12228,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12544,7 +12544,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12640,7 +12640,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/WebSearch.ResponseEncoded"
diff --git a/services/www/public/openapi.json b/services/www/public/openapi.json
index c179b1ec9c8..cd01151fd38 100644
--- a/services/www/public/openapi.json
+++ b/services/www/public/openapi.json
@@ -167,7 +167,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -261,7 +261,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Agent.Info"
@@ -354,7 +354,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -506,7 +506,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -4644,7 +4644,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -4740,7 +4740,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -4926,7 +4926,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -5030,7 +5030,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Provider.Info"
@@ -5133,7 +5133,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -5227,7 +5227,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -5533,7 +5533,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.AttemptEncoded"
@@ -5676,7 +5676,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.AttemptStatus"
@@ -5959,7 +5959,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.CommandAttempt"
@@ -6092,7 +6092,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Integration.CommandAttemptStatus"
@@ -6255,7 +6255,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -6689,7 +6689,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Mcp.ResourceCatalog"
@@ -7140,7 +7140,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -7754,7 +7754,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8533,7 +8533,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8651,7 +8651,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8737,7 +8737,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -8823,7 +8823,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -9148,7 +9148,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -9232,7 +9232,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9358,7 +9358,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9458,7 +9458,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Pty"
@@ -9689,7 +9689,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/PtyTicket.ConnectToken"
@@ -10770,7 +10770,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -10854,7 +10854,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -10973,7 +10973,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -11158,7 +11158,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Shell.Info"
@@ -11296,7 +11296,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "object",
@@ -11407,7 +11407,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -11815,7 +11815,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Vcs.Info"
@@ -11898,7 +11898,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "anyOf": [
@@ -11998,7 +11998,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12114,7 +12114,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/Vcs.BranchList"
@@ -12228,7 +12228,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12544,7 +12544,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "type": "array",
@@ -12640,7 +12640,7 @@
                   "type": "object",
                   "properties": {
                     "location": {
-                      "$ref": "#/components/schemas/Location.PublicInfo"
+                      "$ref": "#/components/schemas/Location.PublicRef"
                     },
                     "data": {
                       "$ref": "#/components/schemas/WebSearch.ResponseEncoded"