Merge branch 'main' into feat/calibration-honesty
This commit is contained in:
@@ -19,6 +19,7 @@ import {
|
||||
type GiteaConfig,
|
||||
type GiteaLabel,
|
||||
type IssueChange,
|
||||
isLabelChange,
|
||||
type LifecycleEvent,
|
||||
makeDirectiveEntry,
|
||||
parseCapacityConfig,
|
||||
@@ -263,19 +264,32 @@ export function registerGiteaIpc(): void {
|
||||
return client.getIssue(index)
|
||||
})
|
||||
|
||||
// The write path (apply_changes). Additive label swaps, applied only after the
|
||||
// renderer's propose-approve. Returns the plan + the freshly-read issue.
|
||||
// The write path (apply_changes), applied only after the renderer's propose-
|
||||
// approve. Label swaps (est/p) return the plan; field writes (assign, milestone)
|
||||
// return the freshly-read issue directly. Either way the snapshot is invalidated
|
||||
// so the board + forecast reflect the change.
|
||||
ipcMain.handle('gitea:applyChange', async (_event, change: IssueChange) => {
|
||||
const client = getGiteaClient()
|
||||
if (!client) return { ok: false as const, reason: 'unconfigured' as const }
|
||||
const current = await client.getIssue(change.issue)
|
||||
const plan = planIssueChange(current.labels, change)
|
||||
if (plan.noop) return { ok: true as const, plan, issue: current }
|
||||
const ids = await resolveLabelIds(client, plan.labels)
|
||||
await client.setIssueLabels(change.issue, ids)
|
||||
const issue = await client.getIssue(change.issue)
|
||||
invalidateSnapshot() // the board + forecast must reflect the label change
|
||||
return { ok: true as const, plan, issue }
|
||||
|
||||
if (isLabelChange(change)) {
|
||||
const current = await client.getIssue(change.issue)
|
||||
const plan = planIssueChange(current.labels, change)
|
||||
if (plan.noop) return { ok: true as const, plan, issue: current }
|
||||
const ids = await resolveLabelIds(client, plan.labels)
|
||||
await client.setIssueLabels(change.issue, ids)
|
||||
const issue = await client.getIssue(change.issue)
|
||||
invalidateSnapshot()
|
||||
return { ok: true as const, plan, issue }
|
||||
}
|
||||
|
||||
// Field writes — the client returns the updated issue.
|
||||
const issue =
|
||||
change.kind === 'assign'
|
||||
? await client.setIssueAssignees(change.issue, change.assignee ? [change.assignee] : [])
|
||||
: await client.setIssueMilestone(change.issue, change.milestone)
|
||||
invalidateSnapshot()
|
||||
return { ok: true as const, issue }
|
||||
})
|
||||
|
||||
// capture_work filing: open each approved issue with its est/* + p/* labels.
|
||||
@@ -319,6 +333,17 @@ export function registerGiteaIpc(): void {
|
||||
}
|
||||
})
|
||||
|
||||
// Assignable people (repo collaborators) for the Adjust dialog's assignee picker.
|
||||
ipcMain.handle('gitea:collaborators', async () => {
|
||||
const client = getGiteaClient()
|
||||
if (!client) return []
|
||||
try {
|
||||
return await client.listCollaborators()
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
})
|
||||
|
||||
// ---- config (team onboarding) ----
|
||||
ipcMain.handle('config:get', () => publicConfig())
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ import {
|
||||
type ChangeProposal,
|
||||
type ChatMessage,
|
||||
createChatClient,
|
||||
describeChange,
|
||||
type ModelRouter,
|
||||
type ProjectView,
|
||||
proposalsFor,
|
||||
@@ -130,10 +129,19 @@ export function registerModelIpc(): void {
|
||||
const a = (args ?? {}) as ProposeChangeArgs
|
||||
const issue = await client.getIssue(a.issue).catch(() => null)
|
||||
if (!issue) return { error: `issue #${a.issue} not found` }
|
||||
const built = proposalsFor(a, issue.labels, issue.title)
|
||||
// Milestone titles + current assignee/milestone let a proposal label the
|
||||
// milestone and skip a no-op assign/move.
|
||||
const milestones = (a.milestone !== undefined ? await client.listMilestones().catch(() => []) : []).map(
|
||||
(m) => ({ id: m.id, title: m.title }),
|
||||
)
|
||||
const built = proposalsFor(a, issue.labels, issue.title, {
|
||||
currentAssignee: issue.assignee,
|
||||
currentMilestoneId: issue.milestone?.id ?? null,
|
||||
milestones,
|
||||
})
|
||||
proposals.push(...built)
|
||||
return built.length
|
||||
? { proposed: built.map((p) => ({ issue: a.issue, diff: describeChange(p.plan) })) }
|
||||
? { proposed: built.map((p) => ({ issue: a.issue, diff: p.summary })) }
|
||||
: { proposed: [], note: 'no change — already at that value' }
|
||||
}
|
||||
if (name === 'record_directive') {
|
||||
|
||||
@@ -15,6 +15,8 @@ const api = {
|
||||
applyChange: (change: unknown) => ipcRenderer.invoke('gitea:applyChange', change),
|
||||
/** File a set of captured issues with their est/* + p/* labels. */
|
||||
createIssues: (issues: unknown) => ipcRenderer.invoke('gitea:createIssues', issues),
|
||||
/** Assignable people (repo collaborators) for the assignee picker. */
|
||||
collaborators: () => ipcRenderer.invoke('gitea:collaborators'),
|
||||
},
|
||||
pmstate: {
|
||||
/** Read the directive ledger from the pm-state repo. */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react'
|
||||
|
||||
import { COLUMNS, type BoardColumn, type BoardIssue, type IssueRef } from '../../data/fixtures.js'
|
||||
import { COLUMNS, type BoardColumn, type BoardIssue, type DepsData, type GanttData, type IssueRef } from '../../data/fixtures.js'
|
||||
import { Card, Tag, Badge, Tabs, IconButton, Input, Icon } from '../ui/index.js'
|
||||
import { EmptyState } from '../shell/states.js'
|
||||
import { GanttView } from './gantt-view.js'
|
||||
@@ -12,10 +12,14 @@ import { DepsGraph } from './deps-graph.js'
|
||||
export function BoardScreen({
|
||||
onOpenIssue,
|
||||
columns = COLUMNS,
|
||||
gantt,
|
||||
deps,
|
||||
loading = false,
|
||||
}: {
|
||||
onOpenIssue: (issue: IssueRef) => void
|
||||
columns?: BoardColumn[]
|
||||
gantt?: GanttData
|
||||
deps?: DepsData
|
||||
loading?: boolean
|
||||
}) {
|
||||
const [tab, setTab] = React.useState('board');
|
||||
@@ -90,9 +94,9 @@ export function BoardScreen({
|
||||
</div>
|
||||
)
|
||||
) : tab === 'deps' ? (
|
||||
<DepsGraph onOpenIssue={onOpenIssue} />
|
||||
<DepsGraph onOpenIssue={onOpenIssue} data={deps} />
|
||||
) : (
|
||||
<GanttView onOpenIssue={onOpenIssue} />
|
||||
<GanttView onOpenIssue={onOpenIssue} data={gantt} />
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import React from 'react'
|
||||
|
||||
import { DEPS, type IssueRef } from '../../data/fixtures.js'
|
||||
import { DEPS, type DepsData, type IssueRef } from '../../data/fixtures.js'
|
||||
import { Tag, Icon } from '../ui/index.js'
|
||||
|
||||
// Dependency graph drill-in — layered DAG, critical path in spruce
|
||||
export function DepsGraph({ onOpenIssue }: { onOpenIssue: (issue: IssueRef) => void }) {
|
||||
const g = DEPS
|
||||
export function DepsGraph({ onOpenIssue, data }: { onOpenIssue: (issue: IssueRef) => void; data?: DepsData }) {
|
||||
const g = data ?? DEPS
|
||||
|
||||
const PAD = 14, COLW = 206, ROWH = 106, NW = 176, NH = 84
|
||||
const X = (c: number) => PAD + c * COLW
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import React from 'react'
|
||||
|
||||
import { GANTT, type IssueRef } from '../../data/fixtures.js'
|
||||
import { GANTT, type GanttData, type IssueRef } from '../../data/fixtures.js'
|
||||
import { Icon } from '../ui/index.js'
|
||||
|
||||
// Gantt drill-in — scheduler-derived bars, critical chain, 80% forecast tails
|
||||
export function GanttView({ onOpenIssue }: { onOpenIssue: (issue: IssueRef) => void }) {
|
||||
const g = GANTT;
|
||||
export function GanttView({ onOpenIssue, data }: { onOpenIssue: (issue: IssueRef) => void; data?: GanttData }) {
|
||||
const g = data ?? GANTT;
|
||||
|
||||
const LABELW = 232, DAYW = 21, ROWH = 36, HEADH = 30;
|
||||
const chartW = g.days * DAYW;
|
||||
|
||||
@@ -9,13 +9,15 @@ export function InboxScreen({
|
||||
onOpenDirectives,
|
||||
readIds,
|
||||
setReadIds,
|
||||
data,
|
||||
}: {
|
||||
onOpenIssue: (issue: IssueRef) => void
|
||||
onOpenDirectives: () => void
|
||||
readIds: number[]
|
||||
setReadIds: React.Dispatch<React.SetStateAction<number[]>>
|
||||
data?: InboxItem[]
|
||||
}) {
|
||||
const all = INBOX
|
||||
const all = data ?? INBOX
|
||||
const [tab, setTab] = React.useState('all')
|
||||
|
||||
const isRead = (n: InboxItem) => !n.unread || readIds.includes(n.id)
|
||||
|
||||
@@ -2,13 +2,12 @@
|
||||
import React, { useState } from 'react'
|
||||
|
||||
import {
|
||||
describeChange,
|
||||
type EstimateLabel,
|
||||
ESTIMATE_LABELS,
|
||||
type IssueChange,
|
||||
planIssueChange,
|
||||
type PriorityLabel,
|
||||
PRIORITY_LABELS,
|
||||
summarizeChange,
|
||||
} from '@commitea/core'
|
||||
|
||||
import { ISSUE_DETAIL, type IssueDetail, type IssueRef } from '../../data/fixtures.js'
|
||||
@@ -18,18 +17,28 @@ const NONE = '—'
|
||||
|
||||
export function IssueScreen({
|
||||
issue,
|
||||
detail,
|
||||
onBack,
|
||||
onOpenIssue,
|
||||
canWrite = false,
|
||||
onApplyChange,
|
||||
collaborators = [],
|
||||
milestones = [],
|
||||
currentAssignee = null,
|
||||
currentMilestoneId = null,
|
||||
}: {
|
||||
issue: IssueRef
|
||||
detail?: IssueDetail
|
||||
onBack: () => void
|
||||
onOpenIssue: (issue: IssueRef) => void
|
||||
canWrite?: boolean
|
||||
onApplyChange?: (change: IssueChange) => Promise<{ ok: boolean }>
|
||||
collaborators?: { login: string; name: string }[]
|
||||
milestones?: { id: number; title: string }[]
|
||||
currentAssignee?: string | null
|
||||
currentMilestoneId?: number | null
|
||||
}) {
|
||||
const det: IssueDetail = ISSUE_DETAIL[issue.id] || {
|
||||
const det: IssueDetail = detail ?? ISSUE_DETAIL[issue.id] ?? {
|
||||
state: 'triage',
|
||||
assignee: 'Stephen',
|
||||
milestone: 'Beta',
|
||||
@@ -60,25 +69,40 @@ export function IssueScreen({
|
||||
const labels = issue.labels ?? []
|
||||
const curEstimate = labels.find((l) => l.startsWith('est/')) ?? ''
|
||||
const curPriority = labels.find((l) => l.startsWith('p/')) ?? ''
|
||||
const curAssignee = currentAssignee ?? ''
|
||||
const curMilestone = currentMilestoneId != null ? String(currentMilestoneId) : ''
|
||||
const [adjustOpen, setAdjustOpen] = useState(false)
|
||||
const [estimate, setEstimate] = useState(curEstimate)
|
||||
const [priority, setPriority] = useState(curPriority)
|
||||
const [assignee, setAssignee] = useState(curAssignee)
|
||||
const [milestone, setMilestone] = useState(curMilestone)
|
||||
const [applying, setApplying] = useState(false)
|
||||
|
||||
const openAdjust = () => {
|
||||
setEstimate(curEstimate)
|
||||
setPriority(curPriority)
|
||||
setAssignee(curAssignee)
|
||||
setMilestone(curMilestone)
|
||||
setAdjustOpen(true)
|
||||
}
|
||||
|
||||
// the concrete changes this dialog would apply, one per axis that differs
|
||||
// the concrete changes this dialog would apply, one per field that differs
|
||||
const pendingChanges: IssueChange[] = []
|
||||
if (estimate !== curEstimate)
|
||||
pendingChanges.push({ kind: 'reestimate', issue: issue.id, estimate: (estimate || null) as EstimateLabel | null })
|
||||
if (priority !== curPriority)
|
||||
pendingChanges.push({ kind: 'reprioritize', issue: issue.id, priority: (priority || null) as PriorityLabel | null })
|
||||
if (assignee !== curAssignee)
|
||||
pendingChanges.push({ kind: 'assign', issue: issue.id, assignee: assignee || null })
|
||||
if (milestone !== curMilestone)
|
||||
pendingChanges.push({
|
||||
kind: 'remilestone',
|
||||
issue: issue.id,
|
||||
milestone: milestone ? Number(milestone) : null,
|
||||
milestoneTitle: milestones.find((m) => String(m.id) === milestone)?.title ?? null,
|
||||
})
|
||||
|
||||
const diffs = pendingChanges.map((c) => describeChange(planIssueChange(labels, c)))
|
||||
const diffs = pendingChanges.map((c) => summarizeChange(c, labels))
|
||||
|
||||
const apply = async () => {
|
||||
if (!onApplyChange || pendingChanges.length === 0) return
|
||||
@@ -93,6 +117,14 @@ export function IssueScreen({
|
||||
|
||||
const estOptions = [{ value: '', label: NONE }, ...ESTIMATE_LABELS.map((l) => ({ value: l, label: l }))]
|
||||
const prioOptions = [{ value: '', label: NONE }, ...PRIORITY_LABELS.map((l) => ({ value: l, label: l }))]
|
||||
const assigneeOptions = [
|
||||
{ value: '', label: 'Unassigned' },
|
||||
...collaborators.map((c) => ({ value: c.login, label: c.name })),
|
||||
]
|
||||
const milestoneOptions = [
|
||||
{ value: '', label: NONE },
|
||||
...milestones.map((m) => ({ value: String(m.id), label: m.title })),
|
||||
]
|
||||
|
||||
return (
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
|
||||
@@ -133,7 +165,7 @@ export function IssueScreen({
|
||||
<Dialog
|
||||
open={adjustOpen}
|
||||
onClose={() => setAdjustOpen(false)}
|
||||
title="Adjust estimate & priority"
|
||||
title="Adjust issue"
|
||||
footer={
|
||||
<>
|
||||
<Button variant="ghost" onClick={() => setAdjustOpen(false)}>
|
||||
@@ -159,15 +191,35 @@ export function IssueScreen({
|
||||
onChange={(e) => setPriority(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
{(collaborators.length > 0 || milestones.length > 0) && (
|
||||
<div style={{ display: 'flex', gap: 14, marginTop: 12 }}>
|
||||
{collaborators.length > 0 ? (
|
||||
<Select
|
||||
label="Assignee"
|
||||
options={assigneeOptions}
|
||||
value={assignee}
|
||||
onChange={(e) => setAssignee(e.target.value)}
|
||||
/>
|
||||
) : null}
|
||||
{milestones.length > 0 ? (
|
||||
<Select
|
||||
label="Milestone"
|
||||
options={milestoneOptions}
|
||||
value={milestone}
|
||||
onChange={(e) => setMilestone(e.target.value)}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
)}
|
||||
<div style={{ marginTop: 14, minHeight: 40 }}>
|
||||
{pendingChanges.length === 0 ? (
|
||||
<p style={{ font: 'var(--text-agent)', color: 'var(--ink-3)', margin: 0 }}>
|
||||
No change yet — pick a different estimate or priority.
|
||||
No change yet — pick a different estimate, priority, assignee, or milestone.
|
||||
</p>
|
||||
) : (
|
||||
<>
|
||||
<p style={{ font: 'var(--text-overline)', letterSpacing: 'var(--letter-spacing-wide)', textTransform: 'uppercase', color: 'var(--ink-3)', margin: '0 0 6px' }}>
|
||||
Proposed label change
|
||||
Proposed change
|
||||
</p>
|
||||
{diffs.map((d) => (
|
||||
<div key={d} style={{ font: '500 13px var(--font-mono)', color: 'var(--ink-1)' }}>
|
||||
@@ -175,7 +227,7 @@ export function IssueScreen({
|
||||
</div>
|
||||
))}
|
||||
<p style={{ font: 'var(--text-agent)', color: 'var(--ink-2)', margin: '8px 0 0' }}>
|
||||
Writes the label to gitea and re-runs the plan. Nothing else changes.
|
||||
Writes to gitea and re-runs the plan. Nothing else changes.
|
||||
</p>
|
||||
</>
|
||||
)}
|
||||
@@ -267,7 +319,7 @@ export function IssueScreen({
|
||||
<span style={{ font: '400 11px var(--font-mono)', color: 'var(--ink-3)' }}>blocks</span>
|
||||
{det.blocks.map((b) => (
|
||||
<button key={b} type="button"
|
||||
onClick={() => onOpenIssue({ id: b, title: b === 91 ? 'Webhook listener: reconcile on reconnect' : 'Monte Carlo engine: percentile bands', labels: b === 91 ? ['est/3d', 'p/2'] : ['est/5d', 'p/1'] })}
|
||||
onClick={() => onOpenIssue({ id: b })}
|
||||
style={{ font: '500 11px var(--font-mono)', color: 'var(--accent-text)', background: 'var(--spruce-1)', border: '1px solid var(--spruce-2)', borderRadius: 'var(--radius-1)', padding: '2px 7px', cursor: 'pointer' }}>
|
||||
#{b}
|
||||
</button>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react'
|
||||
|
||||
import { type IssueRef, STANDUP } from '../../data/fixtures.js'
|
||||
import { type IssueRef, STANDUP, type StandupData } from '../../data/fixtures.js'
|
||||
import { Badge, Button, Icon } from '../ui/index.js'
|
||||
|
||||
const standupCSS = `
|
||||
@@ -36,15 +36,15 @@ const toneColor: Record<string, string> = {
|
||||
export function StandupScreen({
|
||||
onBegin,
|
||||
onOpenIssue,
|
||||
data,
|
||||
}: {
|
||||
onBegin: () => void
|
||||
onOpenIssue: (issue: IssueRef) => void
|
||||
data?: StandupData
|
||||
}) {
|
||||
const s = STANDUP
|
||||
const s = data ?? STANDUP
|
||||
const NAG_REF: IssueRef = {
|
||||
id: s.nag.id,
|
||||
title: 'Fix lifecycle inference on merge events',
|
||||
labels: ['est/2d', 'p/1'],
|
||||
days: s.nag.days,
|
||||
}
|
||||
|
||||
|
||||
@@ -17,6 +17,12 @@ import {
|
||||
} from '../../lib/backlog.js'
|
||||
import { useBacklog } from '../../lib/use-backlog.js'
|
||||
import { useCapacity } from '../../lib/use-capacity.js'
|
||||
import { depsGraphView } from '../../lib/views/deps-graph.js'
|
||||
import { ganttView } from '../../lib/views/gantt-view.js'
|
||||
import { inboxView } from '../../lib/views/inbox-view.js'
|
||||
import { issueDetailView } from '../../lib/views/issue-detail.js'
|
||||
import type { ProjectData } from '../../lib/views/project-data.js'
|
||||
import { standupView } from '../../lib/views/standup-view.js'
|
||||
import { PrimitivesGallery } from '../gallery.js'
|
||||
import { BoardScreen } from '../screens/board-screen.js'
|
||||
import { CalibrationScreen } from '../screens/calibration-screen.js'
|
||||
@@ -100,7 +106,9 @@ export function AppShell() {
|
||||
const [readIds, setReadIds] = useState<number[]>([])
|
||||
const [milestoneId, setMilestoneId] = useState<number | null>(null)
|
||||
const [gate, setGate] = useState<'checking' | 'connect' | 'ready'>('checking')
|
||||
const [demo, setDemo] = useState(false)
|
||||
const [pubConfig, setPubConfig] = useState<PublicConfig | null>(null)
|
||||
const [collaborators, setCollaborators] = useState<{ login: string; name: string }[]>([])
|
||||
const [backlog, refetchBacklog] = useBacklog()
|
||||
const capacityMembers = useCapacity()
|
||||
const workers = capacityWorkers(capacityMembers)
|
||||
@@ -132,6 +140,41 @@ export function AppShell() {
|
||||
) ?? undefined)
|
||||
: undefined
|
||||
|
||||
// The uniform input every real-data view builder consumes. Assembled once from
|
||||
// the reconciled backlog + capacity; undefined until the first reconcile lands.
|
||||
const projectData: ProjectData | undefined =
|
||||
backlog.status === 'ready'
|
||||
? {
|
||||
issues: backlog.issues,
|
||||
milestones: backlog.milestones,
|
||||
deps: backlog.deps,
|
||||
timelines: backlog.timelines,
|
||||
calibration: calibration?.model,
|
||||
workers,
|
||||
today: new Date(),
|
||||
}
|
||||
: undefined
|
||||
const issueDetail =
|
||||
projectData && issue ? (issueDetailView(issue.id, projectData) ?? undefined) : undefined
|
||||
const standup = projectData ? standupView(projectData) : undefined
|
||||
const inbox = projectData ? inboxView(projectData) : undefined
|
||||
const gantt = projectData ? ganttView(projectData) : undefined
|
||||
const depsGraph = projectData ? depsGraphView(projectData) : undefined
|
||||
// The rail's unread badge tracks the real inbox once reconciled (still-unread
|
||||
// minus what's been opened); demo shows the fixture count.
|
||||
const inboxUnread = inbox
|
||||
? inbox.filter((n) => n.unread && !readIds.includes(n.id)).length
|
||||
: INBOX_UNREAD
|
||||
|
||||
// The real connected host (from the saved config), for the rail's status line.
|
||||
const hostLabel = (() => {
|
||||
try {
|
||||
return pubConfig?.baseUrl ? new URL(pubConfig.baseUrl).host : 'gitea'
|
||||
} catch {
|
||||
return pubConfig?.baseUrl ?? 'gitea'
|
||||
}
|
||||
})()
|
||||
|
||||
useEffect(() => {
|
||||
document.documentElement.setAttribute('data-theme', dark ? 'dark' : 'light')
|
||||
}, [dark])
|
||||
@@ -141,14 +184,34 @@ export function AppShell() {
|
||||
useEffect(() => {
|
||||
window.commitea.gitea
|
||||
.status()
|
||||
.then((s) => setGate(s.demo || s.configured ? 'ready' : 'connect'))
|
||||
.then((s) => {
|
||||
setDemo(s.demo)
|
||||
setGate(s.demo || s.configured ? 'ready' : 'connect')
|
||||
})
|
||||
.catch(() => setGate('connect'))
|
||||
window.commitea.config.get().then(setPubConfig).catch(() => {})
|
||||
// Assignable people for the Adjust dialog's assignee picker (empty when demo/unconfigured).
|
||||
window.commitea.gitea.collaborators().then(setCollaborators).catch(() => {})
|
||||
}, [])
|
||||
|
||||
// The open issue's current assignee + milestone (from the reconciled backlog),
|
||||
// so the Adjust dialog can preselect and diff them. Milestones list feeds its picker.
|
||||
const currentIssue =
|
||||
backlog.status === 'ready' && issue ? backlog.issues.find((i) => i.number === issue.id) : undefined
|
||||
const milestoneOptions =
|
||||
backlog.status === 'ready' ? backlog.milestones.map((m) => ({ id: m.id, title: m.title })) : []
|
||||
|
||||
const openIssue = (ref: IssueRef) => {
|
||||
if (view !== 'issue') setPrevView(view)
|
||||
setIssue(ref)
|
||||
// Callers into the sidecar (e.g. a "blocks #N" chip) may know only the id.
|
||||
// Backfill the real title + labels from the reconciled backlog so the header
|
||||
// isn't blank; fall back to whatever the caller passed (demo fixtures).
|
||||
let full = ref
|
||||
if (backlog.status === 'ready' && (!ref.title || !ref.labels)) {
|
||||
const found = backlog.issues.find((i) => i.number === ref.id)
|
||||
if (found) full = { ...ref, id: found.number, title: found.title, labels: found.labels }
|
||||
}
|
||||
setIssue(full)
|
||||
setView('issue')
|
||||
}
|
||||
|
||||
@@ -166,7 +229,7 @@ export function AppShell() {
|
||||
const NAV: NavEntry[] = [
|
||||
{ id: 'standup', label: 'Standup', icon: 'sun' },
|
||||
{ id: 'focus', label: 'Morning service', icon: 'coffee' },
|
||||
{ id: 'inbox', label: 'Inbox', icon: 'bell', count: INBOX_UNREAD || null },
|
||||
{ id: 'inbox', label: 'Inbox', icon: 'bell', count: inboxUnread || null },
|
||||
{ id: 'capture', label: 'Capture', icon: 'plus' },
|
||||
{ id: 'board', label: 'The pot', icon: 'square-kanban' },
|
||||
{ id: 'runway', label: 'Runway', icon: 'chart-line' },
|
||||
@@ -224,12 +287,14 @@ export function AppShell() {
|
||||
case 'focus':
|
||||
return <FocusScreen onOpenIssue={openIssue} focus={focus} forecast={forecast} />
|
||||
case 'standup':
|
||||
return <StandupScreen onBegin={() => setView('focus')} onOpenIssue={openIssue} />
|
||||
return <StandupScreen onBegin={() => setView('focus')} onOpenIssue={openIssue} data={standup} />
|
||||
case 'board':
|
||||
return (
|
||||
<BoardScreen
|
||||
onOpenIssue={openIssue}
|
||||
columns={boardColumns}
|
||||
gantt={gantt}
|
||||
deps={depsGraph}
|
||||
loading={backlog.status === 'loading'}
|
||||
/>
|
||||
)
|
||||
@@ -265,6 +330,7 @@ export function AppShell() {
|
||||
onOpenDirectives={() => setView('directives')}
|
||||
readIds={readIds}
|
||||
setReadIds={setReadIds}
|
||||
data={inbox}
|
||||
/>
|
||||
)
|
||||
case 'capture':
|
||||
@@ -290,10 +356,15 @@ export function AppShell() {
|
||||
return issue ? (
|
||||
<IssueScreen
|
||||
issue={issue}
|
||||
detail={issueDetail}
|
||||
onBack={() => setView(prevView)}
|
||||
onOpenIssue={openIssue}
|
||||
canWrite={backlog.status === 'ready'}
|
||||
onApplyChange={applyChange}
|
||||
collaborators={collaborators}
|
||||
milestones={milestoneOptions}
|
||||
currentAssignee={currentIssue?.assignee ?? null}
|
||||
currentMilestoneId={currentIssue?.milestone?.id ?? null}
|
||||
/>
|
||||
) : null
|
||||
case 'states':
|
||||
@@ -364,9 +435,15 @@ export function AppShell() {
|
||||
|
||||
<div style={{ borderTop: '1px solid var(--line-1)', margin: '10px 8px' }} />
|
||||
<NavItem item={{ id: 'settings', label: 'Settings', icon: 'settings-2' }} />
|
||||
<NavItem item={{ id: 'firstrun', label: 'First run', icon: 'play' }} />
|
||||
<NavItem item={{ id: 'states', label: 'States', icon: 'circle-dashed' }} />
|
||||
<NavItem item={{ id: 'primitives', label: 'Primitives', icon: 'layers' }} />
|
||||
{/* Dev-only surfaces (fixture galleries / onboarding preview) — shown in dev
|
||||
and in demo/e2e mode; hidden in a real configured, packaged app. */}
|
||||
{import.meta.env.DEV || demo ? (
|
||||
<>
|
||||
<NavItem item={{ id: 'firstrun', label: 'First run', icon: 'play' }} />
|
||||
<NavItem item={{ id: 'states', label: 'States', icon: 'circle-dashed' }} />
|
||||
<NavItem item={{ id: 'primitives', label: 'Primitives', icon: 'layers' }} />
|
||||
</>
|
||||
) : null}
|
||||
|
||||
<div style={{ marginTop: 'auto', padding: '0 12px', display: 'flex', flexDirection: 'column', gap: 12 }}>
|
||||
<button
|
||||
@@ -396,7 +473,7 @@ export function AppShell() {
|
||||
display: 'inline-block',
|
||||
}}
|
||||
/>
|
||||
gitea.stephenmann.io
|
||||
{hostLabel}
|
||||
</button>
|
||||
<Switch
|
||||
label={<span style={{ font: 'var(--text-caption)' }}>Evening service</span>}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React, { useEffect, useRef, useState } from 'react'
|
||||
|
||||
import { describeChange, type IssueChange } from '@commitea/core'
|
||||
import type { IssueChange } from '@commitea/core'
|
||||
|
||||
import { useChat } from '../../lib/use-chat.js'
|
||||
import { Button, Icon, IconButton } from '../ui/index.js'
|
||||
@@ -127,7 +127,7 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
|
||||
<div style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', textTransform: 'uppercase', letterSpacing: 'var(--letter-spacing-wide)' }}>
|
||||
Proposed · #{p.change.issue}
|
||||
</div>
|
||||
<div style={{ font: '500 13px var(--font-mono)', color: 'var(--ink-1)' }}>{describeChange(p.plan)}</div>
|
||||
<div style={{ font: '500 13px var(--font-mono)', color: 'var(--ink-1)' }}>{p.summary}</div>
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<Button size="sm" onClick={() => approve(p)} disabled={offline}>
|
||||
Approve
|
||||
|
||||
4
apps/desktop/src/renderer/src/global.d.ts
vendored
4
apps/desktop/src/renderer/src/global.d.ts
vendored
@@ -17,7 +17,8 @@ import type {
|
||||
/** The result of a write through the bridge. */
|
||||
export type ApplyChangeResult =
|
||||
| { ok: false; reason: 'unconfigured' }
|
||||
| { ok: true; plan: LabelPlan; issue: GiteaIssue }
|
||||
// `plan` is present for label swaps (est/p); absent for field writes (assign, milestone).
|
||||
| { ok: true; plan?: LabelPlan; issue: GiteaIssue }
|
||||
|
||||
/** The result of filing captured issues. */
|
||||
export type CreateIssuesResult =
|
||||
@@ -85,6 +86,7 @@ export interface GiteaBridge {
|
||||
getIssue(index: number): Promise<GiteaIssue | null>
|
||||
applyChange(change: IssueChange): Promise<ApplyChangeResult>
|
||||
createIssues(issues: ProposedIssue[]): Promise<CreateIssuesResult>
|
||||
collaborators(): Promise<{ login: string; name: string }[]>
|
||||
}
|
||||
|
||||
/** One agent turn's result. */
|
||||
|
||||
@@ -133,14 +133,13 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
|
||||
(p: ChangeProposal) => {
|
||||
if (!onApplyChange) return
|
||||
drop(p)
|
||||
const label = p.plan.added[0] ?? p.plan.removed[0] ?? 'change'
|
||||
void onApplyChange(p.change).then((res) => {
|
||||
setConvo((c) => [
|
||||
...c,
|
||||
{
|
||||
from: 'agent',
|
||||
text: res.ok
|
||||
? `Done — #${p.change.issue} is now ${label}. The plan's been re-run.`
|
||||
? `Done — #${p.change.issue}: ${p.summary}. The plan's been re-run.`
|
||||
: `That didn't take — #${p.change.issue} is unchanged.`,
|
||||
},
|
||||
])
|
||||
|
||||
195
apps/desktop/src/renderer/src/lib/views/deps-graph.ts
Normal file
195
apps/desktop/src/renderer/src/lib/views/deps-graph.ts
Normal file
@@ -0,0 +1,195 @@
|
||||
import { inferLifecycle, schedule } from '@commitea/core'
|
||||
|
||||
import type { DepEdge, DepNode, DepsData } from '../../data/fixtures.js'
|
||||
import { formatShort } from '../dates.js'
|
||||
import type { ProjectData } from './project-data.js'
|
||||
|
||||
/** Copy of backlog.ts's private toSchedulable — open issues → scheduler input. Not exported there. */
|
||||
function toSchedulable(issues: ProjectData['issues']) {
|
||||
return issues
|
||||
.filter((i) => i.state === 'open')
|
||||
.map((i) => ({
|
||||
number: i.number,
|
||||
title: i.title,
|
||||
labels: i.labels,
|
||||
estimateDays: i.facts.estimateDays,
|
||||
priority: i.facts.priority,
|
||||
assignee: i.assignee,
|
||||
}))
|
||||
}
|
||||
|
||||
function median(values: number[]): number {
|
||||
if (values.length === 0) return 0
|
||||
const sorted = [...values].sort((a, b) => a - b)
|
||||
const mid = Math.floor(sorted.length / 2)
|
||||
return sorted.length % 2 ? sorted[mid] : (sorted[mid - 1] + sorted[mid]) / 2
|
||||
}
|
||||
|
||||
/**
|
||||
* Real Deps-graph view: dependency topology of every issue that appears in a
|
||||
* real gitea dependency edge, laid out into columns (longest dependency depth)
|
||||
* and rows (index within its column, ordered by issue number). Critical path
|
||||
* comes from the deterministic scheduler over the open backlog — closed issues
|
||||
* never schedule, so they can't be critical, which is honest (they're done).
|
||||
* The milestone node is the open milestone with the most open in-scope issues;
|
||||
* when nothing links to a real milestone we fall back to the first open one,
|
||||
* then to a bare '—' placeholder — never a fabricated name/date.
|
||||
*/
|
||||
export function depsGraphView(d: ProjectData): DepsData {
|
||||
const byNumber = new Map(d.issues.map((i) => [i.number, i]))
|
||||
|
||||
// Participating set: anything that shows up as either end of a real edge,
|
||||
// restricted to issues we actually have (dangling refs to unknown issues
|
||||
// are dropped — nothing honest to draw for them).
|
||||
const participating = new Set<number>()
|
||||
for (const e of d.deps) {
|
||||
if (byNumber.has(e.issue)) participating.add(e.issue)
|
||||
if (byNumber.has(e.dependsOn)) participating.add(e.dependsOn)
|
||||
}
|
||||
|
||||
if (participating.size === 0) {
|
||||
const fallback = d.milestones.find((m) => m.state === 'open')
|
||||
return {
|
||||
nodes: [],
|
||||
milestone: fallback
|
||||
? { name: fallback.title, due: fallback.dueOn ? formatShort(new Date(fallback.dueOn)) : 'no date', col: 0, row: 0 }
|
||||
: { name: '—', due: 'no date', col: 0, row: 0 },
|
||||
edges: [],
|
||||
critical: [],
|
||||
unattached: [],
|
||||
}
|
||||
}
|
||||
|
||||
// In-scope deps: both endpoints participating.
|
||||
const depsMap = new Map<number, number[]>() // issue -> its dependencies
|
||||
const dependentsMap = new Map<number, number[]>() // issue -> who depends on it
|
||||
for (const id of participating) {
|
||||
depsMap.set(id, [])
|
||||
dependentsMap.set(id, [])
|
||||
}
|
||||
for (const e of d.deps) {
|
||||
if (participating.has(e.issue) && participating.has(e.dependsOn)) {
|
||||
depsMap.get(e.issue)!.push(e.dependsOn)
|
||||
dependentsMap.get(e.dependsOn)!.push(e.issue)
|
||||
}
|
||||
}
|
||||
|
||||
// Column = longest dependency depth. Cycle-guarded (shouldn't happen — real
|
||||
// gitea deps are DAG-shaped in practice — but recursion must not hang).
|
||||
const colMemo = new Map<number, number>()
|
||||
function colOf(id: number, visiting: Set<number>): number {
|
||||
const cached = colMemo.get(id)
|
||||
if (cached != null) return cached
|
||||
if (visiting.has(id)) return 0 // cycle guard: treat as a root
|
||||
visiting.add(id)
|
||||
const deps = depsMap.get(id) ?? []
|
||||
const col = deps.length === 0 ? 0 : 1 + Math.max(...deps.map((dep) => colOf(dep, visiting)))
|
||||
visiting.delete(id)
|
||||
colMemo.set(id, col)
|
||||
return col
|
||||
}
|
||||
for (const id of participating) colOf(id, new Set())
|
||||
|
||||
// Row = index within column, ordered deterministically by issue number.
|
||||
const byCol = new Map<number, number[]>()
|
||||
for (const id of participating) {
|
||||
const col = colMemo.get(id)!
|
||||
if (!byCol.has(col)) byCol.set(col, [])
|
||||
byCol.get(col)!.push(id)
|
||||
}
|
||||
const rowOf = new Map<number, number>()
|
||||
for (const ids of byCol.values()) {
|
||||
ids.sort((a, b) => a - b)
|
||||
ids.forEach((id, i) => rowOf.set(id, i))
|
||||
}
|
||||
|
||||
const maxCol = Math.max(...[...colMemo.values()])
|
||||
|
||||
// Critical path from the real scheduler over the open backlog.
|
||||
const plan = schedule(toSchedulable(d.issues), d.deps)
|
||||
const critical = new Set(plan.items.filter((i) => i.critical).map((i) => i.number))
|
||||
const scheduledByNumber = new Map(plan.items.map((i) => [i.number, i]))
|
||||
|
||||
const nodes: DepNode[] = [...participating].sort((a, b) => a - b).map((id) => {
|
||||
const issue = byNumber.get(id)!
|
||||
const inf = inferLifecycle(issue, d.timelines[id] ?? [], d.today)
|
||||
const scheduled = scheduledByNumber.get(id)
|
||||
return {
|
||||
id,
|
||||
title: issue.title,
|
||||
tags: issue.labels,
|
||||
state: inf.column,
|
||||
days: inf.steepingDays != null ? `${inf.steepingDays}d` : undefined,
|
||||
col: colMemo.get(id)!,
|
||||
row: rowOf.get(id)!,
|
||||
// Reuse the scheduler's own rationale where one exists (open issues
|
||||
// only) — never invented commentary for closed/unscheduled nodes.
|
||||
rationale: scheduled?.rationale,
|
||||
}
|
||||
})
|
||||
|
||||
// Nearest open milestone with the most open in-scope issues.
|
||||
const openMilestones = d.milestones.filter((m) => m.state === 'open')
|
||||
let chosenMilestoneId: number | null = null
|
||||
let milestone: DepsData['milestone']
|
||||
const medianRow = median(nodes.map((n) => n.row))
|
||||
if (openMilestones.length === 0) {
|
||||
milestone = { name: '—', due: 'no date', col: maxCol + 1, row: medianRow }
|
||||
} else {
|
||||
let best: { id: number; title: string; dueOn: string | null | undefined; count: number } | null = null
|
||||
for (const m of openMilestones) {
|
||||
const count = [...participating].filter((id) => {
|
||||
const issue = byNumber.get(id)!
|
||||
return issue.milestone?.id === m.id && issue.state === 'open'
|
||||
}).length
|
||||
if (
|
||||
best === null ||
|
||||
count > best.count ||
|
||||
(count === best.count && dueRank(m.dueOn) < dueRank(best.dueOn))
|
||||
) {
|
||||
best = { id: m.id, title: m.title, dueOn: m.dueOn, count }
|
||||
}
|
||||
}
|
||||
// best is non-null since openMilestones.length > 0
|
||||
chosenMilestoneId = best!.count > 0 ? best!.id : null
|
||||
milestone = {
|
||||
name: best!.title,
|
||||
due: best!.dueOn ? formatShort(new Date(best!.dueOn)) : 'no date',
|
||||
col: maxCol + 1,
|
||||
row: medianRow,
|
||||
}
|
||||
}
|
||||
|
||||
const edges: DepEdge[] = []
|
||||
for (const e of d.deps) {
|
||||
if (!participating.has(e.issue) || !participating.has(e.dependsOn)) continue
|
||||
const crit = critical.has(e.dependsOn) && critical.has(e.issue)
|
||||
edges.push(crit ? { from: e.dependsOn, to: e.issue, crit: true } : { from: e.dependsOn, to: e.issue })
|
||||
}
|
||||
|
||||
// Terminal nodes (nothing in scope depends on them) that belong to the
|
||||
// chosen milestone's scope get an edge into it.
|
||||
if (chosenMilestoneId != null) {
|
||||
for (const id of participating) {
|
||||
const dependents = dependentsMap.get(id) ?? []
|
||||
if (dependents.length > 0) continue
|
||||
const issue = byNumber.get(id)!
|
||||
if (issue.milestone?.id !== chosenMilestoneId) continue
|
||||
edges.push(critical.has(id) ? { from: id, to: 'ms', crit: true } : { from: id, to: 'ms' })
|
||||
}
|
||||
}
|
||||
|
||||
const linked = new Set<number>()
|
||||
for (const e of edges) {
|
||||
linked.add(e.from)
|
||||
if (e.to !== 'ms') linked.add(e.to)
|
||||
}
|
||||
const unattached = [...participating].filter((id) => !linked.has(id)).sort((a, b) => a - b)
|
||||
|
||||
return { nodes, milestone, edges, critical: [...critical], unattached }
|
||||
}
|
||||
|
||||
/** Rank a due date for "nearest" comparisons; undated milestones sort last. */
|
||||
function dueRank(dueOn: string | null | undefined): number {
|
||||
return dueOn ? new Date(dueOn).getTime() : Number.POSITIVE_INFINITY
|
||||
}
|
||||
130
apps/desktop/src/renderer/src/lib/views/gantt-view.ts
Normal file
130
apps/desktop/src/renderer/src/lib/views/gantt-view.ts
Normal file
@@ -0,0 +1,130 @@
|
||||
import { forecast, inferLifecycle, scheduleWithCapacity, workingDaysBetween } from '@commitea/core'
|
||||
|
||||
import type { GanttData, GanttRow, GanttWeek } from '../../data/fixtures.js'
|
||||
import { addWorkingDays, formatShort } from '../dates.js'
|
||||
import type { ProjectData } from './project-data.js'
|
||||
|
||||
/** Same 2-char scheme as backlog.ts's `initials()`; copied inline (not exported there). */
|
||||
function initials(login: string): string {
|
||||
return login.slice(0, 2).toUpperCase()
|
||||
}
|
||||
|
||||
/** Copy of backlog.ts's private `toSchedulable` — not exported, so mirrored here. */
|
||||
function toSchedulable(issues: ProjectData['issues']) {
|
||||
return issues
|
||||
.filter((i) => i.state === 'open')
|
||||
.map((i) => ({
|
||||
number: i.number,
|
||||
title: i.title,
|
||||
labels: i.labels,
|
||||
estimateDays: i.facts.estimateDays,
|
||||
priority: i.facts.priority,
|
||||
assignee: i.assignee,
|
||||
}))
|
||||
}
|
||||
|
||||
const roundUpToWeek = (n: number): number => Math.ceil(Math.max(n, 1) / 7) * 7
|
||||
|
||||
/**
|
||||
* Real Gantt: the capacity-aware scheduler's lane layout over the open backlog
|
||||
* (startDay/endDay/critical/worker) — the SAME layout the Monte Carlo forecast
|
||||
* runs each trial on, so the bars you see match what's forecast. Plus a handful
|
||||
* of recently-closed issues shown as already-done bars. No per-issue Monte Carlo
|
||||
* exists at this grain, so `p80` is a rough single-issue buffer (endDay padded by
|
||||
* half its own duration) rather than a simulated percentile — flagged below.
|
||||
*/
|
||||
export function ganttView(d: ProjectData): GanttData {
|
||||
const plan = scheduleWithCapacity(toSchedulable(d.issues), d.deps, d.workers)
|
||||
const issueByNumber = new Map(d.issues.map((i) => [i.number, i]))
|
||||
|
||||
const scheduledRows: GanttRow[] = plan.items.map((item) => {
|
||||
const issue = issueByNumber.get(item.number)
|
||||
const inf = issue ? inferLifecycle(issue, d.timelines[item.number] ?? [], d.today) : null
|
||||
const state: GanttRow['state'] =
|
||||
inf?.column === 'done' ? 'done' : inf?.column === 'steeping' ? 'steeping' : inf?.column === 'review' ? 'review' : 'scheduled'
|
||||
return {
|
||||
id: item.number,
|
||||
title: item.title,
|
||||
// The lane it actually landed on (capacity-aware) — falls back to the
|
||||
// assignee, then blank, so an unassigned issue shows the lane doing it.
|
||||
who: initials(item.worker ?? issue?.assignee ?? ''),
|
||||
start: item.startDay,
|
||||
end: item.endDay,
|
||||
crit: item.critical,
|
||||
state,
|
||||
// Rough single-issue buffer (no Monte Carlo at this grain): pad the end
|
||||
// by half its own duration as a stand-in p80.
|
||||
p80: Math.ceil(item.endDay + (item.endDay - item.startDay) * 0.5),
|
||||
}
|
||||
})
|
||||
|
||||
// Recently-closed issues (closed within ~14 calendar days) as already-done bars.
|
||||
const doneRows: GanttRow[] = d.issues
|
||||
.filter((i) => {
|
||||
if (i.state !== 'closed' || !i.closedAt) return false
|
||||
const ageDays = (d.today.getTime() - new Date(i.closedAt).getTime()) / (24 * 60 * 60 * 1000)
|
||||
return ageDays >= 0 && ageDays <= 14
|
||||
})
|
||||
.map((i) => ({
|
||||
id: i.number,
|
||||
title: i.title,
|
||||
who: initials(i.assignee ?? ''),
|
||||
start: 0,
|
||||
end: 1,
|
||||
state: 'done' as const,
|
||||
}))
|
||||
|
||||
const rows = [...doneRows, ...scheduledRows]
|
||||
|
||||
// Nearest open milestone with a due date, for the horizon + `due` marker.
|
||||
const dueCandidates = d.milestones
|
||||
.filter((m) => m.state === 'open' && m.dueOn)
|
||||
.map((m) => ({ m, day: Math.max(0, workingDaysBetween(d.today, new Date(m.dueOn as string))) }))
|
||||
.sort((a, b) => a.day - b.day)
|
||||
const nearestDue = dueCandidates[0] ?? null
|
||||
|
||||
const days = roundUpToWeek(Math.max(7, ...rows.map((r) => r.end), nearestDue?.day ?? 0))
|
||||
|
||||
const weeks: GanttWeek[] = []
|
||||
for (let at = 0; at <= days; at += 7) {
|
||||
weeks.push({ at, label: formatShort(addWorkingDays(d.today, at)) })
|
||||
}
|
||||
|
||||
const due = nearestDue
|
||||
? { at: nearestDue.day, label: `${nearestDue.m.title} due` }
|
||||
: { at: days, label: 'horizon' }
|
||||
|
||||
// 80% window: forecast the nearest open milestone's open scope, if any has
|
||||
// one; otherwise fall back to a generic band over the last third of the
|
||||
// horizon (no milestone scope to anchor it to).
|
||||
const open = d.issues.filter((i) => i.state === 'open')
|
||||
const milestoneWithScope = d.milestones
|
||||
.filter((m) => m.state === 'open')
|
||||
.map((m) => ({ m, scope: open.filter((i) => i.milestone?.id === m.id) }))
|
||||
.filter((x) => x.scope.length > 0)
|
||||
.sort((a, b) => {
|
||||
const da = a.m.dueOn ? workingDaysBetween(d.today, new Date(a.m.dueOn)) : Number.POSITIVE_INFINITY
|
||||
const db = b.m.dueOn ? workingDaysBetween(d.today, new Date(b.m.dueOn)) : Number.POSITIVE_INFINITY
|
||||
return da - db
|
||||
})[0]
|
||||
|
||||
let band: GanttData['band']
|
||||
if (milestoneWithScope) {
|
||||
const f = forecast(toSchedulable(milestoneWithScope.scope), d.deps, { workers: d.workers })
|
||||
const p90 = f.curve.length ? f.curve[f.curve.length - 1].p90Day : f.p95Day
|
||||
band = { from: Math.round(f.p50Day), to: Math.round(p90), label: '80% window' }
|
||||
} else {
|
||||
// No milestone with open scope to anchor a real forecast to — degrade to
|
||||
// a generic band over the last third of the horizon.
|
||||
band = { from: Math.round((days * 2) / 3), to: days, label: '80% window' }
|
||||
}
|
||||
|
||||
return {
|
||||
days,
|
||||
weeks,
|
||||
today: 0,
|
||||
band,
|
||||
due,
|
||||
rows,
|
||||
}
|
||||
}
|
||||
112
apps/desktop/src/renderer/src/lib/views/inbox-view.ts
Normal file
112
apps/desktop/src/renderer/src/lib/views/inbox-view.ts
Normal file
@@ -0,0 +1,112 @@
|
||||
import { inferLifecycle } from '@commitea/core'
|
||||
|
||||
import type { InboxItem } from '../../data/fixtures.js'
|
||||
import type { ProjectData } from './project-data.js'
|
||||
|
||||
const CLOSED_CAP = 5
|
||||
const TOTAL_CAP = 12
|
||||
|
||||
/** "HH:MM" from an ISO timestamp; '—' when absent (never fabricated). */
|
||||
function hhmm(iso: string | null | undefined): string {
|
||||
if (!iso) return '—'
|
||||
const d = new Date(iso)
|
||||
const hh = String(d.getHours()).padStart(2, '0')
|
||||
const mm = String(d.getMinutes()).padStart(2, '0')
|
||||
return `${hh}:${mm}`
|
||||
}
|
||||
|
||||
/**
|
||||
* Real Inbox feed: steeping nags, review-waiting issues, recently-closed
|
||||
* issues, and closed milestones — all derived straight from the reconciled
|
||||
* backlog + inferred lifecycle. No mentions, no outages, no people-activity:
|
||||
* ProjectData carries none of that, so those fixture item `type`s never
|
||||
* appear here (an honest degrade, not an oversight).
|
||||
*/
|
||||
export function inboxView(d: ProjectData): InboxItem[] {
|
||||
const items: InboxItem[] = []
|
||||
let id = 1
|
||||
|
||||
const open = d.issues.filter((i) => i.state === 'open')
|
||||
|
||||
// 1. Steeping nags — open issues that have sat past first-commit for 2+ working days.
|
||||
for (const issue of open) {
|
||||
const inf = inferLifecycle(issue, d.timelines[issue.number] ?? [], d.today)
|
||||
if (inf.steepingDays == null || inf.steepingDays < 2) continue
|
||||
const blocks = d.deps.filter((e) => e.dependsOn === issue.number).map((e) => e.issue)
|
||||
items.push({
|
||||
id: id++,
|
||||
day: 'Today',
|
||||
type: 'nag',
|
||||
icon: 'clock',
|
||||
tone: 'warn',
|
||||
text: `#${issue.number} is steeping · ${inf.steepingDays}d`,
|
||||
detail: blocks.length ? `blocks ${blocks.map((b) => `#${b}`).join(' and ')}` : 'worth a look',
|
||||
time: hhmm(inf.stages.steeping),
|
||||
unread: true,
|
||||
issue: { id: issue.number, title: issue.title, labels: issue.labels, days: `${inf.steepingDays}d` },
|
||||
})
|
||||
}
|
||||
|
||||
// 2. Review-waiting — open issues whose lifecycle has reached the review column.
|
||||
for (const issue of open) {
|
||||
const inf = inferLifecycle(issue, d.timelines[issue.number] ?? [], d.today)
|
||||
if (inf.column !== 'review') continue
|
||||
items.push({
|
||||
id: id++,
|
||||
day: 'Today',
|
||||
type: 'review',
|
||||
icon: 'git-pull-request',
|
||||
tone: 'info',
|
||||
text: `#${issue.number} awaits review`,
|
||||
detail: issue.title,
|
||||
time: hhmm(inf.stages.review),
|
||||
unread: true,
|
||||
issue: { id: issue.number, title: issue.title, labels: issue.labels },
|
||||
})
|
||||
}
|
||||
|
||||
// 3. Recently shipped — closed issues, newest close first, capped.
|
||||
const closed = d.issues
|
||||
.filter((i) => i.state === 'closed')
|
||||
.slice()
|
||||
.sort((a, b) => {
|
||||
const at = a.closedAt ? new Date(a.closedAt).getTime() : -Infinity
|
||||
const bt = b.closedAt ? new Date(b.closedAt).getTime() : -Infinity
|
||||
return bt - at
|
||||
})
|
||||
.slice(0, CLOSED_CAP)
|
||||
for (const issue of closed) {
|
||||
items.push({
|
||||
id: id++,
|
||||
day: 'Yesterday',
|
||||
type: 'milestone',
|
||||
icon: 'circle-check',
|
||||
tone: 'ok',
|
||||
text: `#${issue.number} shipped`,
|
||||
detail: issue.title,
|
||||
time: hhmm(issue.closedAt),
|
||||
unread: false,
|
||||
issue: { id: issue.number, title: issue.title, labels: issue.labels },
|
||||
})
|
||||
}
|
||||
|
||||
// 4. Milestone completion — milestones gitea reports as closed.
|
||||
for (const m of d.milestones) {
|
||||
if (m.state !== 'closed') continue
|
||||
items.push({
|
||||
id: id++,
|
||||
day: 'Earlier',
|
||||
type: 'milestone',
|
||||
icon: 'milestone',
|
||||
tone: 'ok',
|
||||
// No milestone-close timestamp is available on GiteaMilestone, so time is
|
||||
// left at the honest placeholder rather than borrowed from an issue.
|
||||
text: `${m.title} closed`,
|
||||
detail: 'milestone complete',
|
||||
time: '—',
|
||||
unread: false,
|
||||
})
|
||||
}
|
||||
|
||||
return items.slice(0, TOTAL_CAP)
|
||||
}
|
||||
72
apps/desktop/src/renderer/src/lib/views/issue-detail.ts
Normal file
72
apps/desktop/src/renderer/src/lib/views/issue-detail.ts
Normal file
@@ -0,0 +1,72 @@
|
||||
import {
|
||||
forecast,
|
||||
inferLifecycle,
|
||||
type LifecycleStages,
|
||||
toDurationModel,
|
||||
} from '@commitea/core'
|
||||
|
||||
import type { IssueDetail } from '../../data/fixtures.js'
|
||||
import { addWorkingDays, formatRange, formatShort } from '../dates.js'
|
||||
import type { ProjectData } from './project-data.js'
|
||||
|
||||
const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
|
||||
|
||||
/** "Feb 6 · 11:47" from an ISO timestamp; "pending" when absent. */
|
||||
function when(iso: string | undefined): string {
|
||||
if (!iso) return 'pending'
|
||||
const d = new Date(iso)
|
||||
const hh = String(d.getHours()).padStart(2, '0')
|
||||
const mm = String(d.getMinutes()).padStart(2, '0')
|
||||
return `${MONTHS[d.getMonth()]} ${d.getDate()} · ${hh}:${mm}`
|
||||
}
|
||||
|
||||
function lifecycle(stages: LifecycleStages): IssueDetail['lifecycle'] {
|
||||
return [
|
||||
{ stage: 'Diagnosis', event: 'issue opened', when: when(stages.opened), icon: 'circle-dot', done: true },
|
||||
{ stage: 'Triage', event: 'labeled / milestoned', when: when(stages.triaged), icon: 'tag', done: !!stages.triaged },
|
||||
{ stage: 'Work start', event: 'first commit ref', when: when(stages.steeping), icon: 'git-commit-horizontal', done: !!stages.steeping },
|
||||
{ stage: 'In review', event: 'PR referenced', when: when(stages.review), icon: 'git-merge', done: !!stages.review },
|
||||
{ stage: 'Complete', event: 'issue closed', when: when(stages.done), icon: 'circle-check', done: !!stages.done },
|
||||
]
|
||||
}
|
||||
|
||||
/**
|
||||
* Real Issue-detail sidecar: lifecycle timeline (from event inference), a
|
||||
* single-issue forecast range, and the real dependency edges. Returns null for
|
||||
* an unknown id → the screen shows the demo fixture. Comments aren't reconciled,
|
||||
* so they stay empty (the screen degrades gracefully).
|
||||
*/
|
||||
export function issueDetailView(id: number, d: ProjectData): IssueDetail | null {
|
||||
const issue = d.issues.find((i) => i.number === id)
|
||||
if (!issue) return null
|
||||
const inf = inferLifecycle(issue, d.timelines[id] ?? [], d.today)
|
||||
const blockedBy = d.deps.filter((e) => e.issue === id).map((e) => e.dependsOn)
|
||||
const blocks = d.deps.filter((e) => e.dependsOn === id).map((e) => e.issue)
|
||||
|
||||
let forecastLine = { p80: 'closed', note: 'shipped' }
|
||||
if (issue.state === 'open') {
|
||||
const f = forecast(
|
||||
[{ number: id, title: issue.title, labels: issue.labels, estimateDays: issue.facts.estimateDays, priority: issue.facts.priority, assignee: issue.assignee }],
|
||||
[],
|
||||
{ ...(d.calibration ? { model: toDurationModel(d.calibration) } : {}), workers: d.workers },
|
||||
)
|
||||
const p90 = f.curve.length ? f.curve[f.curve.length - 1].p90Day : f.p95Day
|
||||
forecastLine = {
|
||||
p80: `done ${formatRange(addWorkingDays(d.today, f.p50Day), addWorkingDays(d.today, p90))}`,
|
||||
note: d.calibration && !d.calibration.coldStart ? `from your history · n=${d.calibration.n}` : 'cold-start priors',
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
state: inf.column === 'review' ? 'review' : inf.column,
|
||||
assignee: issue.assignee ?? 'unassigned',
|
||||
milestone: issue.milestone?.title ?? '—',
|
||||
body: issue.body,
|
||||
comments: [],
|
||||
lifecycle: lifecycle(inf.stages),
|
||||
forecast: forecastLine,
|
||||
blocks,
|
||||
blockedBy,
|
||||
note: inf.steepingDays != null ? `Steeping ${inf.steepingDays}d.${blocks.length ? ` Blocks ${blocks.map((b) => `#${b}`).join(', ')}.` : ''}` : '',
|
||||
}
|
||||
}
|
||||
17
apps/desktop/src/renderer/src/lib/views/project-data.ts
Normal file
17
apps/desktop/src/renderer/src/lib/views/project-data.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import type { CalibrationModel, DependencyEdge, GiteaIssue, GiteaMilestone, LifecycleEvent, Worker } from '@commitea/core'
|
||||
|
||||
/**
|
||||
* The reconciled backlog + derived config that every real-data view builder
|
||||
* consumes. AppShell assembles it once from the backlog + capacity, so each
|
||||
* screen's builder gets a uniform input. `calibration`/`workers` are optional —
|
||||
* views degrade to cold-start / single-worker when absent.
|
||||
*/
|
||||
export interface ProjectData {
|
||||
issues: GiteaIssue[]
|
||||
milestones: GiteaMilestone[]
|
||||
deps: DependencyEdge[]
|
||||
timelines: Record<number, LifecycleEvent[]>
|
||||
calibration?: CalibrationModel
|
||||
workers: Worker[]
|
||||
today: Date
|
||||
}
|
||||
157
apps/desktop/src/renderer/src/lib/views/standup-view.ts
Normal file
157
apps/desktop/src/renderer/src/lib/views/standup-view.ts
Normal file
@@ -0,0 +1,157 @@
|
||||
import {
|
||||
type DependencyEdge,
|
||||
type GiteaIssue,
|
||||
inferLifecycle,
|
||||
schedule,
|
||||
type ScheduledItem,
|
||||
} from '@commitea/core'
|
||||
|
||||
import type { DriftItem, Nag, PlanItem, StandupData } from '../../data/fixtures.js'
|
||||
import type { ProjectData } from './project-data.js'
|
||||
|
||||
/** Same shape as backlog.ts's private toSchedulable — not exported there, so copied inline. */
|
||||
function toSchedulable(issues: GiteaIssue[]) {
|
||||
return issues
|
||||
.filter((i) => i.state === 'open')
|
||||
.map((i) => ({
|
||||
number: i.number,
|
||||
title: i.title,
|
||||
labels: i.labels,
|
||||
estimateDays: i.facts.estimateDays,
|
||||
priority: i.facts.priority,
|
||||
assignee: i.assignee,
|
||||
}))
|
||||
}
|
||||
|
||||
function whyFor(item: ScheduledItem): string {
|
||||
if (item.critical) return 'On the critical path.'
|
||||
if (item.blocks.length) return `Blocks ${item.blocks.map((b) => `#${b}`).join(', ')}.`
|
||||
return 'Next by dependency + priority order.'
|
||||
}
|
||||
|
||||
/**
|
||||
* Top scheduled pick per distinct assignee. Iterates the (already dependency-
|
||||
* + priority-ordered) plan once, keeping the first item seen per assignee —
|
||||
* that's their earliest-starting pick since the v0 scheduler lays out a single
|
||||
* serial lane (order ascending ⇒ startDay ascending). Ordered by `d.workers`
|
||||
* when present (assignees absent from the roster are appended after the named
|
||||
* workers; unassigned work last), else by discovery order. Capped at 4 people.
|
||||
*/
|
||||
function buildPlan(d: ProjectData, open: GiteaIssue[], items: ScheduledItem[]): PlanItem[] {
|
||||
const assigneeByNumber = new Map(open.map((i) => [i.number, i.assignee]))
|
||||
const firstPickByPerson = new Map<string, ScheduledItem>()
|
||||
for (const item of items) {
|
||||
const key = assigneeByNumber.get(item.number) ?? 'Unassigned'
|
||||
if (!firstPickByPerson.has(key)) firstPickByPerson.set(key, item)
|
||||
}
|
||||
|
||||
let order: string[]
|
||||
if (d.workers.length) {
|
||||
const workerOrder = d.workers.map((w) => w.person)
|
||||
const known = workerOrder.filter((p) => firstPickByPerson.has(p))
|
||||
const extra = [...firstPickByPerson.keys()].filter((k) => k !== 'Unassigned' && !workerOrder.includes(k))
|
||||
order = [...known, ...extra]
|
||||
if (firstPickByPerson.has('Unassigned')) order.push('Unassigned')
|
||||
} else {
|
||||
order = [...firstPickByPerson.keys()]
|
||||
}
|
||||
|
||||
return order.slice(0, 4).map((who) => {
|
||||
const item = firstPickByPerson.get(who)!
|
||||
return { who, pick: `#${item.number}`, title: item.title, why: whyFor(item) }
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* The single longest-steeping open issue (inferLifecycle's steepingDays, whole
|
||||
* working days since first commit ref). `blocks` comes from the scheduler's
|
||||
* in-scope dependents of that same issue. Falls back to a calm, honest nag
|
||||
* when nothing is currently steeping.
|
||||
*/
|
||||
function buildNag(d: ProjectData, open: GiteaIssue[], items: ScheduledItem[]): Nag {
|
||||
let worst: { issue: GiteaIssue; days: number } | null = null
|
||||
for (const issue of open) {
|
||||
const inf = inferLifecycle(issue, d.timelines[issue.number] ?? [], d.today)
|
||||
if (inf.steepingDays != null && (worst == null || inf.steepingDays > worst.days)) {
|
||||
worst = { issue, days: inf.steepingDays }
|
||||
}
|
||||
}
|
||||
if (!worst) {
|
||||
return { id: 0, days: '0d', blocks: [], text: 'Nothing is over-steeping. The pot is calm.' }
|
||||
}
|
||||
|
||||
const scheduled = items.find((it) => it.number === worst!.issue.number)
|
||||
const blocks = (scheduled?.blocks ?? []).map((n) => `#${n}`)
|
||||
const days = `${worst.days}d`
|
||||
return {
|
||||
id: worst.issue.number,
|
||||
days,
|
||||
blocks,
|
||||
text: `${days} steeping. ${blocks.length ? `Blocks ${blocks.join(', ')}.` : 'Worth a look.'}`,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Honest drift signals only — ProjectData carries no notification/webhook
|
||||
* stream, so drift is limited to what lifecycle inference can actually see:
|
||||
* open issues sitting in review (age isn't measurable from the data we have,
|
||||
* so every review-column issue is flagged rather than fabricating a duration)
|
||||
* and open issues steeping past their own estimate. Sorted most-severe first
|
||||
* (steeping overage ranks by days over estimate; review-sitting is a flat,
|
||||
* lower severity since it has no measured age) and capped at 4.
|
||||
*/
|
||||
function buildDrift(d: ProjectData, open: GiteaIssue[]): DriftItem[] {
|
||||
const candidates: (DriftItem & { severity: number })[] = []
|
||||
for (const issue of open) {
|
||||
const inf = inferLifecycle(issue, d.timelines[issue.number] ?? [], d.today)
|
||||
if (inf.column === 'review') {
|
||||
candidates.push({
|
||||
tone: 'warn',
|
||||
text: `#${issue.number} ${issue.title} is sitting in review.`,
|
||||
delta: 'idle in review',
|
||||
severity: 1,
|
||||
})
|
||||
}
|
||||
if (inf.steepingDays != null) {
|
||||
const est = issue.facts.estimateDays ?? 2
|
||||
if (inf.steepingDays > est) {
|
||||
candidates.push({
|
||||
tone: 'warn',
|
||||
text: `#${issue.number} ${issue.title} has steeped past its estimate.`,
|
||||
delta: `${inf.steepingDays}d vs ${est}d est`,
|
||||
severity: inf.steepingDays - est + 1,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
return candidates
|
||||
.sort((a, b) => b.severity - a.severity)
|
||||
.slice(0, 4)
|
||||
.map(({ tone, text, delta }) => ({ tone, text, delta }))
|
||||
}
|
||||
|
||||
/**
|
||||
* Morning-standup sidecar: per-person top pick from the deterministic
|
||||
* scheduler, the single longest-steeping issue as the day's nag, and drift
|
||||
* limited to real lifecycle anomalies (review-sitting, steeping-past-estimate).
|
||||
* Never throws — an empty/cold backlog degrades to an empty plan, empty drift,
|
||||
* and a calm nag.
|
||||
*/
|
||||
export function standupView(d: ProjectData): StandupData {
|
||||
const date = d.today.toLocaleDateString('en-GB', {
|
||||
weekday: 'long',
|
||||
day: 'numeric',
|
||||
month: 'long',
|
||||
year: 'numeric',
|
||||
})
|
||||
const open = d.issues.filter((i) => i.state === 'open')
|
||||
const deps: DependencyEdge[] = d.deps
|
||||
const { items } = schedule(toSchedulable(open), deps)
|
||||
|
||||
return {
|
||||
date,
|
||||
plan: buildPlan(d, open, items),
|
||||
nag: buildNag(d, open, items),
|
||||
drift: buildDrift(d, open),
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user