Bohdan Triapitsyn
f4743ea060
Adds a work-status panel beside the transcript. Context fill, model and cost, todos, running subagents and the permission requests blocking them, branch and working-tree state, MCP servers, pinned messages and context sources were scattered across the header, the composer and the context panel — a blocked subagent was reported nowhere at all. The panel reads them from live channels rather than persisted history, and becomes an overlay where the chat is too narrow to seat a column. It is on by default, including for existing installs. Because it now carries these readouts, the desktop header and composer drop the ones it duplicates: todo and changed-files chips, usage and MCP tabs. VS Code and mobile keep theirs — neither hosts the panel. Fixes MCP authorization, which was broken from the panel, invalidated by a directory switch through a redirect URI that encoded the working directory, and left the desktop app in the background because browsers will not follow a custom-protocol link without a user gesture. The settings page no longer asks the user to understand the MCP spec before adding a server: one field takes the command or the link, with the kind inferred and a visible override, and client-registration fields appear only when a server actually asks for its own credentials. Also: skills load from the panel instead of only when the composer's slash autocomplete opens; the header button names the current instance rather than falling through to the word "Instance" for relay hosts. Three new optional UI settings keys, all migrated. No change to stored MCP server configuration.
67 lines
2.5 KiB
TypeScript
67 lines
2.5 KiB
TypeScript
import type { UsageProviderGroup, UsageLimitRow } from '@/components/usage/usageGroups';
|
|
|
|
/**
|
|
* Picking the one quota worth showing while the Usage section is collapsed.
|
|
*
|
|
* The interesting limit is the one that runs out first, which is the shortest
|
|
* window a provider reports — a 5-hour bucket says more about whether the next
|
|
* turn will land than a monthly one. Rows without a window duration (credit
|
|
* balances, tool counters) are kept only as a last resort, since they never
|
|
* answer "can I keep working right now".
|
|
*/
|
|
|
|
/**
|
|
* Quota provider ids mostly match OpenCode provider ids; these are the ones
|
|
* that do not. Unmatched providers simply produce no headline.
|
|
*/
|
|
const QUOTA_PROVIDER_ALIASES = new Map<string, string>([
|
|
['openai', 'codex'],
|
|
['chatgpt', 'codex'],
|
|
['anthropic', 'claude'],
|
|
['gemini', 'google'],
|
|
]);
|
|
|
|
const normalize = (value: string | null | undefined): string => (value ?? '').trim().toLowerCase();
|
|
|
|
export const resolveQuotaProviderId = (modelProviderId: string | null | undefined): string | null => {
|
|
const normalized = normalize(modelProviderId);
|
|
if (!normalized) return null;
|
|
return QUOTA_PROVIDER_ALIASES.get(normalized) ?? normalized;
|
|
};
|
|
|
|
/**
|
|
* Shortest reported window for the provider the composer is pointed at.
|
|
*
|
|
* Returns null when nothing matches — the section then falls back to its
|
|
* display-mode label rather than showing a quota belonging to some other
|
|
* provider, which would read as the active one.
|
|
*/
|
|
export const pickUsageHeadline = (
|
|
groups: readonly UsageProviderGroup[],
|
|
modelProviderId: string | null | undefined,
|
|
): { group: UsageProviderGroup; row: UsageLimitRow } | null => {
|
|
const quotaProviderId = resolveQuotaProviderId(modelProviderId);
|
|
if (!quotaProviderId) return null;
|
|
|
|
const group = groups.find((candidate) => normalize(candidate.providerId) === quotaProviderId);
|
|
if (!group || group.rows.length === 0) return null;
|
|
|
|
// Provider-level rows only: a model-scoped row describes one model, not the
|
|
// provider the composer is pointed at.
|
|
const providerRows = group.rows.filter((row) => !row.subtitle);
|
|
const rows = providerRows.length > 0 ? providerRows : group.rows;
|
|
|
|
let best: UsageLimitRow | null = null;
|
|
let bestSeconds = Number.POSITIVE_INFINITY;
|
|
for (const row of rows) {
|
|
const seconds = row.window.windowSeconds;
|
|
if (typeof seconds !== 'number' || !Number.isFinite(seconds) || seconds <= 0) continue;
|
|
if (seconds < bestSeconds) {
|
|
best = row;
|
|
bestSeconds = seconds;
|
|
}
|
|
}
|
|
|
|
return { group, row: best ?? rows[0] };
|
|
};
|