Compare commits

1 Commits

Author SHA1 Message Date
Croissant Le Doux
5ae191be49 feat: capture_work — braindump → decomposed issues → filed in gitea (P4)
The last big agent capability. In the Capture screen, a rough braindump runs real
big-model decomposition into a small, estimated issue set; you review/edit the
labels and approve, and the issues are opened in gitea. This is the one place the
big model earns its keep (docs/agent-tools.md).

core (@commitea/core):
- capture-work: PROPOSE_ISSUES_TOOL + CAPTURE_SYSTEM; captureWork(complete, dump)
  forces a single structured decomposition and returns validated issues; parseCaptureArgs
  drops blank titles + invalid est/p labels. ProposedIssue / CaptureProposal.
- gitea client: createIssue({title, body?, labelIds?}) → POST /issues, normalized.

app:
- model bridge model:capture runs captureWork on the (loaded) big model.
- gitea bridge gitea:createIssues opens each approved issue with its est/* + p/*
  labels (reusing the #41 label-id resolver — zero-pollution, no invented labels).
- Capture screen: when a model is configured, "Brew tickets" runs real capture and
  "Approve all" files the set; otherwise the scripted demo interview runs. Fixed a
  race — the brew handler re-checks model status at click time so a configured
  model never falls into the scripted path before status resolves.

Verified: 108 core tests green (7 capture + createIssue added), desktop typecheck
clean, 14 fixture e2e green. Gated live e2e against gemma-4-26b: the auth braindump
→ 3 real tickets ("Resolve token refresh + session staleness" est/3d p/1, "Fix
webhook double-firing" est/2d p/2, "Write auth setup docs" est/1d p/3), reviewable
and editable; Discard so the test files nothing (createIssue POST is unit-tested).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-08 22:08:37 -04:00
41 changed files with 136 additions and 2012 deletions

View File

@@ -41,21 +41,6 @@ test.describe('live backlog', () => {
await expect( await expect(
win.getByText(/cold-start priors · \d+\/20 closed issues estimated|calibrated on \d+ closed/), win.getByText(/cold-start priors · \d+\/20 closed issues estimated|calibrated on \d+ closed/),
).toBeVisible() ).toBeVisible()
// Real per-milestone forecasts — these milestone names come from gitea, not the
// fixture (which lists Beta / Pilot-ready / v1.0).
await expect(win.getByText(/P2 — Scheduler/)).toBeVisible()
// Real capacity config from pm-state (christian/stephen), not the fixture (Stephen/Ana K.)
await expect(win.getByText('christian', { exact: true })).toBeVisible()
await expect(win.getByText(/pd\/day/).first()).toBeVisible()
await win.screenshot({ path: join(here, '.artifacts', 'screens', 'live-runway.png'), fullPage: true, animations: 'disabled' })
// Milestone drill-in — clicking a real milestone opens its real detail
await win.getByText(/P2 — Scheduler/).click()
await expect(win.getByRole('heading', { name: 'P2 — Scheduler + Monte Carlo' })).toBeVisible()
await expect(win.getByText(/\d+ issues · est \d+d/)).toBeVisible()
await win.screenshot({ path: join(here, '.artifacts', 'screens', 'live-milestone.png'), fullPage: true, animations: 'disabled' })
await rail.getByRole('button', { name: 'Runway' }).click()
await win.getByRole('button', { name: 'Full report' }).click() await win.getByRole('button', { name: 'Full report' }).click()
await expect(win.getByText(/cold-start · \d+\/20|curve active · n ≥ 20/)).toBeVisible() await expect(win.getByText(/cold-start · \d+\/20|curve active · n ≥ 20/)).toBeVisible()
await win.screenshot({ path: join(here, '.artifacts', 'screens', 'live-calibration.png'), fullPage: true, animations: 'disabled' }) await win.screenshot({ path: join(here, '.artifacts', 'screens', 'live-calibration.png'), fullPage: true, animations: 'disabled' })

View File

@@ -1,32 +0,0 @@
import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
import { _electron as electron, expect, test } from '@playwright/test'
const here = dirname(fileURLToPath(import.meta.url))
const MAIN = join(here, '..', 'out', 'main', 'index.js')
// Opt-in (GITEA_LIVE=1 + COMMITEA_MODEL_LIVE=1 + a local model + the commitea-pm-state
// repo). Reginald records a standing directive; it's appended to the real pm-state
// ledger. The append is idempotent-ish (a fresh line each run); this only reads back
// that a directive was consulted, and leaves the ledger intact.
test.describe('live record_directive', () => {
test('logs a standing directive to the pm-state ledger', async () => {
test.skip(!process.env.GITEA_LIVE || !process.env.COMMITEA_MODEL_LIVE, 'live model test — opt-in')
test.setTimeout(300_000)
const app = await electron.launch({ args: [MAIN], env: { ...process.env } })
const win = await app.firstWindow()
await win.waitForLoadState('domcontentloaded')
await expect(win.getByText(/· local$/)).toBeVisible({ timeout: 20000 })
const composer = win.getByPlaceholder(/Tell me what to do/)
await composer.fill('Record a standing directive: freeze scope for beta, pilots come first.')
await composer.press('Enter')
// the agent logged it to the ledger (record_directive), not applied a change
await expect(win.getByText(/consulted the directive ledger/)).toBeVisible({ timeout: 240_000 })
await win.screenshot({ path: join(here, '.artifacts', 'screens', 'live-directive.png'), fullPage: true, animations: 'disabled' })
await app.close()
})
})

View File

@@ -1,56 +0,0 @@
import { dirname, join } from 'node:path'
import { mkdtempSync, readFileSync } from 'node:fs'
import { tmpdir } from 'node:os'
import { fileURLToPath } from 'node:url'
import { _electron as electron, expect, test } from '@playwright/test'
const here = dirname(fileURLToPath(import.meta.url))
const MAIN = join(here, '..', 'out', 'main', 'index.js')
/** Read the real token from .env.local (walking up) so the test can fill the form. */
function readToken(): string | null {
let dir = here
for (let i = 0; i < 6; i++) {
try {
const m = /^GITEA_TOKEN\s*=\s*(.+?)\s*$/m.exec(readFileSync(join(dir, '.env.local'), 'utf8'))
if (m) return m[1].trim()
} catch {
/* keep walking */
}
dir = dirname(dir)
}
return null
}
// Opt-in (GITEA_LIVE=1). Forces the onboarding path (COMMITEA_NO_ENV_LOCAL) with a
// fresh userData, fills the real connection form, and asserts it lands on real data.
test.describe('live onboarding', () => {
test('connect form → real board', async () => {
const token = process.env.GITEA_LIVE ? readToken() : null
test.skip(!token, 'GITEA_LIVE + a .env.local token required')
test.setTimeout(90_000)
const app = await electron.launch({
args: [MAIN],
env: { ...process.env, COMMITEA_NO_ENV_LOCAL: '1', COMMITEA_USERDATA: mkdtempSync(join(tmpdir(), 'commitea-')) },
})
const win = await app.firstWindow()
await win.waitForLoadState('domcontentloaded')
// the connection gate, not the app
await expect(win.getByText(/Connect your Gitea/)).toBeVisible({ timeout: 15000 })
await win.getByPlaceholder('your-org').fill('christian')
await win.getByPlaceholder('your-repo').fill('commitea')
await win.getByPlaceholder(/gitea PAT/).fill(token!)
await win.getByRole('button', { name: 'Connect' }).click()
// it validated + saved + reconciled into the real board — real issue titles prove it
const rail = win.getByRole('navigation', { name: 'Primary' })
await rail.getByRole('button', { name: 'The pot' }).click()
await expect(win.getByText(/Model router|SQLite cache bootstrap|Purity\/rebuild/).first()).toBeVisible({ timeout: 30000 })
await win.screenshot({ path: join(here, '.artifacts', 'screens', 'live-onboarding.png'), fullPage: true, animations: 'disabled' })
await app.close()
})
})

View File

