Merge branch 'main' into feat/calibration-honesty

packages/core/src/agent/agent-tools.ts

@@ -38,15 +38,19 @@ export const QUERY_PROJECT_TOOL: ToolDecl = {
 export const PROPOSE_CHANGE_TOOL: ToolDecl = {
   name: 'propose_change',
   description:
-    "Propose an estimate and/or priority change to an issue. This does NOT apply anything — it shows the " +
-    'human a diff to approve. Use it whenever the user asks to re-estimate or reprioritize. After calling it, ' +
-    "tell the user you've *proposed* the change for approval — never say it is done.",
+    'Propose a change to an issue — estimate, priority, assignee, and/or milestone. This does NOT apply ' +
+    'anything; it shows the human a diff to approve. Use it whenever the user asks to re-estimate, reprioritize, ' +
+    'assign someone (or unassign), or move an issue to a milestone. Pass a login for `assignee` (null to ' +
+    'unassign) and a milestone id for `milestone` (null to remove). After calling it, tell the user you have ' +
+    '*proposed* the change for approval — never say it is done.',
   parameters: {
     type: 'object',
     properties: {
       issue: { type: 'number', description: 'the issue number to change' },
       estimate: { type: 'string', enum: ['est/1d', 'est/2d', 'est/3d', 'est/5d', 'est/8d'] },
       priority: { type: 'string', enum: ['p/1', 'p/2', 'p/3', 'p/4'] },
+      assignee: { type: 'string', description: 'gitea login to assign, or null to unassign' },
+      milestone: { type: 'number', description: 'milestone id to set, or null to remove from its milestone' },
     },
     required: ['issue'],
   },
@@ -84,7 +88,7 @@ export const REGINALD_SYSTEM = [
   'You are Reginald, the calm, dry project manager inside CommiTea — a tool that runs projects on Gitea.',
   'Call query_project to ground every answer in the real project; never invent issues, numbers, or dates.',
   'The scheduler and forecasts are deterministic code — report their output, do not recompute it.',
-  'To change an estimate or priority, call propose_change — it shows the human a diff to approve.',
+  'To change an estimate, priority, assignee, or milestone, call propose_change — it shows the human a diff to approve.',
   'When the PM states standing intent ("pilots first", "freeze scope"), call record_directive to log it.',
   'Never claim a change is applied; you propose, the human approves. Forecasts are ranges, never single dates.',
   'Refer to issues as #<number>. Be brief and plain — a sentence or two. No preamble, no bullet dumps.',

packages/core/src/changes/apply-changes-v0.test.ts

@@ -1,6 +1,13 @@
 import { describe, expect, it } from 'vitest'
 
-import { describeChange, type IssueChange, planIssueChange, proposalsFor } from './apply-changes-v0.js'
+import {
+  describeChange,
+  isLabelChange,
+  type IssueChange,
+  planIssueChange,
+  proposalsFor,
+  summarizeChange,
+} from './apply-changes-v0.js'
 
 describe('planIssueChange', () => {
   it('swaps the estimate label, keeping non-axis labels', () => {
@@ -58,11 +65,31 @@ describe('proposalsFor', () => {
     const props = proposalsFor({ issue: 2, estimate: 'est/5d', priority: 'p/1' }, ['est/2d', 'p/3'], 'ChangeSource')
     expect(props).toHaveLength(2)
     expect(props[0].change).toEqual({ kind: 'reestimate', issue: 2, estimate: 'est/5d' })
-    expect(describeChange(props[0].plan)).toBe('est/2d → est/5d')
+    expect(props[0].summary).toBe('est/2d → est/5d')
     expect(props[1].change).toEqual({ kind: 'reprioritize', issue: 2, priority: 'p/1' })
     expect(props[0].issueTitle).toBe('ChangeSource')
   })
 
+  it('proposes an assignment only when it differs from the current assignee', () => {
+    const change = proposalsFor({ issue: 2, assignee: 'christian' }, [], undefined, { currentAssignee: null })
+    expect(change).toHaveLength(1)
+    expect(change[0].change).toEqual({ kind: 'assign', issue: 2, assignee: 'christian' })
+    expect(change[0].summary).toBe('assign → @christian')
+    expect(change[0].plan).toBeUndefined()
+    // already assigned → no proposal
+    expect(proposalsFor({ issue: 2, assignee: 'christian' }, [], undefined, { currentAssignee: 'christian' })).toEqual([])
+  })
+
+  it('proposes a milestone move, labeled from the milestones list, skipping a no-op', () => {
+    const ctx = { currentMilestoneId: 1, milestones: [{ id: 3, title: 'P5 — Dogfood' }] }
+    const props = proposalsFor({ issue: 2, milestone: 3 }, [], undefined, ctx)
+    expect(props).toHaveLength(1)
+    expect(props[0].change).toEqual({ kind: 'remilestone', issue: 2, milestone: 3, milestoneTitle: 'P5 — Dogfood' })
+    expect(props[0].summary).toBe('milestone → P5 — Dogfood')
+    // same milestone → no proposal
+    expect(proposalsFor({ issue: 2, milestone: 1 }, [], undefined, ctx)).toEqual([])
+  })
+
   it('drops a noop axis (already at the requested value)', () => {
     const props = proposalsFor({ issue: 2, estimate: 'est/2d', priority: 'p/1' }, ['est/2d', 'p/3'])
     expect(props.map((p) => p.change.kind)).toEqual(['reprioritize']) // estimate unchanged
@@ -77,3 +104,31 @@ describe('proposalsFor', () => {
     expect(proposalsFor({ issue: 2 }, ['est/2d'])).toEqual([])
   })
 })
+
+describe('unified change model (assign + milestone)', () => {
+  it('isLabelChange narrows label kinds only', () => {
+    expect(isLabelChange({ kind: 'reestimate', issue: 1, estimate: 'est/2d' })).toBe(true)
+    expect(isLabelChange({ kind: 'reprioritize', issue: 1, priority: 'p/1' })).toBe(true)
+    expect(isLabelChange({ kind: 'assign', issue: 1, assignee: 'christian' })).toBe(false)
+    expect(isLabelChange({ kind: 'remilestone', issue: 1, milestone: 3 })).toBe(false)
+  })
+
+  it('summarizeChange describes an assignment and an unassignment', () => {
+    expect(summarizeChange({ kind: 'assign', issue: 1, assignee: 'christian' })).toBe('assign → @christian')
+    expect(summarizeChange({ kind: 'assign', issue: 1, assignee: null })).toBe('unassign')
+  })
+
+  it('summarizeChange describes a milestone set (by title) and removal', () => {
+    expect(summarizeChange({ kind: 'remilestone', issue: 1, milestone: 3, milestoneTitle: 'P5 — Dogfood' })).toBe(
+      'milestone → P5 — Dogfood',
+    )
+    expect(summarizeChange({ kind: 'remilestone', issue: 1, milestone: 3 })).toBe('milestone → #3')
+    expect(summarizeChange({ kind: 'remilestone', issue: 1, milestone: null })).toBe('remove from milestone')
+  })
+
+  it('summarizeChange delegates label kinds to describeChange (needs current labels)', () => {
+    const change: IssueChange = { kind: 'reestimate', issue: 1, estimate: 'est/5d' }
+    expect(summarizeChange(change, ['est/2d'])).toBe('est/2d → est/5d')
+    expect(summarizeChange(change, ['est/5d'])).toBe('no change')
+  })
+})

packages/core/src/changes/apply-changes-v0.ts

@@ -17,6 +17,15 @@ import {
 export type IssueChange =
   | { kind: 'reestimate'; issue: number; estimate: EstimateLabel | null }
   | { kind: 'reprioritize'; issue: number; priority: PriorityLabel | null }
+  | { kind: 'assign'; issue: number; assignee: string | null }
+  | { kind: 'remilestone'; issue: number; milestone: number | null; milestoneTitle?: string | null }
+
+/** The label axes are the only kinds planned as a label swap; the rest are field writes. */
+export function isLabelChange(
+  change: IssueChange,
+): change is Extract<IssueChange, { kind: 'reestimate' | 'reprioritize' }> {
+  return change.kind === 'reestimate' || change.kind === 'reprioritize'
+}
 
 export interface LabelPlan {
   /** The full resulting label-name set (order: kept labels, then the new axis label). */
@@ -29,7 +38,10 @@ export interface LabelPlan {
   noop: boolean
 }
 
-function axisFor(change: IssueChange): { labels: readonly string[]; target: string | null } {
+/** A change that resolves to a label swap (the only kind `planIssueChange` accepts). */
+export type LabelChange = Extract<IssueChange, { kind: 'reestimate' | 'reprioritize' }>
+
+function axisFor(change: LabelChange): { labels: readonly string[]; target: string | null } {
   return change.kind === 'reestimate'
     ? { labels: ESTIMATE_LABELS, target: change.estimate }
     : { labels: PRIORITY_LABELS, target: change.priority }
@@ -40,7 +52,7 @@ function axisFor(change: IssueChange): { labels: readonly string[]; target: stri
  * change's axis except the target, adds the target if absent. Setting the axis
  * to null clears it. Cleans up a duplicated axis (two `est/*`) as a side effect.
  */
-export function planIssueChange(current: string[], change: IssueChange): LabelPlan {
+export function planIssueChange(current: string[], change: LabelChange): LabelPlan {
   const { labels: axis, target } = axisFor(change)
   const onAxis = current.filter((l) => axis.includes(l))
   const removed = onAxis.filter((l) => l !== target)
@@ -58,18 +70,52 @@ export function describeChange(plan: LabelPlan): string {
   return `${from} → ${to}`
 }
 
-/** A change the agent proposes: the concrete op + its diff, ready for approve-then-apply. */
+/**
+ * One human-readable confirm line for ANY change kind — the unified describe for
+ * the propose-approve UI. Label kinds delegate to {@link describeChange} (so they
+ * need the issue's current labels); assign/milestone describe the field write
+ * directly. Pure; no network.
+ */
+export function summarizeChange(change: IssueChange, currentLabels: string[] = []): string {
+  switch (change.kind) {
+    case 'reestimate':
+    case 'reprioritize':
+      return describeChange(planIssueChange(currentLabels, change))
+    case 'assign':
+      return change.assignee ? `assign → @${change.assignee}` : 'unassign'
+    case 'remilestone':
+      return change.milestone == null
+        ? 'remove from milestone'
+        : `milestone → ${change.milestoneTitle ?? `#${change.milestone}`}`
+  }
+}
+
+/** A change the agent proposes: the concrete op + its human diff, ready for approve-then-apply. */
 export interface ChangeProposal {
   change: IssueChange
-  plan: LabelPlan
+  /** One-line diff for the approve UI — always present ({@link summarizeChange}). */
+  summary: string
+  /** The label plan, for label kinds only (absent for assign/milestone). */
+  plan?: LabelPlan
   issueTitle?: string
 }
 
-/** What the `propose_change` tool accepts — a target issue and the axes to set. */
+/** What the `propose_change` tool accepts — a target issue and the fields to set. */
 export interface ProposeChangeArgs {
   issue: number
   estimate?: EstimateLabel
   priority?: PriorityLabel
+  /** Login to assign, or null to unassign. Omit to leave assignee untouched. */
+  assignee?: string | null
+  /** Milestone id to set, or null to clear. Omit to leave the milestone untouched. */
+  milestone?: number | null
+}
+
+/** Current state + lookups a proposal needs to skip noops and label the milestone. */
+export interface ProposalContext {
+  currentAssignee?: string | null
+  currentMilestoneId?: number | null
+  milestones?: { id: number; title: string }[]
 }
 
 function isEstimate(v: unknown): v is EstimateLabel {
@@ -80,25 +126,33 @@ function isPriority(v: unknown): v is PriorityLabel {
 }
 
 /**
- * Build the concrete, non-noop proposals for a `propose_change` request against
- * an issue's current labels. Invalid or unchanged axes are dropped — the agent
- * proposes only real changes, and never a label outside the est/* · p/* axes.
+ * Build the concrete, non-noop proposals for a `propose_change` request. Label
+ * axes (est/*, p/*) are validated and never invented; assign/milestone are
+ * emitted only when they differ from the issue's current value (via `ctx`). Each
+ * proposal carries a human `summary`; label kinds also carry the label plan.
  */
 export function proposalsFor(
   args: ProposeChangeArgs,
   currentLabels: string[],
   issueTitle?: string,
+  ctx: ProposalContext = {},
 ): ChangeProposal[] {
   const out: ChangeProposal[] = []
-  if (isEstimate(args.estimate)) {
-    const change: IssueChange = { kind: 'reestimate', issue: args.issue, estimate: args.estimate }
+  const pushLabel = (change: LabelChange) => {
     const plan = planIssueChange(currentLabels, change)
-    if (!plan.noop) out.push({ change, plan, issueTitle })
+    if (!plan.noop) out.push({ change, plan, summary: describeChange(plan), issueTitle })
   }
-  if (isPriority(args.priority)) {
-    const change: IssueChange = { kind: 'reprioritize', issue: args.issue, priority: args.priority }
-    const plan = planIssueChange(currentLabels, change)
-    if (!plan.noop) out.push({ change, plan, issueTitle })
+  if (isEstimate(args.estimate)) pushLabel({ kind: 'reestimate', issue: args.issue, estimate: args.estimate })
+  if (isPriority(args.priority)) pushLabel({ kind: 'reprioritize', issue: args.issue, priority: args.priority })
+
+  if (args.assignee !== undefined && args.assignee !== (ctx.currentAssignee ?? null)) {
+    const change: IssueChange = { kind: 'assign', issue: args.issue, assignee: args.assignee }
+    out.push({ change, summary: summarizeChange(change), issueTitle })
+  }
+  if (args.milestone !== undefined && args.milestone !== (ctx.currentMilestoneId ?? null)) {
+    const milestoneTitle = ctx.milestones?.find((m) => m.id === args.milestone)?.title ?? null
+    const change: IssueChange = { kind: 'remilestone', issue: args.issue, milestone: args.milestone, milestoneTitle }
+    out.push({ change, summary: summarizeChange(change), issueTitle })
   }
   return out
 }

packages/core/src/gitea/client.test.ts

@@ -146,6 +146,22 @@ describe('createGiteaClient.getIssue', () => {
     ])
   })
 
+  it('listCollaborators maps login+name and prepends the owner when absent', async () => {
+    const { fetch } = stubFetch([{ login: 'stephen', full_name: 'Stephen M.' }])
+    const people = await createGiteaClient(CONFIG, fetch).listCollaborators()
+    // owner (christian) prepended since /collaborators omits them; collaborator name preserved
+    expect(people).toEqual([
+      { login: 'christian', name: 'christian' },
+      { login: 'stephen', name: 'Stephen M.' },
+    ])
+  })
+
+  it('listCollaborators does not double-add the owner when already listed', async () => {
+    const { fetch } = stubFetch([{ login: 'christian', full_name: 'Christian L.' }])
+    const people = await createGiteaClient(CONFIG, fetch).listCollaborators()
+    expect(people).toEqual([{ login: 'christian', name: 'Christian L.' }])
+  })
+
   it('getFile returns null on 404 and content+sha on hit', async () => {
     const miss = stubFetch('nope', 404)
     expect(await createGiteaClient(CONFIG, miss.fetch).getFile('directives/log.jsonl')).toBeNull()

packages/core/src/gitea/client.ts

@@ -101,8 +101,14 @@ export interface GiteaClient {
   getIssueTimeline(index: number): Promise<LifecycleEvent[]>
   /** Every label defined on the repo (id + name), for name→id resolution. */
   listLabels(): Promise<GiteaLabel[]>
+  /** Repo collaborators (login + display name) — the assignable people. */
+  listCollaborators(): Promise<{ login: string; name: string }[]>
   /** Replace an issue's entire label set with the given label ids. Write. */
   setIssueLabels(index: number, labelIds: number[]): Promise<void>
+  /** Replace an issue's assignees (empty array unassigns); returns the updated issue. Write. */
+  setIssueAssignees(index: number, logins: string[]): Promise<GiteaIssue>
+  /** Set (or clear, with null) an issue's milestone by id; returns the updated issue. Write. */
+  setIssueMilestone(index: number, milestoneId: number | null): Promise<GiteaIssue>
   /** Open a new issue with a title, optional body, and label ids. Write. */
   createIssue(input: { title: string; body?: string; labelIds?: number[] }): Promise<GiteaIssue>
   /** Read a repo file's base64 content + blob sha; null if it (or the repo) is absent. */
@@ -229,6 +235,33 @@ export function createGiteaClient(config: GiteaConfig, fetchImpl: FetchLike): Gi
       await request(`/issues/${index}/labels`, { method: 'PUT', body: { labels: labelIds } })
     },
 
+    async listCollaborators() {
+      const raw = await requestAll<{ login: string; full_name?: string }>(
+        (page) => `/collaborators?page=${page}&limit=${PAGE_LIMIT}`,
+      )
+      const collabs = raw.map((u) => ({ login: u.login, name: u.full_name || u.login }))
+      // The owner is assignable but is not returned by /collaborators — prepend them
+      // so a solo-owner repo still has an assignable person.
+      if (!collabs.some((c) => c.login === config.owner)) {
+        collabs.unshift({ login: config.owner, name: config.owner })
+      }
+      return collabs
+    },
+
+    async setIssueAssignees(index, logins) {
+      const raw = (await request(`/issues/${index}`, { method: 'PATCH', body: { assignees: logins } })) as RawIssue
+      return normalizeIssue(raw)
+    },
+
+    async setIssueMilestone(index, milestoneId) {
+      // gitea's EditIssueOption takes a milestone id; 0 clears it.
+      const raw = (await request(`/issues/${index}`, {
+        method: 'PATCH',
+        body: { milestone: milestoneId ?? 0 },
+      })) as RawIssue
+      return normalizeIssue(raw)
+    },
+
     async createIssue(input) {
       const raw = (await request('/issues', {
         method: 'POST',

packages/core/src/index.ts

@@ -23,8 +23,15 @@ export type {
   GiteaRequestInit,
 } from './gitea/types.js'
 
-export { describeChange, planIssueChange, proposalsFor } from './changes/apply-changes-v0.js'
-export type { ChangeProposal, IssueChange, LabelPlan, ProposeChangeArgs } from './changes/apply-changes-v0.js'
+export { describeChange, isLabelChange, planIssueChange, proposalsFor, summarizeChange } from './changes/apply-changes-v0.js'
+export type {
+  ChangeProposal,
+  IssueChange,
+  LabelChange,
+  LabelPlan,
+  ProposalContext,
+  ProposeChangeArgs,
+} from './changes/apply-changes-v0.js'
 
 export {
   inferColumnV0,