ethagent 3.3.3 → 4.0.0

package/src/auth/openaiOAuth/refresh.ts

@@ -1,70 +0,0 @@
-import {
-  OPENAI_OAUTH_CLIENT_ID,
-  OPENAI_OAUTH_TOKEN_URL,
-  asTrimmedString,
-  parseChatgptAccountId,
-} from './shared.js'
-import type { OpenAIOAuthCredentials } from './credentials.js'
-
-export type RefreshedTokens = {
-  accessToken: string
-  refreshToken: string
-  idToken?: string
-  accountId?: string
-  expiresIn: number
-}
-
-const REFRESH_LEEWAY_MS = 60_000
-
-export function shouldRefresh(creds: OpenAIOAuthCredentials, now: number = Date.now()): boolean {
-  return now >= creds.expiresAt - REFRESH_LEEWAY_MS
-}
-
-export async function refreshOpenAIAccessToken(refreshToken: string): Promise<RefreshedTokens> {
-  const body = new URLSearchParams({
-    client_id: OPENAI_OAUTH_CLIENT_ID,
-    grant_type: 'refresh_token',
-    refresh_token: refreshToken,
-  })
-
-  const response = await fetch(OPENAI_OAUTH_TOKEN_URL, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body,
-    signal: AbortSignal.timeout(15_000),
-  })
-
-  if (!response.ok) {
-    const errorText = await response.text().catch(() => '')
-    throw new Error(
-      errorText.trim()
-        ? `OpenAI token refresh failed (${response.status}): ${errorText.trim()}`
-        : `OpenAI token refresh failed with status ${response.status}.`,
-    )
-  }
-
-  const payload = (await response.json()) as {
-    access_token?: string
-    refresh_token?: string
-    id_token?: string
-    expires_in?: number
-  }
-  const accessToken = asTrimmedString(payload.access_token)
-  if (!accessToken) {
-    throw new Error('OpenAI token refresh succeeded without a new access token.')
-  }
-  const nextRefresh = asTrimmedString(payload.refresh_token) ?? refreshToken
-  const idToken = asTrimmedString(payload.id_token)
-  const expiresIn = typeof payload.expires_in === 'number' && payload.expires_in > 0
-    ? payload.expires_in
-    : 3600
-  const accountId = parseChatgptAccountId(idToken) ?? parseChatgptAccountId(accessToken)
-
-  return {
-    accessToken,
-    refreshToken: nextRefresh,
-    idToken,
-    accountId,
-    expiresIn,
-  }
-}

package/src/auth/openaiOAuth/shared.ts

