Merge pull request #327 from campfirein/proj/git-semantics

Proj/git semantics

Author: bao-byterover

.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(),
     }
   }