orizu 0.5.6 → 0.5.8

package/src/index.ts

@@ -68,6 +68,11 @@ import { hostedCommand } from './hosted-session-cli.js'
 import { workspaceSyncCommand } from './workspace-sync.js'
 import { runGitCredential } from './git-credential.js'
 import { type GithubLinkResult, runGithubLink, runInteractiveHostedSetup } from './github-setup.js'
+import {
+  reportCommentsCommand,
+  throwDeprecatedPromptCommentsCommand,
+  type ReportCommentsCliContext,
+} from './report-comments-cli.js'
 
 function getErrorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error)
@@ -144,60 +149,18 @@ interface PromptSummary {
   description?: string | null
 }
 
-interface PromptCommentAuthor {
-  name: string
-  initials?: string
-  color?: string
-}
-
-interface PromptCommentAnchor {
-  text: string | null
-  startLine: number | null
-  endLine: number | null
-}
-
-interface PromptCommentReply {
-  id: string
-  body: string
-  author: PromptCommentAuthor
-  createdAt: string
-  updatedAt: string
-}
-
-interface PromptCommentThread {
-  id: string
-  status: 'open' | 'resolved'
-  body: string
-  anchor: PromptCommentAnchor | null
-  author: PromptCommentAuthor
-  createdAt: string
-  updatedAt: string
-  resolvedAt: string | null
-  resolvedByUserId: string | null
-  replyCount: number
-  replies: PromptCommentReply[]
-}
-
-interface PromptCommentsPayload {
-  prompt: {
-    id: string
-    name: string
-    role: string
-    description?: string | null
-  }
-  version: {
+interface TaskReportPayload {
+  task: {
     id: string
-    versionNumber?: number
-    versionLabel?: string | null
+    title?: string | null
     status?: string | null
+    report: {
+      markdown: string
+      sourceName: string | null
+      createdAt: string | null
+      updatedAt?: string | null
+    }
   }
-  summary: {
-    threadCount: number
-    openThreadCount: number
-    resolvedThreadCount: number
-    replyCount: number
-  }
-  comments: PromptCommentThread[]
 }
 
 interface ScorerSummary {
@@ -1083,78 +1046,6 @@ function printTaskStatusSummary(data: TaskStatusPayload) {
   }
 }
 
-function compactTerminalText(value: string, maxLength = 160): string {
-  const compact = sanitizeTerminalText(value).replace(/\s+/g, ' ').trim()
-  if (compact.length <= maxLength) {
-    return compact
-  }
-
-  return `${compact.slice(0, Math.max(0, maxLength - 1)).trim()}…`
-}
-
-function printIndentedBody(value: string, indent: string) {
-  const lines = sanitizeTerminalText(value || '').split(/\r?\n/)
-  for (const line of lines) {
-    printLine(`${indent}${line}`)
-  }
-}
-
-function formatPromptCommentAnchor(anchor: PromptCommentAnchor | null): string | null {
-  if (!anchor) {
-    return null
-  }
-
-  const lineLabel = anchor.startLine && anchor.endLine
-    ? anchor.startLine === anchor.endLine
-      ? `line ${anchor.startLine}`
-      : `lines ${anchor.startLine}-${anchor.endLine}`
-    : null
-  const selectedText = anchor.text ? `"${compactTerminalText(anchor.text, 180)}"` : null
-
-  if (lineLabel && selectedText) {
-    return `${lineLabel}: ${selectedText}`
-  }
-  return lineLabel || selectedText
-}
-
-function printPromptComments(data: PromptCommentsPayload) {
-  const versionLabel = data.version.versionLabel || (
-    data.version.versionNumber ? `v${data.version.versionNumber}` : data.version.id
-  )
-
-  printLine(`Prompt: ${sanitizeTerminalText(data.prompt.name)} (${sanitizeTerminalText(data.prompt.id)})`)
-  printLine(`Version: ${sanitizeTerminalText(String(versionLabel))} (${sanitizeTerminalText(data.version.id)})`)
-  printLine(
-    `Comments: ${data.summary.threadCount} thread${data.summary.threadCount === 1 ? '' : 's'} ` +
-    `(${data.summary.openThreadCount} open, ${data.summary.resolvedThreadCount} resolved, ${data.summary.replyCount} replies)`
-  )
-
-  if (data.comments.length === 0) {
-    printLine('\nNo comments found for this prompt version.')
-    return
-  }
-
-  for (const [index, thread] of data.comments.entries()) {
-    const authorName = thread.author?.name || 'Unknown'
-    const anchor = formatPromptCommentAnchor(thread.anchor)
-    printLine('')
-    printLine(`${index + 1}. [${thread.status}] ${sanitizeTerminalText(authorName)} · ${sanitizeTerminalText(thread.createdAt)}`)
-    if (anchor) {
-      printLine(`   Selection: ${anchor}`)
-    }
-    printIndentedBody(thread.body, '   ')
-
-    if (thread.replies.length > 0) {
-      printLine(`   Replies (${thread.replies.length})`)
-      for (const reply of thread.replies) {
-        const replyAuthor = reply.author?.name || 'Unknown'
-        printLine(`   - ${sanitizeTerminalText(replyAuthor)} · ${sanitizeTerminalText(reply.createdAt)}`)
-        printIndentedBody(reply.body, '     ')
-      }
-    }
-  }
-}
-
 const DEFAULT_AUTH_CALLBACK_PORT = 43123
 
 function resolveAuthCallbackPort(): number {
@@ -1562,37 +1453,6 @@ async function listJudges() {
   printPromptSummaries(data.judges, 'No judges found.')
 }
 
-async function listPromptComments() {
-  const promptRef = getPositionalArg(2)
-  const project = getArg('--project') || await resolveProjectSlug(null)
-  const label = getArg('--label')
-  const version = getArg('--version')
-
-  if (!promptRef) {
-    throw new Error('Usage: orizu prompts comments <prompt-id-or-name> --project <team/project> [--label <label> | --version <version-id>] [--json]')
-  }
-  if (label && version) {
-    throw new Error('Use either --label or --version, not both')
-  }
-
-  const params = new URLSearchParams({ project })
-  if (label) params.set('label', label)
-  if (version) params.set('version', version)
-
-  const response = await authedFetch(`/api/cli/prompts/${encodeURIComponent(promptRef)}/comments?${params.toString()}`)
-  if (!response.ok) {
-    throw new Error(`Failed to fetch prompt comments: ${await response.text()}`)
-  }
-
-  const data = await parseJsonResponse<PromptCommentsPayload>(response, 'Prompt comments')
-  if (hasJsonFlag()) {
-    printJson(data as unknown as Record<string, unknown>)
-    return
-  }
-
-  printPromptComments(data)
-}
-
 async function listScorers() {
   const project = getArg('--project') || await resolveProjectSlug(null)
   const response = await authedFetch(`/api/cli/scorers?project=${encodeURIComponent(project)}`)
@@ -2957,6 +2817,22 @@ function printJson(value: Record<string, unknown>) {
   printLine(JSON.stringify(value))
 }
 
+function createReportCommentsCliContext(): ReportCommentsCliContext {
+  return {
+    getArg,
+    getPositionalArg,
+    rejectDashPrefixedOptionValue,
+    resolveProjectSlug,
+    readSourceFile,
+    authedFetch,
+    parseJsonResponse,
+    hasJsonFlag,
+    printJson,
+    printLine,
+    sanitizeTerminalText,
+  }
+}
+
 function printCapabilities() {
   const capabilities = getCapabilities(getCliVersion())
   if (hasJsonFlag()) {
@@ -4994,6 +4870,39 @@ async function setTaskReport() {
   )
 }
 
+async function getTaskReport() {
+  const taskId = getArg('--task')
+  rejectDashPrefixedOptionValue('--task', taskId)
+  if (!taskId) {
+    throw new Error('Usage: orizu tasks report get --task <taskId> [--json]')
+  }
+
+  const response = await authedFetch(`/api/cli/tasks/${encodeURIComponent(taskId)}/report`)
+  if (!response.ok) {
+    throw new Error(`Failed to read task report: ${await response.text()}`)
+  }
+
+  const data = await parseJsonResponse<TaskReportPayload>(response, 'Task report get')
+  if (hasJsonFlag()) {
+    printJson(data as unknown as Record<string, unknown>)
+    return
+  }
+
+  const title = data.task.title ? `${data.task.title} ` : ''
+  printLine(`Task report: ${sanitizeTerminalText(title)}(${sanitizeTerminalText(data.task.id)})`)
+  if (data.task.status) {
+    printLine(`Status: ${sanitizeTerminalText(data.task.status)}`)
+  }
+  if (data.task.report.sourceName) {
+    printLine(`Source: ${sanitizeTerminalText(data.task.report.sourceName)}`)
+  }
+  if (data.task.report.createdAt) {
+    printLine(`Created: ${sanitizeTerminalText(data.task.report.createdAt)}`)
+  }
+  printLine('')
+  printLine(sanitizeTerminalText(data.task.report.markdown))
+}
+
 interface AppDetailPayload {
   id: string
   name: string
@@ -6339,6 +6248,11 @@ export async function main(rawArgs = process.argv.slice(2)) {
     return
   }
 
+  if (command === 'comments') {
+    await reportCommentsCommand(subcommand, createReportCommentsCliContext())
+    return
+  }
+
   if (command === 'teams' && subcommand === 'list') {
     await listTeams()
     return
@@ -6383,8 +6297,7 @@ export async function main(rawArgs = process.argv.slice(2)) {
   }
 
   if (command === 'prompts' && subcommand === 'comments') {
-    await listPromptComments()
-    return
+    throwDeprecatedPromptCommentsCommand()
   }
 
   if (command === 'prompts' && subcommand === 'pull') {
@@ -6594,6 +6507,11 @@ export async function main(rawArgs = process.argv.slice(2)) {
     return
   }
 
+  if (command === 'tasks' && subcommand === 'report' && cliArgs[2] === 'get') {
+    await getTaskReport()
+    return
+  }
+
   if (command === 'tasks' && subcommand === 'pause') { await updateTaskStatus('paused'); return }
   if (command === 'tasks' && subcommand === 'unpause') { await updateTaskStatus('active'); return }
   if (command === 'tasks' && subcommand === 'complete') { await updateTaskStatus('completed'); return }

package/src/manifests-cli.ts

@@ -16,7 +16,7 @@ export interface ManifestsCommandIo {
   resolveProjectSlug?: (arg: string | null) => Promise<string>
 }
 
-const MANIFEST_ACTIONS = new Set(['approve', 'reject', 'apply'])
+const MANIFEST_ACTIONS = new Set(['approve', 'reject', 'apply', 'revert'])
 
 async function responseMessage(response: Response): Promise<string> {
   try {
@@ -93,6 +93,93 @@ function num(value: unknown): number {
   return typeof value === 'number' ? value : 0
 }
 
+// Auto-applied manifests (ALI-1040) landed by SERVER POLICY, not a human approver
+// (approved_by is NULL). Mark them so a reviewer can tell policy applies from
+// human applies at a glance; the reason lives in the outcome for `show`.
+function wasAutoApplied(manifest: Record<string, unknown>): boolean {
+  return asRecord(manifest.outcome).autoApplied === true
+}
+
+/** STATUS cell: `applied*` when the server auto-applied it, else the raw status. */
+function statusDisplay(manifest: Record<string, unknown>): string {
+  const status = typeof manifest.status === 'string' ? manifest.status : '(unknown)'
+  return wasAutoApplied(manifest) ? `${status}*` : status
+}
+
+/** One-line auto-apply audit note for `show`, or null when not auto-applied. */
+function autoApplyNote(manifest: Record<string, unknown>): string | null {
+  if (!wasAutoApplied(manifest)) return null
+  const reason = asRecord(manifest.outcome).autoApplyReason
+  return typeof reason === 'string' && reason.length > 0
+    ? `auto-applied by policy: ${reason}`
+    : 'auto-applied by policy'
+}
+
+// -- list table (ALI-1038) ----------------------------------------------------
+
+/** "3m" / "4h" / "2d" — enough resolution to pick a manifest out of a list. */
+function relativeAge(iso: unknown, now: number): string {
+  if (typeof iso !== 'string') return '-'
+  const then = Date.parse(iso)
+  if (Number.isNaN(then)) return '-'
+  const mins = Math.max(0, Math.floor((now - then) / 60_000))
+  if (mins < 60) return `${mins}m`
+  const hours = Math.floor(mins / 60)
+  if (hours < 48) return `${hours}h`
+  return `${Math.floor(hours / 24)}d`
+}
+
+/** One-glance change summary from the stored proposedState — no live API call. */
+function changesSummary(manifest: Record<string, unknown>): string {
+  if (manifest.actionType !== 'repo_merge') return '-'
+  const proposed = asRecord(manifest.proposedState)
+  const files = num(proposed.filesChanged)
+  const parts = `${files} file${files === 1 ? '' : 's'} +${num(proposed.additions)}/-${num(proposed.deletions)}`
+  // Instruction files steer agent behavior — reviewers should see the flag in the list.
+  return proposed.touches_instruction_files === true ? `${parts} !instr` : parts
+}
+
+/** Reviewable-first (pending_approval, then draft), newest first within a group. */
+function listOrder(a: Record<string, unknown>, b: Record<string, unknown>): number {
+  const rank = (m: Record<string, unknown>): number =>
+    m.status === 'pending_approval' ? 0 : m.status === 'draft' ? 1 : 2
+  const byRank = rank(a) - rank(b)
+  if (byRank !== 0) return byRank
+  const created = (m: Record<string, unknown>): number =>
+    typeof m.createdAt === 'string' ? Date.parse(m.createdAt) || 0 : 0
+  return created(b) - created(a)
+}
+
+/** Render manifests as the standard padEnd table (matches teams/projects list). */
+function manifestsTable(manifests: Record<string, unknown>[], now: number): string {
+  if (manifests.length === 0) return 'promotion manifests\n(none)'
+  const rows = [...manifests].sort(listOrder).map(manifest => ({
+    id: typeof manifest.id === 'string' ? manifest.id : '(unknown)',
+    status: statusDisplay(manifest),
+    type: typeof manifest.actionType === 'string' ? manifest.actionType : '(unknown)',
+    changes: changesSummary(manifest),
+    author: typeof manifest.authorActorType === 'string' ? manifest.authorActorType : '-',
+    age: relativeAge(manifest.createdAt, now),
+  }))
+  const idWidth = Math.max('ID'.length, ...rows.map(row => row.id.length))
+  const statusWidth = Math.max('STATUS'.length, ...rows.map(row => row.status.length))
+  const typeWidth = Math.max('TYPE'.length, ...rows.map(row => row.type.length))
+  const changesWidth = Math.max('CHANGES'.length, ...rows.map(row => row.changes.length))
+  const authorWidth = Math.max('AUTHOR'.length, ...rows.map(row => row.author.length))
+  const header =
+    `${'ID'.padEnd(idWidth)}  ${'STATUS'.padEnd(statusWidth)}  ${'TYPE'.padEnd(typeWidth)}  ` +
+    `${'CHANGES'.padEnd(changesWidth)}  ${'AUTHOR'.padEnd(authorWidth)}  AGE`
+  const divider =
+    `${'-'.repeat(idWidth)}  ${'-'.repeat(statusWidth)}  ${'-'.repeat(typeWidth)}  ` +
+    `${'-'.repeat(changesWidth)}  ${'-'.repeat(authorWidth)}  ---`
+  const body = rows.map(
+    row =>
+      `${row.id.padEnd(idWidth)}  ${row.status.padEnd(statusWidth)}  ${row.type.padEnd(typeWidth)}  ` +
+      `${row.changes.padEnd(changesWidth)}  ${row.author.padEnd(authorWidth)}  ${row.age}`
+  )
+  return [header, divider, ...body].join('\n')
+}
+
 // repo_merge manifests (ALI-972) render the compare summary from stored evidence
 // — no live GitHub call — so a reviewer can approve informed without a PR.
 function repoMergeShow(manifest: Record<string, unknown>): string {
@@ -130,7 +217,7 @@ export async function manifestsCommand(args: string[], io: ManifestsCommandIo):
     const response = await fetcherFrom(io)(`/api/cli/promotion-manifests${query}`)
     const data = await requireOk(response, 'Manifest list')
     const manifests = Array.isArray(data.manifests) ? (data.manifests as Record<string, unknown>[]) : []
-    emit(io, { manifests }, ['promotion manifests', ...manifests.map(manifestLine)].join('\n'))
+    emit(io, { manifests }, manifestsTable(manifests, Date.now()))
     return 0
   }
 
@@ -142,7 +229,9 @@ export async function manifestsCommand(args: string[], io: ManifestsCommandIo):
     const response = await fetcherFrom(io)(`/api/cli/promotion-manifests/${encodeURIComponent(id)}`)
     const data = await requireOk(response, 'Manifest show')
     const manifest = (data.manifest ?? {}) as Record<string, unknown>
-    const human = manifest.actionType === 'repo_merge' ? repoMergeShow(manifest) : manifestLine(manifest)
+    const base = manifest.actionType === 'repo_merge' ? repoMergeShow(manifest) : manifestLine(manifest)
+    const note = autoApplyNote(manifest)
+    const human = note ? `${base}\n  ${note}` : base
     emit(io, { manifest }, human)
     return 0
   }
@@ -159,10 +248,26 @@ export async function manifestsCommand(args: string[], io: ManifestsCommandIo):
     })
     const data = await requireOk(response, `Manifest ${subcommand}`)
     const manifest = (data.manifest ?? {}) as Record<string, unknown>
-    emit(io, { manifest }, manifestLine(manifest))
+    const lines = [manifestLine(manifest)]
+    // Reject reaps the session branch best-effort; a failed reap must never be
+    // silent (ALI-1043) — surface it with the exact cleanup command.
+    if (subcommand === 'reject' && manifest.actionType === 'repo_merge') {
+      const outcome = asRecord(manifest.outcome)
+      const branch = asRecord(manifest.proposedState).branch
+      if (outcome.branchDeleted === true) {
+        lines.push('session branch deleted')
+      } else if (typeof branch === 'string' && branch.length > 0) {
+        lines.push(
+          `warning: the session branch could not be deleted — remove it with: git push origin --delete ${branch}`
+        )
+      } else {
+        lines.push('warning: the session branch could not be deleted (branch name unavailable)')
+      }
+    }
+    emit(io, { manifest }, lines.join('\n'))
     return 0
   }
 
-  io.print('Usage: orizu manifests <list|show|approve|reject|apply> ... [--json]')
+  io.print('Usage: orizu manifests <list|show|approve|reject|apply|revert> ... [--json]')
   return 1
 }