@aaronshaf/ger 2.0.1 → 2.0.2

package/src/cli/commands/show.ts

@@ -48,6 +48,7 @@ interface ChangeDetails {
   created?: string
   updated?: string
   commitMessage: string
+  topic?: string
 }
 
 const getChangeDetails = (
@@ -71,6 +72,7 @@ const getChangeDetails = (
       created: change.created,
       updated: change.updated,
       commitMessage: change.subject, // For now, using subject as commit message
+      topic: change.topic,
     }
   })
 
@@ -142,6 +144,9 @@ const formatShowPretty = (
   console.log(`   Project: ${changeDetails.project}`)
   console.log(`   Branch: ${changeDetails.branch}`)
   console.log(`   Status: ${changeDetails.status}`)
+  if (changeDetails.topic) {
+    console.log(`   Topic: ${changeDetails.topic}`)
+  }
   console.log(`   Owner: ${changeDetails.owner.name || changeDetails.owner.email || 'Unknown'}`)
   console.log(
     `   Created: ${changeDetails.created ? formatDate(changeDetails.created) : 'Unknown'}`,
@@ -220,6 +225,7 @@ const formatShowJson = async (
       status: changeDetails.status,
       project: changeDetails.project,
       branch: changeDetails.branch,
+      topic: changeDetails.topic,
       owner: removeUndefined(changeDetails.owner),
       created: changeDetails.created,
       updated: changeDetails.updated,
@@ -301,6 +307,9 @@ const formatShowXml = async (
   xmlParts.push(`    <status>${escapeXML(changeDetails.status)}</status>`)
   xmlParts.push(`    <project>${escapeXML(changeDetails.project)}</project>`)
   xmlParts.push(`    <branch>${escapeXML(changeDetails.branch)}</branch>`)
+  if (changeDetails.topic) {
+    xmlParts.push(`    <topic><![CDATA[${sanitizeCDATA(changeDetails.topic)}]]></topic>`)
+  }
   xmlParts.push(`    <owner>`)
   if (changeDetails.owner.name) {
     xmlParts.push(`      <name><![CDATA[${sanitizeCDATA(changeDetails.owner.name)}]]></name>`)

package/src/cli/commands/topic.ts

@@ -0,0 +1,108 @@
+import { Effect } from 'effect'
+import { type ApiError, GerritApiService } from '@/api/gerrit'
+import { sanitizeCDATA } from '@/utils/shell-safety'
+import { getChangeIdFromHead, GitError, NoChangeIdError } from '@/utils/git-commit'
+
+export const TOPIC_HELP_TEXT = `
+Examples:
+  # View current topic (auto-detect from HEAD)
+  $ ger topic
+
+  # View topic for specific change
+  $ ger topic 12345
+
+  # Set topic on a change
+  $ ger topic 12345 my-feature
+
+  # Remove topic from a change
+  $ ger topic 12345 --delete
+  $ ger topic --delete  # auto-detect from HEAD
+
+Note: When no change-id is provided, it will be auto-detected from the HEAD commit.`
+
+interface TopicOptions {
+  xml?: boolean
+  delete?: boolean
+}
+
+/**
+ * Manages topic for a Gerrit change.
+ *
+ * - No topic argument: get current topic
+ * - With topic argument: set topic
+ * - With --delete flag: remove topic
+ *
+ * @param changeId - Change number or Change-ID (auto-detects from HEAD if not provided)
+ * @param topic - Optional topic to set
+ * @param options - Configuration options
+ * @returns Effect that completes when the operation finishes
+ */
+export const topicCommand = (
+  changeId: string | undefined,
+  topic: string | undefined,
+  options: TopicOptions = {},
+): Effect.Effect<void, ApiError | GitError | NoChangeIdError, GerritApiService> =>
+  Effect.gen(function* () {
+    const gerritApi = yield* GerritApiService
+
+    // Auto-detect Change-ID from HEAD commit if not provided
+    const resolvedChangeId = changeId?.trim() || (yield* getChangeIdFromHead())
+
+    // Handle delete operation
+    if (options.delete) {
+      yield* gerritApi.deleteTopic(resolvedChangeId)
+
+      if (options.xml) {
+        console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+        console.log(`<topic_result>`)
+        console.log(`  <status>success</status>`)
+        console.log(`  <action>deleted</action>`)
+        console.log(`  <change_id><![CDATA[${sanitizeCDATA(resolvedChangeId)}]]></change_id>`)
+        console.log(`</topic_result>`)
+      } else {
+        console.log(`✓ Removed topic from change ${resolvedChangeId}`)
+      }
+      return
+    }
+
+    // Handle set operation
+    if (topic !== undefined && topic.trim() !== '') {
+      const newTopic = yield* gerritApi.setTopic(resolvedChangeId, topic)
+
+      if (options.xml) {
+        console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+        console.log(`<topic_result>`)
+        console.log(`  <status>success</status>`)
+        console.log(`  <action>set</action>`)
+        console.log(`  <change_id><![CDATA[${sanitizeCDATA(resolvedChangeId)}]]></change_id>`)
+        console.log(`  <topic><![CDATA[${sanitizeCDATA(newTopic)}]]></topic>`)
+        console.log(`</topic_result>`)
+      } else {
+        console.log(`✓ Set topic on change ${resolvedChangeId}: ${newTopic}`)
+      }
+      return
+    }
+
+    // Handle get operation (default)
+    const currentTopic = yield* gerritApi.getTopic(resolvedChangeId)
+
+    if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<topic_result>`)
+      console.log(`  <status>success</status>`)
+      console.log(`  <action>get</action>`)
+      console.log(`  <change_id><![CDATA[${sanitizeCDATA(resolvedChangeId)}]]></change_id>`)
+      if (currentTopic) {
+        console.log(`  <topic><![CDATA[${sanitizeCDATA(currentTopic)}]]></topic>`)
+      } else {
+        console.log(`  <topic />`)
+      }
+      console.log(`</topic_result>`)
+    } else {
+      if (currentTopic) {
+        console.log(currentTopic)
+      } else {
+        console.log(`No topic set for change ${resolvedChangeId}`)
+      }
+    }
+  })

package/src/cli/register-commands.ts

@@ -9,15 +9,17 @@ import { abandonCommand } from './commands/abandon'
 import { restoreCommand } from './commands/restore'
 import { rebaseCommand } from './commands/rebase'
 import { submitCommand } from './commands/submit'
+import { topicCommand, TOPIC_HELP_TEXT } from './commands/topic'
 import { voteCommand } from './commands/vote'
 import { projectsCommand } from './commands/projects'
 import { buildStatusCommand, BUILD_STATUS_HELP_TEXT } from './commands/build-status'
 import { checkoutCommand, CHECKOUT_HELP_TEXT } from './commands/checkout'
-import { commentCommand } from './commands/comment'
+import { commentCommand, COMMENT_HELP_TEXT } 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 { installHookCommand } from './commands/install-hook'
 import { mineCommand } from './commands/mine'
 import { openCommand } from './commands/open'
 import { pushCommand, PUSH_HELP_TEXT } from './commands/push'
@@ -106,38 +108,7 @@ export function registerCommands(program: Command): void {
     .option('--unresolved', 'Mark comment as unresolved (requires human attention)')
     .option('--batch', 'Read batch comments from stdin as JSON (see examples below)')
     .option('--xml', 'XML output for LLM consumption')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  # 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
-
-  # Post a line-specific comment (line number from NEW file version)
-  $ ger comment 12345 --file src/main.js --line 42 -m "Consider using const here"
-
-  # Post an unresolved comment requiring human attention
-  $ ger comment 12345 --file src/api.js --line 15 -m "Security concern" --unresolved
-
-  # Post multiple comments using batch mode
-  $ echo '{"message": "Review complete", "comments": [
-      {"file": "src/main.js", "line": 10, "message": "Good refactor"},
-      {"file": "src/api.js", "line": 25, "message": "Check error handling", "unresolved": true}
-    ]}' | ger comment 12345 --batch
-
-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.`,
-    )
+    .addHelpText('after', COMMENT_HELP_TEXT)
     .action(async (changeId, options) => {
       await executeEffect(
         commentCommand(changeId, options).pipe(
@@ -316,6 +287,24 @@ Note:
       )
     })
 
+  // topic command
+  program
+    .command('topic [change-id] [topic]')
+    .description('Get, set, or remove topic for a change (auto-detects from HEAD if not specified)')
+    .option('--delete', 'Remove the topic from the change')
+    .option('--xml', 'XML output for LLM consumption')
+    .addHelpText('after', TOPIC_HELP_TEXT)
+    .action(async (changeId, topic, options) => {
+      await executeEffect(
+        topicCommand(changeId, topic, options).pipe(
+          Effect.provide(GerritApiServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'topic_result',
+      )
+    })
+
   // vote command
   program
     .command('vote <change-id>')
@@ -528,6 +517,39 @@ Note:
       }
     })
 
+  // install-hook command
+  program
+    .command('install-hook')
+    .description('Install the Gerrit commit-msg hook for automatic Change-Id generation')
+    .option('--force', 'Overwrite existing hook')
+    .option('--xml', 'XML output for LLM consumption')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  # Install the commit-msg hook
+  $ ger install-hook
+
+  # Force reinstall (overwrite existing)
+  $ ger install-hook --force
+
+Note:
+  - Downloads hook from your configured Gerrit server
+  - Installs to .git/hooks/commit-msg
+  - Makes hook executable (chmod +x)
+  - Required for commits to have Change-Id footers`,
+    )
+    .action(async (options) => {
+      await executeEffect(
+        installHookCommand(options).pipe(
+          Effect.provide(CommitHookServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'install_hook_result',
+      )
+    })
+
   // push command
   program
     .command('push')

package/src/schemas/gerrit.ts

@@ -118,6 +118,7 @@ export const ChangeInfo: Schema.Schema<{
   readonly work_in_progress?: boolean
   readonly current_revision?: string
   readonly revisions?: Record<string, RevisionInfoType>
+  readonly topic?: string
 }> = Schema.Struct({
   id: Schema.String,
   project: Schema.String,
@@ -182,6 +183,7 @@ export const ChangeInfo: Schema.Schema<{
   work_in_progress: Schema.optional(Schema.Boolean),
   current_revision: Schema.optional(Schema.String),
   revisions: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
+  topic: Schema.optional(Schema.String),
 })
 export type ChangeInfo = Schema.Schema.Type<typeof ChangeInfo>