Proj/git semantics

.env.example

@@ -5,7 +5,6 @@
 BRV_API_BASE_URL=http://localhost:3000/api/v1
 BRV_AUTHORIZATION_URL=http://localhost:3000/api/v1/oidc/authorize
 BRV_COGIT_API_BASE_URL=http://localhost:3001/api/v1
-BRV_GIT_API_BASE_URL=http://localhost:3001
 BRV_GIT_REMOTE_BASE_URL=http://localhost:8080
 BRV_ISSUER_URL=http://localhost:3000/api/v1/oidc
 BRV_LLM_API_BASE_URL=http://localhost:3002

package.json

@@ -147,9 +147,6 @@
     ],
     "topicSeparator": " ",
     "topics": {
-      "vc": {
-        "description": "Version control commands for the context tree"
-      },
       "hub": {
         "description": "Browse and manage skills & bundles registry",
         "subtopics": {

src/oclif/commands/init.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-unreachable */
 import {Command, Flags} from '@oclif/core'
 
 import {InitEvents, type InitLocalResponse} from '../../shared/transport/events/init-events.js'
@@ -14,12 +15,16 @@ export default class Init extends Command {
       description: 'Force re-initialization even if already initialized',
     }),
   }
+  public static hidden = true
 
   protected getDaemonOptions(): DaemonClientOptions {
     return {projectPath: process.cwd()}
   }
 
   public async run(): Promise<void> {
+    this.log('The init command is not available. Use: brv vc init')
+    return
+
     const {flags} = await this.parse(Init)
     const daemonOptions = this.getDaemonOptions()
 

src/oclif/commands/vc/commit.ts

@@ -12,11 +12,16 @@ export default class VcCommit extends Command {
       description: 'Commit message',
     }),
   }
