Compare commits
8 Commits
feat/runwa
...
62a521e7eb
| Author | SHA1 | Date | |
|---|---|---|---|
| 62a521e7eb | |||
|
|
0dd26b8b05 | ||
| 770c253625 | |||
|
|
1636d6bada | ||
| d80e1266ee | |||
| cf03827cd5 | |||
| 69106b603d | |||
|
|
dbcdcda5e7 |
@@ -44,6 +44,9 @@ test.describe('live backlog', () => {
|
|||||||
// Real per-milestone forecasts — these milestone names come from gitea, not the
|
// Real per-milestone forecasts — these milestone names come from gitea, not the
|
||||||
// fixture (which lists Beta / Pilot-ready / v1.0).
|
// fixture (which lists Beta / Pilot-ready / v1.0).
|
||||||
await expect(win.getByText(/P2 — Scheduler/)).toBeVisible()
|
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' })
|
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
|
// Milestone drill-in — clicking a real milestone opens its real detail
|
||||||
|
|||||||
56
apps/desktop/e2e/live-onboarding.spec.ts
Normal file
56
apps/desktop/e2e/live-onboarding.spec.ts
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
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()
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -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.getByText('Managed repos')).toBeVisible()
|
await expect(window.getByRole('heading', { name: 'Connection' })).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()
|
||||||
|
|||||||
101
apps/desktop/src/main/config-store.ts
Normal file
101
apps/desktop/src/main/config-store.ts
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
/**
|
||||||
|
* 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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ import { dirname, join } from 'node:path'
|
|||||||
import {
|
import {
|
||||||
appendDirective,
|
appendDirective,
|
||||||
createGiteaClient,
|
createGiteaClient,
|
||||||
|
GiteaApiError,
|
||||||
type DirectiveEntry,
|
type DirectiveEntry,
|
||||||
type GiteaClient,
|
type GiteaClient,
|
||||||
type GiteaConfig,
|
type GiteaConfig,
|
||||||
@@ -20,6 +21,7 @@ import {
|
|||||||
type IssueChange,
|
type IssueChange,
|
||||||
type LifecycleEvent,
|
type LifecycleEvent,
|
||||||
makeDirectiveEntry,
|
makeDirectiveEntry,
|
||||||
|
parseCapacityConfig,
|
||||||
parseDirectiveLog,
|
parseDirectiveLog,
|
||||||
planIssueChange,
|
planIssueChange,
|
||||||
type ProjectSnapshot,
|
type ProjectSnapshot,
|
||||||
@@ -27,6 +29,7 @@ import {
|
|||||||
} 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'
|
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). */
|
||||||
@@ -47,9 +50,15 @@ function loadEnvLocalToken(): string | undefined {
|
|||||||
return undefined
|
return undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
function resolveConfig(): GiteaConfig | null {
|
/** Saved config wins (team build); a `.env.local` is the dev fallback; e2e uses fixtures. */
|
||||||
|
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 {
|
||||||
@@ -60,8 +69,23 @@ function resolveConfig(): GiteaConfig | null {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Memoized client so both the gitea and model bridges share one instance.
|
/** The pm-state repo name: configured, else `${repo}-pm-state`, else the env override. */
|
||||||
|
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()
|
||||||
@@ -72,13 +96,10 @@ export function getGiteaClient(): GiteaClient | null {
|
|||||||
|
|
||||||
// The pm-state repo holds machine-derived state (the directive ledger). Same
|
// 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).
|
// token/host as the work repo, a different repo (the purity split, decisions D4).
|
||||||
let pmStateClient: GiteaClient | null | undefined
|
|
||||||
export function getPmStateClient(): GiteaClient | null {
|
export function getPmStateClient(): GiteaClient | null {
|
||||||
if (pmStateClient === undefined) {
|
if (pmStateClient === undefined) {
|
||||||
const config = resolveConfig()
|
const config = resolveConfig()
|
||||||
pmStateClient = config
|
pmStateClient = config ? createGiteaClient({ ...config, repo: pmStateRepoName(config) }, fetch) : null
|
||||||
? createGiteaClient({ ...config, repo: process.env.COMMITEA_PMSTATE_REPO ?? 'commitea-pm-state' }, fetch)
|
|
||||||
: null
|
|
||||||
}
|
}
|
||||||
return pmStateClient
|
return pmStateClient
|
||||||
}
|
}
|
||||||
@@ -109,6 +130,19 @@ export async function readDirectives(client: GiteaClient) {
|
|||||||
return parseDirectiveLog(text)
|
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,
|
||||||
@@ -178,20 +212,38 @@ export function bootSnapshot(): (Snapshot & { savedAt: string }) | null {
|
|||||||
/** Agent tool calls tolerate a slightly stale snapshot (seconds) to stay responsive. */
|
/** Agent tool calls tolerate a slightly stale snapshot (seconds) to stay responsive. */
|
||||||
export const AGENT_SNAPSHOT_TTL_MS = 30_000
|
export const AGENT_SNAPSHOT_TTL_MS = 30_000
|
||||||
|
|
||||||
export function registerGiteaIpc(): void {
|
// Label cache is reset with the clients (module-level so resetClients can clear it).
|
||||||
const client = getGiteaClient()
|
let labelCache: GiteaLabel[] | null = null
|
||||||
const repo = client ? `${process.env.GITEA_OWNER ?? 'christian'}/${process.env.GITEA_REPO ?? 'commitea'}` : 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)
|
||||||
|
}
|
||||||
|
|
||||||
ipcMain.handle('gitea:status', () => ({ configured: !!client, repo }))
|
export function registerGiteaIpc(): void {
|
||||||
|
ipcMain.handle('gitea:status', () => {
|
||||||
|
const cfg = resolveConfig()
|
||||||
|
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.
|
// Instant boot: the last persisted snapshot, shown before the fresh reconcile lands.
|
||||||
ipcMain.handle('gitea:boot', () => {
|
ipcMain.handle('gitea:boot', () => {
|
||||||
if (!client) return { configured: false }
|
if (!getGiteaClient()) return { configured: false }
|
||||||
const persisted = bootSnapshot()
|
const persisted = bootSnapshot()
|
||||||
return persisted ? { configured: true, cached: true, ...persisted } : { configured: true, cached: false }
|
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 {
|
try {
|
||||||
// explicit UI sync — force fresh, and warm the cache for agent tool calls
|
// explicit UI sync — force fresh, and warm the cache for agent tool calls
|
||||||
@@ -206,32 +258,20 @@ export function registerGiteaIpc(): void {
|
|||||||
})
|
})
|
||||||
|
|
||||||
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(plan.labels)
|
const ids = await resolveLabelIds(client, 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
|
invalidateSnapshot() // the board + forecast must reflect the label change
|
||||||
@@ -243,11 +283,12 @@ 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(names)
|
const labelIds = await resolveLabelIds(client, 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 })
|
||||||
}
|
}
|
||||||
@@ -266,4 +307,44 @@ export function registerGiteaIpc(): void {
|
|||||||
return { ok: false as const, reason: 'error' as const, message: e instanceof Error ? e.message : String(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) }
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ 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'
|
||||||
|
|
||||||
|
|||||||
@@ -24,8 +24,9 @@ import {
|
|||||||
runAgentTurn,
|
runAgentTurn,
|
||||||
toDirectiveInput,
|
toDirectiveInput,
|
||||||
} from '@commitea/core'
|
} from '@commitea/core'
|
||||||
import { ipcMain } from 'electron'
|
import { app, ipcMain } from 'electron'
|
||||||
|
|
||||||
|
import { loadConfig } from './config-store.js'
|
||||||
import {
|
import {
|
||||||
AGENT_SNAPSHOT_TTL_MS,
|
AGENT_SNAPSHOT_TTL_MS,
|
||||||
appendDirectiveEntry,
|
appendDirectiveEntry,
|
||||||
@@ -37,7 +38,11 @@ import {
|
|||||||
/** 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
|
||||||
const baseUrl = process.env.COMMITEA_MODEL_URL ?? 'http://localhost:1234/v1'
|
// Config wins (team build); env is the dev override; localhost is a dev convenience only.
|
||||||
|
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 ?? '' },
|
||||||
@@ -45,6 +50,19 @@ 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
|
||||||
@@ -78,19 +96,23 @@ 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 () => {
|
||||||
if (!router) return { configured: false, model: null }
|
const r = resolveModelRouter() // resolve fresh so a saved modelUrl takes effect
|
||||||
const model = await resolveLoadedModel(router.small.baseUrl, router.small.model)
|
if (!r) return { configured: false, model: null }
|
||||||
return { configured: true, model }
|
const model = await probeModel(r.small.baseUrl) // only "configured" if a model actually answers
|
||||||
|
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).
|
||||||
@@ -129,10 +151,11 @@ export function registerModelIpc(): void {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const turn = await runAgentTurn({
|
const turn = await runAgentTurn({
|
||||||
complete: (m, t) => chat.complete(m, t),
|
complete: (m, t, ot) => chat.complete(m, t, ot),
|
||||||
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) {
|
||||||
@@ -144,6 +167,7 @@ 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)
|
||||||
|
|||||||
@@ -19,12 +19,30 @@ const api = {
|
|||||||
pmstate: {
|
pmstate: {
|
||||||
/** Read the directive ledger from the pm-state repo. */
|
/** Read the directive ledger from the pm-state repo. */
|
||||||
directives: () => ipcRenderer.invoke('pmstate:directives'),
|
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),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,23 +1,35 @@
|
|||||||
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, type RunwayMilestone } 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) overrides the demo when present.
|
// `milestones` (real per-milestone forecasts) + `capacity` (real config) override the demo.
|
||||||
export function RunwayScreen({
|
export function RunwayScreen({
|
||||||
onOpenCalibration,
|
onOpenCalibration,
|
||||||
onOpenMilestone,
|
onOpenMilestone,
|
||||||
calibration,
|
calibration,
|
||||||
milestones,
|
milestones,
|
||||||
|
capacity,
|
||||||
}: {
|
}: {
|
||||||
onOpenCalibration: () => void
|
onOpenCalibration: () => void
|
||||||
onOpenMilestone: (id?: number) => void
|
onOpenMilestone: (id?: number) => void
|
||||||
calibration?: { n: number; coldStart: boolean }
|
calibration?: { n: number; coldStart: boolean }
|
||||||
milestones?: RunwayMilestone[]
|
milestones?: RunwayMilestone[]
|
||||||
|
capacity?: CapacityMember[]
|
||||||
}) {
|
}) {
|
||||||
const rows = milestones && milestones.length ? milestones : RUNWAY
|
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`
|
||||||
@@ -59,7 +71,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>
|
||||||
{CAPACITY.map((p, i) => (
|
{capacityRows.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)',
|
||||||
|
|||||||
@@ -1,9 +1,22 @@
|
|||||||
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({ dark, setDark }: { dark: boolean; setDark: (v: boolean) => void }) {
|
export function SettingsScreen({
|
||||||
|
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)
|
||||||
@@ -24,25 +37,35 @@ export function SettingsScreen({ dark, setDark }: { dark: boolean; setDark: (v:
|
|||||||
</header>
|
</header>
|
||||||
|
|
||||||
<Card overline="Gitea" title="Connection">
|
<Card overline="Gitea" title="Connection">
|
||||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
|
<div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
|
||||||
<Input label="Base URL" icon="link" mono defaultValue="https://gitea.stephenmann.io" />
|
{connection ? (
|
||||||
<Input label="Access token" icon="keyboard" mono type="password" defaultValue="ct_9f2e81c4a7d6" hint="Scopes: repo, issue. Nothing more." />
|
<>
|
||||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
|
|
||||||
<span style={{ font: '600 13px/1.2 var(--font-sans)', color: 'var(--ink-1)' }}>Managed repos</span>
|
|
||||||
<Row style={{ padding: '8px 12px', background: 'var(--paper-0)', border: '1px solid var(--line-1)', borderRadius: 'var(--radius-2)' }}>
|
<Row style={{ padding: '8px 12px', background: 'var(--paper-0)', border: '1px solid var(--line-1)', borderRadius: 'var(--radius-2)' }}>
|
||||||
<Icon name="git-branch" size={14} style={{ color: 'var(--ink-3)' }} />
|
<Icon name="git-branch" size={14} style={{ color: 'var(--ink-3)' }} />
|
||||||
<span style={{ font: 'var(--text-data)', color: 'var(--ink-1)', flex: 1 }}>stephen/commitea</span>
|
<span style={{ font: 'var(--text-data)', color: 'var(--ink-1)', flex: 1 }}>{connection.owner}/{connection.repo}</span>
|
||||||
<Badge tone="ok" dot>syncing</Badge>
|
<Badge tone="ok" dot>connected</Badge>
|
||||||
<IconButton icon="x" label="Stop managing" size="sm" />
|
|
||||||
</Row>
|
</Row>
|
||||||
<Row style={{ padding: '8px 12px', background: 'var(--paper-0)', border: '1px solid var(--line-1)', borderRadius: 'var(--radius-2)' }}>
|
<Row style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', gap: 6 }}>
|
||||||
<Icon name="layers" size={14} style={{ color: 'var(--ink-3)' }} />
|
<Icon name="link" size={12} />{connection.baseUrl}
|
||||||
<span style={{ font: 'var(--text-data)', color: 'var(--ink-1)', flex: 1 }}>stephen/pm-state</span>
|
|
||||||
<Badge>sidecar</Badge>
|
|
||||||
</Row>
|
</Row>
|
||||||
<Note>The sidecar holds machine-derived state only. Delete it and resync — no truth is lost.</Note>
|
<Row style={{ font: 'var(--text-caption)', color: 'var(--ink-3)', gap: 6 }}>
|
||||||
<Button variant="secondary" size="sm" icon="plus" style={{ alignSelf: 'flex-start' }}>Add repo</Button>
|
<Icon name="layers" size={12} />sidecar: {connection.pmStateRepo ?? `${connection.repo}-pm-state`}
|
||||||
</div>
|
</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>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,12 @@ 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 {
|
import {
|
||||||
backlogCalibration,
|
backlogCalibration,
|
||||||
|
capacityWorkers,
|
||||||
forecastBacklog,
|
forecastBacklog,
|
||||||
issuesToBoardColumns,
|
issuesToBoardColumns,
|
||||||
milestoneView,
|
milestoneView,
|
||||||
@@ -13,6 +16,7 @@ import {
|
|||||||
scheduleFocus,
|
scheduleFocus,
|
||||||
} from '../../lib/backlog.js'
|
} 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'
|
||||||
@@ -95,7 +99,11 @@ export function AppShell() {
|
|||||||
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 [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 =
|
||||||
@@ -104,10 +112,12 @@ 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) ?? undefined)
|
? (forecastBacklog(backlog.issues, backlog.deps, new Date(), calibration?.model, workers) ?? undefined)
|
||||||
: undefined
|
: undefined
|
||||||
const runwayMilestones =
|
const runwayMilestones =
|
||||||
backlog.status === 'ready' ? runwayView(backlog.issues, backlog.milestones, backlog.deps) : undefined
|
backlog.status === 'ready'
|
||||||
|
? runwayView(backlog.issues, backlog.milestones, backlog.deps, new Date(), workers)
|
||||||
|
: undefined
|
||||||
const milestone =
|
const milestone =
|
||||||
backlog.status === 'ready' && milestoneId != null
|
backlog.status === 'ready' && milestoneId != null
|
||||||
? (milestoneView(
|
? (milestoneView(
|
||||||
@@ -117,6 +127,8 @@ export function AppShell() {
|
|||||||
backlog.deps,
|
backlog.deps,
|
||||||
backlog.timelines,
|
backlog.timelines,
|
||||||
calibration?.model,
|
calibration?.model,
|
||||||
|
new Date(),
|
||||||
|
workers,
|
||||||
) ?? undefined)
|
) ?? undefined)
|
||||||
: undefined
|
: undefined
|
||||||
|
|
||||||
@@ -124,6 +136,16 @@ export function AppShell() {
|
|||||||
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)
|
||||||
@@ -221,6 +243,7 @@ export function AppShell() {
|
|||||||
}}
|
}}
|
||||||
calibration={calibration ? { n: calibration.model.n, coldStart: calibration.model.coldStart } : undefined}
|
calibration={calibration ? { n: calibration.model.n, coldStart: calibration.model.coldStart } : undefined}
|
||||||
milestones={runwayMilestones}
|
milestones={runwayMilestones}
|
||||||
|
capacity={capacityMembers}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
case 'calibration':
|
case 'calibration':
|
||||||
@@ -241,7 +264,20 @@ export function AppShell() {
|
|||||||
case 'directives':
|
case 'directives':
|
||||||
return <DirectivesScreen />
|
return <DirectivesScreen />
|
||||||
case 'settings':
|
case 'settings':
|
||||||
return <SettingsScreen dark={dark} setDark={setDark} />
|
return (
|
||||||
|
<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
|
||||||
@@ -261,6 +297,23 @@ 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)} />
|
||||||
|
|||||||
@@ -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, send: sendChat, approve, dismiss } = useChat(onApplyChange)
|
const { msgs, thinking, live, model, steps, proposals, streaming, 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])
|
}, [msgs, thinking, streaming])
|
||||||
|
|
||||||
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` : 'demo · scripted'}
|
{offline ? 'offline · queueing' : live ? `${modelLabel} · local` : 'no model'}
|
||||||
</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,7 +98,14 @@ 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}
|
||||||
{thinking ? <div style={{ font: 'var(--text-agent)', color: 'var(--ink-3)' }}>considering…</div> : null}
|
{streaming ? (
|
||||||
|
<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').replace('record_directive', 'the directive ledger')))).join(', ')}
|
||||||
@@ -154,8 +161,8 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
|
|||||||
send()
|
send()
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
placeholder={offline ? 'Writes wait for the connection…' : 'Tell me what to do…'}
|
placeholder={offline ? 'Writes wait for the connection…' : live ? 'Tell me what to do…' : 'Add a Model URL in Settings…'}
|
||||||
disabled={offline}
|
disabled={offline || !live}
|
||||||
rows={1}
|
rows={1}
|
||||||
style={{
|
style={{
|
||||||
flex: 1,
|
flex: 1,
|
||||||
@@ -173,15 +180,15 @@ export function ChatPanel({ onOpenDirectives, offline, onApplyChange }: ChatPane
|
|||||||
type="button"
|
type="button"
|
||||||
onClick={send}
|
onClick={send}
|
||||||
aria-label="Send"
|
aria-label="Send"
|
||||||
disabled={offline}
|
disabled={offline || !live}
|
||||||
style={{
|
style={{
|
||||||
width: 30,
|
width: 30,
|
||||||
height: 30,
|
height: 30,
|
||||||
borderRadius: 'var(--radius-2)',
|
borderRadius: 'var(--radius-2)',
|
||||||
border: 'none',
|
border: 'none',
|
||||||
cursor: offline ? 'not-allowed' : 'pointer',
|
cursor: offline || !live ? 'not-allowed' : 'pointer',
|
||||||
background: offline ? 'var(--paper-3)' : 'var(--accent)',
|
background: offline || !live ? 'var(--paper-3)' : 'var(--accent)',
|
||||||
color: offline ? 'var(--ink-3)' : 'var(--ink-inverse)',
|
color: offline || !live ? 'var(--ink-3)' : 'var(--ink-inverse)',
|
||||||
display: 'inline-flex',
|
display: 'inline-flex',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
|
|||||||
40
apps/desktop/src/renderer/src/global.d.ts
vendored
40
apps/desktop/src/renderer/src/global.d.ts
vendored
@@ -1,5 +1,6 @@
|
|||||||
import type {
|
import type {
|
||||||
AgentStep,
|
AgentStep,
|
||||||
|
CapacityMember,
|
||||||
ChangeProposal,
|
ChangeProposal,
|
||||||
ChatMessage,
|
ChatMessage,
|
||||||
CaptureProposal,
|
CaptureProposal,
|
||||||
@@ -48,9 +49,37 @@ export type BootPayload =
|
|||||||
| { configured: true; cached: false }
|
| { configured: true; cached: false }
|
||||||
| ({ configured: true; cached: true } & Omit<SnapshotPayload, 'configured'>)
|
| ({ 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 }>
|
status(): Promise<{ configured: boolean; repo: string | null; demo: boolean }>
|
||||||
boot(): Promise<BootPayload>
|
boot(): Promise<BootPayload>
|
||||||
reconcile(): Promise<SnapshotPayload>
|
reconcile(): Promise<SnapshotPayload>
|
||||||
getIssue(index: number): Promise<GiteaIssue | null>
|
getIssue(index: number): Promise<GiteaIssue | null>
|
||||||
@@ -68,6 +97,8 @@ 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. */
|
/** The result of reading the directive ledger. */
|
||||||
@@ -75,9 +106,15 @@ export type DirectivesResult =
|
|||||||
| { ok: false; reason: 'unconfigured' | 'error'; message?: string }
|
| { ok: false; reason: 'unconfigured' | 'error'; message?: string }
|
||||||
| { ok: true; directives: DirectiveRecord[] }
|
| { 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. */
|
/** The pm-state bridge (machine-derived state) exposed by the preload over IPC. */
|
||||||
export interface PmStateBridge {
|
export interface PmStateBridge {
|
||||||
directives(): Promise<DirectivesResult>
|
directives(): Promise<DirectivesResult>
|
||||||
|
capacity(): Promise<CapacityResult>
|
||||||
}
|
}
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
@@ -87,6 +124,7 @@ declare global {
|
|||||||
gitea: GiteaBridge
|
gitea: GiteaBridge
|
||||||
model: ModelBridge
|
model: ModelBridge
|
||||||
pmstate: PmStateBridge
|
pmstate: PmStateBridge
|
||||||
|
config: ConfigBridge
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,13 @@ 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,
|
type GiteaMilestone,
|
||||||
inferLifecycle,
|
inferLifecycle,
|
||||||
@@ -107,9 +110,15 @@ 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
|
||||||
@@ -132,9 +141,10 @@ 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 } : {})
|
const f = forecast(toSchedulable(issues), deps, { ...(model ? { model } : {}), workers })
|
||||||
const cone = buildBurnUpData(f, today)
|
const cone = buildBurnUpData(f, today)
|
||||||
if (!cone) return null
|
if (!cone) return null
|
||||||
return {
|
return {
|
||||||
@@ -252,6 +262,7 @@ export function runwayView(
|
|||||||
milestones: GiteaMilestone[],
|
milestones: GiteaMilestone[],
|
||||||
deps: DependencyEdge[],
|
deps: DependencyEdge[],
|
||||||
today: Date = new Date(),
|
today: Date = new Date(),
|
||||||
|
workers: Worker[] = [],
|
||||||
): RunwayMilestone[] {
|
): RunwayMilestone[] {
|
||||||
const open = issues.filter((i) => i.state === 'open')
|
const open = issues.filter((i) => i.state === 'open')
|
||||||
const rows = milestones
|
const rows = milestones
|
||||||
@@ -266,8 +277,10 @@ export function runwayView(
|
|||||||
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,
|
||||||
})),
|
})),
|
||||||
deps,
|
deps,
|
||||||
|
{ workers },
|
||||||
)
|
)
|
||||||
const p90 = f.curve.length ? f.curve[f.curve.length - 1].p90Day : f.p95Day
|
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
|
const dueDay = m.dueOn ? workingDaysBetween(today, new Date(m.dueOn)) : null
|
||||||
@@ -324,6 +337,7 @@ export function milestoneView(
|
|||||||
timelines: Timelines = {},
|
timelines: Timelines = {},
|
||||||
calibration?: CalibrationModel,
|
calibration?: CalibrationModel,
|
||||||
today: Date = new Date(),
|
today: Date = new Date(),
|
||||||
|
workers: Worker[] = [],
|
||||||
): MilestoneView | null {
|
): MilestoneView | null {
|
||||||
const m = milestones.find((x) => x.id === id)
|
const m = milestones.find((x) => x.id === id)
|
||||||
if (!m) return null
|
if (!m) return null
|
||||||
@@ -340,9 +354,10 @@ export function milestoneView(
|
|||||||
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,
|
||||||
})),
|
})),
|
||||||
deps,
|
deps,
|
||||||
model ? { model } : {},
|
{ ...(model ? { model } : {}), workers },
|
||||||
)
|
)
|
||||||
const cone = buildBurnUpData(f, today)
|
const cone = buildBurnUpData(f, today)
|
||||||
|
|
||||||
|
|||||||
24
apps/desktop/src/renderer/src/lib/use-capacity.ts
Normal file
24
apps/desktop/src/renderer/src/lib/use-capacity.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -2,13 +2,18 @@ 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 { CANNED_REPLY, CHAT, type ChatMessage } from '../data/fixtures.js'
|
import { 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
|
||||||
@@ -20,6 +25,8 @@ 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
|
||||||
@@ -41,6 +48,7 @@ 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
|
||||||
|
|
||||||
@@ -52,10 +60,14 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
|
|||||||
window.commitea.model
|
window.commitea.model
|
||||||
.status()
|
.status()
|
||||||
.then((s) => {
|
.then((s) => {
|
||||||
if (alive && s.configured) {
|
if (!alive) return
|
||||||
|
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(() => {})
|
||||||
@@ -75,10 +87,8 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
|
|||||||
setProposals([])
|
setProposals([])
|
||||||
|
|
||||||
if (!live) {
|
if (!live) {
|
||||||
window.setTimeout(() => {
|
// no model configured — nothing to send (composer is disabled anyway)
|
||||||
setThinking(false)
|
setThinking(false)
|
||||||
setConvo((c) => [...c, { from: 'agent', text: CANNED_REPLY }])
|
|
||||||
}, 900)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,10 +96,17 @@ 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) => {
|
||||||
setThinking(false)
|
finish()
|
||||||
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)
|
||||||
@@ -105,7 +122,7 @@ export function useChat(onApplyChange?: (change: IssueChange) => Promise<{ ok: b
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
setThinking(false)
|
finish()
|
||||||
setConvo((c) => [...c, { from: 'agent', text: 'I could not reach the model.' }])
|
setConvo((c) => [...c, { from: 'agent', text: 'I could not reach the model.' }])
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -137,5 +154,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, send, approve, dismiss }
|
return { msgs: [...seed, ...convo], thinking, live, model, steps, proposals, streaming, send, approve, dismiss }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,18 +31,20 @@ function stringify(result: unknown): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function runAgentTurn(opts: {
|
export async function runAgentTurn(opts: {
|
||||||
complete: (messages: ChatMessage[], tools?: ToolDecl[]) => Promise<CompletionResult>
|
complete: (messages: ChatMessage[], tools?: ToolDecl[], onToken?: (delta: string) => void) => 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)
|
const { content, toolCalls } = await opts.complete(convo, opts.tools, opts.onToken)
|
||||||
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 }
|
||||||
@@ -63,7 +65,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, [])
|
const final = await opts.complete(convo, [], opts.onToken)
|
||||||
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 }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,48 @@ 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)
|
||||||
|
|||||||
@@ -48,8 +48,12 @@ 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 {
|
||||||
complete(messages: ChatMessage[], tools?: ToolDecl[]): Promise<CompletionResult>
|
/** When `onToken` is given, the response streams (SSE) and each content delta is emitted. */
|
||||||
|
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. */
|
||||||
@@ -85,7 +89,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) {
|
async complete(messages, tools, onToken) {
|
||||||
const body: Record<string, unknown> = {
|
const body: Record<string, unknown> = {
|
||||||
model: config.model,
|
model: config.model,
|
||||||
messages: messages.map(toWireMessage),
|
messages: messages.map(toWireMessage),
|
||||||
@@ -95,11 +99,13 @@ 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: 'application/json',
|
Accept: stream ? 'text/event-stream' : 'application/json',
|
||||||
...(config.apiKey ? { Authorization: `Bearer ${config.apiKey}` } : {}),
|
...(config.apiKey ? { Authorization: `Bearer ${config.apiKey}` } : {}),
|
||||||
},
|
},
|
||||||
body: JSON.stringify(body),
|
body: JSON.stringify(body),
|
||||||
@@ -108,6 +114,8 @@ 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 {
|
||||||
@@ -121,3 +129,56 @@ 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 })) }
|
||||||
|
}
|
||||||
|
|||||||
88
packages/core/src/capacity/capacity-v0.test.ts
Normal file
88
packages/core/src/capacity/capacity-v0.test.ts
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
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
|
||||||
|
})
|
||||||
|
})
|
||||||
49
packages/core/src/capacity/capacity-v0.ts
Normal file
49
packages/core/src/capacity/capacity-v0.ts
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
/**
|
||||||
|
* 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
|
||||||
|
}
|
||||||
@@ -120,4 +120,20 @@ 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)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ 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. */
|
||||||
@@ -76,6 +77,12 @@ 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. */
|
||||||
@@ -158,17 +165,34 @@ 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)
|
||||||
|
|
||||||
// endByRank[k][t] = working day the (k+1)-th scheduled issue completes on trial t.
|
// Capacity lanes, when configured — the per-trial layout goes parallel.
|
||||||
|
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)))
|
||||||
|
if (lanes) {
|
||||||
|
// parallel: lay the sampled durations across lanes, then sort finish days
|
||||||
|
const byNumber = new Map(order.map((it, k) => [it.number, sampled[k]]))
|
||||||
|
const { finishAt } = layoutOnLanes(laneInputs, lanes, (num) => byNumber.get(num)!)
|
||||||
|
const finishes = order.map((it) => finishAt.get(it.number)!).sort((a, b) => a - b)
|
||||||
|
for (let k = 0; k < n; k++) endByRank[k][t] = finishes[k]
|
||||||
|
} else {
|
||||||
|
// single serial worker: cumulative sum (already sorted ascending)
|
||||||
let cursor = 0
|
let cursor = 0
|
||||||
for (let k = 0; k < n; k++) {
|
for (let k = 0; k < n; k++) {
|
||||||
const p = priors[k]
|
cursor += sampled[k]
|
||||||
const sampled = order[k].durationDays * Math.exp(p.mu + p.sigma * standardNormal(rng))
|
|
||||||
cursor += sampled
|
|
||||||
endByRank[k][t] = cursor
|
endByRank[k][t] = cursor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const curve: BurnUpPoint[] = endByRank.map((row, k) => {
|
const curve: BurnUpPoint[] = endByRank.map((row, k) => {
|
||||||
const sorted = [...row].sort((a, b) => a - b)
|
const sorted = [...row].sort((a, b) => a - b)
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ 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>
|
||||||
|
|||||||
@@ -49,6 +49,12 @@ 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,
|
||||||
@@ -80,7 +86,7 @@ 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, ToolCall, ToolDecl } from './agent/chat-client.js'
|
export type { ChatClient, ChatMessage, CompletionResult, ModelConfig, OnToken, 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'
|
||||||
|
|||||||
119
packages/core/src/scheduler/scheduler-capacity-v0.ts
Normal file
119
packages/core/src/scheduler/scheduler-capacity-v0.ts
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
/**
|
||||||
|
* 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)
|
||||||
|
}
|
||||||
@@ -21,6 +21,8 @@ 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 {
|
||||||
@@ -45,6 +47,8 @@ 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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user