@aaronshaf/ger 0.1.10 → 0.2.0

package/src/cli/index.ts

@@ -34,6 +34,7 @@ import { abandonCommand } from './commands/abandon'
 import { commentCommand } from './commands/comment'
 import { commentsCommand } from './commands/comments'
 import { diffCommand } from './commands/diff'
+import { extractUrlCommand } from './commands/extract-url'
 import { incomingCommand } from './commands/incoming'
 import { mineCommand } from './commands/mine'
 import { openCommand } from './commands/open'
@@ -42,6 +43,7 @@ import { setup } from './commands/setup'
 import { showCommand } from './commands/show'
 import { statusCommand } from './commands/status'
 import { workspaceCommand } from './commands/workspace'
+import { sanitizeCDATA } from '@/utils/shell-safety'
 
 // Read version from package.json
 function getVersion(): string {
@@ -101,7 +103,7 @@ program
 // comment command
 program
   .command('comment <change-id>')
-  .description('Post a comment on a change')
+  .description('Post a comment on a change (accepts change number or Change-ID)')
   .option('-m, --message <message>', 'Comment message')
   .option('--file <file>', 'File path for line-specific comment (relative to repo root)')
   .option(
@@ -116,9 +118,12 @@ program
     'after',
     `
 Examples:
-  # Post a general comment on a change
+  # Post a general comment on a change (using change number)
   $ ger comment 12345 -m "Looks good to me!"
 
+  # Post a comment using Change-ID
+  $ ger comment If5a3ae8cb5a107e187447802358417f311d0c4b1 -m "LGTM"
+
   # Post a comment using piped input (useful for multi-line comments or scripts)
   $ echo "This is a comment from stdin!" | ger comment 12345
   $ cat review-notes.txt | ger comment 12345
@@ -135,9 +140,11 @@ Examples:
       {"file": "src/api.js", "line": 25, "message": "Check error handling", "unresolved": true}
     ]}' | ger comment 12345 --batch
 
-Note: Line numbers refer to the actual line numbers in the NEW version of the file,
-      NOT the line numbers shown in the diff view. To find the correct line number,
-      look at the file after all changes have been applied.`,
+Note:
+  - Both change number (e.g., 12345) and Change-ID (e.g., If5a3ae8...) formats are accepted
+  - Line numbers refer to the actual line numbers in the NEW version of the file,
+    NOT the line numbers shown in the diff view. To find the correct line number,
+    look at the file after all changes have been applied.`,
   )
   .action(async (changeId, options) => {
     try {
@@ -165,7 +172,7 @@ Note: Line numbers refer to the actual line numbers in the NEW version of the fi
 // diff command
 program
   .command('diff <change-id>')
-  .description('Get diff for a change')
+  .description('Get diff for a change (accepts change number or Change-ID)')
   .option('--xml', 'XML output for LLM consumption')
   .option('--file <file>', 'Specific file to diff')
   .option('--files-only', 'List changed files only')
@@ -224,7 +231,9 @@ program
 // workspace command
 program
   .command('workspace <change-id>')
-  .description('Create or switch to a git worktree for a Gerrit change')
+  .description(
+    'Create or switch to a git worktree for a Gerrit change (accepts change number or Change-ID)',
+  )
   .option('--xml', 'XML output for LLM consumption')
   .action(async (changeId, options) => {
     try {
@@ -281,7 +290,9 @@ program
 // abandon command
 program
   .command('abandon [change-id]')
-  .description('Abandon a change (interactive mode if no change-id provided)')
+  .description(
+    'Abandon a change (interactive mode if no change-id provided; accepts change number or Change-ID)',
+  )
   .option('-m, --message <message>', 'Abandon message')
   .option('--xml', 'XML output for LLM consumption')
   .action(async (changeId, options) => {
@@ -310,7 +321,9 @@ program
 // comments command
 program
   .command('comments <change-id>')
-  .description('Show all comments on a change with diff context')
+  .description(
+    'Show all comments on a change with diff context (accepts change number or Change-ID)',
+  )
   .option('--xml', 'XML output for LLM consumption')
   .action(async (changeId, options) => {
     try {
@@ -338,7 +351,7 @@ program
 // open command
 program
   .command('open <change-id>')
-  .description('Open a change in the browser')
+  .description('Open a change in the browser (accepts change number or Change-ID)')
   .action(async (changeId, options) => {
     try {
       const effect = openCommand(changeId, options).pipe(
@@ -354,9 +367,34 @@ program
 
 // show command
 program
-  .command('show <change-id>')
-  .description('Show comprehensive change information including metadata, diff, and all comments')
+  .command('show [change-id]')
+  .description(
+    'Show comprehensive change information (auto-detects from HEAD commit if not specified)',
+  )
   .option('--xml', 'XML output for LLM consumption')
+  .option('--json', 'JSON output for programmatic consumption')
+  .addHelpText(
+    'after',
+    `
+Examples:
+  # Show specific change (using change number)
+  $ ger show 392385
+
+  # Show specific change (using Change-ID)
+  $ ger show If5a3ae8cb5a107e187447802358417f311d0c4b1
+
+  # Auto-detect Change-ID from HEAD commit
+  $ ger show
+  $ ger show --xml
+  $ ger show --json
+
+  # Extract build failure URL with jq
+  $ ger show 392090 --json | jq -r '.messages[] | select(.message | contains("Build Failed")) | .message' | grep -oP 'https://[^\\s]+'
+
+Note: When no change-id is provided, it will be automatically extracted from the
+      Change-ID footer in your HEAD commit. You must be in a git repository with
+      a commit that has a Change-ID.`,
+  )
   .action(async (changeId, options) => {
     try {
       const effect = showCommand(changeId, options).pipe(
@@ -365,16 +403,88 @@ program
       )
       await Effect.runPromise(effect)
     } catch (error) {
-      if (options.xml) {
+      const errorMessage = error instanceof Error ? error.message : String(error)
+      if (options.json) {
+        console.log(JSON.stringify({ status: 'error', error: errorMessage }, null, 2))
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<show_result>`)
         console.log(`  <status>error</status>`)
-        console.log(
-          `  <error><![CDATA[${error instanceof Error ? error.message : String(error)}]]></error>`,
-        )
+        console.log(`  <error><![CDATA[${sanitizeCDATA(errorMessage)}]]></error>`)
         console.log(`</show_result>`)
       } else {
-        console.error('✗ Error:', error instanceof Error ? error.message : String(error))
+        console.error('✗ Error:', errorMessage)
+      }
+      process.exit(1)
+    }
+  })
+
+// extract-url command
+program
+  .command('extract-url <pattern> [change-id]')
+  .description(
+    'Extract URLs from change messages and comments (auto-detects from HEAD commit if not specified)',
+  )
+  .option('--include-comments', 'Also search inline comments (default: messages only)')
+  .option('--regex', 'Treat pattern as regex instead of substring match')
+  .option('--xml', 'XML output for LLM consumption')
+  .option('--json', 'JSON output for programmatic consumption')
+  .addHelpText(
+    'after',
+    `
+Examples:
+  # Extract all Jenkins build-summary-report URLs (substring match)
+  $ ger extract-url "build-summary-report"
+
+  # Get the latest build URL using tail
+  $ ger extract-url "build-summary-report" | tail -1
+
+  # Get the first build URL using head
+  $ ger extract-url "jenkins.inst-ci.net" | head -1
+
+  # For a specific change (using change number)
+  $ ger extract-url "build-summary" 391831
+
+  # For a specific change (using Change-ID)
+  $ ger extract-url "jenkins" If5a3ae8cb5a107e187447802358417f311d0c4b1
+
+  # Use regex for precise matching
+  $ ger extract-url "job/Canvas/job/main/\\d+/" --regex
+
+  # Search both messages and inline comments
+  $ ger extract-url "github.com" --include-comments
+
+  # JSON output for scripting
+  $ ger extract-url "jenkins" --json | jq -r '.urls[-1]'
+
+  # XML output
+  $ ger extract-url "jenkins" --xml
+
+Note:
+  - URLs are output in chronological order (oldest first)
+  - Use tail -1 to get the latest URL, head -1 for the oldest
+  - When no change-id is provided, it will be automatically extracted from the
+    Change-ID footer in your HEAD commit`,
+  )
+  .action(async (pattern, changeId, options) => {
+    try {
+      const effect = extractUrlCommand(pattern, changeId, options).pipe(
+        Effect.provide(GerritApiServiceLive),
+        Effect.provide(ConfigServiceLive),
+      )
+      await Effect.runPromise(effect)
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error)
+      if (options.json) {
+        console.log(JSON.stringify({ status: 'error', error: errorMessage }, null, 2))
+      } else if (options.xml) {
+        console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+        console.log(`<extract_url_result>`)
+        console.log(`  <status>error</status>`)
+        console.log(`  <error><![CDATA[${sanitizeCDATA(errorMessage)}]]></error>`)
+        console.log(`</extract_url_result>`)
+      } else {
+        console.error('✗ Error:', errorMessage)
       }
       process.exit(1)
     }
@@ -383,7 +493,9 @@ program
 // review command
 program
   .command('review <change-id>')
-  .description('AI-powered code review that analyzes changes and optionally posts comments')
+  .description(
+    'AI-powered code review that analyzes changes and optionally posts comments (accepts change number or Change-ID)',
+  )
   .option('--comment', 'Post the review as comments (prompts for confirmation)')
   .option('-y, --yes', 'Skip confirmation prompts when posting comments')
   .option('--debug', 'Show debug output including AI responses')
@@ -408,20 +520,25 @@ Requirements:
   - Gerrit credentials must be configured (run 'ger setup' first)
 
 Examples:
-  # Review a change (display only)
+  # Review a change using change number (display only)
   $ ger review 12345
-  
+
+  # Review using Change-ID
+  $ ger review If5a3ae8cb5a107e187447802358417f311d0c4b1
+
   # Review and prompt to post comments
   $ ger review 12345 --comment
-  
+
   # Review and auto-post comments without prompting
   $ ger review 12345 --comment --yes
-  
+
   # Use specific AI tool
   $ ger review 12345 --tool gemini
-  
+
   # Show debug output to troubleshoot issues
   $ ger review 12345 --debug
+
+Note: Both change number (e.g., 12345) and Change-ID (e.g., If5a3ae8...) formats are accepted
 `,
   )
   .action(async (changeId, options) => {

package/src/schemas/config.ts

@@ -1,7 +1,13 @@
 import { Schema } from '@effect/schema'
 
 // Flat Application Configuration (similar to ji structure)
-export const AppConfig = Schema.Struct({
+export const AppConfig: Schema.Struct<{
+  host: typeof Schema.String
+  username: typeof Schema.String
+  password: typeof Schema.String
+  aiTool: Schema.optional<Schema.Literal<['claude', 'llm', 'opencode', 'gemini']>>
+  aiAutoDetect: Schema.optionalWith<typeof Schema.Boolean, { default: () => boolean }>
+}> = Schema.Struct({
   // Gerrit credentials (flattened)
   host: Schema.String.pipe(
     Schema.pattern(/^https?:\/\/.+$/),
@@ -17,15 +23,18 @@ export const AppConfig = Schema.Struct({
   ),
   // AI configuration (flattened)
   aiTool: Schema.optional(Schema.Literal('claude', 'llm', 'opencode', 'gemini')),
-  aiAutoDetect: Schema.optionalWith(Schema.Boolean, { default: () => true }),
+  aiAutoDetect: Schema.optionalWith(Schema.Boolean, { default: (): boolean => true }),
 })
 
 export type AppConfig = Schema.Schema.Type<typeof AppConfig>
 
 // Legacy schemas for backward compatibility (deprecated)
-export const AiConfig = Schema.Struct({
+export const AiConfig: Schema.Struct<{
+  tool: Schema.optional<Schema.Literal<['claude', 'llm', 'opencode', 'gemini']>>
+  autoDetect: Schema.optionalWith<typeof Schema.Boolean, { default: () => boolean }>
+}> = Schema.Struct({
   tool: Schema.optional(Schema.Literal('claude', 'llm', 'opencode', 'gemini')),
-  autoDetect: Schema.optionalWith(Schema.Boolean, { default: () => true }),
+  autoDetect: Schema.optionalWith(Schema.Boolean, { default: (): boolean => true }),
 })
 
 export type AiConfig = Schema.Schema.Type<typeof AiConfig>

package/src/services/config.test.ts

@@ -0,0 +1,150 @@
+import { describe, expect, test, beforeEach, afterEach } from 'bun:test'
+import { Effect } from 'effect'
+import * as fs from 'node:fs'
+import * as os from 'node:os'
+import * as path from 'node:path'
+import { ConfigService, ConfigServiceLive } from './config'
+
+describe('ConfigService', () => {
+  let originalEnv: NodeJS.ProcessEnv
+  const CONFIG_DIR = path.join(os.homedir(), '.ger')
+  const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json')
+  let originalConfigContent: string | null = null
+
+  beforeEach(() => {
+    // Store original env vars
+    originalEnv = { ...process.env }
+
+    // Clear environment variables for clean tests
+    delete process.env.GERRIT_HOST
+    delete process.env.GERRIT_USERNAME
+    delete process.env.GERRIT_PASSWORD
+
+    // Backup and remove existing config file for clean tests
+    try {
+      if (fs.existsSync(CONFIG_FILE)) {
+        originalConfigContent = fs.readFileSync(CONFIG_FILE, 'utf8')
+        fs.unlinkSync(CONFIG_FILE)
+      }
+    } catch {
+      // Ignore errors
+    }
+  })
+
+  afterEach(() => {
+    // Restore original env vars
+    process.env = originalEnv
+
+    // Restore original config file
+    try {
+      if (originalConfigContent !== null) {
+        if (!fs.existsSync(CONFIG_DIR)) {
+          fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 })
+        }
+        fs.writeFileSync(CONFIG_FILE, originalConfigContent, 'utf8')
+        fs.chmodSync(CONFIG_FILE, 0o600)
+      }
+    } catch {
+      // Ignore errors
+    }
+    originalConfigContent = null
+  })
+
+  describe('Environment Variable Configuration', () => {
+    test('loads config from environment variables when all required vars are present', async () => {
+      // Set environment variables
+      process.env.GERRIT_HOST = 'https://gerrit.example.com'
+      process.env.GERRIT_USERNAME = 'envuser'
+      process.env.GERRIT_PASSWORD = 'envpass123'
+
+      const result = await Effect.gen(function* () {
+        const configService = yield* ConfigService
+        return yield* configService.getFullConfig
+      }).pipe(Effect.provide(ConfigServiceLive), Effect.runPromise)
+
+      expect(result).toEqual({
+        host: 'https://gerrit.example.com',
+        username: 'envuser',
+        password: 'envpass123',
+        aiAutoDetect: true,
+        aiTool: undefined,
+      })
+    })
+
+    test('loads credentials from environment variables', async () => {
+      // Set environment variables
+      process.env.GERRIT_HOST = 'https://gerrit.example.com'
+      process.env.GERRIT_USERNAME = 'envuser'
+      process.env.GERRIT_PASSWORD = 'envpass123'
+
+      const result = await Effect.gen(function* () {
+        const configService = yield* ConfigService
+        return yield* configService.getCredentials
+      }).pipe(Effect.provide(ConfigServiceLive), Effect.runPromise)
+
+      expect(result).toEqual({
+        host: 'https://gerrit.example.com',
+        username: 'envuser',
+        password: 'envpass123',
+      })
+    })
+
+    test('fails when only some environment variables are present', async () => {
+      // Set only some environment variables
+      process.env.GERRIT_HOST = 'https://gerrit.example.com'
+      process.env.GERRIT_USERNAME = 'envuser'
+      // GERRIT_PASSWORD is missing
+
+      await expect(
+        Effect.gen(function* () {
+          const configService = yield* ConfigService
+          return yield* configService.getFullConfig
+        }).pipe(Effect.provide(ConfigServiceLive), Effect.runPromise),
+      ).rejects.toThrow('Configuration not found')
+    })
+
+    test('validates environment variable configuration format', async () => {
+      // Set invalid environment variables
+      process.env.GERRIT_HOST = 'not-a-url'
+      process.env.GERRIT_USERNAME = 'envuser'
+      process.env.GERRIT_PASSWORD = 'envpass123'
+
+      await expect(
+        Effect.gen(function* () {
+          const configService = yield* ConfigService
+          return yield* configService.getFullConfig
+        }).pipe(Effect.provide(ConfigServiceLive), Effect.runPromise),
+      ).rejects.toThrow('Invalid environment configuration format')
+    })
+
+    test('rejects empty environment variables', async () => {
+      // Set empty environment variables
+      process.env.GERRIT_HOST = 'https://gerrit.example.com'
+      process.env.GERRIT_USERNAME = ''
+      process.env.GERRIT_PASSWORD = 'envpass123'
+
+      await expect(
+        Effect.gen(function* () {
+          const configService = yield* ConfigService
+          return yield* configService.getFullConfig
+        }).pipe(Effect.provide(ConfigServiceLive), Effect.runPromise),
+      ).rejects.toThrow('Configuration not found')
+    })
+
+    test('provides helpful error message when no configuration is found', async () => {
+      // Clear all relevant environment variables
+      delete process.env.GERRIT_HOST
+      delete process.env.GERRIT_USERNAME
+      delete process.env.GERRIT_PASSWORD
+
+      await expect(
+        Effect.gen(function* () {
+          const configService = yield* ConfigService
+          return yield* configService.getFullConfig
+        }).pipe(Effect.provide(ConfigServiceLive), Effect.runPromise),
+      ).rejects.toThrow(
+        'Configuration not found. Run "ger setup" to set up your credentials or set GERRIT_HOST, GERRIT_USERNAME, and GERRIT_PASSWORD environment variables.',
+      )
+    })
+  })
+})

package/src/services/config.ts

@@ -16,19 +16,50 @@ export interface ConfigServiceImpl {
   readonly saveFullConfig: (config: AppConfig) => Effect.Effect<void, ConfigError>
 }
 
-export class ConfigService extends Context.Tag('ConfigService')<
-  ConfigService,
-  ConfigServiceImpl
->() {}
+// Export both the tag value and the type for use in Effect requirements
+export const ConfigService: Context.Tag<ConfigServiceImpl, ConfigServiceImpl> =
+  Context.GenericTag<ConfigServiceImpl>('ConfigService')
+export type ConfigService = Context.Tag.Identifier<typeof ConfigService>
+
+// Export ConfigError fields interface explicitly
+export interface ConfigErrorFields {
+  readonly message: string
+}
 
-export class ConfigError extends Schema.TaggedError<ConfigError>()('ConfigError', {
+// Define error schema (not exported, so type can be implicit)
+const ConfigErrorSchema = Schema.TaggedError<ConfigErrorFields>()('ConfigError', {
   message: Schema.String,
-} as const) {}
+} as const) as unknown
+
+// Export the error class with explicit constructor signature for isolatedDeclarations
+export class ConfigError
+  extends (ConfigErrorSchema as new (
+    args: ConfigErrorFields,
+  ) => ConfigErrorFields & Error & { readonly _tag: 'ConfigError' })
+  implements Error
+{
+  readonly name = 'ConfigError'
+}
 
 // File-based storage
 const CONFIG_DIR = path.join(os.homedir(), '.ger')
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json')
 
+const readEnvConfig = (): unknown | null => {
+  const { GERRIT_HOST, GERRIT_USERNAME, GERRIT_PASSWORD } = process.env
+
+  if (GERRIT_HOST && GERRIT_USERNAME && GERRIT_PASSWORD) {
+    return {
+      host: GERRIT_HOST,
+      username: GERRIT_USERNAME,
+      password: GERRIT_PASSWORD,
+      aiAutoDetect: true,
+    }
+  }
+
+  return null
+}
+
 const readFileConfig = (): unknown | null => {
   try {
     if (fs.existsSync(CONFIG_FILE)) {
@@ -85,21 +116,34 @@ export const ConfigServiceLive: Layer.Layer<ConfigService, never, never> = Layer
   ConfigService,
   Effect.sync(() => {
     const getFullConfig = Effect.gen(function* () {
+      // First try to read from file
       const fileContent = readFileConfig()
-      if (!fileContent) {
-        return yield* Effect.fail(
-          new ConfigError({
-            message: 'Configuration not found. Run "ger setup" to set up your credentials.',
-          }),
+      if (fileContent) {
+        // Parse as flat config
+        const fullConfigResult = yield* Schema.decodeUnknown(AppConfig)(fileContent).pipe(
+          Effect.mapError(() => new ConfigError({ message: 'Invalid configuration format' })),
         )
+        return fullConfigResult
       }
 
-      // Parse as flat config
-      const fullConfigResult = yield* Schema.decodeUnknown(AppConfig)(fileContent).pipe(
-        Effect.mapError(() => new ConfigError({ message: 'Invalid configuration format' })),
-      )
+      // Fallback to environment variables
+      const envContent = readEnvConfig()
+      if (envContent) {
+        const fullConfigResult = yield* Schema.decodeUnknown(AppConfig)(envContent).pipe(
+          Effect.mapError(
+            () => new ConfigError({ message: 'Invalid environment configuration format' }),
+          ),
+        )
+        return fullConfigResult
+      }
 
-      return fullConfigResult
+      // No configuration found
+      return yield* Effect.fail(
+        new ConfigError({
+          message:
+            'Configuration not found. Run "ger setup" to set up your credentials or set GERRIT_HOST, GERRIT_USERNAME, and GERRIT_PASSWORD environment variables.',
+        }),
+      )
     })
 
     const saveFullConfig = (config: AppConfig) =>

package/src/services/git-worktree.ts

@@ -5,30 +5,84 @@ import * as path from 'node:path'
 import * as fs from 'node:fs/promises'
 import { spawn } from 'node:child_process'
 
-// Error types
-export class WorktreeCreationError extends Schema.TaggedError<WorktreeCreationError>()(
+// Error types with explicit interfaces
+export interface WorktreeCreationErrorFields {
+  readonly message: string
+  readonly cause?: unknown
+}
+
+const WorktreeCreationErrorSchema = Schema.TaggedError<WorktreeCreationErrorFields>()(
   'WorktreeCreationError',
   {
     message: Schema.String,
     cause: Schema.optional(Schema.Unknown),
   },
-) {}
+) as unknown
+
+export class WorktreeCreationError
+  extends (WorktreeCreationErrorSchema as new (
+    args: WorktreeCreationErrorFields,
+  ) => WorktreeCreationErrorFields & Error & { readonly _tag: 'WorktreeCreationError' })
+  implements Error
+{
+  readonly name = 'WorktreeCreationError'
+}
+
+export interface PatchsetFetchErrorFields {
+  readonly message: string
+  readonly cause?: unknown
+}
 
-export class PatchsetFetchError extends Schema.TaggedError<PatchsetFetchError>()(
+const PatchsetFetchErrorSchema = Schema.TaggedError<PatchsetFetchErrorFields>()(
   'PatchsetFetchError',
   {
     message: Schema.String,
     cause: Schema.optional(Schema.Unknown),
   },
-) {}
+) as unknown
+
+export class PatchsetFetchError
+  extends (PatchsetFetchErrorSchema as new (
+    args: PatchsetFetchErrorFields,
+  ) => PatchsetFetchErrorFields & Error & { readonly _tag: 'PatchsetFetchError' })
+  implements Error
+{
+  readonly name = 'PatchsetFetchError'
+}
+
+export interface DirtyRepoErrorFields {
+  readonly message: string
+}
 
-export class DirtyRepoError extends Schema.TaggedError<DirtyRepoError>()('DirtyRepoError', {
+const DirtyRepoErrorSchema = Schema.TaggedError<DirtyRepoErrorFields>()('DirtyRepoError', {
   message: Schema.String,
-}) {}
+}) as unknown
+
+export class DirtyRepoError
+  extends (DirtyRepoErrorSchema as new (
+    args: DirtyRepoErrorFields,
+  ) => DirtyRepoErrorFields & Error & { readonly _tag: 'DirtyRepoError' })
+  implements Error
+{
+  readonly name = 'DirtyRepoError'
+}
+
+export interface NotGitRepoErrorFields {
+  readonly message: string
+}
 
-export class NotGitRepoError extends Schema.TaggedError<NotGitRepoError>()('NotGitRepoError', {
+const NotGitRepoErrorSchema = Schema.TaggedError<NotGitRepoErrorFields>()('NotGitRepoError', {
   message: Schema.String,
-}) {}
+}) as unknown
+
+export class NotGitRepoError
+  extends (NotGitRepoErrorSchema as new (
+    args: NotGitRepoErrorFields,
+  ) => NotGitRepoErrorFields & Error & { readonly _tag: 'NotGitRepoError' })
+  implements Error
+{
+  readonly name = 'NotGitRepoError'
+}
 
 export type GitError = WorktreeCreationError | PatchsetFetchError | DirtyRepoError | NotGitRepoError
 
@@ -286,11 +340,14 @@ const GitWorktreeServiceImplLive: GitWorktreeServiceImpl = {
     }),
 }
 
-// Export service tag for dependency injection
-export class GitWorktreeService extends Context.Tag('GitWorktreeService')<
-  GitWorktreeService,
-  GitWorktreeServiceImpl
->() {}
+// Export service tag for dependency injection with explicit type
+export const GitWorktreeService: Context.Tag<GitWorktreeServiceImpl, GitWorktreeServiceImpl> =
+  Context.GenericTag<GitWorktreeServiceImpl>('GitWorktreeService')
+
+export type GitWorktreeService = Context.Tag.Identifier<typeof GitWorktreeService>
 
-// Export service layer
-export const GitWorktreeServiceLive = Layer.succeed(GitWorktreeService, GitWorktreeServiceImplLive)
+// Export service layer with explicit type
+export const GitWorktreeServiceLive: Layer.Layer<GitWorktreeServiceImpl> = Layer.succeed(
+  GitWorktreeService,
+  GitWorktreeServiceImplLive,
+)