ummaya 0.2.9 → 0.2.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/npm-shrinkwrap.json +2 -2
- package/package.json +1 -1
- package/pyproject.toml +2 -2
- package/tui/package.json +1 -1
- package/tui/src/bridge/bridgeEnabled.ts +1 -1
- package/tui/src/commands/chrome/chrome.tsx +3 -4
- package/tui/src/commands/createMovedToPluginCommand.ts +1 -1
- package/tui/src/commands/extra-usage/extra-usage-core.ts +2 -4
- package/tui/src/commands/insights.ts +5 -4
- package/tui/src/commands/install-github-app/ApiKeyStep.tsx +1 -2
- package/tui/src/commands/install-github-app/ExistingWorkflowStep.tsx +1 -1
- package/tui/src/commands/install-github-app/InstallAppStep.tsx +1 -1
- package/tui/src/commands/install-github-app/install-github-app.tsx +2 -2
- package/tui/src/commands/install-github-app/setupGitHubActions.ts +2 -2
- package/tui/src/commands/install-slack-app/install-slack-app.ts +1 -1
- package/tui/src/commands/mobile/mobile.tsx +3 -3
- package/tui/src/commands/stickers/stickers.ts +1 -1
- package/tui/src/commands/upgrade/upgrade.tsx +3 -4
- package/tui/src/components/ClaudeInChromeOnboarding.tsx +2 -3
- package/tui/src/components/Feedback.tsx +8 -2
- package/tui/src/components/FeedbackSurvey/submitTranscriptShare.ts +7 -2
- package/tui/src/components/Passes/Passes.tsx +1 -1
- package/tui/src/components/WorkflowMultiselectDialog.tsx +1 -1
- package/tui/src/components/messages/AssistantTextMessage.tsx +1 -2
- package/tui/src/constants/github-app.ts +19 -26
- package/tui/src/constants/oauth.ts +28 -59
- package/tui/src/constants/product.ts +6 -6
- package/tui/src/entrypoints/sdk/coreSchemas.ts +1 -1
- package/tui/src/services/analytics/firstPartyEventLogger.ts +0 -3
- package/tui/src/services/analytics/firstPartyEventLoggingExporter.ts +34 -12
- package/tui/src/services/analytics/growthbook.ts +17 -16
- package/tui/src/services/api/filesApi.ts +4 -14
- package/tui/src/services/api/metricsOptOut.ts +20 -1
- package/tui/src/services/mcp/channelNotification.ts +1 -1
- package/tui/src/services/mcp/officialRegistry.ts +5 -1
- package/tui/src/services/mcp/useManageMCPConnections.ts +1 -1
- package/tui/src/services/mcp/utils.ts +2 -2
- package/tui/src/services/tokenEstimation.ts +0 -1
- package/tui/src/tools/AgentTool/built-in/claudeCodeGuideAgent.ts +6 -6
- package/tui/src/tools/McpAuthTool/McpAuthTool.ts +1 -1
- package/tui/src/tools/RemoteTriggerTool/RemoteTriggerTool.ts +1 -1
- package/tui/src/tools/RemoteTriggerTool/prompt.ts +2 -2
- package/tui/src/tools/WebFetchTool/preapproved.ts +0 -4
- package/tui/src/tools/WebFetchTool/utils.ts +15 -11
- package/tui/src/upstreamproxy/upstreamproxy.ts +9 -15
- package/tui/src/utils/autoUpdater.ts +4 -1
- package/tui/src/utils/claudeInChrome/mcpServer.ts +1 -1
- package/tui/src/utils/claudeInChrome/setup.ts +1 -1
- package/tui/src/utils/claudeInChrome/toolRendering.tsx +1 -2
- package/tui/src/utils/desktopDeepLink.ts +18 -18
- package/tui/src/utils/fastMode.ts +1 -1
- package/tui/src/utils/http.ts +1 -5
- package/tui/src/utils/ide.ts +6 -5
- package/tui/src/utils/model/providers.ts +6 -10
- package/tui/src/utils/modelCost.ts +0 -2
- package/tui/src/utils/nativeInstaller/download.ts +15 -17
- package/tui/src/utils/plugins/installCounts.ts +4 -11
- package/tui/src/utils/plugins/officialMarketplaceGcs.ts +5 -18
- package/tui/src/utils/releaseNotes.ts +2 -2
- package/tui/src/utils/settings/types.ts +1 -1
- package/tui/src/utils/statusNoticeDefinitions.tsx +3 -3
- package/tui/src/utils/telemetry/bigqueryExporter.ts +20 -13
- package/uv.lock +1 -1
|
@@ -100,7 +100,7 @@ export function AssistantTextMessage(t0) {
|
|
|
100
100
|
{
|
|
101
101
|
let t2;
|
|
102
102
|
if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
|
|
103
|
-
t2 = <MessageResponse height={1}><Text color="error">Credit balance too low ·
|
|
103
|
+
t2 = <MessageResponse height={1}><Text color="error">Credit balance too low · Configure FriendliAI billing: https://ummaya-docs.pages.dev/</Text></MessageResponse>;
|
|
104
104
|
$[5] = t2;
|
|
105
105
|
} else {
|
|
106
106
|
t2 = $[5];
|
|
@@ -267,4 +267,3 @@ export function AssistantTextMessage(t0) {
|
|
|
267
267
|
}
|
|
268
268
|
}
|
|
269
269
|
}
|
|
270
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["TextBlockParam","React","useContext","ERROR_MESSAGE_USER_ABORT","isRateLimitErrorMessage","BLACK_CIRCLE","Box","NoSelect","Text","API_ERROR_MESSAGE_PREFIX","API_TIMEOUT_ERROR_MESSAGE","CREDIT_BALANCE_TOO_LOW_ERROR_MESSAGE","CUSTOM_OFF_SWITCH_MESSAGE","INVALID_API_KEY_ERROR_MESSAGE","INVALID_API_KEY_ERROR_MESSAGE_EXTERNAL","ORG_DISABLED_ERROR_MESSAGE_ENV_KEY","ORG_DISABLED_ERROR_MESSAGE_ENV_KEY_WITH_OAUTH","PROMPT_TOO_LONG_ERROR_MESSAGE","startsWithApiErrorPrefix","TOKEN_REVOKED_ERROR_MESSAGE","isEmptyMessageText","NO_RESPONSE_REQUESTED","getUpgradeMessage","getDefaultSonnetModel","renderModelName","isMacOsKeychainLocked","CtrlOToExpand","InterruptedByUser","Markdown","MessageResponse","MessageActionsSelectedContext","RateLimitMessage","MAX_API_ERROR_CHARS","Props","param","addMargin","shouldShowDot","verbose","width","onOpenRateLimitOptions","InvalidApiKeyMessage","$","_c","t0","Symbol","for","isKeychainLocked","t1","AssistantTextMessage","text","isSelected","t2","upgradeHint","t3","process","env","API_TIMEOUT_MS","truncated","length","slice","t4","t5","undefined","t6","t7"],"sources":["AssistantTextMessage.tsx"],"sourcesContent":["import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'\nimport React, { useContext } from 'react'\nimport { ERROR_MESSAGE_USER_ABORT } from 'src/services/compact/compact.js'\nimport { isRateLimitErrorMessage } from 'src/services/rateLimitMessages.js'\nimport { BLACK_CIRCLE } from '../../constants/figures.js'\nimport { Box, NoSelect, Text } from '../../ink.js'\nimport {\n  API_ERROR_MESSAGE_PREFIX,\n  API_TIMEOUT_ERROR_MESSAGE,\n  CREDIT_BALANCE_TOO_LOW_ERROR_MESSAGE,\n  CUSTOM_OFF_SWITCH_MESSAGE,\n  INVALID_API_KEY_ERROR_MESSAGE,\n  INVALID_API_KEY_ERROR_MESSAGE_EXTERNAL,\n  ORG_DISABLED_ERROR_MESSAGE_ENV_KEY,\n  ORG_DISABLED_ERROR_MESSAGE_ENV_KEY_WITH_OAUTH,\n  PROMPT_TOO_LONG_ERROR_MESSAGE,\n  startsWithApiErrorPrefix,\n  TOKEN_REVOKED_ERROR_MESSAGE,\n} from '../../services/api/errors.js'\nimport {\n  isEmptyMessageText,\n  NO_RESPONSE_REQUESTED,\n} from '../../utils/messages.js'\nimport { getUpgradeMessage } from '../../utils/model/contextWindowUpgradeCheck.js'\nimport {\n  getDefaultSonnetModel,\n  renderModelName,\n} from '../../utils/model/model.js'\nimport { isMacOsKeychainLocked } from '../../utils/secureStorage/macOsKeychainStorage.js'\nimport { CtrlOToExpand } from '../CtrlOToExpand.js'\nimport { InterruptedByUser } from '../InterruptedByUser.js'\nimport { Markdown } from '../Markdown.js'\nimport { MessageResponse } from '../MessageResponse.js'\nimport { MessageActionsSelectedContext } from '../messageActions.js'\nimport { RateLimitMessage } from './RateLimitMessage.js'\n\nconst MAX_API_ERROR_CHARS = 1000\n\ntype Props = {\n  param: TextBlockParam\n  addMargin: boolean\n  shouldShowDot: boolean\n  verbose: boolean\n  width?: number | string\n  onOpenRateLimitOptions?: () => void\n}\n\nfunction InvalidApiKeyMessage(): React.ReactNode {\n  const isKeychainLocked = isMacOsKeychainLocked()\n\n  return (\n    <MessageResponse>\n      <Box flexDirection=\"column\">\n        <Text color=\"error\">{INVALID_API_KEY_ERROR_MESSAGE}</Text>\n        {isKeychainLocked && (\n          <Text dimColor>\n            · Run in another terminal: security unlock-keychain\n          </Text>\n        )}\n      </Box>\n    </MessageResponse>\n  )\n}\n\nexport function AssistantTextMessage({\n  param: { text },\n  addMargin,\n  shouldShowDot,\n  verbose,\n  onOpenRateLimitOptions,\n}: Props): React.ReactNode {\n  const isSelected = useContext(MessageActionsSelectedContext)\n  if (isEmptyMessageText(text)) {\n    return null\n  }\n\n  // Handle all rate limit error messages from getRateLimitErrorMessage\n  // Use the exported function to avoid fragile string coupling\n  if (isRateLimitErrorMessage(text)) {\n    return (\n      <RateLimitMessage\n        text={text}\n        onOpenRateLimitOptions={onOpenRateLimitOptions}\n      />\n    )\n  }\n\n  switch (text) {\n    // Local JSX commands don't need a response, but we still want Claude to see them\n    // Tool results render their own interrupt messages\n    case NO_RESPONSE_REQUESTED:\n      return null\n\n    case PROMPT_TOO_LONG_ERROR_MESSAGE: {\n      const upgradeHint = getUpgradeMessage('warning')\n      return (\n        <MessageResponse height={1}>\n          <Text color=\"error\">\n            Context limit reached · /compact or /clear to continue\n            {upgradeHint ? ` · ${upgradeHint}` : ''}\n          </Text>\n        </MessageResponse>\n      )\n    }\n\n    case CREDIT_BALANCE_TOO_LOW_ERROR_MESSAGE:\n      return (\n        <MessageResponse height={1}>\n          <Text color=\"error\">\n            Credit balance too low &middot; Add funds:\n            https://platform.claude.com/settings/billing\n          </Text>\n        </MessageResponse>\n      )\n\n    case INVALID_API_KEY_ERROR_MESSAGE:\n      return <InvalidApiKeyMessage />\n\n    case INVALID_API_KEY_ERROR_MESSAGE_EXTERNAL:\n      return (\n        <MessageResponse height={1}>\n          <Text color=\"error\">{INVALID_API_KEY_ERROR_MESSAGE_EXTERNAL}</Text>\n        </MessageResponse>\n      )\n\n    case ORG_DISABLED_ERROR_MESSAGE_ENV_KEY:\n    case ORG_DISABLED_ERROR_MESSAGE_ENV_KEY_WITH_OAUTH:\n      return (\n        <MessageResponse>\n          <Text color=\"error\">{text}</Text>\n        </MessageResponse>\n      )\n\n    case TOKEN_REVOKED_ERROR_MESSAGE:\n      return (\n        <MessageResponse height={1}>\n          <Text color=\"error\">{TOKEN_REVOKED_ERROR_MESSAGE}</Text>\n        </MessageResponse>\n      )\n\n    case API_TIMEOUT_ERROR_MESSAGE:\n      return (\n        <MessageResponse height={1}>\n          <Text color=\"error\">\n            {API_TIMEOUT_ERROR_MESSAGE}\n            {process.env.API_TIMEOUT_MS && (\n              <>\n                {' '}\n                (API_TIMEOUT_MS={process.env.API_TIMEOUT_MS}ms, try increasing\n                it)\n              </>\n            )}\n          </Text>\n        </MessageResponse>\n      )\n\n    case CUSTOM_OFF_SWITCH_MESSAGE:\n      return (\n        <MessageResponse>\n          <Box flexDirection=\"column\" gap={1}>\n            <Text color=\"error\">\n              We are experiencing high demand for Opus 4.\n            </Text>\n            <Text>\n              To continue immediately, use /model to switch to{' '}\n              {renderModelName(getDefaultSonnetModel())} and continue coding.\n            </Text>\n          </Box>\n        </MessageResponse>\n      )\n\n    // TODO: Move this to a user turn\n    case ERROR_MESSAGE_USER_ABORT:\n      return (\n        <MessageResponse height={1}>\n          <InterruptedByUser />\n        </MessageResponse>\n      )\n\n    default:\n      if (startsWithApiErrorPrefix(text)) {\n        const truncated = !verbose && text.length > MAX_API_ERROR_CHARS\n        return (\n          <MessageResponse>\n            <Box flexDirection=\"column\">\n              <Text color=\"error\">\n                {text === API_ERROR_MESSAGE_PREFIX\n                  ? `${API_ERROR_MESSAGE_PREFIX}: Please wait a moment and try again.`\n                  : truncated\n                    ? text.slice(0, MAX_API_ERROR_CHARS) + '…'\n                    : text}\n              </Text>\n              {truncated && <CtrlOToExpand />}\n            </Box>\n          </MessageResponse>\n        )\n      }\n      return (\n        <Box\n          alignItems=\"flex-start\"\n          flexDirection=\"row\"\n          justifyContent=\"space-between\"\n          marginTop={addMargin ? 1 : 0}\n          width=\"100%\"\n          backgroundColor={isSelected ? 'messageActionsBackground' : undefined}\n        >\n          <Box flexDirection=\"row\">\n            {shouldShowDot && (\n              <NoSelect fromLeftEdge minWidth={2}>\n                <Text color={isSelected ? 'suggestion' : 'text'}>\n                  {BLACK_CIRCLE}\n                </Text>\n              </NoSelect>\n            )}\n            <Box flexDirection=\"column\">\n              <Markdown>{text}</Markdown>\n            </Box>\n          </Box>\n        </Box>\n      )\n  }\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export const PR_TITLE = 'Add UMMAYA GitHub Workflow'
|
|
2
2
|
|
|
3
3
|
export const GITHUB_ACTION_SETUP_DOCS_URL =
|
|
4
|
-
'https://
|
|
4
|
+
'https://ummaya-docs.pages.dev/en/'
|
|
5
5
|
|
|
6
6
|
export const WORKFLOW_CONTENT = `name: UMMAYA
|
|
7
7
|
|
|
@@ -35,23 +35,16 @@ jobs:
|
|
|
35
35
|
with:
|
|
36
36
|
fetch-depth: 1
|
|
37
37
|
|
|
38
|
-
- name:
|
|
39
|
-
|
|
40
|
-
uses: anthropics/claude-code-action@v1
|
|
41
|
-
with:
|
|
42
|
-
friendli_api_key: \${{ secrets.FRIENDLI_TOKEN }}
|
|
43
|
-
|
|
44
|
-
# This is an optional setting that allows UMMAYA to read CI results on PRs
|
|
45
|
-
additional_permissions: |
|
|
46
|
-
actions: read
|
|
38
|
+
- name: Install UMMAYA
|
|
39
|
+
run: npm install -g ummaya
|
|
47
40
|
|
|
48
|
-
|
|
49
|
-
|
|
41
|
+
- name: Verify UMMAYA
|
|
42
|
+
id: ummaya
|
|
43
|
+
env:
|
|
44
|
+
FRIENDLI_TOKEN: \${{ secrets.FRIENDLI_TOKEN }}
|
|
45
|
+
run: ummaya --version
|
|
50
46
|
|
|
51
|
-
|
|
52
|
-
# See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
|
|
53
|
-
# or https://ummaya-docs.pages.dev/en/ for available options
|
|
54
|
-
# ummaya_args: '--allowed-tools Bash(gh pr:*)'
|
|
47
|
+
# See https://ummaya-docs.pages.dev/en/ for available options
|
|
55
48
|
|
|
56
49
|
`
|
|
57
50
|
|
|
@@ -130,15 +123,15 @@ jobs:
|
|
|
130
123
|
with:
|
|
131
124
|
fetch-depth: 1
|
|
132
125
|
|
|
133
|
-
- name:
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
126
|
+
- name: Install UMMAYA
|
|
127
|
+
run: npm install -g ummaya
|
|
128
|
+
|
|
129
|
+
- name: Verify UMMAYA Review Runtime
|
|
130
|
+
id: ummaya-review
|
|
131
|
+
env:
|
|
132
|
+
FRIENDLI_TOKEN: \${{ secrets.FRIENDLI_TOKEN }}
|
|
133
|
+
run: ummaya --version
|
|
134
|
+
|
|
135
|
+
# See https://ummaya-docs.pages.dev/en/ for available options
|
|
143
136
|
|
|
144
137
|
`
|
|
@@ -34,6 +34,9 @@ export const CLAUDE_AI_INFERENCE_SCOPE = 'user:inference' as const
|
|
|
34
34
|
export const CLAUDE_AI_PROFILE_SCOPE = 'user:profile' as const
|
|
35
35
|
const CONSOLE_SCOPE = 'org:create_api_key' as const
|
|
36
36
|
export const OAUTH_BETA_HEADER = 'oauth-2025-04-20' as const
|
|
37
|
+
const UMMAYA_DISABLED_OAUTH_BASE_URL =
|
|
38
|
+
'http://127.0.0.1:9/ummaya-disabled-oauth' as const
|
|
39
|
+
const UMMAYA_DOCS_ORIGIN = 'https://ummaya-docs.pages.dev' as const
|
|
37
40
|
|
|
38
41
|
// Console OAuth scopes - for API key creation via Console
|
|
39
42
|
export const CONSOLE_OAUTH_SCOPES = [
|
|
@@ -61,12 +64,6 @@ type OauthConfig = {
|
|
|
61
64
|
BASE_API_URL: string
|
|
62
65
|
CONSOLE_AUTHORIZE_URL: string
|
|
63
66
|
CLAUDE_AI_AUTHORIZE_URL: string
|
|
64
|
-
/**
|
|
65
|
-
* The claude.ai web origin. Separate from CLAUDE_AI_AUTHORIZE_URL because
|
|
66
|
-
* that now routes through claude.com/cai/* for attribution — deriving
|
|
67
|
-
* .origin from it would give claude.com, breaking links to /code,
|
|
68
|
-
* /settings/connectors, and other claude.ai web pages.
|
|
69
|
-
*/
|
|
70
67
|
CLAUDE_AI_ORIGIN: string
|
|
71
68
|
TOKEN_URL: string
|
|
72
69
|
API_KEY_URL: string
|
|
@@ -80,26 +77,24 @@ type OauthConfig = {
|
|
|
80
77
|
MCP_PROXY_PATH: string
|
|
81
78
|
}
|
|
82
79
|
|
|
83
|
-
// Production OAuth configuration
|
|
80
|
+
// Production OAuth configuration. UMMAYA uses FriendliAI API-key login, so
|
|
81
|
+
// OAuth-shaped endpoints fail closed unless an explicit operator override is
|
|
82
|
+
// configured below.
|
|
84
83
|
const PROD_OAUTH_CONFIG = {
|
|
85
|
-
BASE_API_URL:
|
|
86
|
-
CONSOLE_AUTHORIZE_URL:
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
'https://platform.claude.com/buy_credits?returnUrl=/oauth/code/success%3Fapp%3Dclaude-code',
|
|
96
|
-
CLAUDEAI_SUCCESS_URL:
|
|
97
|
-
'https://platform.claude.com/oauth/code/success?app=claude-code',
|
|
98
|
-
MANUAL_REDIRECT_URL: 'https://platform.claude.com/oauth/code/callback',
|
|
84
|
+
BASE_API_URL: UMMAYA_DISABLED_OAUTH_BASE_URL,
|
|
85
|
+
CONSOLE_AUTHORIZE_URL: `${UMMAYA_DISABLED_OAUTH_BASE_URL}/oauth/authorize`,
|
|
86
|
+
CLAUDE_AI_AUTHORIZE_URL: `${UMMAYA_DISABLED_OAUTH_BASE_URL}/oauth/authorize`,
|
|
87
|
+
CLAUDE_AI_ORIGIN: UMMAYA_DOCS_ORIGIN,
|
|
88
|
+
TOKEN_URL: `${UMMAYA_DISABLED_OAUTH_BASE_URL}/v1/oauth/token`,
|
|
89
|
+
API_KEY_URL: `${UMMAYA_DISABLED_OAUTH_BASE_URL}/api/oauth/ummaya_cli/create_api_key`,
|
|
90
|
+
ROLES_URL: `${UMMAYA_DISABLED_OAUTH_BASE_URL}/api/oauth/ummaya_cli/roles`,
|
|
91
|
+
CONSOLE_SUCCESS_URL: `${UMMAYA_DOCS_ORIGIN}/en/`,
|
|
92
|
+
CLAUDEAI_SUCCESS_URL: `${UMMAYA_DOCS_ORIGIN}/en/`,
|
|
93
|
+
MANUAL_REDIRECT_URL: `${UMMAYA_DISABLED_OAUTH_BASE_URL}/oauth/code/callback`,
|
|
99
94
|
CLIENT_ID: '9d1c250a-e61b-44d9-88ed-5944d1962f5e',
|
|
100
95
|
// No suffix for production config
|
|
101
96
|
OAUTH_FILE_SUFFIX: '',
|
|
102
|
-
MCP_PROXY_URL:
|
|
97
|
+
MCP_PROXY_URL: UMMAYA_DISABLED_OAUTH_BASE_URL,
|
|
103
98
|
MCP_PROXY_PATH: '/v1/mcp/{server_id}',
|
|
104
99
|
} as const
|
|
105
100
|
|
|
@@ -107,44 +102,22 @@ const PROD_OAUTH_CONFIG = {
|
|
|
107
102
|
* Client ID Metadata Document URL for MCP OAuth (CIMD / SEP-991).
|
|
108
103
|
* When an MCP auth server advertises client_id_metadata_document_supported: true,
|
|
109
104
|
* Claude Code uses this URL as its client_id instead of Dynamic Client Registration.
|
|
110
|
-
* The URL must point to a JSON document hosted by
|
|
105
|
+
* The URL must point to a JSON document hosted by the runtime operator. UMMAYA
|
|
106
|
+
* disables this by default because there is no public hosted OAuth metadata
|
|
107
|
+
* endpoint for the FriendliAI API-key login path.
|
|
111
108
|
* See: https://datatracker.ietf.org/doc/html/draft-ietf-oauth-client-id-metadata-document-00
|
|
112
109
|
*/
|
|
113
110
|
export const MCP_CLIENT_METADATA_URL =
|
|
114
|
-
|
|
111
|
+
`${UMMAYA_DISABLED_OAUTH_BASE_URL}/oauth/ummaya-client-metadata`
|
|
115
112
|
|
|
116
|
-
// Staging OAuth configuration - only included in ant builds with staging flag
|
|
117
|
-
// Uses literal check for dead code elimination
|
|
118
113
|
const STAGING_OAUTH_CONFIG =
|
|
119
114
|
process.env.USER_TYPE === 'ant'
|
|
120
115
|
? ({
|
|
121
|
-
|
|
122
|
-
CONSOLE_AUTHORIZE_URL:
|
|
123
|
-
'https://platform.staging.ant.dev/oauth/authorize',
|
|
124
|
-
CLAUDE_AI_AUTHORIZE_URL:
|
|
125
|
-
'https://claude-ai.staging.ant.dev/oauth/authorize',
|
|
126
|
-
CLAUDE_AI_ORIGIN: 'https://claude-ai.staging.ant.dev',
|
|
127
|
-
TOKEN_URL: 'https://platform.staging.ant.dev/v1/oauth/token',
|
|
128
|
-
API_KEY_URL:
|
|
129
|
-
'https://api-staging.anthropic.com/api/oauth/claude_cli/create_api_key',
|
|
130
|
-
ROLES_URL:
|
|
131
|
-
'https://api-staging.anthropic.com/api/oauth/claude_cli/roles',
|
|
132
|
-
CONSOLE_SUCCESS_URL:
|
|
133
|
-
'https://platform.staging.ant.dev/buy_credits?returnUrl=/oauth/code/success%3Fapp%3Dclaude-code',
|
|
134
|
-
CLAUDEAI_SUCCESS_URL:
|
|
135
|
-
'https://platform.staging.ant.dev/oauth/code/success?app=claude-code',
|
|
136
|
-
MANUAL_REDIRECT_URL:
|
|
137
|
-
'https://platform.staging.ant.dev/oauth/code/callback',
|
|
138
|
-
CLIENT_ID: '22422756-60c9-4084-8eb7-27705fd5cf9a',
|
|
116
|
+
...PROD_OAUTH_CONFIG,
|
|
139
117
|
OAUTH_FILE_SUFFIX: '-staging-oauth',
|
|
140
|
-
MCP_PROXY_URL: 'https://mcp-proxy-staging.anthropic.com',
|
|
141
|
-
MCP_PROXY_PATH: '/v1/mcp/{server_id}',
|
|
142
118
|
} as const)
|
|
143
119
|
: undefined
|
|
144
120
|
|
|
145
|
-
// Three local dev servers: :8000 api-proxy (`api dev start -g ccr`),
|
|
146
|
-
// :4000 claude-ai frontend, :3000 Console frontend. Env vars let
|
|
147
|
-
// scripts/claude-localhost override if your layout differs.
|
|
148
121
|
function getLocalOauthConfig(): OauthConfig {
|
|
149
122
|
const api =
|
|
150
123
|
process.env.CLAUDE_LOCAL_OAUTH_API_BASE?.replace(/\/$/, '') ??
|
|
@@ -173,14 +146,12 @@ function getLocalOauthConfig(): OauthConfig {
|
|
|
173
146
|
}
|
|
174
147
|
}
|
|
175
148
|
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
'https://claude-staging.fedstart.com',
|
|
183
|
-
]
|
|
149
|
+
const ALLOWED_OAUTH_BASE_URLS = (
|
|
150
|
+
process.env.UMMAYA_ALLOWED_OAUTH_BASE_URLS ?? ''
|
|
151
|
+
)
|
|
152
|
+
.split(',')
|
|
153
|
+
.map(url => url.trim().replace(/\/$/, ''))
|
|
154
|
+
.filter(Boolean)
|
|
184
155
|
|
|
185
156
|
// Default to prod config, override with test/staging if enabled
|
|
186
157
|
export function getOauthConfig(): OauthConfig {
|
|
@@ -195,8 +166,6 @@ export function getOauthConfig(): OauthConfig {
|
|
|
195
166
|
}
|
|
196
167
|
})()
|
|
197
168
|
|
|
198
|
-
// Allow overriding all OAuth URLs to point to an approved FedStart deployment.
|
|
199
|
-
// Only allowlisted base URLs are accepted to prevent credential leakage.
|
|
200
169
|
const oauthBaseUrl = process.env.CLAUDE_CODE_CUSTOM_OAUTH_URL
|
|
201
170
|
if (oauthBaseUrl) {
|
|
202
171
|
const base = oauthBaseUrl.replace(/\/$/, '')
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export const PRODUCT_URL = 'https://
|
|
1
|
+
export const PRODUCT_URL = 'https://ummaya-docs.pages.dev/'
|
|
2
2
|
|
|
3
|
-
//
|
|
4
|
-
export const CLAUDE_AI_BASE_URL = 'https://
|
|
5
|
-
export const CLAUDE_AI_STAGING_BASE_URL = 'https://
|
|
3
|
+
// UMMAYA remote session URLs
|
|
4
|
+
export const CLAUDE_AI_BASE_URL = 'https://ummaya-docs.pages.dev'
|
|
5
|
+
export const CLAUDE_AI_STAGING_BASE_URL = 'https://ummaya-docs.pages.dev'
|
|
6
6
|
export const CLAUDE_AI_LOCAL_BASE_URL = 'http://localhost:4000'
|
|
7
7
|
|
|
8
8
|
/**
|
|
@@ -34,7 +34,7 @@ export function isRemoteSessionLocal(
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
/**
|
|
37
|
-
* Get the base URL for
|
|
37
|
+
* Get the base URL for UMMAYA remote sessions based on environment.
|
|
38
38
|
*/
|
|
39
39
|
export function getClaudeAiBaseUrl(
|
|
40
40
|
sessionId?: string,
|
|
@@ -54,7 +54,7 @@ export function getClaudeAiBaseUrl(
|
|
|
54
54
|
*
|
|
55
55
|
* The cse_→session_ translation is a temporary shim gated by
|
|
56
56
|
* tengu_bridge_repl_v2_cse_shim_enabled (see isCseShimEnabled). Worker
|
|
57
|
-
* endpoints (/v1/code/sessions/{id}/worker/*) want `cse_*` but the
|
|
57
|
+
* endpoints (/v1/code/sessions/{id}/worker/*) want `cse_*` but the remote
|
|
58
58
|
* frontend currently routes on `session_*` (compat/convert.go:27 validates
|
|
59
59
|
* TagSession). Same UUID body, different tag prefix. Once the server tags by
|
|
60
60
|
* environment_kind and the frontend accepts `cse_*` directly, flip the gate
|
|
@@ -1341,7 +1341,7 @@ export const SDKRateLimitInfoSchema = lazySchema(() =>
|
|
|
1341
1341
|
isUsingOverage: z.boolean().optional(),
|
|
1342
1342
|
surpassedThreshold: z.number().optional(),
|
|
1343
1343
|
})
|
|
1344
|
-
.describe('Rate limit information for
|
|
1344
|
+
.describe('Rate limit information for UMMAYA remote subscription users.'),
|
|
1345
1345
|
)
|
|
1346
1346
|
|
|
1347
1347
|
export const SDKAssistantMessageSchema = lazySchema(() =>
|
|
@@ -239,9 +239,6 @@ export type GrowthBookExperimentData = {
|
|
|
239
239
|
experimentMetadata?: Record<string, unknown>
|
|
240
240
|
}
|
|
241
241
|
|
|
242
|
-
// api.anthropic.com only serves the "production" GrowthBook environment
|
|
243
|
-
// (see starling/starling/cli/cli.py DEFAULT_ENVIRONMENTS). Staging and
|
|
244
|
-
// development environments are not exported to the prod API.
|
|
245
242
|
function getEnvironmentForGrowthBook(): string {
|
|
246
243
|
return 'production'
|
|
247
244
|
}
|
|
@@ -55,6 +55,17 @@ type FirstPartyEventLoggingPayload = {
|
|
|
55
55
|
events: FirstPartyEventLoggingEvent[]
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
+
function getFirstPartyEventBaseUrl(
|
|
59
|
+
configuredBaseUrl: string | undefined,
|
|
60
|
+
): string | undefined {
|
|
61
|
+
const baseUrl =
|
|
62
|
+
configuredBaseUrl ??
|
|
63
|
+
process.env.UMMAYA_FIRST_PARTY_EVENT_BASE_URL ??
|
|
64
|
+
process.env.ANTHROPIC_BASE_URL
|
|
65
|
+
const trimmed = baseUrl?.trim()
|
|
66
|
+
return trimmed ? trimmed.replace(/\/$/, '') : undefined
|
|
67
|
+
}
|
|
68
|
+
|
|
58
69
|
/**
|
|
59
70
|
* Exporter for 1st-party event logging to /api/event_logging/batch.
|
|
60
71
|
*
|
|
@@ -71,7 +82,7 @@ type FirstPartyEventLoggingPayload = {
|
|
|
71
82
|
* - Auth fallback: retries without auth on 401 errors
|
|
72
83
|
*/
|
|
73
84
|
export class FirstPartyEventLoggingExporter implements LogRecordExporter {
|
|
74
|
-
private readonly endpoint: string
|
|
85
|
+
private readonly endpoint: string | undefined
|
|
75
86
|
private readonly timeout: number
|
|
76
87
|
private readonly maxBatchSize: number
|
|
77
88
|
private readonly skipAuth: boolean
|
|
@@ -109,15 +120,10 @@ export class FirstPartyEventLoggingExporter implements LogRecordExporter {
|
|
|
109
120
|
schedule?: (fn: () => Promise<void>, delayMs: number) => () => void
|
|
110
121
|
} = {},
|
|
111
122
|
) {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
(process.env.ANTHROPIC_BASE_URL === 'https://api-staging.anthropic.com'
|
|
117
|
-
? 'https://api-staging.anthropic.com'
|
|
118
|
-
: 'https://api.anthropic.com')
|
|
119
|
-
|
|
120
|
-
this.endpoint = `${baseUrl}${options.path || '/api/event_logging/batch'}`
|
|
123
|
+
const baseUrl = getFirstPartyEventBaseUrl(options.baseUrl)
|
|
124
|
+
this.endpoint = baseUrl
|
|
125
|
+
? `${baseUrl}${options.path || '/api/event_logging/batch'}`
|
|
126
|
+
: undefined
|
|
121
127
|
|
|
122
128
|
this.timeout = options.timeout || 10000
|
|
123
129
|
this.maxBatchSize = options.maxBatchSize || 200
|
|
@@ -134,8 +140,10 @@ export class FirstPartyEventLoggingExporter implements LogRecordExporter {
|
|
|
134
140
|
return () => clearTimeout(t)
|
|
135
141
|
})
|
|
136
142
|
|
|
137
|
-
|
|
138
|
-
|
|
143
|
+
if (this.endpoint) {
|
|
144
|
+
// Retry any failed events from previous runs of this session (in background)
|
|
145
|
+
void this.retryPreviousBatches()
|
|
146
|
+
}
|
|
139
147
|
}
|
|
140
148
|
|
|
141
149
|
// Expose for testing
|
|
@@ -327,6 +335,11 @@ export class FirstPartyEventLoggingExporter implements LogRecordExporter {
|
|
|
327
335
|
return
|
|
328
336
|
}
|
|
329
337
|
|
|
338
|
+
if (!this.endpoint) {
|
|
339
|
+
resultCallback({ code: ExportResultCode.SUCCESS })
|
|
340
|
+
return
|
|
341
|
+
}
|
|
342
|
+
|
|
330
343
|
if (this.attempts >= this.maxAttempts) {
|
|
331
344
|
resultCallback({
|
|
332
345
|
code: ExportResultCode.FAILED,
|
|
@@ -467,6 +480,11 @@ export class FirstPartyEventLoggingExporter implements LogRecordExporter {
|
|
|
467
480
|
}
|
|
468
481
|
|
|
469
482
|
private async retryFailedEvents(): Promise<void> {
|
|
483
|
+
if (!this.endpoint) {
|
|
484
|
+
this.resetBackoff()
|
|
485
|
+
return
|
|
486
|
+
}
|
|
487
|
+
|
|
470
488
|
const filePath = this.getCurrentBatchFilePath()
|
|
471
489
|
|
|
472
490
|
// Keep retrying while there are events and endpoint is healthy
|
|
@@ -527,6 +545,10 @@ export class FirstPartyEventLoggingExporter implements LogRecordExporter {
|
|
|
527
545
|
private async sendBatchWithRetry(
|
|
528
546
|
payload: FirstPartyEventLoggingPayload,
|
|
529
547
|
): Promise<void> {
|
|
548
|
+
if (!this.endpoint) {
|
|
549
|
+
return
|
|
550
|
+
}
|
|
551
|
+
|
|
530
552
|
if (this.isKilled()) {
|
|
531
553
|
// Throw so the caller short-circuits remaining batches and queues
|
|
532
554
|
// everything to disk. Zero network traffic while killed; the backoff
|
|
@@ -421,27 +421,31 @@ function syncRemoteEvalToDisk(): void {
|
|
|
421
421
|
*/
|
|
422
422
|
function isGrowthBookEnabled(): boolean {
|
|
423
423
|
// GrowthBook depends on 1P event logging.
|
|
424
|
-
return is1PEventLoggingEnabled()
|
|
424
|
+
return is1PEventLoggingEnabled() && getGrowthBookApiHost() !== undefined
|
|
425
|
+
}
|
|
426
|
+
|
|
427
|
+
function getGrowthBookApiHost(): string | undefined {
|
|
428
|
+
const baseUrl =
|
|
429
|
+
process.env.USER_TYPE === 'ant'
|
|
430
|
+
? process.env.CLAUDE_CODE_GB_BASE_URL
|
|
431
|
+
: process.env.UMMAYA_GROWTHBOOK_BASE_URL
|
|
432
|
+
const trimmed = baseUrl?.trim()
|
|
433
|
+
return trimmed ? trimmed : undefined
|
|
425
434
|
}
|
|
426
435
|
|
|
427
436
|
/**
|
|
428
|
-
* Hostname of ANTHROPIC_BASE_URL when it points at
|
|
429
|
-
*
|
|
430
|
-
* Enterprise-proxy deployments (Epic, Marble, etc.) typically use
|
|
431
|
-
* apiKeyHelper auth, which means isAnthropicAuthEnabled() returns false and
|
|
432
|
-
* organizationUUID/accountUUID/email are all absent from GrowthBook
|
|
433
|
-
* attributes. Without this, there's no stable attribute to target them on
|
|
434
|
-
* — only per-device IDs. See src/utils/auth.ts isAnthropicAuthEnabled().
|
|
435
|
-
*
|
|
436
|
-
* Returns undefined for unset/default (api.anthropic.com) so the attribute
|
|
437
|
-
* is absent for direct-API users. Hostname only — no path/query/creds.
|
|
437
|
+
* Hostname of ANTHROPIC_BASE_URL when it points at an operator-approved proxy.
|
|
438
438
|
*/
|
|
439
439
|
export function getApiBaseUrlHost(): string | undefined {
|
|
440
440
|
const baseUrl = process.env.ANTHROPIC_BASE_URL
|
|
441
441
|
if (!baseUrl) return undefined
|
|
442
442
|
try {
|
|
443
443
|
const host = new URL(baseUrl).host
|
|
444
|
-
|
|
444
|
+
const firstPartyHosts = (process.env.UMMAYA_FIRST_PARTY_API_HOSTS ?? '')
|
|
445
|
+
.split(',')
|
|
446
|
+
.map(value => value.trim())
|
|
447
|
+
.filter(Boolean)
|
|
448
|
+
if (firstPartyHosts.includes(host)) return undefined
|
|
445
449
|
return host
|
|
446
450
|
} catch {
|
|
447
451
|
return undefined
|
|
@@ -500,10 +504,7 @@ const getGrowthBookClient = memoize(
|
|
|
500
504
|
`GrowthBook: Creating client with clientKey=${clientKey}, attributes: ${jsonStringify(attributes)}`,
|
|
501
505
|
)
|
|
502
506
|
}
|
|
503
|
-
const baseUrl =
|
|
504
|
-
process.env.USER_TYPE === 'ant'
|
|
505
|
-
? process.env.CLAUDE_CODE_GB_BASE_URL || 'https://api.anthropic.com/'
|
|
506
|
-
: 'https://api.anthropic.com/'
|
|
507
|
+
const baseUrl = getGrowthBookApiHost() ?? 'http://127.0.0.1:9'
|
|
507
508
|
|
|
508
509
|
// Skip auth if trust hasn't been established yet
|
|
509
510
|
// This prevents executing apiKeyHelper commands before the trust dialog
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Files API client for managing files
|
|
3
|
-
*
|
|
4
|
-
* This module provides functionality to download and upload files to Anthropic Public Files API.
|
|
5
|
-
* Used by the Claude Code agent to download file attachments at session startup.
|
|
6
|
-
*
|
|
7
|
-
* API Reference: https://docs.anthropic.com/en/api/files-content
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
1
|
import axios from 'axios'
|
|
11
2
|
import { randomUUID } from 'crypto'
|
|
12
3
|
import * as fs from 'fs/promises'
|
|
@@ -27,13 +18,12 @@ import {
|
|
|
27
18
|
const FILES_API_BETA_HEADER = 'files-api-2025-04-14,oauth-2025-04-20'
|
|
28
19
|
const ANTHROPIC_VERSION = '2023-06-01'
|
|
29
20
|
|
|
30
|
-
// API base URL - uses ANTHROPIC_BASE_URL set by env-manager for the appropriate environment
|
|
31
|
-
// Falls back to public API for standalone usage
|
|
32
21
|
function getDefaultApiBaseUrl(): string {
|
|
33
22
|
return (
|
|
23
|
+
process.env.UMMAYA_FILES_API_BASE_URL ||
|
|
34
24
|
process.env.ANTHROPIC_BASE_URL ||
|
|
35
25
|
process.env.CLAUDE_CODE_API_BASE_URL ||
|
|
36
|
-
'
|
|
26
|
+
'http://127.0.0.1:9/ummaya-disabled-files-api'
|
|
37
27
|
)
|
|
38
28
|
}
|
|
39
29
|
|
|
@@ -60,7 +50,7 @@ export type File = {
|
|
|
60
50
|
export type FilesApiConfig = {
|
|
61
51
|
/** OAuth token for authentication (from session JWT) */
|
|
62
52
|
oauthToken: string
|
|
63
|
-
/** Base URL for the API
|
|
53
|
+
/** Base URL for the API. Defaults to a disabled local endpoint. */
|
|
64
54
|
baseUrl?: string
|
|
65
55
|
/** Session ID for creating session-specific directories */
|
|
66
56
|
sessionId: string
|
|
@@ -123,7 +113,7 @@ async function retryWithBackoff<T>(
|
|
|
123
113
|
}
|
|
124
114
|
|
|
125
115
|
/**
|
|
126
|
-
* Downloads a single file from the
|
|
116
|
+
* Downloads a single file from the configured runtime Files API.
|
|
127
117
|
*
|
|
128
118
|
* @param fileId - The file ID (e.g., "file_011CNha8iCJcU1wXNR6q4V8w")
|
|
129
119
|
* @param config - Files API configuration
|
|
@@ -26,6 +26,18 @@ const CACHE_TTL_MS = 60 * 60 * 1000
|
|
|
26
26
|
// N `claude -p` invocations into ~1 API call/day.
|
|
27
27
|
const DISK_CACHE_TTL_MS = 24 * 60 * 60 * 1000
|
|
28
28
|
|
|
29
|
+
function getMetricsEnabledEndpoint(): string | undefined {
|
|
30
|
+
const baseUrl =
|
|
31
|
+
process.env.UMMAYA_METRICS_BASE_URL ??
|
|
32
|
+
process.env.ANT_CLAUDE_CODE_METRICS_ENDPOINT ??
|
|
33
|
+
process.env.ANTHROPIC_BASE_URL ??
|
|
34
|
+
process.env.CLAUDE_CODE_API_BASE_URL
|
|
35
|
+
const trimmed = baseUrl?.trim()
|
|
36
|
+
return trimmed
|
|
37
|
+
? `${trimmed.replace(/\/$/, '')}/api/claude_code/organizations/metrics_enabled`
|
|
38
|
+
: undefined
|
|
39
|
+
}
|
|
40
|
+
|
|
29
41
|
/**
|
|
30
42
|
* Internal function to call the API and check if metrics are enabled
|
|
31
43
|
* This is wrapped by memoizeWithTTLAsync to add caching behavior
|
|
@@ -42,7 +54,10 @@ async function _fetchMetricsEnabled(): Promise<MetricsEnabledResponse> {
|
|
|
42
54
|
...authResult.headers,
|
|
43
55
|
}
|
|
44
56
|
|
|
45
|
-
const endpoint =
|
|
57
|
+
const endpoint = getMetricsEnabledEndpoint()
|
|
58
|
+
if (!endpoint) {
|
|
59
|
+
throw new Error('Metrics opt-out endpoint is not configured for UMMAYA')
|
|
60
|
+
}
|
|
46
61
|
const response = await axios.get<MetricsEnabledResponse>(endpoint, {
|
|
47
62
|
headers,
|
|
48
63
|
timeout: 5000,
|
|
@@ -58,6 +73,10 @@ async function _checkMetricsEnabledAPI(): Promise<MetricsStatus> {
|
|
|
58
73
|
return { enabled: false, hasError: false }
|
|
59
74
|
}
|
|
60
75
|
|
|
76
|
+
if (!getMetricsEnabledEndpoint()) {
|
|
77
|
+
return { enabled: false, hasError: false }
|
|
78
|
+
}
|
|
79
|
+
|
|
61
80
|
try {
|
|
62
81
|
const data = await withOAuth401Retry(_fetchMetricsEnabled, {
|
|
63
82
|
also403Revoked: true,
|
|
@@ -34,10 +34,14 @@ export async function prefetchOfficialMcpUrls(): Promise<void> {
|
|
|
34
34
|
if (process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC) {
|
|
35
35
|
return
|
|
36
36
|
}
|
|
37
|
+
const registryUrl = process.env.UMMAYA_MCP_REGISTRY_URL?.trim()
|
|
38
|
+
if (!registryUrl) {
|
|
39
|
+
return
|
|
40
|
+
}
|
|
37
41
|
|
|
38
42
|
try {
|
|
39
43
|
const response = await axios.get<RegistryResponse>(
|
|
40
|
-
|
|
44
|
+
registryUrl,
|
|
41
45
|
{ timeout: 5000 },
|
|
42
46
|
)
|
|
43
47
|
|
|
@@ -597,7 +597,7 @@ export function useManageMCPConnections(
|
|
|
597
597
|
gate.kind === 'disabled'
|
|
598
598
|
? 'Channels are not currently available'
|
|
599
599
|
: gate.kind === 'auth'
|
|
600
|
-
? 'Channels require
|
|
600
|
+
? 'Channels require UMMAYA remote authentication · run /login'
|
|
601
601
|
: gate.kind === 'policy'
|
|
602
602
|
? 'Channels are not enabled for your org · have an administrator set channelsEnabled: true in managed settings'
|
|
603
603
|
: gate.reason
|
|
@@ -273,7 +273,7 @@ export function describeMcpConfigFilePath(scope: ConfigScope): string {
|
|
|
273
273
|
case 'enterprise':
|
|
274
274
|
return getEnterpriseMcpFilePath()
|
|
275
275
|
case 'claudeai':
|
|
276
|
-
return '
|
|
276
|
+
return 'UMMAYA remote'
|
|
277
277
|
default:
|
|
278
278
|
return scope
|
|
279
279
|
}
|
|
@@ -292,7 +292,7 @@ export function getScopeLabel(scope: ConfigScope): string {
|
|
|
292
292
|
case 'enterprise':
|
|
293
293
|
return 'Enterprise config (managed by your organization)'
|
|
294
294
|
case 'claudeai':
|
|
295
|
-
return '
|
|
295
|
+
return 'UMMAYA remote config'
|
|
296
296
|
default:
|
|
297
297
|
return scope
|
|
298
298
|
}
|
|
@@ -398,7 +398,6 @@ function roughTokenCountEstimationForBlock(
|
|
|
398
398
|
return roughTokenCountEstimation(block.text)
|
|
399
399
|
}
|
|
400
400
|
if (block.type === 'image' || block.type === 'document') {
|
|
401
|
-
// https://platform.claude.com/docs/en/build-with-claude/vision#calculate-image-costs
|
|
402
401
|
// tokens = (width px * height px)/750
|
|
403
402
|
// Images are resized to max 2000x2000 (5333 tokens). Use a conservative
|
|
404
403
|
// estimate that matches microCompact's IMAGE_MAX_TOKEN_SIZE to avoid
|