@@ -1,115 +0,0 @@
-export const OPENAI_OAUTH_ISSUER = 'https://auth.openai.com'
-export const OPENAI_OAUTH_TOKEN_URL = `${OPENAI_OAUTH_ISSUER}/oauth/token`
-export const OPENAI_OAUTH_CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann'
-export const OPENAI_OAUTH_CALLBACK_PORT = 1455
-export const OPENAI_OAUTH_SCOPE =
-  'openid profile email offline_access api.connectors.read api.connectors.invoke'
-export const OPENAI_OAUTH_ORIGINATOR = 'codex_cli_rs'
-export const OPENAI_API_KEY_TOKEN_NAME = 'openai-api-key'
-export const OPENAI_ID_TOKEN_SUBJECT_TYPE =
-  'urn:ietf:params:oauth:token-type:id_token'
-export const OPENAI_TOKEN_EXCHANGE_GRANT =
-  'urn:ietf:params:oauth:grant-type:token-exchange'
-
-export function asTrimmedString(value: unknown): string | undefined {
-  if (typeof value !== 'string') return undefined
-  const trimmed = value.trim()
-  return trimmed ? trimmed : undefined
-}
-
-export function decodeJwtPayload(
-  token: string,
-): Record<string, unknown> | undefined {
-  const parts = token.split('.')
-  if (parts.length < 2) return undefined
-  const segment = parts[1]
-  if (!segment) return undefined
-
-  try {
-    const normalized = segment.replace(/-/g, '+').replace(/_/g, '/')
-    const padded = normalized + '='.repeat((4 - (normalized.length % 4)) % 4)
-    const json = Buffer.from(padded, 'base64').toString('utf8')
-    const parsed = JSON.parse(json) as unknown
-    return parsed && typeof parsed === 'object'
-      ? (parsed as Record<string, unknown>)
-      : undefined
-  } catch {
-    return undefined
-  }
-}
-
-export function parseChatgptAccountId(
-  token: string | undefined,
-): string | undefined {
-  if (!token) return undefined
-
-  const payload = decodeJwtPayload(token)
-  const nestedAuthRaw = payload?.['https://api.openai.com/auth']
-  const nestedAuth =
-    nestedAuthRaw && typeof nestedAuthRaw === 'object'
-      ? (nestedAuthRaw as Record<string, unknown>)
-      : undefined
-
-  return (
-    asTrimmedString(
-      nestedAuth?.chatgpt_account_id ??
-        payload?.['https://api.openai.com/auth.chatgpt_account_id'] ??
-        payload?.chatgpt_account_id,
-    ) ?? undefined
-  )
-}
-
-export function escapeHtml(value: string): string {
-  return value.replace(/[&<>"']/g, char => {
-    switch (char) {
-      case '&':
-        return '&amp;'
-      case '<':
-        return '&lt;'
-      case '>':
-        return '&gt;'
-      case '"':
-        return '&quot;'
-      case '\'':
-        return '&#39;'
-      default:
-        return char
-    }
-  })
-}
-
-export async function exchangeIdTokenForApiKey(idToken: string): Promise<string> {
-  const body = new URLSearchParams({
-    grant_type: OPENAI_TOKEN_EXCHANGE_GRANT,
-    client_id: OPENAI_OAUTH_CLIENT_ID,
-    requested_token: OPENAI_API_KEY_TOKEN_NAME,
-    subject_token: idToken,
-    subject_token_type: OPENAI_ID_TOKEN_SUBJECT_TYPE,
-  })
-
-  const response = await fetch(OPENAI_OAUTH_TOKEN_URL, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body,
-    signal: AbortSignal.timeout(15_000),
-  })
-
-  if (!response.ok) {
-    const bodyText = await response.text().catch(() => '')
-    throw new Error(
-      bodyText.trim()
-        ? `OpenAI API key exchange failed (${response.status}): ${bodyText.trim()}`
-        : `OpenAI API key exchange failed with status ${response.status}.`,
-    )
-  }
-
-  const payload = (await response.json()) as { access_token?: string }
-  const apiKey = asTrimmedString(payload.access_token)
-  if (!apiKey) {
-    throw new Error(
-      'OpenAI API key exchange completed, but no key was returned.',
-    )
-  }
-
-  return apiKey
-}

package/src/chat/ChatBottomPane.tsx

