Skip to content

Node-based terminal manager for AI coding agents — tmux-backed terminals and parallel agent sessions as draggable nodes on an infinite pan/zoom canvas. macOS, Linux, and a browser Server Edition.

Merge remote-tracking branch 'origin/main' into integrate/pr880-final-20260923

reviewcfd2c20202ed
diff --cc CONTRIBUTING.md
index 2d094f663,8b91319ed..7ce0ef47b
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -56,11 -56,14 +56,19 @@@ handler needs something only Electron h
**injected dep** whose absence is a documented degrade — see `registerTranscriptIpc` /
`registerContextEnsureIpc` — rather than a reason to keep the whole handler in `src/main`.
+Claude usage identity is scoped to the same config directory as its credentials. Read organization
+metadata even when credentials already include an email, and degrade to the email-only row when
+metadata cannot be read. Managed usage must never fall back to an unscoped system Keychain token:
+that would label one account's limits with another account's organization.
+
+ Windows installer safety (#829): `build/installer.nsh` overrides NSIS's process-killing check.
+ A running app or session host blocks install/uninstall, and a failed process query blocks too.
+ Never restore automatic host termination: quitting the app preserves those live sessions.
+ Update preparation must keep saved canvas nodes: exit programs normally, quit, then have the user
+ verify and stop any remaining host. Never recommend **End session** (it deletes nodes). Cold agent
+ resume depends on supported, saved conversation history; it does not preserve running tasks.
+ See `docs/windows-session-host.md` for the user-controlled preparation/recovery steps and limits.
+
## Three surfaces
A feature is not done until you have decided how it behaves on each — even if the decision is "not
diff --cc src/renderer/components/UsageIndicator.tsx
index a1104075b,c8333888a..5dbac3436
--- a/src/renderer/components/UsageIndicator.tsx
+++ b/src/renderer/components/UsageIndicator.tsx
@@@ -1,5 -1,5 +1,6 @@@
+ import { usageDiagnosticText } from '../lib/usageDiagnostic'
import { useEffect, useMemo, useRef, useState } from 'react'
+import { UsageOrganization } from './UsageOrganization'
import { IconReload } from './icons'
import type { ClaudeUsage, ProviderUsage, RemoteAccountUsage, UsageLimit } from '@shared/types'
import { AGENT_CONFIG } from '@shared/agents/config'
@@@ -638,12 -644,12 +646,12 @@@ export function UsageIndicator(
))}
{/* Another provider's data must not hide a failed Claude read. Keep any
last-known Claude bars instead of replacing them with the empty state. */}
- {(!hasData || (isError && limits.length === 0)) && (
+ {((!hasData && !providerError) || (claudeError && limits.length === 0)) && (
<div className="usage-popover__empty">
- {isError ? 'Could not read usage.' : 'No usage data.'}
+ {claudeError ? 'Could not read usage.' : 'No usage data.'}
</div>
)}
- {claudeUsage?.email && (
+ {(claudeUsage?.email || claudeUsage?.organization) && (
<div className="usage-account">
<div className="usage-account__label">Claude Account</div>
<div className="usage-account__email">{claudeUsage.email}</div>