+  public static strict = false
 
   public async run(): Promise<void> {
-    const {flags} = await this.parse(VcCommit)
+    const {argv, flags} = await this.parse(VcCommit)
 
-    const {message} = flags
+    // Support unquoted multi-word messages: brv vc commit -m hello world
+    const extra = (argv as string[]).join(' ')
+    const message = flags.message
+      ? (extra ? `${flags.message} ${extra}` : flags.message)
+      : (extra || undefined)
     if (!message) {
       this.error('Usage: brv vc commit -m "<message>"')
     }

src/oclif/commands/vc/index.ts

@@ -0,0 +1,10 @@
+import {Command} from '@oclif/core'
+
+export default class Vc extends Command {
+  public static description = 'Version control commands for the context tree'
+  public static examples = ['<%= config.bin %> <%= command.id %> --help']
+
+  public async run(): Promise<void> {
+    await this.config.runCommand('help', ['vc'])
+  }
+}

src/oclif/commands/vc/init.ts

@@ -5,7 +5,7 @@ import {type IVcInitResponse, VcEvents} from '../../../shared/transport/events/v
 import {formatConnectionError, withDaemonRetry} from '../../lib/daemon-client.js'
 
 export default class VcInit extends Command {
-  public static description = 'Initialize ByteRover version control'
+  public static description = 'Initialize ByteRover version control for context tree'
   public static examples = ['<%= config.bin %> <%= command.id %>']
 
   public async run(): Promise<void> {

src/oclif/hooks/init/validate-brv-config.ts

@@ -17,11 +17,11 @@ import {getProjectDataDir} from '../../../server/utils/path-utils.js'
 export const SKIP_COMMANDS = new Set<string>([
   '--help',
   'help',
-  'init',
   'login',
   'logout',
   'main',
   'restart',
+  'vc',
   'vc:clone',
   'vc:init',
 ])

src/server/config/environment.ts

@@ -21,7 +21,6 @@ type EnvironmentConfig = {
   authorizationUrl: string
   clientId: string
   cogitApiBaseUrl: string
-  gitApiBaseUrl: string
   gitRemoteBaseUrl: string
   hubRegistryUrl: string
   issuerUrl: string
@@ -57,7 +56,6 @@ export const getCurrentConfig = (): EnvironmentConfig => ({
   authorizationUrl: readRequiredEnv('BRV_AUTHORIZATION_URL'),
   clientId: DEFAULTS.clientId,
   cogitApiBaseUrl: readRequiredEnv('BRV_COGIT_API_BASE_URL'),
-  gitApiBaseUrl: readRequiredEnv('BRV_GIT_API_BASE_URL'),
   gitRemoteBaseUrl: readRequiredEnv('BRV_GIT_REMOTE_BASE_URL'),
   hubRegistryUrl: DEFAULTS.hubRegistryUrl,
   issuerUrl: readRequiredEnv('BRV_ISSUER_URL'),

src/server/core/domain/entities/space.ts

@@ -5,8 +5,10 @@ interface SpaceParams {
   id: string
   isDefault: boolean
   name: string
+  slug?: string
   teamId: string
   teamName: string
+  teamSlug?: string
 }
 
 /**
@@ -17,8 +19,10 @@ export class Space {
   public readonly id: string
   public readonly isDefault: boolean
   public readonly name: string
+  public readonly slug: string
   public readonly teamId: string
   public readonly teamName: string
+  public readonly teamSlug: string
 
   public constructor(params: SpaceParams) {
     if (params.id.trim().length === 0) {
@@ -40,8 +44,10 @@ export class Space {
     this.id = params.id
     this.isDefault = params.isDefault
     this.name = params.name
+    this.slug = params.slug ?? params.name
     this.teamId = params.teamId
     this.teamName = params.teamName
+    this.teamSlug = params.teamSlug ?? params.teamName
   }
 
   /**
@@ -72,8 +78,10 @@ export class Space {
       id: json.id,
       isDefault: json.is_default,
       name: json.name,
+      slug: typeof json.slug === 'string' ? json.slug : json.name,
       teamId: json.team_id,
       teamName: json.team_name,
+      teamSlug: typeof json.team_slug === 'string' ? json.team_slug : json.team_name,
     })
   }
 
@@ -93,8 +101,10 @@ export class Space {
       id: this.id,
       isDefault: this.isDefault,
       name: this.name,
+      slug: this.slug,
       teamId: this.teamId,
       teamName: this.teamName,
+      teamSlug: this.teamSlug,
     }
   }
 }

src/server/core/domain/entities/team.ts

@@ -10,6 +10,7 @@ interface TeamParams {
   isActive: boolean
   isDefault: boolean
   name: string
+  slug: string
   updatedAt: Date
 }
 
@@ -26,6 +27,7 @@ export class Team {
   public readonly isActive: boolean
   public readonly isDefault: boolean
   public readonly name: string
+  public readonly slug: string
   public readonly updatedAt: Date
 
   public constructor(params: TeamParams) {
@@ -49,6 +51,7 @@ export class Team {
     this.isActive = params.isActive
     this.isDefault = params.isDefault
     this.name = params.name
+    this.slug = params.slug
     this.updatedAt = params.updatedAt
   }
 
@@ -94,6 +97,7 @@ export class Team {
       isActive: json.is_active,
       isDefault: json.is_default,
       name: json.name,
+      slug: typeof json.slug === 'string' ? json.slug : json.name,
       updatedAt: new Date(json.updated_at),
     })
   }
@@ -119,6 +123,7 @@ export class Team {
       isActive: this.isActive,
       isDefault: this.isDefault,
       name: this.name,
+      slug: this.slug,
       updatedAt: this.updatedAt.toISOString(),
     }
   }

src/server/infra/git/cogit-url.ts

@@ -1,50 +1,15 @@
 /**
  * Build the CoGit Git remote URL for a given team and space.
- * Format: {gitApiBaseUrl}/git/{teamId}/{spaceId}.git
+ * Format: {baseUrl}/{teamName}/{spaceName}.git
  */
-export function buildCogitRemoteUrl(baseUrl: string, teamId: string, spaceId: string): string {
+export function buildCogitRemoteUrl(baseUrl: string, teamName: string, spaceName: string): string {
   const base = baseUrl.replace(/\/$/, '')
-  return `${base}/git/${teamId}/${spaceId}.git`
+  return `${base}/${teamName}/${spaceName}.git`
 }
 
 /**
- * Remove credentials from a URL, returning only the host + path.
- */
-export function stripCredentialsFromUrl(url: string): string {
-  try {
-    const parsed = new URL(url)
-    parsed.username = ''
-    parsed.password = ''
-    return parsed.toString()
-  } catch {
-    return url
-  }
-}
-
-/**
- * Parse a URL that contains /git/{segment1}/{segment2}.git
- * Returns the two segments and whether they look like UUIDs.
- */
-export function parseGitPathUrl(url: string): null | {
-  areUuids: boolean
-  segment1: string
-  segment2: string
-} {
-  try {
-    const parsed = new URL(url)
-    const match = parsed.pathname.match(/^\/git\/([^/]+)\/([^/]+?)\.git$/)
-    if (!match) return null
-    const segment1 = match[1]
-    const segment2 = match[2]
-    return {areUuids: isUuid(segment1) && isUuid(segment2), segment1, segment2}
-  } catch {
-    return null
-  }
-}
-
-/**
- * Parse a user-facing .git URL to extract team and space names.
- * Expected path: /{teamName}/{spaceName}.git (no /git/ prefix)
+ * Parse a .git URL to extract team and space names.
+ * Expected path: /{teamName}/{spaceName}.git
  */
 export function parseUserFacingUrl(url: string): null | {spaceName: string; teamName: string} {
   try {
@@ -69,9 +34,3 @@ export function isValidBranchName(name: string): boolean {
   return !/\.\.|[~^:?*[\\\u0000-\u001F\u007F]/.test(name)
 }
 
-/**
- * Check if a string looks like a UUID (v1-v7, with hyphens).
- */
-function isUuid(value: string): boolean {
-  return /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/i.test(value)
-}

src/server/infra/git/isomorphic-git-service.ts

@@ -424,6 +424,7 @@ export class IsomorphicGitService implements IGitService {
     const dir = this.requireDirectory(params)
     const commitOid = await git.resolveRef({dir, fs, ref: params.commit})
     const ancestorOid = await git.resolveRef({dir, fs, ref: params.ancestor})
+    if (commitOid === ancestorOid) return true
     return git.isDescendent({ancestor: ancestorOid, depth: -1, dir, fs, oid: commitOid})
   }
 

src/server/infra/process/feature-handlers.ts

@@ -250,7 +250,6 @@ export async function setupFeatureHandlers({
   new VcHandler({
     broadcastToProject,
     contextTreeService,
-    gitApiBaseUrl: envConfig.gitApiBaseUrl,
     gitRemoteBaseUrl: envConfig.gitRemoteBaseUrl,
     gitService,
     projectConfigStore,

src/server/infra/space/http-space-service.ts

@@ -12,6 +12,7 @@ export type SpaceServiceConfig = {
 
 type Team = {
   name: string
+  slug?: string
 }
 
 type SpaceApiResponse = {
@@ -23,6 +24,7 @@ type SpaceApiResponse = {
   is_default: boolean
   name: string
   size: number
+  slug?: string
   status: string
   storage_path: string
   team: Team
@@ -130,8 +132,10 @@ export class HttpSpaceService implements ISpaceService {
       id: spaceData.id,
       isDefault: spaceData.is_default,
       name: spaceData.name,
+      slug: spaceData.slug,
       teamId: spaceData.team_id,
       teamName: spaceData.team.name,
+      teamSlug: spaceData.team.slug,
     })
   }
 }

src/server/infra/team/http-team-service.ts

@@ -18,6 +18,7 @@ type TeamApiResponse = {
   is_active: boolean
   is_default: boolean
   name: string
+  slug?: string
   updated_at: string
 }