@@ -1,37 +0,0 @@
import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
import { _electron as electron, expect, test } from '@playwright/test'
const here = dirname(fileURLToPath(import.meta.url))
const MAIN = join(here, '..', 'out', 'main', 'index.js')
// Opt-in (GITEA_LIVE=1). A real launch persists the snapshot; a second launch with
// gitea unreachable must still show the board + real scheduler output from the
// persisted cache (offline reads). No model needed.
test.describe('live persistence', () => {
test('offline: serves the persisted snapshot', async () => {
test.skip(!process.env.GITEA_LIVE, 'GITEA_LIVE not set — opt-in live test')
test.setTimeout(120_000)
// launch 1 — real reconcile writes the snapshot to disk
const app1 = await electron.launch({ args: [MAIN], env: { ...process.env } })
const w1 = await app1.firstWindow()
await w1.waitForLoadState('domcontentloaded')
// a scheduler-only phrase confirms real data reconciled (never emitted by fixtures)
await expect(w1.getByText(/on the critical path|unblocks #|waits on #|· ready/).first()).toBeVisible({ timeout: 30000 })
await app1.close()
// launch 2 — gitea unreachable; the reconcile must fall back to the persisted snapshot
const app2 = await electron.launch({
args: [MAIN],
env: { ...process.env, GITEA_BASE_URL: 'http://127.0.0.1:9' },
})
const w2 = await app2.firstWindow()
await w2.waitForLoadState('domcontentloaded')
// Focus still renders real scheduler output — proving it came from the cache, offline
await expect(w2.getByText(/on the critical path|unblocks #|waits on #|· ready/).first()).toBeVisible({ timeout: 20000 })
await w2.screenshot({ path: join(here, '.artifacts', 'screens', 'live-offline.png'), fullPage: true, animations: 'disabled' })
await app2.close()
})
})

View File

@@ -97,7 +97,7 @@ test('Directives: consequence diff + append-only ledger', async ({ app, window }
test('Settings: connection, schema, and appearance sync with theme', async ({ app, window }) => { test('Settings: connection, schema, and appearance sync with theme', async ({ app, window }) => {
await app.nav('Settings').click() await app.nav('Settings').click()
await expect(window.getByRole('heading', { name: 'Settings' })).toBeVisible() await expect(window.getByRole('heading', { name: 'Settings' })).toBeVisible()
await expect(window.getByRole('heading', { name: 'Connection' })).toBeVisible() await expect(window.getByText('Managed repos')).toBeVisible()
await app.screenshot('settings') await app.screenshot('settings')
// the Evening (dark) radio drives the shared theme // the Evening (dark) radio drives the shared theme
await window.getByText('Evening (dark)').click() await window.getByText('Evening (dark)').click()

View File

@@ -1,101 +0,0 @@
/**
* Persistent app config for a shared/team build. The gitea PAT is encrypted at
* rest with Electron's safeStorage (OS keychain-backed) and only ever lives in
* the main process — the renderer receives everything *except* the token. Config
* lives in userData so each teammate has their own; a `.env.local` remains a dev
* fallback (see resolveConfig). Nothing here runs under COMMITEA_E2E.
*/
import { readFileSync, writeFileSync } from 'node:fs'
import { join } from 'node:path'
import { app, safeStorage } from 'electron'
export interface AppConfig {
baseUrl: string
owner: string
repo: string
token: string
/** Defaults to `${repo}-pm-state` when omitted. */
pmStateRepo?: string
/** OpenAI-compatible base for Reginald; chat stays off when absent. */
modelUrl?: string
}
/** The renderer-safe view — everything but the token, plus whether one is set. */
export type PublicConfig = Omit<AppConfig, 'token'> & { hasToken: boolean }
interface StoredConfig {
baseUrl: string
owner: string
repo: string
tokenEnc: string | null // base64 of safeStorage-encrypted token
pmStateRepo?: string
modelUrl?: string
}
function configPath(): string {
return join(app.getPath('userData'), 'commitea-config.json')
}
function readStored(): StoredConfig | null {
try {
return JSON.parse(readFileSync(configPath(), 'utf8')) as StoredConfig
} catch {
return null
}
}
/** Full config incl. the decrypted token, or null when unset. Main-process only. */
export function loadConfig(): AppConfig | null {
const s = readStored()
if (!s || !s.baseUrl || !s.owner || !s.repo) return null
let token = ''
if (s.tokenEnc) {
try {
token = safeStorage.decryptString(Buffer.from(s.tokenEnc, 'base64'))
} catch {
token = '' // key rotated / different machine — treat as no token
}
}
if (!token) return null
return { baseUrl: s.baseUrl, owner: s.owner, repo: s.repo, token, pmStateRepo: s.pmStateRepo, modelUrl: s.modelUrl }
}
/** The renderer-safe view of the saved config (never includes the token). */
export function publicConfig(): PublicConfig | null {
const s = readStored()
if (!s) return null
return {
baseUrl: s.baseUrl,
owner: s.owner,
repo: s.repo,
pmStateRepo: s.pmStateRepo,
modelUrl: s.modelUrl,
hasToken: !!s.tokenEnc,
}
}
/** Encrypt the token + persist. Best-effort; throws only on a genuine write failure. */
export function saveConfig(cfg: AppConfig): void {
const tokenEnc = cfg.token
? Buffer.from(safeStorage.encryptString(cfg.token)).toString('base64')
: (readStored()?.tokenEnc ?? null) // keep the existing token if none supplied
const stored: StoredConfig = {
baseUrl: cfg.baseUrl.trim().replace(/\/+$/, ''),
owner: cfg.owner.trim(),
repo: cfg.repo.trim(),
tokenEnc,
pmStateRepo: cfg.pmStateRepo?.trim() || undefined,
modelUrl: cfg.modelUrl?.trim() || undefined,
}
writeFileSync(configPath(), JSON.stringify(stored, null, 2), 'utf8')
}
export function clearConfig(): void {
try {
writeFileSync(configPath(), JSON.stringify({ baseUrl: '', owner: '', repo: '', tokenEnc: null }), 'utf8')
} catch {
// ignore
}
}

View File

@@ -6,32 +6,21 @@
* properly later. * properly later.
*/ */
import { randomUUID } from 'node:crypto'
import { readFileSync } from 'node:fs' import { readFileSync } from 'node:fs'
import { dirname, join } from 'node:path' import { dirname, join } from 'node:path'
import { import {
appendDirective,
createGiteaClient, createGiteaClient,
GiteaApiError,
type DirectiveEntry,
type GiteaClient, type GiteaClient,
type GiteaConfig, type GiteaConfig,
type GiteaLabel, type GiteaLabel,
type IssueChange, type IssueChange,
type LifecycleEvent, type LifecycleEvent,
makeDirectiveEntry,
parseCapacityConfig,
parseDirectiveLog,
planIssueChange, planIssueChange,
type ProjectSnapshot, type ProjectSnapshot,
type DirectiveInput,
} from '@commitea/core' } from '@commitea/core'
import { ipcMain } from 'electron' import { ipcMain } from 'electron'
import { type AppConfig, clearConfig, loadConfig, publicConfig, saveConfig } from './config-store.js'
import { loadSnapshot, saveSnapshot } from './snapshot-store.js'
/** Walk up from cwd looking for a .env.local with a GITEA_TOKEN (dev convenience). */ /** Walk up from cwd looking for a .env.local with a GITEA_TOKEN (dev convenience). */
function loadEnvLocalToken(): string | undefined { function loadEnvLocalToken(): string | undefined {
let dir = process.cwd() let dir = process.cwd()
@@ -50,15 +39,9 @@ function loadEnvLocalToken(): string | undefined {
return undefined return undefined
} }
/** Saved config wins (team build); a `.env.local` is the dev fallback; e2e uses fixtures. */ function resolveConfig(): GiteaConfig | null {
export function resolveConfig(): GiteaConfig | null {
// E2E runs against fixtures — never hit the network from the test harness. // E2E runs against fixtures — never hit the network from the test harness.
if (process.env.COMMITEA_E2E === '1') return null if (process.env.COMMITEA_E2E === '1') return null
const saved = loadConfig()
if (saved) return { baseUrl: saved.baseUrl, token: saved.token, owner: saved.owner, repo: saved.repo }
// COMMITEA_NO_ENV_LOCAL forces the onboarding path (no .env.local fallback) for testing.
if (process.env.COMMITEA_NO_ENV_LOCAL === '1') return null
// dev fallback — .env.local / env vars
const token = process.env.GITEA_TOKEN ?? loadEnvLocalToken() const token = process.env.GITEA_TOKEN ?? loadEnvLocalToken()
if (!token) return null if (!token) return null
return { return {
@@ -69,23 +52,8 @@ export function resolveConfig(): GiteaConfig | null {
} }
} }
/** The pm-state repo name: configured, else `${repo}-pm-state`, else the env override. */ // Memoized client so both the gitea and model bridges share one instance.
function pmStateRepoName(config: GiteaConfig): string {
return loadConfig()?.pmStateRepo ?? process.env.COMMITEA_PMSTATE_REPO ?? `${config.repo}-pm-state`
}
// Memoized clients; reset via resetClients() when the config changes.
let sharedClient: GiteaClient | null | undefined let sharedClient: GiteaClient | null | undefined
let pmStateClient: GiteaClient | null | undefined
/** Drop the cached clients + snapshot so the next call re-reads the new config. */
export function resetClients(): void {
sharedClient = undefined
pmStateClient = undefined
labelCache = null
invalidateSnapshot()
}
export function getGiteaClient(): GiteaClient | null { export function getGiteaClient(): GiteaClient | null {
if (sharedClient === undefined) { if (sharedClient === undefined) {
const config = resolveConfig() const config = resolveConfig()
@@ -94,55 +62,6 @@ export function getGiteaClient(): GiteaClient | null {
return sharedClient return sharedClient
} }
// The pm-state repo holds machine-derived state (the directive ledger). Same
// token/host as the work repo, a different repo (the purity split, decisions D4).
export function getPmStateClient(): GiteaClient | null {
if (pmStateClient === undefined) {
const config = resolveConfig()
pmStateClient = config ? createGiteaClient({ ...config, repo: pmStateRepoName(config) }, fetch) : null
}
return pmStateClient
}
const DIRECTIVE_LOG_PATH = 'directives/log.jsonl'
async function readDirectiveLog(client: GiteaClient): Promise<{ text: string; sha: string | null }> {
const file = await client.getFile(DIRECTIVE_LOG_PATH)
if (!file) return { text: '', sha: null }
return { text: Buffer.from(file.contentBase64, 'base64').toString('utf8'), sha: file.sha }
}
/** Record a directive: read the ledger, append, write it back (concatenation merge). */
export async function appendDirectiveEntry(client: GiteaClient, input: DirectiveInput): Promise<DirectiveEntry> {
const entry = makeDirectiveEntry(input, randomUUID(), new Date().toISOString())
const { text, sha } = await readDirectiveLog(client)
const next = appendDirective(text, entry)
await client.putFile(DIRECTIVE_LOG_PATH, {
contentBase64: Buffer.from(next, 'utf8').toString('base64'),
message: `directive: ${entry.kind}`,
sha: sha ?? undefined,
})
return entry
}
export async function readDirectives(client: GiteaClient) {
const { text } = await readDirectiveLog(client)
return parseDirectiveLog(text)
}
const CAPACITY_PATH = 'capacity/members.json'
/** Read the capacity config from the pm-state repo (empty when absent). */
export async function readCapacity(client: GiteaClient) {
const file = await client.getFile(CAPACITY_PATH)
if (!file) return []
try {
return parseCapacityConfig(JSON.parse(Buffer.from(file.contentBase64, 'base64').toString('utf8')))
} catch {
return []
}
}
/** Full reconcile: issues + milestones + native deps + lifecycle timelines. */ /** Full reconcile: issues + milestones + native deps + lifecycle timelines. */
export async function reconcileSnapshot( export async function reconcileSnapshot(
client: GiteaClient, client: GiteaClient,
@@ -162,119 +81,47 @@ export async function reconcileSnapshot(
return { issues, milestones, deps, timelines } return { issues, milestones, deps, timelines }
} }
type Snapshot = Awaited<ReturnType<typeof reconcileSnapshot>>
/**
* A single in-memory reconcile cache shared across the app. A full reconcile is
* ~2N gitea calls (deps + timelines per issue); without this, every agent tool
* call refetched the whole repo. Reads within `maxAgeMs` reuse the cache;
* `getSnapshot({ maxAgeMs: 0 })` forces a fresh pull (the explicit UI reconcile),
* and any write calls `invalidateSnapshot()` so the next read sees it. The cache
* is rebuildable — the durable truth stays in gitea (the purity split, D4).
*/
let snapshotCache: { snap: Snapshot; at: number } | null = null
export async function getSnapshot(client: GiteaClient, opts?: { maxAgeMs?: number }): Promise<Snapshot> {
const maxAgeMs = opts?.maxAgeMs ?? 0
if (snapshotCache && maxAgeMs > 0 && Date.now() - snapshotCache.at <= maxAgeMs) {
return snapshotCache.snap
}
const snap = await reconcileSnapshot(client)
snapshotCache = { snap, at: Date.now() }
saveSnapshot(snap, new Date().toISOString()) // persist for instant boot + offline
return snap
}
/** Drop the cache so the next read reflects a just-made write. */
export function invalidateSnapshot(): void {
snapshotCache = null
}
/**
* The last persisted snapshot (from a previous session), for instant boot. The
* renderer shows it immediately, then a real reconcile supersedes it
* (stale-while-revalidate). Returns null when there's nothing on disk; its
* `savedAt` marks staleness. It does NOT seed the cache — agent tool calls
* always reconcile fresh so they never reason over stale data.
*/
export function bootSnapshot(): (Snapshot & { savedAt: string }) | null {
const persisted = loadSnapshot()
if (!persisted) return null
return {
issues: persisted.issues,
milestones: persisted.milestones,
deps: persisted.deps,
timelines: persisted.timelines,
savedAt: persisted.savedAt,
} as unknown as Snapshot & { savedAt: string }
}
/** Agent tool calls tolerate a slightly stale snapshot (seconds) to stay responsive. */
export const AGENT_SNAPSHOT_TTL_MS = 30_000
// Label cache is reset with the clients (module-level so resetClients can clear it).
let labelCache: GiteaLabel[] | null = null
async function resolveLabelIds(client: GiteaClient, names: string[]): Promise<number[]> {
const lookup = () => new Map(labelCache!.map((l) => [l.name, l.id]))
if (!labelCache) labelCache = await client.listLabels()
let byName = lookup()
if (names.some((n) => !byName.has(n))) {
labelCache = await client.listLabels() // a name we don't know — refetch once
byName = lookup()
}
return names.map((n) => byName.get(n)).filter((id): id is number => id != null)
}
export function registerGiteaIpc(): void { export function registerGiteaIpc(): void {
ipcMain.handle('gitea:status', () => { const client = getGiteaClient()
const cfg = resolveConfig() const repo = client ? `${process.env.GITEA_OWNER ?? 'christian'}/${process.env.GITEA_REPO ?? 'commitea'}` : null
return {
configured: !!cfg,
repo: cfg ? `${cfg.owner}/${cfg.repo}` : null,
demo: process.env.COMMITEA_E2E === '1',
}
})
// Instant boot: the last persisted snapshot, shown before the fresh reconcile lands. ipcMain.handle('gitea:status', () => ({ configured: !!client, repo }))
ipcMain.handle('gitea:boot', () => {
if (!getGiteaClient()) return { configured: false }
const persisted = bootSnapshot()
return persisted ? { configured: true, cached: true, ...persisted } : { configured: true, cached: false }
})
ipcMain.handle('gitea:reconcile', async () => { ipcMain.handle('gitea:reconcile', async () => {
const client = getGiteaClient()
if (!client) return { configured: false, issues: [], milestones: [], deps: [], timelines: {} } if (!client) return { configured: false, issues: [], milestones: [], deps: [], timelines: {} }
try { const snap = await reconcileSnapshot(client)
// explicit UI sync — force fresh, and warm the cache for agent tool calls return { configured: true, ...snap }
const snap = await getSnapshot(client, { maxAgeMs: 0 })
return { configured: true, stale: false, ...snap }
} catch (e) {
// offline / gitea down — serve the last persisted snapshot rather than error out
const persisted = bootSnapshot()
if (persisted) return { configured: true, stale: true, ...persisted }
throw e
}
}) })
ipcMain.handle('gitea:getIssue', async (_event, index: number) => { ipcMain.handle('gitea:getIssue', async (_event, index: number) => {
const client = getGiteaClient()
if (!client) return null if (!client) return null
return client.getIssue(index) return client.getIssue(index)
}) })
// Cached label list for name→id resolution; refreshed on demand if a name misses.
let labelCache: GiteaLabel[] | null = null
async function resolveLabelIds(names: string[]): Promise<number[]> {
if (!client) return []
const lookup = () => new Map(labelCache!.map((l) => [l.name, l.id]))
if (!labelCache) labelCache = await client.listLabels()
let byName = lookup()
if (names.some((n) => !byName.has(n))) {
labelCache = await client.listLabels() // a name we don't know — refetch once
byName = lookup()
}
return names.map((n) => byName.get(n)).filter((id): id is number => id != null)
}
// The write path (apply_changes). Additive label swaps, applied only after the // The write path (apply_changes). Additive label swaps, applied only after the
// renderer's propose-approve. Returns the plan + the freshly-read issue. // renderer's propose-approve. Returns the plan + the freshly-read issue.
ipcMain.handle('gitea:applyChange', async (_event, change: IssueChange) => { ipcMain.handle('gitea:applyChange', async (_event, change: IssueChange) => {
const client = getGiteaClient()
if (!client) return { ok: false as const, reason: 'unconfigured' as const } if (!client) return { ok: false as const, reason: 'unconfigured' as const }
const current = await client.getIssue(change.issue) const current = await client.getIssue(change.issue)
const plan = planIssueChange(current.labels, change) const plan = planIssueChange(current.labels, change)
if (plan.noop) return { ok: true as const, plan, issue: current } if (plan.noop) return { ok: true as const, plan, issue: current }
const ids = await resolveLabelIds(client, plan.labels) const ids = await resolveLabelIds(plan.labels)
await client.setIssueLabels(change.issue, ids) await client.setIssueLabels(change.issue, ids)
const issue = await client.getIssue(change.issue) const issue = await client.getIssue(change.issue)
invalidateSnapshot() // the board + forecast must reflect the label change
return { ok: true as const, plan, issue } return { ok: true as const, plan, issue }
}) })
@@ -283,68 +130,15 @@ export function registerGiteaIpc(): void {
ipcMain.handle( ipcMain.handle(
'gitea:createIssues', 'gitea:createIssues',
async (_event, issues: { title: string; body?: string; estimate?: string; priority?: string }[]) => { async (_event, issues: { title: string; body?: string; estimate?: string; priority?: string }[]) => {
const client = getGiteaClient()
if (!client) return { ok: false as const, reason: 'unconfigured' as const } if (!client) return { ok: false as const, reason: 'unconfigured' as const }
const created: { number: number; title: string }[] = [] const created: { number: number; title: string }[] = []
for (const it of issues) { for (const it of issues) {
const names = [it.estimate, it.priority].filter((n): n is string => !!n) const names = [it.estimate, it.priority].filter((n): n is string => !!n)
const labelIds = await resolveLabelIds(client, names) const labelIds = await resolveLabelIds(names)
const issue = await client.createIssue({ title: it.title, body: it.body, labelIds }) const issue = await client.createIssue({ title: it.title, body: it.body, labelIds })
created.push({ number: issue.number, title: issue.title }) created.push({ number: issue.number, title: issue.title })
} }
if (created.length) invalidateSnapshot() // new issues enter the board/scope
return { ok: true as const, created } return { ok: true as const, created }
}, },
) )
// Read the directive ledger from the pm-state repo (for the Directives screen).
ipcMain.handle('pmstate:directives', async () => {
const pm = getPmStateClient()
if (!pm) return { ok: false as const, reason: 'unconfigured' as const }
try {
return { ok: true as const, directives: await readDirectives(pm) }
} catch (e) {
return { ok: false as const, reason: 'error' as const, message: e instanceof Error ? e.message : String(e) }
}
})
// Read the capacity config from the pm-state repo (for capacity-aware forecasts).
ipcMain.handle('pmstate:capacity', async () => {
const pm = getPmStateClient()
if (!pm) return { ok: false as const, reason: 'unconfigured' as const, members: [] }
try {
return { ok: true as const, members: await readCapacity(pm) }
} catch {
return { ok: true as const, members: [] }
}
})
// ---- config (team onboarding) ----
ipcMain.handle('config:get', () => publicConfig())
ipcMain.handle('config:set', (_event, cfg: AppConfig) => {
saveConfig(cfg)
resetClients() // new config takes effect without a restart
return { ok: true as const }
})
ipcMain.handle('config:clear', () => {
clearConfig()
resetClients()
return { ok: true as const }
})
// Validate a token + repo before saving: any authed read on the repo proves access.
ipcMain.handle('config:test', async (_event, cfg: AppConfig) => {
try {
const c = createGiteaClient(
{ baseUrl: cfg.baseUrl.replace(/\/+$/, ''), owner: cfg.owner.trim(), repo: cfg.repo.trim(), token: cfg.token },
fetch,
)
await c.listLabels()
return { ok: true as const }
} catch (e) {
return { ok: false as const, error: e instanceof GiteaApiError ? `${e.status}` : e instanceof Error ? e.message : String(e) }
}
})
} }

View File

@@ -2,9 +2,6 @@ import { join } from 'node:path'
import { BrowserWindow, app, shell } from 'electron' import { BrowserWindow, app, shell } from 'electron'
// Test hook: isolate config/cache to a throwaway dir (must run before any getPath).
if (process.env.COMMITEA_USERDATA) app.setPath('userData', process.env.COMMITEA_USERDATA)
import { registerGiteaIpc } from './gitea.js' import { registerGiteaIpc } from './gitea.js'
import { registerModelIpc } from './model.js' import { registerModelIpc } from './model.js'

View File

@@ -22,27 +22,15 @@ import {
REGINALD_SYSTEM, REGINALD_SYSTEM,
REGINALD_TOOLS, REGINALD_TOOLS,
runAgentTurn, runAgentTurn,
toDirectiveInput,
} from '@commitea/core' } from '@commitea/core'
import { app, ipcMain } from 'electron' import { ipcMain } from 'electron'
import { loadConfig } from './config-store.js' import { getGiteaClient, reconcileSnapshot } from './gitea.js'
import {
AGENT_SNAPSHOT_TTL_MS,
appendDirectiveEntry,
getGiteaClient,
getPmStateClient,
getSnapshot,
} from './gitea.js'
/** Small local model for prose + the read tool; big model reserved for later decomposition. */ /** Small local model for prose + the read tool; big model reserved for later decomposition. */
function resolveModelRouter(): ModelRouter | null { function resolveModelRouter(): ModelRouter | null {
if (process.env.COMMITEA_E2E === '1') return null // e2e uses the scripted fixture Reginald if (process.env.COMMITEA_E2E === '1') return null // e2e uses the scripted fixture Reginald
// Config wins (team build); env is the dev override; localhost is a dev convenience only. const baseUrl = process.env.COMMITEA_MODEL_URL ?? 'http://localhost:1234/v1'
const baseUrl =
loadConfig()?.modelUrl ??
process.env.COMMITEA_MODEL_URL ??
(app.isPackaged ? undefined : 'http://localhost:1234/v1')
if (!baseUrl) return null if (!baseUrl) return null
return { return {
small: { baseUrl, model: process.env.COMMITEA_MODEL_SMALL ?? '' }, small: { baseUrl, model: process.env.COMMITEA_MODEL_SMALL ?? '' },
@@ -50,19 +38,6 @@ function resolveModelRouter(): ModelRouter | null {
} }
} }
/** Probe the endpoint for a usable model; null when unreachable (chat then stays off). */
async function probeModel(baseUrl: string): Promise<string | null> {
try {
const model = await resolveLoadedModel(baseUrl, process.env.COMMITEA_MODEL_SMALL ?? '')
// resolveLoadedModel only returns a real id when the server answered; the default
// fallback means unreachable, so confirm with a lightweight models call.
const res = await fetch(`${baseUrl.replace(/\/+$/, '')}/models`)
return res.ok ? model : null
} catch {
return null
}
}
/** /**
* Resolve which model to actually ask for. An explicit env override wins; * Resolve which model to actually ask for. An explicit env override wins;
* otherwise ask the server which model is *loaded* (LM Studio's native * otherwise ask the server which model is *loaded* (LM Studio's native
@@ -96,23 +71,19 @@ async function resolveLoadedModel(baseUrl: string, override: string): Promise<st
} }
export function registerModelIpc(): void { export function registerModelIpc(): void {
const router = resolveModelRouter()
ipcMain.handle('model:status', async () => { ipcMain.handle('model:status', async () => {
const r = resolveModelRouter() // resolve fresh so a saved modelUrl takes effect if (!router) return { configured: false, model: null }
if (!r) return { configured: false, model: null } const model = await resolveLoadedModel(router.small.baseUrl, router.small.model)
const model = await probeModel(r.small.baseUrl) // only "configured" if a model actually answers return { configured: true, model }
return { configured: !!model, model }
}) })
ipcMain.handle('model:chat', async (event, messages: ChatMessage[]) => { ipcMain.handle('model:chat', async (_event, messages: ChatMessage[]) => {
const router = resolveModelRouter()
if (!router) return { ok: false as const, reason: 'unconfigured' as const } if (!router) return { ok: false as const, reason: 'unconfigured' as const }
const client = getGiteaClient() const client = getGiteaClient()
const model = await resolveLoadedModel(router.small.baseUrl, router.small.model) const model = await resolveLoadedModel(router.small.baseUrl, router.small.model)
const chat = createChatClient({ ...router.small, model }, fetch) const chat = createChatClient({ ...router.small, model }, fetch)
// stream the model's prose to the renderer token-by-token
const onToken = (delta: string) => {
if (!event.sender.isDestroyed()) event.sender.send('model:chat:token', delta)
}
// Proposals the model formulates this turn; the renderer approves them (the // Proposals the model formulates this turn; the renderer approves them (the
// write happens through gitea:applyChange, never inside the loop). // write happens through gitea:applyChange, never inside the loop).
@@ -121,8 +92,7 @@ export function registerModelIpc(): void {
const execute = async (name: string, args: unknown) => { const execute = async (name: string, args: unknown) => {
if (!client) return { error: 'gitea is not configured' } if (!client) return { error: 'gitea is not configured' }
if (name === 'query_project') { if (name === 'query_project') {
// reuse a recent reconcile — a multi-tool turn shouldn't refetch the repo each call const snap = await reconcileSnapshot(client)
const snap = await getSnapshot(client, { maxAgeMs: AGENT_SNAPSHOT_TTL_MS })
const a = (args ?? {}) as { view: ProjectView; filters?: QueryFilters } const a = (args ?? {}) as { view: ProjectView; filters?: QueryFilters }
return buildProjectView(a.view, a.filters, snap, new Date()) return buildProjectView(a.view, a.filters, snap, new Date())
} }
@@ -136,26 +106,15 @@ export function registerModelIpc(): void {
? { proposed: built.map((p) => ({ issue: a.issue, diff: describeChange(p.plan) })) } ? { proposed: built.map((p) => ({ issue: a.issue, diff: describeChange(p.plan) })) }
: { proposed: [], note: 'no change — already at that value' } : { proposed: [], note: 'no change — already at that value' }
} }
if (name === 'record_directive') {
const pm = getPmStateClient()
if (!pm) return { error: 'pm-state is not configured' }
try {
const entry = await appendDirectiveEntry(pm, toDirectiveInput(args))
return { recorded: { kind: entry.kind, quote: entry.quote } }
} catch (e) {
return { error: `could not record — is the pm-state repo created? (${e instanceof Error ? e.message : e})` }
}
}
return { error: `unknown tool: ${name}` } return { error: `unknown tool: ${name}` }
} }
try { try {
const turn = await runAgentTurn({ const turn = await runAgentTurn({
complete: (m, t, ot) => chat.complete(m, t, ot), complete: (m, t) => chat.complete(m, t),
messages: [{ role: 'system', content: REGINALD_SYSTEM }, ...messages], messages: [{ role: 'system', content: REGINALD_SYSTEM }, ...messages],
tools: REGINALD_TOOLS, tools: REGINALD_TOOLS,
execute, execute,
onToken,
}) })
return { ok: true as const, content: turn.content, steps: turn.steps, proposals } return { ok: true as const, content: turn.content, steps: turn.steps, proposals }
} catch (e) { } catch (e) {
@@ -167,7 +126,6 @@ export function registerModelIpc(): void {
// decomposition (with one loaded local model, that's the loaded one). Returns // decomposition (with one loaded local model, that's the loaded one). Returns
// a proposal; nothing is filed until the Capture tray approves it. // a proposal; nothing is filed until the Capture tray approves it.
ipcMain.handle('model:capture', async (_event, braindump: string) => { ipcMain.handle('model:capture', async (_event, braindump: string) => {
const router = resolveModelRouter()
if (!router) return { ok: false as const, reason: 'unconfigured' as const } if (!router) return { ok: false as const, reason: 'unconfigured' as const }
const model = await resolveLoadedModel(router.big.baseUrl, router.big.model) const model = await resolveLoadedModel(router.big.baseUrl, router.big.model)
const chat = createChatClient({ ...router.big, model }, fetch) const chat = createChatClient({ ...router.big, model }, fetch)

View File

@@ -1,47 +0,0 @@
/**
* Durable snapshot store — the reconcile cache, persisted to disk. On boot the
* app shows the last snapshot instantly (stale-while-revalidate) instead of a
* blank board while ~2N gitea calls run; if gitea is unreachable, reads fall
* back to it (offline). It's a rebuildable mirror — the durable truth stays in
* gitea (the purity split, D4). A plain JSON file: the whole snapshot fits in
* memory at this scale, so indexed SQL buys nothing yet (see the PR).
*/
import { readFileSync, writeFileSync } from 'node:fs'
import { join } from 'node:path'
import { app } from 'electron'
/** The shape we persist — kept loose so a schema drift degrades to "no cache", not a crash. */
export interface PersistedSnapshot {
issues: unknown[]
milestones: unknown[]
deps: unknown[]
timelines: Record<number, unknown[]>
/** ISO time the snapshot was reconciled — shown as "cached since". */
savedAt: string
}
function snapshotPath(): string {
return join(app.getPath('userData'), 'commitea-snapshot.json')
}
/** Load the last persisted snapshot, or null if absent/corrupt. Never throws. */
export function loadSnapshot(): PersistedSnapshot | null {
try {
const parsed = JSON.parse(readFileSync(snapshotPath(), 'utf8')) as PersistedSnapshot
if (parsed && Array.isArray(parsed.issues)) return parsed
return null
} catch {
return null // missing file, bad JSON, or drift — treat as no cache
}
}
/** Persist a freshly reconciled snapshot. Best-effort — a write failure never breaks a reconcile. */
export function saveSnapshot(snap: Omit<PersistedSnapshot, 'savedAt'>, savedAt: string): void {
try {
writeFileSync(snapshotPath(), JSON.stringify({ ...snap, savedAt }), 'utf8')
} catch {
// disk full / permissions — the in-memory cache still works this session
}
}

View File

@@ -5,8 +5,6 @@ const api = {
gitea: { gitea: {
/** Whether the main process has a gitea token + target repo configured. */ /** Whether the main process has a gitea token + target repo configured. */
status: () => ipcRenderer.invoke('gitea:status'), status: () => ipcRenderer.invoke('gitea:status'),
/** The last persisted snapshot, for instant boot before the fresh reconcile. */
boot: () => ipcRenderer.invoke('gitea:boot'),
/** Full read of the managed repo — every issue + milestone. */ /** Full read of the managed repo — every issue + milestone. */
reconcile: () => ipcRenderer.invoke('gitea:reconcile'), reconcile: () => ipcRenderer.invoke('gitea:reconcile'),
/** One issue by index, normalized (or null if unconfigured). */ /** One issue by index, normalized (or null if unconfigured). */
@@ -16,33 +14,11 @@ const api = {
/** File a set of captured issues with their est/* + p/* labels. */ /** File a set of captured issues with their est/* + p/* labels. */
createIssues: (issues: unknown) => ipcRenderer.invoke('gitea:createIssues', issues), createIssues: (issues: unknown) => ipcRenderer.invoke('gitea:createIssues', issues),
}, },
pmstate: {
/** Read the directive ledger from the pm-state repo. */
directives: () => ipcRenderer.invoke('pmstate:directives'),
/** Read the capacity config from the pm-state repo. */
capacity: () => ipcRenderer.invoke('pmstate:capacity'),
},
config: {
/** The saved config (never the token) — null when unset. */
get: () => ipcRenderer.invoke('config:get'),
/** Validate a token + repo before saving. */
test: (cfg: unknown) => ipcRenderer.invoke('config:test', cfg),
/** Save config (token encrypted in main); takes effect without restart. */
set: (cfg: unknown) => ipcRenderer.invoke('config:set', cfg),
/** Forget the saved config. */
clear: () => ipcRenderer.invoke('config:clear'),
},
model: { model: {
/** Whether a model endpoint is configured (else the UI keeps the scripted Reginald). */ /** Whether a model endpoint is configured (else the UI keeps the scripted Reginald). */
status: () => ipcRenderer.invoke('model:status'), status: () => ipcRenderer.invoke('model:status'),
/** One agent turn: messages in, Reginald's prose + the tools it consulted out. */ /** One agent turn: messages in, Reginald's prose + the tools it consulted out. */
chat: (messages: unknown) => ipcRenderer.invoke('model:chat', messages), chat: (messages: unknown) => ipcRenderer.invoke('model:chat', messages),
/** Subscribe to streamed prose tokens for the in-flight turn; returns an unsubscribe. */
onToken: (cb: (delta: string) => void) => {
const listener = (_e: unknown, delta: string) => cb(delta)
ipcRenderer.on('model:chat:token', listener)
return () => ipcRenderer.removeListener('model:chat:token', listener)
},
/** Decompose a braindump into a proposed issue set (capture_work). */ /** Decompose a braindump into a proposed issue set (capture_work). */
capture: (braindump: string) => ipcRenderer.invoke('model:capture', braindump), capture: (braindump: string) => ipcRenderer.invoke('model:capture', braindump),
}, },

View File

@@ -1,117 +0,0 @@
import React from 'react'
import type { PublicConfig } from '../../global.js'
import logoIcon from '../../design/assets/logo-icon.png'
import { Button, Card, Input } from '../ui/index.js'
/**
* Real onboarding — each teammate connects their own Gitea with a personal access
* token. The token is validated (an authed read on the repo) then saved encrypted
* in the main process (never exposed to this renderer). Optional model URL wires
* Reginald; leave it blank and chat simply stays off.
*/
export function ConnectScreen({ onConnected, existing }: { onConnected: () => void; existing?: PublicConfig | null }) {
const [baseUrl, setBaseUrl] = React.useState(existing?.baseUrl ?? 'https://gitea.stephenmann.io')
const [owner, setOwner] = React.useState(existing?.owner ?? '')
const [repo, setRepo] = React.useState(existing?.repo ?? '')
const [token, setToken] = React.useState('')
const [modelUrl, setModelUrl] = React.useState(existing?.modelUrl ?? '')
const [state, setState] = React.useState<'idle' | 'testing' | 'saving'>('idle')
const [error, setError] = React.useState<string | null>(null)
const cfg = () => ({ baseUrl, owner, repo, token, modelUrl: modelUrl.trim() || undefined })
const ready = baseUrl.trim() && owner.trim() && repo.trim() && (token.trim() || existing?.hasToken)
const connect = async () => {
setError(null)
setState('testing')
// reuse the saved token when editing and the field is left blank
const payload = token.trim() ? cfg() : { ...cfg(), token: '' }
if (token.trim()) {
const test = await window.commitea.config.test(cfg()).catch(() => ({ ok: false, error: 'unreachable' }))
if (!test.ok) {
setState('idle')
setError(
test.error === '404'
? "Couldn't find that repo — check owner/name and that the token can see it."
: test.error === '401' || test.error === '403'
? 'The token was rejected — check it has repo + issue scopes.'
: `Connection failed${test.error ? ` (${test.error})` : ''}.`,
)
return
}
}
setState('saving')
await window.commitea.config.set(payload)
onConnected()
}
const field = (
label: string,
value: string,
set: (v: string) => void,
opts: { placeholder?: string; type?: string; hint?: string } = {},
) => (
<div style={{ display: 'flex', flexDirection: 'column', gap: 5 }}>
<Input
label={label}
value={value}
type={opts.type}
placeholder={opts.placeholder}
onChange={(e) => set(e.target.value)}
/>
{opts.hint ? <span style={{ font: 'var(--text-caption)', color: 'var(--ink-3)' }}>{opts.hint}</span> : null}
</div>
)
return (
<div
style={{
height: '100vh',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
background: 'var(--surface-app)',
padding: 24,
}}
>
<Card style={{ width: 460, maxWidth: '100%' }}>
<div style={{ display: 'flex', alignItems: 'center', gap: 10, marginBottom: 6 }}>
<img src={logoIcon} width="28" height="28" alt="" style={{ borderRadius: 7, display: 'block' }} />
<span style={{ font: '400 24px/1 var(--font-serif-display)', color: 'var(--ink-1)' }}>
Commi<span style={{ color: 'var(--accent-text)' }}>Tea</span>
</span>
</div>
<p style={{ font: 'var(--text-body)', color: 'var(--ink-2)', margin: '0 0 18px' }}>
Connect your Gitea. Your token is stored encrypted on this machine and never leaves it.
</p>
<div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
{field('Gitea URL', baseUrl, setBaseUrl, { placeholder: 'https://gitea.example.com' })}
<div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 12 }}>
{field('Owner', owner, setOwner, { placeholder: 'your-org' })}
{field('Repository', repo, setRepo, { placeholder: 'your-repo' })}
</div>
{field('Access token', token, setToken, {
type: 'password',
placeholder: existing?.hasToken ? '•••••••• (saved — leave blank to keep)' : 'gitea PAT · scopes: repo + issue',
})}
{field('Model URL', modelUrl, setModelUrl, {
placeholder: 'http://localhost:1234/v1',
hint: 'Optional — an OpenAI-compatible endpoint for Reginald. Leave blank to keep chat off.',
})}
</div>
{error ? (
<p style={{ font: 'var(--text-agent)', color: 'var(--danger)', margin: '12px 0 0' }}>{error}</p>
) : null}
<div style={{ display: 'flex', gap: 10, marginTop: 18 }}>
<Button onClick={() => void connect()} disabled={!ready || state !== 'idle'}>
{state === 'testing' ? 'Checking…' : state === 'saving' ? 'Connecting…' : existing ? 'Save' : 'Connect'}
</Button>
</div>
</Card>
</div>
)
}

View File

@@ -8,35 +8,6 @@ export function DirectivesScreen() {
const [pending, setPending] = React.useState<DirectivePending | null>(DIRECTIVES.pending) const [pending, setPending] = React.useState<DirectivePending | null>(DIRECTIVES.pending)
const [entries, setEntries] = React.useState<DirectiveEntry[]>(DIRECTIVES.entries) const [entries, setEntries] = React.useState<DirectiveEntry[]>(DIRECTIVES.entries)
// Real ledger from the pm-state repo, when it exists — else the fixture demo.
React.useEffect(() => {
let alive = true
window.commitea.pmstate
.directives()
.then((r) => {
if (!alive || !r.ok || r.directives.length === 0) return
setPending(null)
setEntries(
r.directives
.slice()
.reverse()
.map((d) => ({
seq: d.seq,
who: 'You',
when: new Date(d.ts).toLocaleDateString(),
what: d.quote,
why: d.rationale ?? '',
status: d.status === 'accepted' ? 'applied' : d.status === 'withdrawn' ? 'withdrawn' : 'superseded',
consequence: '',
})),
)
})
.catch(() => {})
return () => {
alive = false
}
}, [])
const resolve = (status: string) => { const resolve = (status: string) => {
setEntries((e) => [{ setEntries((e) => [{
seq: pending!.seq, who: pending!.who, when: pending!.when, what: pending!.what, why: 'pilot demo on the 14th', seq: pending!.seq, who: pending!.who, when: pending!.when, what: pending!.what, why: 'pilot demo on the 14th',

View File

@@ -1,44 +1,22 @@
import React from 'react' import React from 'react'
import { COLUMNS, type IssueRef } from '../../data/fixtures.js' import { COLUMNS, type IssueRef } from '../../data/fixtures.js'
import { type MilestoneView } from '../../lib/backlog.js'
import { BurnUpCone } from '../charts/chart.js' import { BurnUpCone } from '../charts/chart.js'
import { Badge, Button, Card, Icon, Tag } from '../ui/index.js' import { Badge, Button, Card, Icon, Tag } from '../ui/index.js'
// Milestone detail — scope, cone, issues; forecasts stay ranges. // Milestone detail — scope, cone, issues; forecasts stay ranges
// `data` (real milestone forecast) overrides the demo fixture when present. export function MilestoneScreen({ onBack, onOpenIssue }: { onBack: () => void; onOpenIssue: (issue: IssueRef) => void }) {
export function MilestoneScreen({
onBack,
onOpenIssue,
data,
}: {
onBack: () => void
onOpenIssue: (issue: IssueRef) => void
data?: MilestoneView
}) {
const cols = COLUMNS const cols = COLUMNS
const byState = (ids: number[]) => const byState = (ids: number[]) =>
cols.flatMap((c) => c.issues.map((i) => ({ ...i, col: c.label }))).filter((i) => ids.includes(i.id)) cols.flatMap((c) => c.issues.map((i) => ({ ...i, col: c.label }))).filter((i) => ids.includes(i.id))
const fixtureGroups = [ const groups = [
{ label: 'Steeping', issues: byState([87, 84]) }, { label: 'Steeping', issues: byState([87, 84]) },
{ label: 'In review', issues: byState([92]) }, { label: 'In review', issues: byState([92]) },
{ label: 'Queued', issues: byState([102, 103, 99, 96, 78]) }, { label: 'Queued', issues: byState([102, 103, 99, 96, 78]) },
{ label: 'Done', issues: byState([71, 69, 65]), muted: true }, { label: 'Done', issues: byState([71, 69, 65]), muted: true },
] ]
// real or demo, in one shape the render loop understands
const groups = data
? data.groups.map((g) => ({ label: g.label, issues: g.issues, muted: g.label === 'Done' }))
: fixtureGroups
const name = data ? data.name : 'Beta'
const dueLine = data
? `milestone · due ${data.due} · ${data.soft ? 'soft — scope may flex' : 'hard deadline'}`
: 'milestone · due Mar 15 · soft — scope may flex'
const forecastLabel = data ? (data.forecastRange ? `80% ${data.forecastRange}` : 'all shipped') : '80% Mar 312'
const scopeStat = data ? `${data.scopeCount} issues · est ${data.scopeEstDays}d` : '42 issues · est 61d'
const doneStat = data ? `${data.doneCount} · ${data.donePct}%` : '24 · 57%'
const Stat = ({ label, value, tone }: { label: string; value: string; tone?: string }) => ( const Stat = ({ label, value, tone }: { label: string; value: string; tone?: string }) => (
<div style={{ flex: 1, padding: '12px 18px', borderRight: '1px solid var(--line-1)' }}> <div style={{ flex: 1, padding: '12px 18px', borderRight: '1px solid var(--line-1)' }}>
<div style={{ font: 'var(--text-overline)', letterSpacing: 'var(--letter-spacing-wide)', textTransform: 'uppercase', color: 'var(--ink-3)', marginBottom: 5 }}>{label}</div> <div style={{ font: 'var(--text-overline)', letterSpacing: 'var(--letter-spacing-wide)', textTransform: 'uppercase', color: 'var(--ink-3)', marginBottom: 5 }}>{label}</div>
@@ -58,12 +36,12 @@ export function MilestoneScreen({
<header style={{ borderBottom: 'var(--rule-double)', paddingBottom: 14, display: 'flex', alignItems: 'flex-start', gap: 16 }}> <header style={{ borderBottom: 'var(--rule-double)', paddingBottom: 14, display: 'flex', alignItems: 'flex-start', gap: 16 }}>
<div style={{ flex: 1, minWidth: 0 }}> <div style={{ flex: 1, minWidth: 0 }}>
<p style={{ font: '400 12px var(--font-mono)', color: 'var(--ink-3)', margin: '0 0 6px', display: 'inline-flex', alignItems: 'center', gap: 6 }}> <p style={{ font: '400 12px var(--font-mono)', color: 'var(--ink-3)', margin: '0 0 6px', display: 'inline-flex', alignItems: 'center', gap: 6 }}>
<Icon name="milestone" size={13} /> {dueLine} <Icon name="milestone" size={13} /> milestone · due Mar 15 · soft scope may flex
</p> </p>
<h1 style={{ font: 'var(--text-display)', color: 'var(--ink-1)', margin: 0 }}>{name}</h1> <h1 style={{ font: 'var(--text-display)', color: 'var(--ink-1)', margin: 0 }}>Beta</h1>
<div style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 10 }}> <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 10 }}>
<Badge tone="ok" dot>{data ? `${data.doneCount}/${data.scopeCount} done` : 'ahead of forecast'}</Badge> <Badge tone="ok" dot>ahead of forecast</Badge>
<span style={{ font: '400 12px var(--font-mono)', color: 'var(--ink-2)', whiteSpace: 'nowrap' }}>{forecastLabel}</span> <span style={{ font: '400 12px var(--font-mono)', color: 'var(--ink-2)', whiteSpace: 'nowrap' }}>80% Mar 312</span>
</div> </div>
</div> </div>
<Button variant="secondary" icon="arrow-up-right">Open in Gitea</Button> <Button variant="secondary" icon="arrow-up-right">Open in Gitea</Button>
@@ -73,25 +51,21 @@ export function MilestoneScreen({
{/* stats strip */} {/* stats strip */}
<Card flush> <Card flush>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Stat label="Scope" value={scopeStat} /> <Stat label="Scope" value="42 issues · est 61d" />
<Stat label="Done" value={doneStat} /> <Stat label="Done" value="24 · 57%" />
<Stat label="Forecast" value={forecastLabel} /> <Stat label="Forecast" value="80% Mar 312" />
<div style={{ flex: 1, padding: '12px 18px' }}> <div style={{ flex: 1, padding: '12px 18px' }}>
<div style={{ font: 'var(--text-overline)', letterSpacing: 'var(--letter-spacing-wide)', textTransform: 'uppercase', color: 'var(--ink-3)', marginBottom: 5 }}>Remaining</div> <div style={{ font: 'var(--text-overline)', letterSpacing: 'var(--letter-spacing-wide)', textTransform: 'uppercase', color: 'var(--ink-3)', marginBottom: 5 }}>Drift · 7d</div>
<div style={{ font: '500 14px var(--font-mono)', color: 'var(--ink-1)', whiteSpace: 'nowrap' }}>{data ? `${data.scopeCount - data.doneCount} open` : '2d · cone narrowed'}</div> <div style={{ font: '500 14px var(--font-mono)', color: 'var(--ok)', whiteSpace: 'nowrap' }}>2d · cone narrowed</div>
</div> </div>
</div> </div>
</Card> </Card>
<div style={{ display: 'grid', gridTemplateColumns: '1.2fr 1fr', gap: 14, alignItems: 'start' }}> <div style={{ display: 'grid', gridTemplateColumns: '1.2fr 1fr', gap: 14, alignItems: 'start' }}>
<Card overline="Burn-up" title={<>80% this lands <span style={{ whiteSpace: 'nowrap' }}>{data ? (data.forecastRange ?? 'shipped') : 'Mar 312'}</span></>} jade> <Card overline="Burn-up" title={<>80% this lands <span style={{ whiteSpace: 'nowrap' }}>Mar 312</span></>} jade>
<BurnUpCone data={data?.cone ?? undefined} /> <BurnUpCone />
<p style={{ font: 'var(--text-agent)', color: 'var(--ink-2)', margin: '10px 0 0' }}> <p style={{ font: 'var(--text-agent)', color: 'var(--ink-2)', margin: '10px 0 0' }}>
{data Comfortably ahead. Beta needs #87 more than it needs my commentary.
? data.cone
? `${data.scopeCount - data.doneCount} open of ${data.scopeCount}. Cone over what's left.`
: 'Everything here has shipped.'
: 'Comfortably ahead. Beta needs #87 more than it needs my commentary.'}
</p> </p>
</Card> </Card>

View File

@@ -1,35 +1,19 @@
import React from 'react' import React from 'react'
import { type CapacityMember, capacityPerWorkday } from '@commitea/core'
import { RunwayBar } from '../charts/chart.js' import { RunwayBar } from '../charts/chart.js'
import { Card, Badge, Tag, Icon, IconButton } from '../ui/index.js' import { Card, Badge, Tag, Icon, IconButton } from '../ui/index.js'
import { RUNWAY, CAPACITY, type RunwayMilestone } from '../../data/fixtures.js' import { RUNWAY, CAPACITY } from '../../data/fixtures.js'
// Runway — capacity vs milestone dates; ranges, never points. // Runway — capacity vs milestone dates; ranges, never points
// `milestones` (real per-milestone forecasts) + `capacity` (real config) override the demo.
export function RunwayScreen({ export function RunwayScreen({
onOpenCalibration, onOpenCalibration,
onOpenMilestone, onOpenMilestone,
calibration, calibration,
milestones,
capacity,
}: { }: {
onOpenCalibration: () => void onOpenCalibration: () => void
onOpenMilestone: (id?: number) => void onOpenMilestone: () => void
calibration?: { n: number; coldStart: boolean } calibration?: { n: number; coldStart: boolean }
milestones?: RunwayMilestone[]
capacity?: CapacityMember[]
}) { }) {
const rows = milestones && milestones.length ? milestones : RUNWAY
const capacityRows =
capacity && capacity.length
? capacity.map((m) => ({
who: m.person,
slices: `focus ${m.focusFactor} · alloc ${Math.round(m.allocation * 100)}%`,
hours: `${capacityPerWorkday(m).toFixed(2)} pd/day`,
}))
: CAPACITY
const calibNote = calibration const calibNote = calibration
? calibration.coldStart ? calibration.coldStart
? `cold-start priors · ${calibration.n}/20 closed issues estimated` ? `cold-start priors · ${calibration.n}/20 closed issues estimated`
@@ -44,8 +28,8 @@ export function RunwayScreen({
<Card overline="Milestones" flush> <Card overline="Milestones" flush>
<div> <div>
{rows.map((m, i) => ( {RUNWAY.map((m, i) => (
<div key={m.name} onClick={() => onOpenMilestone(m.id)} style={{ <div key={m.name} onClick={onOpenMilestone} style={{
display: 'grid', gridTemplateColumns: '160px 1fr 150px 90px', gap: 16, alignItems: 'center', cursor: 'pointer', display: 'grid', gridTemplateColumns: '160px 1fr 150px 90px', gap: 16, alignItems: 'center', cursor: 'pointer',
padding: '14px 20px', borderTop: i === 0 ? 'none' : '1px solid var(--line-1)', padding: '14px 20px', borderTop: i === 0 ? 'none' : '1px solid var(--line-1)',
}} }}
@@ -71,7 +55,7 @@ export function RunwayScreen({
<div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 14, alignItems: 'start' }}> <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 14, alignItems: 'start' }}>
<Card overline="Capacity" flush> <Card overline="Capacity" flush>
<div> <div>
{capacityRows.map((p, i) => ( {CAPACITY.map((p, i) => (
<div key={p.who} style={{ <div key={p.who} style={{
display: 'flex', alignItems: 'center', gap: 12, padding: '12px 20px', display: 'flex', alignItems: 'center', gap: 12, padding: '12px 20px',
borderTop: i === 0 ? 'none' : '1px solid var(--line-1)', borderTop: i === 0 ? 'none' : '1px solid var(--line-1)',

View File

@@ -1,22 +1,9 @@
import React from 'react' import React from 'react'
import type { PublicConfig } from '../../global.js'
import { Badge, Button, Card, Icon, IconButton, Input, Radio, Select, Switch, Tag } from '../ui/index.js' import { Badge, Button, Card, Icon, IconButton, Input, Radio, Select, Switch, Tag } from '../ui/index.js'
// Settings — gitea connection, sync, model roles, labels, rituals, appearance // Settings — gitea connection, sync, model roles, labels, rituals, appearance
export function SettingsScreen({ export function SettingsScreen({ dark, setDark }: { dark: boolean; setDark: (v: boolean) => void }) {
dark,
setDark,
connection,
onReconnect,
onDisconnect,
}: {
dark: boolean
setDark: (v: boolean) => void
connection?: PublicConfig | null
onReconnect?: () => void
onDisconnect?: () => void
}) {
const [webhooks, setWebhooks] = React.useState(true) const [webhooks, setWebhooks] = React.useState(true)
const [reconcile, setReconcile] = React.useState(true) const [reconcile, setReconcile] = React.useState(true)
const [poll, setPoll] = React.useState(true) const [poll, setPoll] = React.useState(true)
@@ -37,35 +24,25 @@ export function SettingsScreen({
</header> </header>
<Card overline="Gitea" title="Connection"> <Card overline="Gitea" title="Connection">
<div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}> <div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
{connection ? ( <Input label="Base URL" icon="link" mono defaultValue="https://gitea.stephenmann.io" />
<> <Input label="Access token" icon="keyboard" mono type="password" defaultValue="ct_9f2e81c4a7d6" hint="Scopes: repo, issue. Nothing more." />
<Row style={{ padding: '8px 12px', background: 'var(--paper-0)', border: '1px solid var(--line-1)', borderRadius: 'var(--radius-2)' }}> <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
<Icon name="git-branch" size={14} style={{ color: 'var(--ink-3)' }} /> <span style={{ font: '600 13px/1.2 var(--font-sans)', color: 'var(--ink-1)' }}>Managed repos</span>
<span style={{ font: 'var(--text-data)', color: 'var(--ink-1)', flex: 1 }}>{connection.owner}/{connection.repo}</span> <Row style={{ padding: '8px 12px', background: 'var(--paper-0)', border: '1px solid var(--line-1)', borderRadius: 'var(--radius-2)' }}>
<Badge tone="ok" dot>connected</Badge> <Icon name="git-branch" size={14} style={{ color: 'var(--ink-3)' }} />
</Row> <span style={{ font: 'var(--text-data)', color: 'var(--ink-1)', flex: 1 }}>stephen/commitea</span>
<Row style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', gap: 6 }}> <Badge tone="ok" dot>syncing</Badge>
<Icon name="link" size={12} />{connection.baseUrl} <IconButton icon="x" label="Stop managing" size="sm" />
</Row>
<Row style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', gap: 6 }}>
<Icon name="layers" size={12} />sidecar: {connection.pmStateRepo ?? `${connection.repo}-pm-state`}
</Row>
<Row style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', gap: 6 }}>
<Icon name="sparkles" size={12} />model: {connection.modelUrl ?? 'not set — chat off'}
</Row>
<Note>Your token is stored encrypted on this machine. Delete the sidecar and resync no truth is lost.</Note>
<Row style={{ gap: 8, marginTop: 2 }}>
<Button variant="secondary" size="sm" icon="settings-2" onClick={onReconnect}>Reconfigure</Button>
<Button variant="ghost" size="sm" onClick={onDisconnect}>Disconnect</Button>
</Row>
</>
) : (
<Row style={{ gap: 8 }}>
<Note>Not connected.</Note>
<Button variant="secondary" size="sm" onClick={onReconnect}>Connect</Button>
</Row> </Row>
)} <Row style={{ padding: '8px 12px', background: 'var(--paper-0)', border: '1px solid var(--line-1)', borderRadius: 'var(--radius-2)' }}>
<Icon name="layers" size={14} style={{ color: 'var(--ink-3)' }} />
<span style={{ font: 'var(--text-data)', color: 'var(--ink-1)', flex: 1 }}>stephen/pm-state</span>
<Badge>sidecar</Badge>
</Row>
<Note>The sidecar holds machine-derived state only. Delete it and resync no truth is lost.</Note>
<Button variant="secondary" size="sm" icon="plus" style={{ alignSelf: 'flex-start' }}>Add repo</Button>
</div>
</div> </div>
</Card> </Card>

View File

@@ -3,20 +3,9 @@ import React, { useEffect, useState } from 'react'
import logoIcon from '../../design/assets/logo-icon.png' import logoIcon from '../../design/assets/logo-icon.png'
import type { IssueChange } from '@commitea/core' import type { IssueChange } from '@commitea/core'
import type { PublicConfig } from '../../global.js'
import type { IssueRef } from '../../data/fixtures.js' import type { IssueRef } from '../../data/fixtures.js'
import { ConnectScreen } from '../screens/connect-screen.js' import { backlogCalibration, forecastBacklog, issuesToBoardColumns, scheduleFocus } from '../../lib/backlog.js'
import {
backlogCalibration,
capacityWorkers,
forecastBacklog,
issuesToBoardColumns,
milestoneView,
runwayView,
scheduleFocus,
} from '../../lib/backlog.js'
import { useBacklog } from '../../lib/use-backlog.js' import { useBacklog } from '../../lib/use-backlog.js'
import { useCapacity } from '../../lib/use-capacity.js'
import { PrimitivesGallery } from '../gallery.js' import { PrimitivesGallery } from '../gallery.js'
import { BoardScreen } from '../screens/board-screen.js' import { BoardScreen } from '../screens/board-screen.js'
import { CalibrationScreen } from '../screens/calibration-screen.js' import { CalibrationScreen } from '../screens/calibration-screen.js'
@@ -98,12 +87,7 @@ export function AppShell() {
const [offline, setOffline] = useState(false) const [offline, setOffline] = useState(false)
const [issue, setIssue] = useState<IssueRef | null>(null) const [issue, setIssue] = useState<IssueRef | null>(null)
const [readIds, setReadIds] = useState<number[]>([]) const [readIds, setReadIds] = useState<number[]>([])
const [milestoneId, setMilestoneId] = useState<number | null>(null)
const [gate, setGate] = useState<'checking' | 'connect' | 'ready'>('checking')
const [pubConfig, setPubConfig] = useState<PublicConfig | null>(null)
const [backlog, refetchBacklog] = useBacklog() const [backlog, refetchBacklog] = useBacklog()
const capacityMembers = useCapacity()
const workers = capacityWorkers(capacityMembers)
const boardColumns = const boardColumns =
backlog.status === 'ready' ? issuesToBoardColumns(backlog.issues, backlog.timelines) : undefined backlog.status === 'ready' ? issuesToBoardColumns(backlog.issues, backlog.timelines) : undefined
const focus = const focus =
@@ -112,40 +96,13 @@ export function AppShell() {
backlog.status === 'ready' ? backlogCalibration(backlog.issues, backlog.timelines) : undefined backlog.status === 'ready' ? backlogCalibration(backlog.issues, backlog.timelines) : undefined
const forecast = const forecast =
backlog.status === 'ready' backlog.status === 'ready'
? (forecastBacklog(backlog.issues, backlog.deps, new Date(), calibration?.model, workers) ?? undefined) ? (forecastBacklog(backlog.issues, backlog.deps, new Date(), calibration?.model) ?? undefined)
: undefined
const runwayMilestones =
backlog.status === 'ready'
? runwayView(backlog.issues, backlog.milestones, backlog.deps, new Date(), workers)
: undefined
const milestone =
backlog.status === 'ready' && milestoneId != null
? (milestoneView(
milestoneId,
backlog.issues,
backlog.milestones,
backlog.deps,
backlog.timelines,
calibration?.model,
new Date(),
workers,
) ?? undefined)
: undefined : undefined
useEffect(() => { useEffect(() => {
document.documentElement.setAttribute('data-theme', dark ? 'dark' : 'light') document.documentElement.setAttribute('data-theme', dark ? 'dark' : 'light')
}, [dark]) }, [dark])
// Gate: e2e/demo → the shell (fixtures); configured → the shell (real data);
// otherwise → the connect screen (each teammate brings their own token).
useEffect(() => {
window.commitea.gitea
.status()
.then((s) => setGate(s.demo || s.configured ? 'ready' : 'connect'))
.catch(() => setGate('connect'))
window.commitea.config.get().then(setPubConfig).catch(() => {})
}, [])
const openIssue = (ref: IssueRef) => { const openIssue = (ref: IssueRef) => {
if (view !== 'issue') setPrevView(view) if (view !== 'issue') setPrevView(view)
setIssue(ref) setIssue(ref)
@@ -237,19 +194,14 @@ export function AppShell() {
return ( return (
<RunwayScreen <RunwayScreen
onOpenCalibration={() => setView('calibration')} onOpenCalibration={() => setView('calibration')}
onOpenMilestone={(id) => { onOpenMilestone={() => setView('milestone')}
setMilestoneId(id ?? null)
setView('milestone')
}}
calibration={calibration ? { n: calibration.model.n, coldStart: calibration.model.coldStart } : undefined} calibration={calibration ? { n: calibration.model.n, coldStart: calibration.model.coldStart } : undefined}
milestones={runwayMilestones}
capacity={capacityMembers}
/> />
) )
case 'calibration': case 'calibration':
return <CalibrationScreen onBack={() => setView('runway')} data={calibration?.data} /> return <CalibrationScreen onBack={() => setView('runway')} data={calibration?.data} />
case 'milestone': case 'milestone':
return <MilestoneScreen onBack={() => setView('runway')} onOpenIssue={openIssue} data={milestone} /> return <MilestoneScreen onBack={() => setView('runway')} onOpenIssue={openIssue} />
case 'inbox': case 'inbox':
return ( return (
<InboxScreen <InboxScreen
@@ -264,20 +216,7 @@ export function AppShell() {
case 'directives': case 'directives':
return <DirectivesScreen /> return <DirectivesScreen />
case 'settings': case 'settings':
return ( return <SettingsScreen dark={dark} setDark={setDark} />
<SettingsScreen
dark={dark}
setDark={setDark}
connection={pubConfig}
onReconnect={() => setGate('connect')}
onDisconnect={() => {
void window.commitea.config.clear().then(() => {
setPubConfig(null)
setGate('connect')
})
}}
/>
)
case 'issue': case 'issue':
return issue ? ( return issue ? (
<IssueScreen <IssueScreen
@@ -297,23 +236,6 @@ export function AppShell() {
} }
} }
// Connection gate (real onboarding) comes before everything else.
if (gate === 'checking') {
return <div style={{ height: '100vh', background: 'var(--surface-app)' }} />
}
if (gate === 'connect') {
return (
<ConnectScreen
existing={pubConfig}
onConnected={() => {
window.commitea.config.get().then(setPubConfig).catch(() => {})
setGate('ready')
refetchBacklog()
}}
/>
)
}
// First run is full-window — no rail, no chat panel // First run is full-window — no rail, no chat panel
if (view === 'firstrun') { if (view === 'firstrun') {
return <OnboardingScreen onDone={(dest) => setView(dest)} /> return <OnboardingScreen onDone={(dest) => setView(dest)} />

View File

@@ -19,7 +19,7 @@ export interface ChatPanelProps {
} }
export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPanelProps) { export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPanelProps) {
const { msgs, thinking, live, model, steps, proposals, streaming, send: sendChat, approve, dismiss } = useChat(onApplyChange) const { msgs, thinking, live, model, steps, proposals, send: sendChat, approve, dismiss } = useChat(onApplyChange)
// shorten "google/gemma-4-26b-a4b-qat" → "gemma-4-26b" for the header chip // shorten "google/gemma-4-26b-a4b-qat" → "gemma-4-26b" for the header chip
const modelLabel = model ? (model.split('/').pop() ?? model).replace(/-(qat|instruct|it|gguf)$/i, '') : 'gemma-4' const modelLabel = model ? (model.split('/').pop() ?? model).replace(/-(qat|instruct|it|gguf)$/i, '') : 'gemma-4'
const [text, setText] = useState('') const [text, setText] = useState('')
@@ -28,7 +28,7 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
useEffect(() => { useEffect(() => {
const el = scrollRef.current const el = scrollRef.current
if (el) el.scrollTop = el.scrollHeight if (el) el.scrollTop = el.scrollHeight
}, [msgs, thinking, streaming]) }, [msgs, thinking])
const send = () => { const send = () => {
const t = text.trim() const t = text.trim()
@@ -62,7 +62,7 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
<Icon name="sparkles" size={16} style={{ color: offline ? 'var(--ink-3)' : 'var(--jade)' }} /> <Icon name="sparkles" size={16} style={{ color: offline ? 'var(--ink-3)' : 'var(--jade)' }} />
<span style={{ font: 'var(--text-body-strong)', color: 'var(--ink-1)' }}>Reginald</span> <span style={{ font: 'var(--text-body-strong)', color: 'var(--ink-1)' }}>Reginald</span>
<span style={{ font: '400 11px var(--font-mono)', color: 'var(--ink-3)', marginLeft: 'auto' }}> <span style={{ font: '400 11px var(--font-mono)', color: 'var(--ink-3)', marginLeft: 'auto' }}>
{offline ? 'offline · queueing' : live ? `${modelLabel} · local` : 'no model'} {offline ? 'offline · queueing' : live ? `${modelLabel} · local` : 'demo · scripted'}
</span> </span>
<IconButton icon="history" label="Directive log" size="sm" onClick={onOpenDirectives} /> <IconButton icon="history" label="Directive log" size="sm" onClick={onOpenDirectives} />
</header> </header>
@@ -98,17 +98,10 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
The model is away from its desk. Reads still work; writes will wait their turn. The model is away from its desk. Reads still work; writes will wait their turn.
</div> </div>
) : null} ) : null}
{streaming ? ( {thinking ? <div style={{ font: 'var(--text-agent)', color: 'var(--ink-3)' }}>considering</div> : null}
<div style={{ font: 'var(--text-agent)', color: 'var(--ink-1)', lineHeight: 1.55 }}>
{streaming}
<span style={{ opacity: 0.5 }}></span>
</div>
) : thinking ? (
<div style={{ font: 'var(--text-agent)', color: 'var(--ink-3)' }}>considering</div>
) : null}
{!thinking && steps.length ? ( {!thinking && steps.length ? (
<div style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', display: 'flex', alignItems: 'center', gap: 5 }}> <div style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', display: 'flex', alignItems: 'center', gap: 5 }}>
<Icon name="eye" size={11} /> consulted {Array.from(new Set(steps.map((s) => s.replace('query_project', 'the project').replace('propose_change', 'the labels').replace('record_directive', 'the directive ledger')))).join(', ')} <Icon name="eye" size={11} /> consulted {Array.from(new Set(steps.map((s) => s.replace('query_project', 'the project').replace('propose_change', 'the labels')))).join(', ')}
</div> </div>
) : null} ) : null}
{proposals.map((p) => ( {proposals.map((p) => (
@@ -161,8 +154,8 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
send() send()
} }
}} }}
placeholder={offline ? 'Writes wait for the connection…' : live ? 'Tell me what to do…' : 'Add a Model URL in Settings…'} placeholder={offline ? 'Writes wait for the connection…' : 'Tell me what to do…'}
disabled={offline || !live} disabled={offline}
rows={1} rows={1}
style={{ style={{
flex: 1, flex: 1,
@@ -180,15 +173,15 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
type="button" type="button"
onClick={send} onClick={send}
aria-label="Send" aria-label="Send"
disabled={offline || !live} disabled={offline}
style={{ style={{
width: 30, width: 30,
height: 30, height: 30,
borderRadius: 'var(--radius-2)', borderRadius: 'var(--radius-2)',
border: 'none', border: 'none',
cursor: offline || !live ? 'not-allowed' : 'pointer', cursor: offline ? 'not-allowed' : 'pointer',
background: offline || !live ? 'var(--paper-3)' : 'var(--accent)', background: offline ? 'var(--paper-3)' : 'var(--accent)',
color: offline || !live ? 'var(--ink-3)' : 'var(--ink-inverse)', color: offline ? 'var(--ink-3)' : 'var(--ink-inverse)',
display: 'inline-flex', display: 'inline-flex',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',

View File

@@ -315,8 +315,6 @@ export interface RunwayMilestone {
spread: number spread: number
tone: 'ok' | 'warn' tone: 'ok' | 'warn'
note: string note: string
/** gitea milestone id, for the drill-in (absent on the demo fixture). */
id?: number
} }
export const RUNWAY: RunwayMilestone[] = [ export const RUNWAY: RunwayMilestone[] = [

View File

@@ -1,11 +1,9 @@
import type { import type {
AgentStep, AgentStep,
CapacityMember,
ChangeProposal, ChangeProposal,
ChatMessage, ChatMessage,
CaptureProposal, CaptureProposal,
DependencyEdge, DependencyEdge,
DirectiveRecord,
GiteaIssue, GiteaIssue,
GiteaMilestone, GiteaMilestone,
IssueChange, IssueChange,
@@ -29,59 +27,17 @@ export type CaptureResult =
| { ok: false; reason: 'unconfigured' | 'error'; message?: string } | { ok: false; reason: 'unconfigured' | 'error'; message?: string }
| ({ ok: true } & CaptureProposal) | ({ ok: true } & CaptureProposal)
/** A reconciled snapshot as it crosses the bridge. */
export interface SnapshotPayload {
configured: boolean
issues: GiteaIssue[]
milestones: GiteaMilestone[]
deps: DependencyEdge[]
/** Normalized lifecycle events keyed by issue number. */
timelines: Record<number, LifecycleEvent[]>
/** true when served from the persisted cache (offline / instant boot). */
stale?: boolean
/** ISO time the persisted snapshot was reconciled (present on cached reads). */
savedAt?: string
}
/** Boot payload — the persisted snapshot, or a marker that there's none yet. */
export type BootPayload =
| { configured: false }
| { configured: true; cached: false }
| ({ configured: true; cached: true } & Omit<SnapshotPayload, 'configured'>)
/** The saved connection config (never includes the token). */
export interface PublicConfig {
baseUrl: string
owner: string
repo: string
pmStateRepo?: string
modelUrl?: string
hasToken: boolean
}
/** What the onboarding/settings form submits. */
export interface ConfigInput {
baseUrl: string
owner: string
repo: string
token: string
pmStateRepo?: string
modelUrl?: string
}
/** The config bridge for team onboarding. */
export interface ConfigBridge {
get(): Promise<PublicConfig | null>
test(cfg: ConfigInput): Promise<{ ok: boolean; error?: string }>
set(cfg: ConfigInput): Promise<{ ok: boolean }>
clear(): Promise<{ ok: boolean }>
}
/** The gitea bridge exposed by the preload over IPC (main-process backed). */ /** The gitea bridge exposed by the preload over IPC (main-process backed). */
export interface GiteaBridge { export interface GiteaBridge {
status(): Promise<{ configured: boolean; repo: string | null; demo: boolean }> status(): Promise<{ configured: boolean; repo: string | null }>
boot(): Promise<BootPayload> reconcile(): Promise<{
reconcile(): Promise<SnapshotPayload> configured: boolean
issues: GiteaIssue[]
milestones: GiteaMilestone[]
deps: DependencyEdge[]
/** Normalized lifecycle events keyed by issue number. */
timelines: Record<number, LifecycleEvent[]>
}>
getIssue(index: number): Promise<GiteaIssue | null> getIssue(index: number): Promise<GiteaIssue | null>
applyChange(change: IssueChange): Promise<ApplyChangeResult> applyChange(change: IssueChange): Promise<ApplyChangeResult>
createIssues(issues: ProposedIssue[]): Promise<CreateIssuesResult> createIssues(issues: ProposedIssue[]): Promise<CreateIssuesResult>
@@ -97,24 +53,6 @@ export interface ModelBridge {
status(): Promise<{ configured: boolean; model: string | null }> status(): Promise<{ configured: boolean; model: string | null }>
chat(messages: ChatMessage[]): Promise<ChatResult> chat(messages: ChatMessage[]): Promise<ChatResult>
capture(braindump: string): Promise<CaptureResult> capture(braindump: string): Promise<CaptureResult>
/** Subscribe to streamed prose tokens; returns an unsubscribe fn. */
onToken(cb: (delta: string) => void): () => void
}
/** The result of reading the directive ledger. */
export type DirectivesResult =
| { ok: false; reason: 'unconfigured' | 'error'; message?: string }
| { ok: true; directives: DirectiveRecord[] }
/** The result of reading the capacity config. */
export type CapacityResult =
| { ok: false; reason: 'unconfigured'; members: CapacityMember[] }
| { ok: true; members: CapacityMember[] }
/** The pm-state bridge (machine-derived state) exposed by the preload over IPC. */
export interface PmStateBridge {
directives(): Promise<DirectivesResult>
capacity(): Promise<CapacityResult>
} }
declare global { declare global {
@@ -123,8 +61,6 @@ declare global {
platform: string platform: string
gitea: GiteaBridge gitea: GiteaBridge
model: ModelBridge model: ModelBridge
pmstate: PmStateBridge
config: ConfigBridge
} }
} }
} }

View File

@@ -2,15 +2,11 @@ import {
type CalibrationModel, type CalibrationModel,
type CalibrationSample, type CalibrationSample,
calibrationSamples, calibrationSamples,
type CapacityMember,
capacityPerWorkday,
COLD_START_THRESHOLD, COLD_START_THRESHOLD,
type DependencyEdge, type DependencyEdge,
fitCalibration, fitCalibration,
forecast, forecast,
type Worker,
type GiteaIssue, type GiteaIssue,
type GiteaMilestone,
inferLifecycle, inferLifecycle,
type LifecycleColumn, type LifecycleColumn,
type LifecycleEvent, type LifecycleEvent,
@@ -20,17 +16,10 @@ import {
type ScheduledItem, type ScheduledItem,
selectFocus, selectFocus,
toDurationModel, toDurationModel,
workingDaysBetween,
} from '@commitea/core' } from '@commitea/core'
import { import { type BoardColumn, type BoardIssue, type CalibrationData, type FocusIssue } from '../data/fixtures.js'
type BoardColumn, import { type BurnUpData, buildBurnUpData } from './dates.js'
type BoardIssue,
type CalibrationData,
type FocusIssue,
type RunwayMilestone,
} from '../data/fixtures.js'
import { addWorkingDays, type BurnUpData, buildBurnUpData, formatRange, formatShort } from './dates.js'
type Timelines = Record<number, LifecycleEvent[]> type Timelines = Record<number, LifecycleEvent[]>
@@ -110,15 +99,9 @@ function toSchedulable(issues: GiteaIssue[]) {
labels: i.labels, labels: i.labels,
estimateDays: i.facts.estimateDays, estimateDays: i.facts.estimateDays,
priority: i.facts.priority, priority: i.facts.priority,
assignee: i.assignee,
})) }))
} }
/** gitea CapacityMembers → scheduler lanes (person + throughput). */
export function capacityWorkers(members: CapacityMember[]): Worker[] {
return members.map((m) => ({ person: m.person, speed: capacityPerWorkday(m) }))
}
export interface ForecastView { export interface ForecastView {
scope: number scope: number
cone: BurnUpData cone: BurnUpData
@@ -141,10 +124,9 @@ export function forecastBacklog(
deps: DependencyEdge[], deps: DependencyEdge[],
today: Date = new Date(), today: Date = new Date(),
calibration?: CalibrationModel, calibration?: CalibrationModel,
workers: Worker[] = [],
): ForecastView | null { ): ForecastView | null {
const model = calibration ? toDurationModel(calibration) : undefined const model = calibration ? toDurationModel(calibration) : undefined
const f = forecast(toSchedulable(issues), deps, { ...(model ? { model } : {}), workers }) const f = forecast(toSchedulable(issues), deps, model ? { model } : {})
const cone = buildBurnUpData(f, today) const cone = buildBurnUpData(f, today)
if (!cone) return null if (!cone) return null
return { return {
@@ -250,138 +232,3 @@ export function scheduleFocus(
later: toFocusIssue(f.later, inf), later: toFocusIssue(f.later, inf),
} }
} }
/**
* Per-milestone Monte Carlo forecast for the Runway screen — each open milestone's
* open scope gets its own cone, and the p80 landing is compared to the milestone's
* due date (ok/at-risk). Ranges, never point dates. Milestones with no open scope
* (already shipped) are omitted. Falls back to the demo when there's nothing real.
*/
export function runwayView(
issues: GiteaIssue[],
milestones: GiteaMilestone[],
deps: DependencyEdge[],
today: Date = new Date(),
workers: Worker[] = [],
): RunwayMilestone[] {
const open = issues.filter((i) => i.state === 'open')
const rows = milestones
.filter((m) => m.state === 'open')
.map((m) => ({ m, scope: open.filter((i) => i.milestone?.id === m.id) }))
.filter((x) => x.scope.length > 0)
.map(({ m, scope }) => {
const f = forecast(
scope.map((i) => ({
number: i.number,
title: i.title,
labels: i.labels,
estimateDays: i.facts.estimateDays,
priority: i.facts.priority,
assignee: i.assignee,
})),
deps,
{ workers },
)
const p90 = f.curve.length ? f.curve[f.curve.length - 1].p90Day : f.p95Day
const dueDay = m.dueOn ? workingDaysBetween(today, new Date(m.dueOn)) : null
return { m, p50: f.p50Day, p80: f.p80Day, p90, dueDay }
})
const horizon = Math.max(1, ...rows.map((r) => Math.max(r.p90, r.dueDay ?? 0)))
return rows.map(({ m, p50, p80, p90, dueDay }) => {
const onTrack = dueDay == null || p80 <= dueDay
return {
id: m.id,
name: m.title,
due: m.dueOn ? formatShort(new Date(m.dueOn)) : 'no date',
hard: false,
p80: formatRange(addWorkingDays(today, p50), addWorkingDays(today, p90)),
pos: p80 / horizon,
spread: Math.min(0.6, (p90 - p50) / horizon),
tone: onTrack ? ('ok' as const) : ('warn' as const),
note: dueDay == null ? `${Math.ceil(p80)}d of work` : onTrack ? 'on track' : 'at risk',
}
})
}
export interface MilestoneGroup {
label: string
issues: { id: number; title: string; labels: string[]; days?: string }[]
}
export interface MilestoneView {
name: string
due: string
soft: boolean
scopeCount: number
scopeEstDays: number
doneCount: number
donePct: number
/** p50..p90 landing range for the remaining open scope; null when nothing's open. */
forecastRange: string | null
cone: BurnUpData | null
groups: MilestoneGroup[]
}
/**
* The Milestone drill-in: real scope, done %, a Monte Carlo cone over the
* milestone's remaining open work, and its issues grouped by lifecycle column.
* Returns null for an unknown id — the screen then shows the demo fixture.
*/
export function milestoneView(
id: number,
issues: GiteaIssue[],
milestones: GiteaMilestone[],
deps: DependencyEdge[],
timelines: Timelines = {},
calibration?: CalibrationModel,
today: Date = new Date(),
workers: Worker[] = [],
): MilestoneView | null {
const m = milestones.find((x) => x.id === id)
if (!m) return null
const all = issues.filter((i) => i.milestone?.id === id)
const open = all.filter((i) => i.state === 'open')
const done = all.filter((i) => i.state === 'closed')
const scopeEstDays = all.reduce((sum, i) => sum + (i.facts.estimateDays ?? 2), 0)
const model = calibration ? toDurationModel(calibration) : undefined
const f = forecast(
open.map((i) => ({
number: i.number,
title: i.title,
labels: i.labels,
estimateDays: i.facts.estimateDays,
priority: i.facts.priority,
assignee: i.assignee,
})),
deps,
{ ...(model ? { model } : {}), workers },
)
const cone = buildBurnUpData(f, today)
const inf = inferAll(all, timelines, today)
const groups: MilestoneGroup[] = COLUMN_ORDER.map((key) => ({
label: COLUMN_LABELS[key],
issues: all
.filter((i) => inf.get(i.number)!.column === key)
.map((i) => {
const days = inf.get(i.number)!.steepingDays
return { id: i.number, title: i.title, labels: i.labels, days: days != null ? `${days}d` : undefined }
}),
})).filter((g) => g.issues.length > 0)
return {
name: m.title,
due: m.dueOn ? formatShort(new Date(m.dueOn)) : 'no date',
soft: true,
scopeCount: all.length,
scopeEstDays,
doneCount: done.length,
donePct: all.length ? Math.round((done.length / all.length) * 100) : 0,
forecastRange: cone ? cone.rangeLabel : null,
cone,
groups,
}
}

View File

@@ -12,18 +12,13 @@ export type BacklogState =
milestones: GiteaMilestone[] milestones: GiteaMilestone[]
deps: DependencyEdge[] deps: DependencyEdge[]
timelines: Record<number, LifecycleEvent[]> timelines: Record<number, LifecycleEvent[]>
/** true while showing the persisted snapshot (instant boot / offline). */
stale: boolean
/** ISO time the shown snapshot was reconciled, when stale. */
savedAt?: string
} }
/** /**
* Reconcile the managed repo through the main-process bridge, stale-while- * Reconcile the managed repo through the main-process bridge. Runs once on
* revalidate: on mount it shows the persisted snapshot instantly (marked stale), * mount; the returned `refetch` re-reconciles after a write so the board and
* then a fresh reconcile supersedes it. If gitea is unreachable, the fresh * forecast reflect the change. `unconfigured` means no token — the UI falls
* reconcile falls back to the persisted snapshot (offline). `refetch` re-syncs * back to demo fixtures. Errors (network, bad token) surface as `error`.
* after a write. `unconfigured` means no token — the UI uses demo fixtures.
*/ */
export function useBacklog(): [BacklogState, () => void] { export function useBacklog(): [BacklogState, () => void] {
const [state, setState] = useState<BacklogState>({ status: 'loading' }) const [state, setState] = useState<BacklogState>({ status: 'loading' })
@@ -32,30 +27,6 @@ export function useBacklog(): [BacklogState, () => void] {
useEffect(() => { useEffect(() => {
let alive = true let alive = true
// instant boot from the persisted snapshot (only on first mount, not refetch)
if (nonce === 0) {
window.commitea.gitea
.boot()
.then((b) => {
if (!alive || !('cached' in b) || !b.cached) return
setState((prev) =>
prev.status === 'ready' && !prev.stale
? prev // a fresh reconcile already won the race
: {
status: 'ready',
issues: b.issues,
milestones: b.milestones,
deps: b.deps,
timelines: b.timelines,
stale: true,
savedAt: b.savedAt,
},
)
})
.catch(() => {})
}
window.commitea.gitea window.commitea.gitea
.reconcile() .reconcile()
.then((r) => { .then((r) => {
@@ -68,19 +39,12 @@ export function useBacklog(): [BacklogState, () => void] {
milestones: r.milestones, milestones: r.milestones,
deps: r.deps, deps: r.deps,
timelines: r.timelines, timelines: r.timelines,
stale: r.stale ?? false,
savedAt: r.savedAt,
} }
: { status: 'unconfigured' }, : { status: 'unconfigured' },
) )
}) })
.catch((e: unknown) => { .catch((e: unknown) => {
if (alive) { if (alive) setState({ status: 'error', message: e instanceof Error ? e.message : String(e) })
// keep a shown boot snapshot rather than clobbering it with an error
setState((prev) =>
prev.status === 'ready' ? prev : { status: 'error', message: e instanceof Error ? e.message : String(e) },
)
}
}) })
return () => { return () => {
alive = false alive = false

View File

@@ -1,24 +0,0 @@
import { useEffect, useState } from 'react'
import type { CapacityMember } from '@commitea/core'
/**
* The team's capacity config from the pm-state repo. Empty when unconfigured —
* forecasts then fall back to a single serial worker. Read once on mount.
*/
export function useCapacity(): CapacityMember[] {
const [members, setMembers] = useState<CapacityMember[]>([])
useEffect(() => {
let alive = true
window.commitea.pmstate
.capacity()
.then((r) => {
if (alive) setMembers(r.members)
})
.catch(() => {})
return () => {
alive = false
}
}, [])
return members
}

View File

@@ -2,18 +2,13 @@ import { useCallback, useEffect, useRef, useState } from 'react'
import type { ChangeProposal, ChatMessage as WireMessage, IssueChange } from '@commitea/core' import type { ChangeProposal, ChatMessage as WireMessage, IssueChange } from '@commitea/core'
import { CHAT, type ChatMessage } from '../data/fixtures.js' import { CANNED_REPLY, CHAT, type ChatMessage } from '../data/fixtures.js'
const LIVE_GREETING: ChatMessage = { const LIVE_GREETING: ChatMessage = {
from: 'agent', from: 'agent',
text: 'Morning. Ask me anything about the project — I check the real board before I answer.', text: 'Morning. Ask me anything about the project — I check the real board before I answer.',
} }
const NO_MODEL: ChatMessage = {
from: 'agent',
text: "Reginald is off — I need a model. Add a Model URL in Settings and chat turns on.",
}
export interface ChatState { export interface ChatState {
msgs: ChatMessage[] msgs: ChatMessage[]
thinking: boolean thinking: boolean
@@ -25,8 +20,6 @@ export interface ChatState {
steps: string[] steps: string[]
/** Changes Reginald has proposed and is awaiting approval on. */ /** Changes Reginald has proposed and is awaiting approval on. */
proposals: ChangeProposal[] proposals: ChangeProposal[]
/** The in-flight streamed prose (grows token-by-token) before the turn finalizes. */
streaming: string
send: (text: string) => void send: (text: string) => void
approve: (p: ChangeProposal) => void approve: (p: ChangeProposal) => void
dismiss: (p: ChangeProposal) => void dismiss: (p: ChangeProposal) => void
@@ -48,7 +41,6 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
const [model, setModel] = useState<string | null>(null) const [model, setModel] = useState<string | null>(null)
const [steps, setSteps] = useState<string[]>([]) const [steps, setSteps] = useState<string[]>([])
const [proposals, setProposals] = useState<ChangeProposal[]>([]) const [proposals, setProposals] = useState<ChangeProposal[]>([])
const [streaming, setStreaming] = useState('')
const convoRef = useRef(convo) const convoRef = useRef(convo)
convoRef.current = convo convoRef.current = convo
@@ -60,14 +52,10 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
window.commitea.model window.commitea.model
.status() .status()
.then((s) => { .then((s) => {
if (!alive) return if (alive && s.configured) {
if (s.configured) {
setLive(true) setLive(true)
setModel(s.model) setModel(s.model)
setSeed([LIVE_GREETING]) setSeed([LIVE_GREETING])
} else {
// no model → clean "off" state, not a scripted fixture reply
setSeed([NO_MODEL])
} }
}) })
.catch(() => {}) .catch(() => {})
@@ -87,8 +75,10 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
setProposals([]) setProposals([])
if (!live) { if (!live) {
// no model configured — nothing to send (composer is disabled anyway) window.setTimeout(() => {
setThinking(false) setThinking(false)
setConvo((c) => [...c, { from: 'agent', text: CANNED_REPLY }])
}, 900)
return return
} }
@@ -96,17 +86,10 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
role: m.from === 'user' ? 'user' : 'assistant', role: m.from === 'user' ? 'user' : 'assistant',
content: m.text, content: m.text,
})) }))
setStreaming('')
const unsubscribe = window.commitea.model.onToken((delta) => setStreaming((s) => s + delta))
const finish = () => {
unsubscribe()
setThinking(false)
setStreaming('')
}
window.commitea.model window.commitea.model
.chat(wire) .chat(wire)
.then((res) => { .then((res) => {
finish() setThinking(false)
if (res.ok) { if (res.ok) {
setSteps(res.steps.map((s) => s.tool)) setSteps(res.steps.map((s) => s.tool))
setProposals(res.proposals) setProposals(res.proposals)
@@ -122,7 +105,7 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
} }
}) })
.catch(() => { .catch(() => {
finish() setThinking(false)
setConvo((c) => [...c, { from: 'agent', text: 'I could not reach the model.' }]) setConvo((c) => [...c, { from: 'agent', text: 'I could not reach the model.' }])
}) })
}, },
@@ -154,5 +137,5 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
setConvo((c) => [...c, { from: 'agent', text: `Left #${p.change.issue} as it was.` }]) setConvo((c) => [...c, { from: 'agent', text: `Left #${p.change.issue} as it was.` }])
}, []) }, [])
return { msgs: [...seed, ...convo], thinking, live, model, steps, proposals, streaming, send, approve, dismiss } return { msgs: [...seed, ...convo], thinking, live, model, steps, proposals, send, approve, dismiss }
} }

View File

@@ -1,4 +1,4 @@
import { beforeAll, describe, expect, it } from 'vitest' import { describe, expect, it } from 'vitest'
import { extractLabelFacts } from '../labels/label-schema.js' import { extractLabelFacts } from '../labels/label-schema.js'
import type { FetchLike, GiteaIssue } from '../gitea/types.js' import type { FetchLike, GiteaIssue } from '../gitea/types.js'
@@ -10,22 +10,11 @@ import { buildProjectView, type ProjectSnapshot } from './query-project.js'
/** /**
* Opt-in (COMMITEA_MODEL_LIVE=1). Drives the real chat client + agent loop * Opt-in (COMMITEA_MODEL_LIVE=1). Drives the real chat client + agent loop
* against a local OpenAI-compatible server (LM Studio on :1234 by default), * against a local OpenAI-compatible server (LM Studio on :1234 by default),
* proving the model calls the tools and narrates the real result. The model is * proving the model calls query_project and narrates the real result.
* whatever is loaded (via LM Studio's native API), so it never JIT-swaps.
*/ */
const LIVE = !!process.env.COMMITEA_MODEL_LIVE const LIVE = !!process.env.COMMITEA_MODEL_LIVE
const BASE = process.env.COMMITEA_MODEL_URL ?? 'http://localhost:1234/v1' const BASE = process.env.COMMITEA_MODEL_URL ?? 'http://localhost:1234/v1'
let MODEL = process.env.COMMITEA_MODEL_SMALL ?? '' const MODEL = process.env.COMMITEA_MODEL_SMALL ?? 'google/gemma-4-e4b'
beforeAll(async () => {
if (!LIVE || MODEL) return
const root = BASE.replace(/\/v1\/?$/, '')
const loaded = await fetch(`${root}/api/v0/models`)
.then((r) => (r.ok ? (r.json() as Promise<{ data?: { id: string; state?: string; type?: string }[] }>) : null))
.then((d) => d?.data?.find((m) => m.state === 'loaded' && m.type !== 'embeddings')?.id)
.catch(() => undefined)
MODEL = loaded ?? 'google/gemma-4-e4b'
})
function issue(over: Partial<GiteaIssue>): GiteaIssue { function issue(over: Partial<GiteaIssue>): GiteaIssue {
const labels = over.labels ?? [] const labels = over.labels ?? []
@@ -70,34 +59,4 @@ describe('agent loop (live model)', () => {
}, },
60_000, 60_000,
) )
it.skipIf(!LIVE)(
'records a standing instruction via record_directive',
async () => {
const client = createChatClient({ baseUrl: BASE, model: MODEL }, globalThis.fetch as unknown as FetchLike)
const recorded: unknown[] = []
const turn = await runAgentTurn({
complete: (m, t) => client.complete(m, t),
messages: [
{ role: 'system', content: REGINALD_SYSTEM },
{ role: 'user', content: 'Log this standing directive: pilots come first, everything else waits.' },
],
tools: REGINALD_TOOLS,
execute: async (name, args) => {
if (name === 'record_directive') {
recorded.push(args)
return { recorded: { kind: (args as { kind?: string }).kind ?? 'note' } }
}
return name === 'query_project'
? buildProjectView((args as { view: any }).view, (args as any).filters, SNAP, new Date())
: { error: `unknown tool ${name}` }
},
})
// the model logged the directive rather than trying to apply it
expect(turn.steps.some((s) => s.tool === 'record_directive')).toBe(true)
expect(recorded.length).toBeGreaterThan(0)
},
60_000,
)
}) })

View File

@@ -31,20 +31,18 @@ function stringify(result: unknown): string {
} }
export async function runAgentTurn(opts: { export async function runAgentTurn(opts: {
complete: (messages: ChatMessage[], tools?: ToolDecl[], onToken?: (delta: string) => void) => Promise<CompletionResult> complete: (messages: ChatMessage[], tools?: ToolDecl[]) => Promise<CompletionResult>
messages: ChatMessage[] messages: ChatMessage[]
tools: ToolDecl[] tools: ToolDecl[]
execute: ToolExecutor execute: ToolExecutor
maxSteps?: number maxSteps?: number
/** Streams content deltas as the model produces prose (final-answer streaming). */
onToken?: (delta: string) => void
}): Promise<AgentTurn> { }): Promise<AgentTurn> {
const maxSteps = opts.maxSteps ?? DEFAULT_MAX_STEPS const maxSteps = opts.maxSteps ?? DEFAULT_MAX_STEPS
const convo: ChatMessage[] = [...opts.messages] const convo: ChatMessage[] = [...opts.messages]
const steps: AgentStep[] = [] const steps: AgentStep[] = []
for (let step = 0; step < maxSteps; step++) { for (let step = 0; step < maxSteps; step++) {
const { content, toolCalls } = await opts.complete(convo, opts.tools, opts.onToken) const { content, toolCalls } = await opts.complete(convo, opts.tools)
if (toolCalls.length === 0) { if (toolCalls.length === 0) {
convo.push({ role: 'assistant', content }) convo.push({ role: 'assistant', content })
return { content, steps, messages: convo } return { content, steps, messages: convo }
@@ -65,7 +63,7 @@ export async function runAgentTurn(opts: {
} }
// Out of tool budget — force a final prose answer with tools withheld. // Out of tool budget — force a final prose answer with tools withheld.
const final = await opts.complete(convo, [], opts.onToken) const final = await opts.complete(convo, [])
convo.push({ role: 'assistant', content: final.content }) convo.push({ role: 'assistant', content: final.content })
return { content: final.content, steps, messages: convo } return { content: final.content, steps, messages: convo }
} }

View File

@@ -52,40 +52,13 @@ export const PROPOSE_CHANGE_TOOL: ToolDecl = {
}, },
} }
export const RECORD_DIRECTIVE_TOOL: ToolDecl = { export const REGINALD_TOOLS: ToolDecl[] = [QUERY_PROJECT_TOOL, PROPOSE_CHANGE_TOOL]
name: 'record_directive',
description:
'Log a standing instruction from the PM to the durable directive ledger — a reprioritization, ' +
'a re-estimate policy, a deadline, a scope or capacity call, or a plain note. Use it when the user ' +
'states intent that should persist ("pilots come first", "freeze scope for beta"). This records the ' +
'intent verbatim; the actual issue edits still go through propose_change.',
parameters: {
type: 'object',
properties: {
kind: { type: 'string', enum: ['reprioritize', 'reestimate', 'set-deadline', 'scope', 'capacity', 'note'] },
quote: { type: 'string', description: "the PM's own words, stored verbatim" },
target: {
type: 'object',
properties: {
issue: { type: 'number' },
milestone: { type: 'number' },
member: { type: 'string' },
},
},
rationale: { type: 'string', description: 'why (optional)' },
},
required: ['kind', 'quote'],
},
}
export const REGINALD_TOOLS: ToolDecl[] = [QUERY_PROJECT_TOOL, PROPOSE_CHANGE_TOOL, RECORD_DIRECTIVE_TOOL]
export const REGINALD_SYSTEM = [ export const REGINALD_SYSTEM = [
'You are Reginald, the calm, dry project manager inside CommiTea — a tool that runs projects on Gitea.', '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.', '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.', '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 or priority, 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.', '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.', 'Refer to issues as #<number>. Be brief and plain — a sentence or two. No preamble, no bullet dumps.',
].join(' ') ].join(' ')

View File

@@ -25,48 +25,6 @@ describe('createChatClient', () => {
return { fetch, calls } return { fetch, calls }
} }
function sseStub(chunks: string[]) {
const calls: { url: string; body: unknown }[] = []
const fetch: FetchLike = (url, init) => {
calls.push({ url, body: init?.body ? JSON.parse(init.body) : undefined })
const enc = new TextEncoder()
const body = new ReadableStream<Uint8Array>({
start(c) {
for (const ch of chunks) c.enqueue(enc.encode(ch))
c.close()
},
})
return Promise.resolve({ ok: true, status: 200, body, json: () => Promise.resolve({}), text: () => Promise.resolve('') })
}
return { fetch, calls }
}
it('streams content deltas via onToken and returns the assembled result', async () => {
const { fetch, calls } = sseStub([
'data: {"choices":[{"delta":{"content":"Right "}}]}\n\n',
'data: {"choices":[{"delta":{"content":"now: #2."}}]}\n\n',
'data: [DONE]\n\n',
])
const client = createChatClient({ baseUrl: 'http://x/v1', model: 'm' }, fetch)
const tokens: string[] = []
const res = await client.complete([{ role: 'user', content: 'now?' }], undefined, (d) => tokens.push(d))
expect(tokens).toEqual(['Right ', 'now: #2.'])
expect(res.content).toBe('Right now: #2.')
expect((calls[0].body as { stream?: boolean }).stream).toBe(true)
})
it('assembles a streamed tool call from argument deltas', async () => {
const { fetch } = sseStub([
'data: {"choices":[{"delta":{"tool_calls":[{"index":0,"id":"c1","function":{"name":"query_project","arguments":"{\\"view\\""}}]}}]}\n\n',
'data: {"choices":[{"delta":{"tool_calls":[{"index":0,"function":{"arguments":":\\"focus\\"}"}}]}}]}\n\n',
'data: [DONE]\n\n',
])
const client = createChatClient({ baseUrl: 'http://x/v1', model: 'm' }, fetch)
const res = await client.complete([{ role: 'user', content: 'x' }], [{ name: 'query_project', description: '', parameters: {} }], () => {})
expect(res.toolCalls).toEqual([{ id: 'c1', name: 'query_project', arguments: '{"view":"focus"}' }])
})
it('POSTs to /chat/completions and parses content', async () => { it('POSTs to /chat/completions and parses content', async () => {
const { fetch, calls } = stub({ choices: [{ message: { content: 'the focus is #2' } }] }) const { fetch, calls } = stub({ choices: [{ message: { content: 'the focus is #2' } }] })
const client = createChatClient({ baseUrl: 'http://localhost:1234/v1', model: 'gemma' }, fetch) const client = createChatClient({ baseUrl: 'http://localhost:1234/v1', model: 'gemma' }, fetch)

View File

@@ -48,12 +48,8 @@ export interface CompletionResult {
toolCalls: ToolCall[] toolCalls: ToolCall[]
} }
/** Called with each streamed content delta (final-prose streaming). */
export type OnToken = (delta: string) => void
export interface ChatClient { export interface ChatClient {
/** When `onToken` is given, the response streams (SSE) and each content delta is emitted. */ complete(messages: ChatMessage[], tools?: ToolDecl[]): Promise<CompletionResult>
complete(messages: ChatMessage[], tools?: ToolDecl[], onToken?: OnToken): Promise<CompletionResult>
} }
/** Map our message shape to the OpenAI wire shape. */ /** Map our message shape to the OpenAI wire shape. */
@@ -89,7 +85,7 @@ export function createChatClient(config: ModelConfig, fetchImpl: FetchLike): Cha
const url = `${config.baseUrl.replace(/\/+$/, '')}/chat/completions` const url = `${config.baseUrl.replace(/\/+$/, '')}/chat/completions`
return { return {
async complete(messages, tools, onToken) { async complete(messages, tools) {
const body: Record<string, unknown> = { const body: Record<string, unknown> = {
model: config.model, model: config.model,
messages: messages.map(toWireMessage), messages: messages.map(toWireMessage),
@@ -99,13 +95,11 @@ export function createChatClient(config: ModelConfig, fetchImpl: FetchLike): Cha
body.tools = tools.map(toWireTool) body.tools = tools.map(toWireTool)
body.tool_choice = 'auto' body.tool_choice = 'auto'
} }
const stream = !!onToken
if (stream) body.stream = true
const res = await fetchImpl(url, { const res = await fetchImpl(url, {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
Accept: stream ? 'text/event-stream' : 'application/json', Accept: 'application/json',
...(config.apiKey ? { Authorization: `Bearer ${config.apiKey}` } : {}), ...(config.apiKey ? { Authorization: `Bearer ${config.apiKey}` } : {}),
}, },
body: JSON.stringify(body), body: JSON.stringify(body),
@@ -114,8 +108,6 @@ export function createChatClient(config: ModelConfig, fetchImpl: FetchLike): Cha
const text = await res.text().catch(() => '') const text = await res.text().catch(() => '')
throw new Error(`model completion failed (${res.status}): ${text.slice(0, 200)}`) throw new Error(`model completion failed (${res.status}): ${text.slice(0, 200)}`)
} }
if (stream && res.body) return readStream(res.body, onToken!)
const json = (await res.json()) as { choices?: { message: RawChoiceMessage }[] } const json = (await res.json()) as { choices?: { message: RawChoiceMessage }[] }
const msg = json.choices?.[0]?.message const msg = json.choices?.[0]?.message
return { return {
@@ -129,56 +121,3 @@ export function createChatClient(config: ModelConfig, fetchImpl: FetchLike): Cha
}, },
} }
} }
/** Streamed tool-call delta: name arrives first, arguments accumulate across chunks. */
interface RawToolDelta {
index: number
id?: string
function?: { name?: string; arguments?: string }
}
/** Parse an OpenAI SSE stream: emit content deltas via onToken, accumulate the final result. */
async function readStream(body: ReadableStream<Uint8Array>, onToken: OnToken): Promise<CompletionResult> {
const reader = body.getReader()
const decoder = new TextDecoder()
let buffer = ''
let content = ''
const toolAcc: { id: string; name: string; arguments: string }[] = []
const handle = (data: string) => {
if (data === '[DONE]') return
let chunk: { choices?: { delta?: { content?: string; tool_calls?: RawToolDelta[] } }[] }
try {
chunk = JSON.parse(data)
} catch {
return
}
const delta = chunk.choices?.[0]?.delta
if (!delta) return
if (delta.content) {
content += delta.content
onToken(delta.content)
}
for (const tc of delta.tool_calls ?? []) {
const slot = (toolAcc[tc.index] ??= { id: '', name: '', arguments: '' })
if (tc.id) slot.id = tc.id
if (tc.function?.name) slot.name = tc.function.name
if (tc.function?.arguments) slot.arguments += tc.function.arguments
}
}
for (;;) {
const { done, value } = await reader.read()
if (done) break
buffer += decoder.decode(value, { stream: true })
const lines = buffer.split('\n')
buffer = lines.pop() ?? ''
for (const line of lines) {
const t = line.trim()
if (t.startsWith('data:')) handle(t.slice(5).trim())
}
}
if (buffer.trim().startsWith('data:')) handle(buffer.trim().slice(5).trim())
return { content, toolCalls: toolAcc.filter((t) => t.name).map((t) => ({ id: t.id, name: t.name, arguments: t.arguments })) }
}

View File

@@ -1,88 +0,0 @@
import { describe, expect, it } from 'vitest'
import { type DependencyEdge, type SchedulableIssue } from '../scheduler/scheduler-v0.js'
import { makespan, scheduleWithCapacity, type Worker } from '../scheduler/scheduler-capacity-v0.js'
import { capacityPerWorkday, parseCapacityConfig } from './capacity-v0.js'
describe('capacity model', () => {
it('capacityPerWorkday = focusFactor × allocation', () => {
expect(capacityPerWorkday({ person: 'a', focusFactor: 0.8, allocation: 0.5 })).toBeCloseTo(0.4)
})
it('parses + clamps config, drops invalid members', () => {
const members = parseCapacityConfig({
members: [
{ person: 'christian', focusFactor: 0.8, allocation: 1 },
{ person: 'ak', focusFactor: 1.5, allocation: -1 }, // clamps to 1 / 0 → zero capacity → dropped
{ focusFactor: 0.8 }, // no person → dropped
],
})
expect(members).toEqual([{ person: 'christian', focusFactor: 0.8, allocation: 1 }])
})
it('returns [] for a non-array/absent members field', () => {
expect(parseCapacityConfig({})).toEqual([])
expect(parseCapacityConfig({ members: 'nope' })).toEqual([])
})
})
function issue(number: number, over: Partial<SchedulableIssue> = {}): SchedulableIssue {
return { number, title: `#${number}`, labels: [], estimateDays: 4, priority: 2, ...over }
}
describe('scheduleWithCapacity', () => {
it('with no workers, falls back to the single serial plan', () => {
const issues = [issue(1), issue(2)]
const plan = scheduleWithCapacity(issues, [], [])
expect(makespan(plan)).toBe(8) // 4 + 4 serial
})
it('parallelizes independent work across lanes (makespan shrinks)', () => {
const issues = [issue(1), issue(2), issue(3), issue(4)] // 4×4d = 16d serial
const one: Worker[] = [{ person: 'a', speed: 1 }]
const two: Worker[] = [
{ person: 'a', speed: 1 },
{ person: 'b', speed: 1 },
]
expect(makespan(scheduleWithCapacity(issues, [], one))).toBe(16)
expect(makespan(scheduleWithCapacity(issues, [], two))).toBe(8) // two lanes → half
})
it('scales duration by a lane speed (slower lane takes longer)', () => {
const plan = scheduleWithCapacity([issue(1, { estimateDays: 4 })], [], [{ person: 'a', speed: 0.5 }])
expect(plan.items[0].durationDays).toBe(8) // 4 / 0.5
expect(plan.items[0].worker).toBe('a')
})
it('routes an issue to its assignee lane', () => {
const issues = [issue(1, { assignee: 'ak' }), issue(2, { assignee: 'sm' })]
const workers: Worker[] = [
{ person: 'ak', speed: 1 },
{ person: 'sm', speed: 1 },
]
const plan = scheduleWithCapacity(issues, [], workers)
const byN = Object.fromEntries(plan.items.map((i) => [i.number, i]))
expect(byN[1].worker).toBe('ak')
expect(byN[2].worker).toBe('sm')
// both start at 0 (different lanes) → parallel
expect(byN[1].startDay).toBe(0)
expect(byN[2].startDay).toBe(0)
})
it('adds a lane for an assignee not in the config (mean speed)', () => {
const plan = scheduleWithCapacity([issue(1, { assignee: 'newbie' })], [], [{ person: 'a', speed: 0.5 }])
expect(plan.items[0].worker).toBe('newbie')
expect(plan.items[0].durationDays).toBe(8) // mean speed 0.5 → 4/0.5
})
it('respects dependencies across lanes (a blocker finishes before its dependent starts)', () => {
const edges: DependencyEdge[] = [{ issue: 2, dependsOn: 1 }]
const workers: Worker[] = [
{ person: 'a', speed: 1 },
{ person: 'b', speed: 1 },
]
const plan = scheduleWithCapacity([issue(1), issue(2)], edges, workers)
const byN = Object.fromEntries(plan.items.map((i) => [i.number, i]))
expect(byN[2].startDay).toBeGreaterThanOrEqual(byN[1].endDay) // #2 waits for #1 even on another lane
})
})

View File

@@ -1,49 +0,0 @@
/**
* Capacity model (#8). A member's throughput is `focusFactor × allocation` =
* ideal person-days of project work delivered per calendar working day. The
* scheduler treats each member as a lane whose task durations are scaled by that
* rate (a 0.5-capacity person takes twice as long on an est/2d task). Config
* lives in the pm-state repo (`capacity/members.yaml/json`, D4); estimates are
* in ideal person-days (pm-state.md).
*/
export interface CapacityMember {
/** gitea login. */
person: string
/** Productive fraction of a working day (0..1). */
focusFactor: number
/** Fraction of that allocated to this project (0..1). */
allocation: number
}
/** Ideal person-days delivered per calendar working day. */
export function capacityPerWorkday(m: CapacityMember): number {
return m.focusFactor * m.allocation
}
function clamp01(n: unknown, fallback: number): number {
return typeof n === 'number' && Number.isFinite(n) ? Math.min(1, Math.max(0, n)) : fallback
}
/**
* Validate a raw capacity config (`{ members: [...] }`) into members. Unknown
* shapes degrade to `[]` (→ the scheduler falls back to a single worker), never
* throw. focusFactor/allocation clamp to [0,1]; a member without a person is dropped.
*/
export function parseCapacityConfig(raw: unknown): CapacityMember[] {
const list = (raw as { members?: unknown })?.members
if (!Array.isArray(list)) return []
const out: CapacityMember[] = []
for (const m of list) {
const r = (m ?? {}) as Record<string, unknown>
const person = typeof r.person === 'string' ? r.person.trim() : ''
if (!person) continue
const member: CapacityMember = {
person,
focusFactor: clamp01(r.focusFactor, 0.8),
allocation: clamp01(r.allocation, 1),
}
if (capacityPerWorkday(member) > 0) out.push(member)
}
return out
}

View File

@@ -1,66 +0,0 @@
import { describe, expect, it } from 'vitest'
import {
appendDirective,
makeDirectiveEntry,
parseDirectiveLog,
serializeDirective,
toDirectiveInput,
} from './record-directive-v0.js'
describe('toDirectiveInput', () => {
it('keeps a valid kind + target and drops an empty target', () => {
const input = toDirectiveInput({ kind: 'reprioritize', quote: 'pilots first', target: { issue: 87 }, rationale: 'blocked' })
expect(input).toEqual({ kind: 'reprioritize', quote: 'pilots first', target: { issue: 87 }, params: undefined, rationale: 'blocked' })
expect(toDirectiveInput({ kind: 'note', quote: 'x', target: {} }).target).toBeUndefined()
})
it('falls back to note for an unknown kind', () => {
expect(toDirectiveInput({ kind: 'nonsense', quote: 'hmm' }).kind).toBe('note')
})
})
describe('serialize + parse round-trip', () => {
const entry = makeDirectiveEntry(
{ kind: 'reprioritize', quote: 'pilots come first', target: { issue: 87 } },
'id-1',
'2026-02-01T09:00:00Z',
)
it('serializes to one JSON line', () => {
const line = serializeDirective(entry)
expect(line).not.toContain('\n')
expect(JSON.parse(line)).toMatchObject({ id: 'id-1', kind: 'reprioritize', status: 'accepted' })
})
it('parses a log, orders by ts, and assigns a 1-based seq', () => {
const a = serializeDirective(makeDirectiveEntry({ kind: 'note', quote: 'later' }, 'b', '2026-02-02T00:00:00Z'))
const b = serializeDirective(makeDirectiveEntry({ kind: 'note', quote: 'earlier' }, 'a', '2026-02-01T00:00:00Z'))
const records = parseDirectiveLog(`${a}\n${b}\n`)
expect(records.map((r) => r.quote)).toEqual(['earlier', 'later'])
expect(records.map((r) => r.seq)).toEqual([1, 2])
})
it('skips blank and corrupt lines without losing the rest', () => {
const good = serializeDirective(entry)
const records = parseDirectiveLog(`\n{not json\n${good}\n\n`)
expect(records).toHaveLength(1)
expect(records[0].id).toBe('id-1')
})
})
describe('appendDirective', () => {
it('concatenates a newline-terminated entry, normalizing a missing trailing newline', () => {
const e1 = makeDirectiveEntry({ kind: 'note', quote: 'one' }, 'i1', '2026-01-01T00:00:00Z')
const e2 = makeDirectiveEntry({ kind: 'note', quote: 'two' }, 'i2', '2026-01-02T00:00:00Z')
let log = appendDirective('', e1)
log = appendDirective(log, e2)
expect(parseDirectiveLog(log).map((r) => r.quote)).toEqual(['one', 'two'])
expect(log.endsWith('\n')).toBe(true)
})
it('handles existing text without a trailing newline', () => {
const e = makeDirectiveEntry({ kind: 'note', quote: 'x' }, 'i', '2026-01-01T00:00:00Z')
expect(appendDirective('{"id":"prev","ts":"2025-01-01T00:00:00Z"}', e).split('\n').filter(Boolean)).toHaveLength(2)
})
})

View File

@@ -1,106 +0,0 @@
/**
* record_directive — the PM's standing instructions ("pilots come first"),
* appended to an append-only JSONL ledger in the pm-state repo (decisions.md D4,
* pm-state.md). A directive is *intent*: it's logged verbatim; its effects land
* later through apply_changes. Merge is concatenation — order derives from `ts`
* at read time, so two writers never conflict. `seq` is a display ordinal
* computed on read, never stored. This module is pure serialize/parse; the
* append (read → concat → write) is the bridge's job.
*/
export type DirectiveKind = 'reprioritize' | 'reestimate' | 'set-deadline' | 'scope' | 'capacity' | 'note'
export type DirectiveStatus = 'proposed' | 'accepted' | 'amended' | 'withdrawn'
export interface DirectiveTarget {
issue?: number
milestone?: number
member?: string
}
/** What the record_directive tool captures. */
export interface DirectiveInput {
kind: DirectiveKind
/** Verbatim PM words, shown in the ledger. */
quote: string
target?: DirectiveTarget
/** Structured effect the scheduler applies, e.g. { priority: 1 }. */
params?: Record<string, unknown>
rationale?: string
}
/** A ledger entry — an input plus its durable id/ts/status. */
export interface DirectiveEntry extends DirectiveInput {
id: string
ts: string
status: DirectiveStatus
}
/** A ledger entry as read back, with a computed display ordinal. */
export interface DirectiveRecord extends DirectiveEntry {
seq: number
}
const DIRECTIVE_KINDS: readonly DirectiveKind[] = [
'reprioritize',
'reestimate',
'set-deadline',
'scope',
'capacity',
'note',
]
/** Normalize a raw tool payload into a DirectiveInput (unknown kind → note). */
export function toDirectiveInput(raw: unknown): DirectiveInput {
const r = (raw ?? {}) as Record<string, unknown>
const kind = DIRECTIVE_KINDS.includes(r.kind as DirectiveKind) ? (r.kind as DirectiveKind) : 'note'
const target = (r.target ?? undefined) as DirectiveTarget | undefined
return {
kind,
quote: typeof r.quote === 'string' ? r.quote : '',
target: target && (target.issue || target.milestone || target.member) ? target : undefined,
params: (r.params && typeof r.params === 'object' ? (r.params as Record<string, unknown>) : undefined),
rationale: typeof r.rationale === 'string' ? r.rationale : undefined,
}
}
/** Build a full entry from an input + externally-supplied id/ts (Date/uuid live in the caller). */
export function makeDirectiveEntry(
input: DirectiveInput,
id: string,
ts: string,
status: DirectiveStatus = 'accepted',
): DirectiveEntry {
return { ...input, id, ts, status }
}
/** One JSONL line (no trailing newline — the caller joins). */
export function serializeDirective(entry: DirectiveEntry): string {
return JSON.stringify(entry)
}
/**
* Parse a JSONL log into records ordered by `ts` (then id for stability), with a
* 1-based `seq` assigned on read. Blank/corrupt lines are skipped, not fatal.
*/
export function parseDirectiveLog(text: string): DirectiveRecord[] {
const entries: DirectiveEntry[] = []
for (const line of text.split('\n')) {
const trimmed = line.trim()
if (!trimmed) continue
try {
const e = JSON.parse(trimmed) as DirectiveEntry
if (e && typeof e.id === 'string' && typeof e.ts === 'string') entries.push(e)
} catch {
// skip a corrupt line rather than lose the whole ledger
}
}
entries.sort((a, b) => (a.ts === b.ts ? a.id.localeCompare(b.id) : a.ts.localeCompare(b.ts)))
return entries.map((e, i) => ({ ...e, seq: i + 1 }))
}
/** Append a serialized entry to existing log text (concatenation merge). */
export function appendDirective(existing: string, entry: DirectiveEntry): string {
const base = existing.endsWith('\n') || existing === '' ? existing : existing + '\n'
return `${base}${serializeDirective(entry)}\n`
}

View File

@@ -120,20 +120,4 @@ describe('forecast', () => {
expect(fitted.coldStart).toBe(false) expect(fitted.coldStart).toBe(false)
expect(fitted.p50Day).toBeLessThan(priors.p50Day) expect(fitted.p50Day).toBeLessThan(priors.p50Day)
}) })
it('capacity lanes parallelize the sim — the makespan shrinks with more workers', () => {
const independent = [issue(1), issue(2), issue(3), issue(4)] // no deps → fully parallelizable
const serial = forecast(independent, [], { trials: 2000, seed: 7 })
const twoLanes = forecast(independent, [], {
trials: 2000,
seed: 7,
workers: [
{ person: 'a', speed: 1 },
{ person: 'b', speed: 1 },
],
})
// two equal lanes ≈ half the serial landing (independent work)
expect(twoLanes.p80Day).toBeLessThan(serial.p80Day)
expect(twoLanes.p80Day).toBeLessThan(serial.p80Day * 0.7)
})
}) })

View File

@@ -18,7 +18,6 @@ import {
schedule, schedule,
type SchedulableIssue, type SchedulableIssue,
} from '../scheduler/scheduler-v0.js' } from '../scheduler/scheduler-v0.js'
import { type LaneInputs, layoutOnLanes, resolveLanes, type Worker } from '../scheduler/scheduler-capacity-v0.js'
export interface LognormalPrior { export interface LognormalPrior {
/** Median log-ratio: sampled median duration = estimate * e^mu. */ /** Median log-ratio: sampled median duration = estimate * e^mu. */
@@ -77,12 +76,6 @@ export interface ForecastOptions {
* the sim; otherwise the code-resident cold-start priors do. * the sim; otherwise the code-resident cold-start priors do.
*/ */
model?: DurationModel model?: DurationModel
/**
* Capacity lanes. When provided, each trial lays sampled durations across the
* lanes (parallel) instead of a single serial worker — the makespan shrinks
* toward the critical path. Empty/absent → single serial worker.
*/
workers?: Worker[]
} }
/** Resolve the lognormal params for an estimate, preferring a fitted model. */ /** Resolve the lognormal params for an estimate, preferring a fitted model. */
@@ -165,32 +158,15 @@ export function forecast(
const priors = order.map((it) => durationParams(it.durationDays, options.model)) const priors = order.map((it) => durationParams(it.durationDays, options.model))
const rng = mulberry32(seed) const rng = mulberry32(seed)
// Capacity lanes, when configured — the per-trial layout goes parallel. // endByRank[k][t] = working day the (k+1)-th scheduled issue completes on trial t.
const laneInputs: LaneInputs = {
order: order.map((it) => it.number),
blockedBy: new Map(order.map((it) => [it.number, it.blockedBy])),
assignee: new Map(issues.map((i) => [i.number, i.assignee ?? null])),
}
const lanes =
options.workers && options.workers.length ? resolveLanes(options.workers, [...laneInputs.assignee.values()]) : null
// endByRank[k][t] = working day the (k+1)-th issue *to finish* completes on trial t.
const endByRank: number[][] = Array.from({ length: n }, () => new Array<number>(trials)) const endByRank: number[][] = Array.from({ length: n }, () => new Array<number>(trials))
for (let t = 0; t < trials; t++) { for (let t = 0; t < trials; t++) {
const sampled = order.map((it, k) => it.durationDays * Math.exp(priors[k].mu + priors[k].sigma * standardNormal(rng))) let cursor = 0
if (lanes) { for (let k = 0; k < n; k++) {
// parallel: lay the sampled durations across lanes, then sort finish days const p = priors[k]
const byNumber = new Map(order.map((it, k) => [it.number, sampled[k]])) const sampled = order[k].durationDays * Math.exp(p.mu + p.sigma * standardNormal(rng))
const { finishAt } = layoutOnLanes(laneInputs, lanes, (num) => byNumber.get(num)!) cursor += sampled
const finishes = order.map((it) => finishAt.get(it.number)!).sort((a, b) => a - b) endByRank[k][t] = cursor
for (let k = 0; k < n; k++) endByRank[k][t] = finishes[k]
} else {
// single serial worker: cumulative sum (already sorted ascending)
let cursor = 0
for (let k = 0; k < n; k++) {
cursor += sampled[k]
endByRank[k][t] = cursor
}
} }
} }

View File

@@ -146,28 +146,6 @@ describe('createGiteaClient.getIssue', () => {
]) ])
}) })
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()
const hit = stubFetch({ content: 'aGVsbG8=\n', sha: 'abc123' })
const file = await createGiteaClient(CONFIG, hit.fetch).getFile('directives/log.jsonl')
expect(file).toEqual({ contentBase64: 'aGVsbG8=', sha: 'abc123' })
expect(hit.calls[0].url).toContain('/contents/directives/log.jsonl')
})
it('putFile POSTs to create and PUTs to update (with sha)', async () => {
const create = stubFetch({}, 201)
await createGiteaClient(CONFIG, create.fetch).putFile('directives/log.jsonl', { contentBase64: 'eA==', message: 'seed' })
expect(create.calls[0].init?.method).toBe('POST')
expect(JSON.parse(create.calls[0].init?.body ?? '{}')).toEqual({ content: 'eA==', message: 'seed' })
const update = stubFetch({}, 200)
await createGiteaClient(CONFIG, update.fetch).putFile('directives/log.jsonl', { contentBase64: 'eQ==', message: 'append', sha: 's1' })
expect(update.calls[0].init?.method).toBe('PUT')
expect(JSON.parse(update.calls[0].init?.body ?? '{}')).toEqual({ content: 'eQ==', message: 'append', sha: 's1' })
})
it('createIssue POSTs title/body/labels and returns a normalized issue', async () => { it('createIssue POSTs title/body/labels and returns a normalized issue', async () => {
const created = { ...RAW_ISSUE, number: 44, title: 'Retry token refresh', labels: [{ name: 'est/2d' }, { name: 'p/2' }] } const created = { ...RAW_ISSUE, number: 44, title: 'Retry token refresh', labels: [{ name: 'est/2d' }, { name: 'p/2' }] }
const { fetch, calls } = stubFetch(created, 201) const { fetch, calls } = stubFetch(created, 201)

View File

@@ -105,10 +105,6 @@ export interface GiteaClient {
setIssueLabels(index: number, labelIds: number[]): Promise<void> setIssueLabels(index: number, labelIds: number[]): Promise<void>
/** Open a new issue with a title, optional body, and label ids. Write. */ /** Open a new issue with a title, optional body, and label ids. Write. */
createIssue(input: { title: string; body?: string; labelIds?: number[] }): Promise<GiteaIssue> 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. */
getFile(path: string): Promise<{ contentBase64: string; sha: string } | null>
/** Create or update a repo file with base64 content (pass `sha` to update). Write. */
putFile(path: string, input: { contentBase64: string; message: string; sha?: string }): Promise<void>
} }
/** Map raw gitea issue JSON to the normalized domain shape. Pure. */ /** Map raw gitea issue JSON to the normalized domain shape. Pure. */
@@ -236,25 +232,5 @@ export function createGiteaClient(config: GiteaConfig, fetchImpl: FetchLike): Gi
})) as RawIssue })) as RawIssue
return normalizeIssue(raw) return normalizeIssue(raw)
}, },
async getFile(path) {
const res = await fetchImpl(`${repoBase}/contents/${path}`, {
headers: { Authorization: `token ${config.token}`, Accept: 'application/json' },
})
if (res.status === 404) return null
if (!res.ok) {
const body = await res.text().catch(() => '')
throw new GiteaApiError(res.status, `GET contents/${path} failed (${res.status})`, body)
}
const json = (await res.json()) as { content?: string; sha: string }
return { contentBase64: (json.content ?? '').replace(/\n/g, ''), sha: json.sha }
},
async putFile(path, input) {
await request(`/contents/${path}`, {
method: input.sha ? 'PUT' : 'POST',
body: { content: input.contentBase64, message: input.message, ...(input.sha ? { sha: input.sha } : {}) },
})
},
} }
} }

View File

@@ -31,8 +31,6 @@ export interface GiteaHttpResponse {
status: number status: number
json(): Promise<unknown> json(): Promise<unknown>
text(): Promise<string> text(): Promise<string>
/** Present on the real fetch Response; used for SSE streaming (chat). */
body?: ReadableStream<Uint8Array> | null
} }
export type FetchLike = (url: string, init?: GiteaRequestInit) => Promise<GiteaHttpResponse> export type FetchLike = (url: string, init?: GiteaRequestInit) => Promise<GiteaHttpResponse>

View File

@@ -49,12 +49,6 @@ export type {
SchedulePlan, SchedulePlan,
} from './scheduler/scheduler-v0.js' } from './scheduler/scheduler-v0.js'
export { makespan, scheduleWithCapacity } from './scheduler/scheduler-capacity-v0.js'
export type { Worker } from './scheduler/scheduler-capacity-v0.js'
export { capacityPerWorkday, parseCapacityConfig } from './capacity/capacity-v0.js'
export type { CapacityMember } from './capacity/capacity-v0.js'
export { export {
COLD_START_PRIORS, COLD_START_PRIORS,
durationParams, durationParams,
@@ -86,35 +80,13 @@ export type {
} from './calibration/calibration-v0.js' } from './calibration/calibration-v0.js'
export { createChatClient } from './agent/chat-client.js' export { createChatClient } from './agent/chat-client.js'
export type { ChatClient, ChatMessage, CompletionResult, ModelConfig, OnToken, ToolCall, ToolDecl } from './agent/chat-client.js' export type { ChatClient, ChatMessage, CompletionResult, ModelConfig, ToolCall, ToolDecl } from './agent/chat-client.js'
export { pickModel } from './agent/model-router.js' export { pickModel } from './agent/model-router.js'
export type { ModelRouter, TaskKind } from './agent/model-router.js' export type { ModelRouter, TaskKind } from './agent/model-router.js'
export { runAgentTurn } from './agent/agent-loop.js' export { runAgentTurn } from './agent/agent-loop.js'
export type { AgentStep, AgentTurn, ToolExecutor } from './agent/agent-loop.js' export type { AgentStep, AgentTurn, ToolExecutor } from './agent/agent-loop.js'
export { export { PROPOSE_CHANGE_TOOL, QUERY_PROJECT_TOOL, REGINALD_SYSTEM, REGINALD_TOOLS } from './agent/agent-tools.js'
PROPOSE_CHANGE_TOOL,
QUERY_PROJECT_TOOL,
RECORD_DIRECTIVE_TOOL,
REGINALD_SYSTEM,
REGINALD_TOOLS,
} from './agent/agent-tools.js'
export { buildProjectView } from './agent/query-project.js' export { buildProjectView } from './agent/query-project.js'
export type { ProjectSnapshot, ProjectView, QueryFilters } from './agent/query-project.js' export type { ProjectSnapshot, ProjectView, QueryFilters } from './agent/query-project.js'
export { CAPTURE_SYSTEM, captureWork, parseCaptureArgs, PROPOSE_ISSUES_TOOL } from './agent/capture-work.js' export { CAPTURE_SYSTEM, captureWork, parseCaptureArgs, PROPOSE_ISSUES_TOOL } from './agent/capture-work.js'
export type { CaptureProposal, ProposedIssue } from './agent/capture-work.js' export type { CaptureProposal, ProposedIssue } from './agent/capture-work.js'
export {
appendDirective,
makeDirectiveEntry,
parseDirectiveLog,
serializeDirective,
toDirectiveInput,
} from './directives/record-directive-v0.js'
export type {
DirectiveEntry,
DirectiveInput,
DirectiveKind,
DirectiveRecord,
DirectiveStatus,
DirectiveTarget,
} from './directives/record-directive-v0.js'

View File

@@ -1,119 +0,0 @@
/**
* Capacity-aware scheduler (#8). Reuses the single-worker scheduler's topological
* order + critical-path marking, then re-lays the work across lanes: an issue
* runs on its assignee's lane (or the earliest-free lane when unassigned), its
* duration scaled by that lane's speed (ideal person-days/workday). Makespan
* shrinks toward the critical path as lanes are added. Deterministic; falls back
* to the single serial worker when no capacity is configured. The lane layout is
* factored so the Monte Carlo forecast reuses it per trial with sampled durations.
*/
import {
type DependencyEdge,
schedule,
type SchedulableIssue,
type SchedulePlan,
} from './scheduler-v0.js'
/** A scheduling lane: a person and their throughput (ideal person-days / workday). */
export interface Worker {
person: string
speed: number
}
/** The topological order + per-issue relations the layout needs (from the base plan). */
export interface LaneInputs {
order: number[]
blockedBy: Map<number, number[]>
assignee: Map<number, string | null>
}
/** Ensure a lane exists for every assignee; unconfigured assignees get the mean speed. */
export function resolveLanes(workers: Worker[], assignees: (string | null)[]): Worker[] {
const lanes = [...workers]
const known = new Set(lanes.map((w) => w.person))
const meanSpeed = lanes.length ? lanes.reduce((s, w) => s + w.speed, 0) / lanes.length : 1
for (const a of assignees) {
if (a && !known.has(a)) {
lanes.push({ person: a, speed: meanSpeed })
known.add(a)
}
}
return lanes
}
function pickWorker(lanes: Worker[], freeAt: Map<string, number>, assignee: string | null | undefined): Worker {
if (assignee) {
const own = lanes.find((w) => w.person === assignee)
if (own) return own
}
let best = lanes[0]
for (const w of lanes) if (freeAt.get(w.person)! < freeAt.get(best.person)!) best = w
return best
}
/**
* Lay a topologically-ordered set out across lanes. `duration(n)` supplies each
* issue's duration for this layout (estimate, or a sampled value in a MC trial).
* Returns each issue's finish day + the lane it ran on. Order guarantees a
* dependency is always laid out before its dependents.
*/
export function layoutOnLanes(
inputs: LaneInputs,
lanes: Worker[],
duration: (n: number) => number,
): { finishAt: Map<number, number>; startAt: Map<number, number>; laneOf: Map<number, string> } {
const freeAt = new Map(lanes.map((w) => [w.person, 0]))
const finishAt = new Map<number, number>()
const startAt = new Map<number, number>()
const laneOf = new Map<number, string>()
for (const n of inputs.order) {
const worker = pickWorker(lanes, freeAt, inputs.assignee.get(n))
const blockers = inputs.blockedBy.get(n) ?? []
const depFinish = blockers.length ? Math.max(...blockers.map((d) => finishAt.get(d) ?? 0)) : 0
const start = Math.max(freeAt.get(worker.person)!, depFinish)
const end = start + duration(n) / worker.speed
startAt.set(n, start)
finishAt.set(n, end)
laneOf.set(n, worker.person)
freeAt.set(worker.person, end)
}
return { finishAt, startAt, laneOf }
}
/**
* Capacity-aware plan. An empty `workers` means no capacity is configured → the
* single-worker plan verbatim.
*/
export function scheduleWithCapacity(
issues: SchedulableIssue[],
edges: DependencyEdge[],
workers: Worker[],
): SchedulePlan {
if (workers.length === 0) return schedule(issues, edges)
const base = schedule(issues, edges)
if (base.cycle || base.items.length === 0) return base
const inputs: LaneInputs = {
order: base.items.map((it) => it.number),
blockedBy: new Map(base.items.map((it) => [it.number, it.blockedBy])),
assignee: new Map(issues.map((i) => [i.number, i.assignee ?? null])),
}
const lanes = resolveLanes(workers, [...inputs.assignee.values()])
const durationOf = new Map(base.items.map((it) => [it.number, it.durationDays]))
const { finishAt, startAt, laneOf } = layoutOnLanes(inputs, lanes, (n) => durationOf.get(n)!)
const items = base.items.map((it) => ({
...it,
startDay: startAt.get(it.number)!,
endDay: finishAt.get(it.number)!,
durationDays: finishAt.get(it.number)! - startAt.get(it.number)!,
worker: laneOf.get(it.number),
}))
return { items, cycle: null }
}
/** Makespan (last finish) of a plan — the project's landing day. */
export function makespan(plan: SchedulePlan): number {
return plan.items.reduce((m, it) => Math.max(m, it.endDay), 0)
}

View File

@@ -21,8 +21,6 @@ export interface SchedulableIssue {
estimateDays: number | null estimateDays: number | null
/** 1 (most urgent) … 4; null when unset. */ /** 1 (most urgent) … 4; null when unset. */
priority: number | null priority: number | null
/** gitea assignee login, for capacity-aware lane routing; optional. */
assignee?: string | null
} }
export interface DependencyEdge { export interface DependencyEdge {
@@ -47,8 +45,6 @@ export interface ScheduledItem {
/** On a longest-duration dependency chain. */ /** On a longest-duration dependency chain. */
critical: boolean critical: boolean
rationale: string rationale: string
/** Lane it's scheduled on, when capacity-aware; absent for the single-worker plan. */
worker?: string
} }
export interface SchedulePlan { export interface SchedulePlan {