@@ -1,296 +0,0 @@
-import React from 'react'
-import type { EthagentConfig } from '../storage/config.js'
-import type { PermissionDecision, PermissionRequest, SessionPermissionRule } from '../tools/contracts.js'
-import { type ModelPickerSelection, ModelPicker } from '../models/ModelPicker.js'
-import type { ModelPickerContextFit } from '../models/modelPickerOptions.js'
-import { ResumeView } from './views/ResumeView.js'
-import { RewindView } from './views/RewindView.js'
-import { PermissionsView } from './views/PermissionsView.js'
-import { CopyPicker } from './views/CopyPicker.js'
-import { PermissionPrompt } from './views/PermissionPrompt.js'
-import { PlanApprovalView, type PlanApprovalAction } from './views/PlanApprovalView.js'
-import { ChatInput } from './input/ChatInput.js'
-import { IdentityHub, type IdentityHubInitialAction, type IdentityHubResult } from '../identity/hub/IdentityHub.js'
-import type { CopyResult } from '../utils/clipboard.js'
-import { getSlashSuggestions } from './commands.js'
-import { modelSupportsImages } from '../utils/images.js'
-import { Box, Text } from 'ink'
-import { theme } from '../ui/theme.js'
-import { Spinner } from '../ui/Spinner.js'
-import { ContextLimitView, type ContextLimitAction } from './views/ContextLimitView.js'
-import type { ContextUsage } from '../runtime/compaction.js'
-import {
-  ContinuityEditReviewView,
-  type ContinuityEditReviewAction,
-  type ContinuityEditReviewState,
-} from './views/ContinuityEditReviewView.js'
-
-export type Overlay = 'none' | 'modelPicker' | 'resume' | 'rewind' | 'copyPicker' | 'permission' | 'permissions' | 'planApproval' | 'identity' | 'contextLimit' | 'continuityEditReview'
-export type CopyPickerState = { turnText: string; turnLabel: string } | null
-export type IdentityOverlayState = {
-  initialAction: IdentityHubInitialAction | undefined
-  existing: { address: string } | null
-}
-export type ContextLimitState = {
-  usage: ContextUsage
-  prompt: string
-} | null
-
-export type BottomPaneActivity = {
-  label: string
-  hint?: string
-} | null
-
-type ChatBottomPaneProps = {
-  overlay: Overlay
-  config: EthagentConfig
-  sessionId: string
-  cwd: string
-  currentSessionId: string
-  copyPickerState: CopyPickerState
-  contextLimitState: ContextLimitState
-  continuityEditReview: ContinuityEditReviewState | null
-  modelPickerContextFit: ModelPickerContextFit | null
-  permissionRequest: PermissionRequest | null
-  history: string[]
-  streaming: boolean
-  streamingStartedAt: number | null
-  activity: BottomPaneActivity
-  placeholderHints: string[]
-  queuedInputs: string[]
-  slashSuggestions: ReturnType<typeof getSlashSuggestions>
-  planApprovalContextLabel: string
-  footerRight: React.ReactNode
-  handleModelPick: (sel: ModelPickerSelection) => void | Promise<void>
-  handleModelPickerCancel: () => void
-  handleResumePick: (id: string) => void | Promise<void>
-  handleResumeClearAll: () => void | Promise<void>
-  identityOverlay: IdentityOverlayState | null
-  handleIdentityResult: (result: IdentityHubResult) => void
-  handleRestoreConversation: (turnId: string, promptText?: string) => void
-  pendingInputDraft: string | null
-  onInputDraftConsumed: () => void
-  handleSummarizeFromTurn: (turnId: string) => void | Promise<unknown>
-  handleCopyDone: (result: CopyResult, label: string) => void
-  handleCopyCancel: () => void
-  resolvePermission: (decision: PermissionDecision) => void
-  handlePlanApproval: (action: PlanApprovalAction) => void | Promise<void>
-  handlePlanApprovalCancel: () => void
-  handleContextLimitAction: (action: ContextLimitAction) => void | Promise<void>
-  handleContextLimitCancel: () => void
-  handleContinuityEditReviewAction: (action: ContinuityEditReviewAction) => void | Promise<void>
-  handleContinuityEditReviewCancel: () => void
-  onPermissionRulesChanged: (rules: SessionPermissionRule[]) => void
-  onConfigChange: (config: EthagentConfig) => void
-  handleSubmit: (value: string) => void | Promise<void>
-  setOverlay: React.Dispatch<React.SetStateAction<Overlay>>
-  pushNote: (text: string, kind?: 'info' | 'error' | 'dim') => void
-}
-
-export function ChatBottomPane({
-  overlay,
-  config,
-  sessionId,
-  cwd,
-  currentSessionId,
-  copyPickerState,
-  contextLimitState,
-  continuityEditReview,
-  modelPickerContextFit,
-  permissionRequest,
-  history,
-  streaming,
-  streamingStartedAt,
-  activity,
-  placeholderHints,
-  queuedInputs,
-  slashSuggestions,
-  planApprovalContextLabel,
-  footerRight,
-  handleModelPick,
-  handleModelPickerCancel,
-  handleResumePick,
-  handleResumeClearAll,
-  identityOverlay,
-  handleIdentityResult,
-  handleRestoreConversation,
-  handleSummarizeFromTurn,
-  pendingInputDraft,
-  onInputDraftConsumed,
-  handleCopyDone,
-  handleCopyCancel,
-  resolvePermission,
-  handlePlanApproval,
-  handlePlanApprovalCancel,
-  handleContextLimitAction,
-  handleContextLimitCancel,
-  handleContinuityEditReviewAction,
-  handleContinuityEditReviewCancel,
-  onPermissionRulesChanged,
-  onConfigChange,
-  handleSubmit,
-  setOverlay,
-  pushNote,
-}: ChatBottomPaneProps): React.ReactNode {
-  if (overlay === 'modelPicker') {
-    return (
-      <ModelPicker
-        currentConfig={config}
-        currentProvider={config.provider}
-        currentModel={config.model}
-        contextFit={modelPickerContextFit}
-        onPick={handleModelPick}
-        onCancel={handleModelPickerCancel}
-      />
-    )
-  }
-
-  if (overlay === 'resume') {
-    return (
-      <ResumeView
-        currentSessionId={sessionId}
-        onResume={handleResumePick}
-        onClearAll={handleResumeClearAll}
-        onCancel={() => setOverlay('none')}
-      />
-    )
-  }
-
-  if (overlay === 'rewind') {
-    return (
-      <RewindView
-        cwd={cwd}
-        currentSessionId={currentSessionId}
-        onRestoreConversation={handleRestoreConversation}
-        onSummarizeFromTurn={handleSummarizeFromTurn}
-        onDone={(message, variant = 'info') => {
-          setOverlay('none')
-          pushNote(message, variant)
-        }}
-        onCancel={() => setOverlay('none')}
-      />
-    )
-  }
-
-  if (overlay === 'permissions') {
-    return (
-      <PermissionsView
-        cwd={cwd}
-        onRulesChanged={onPermissionRulesChanged}
-        onNotice={(message, variant = 'info') => {
-          pushNote(message, variant)
-        }}
-        onCancel={() => setOverlay('none')}
-      />
-    )
-  }
-
-  if (overlay === 'copyPicker' && copyPickerState) {
-    return (
-      <CopyPicker
-        turnText={copyPickerState.turnText}
-        turnLabel={copyPickerState.turnLabel}
-        onDone={handleCopyDone}
-        onCancel={handleCopyCancel}
-      />
-    )
-  }
-
-  if (overlay === 'permission' && permissionRequest) {
-    return (
-      <PermissionPrompt
-        request={permissionRequest}
-        onDecision={resolvePermission}
-        onCancel={() => resolvePermission('deny')}
-      />
-    )
-  }
-
-  if (overlay === 'identity' && identityOverlay) {
-    return (
-      <IdentityHub
-        mode="manage"
-        config={config}
-        initialAction={identityOverlay.initialAction}
-        onComplete={handleIdentityResult}
-        onConfigChange={onConfigChange}
-      />
-    )
-  }
-
-  if (overlay === 'planApproval') {
-    return (
-      <PlanApprovalView
-        contextLabel={planApprovalContextLabel}
-        onSelect={handlePlanApproval}
-        onCancel={handlePlanApprovalCancel}
-      />
-    )
-  }
-
-  if (overlay === 'contextLimit' && contextLimitState) {
-    return (
-      <ContextLimitView
-        usage={contextLimitState.usage}
-        promptPreview={summarizePrompt(contextLimitState.prompt)}
-        onSelect={handleContextLimitAction}
-        onCancel={handleContextLimitCancel}
-      />
-    )
-  }
-
-  if (overlay === 'continuityEditReview' && continuityEditReview) {
-    return (
-      <ContinuityEditReviewView
-        review={continuityEditReview}
-        onSelect={handleContinuityEditReviewAction}
-        onCancel={handleContinuityEditReviewCancel}
-      />
-    )
-  }
-
-  return (
-    <Box flexDirection="column" width="100%">
-      {activity ? (
-        <Box marginLeft={2} marginBottom={1}>
-          <Spinner active label={activity.label} hint={activity.hint} />
-        </Box>
-      ) : streaming ? (
-        <Box marginLeft={2} marginBottom={1}>
-          <Spinner active hint="esc to cancel" startedAt={streamingStartedAt ?? undefined} />
-        </Box>
-      ) : null}
-      <ChatInput
-        onSubmit={handleSubmit}
-        history={history}
-        placeholderHints={placeholderHints}
-        queuedMessages={queuedInputs}
-        slashSuggestions={slashSuggestions}
-        footerRight={footerRight}
-        cwd={cwd}
-        seedText={pendingInputDraft}
-        onSeedConsumed={onInputDraftConsumed}
-        onImagePaste={() => {
-          if (!modelSupportsImages(config.provider, config.model, { mmprojPath: config.localMmprojPath })) {
-            const hint = config.provider === 'llamacpp'
-              ? ' · run "Add Vision Encoder" in alt+p to enable image input on this model'
-              : ' · switch via alt+p'
-            pushNote(`current model "${config.model}" does not accept image input${hint}`, 'error')
-          }
-        }}
-      />
-      <Box marginLeft={2} marginTop={0} flexDirection="column">
-        <Text>
-          <Text color={theme.dim}>Workspace · </Text>
-          <Text color={theme.textSubtle}>{cwd}</Text>
-        </Text>
-      </Box>
-    </Box>
-  )
-}
-
-function summarizePrompt(text: string): string {
-  const normalized = text.replace(/\s+/g, ' ').trim()
-  if (normalized.length <= 100) return normalized
-  return `${normalized.slice(0, 97)}...`
-}